Adding Patch for loading crl from file
authorJochen Saalfeld <privat@jochen-saalfeld.de>
Tue, 20 Sep 2016 10:17:45 +0000 (12:17 +0200)
committerJochen Saalfeld <privat@jochen-saalfeld.de>
Tue, 20 Sep 2016 10:17:45 +0000 (12:17 +0200)
* Makefile.am - adding the patch to be executed while building
* dirmngr-load-crl-from-fs.patch - the patch itself

Makefile.am
patches/dirmngr-1.1.1/dirmngr-load-crl-from-fs.patch [new file with mode: 0755]

index 266789a..e305b44 100644 (file)
@@ -28,6 +28,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         doc/license-page doc/GPLv3 \
         build-aux/git-log-footer build-aux/git-log-fix \
         patches/dirmngr-1.1.1/dirmngr-pth.patch \
+        patches/dirmngr-1.1.1/dirmngr-load-crl-from-fs.patch \
         patches/glib-2.41.5/01-socket.patch \
         patches/gnupg2/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
         patches/gnupg2/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
@@ -44,11 +45,11 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/gnutls-2.12.23/07-cve-2015-0294.patch \
         patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch \
         patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch \
-               patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch \
+        patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch \
         patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
-               patches/w32pth-2.0.5/workaround-broken-libtool.patch \
-               patches/scute-1.4.0/workaround-broken-libtool.patch \
-               patches/libassuan-2.4.0/0001-Fix-windows-build-with-mingw-w64-2.0.x.patch \
+        patches/w32pth-2.0.5/workaround-broken-libtool.patch \
+        patches/scute-1.4.0/workaround-broken-libtool.patch \
+        patches/libassuan-2.4.0/0001-Fix-windows-build-with-mingw-w64-2.0.x.patch \
         patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
         patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch \
         patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch \
diff --git a/patches/dirmngr-1.1.1/dirmngr-load-crl-from-fs.patch b/patches/dirmngr-1.1.1/dirmngr-load-crl-from-fs.patch
new file mode 100755 (executable)
index 0000000..944a450
--- /dev/null
@@ -0,0 +1,15 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+--- a/src/crlcache.c
++++ b/src/crlcache.c
+@@ -2360,7 +2360,7 @@ crl_cache_load (ctrl_t ctrl, const char *filename)
+   FILE *fp;
+   ksba_reader_t reader;
+-  fp = fopen (filename, "r");
++  fp = fopen (filename, "rb");
+   if (!fp)
+     {
+       err = gpg_error_from_errno (errno);