diff options
Diffstat (limited to 'security/gnupg/patches')
-rw-r--r-- | security/gnupg/patches/patch-aa | 31 | ||||
-rw-r--r-- | security/gnupg/patches/patch-ab | 31 | ||||
-rw-r--r-- | security/gnupg/patches/patch-ac | 17 | ||||
-rw-r--r-- | security/gnupg/patches/patch-ad | 20 | ||||
-rw-r--r-- | security/gnupg/patches/patch-ae | 20 | ||||
-rw-r--r-- | security/gnupg/patches/patch-af | 22 |
6 files changed, 38 insertions, 103 deletions
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa index 906c88fdac5..7c29a444418 100644 --- a/security/gnupg/patches/patch-aa +++ b/security/gnupg/patches/patch-aa @@ -1,13 +1,20 @@ -$NetBSD: patch-aa,v 1.6 2001/05/23 15:35:01 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2002/10/09 14:16:56 itojun Exp $ ---- cipher/Makefile.am.orig Thu Mar 8 14:47:11 2001 -+++ cipher/Makefile.am -@@ -43,7 +43,7 @@ - endif - - --DYNLINK_MOD_CFLAGS = -DIS_MODULE @DYNLINK_MOD_CFLAGS@ -+DYNLINK_MOD_CFLAGS = -DIS_MODULE -fPIC @DYNLINK_MOD_CFLAGS@ - - #libcipher_a_LDFLAGS = - libcipher_a_SOURCES = cipher.c \ +--- configure.orig Sat Sep 21 12:32:56 2002 ++++ configure Sun Sep 29 23:39:25 2002 +@@ -4792,8 +4792,14 @@ + NAME_OF_DEV_RANDOM="/dev/random" + NAME_OF_DEV_URANDOM="/dev/urandom" + case "${target}" in +- *-openbsd* | *-netbsd*) ++ *-openbsd*) + NAME_OF_DEV_RANDOM="/dev/srandom" ++ NAME_OF_DEV_URANDOM="/dev/urandom" ++ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" ++ ;; ++ ++ *-netbsd*) ++ NAME_OF_DEV_RANDOM="/dev/random" + NAME_OF_DEV_URANDOM="/dev/urandom" + ;; + esac diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab index 3bc581e00e3..43ad5db1bfc 100644 --- a/security/gnupg/patches/patch-ab +++ b/security/gnupg/patches/patch-ab @@ -1,13 +1,20 @@ -$NetBSD: patch-ab,v 1.13 2002/05/07 18:48:47 wiz Exp $ - ---- cipher/Makefile.in.orig Mon Apr 29 17:06:11 2002 -+++ cipher/Makefile.in -@@ -129,7 +129,7 @@ - am__quote = @am__quote@ - install_sh = @install_sh@ - --DYNLINK_MOD_CFLAGS = -DIS_MODULE @DYNLINK_MOD_CFLAGS@ -+DYNLINK_MOD_CFLAGS = -DIS_MODULE -fPIC @DYNLINK_MOD_CFLAGS@ - - INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl +$NetBSD: patch-ab,v 1.14 2002/10/09 14:16:56 itojun Exp $ +--- configure.ac.orig Sat Sep 21 12:19:15 2002 ++++ configure.ac Sun Sep 29 23:40:20 2002 +@@ -453,8 +453,14 @@ + NAME_OF_DEV_RANDOM="/dev/random" + NAME_OF_DEV_URANDOM="/dev/urandom" + case "${target}" in +- *-openbsd* | *-netbsd*) ++ *-openbsd*) + NAME_OF_DEV_RANDOM="/dev/srandom" ++ NAME_OF_DEV_URANDOM="/dev/urandom" ++ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" ++ ;; ++ ++ *-netbsd*) ++ NAME_OF_DEV_RANDOM="/dev/random" + NAME_OF_DEV_URANDOM="/dev/urandom" + ;; + esac diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac deleted file mode 100644 index 5e24c169a30..00000000000 --- a/security/gnupg/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.11 2002/05/07 18:48:47 wiz Exp $ - ---- mpi/config.links.orig Thu Apr 18 12:10:40 2002 -+++ mpi/config.links -@@ -119,6 +119,12 @@ - path="sparc32v8 sparc32" - mpi_extra_modules="udiv" - ;; -+ sparc64-*-netbsd) -+ # There are no sparc64 assembler modules that work, so -+ # just use generic C functions -+ echo '/* configured for sparc64-*-netbsd */' >>./mpi/asm-syntax.h -+ path="" -+ ;; - sparc64-sun-solaris2*) - # Got a report that udiv is missing, so we try this one - echo '/* configured for sparc64-sun-solaris2 */' >>./mpi/asm-syntax.h diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad deleted file mode 100644 index b2d69ed793d..00000000000 --- a/security/gnupg/patches/patch-ad +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2002/08/25 21:50:37 jlam Exp $ - ---- configure.orig Mon Apr 29 16:59:16 2002 -+++ configure -@@ -3928,8 +3928,14 @@ - NAME_OF_DEV_RANDOM="/dev/random" - NAME_OF_DEV_URANDOM="/dev/urandom" - case "${target}" in -- *-openbsd* | *-netbsd*) -+ *-openbsd*) - NAME_OF_DEV_RANDOM="/dev/srandom" -+ NAME_OF_DEV_URANDOM="/dev/urandom" -+ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" -+ ;; -+ -+ *-netbsd*) -+ NAME_OF_DEV_RANDOM="/dev/random" - NAME_OF_DEV_URANDOM="/dev/urandom" - DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" - ;; diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae deleted file mode 100644 index e7975763ee7..00000000000 --- a/security/gnupg/patches/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2002/08/25 21:50:38 jlam Exp $ - ---- configure.ac.orig Mon Apr 29 16:56:08 2002 -+++ configure.ac -@@ -325,8 +325,14 @@ - NAME_OF_DEV_RANDOM="/dev/random" - NAME_OF_DEV_URANDOM="/dev/urandom" - case "${target}" in -- *-openbsd* | *-netbsd*) -+ *-openbsd*) - NAME_OF_DEV_RANDOM="/dev/srandom" -+ NAME_OF_DEV_URANDOM="/dev/urandom" -+ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" -+ ;; -+ -+ *-netbsd*) -+ NAME_OF_DEV_RANDOM="/dev/random" - NAME_OF_DEV_URANDOM="/dev/urandom" - DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" - ;; diff --git a/security/gnupg/patches/patch-af b/security/gnupg/patches/patch-af deleted file mode 100644 index c3653f509fa..00000000000 --- a/security/gnupg/patches/patch-af +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-af,v 1.1 2002/09/30 22:41:31 chris Exp $ - ---- cipher/dynload.c.orig Mon Sep 30 23:34:34 2002 -+++ cipher/dynload.c Mon Sep 30 23:35:18 2002 -@@ -287,7 +287,7 @@ - goto failure; - } - name = (char**)dlsym(el->handle, SYMBOL_VERSION); -- if( (err=dlerror()) ) { -+ if( (name == NULL) && (err=dlerror()) ) { - log_error("%s: not a gnupg extension: %s\n", el->name, err ); - goto failure; - } -@@ -332,7 +332,7 @@ - - #ifdef HAVE_DL_DLOPEN - sym = dlsym(el->handle, SYMBOL_ENUM); -- if( (err=dlerror()) ) { -+ if( (sym == NULL) && (err=dlerror()) ) { - log_error("%s: invalid gnupg extension: %s\n", el->name, err ); - goto failure; - } |