From 58c7549fb13f890134350830e4a72a0af3555cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 4 Apr 2018 17:55:01 +0000
Subject: [PATCH] fix build in stretch, problem: other pkcs11.h providers
 require old openssl 1.0 instead of new 1.1

---
 bootstrap.sh       | 18 +++++++++---------
 build-in-docker.sh |  4 ++--
 configure.ac       |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index c38ad04..cfa5546 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -88,7 +88,7 @@ DESCRIPTION
   ${DEFAULT_PROJECT_NAME} as the project name for your project in
   ${PROJECT_PATH}. In the first run, you should call ${MY_NAME} from a
   checked out the bootstrap-build-environment from
-  https://dev.marc.waeckerlin.org/, and the path from where you call
+  https://mrw.sh/, and the path from where you call
   ${MY_NAME} (which is actually ${PROJECT_PATH}) should be the path to
   your newly created project. Please note that your project must be a
   checked out subversion or git repository, since this build
@@ -98,7 +98,7 @@ DESCRIPTION
   subversion on https:/path/to/your/new-project:
 
     cd ~/svn
-    svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\
+    svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\
            bootstrap-build-environment
     svn co https:/path/to/your/new-project/trunk new-project
     cd new-project
@@ -108,7 +108,7 @@ DESCRIPTION
   git on https:/path/to/your/new-project:
 
     cd ~/svn
-    svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\
+    svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\
            bootstrap-build-environment
     cd ~/git
     git clone https:/path/to/your/new-project
@@ -1092,10 +1092,10 @@ to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF
       "foo": ["sha256", "fcde2b2edxx56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"]
     },
     "ldap": {
-      "url": "ldap://dev.marc.waeckerlin.org",
-      "adminDn": "cn=tmp,ou=system,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
+      "url": "ldap://your.ldap.host",
+      "adminDn": "cn=tmp,ou=system,ou=people,dc=your,dc=ldap,dc=host",
       "adminPassword": "secret",
-      "searchBase": "ou=person,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
+      "searchBase": "ou=person,ou=people,dc=your,dc=ldap,dc=host",
       "searchFilter": "(uid={{username}})"
     }
   }
@@ -1899,9 +1899,9 @@ to build-in-docker.conf <<EOF
 ${HEADER}# Use Ubuntu Universe Repository
 repos+=("ubuntu:::universe")
 
-# Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org
-repos+=("debian|ubuntu:::https://dev.marc.waeckerlin.org/repository:::https://dev.marc.waeckerlin.org/repository/@DISTRIBUTOR@/marc-waeckerlin.repo")
-keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
+# Use Marc Wäckerlin's Repository, see https://repository.mrw.sh
+repos+=("debian|ubuntu:::https://repository.mrw.sh:::https://repository.mrw.sh/@DISTRIBUTOR@/marc-waeckerlin.repo")
+keys+=("https://repository.mrw.sh/PublicKey")
 
 # centos requires epel-release for some packages, such as Qt WebKit
 packages+=("centos:::epel-release")
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 2193f34..5559f63 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -75,8 +75,8 @@ while test $# -gt 0; do
             echo "                     -e ANDROID_HOME=/opt/local/android \\"
             echo "                     -d /opt/local/android \\"
             echo "                     -r universe \\"
-            echo "                     -r https://dev.marc.waeckerlin.org/repository \\"
-            echo "                     -k https://dev.marc.waeckerlin.org/repository/PublicKey \\"
+            echo "                     -r https://repository.mrw.sh \\"
+            echo "                     -k https://repository.mrw.sh/PublicKey \\"
             echo "                     -p mrw-c++"
             echo
             exit 0
diff --git a/configure.ac b/configure.ac
index 47745a9..cd2f2b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ CPPFLAGS="${CPPFLAGS} -DQT_NO_KEYWORDS"
 # libraries used
 if test -z "$MINGW"; then
    AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h], [libpcsclite pcsc-lite])
-   AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [p11-kit libpkcs11-helper-1 libp11 libpkcs11-helper1])
+   AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [p11-kit gnutls libp11 libpkcs11-helper1 libpkcs11-helper-1])
    AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl libopenssl])
    AX_PKG_REQUIRE([crypto], [libcrypto], [openssl/crypto.h], [libssl openssl libopenssl])
 else