diff options
author | obache <obache@pkgsrc.org> | 2008-12-13 13:58:31 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2008-12-13 13:58:31 +0000 |
commit | 15debaac892c8866ad36d4f3866b50d7f9ee8c97 (patch) | |
tree | c116ccd95d4ee274b3204e384dca580882dd01e3 /security/skey/patches | |
parent | 3a0751331df76a639dd9b07f38ed668389101e99 (diff) | |
download | pkgsrc-15debaac892c8866ad36d4f3866b50d7f9ee8c97.tar.gz |
* Fixes mismatch between the section and extension of skeyprune.
* skeyprune is perl script, need runtime dependency on perl5.
* Fixes mis-use of config.h (patch-a[d-i]), avoid to use a mixture of
local hash function with system RMD header.
Fixes build failure reported by PR 39872 and PR 39953.
Bump PKGREVISION.
Diffstat (limited to 'security/skey/patches')
-rw-r--r-- | security/skey/patches/patch-aa | 10 | ||||
-rw-r--r-- | security/skey/patches/patch-ad | 23 | ||||
-rw-r--r-- | security/skey/patches/patch-ae | 23 | ||||
-rw-r--r-- | security/skey/patches/patch-af | 23 | ||||
-rw-r--r-- | security/skey/patches/patch-ag | 36 | ||||
-rw-r--r-- | security/skey/patches/patch-ah | 22 | ||||
-rw-r--r-- | security/skey/patches/patch-ai | 23 |
7 files changed, 156 insertions, 4 deletions
diff --git a/security/skey/patches/patch-aa b/security/skey/patches/patch-aa index 7bdc6a539da..b25e7220459 100644 --- a/security/skey/patches/patch-aa +++ b/security/skey/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2008/12/13 13:26:19 obache Exp $ +$NetBSD: patch-aa,v 1.5 2008/12/13 13:58:31 obache Exp $ ---- Makefile.in.orig 2001-05-10 11:10:49.000000000 -0500 +--- Makefile.in.orig 2001-05-10 16:10:49.000000000 +0000 +++ Makefile.in @@ -18,15 +18,18 @@ LIBS=@LIBS@ AR=@AR@ @@ -55,11 +55,13 @@ $NetBSD: patch-aa,v 1.4 2008/12/13 13:26:19 obache Exp $ ${INSTALL_DATA} libskey.a $(DESTDIR)$(libdir) ${INSTALL_DATA} ${HDRS} $(DESTDIR)$(includedir) @for target in ${TARGETS}; do \ -@@ -107,7 +110,7 @@ install: ${TARGETS} +@@ -106,8 +109,8 @@ install: ${TARGETS} + ${INSTALL_MAN} skeyinit.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinit.1 ${INSTALL_MAN} skeyinfo.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinfo.1 ${INSTALL_MAN} skeyaudit.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyaudit.1 - ${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.1 +- ${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.1 - ${TOUCH} ${DESTDIR}${sysconfdir}/skeykeys ++ ${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.8 + ${TOUCH} ${DESTDIR}$(prefix)/share/examples/skey/skeykeys uninstallall: uninstall diff --git a/security/skey/patches/patch-ad b/security/skey/patches/patch-ad new file mode 100644 index 00000000000..117daa5a1bf --- /dev/null +++ b/security/skey/patches/patch-ad @@ -0,0 +1,23 @@ +$NetBSD: patch-ad,v 1.1 2008/12/13 13:58:31 obache Exp $ + +include "config.h" before using HAVE_* macro. + +--- md4c.c.orig 2001-05-10 16:10:49.000000000 +0000 ++++ md4c.c +@@ -21,6 +21,8 @@ + documentation and/or software. + */ + ++#include "config.h" ++ + #ifndef HAVE_MD4_H + + #if defined(LIBC_SCCS) && !defined(lint) +@@ -29,7 +31,6 @@ static char rcsid[] = "$OpenBSD: md4c.c, + + #include <string.h> + #include <sys/types.h> +-#include "config.h" + #include "md4.h" + + /* POINTER defines a generic pointer type */ diff --git a/security/skey/patches/patch-ae b/security/skey/patches/patch-ae new file mode 100644 index 00000000000..d1100580d2f --- /dev/null +++ b/security/skey/patches/patch-ae @@ -0,0 +1,23 @@ +$NetBSD: patch-ae,v 1.1 2008/12/13 13:58:31 obache Exp $ + +include "config.h" before using HAVE_* macro. + +--- md5c.c.orig 2001-05-10 16:10:49.000000000 +0000 ++++ md5c.c +@@ -22,6 +22,8 @@ These notices must be retained in any co + documentation and/or software. + */ + ++#include "config.h" ++ + #ifndef HAVE_MD5_H + + #if defined(LIBC_SCCS) && !defined(lint) +@@ -30,7 +32,6 @@ static char rcsid[] = "$OpenBSD: md5c.c, + + #include <string.h> + #include <sys/types.h> +-#include "config.h" + #include "md5.h" + + diff --git a/security/skey/patches/patch-af b/security/skey/patches/patch-af new file mode 100644 index 00000000000..06a457857a9 --- /dev/null +++ b/security/skey/patches/patch-af @@ -0,0 +1,23 @@ +$NetBSD: patch-af,v 1.1 2008/12/13 13:58:31 obache Exp $ + +include "config.h" before using HAVE_* macro. + +--- rmd160.c.orig 2001-05-10 16:10:49.000000000 +0000 ++++ rmd160.c +@@ -15,6 +15,8 @@ + * 1996, All Rights Reserved + * + \********************************************************************/ ++#include "config.h" ++ + #ifndef HAVE_RMD160_H + + /* header files */ +@@ -22,7 +24,6 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/types.h> +-#include "config.h" + #include "rmd160.h" + + /********************************************************************/ diff --git a/security/skey/patches/patch-ag b/security/skey/patches/patch-ag new file mode 100644 index 00000000000..c1b40960151 --- /dev/null +++ b/security/skey/patches/patch-ag @@ -0,0 +1,36 @@ +$NetBSD: patch-ag,v 1.1 2008/12/13 13:58:31 obache Exp $ + +Change to same as other *.c for hash functions. +Avoid to use a mixture of local RMD160 functions with system RMD160 header. + +--- rmd160hl.c.orig 2001-05-10 16:10:49.000000000 +0000 ++++ rmd160hl.c +@@ -7,6 +7,10 @@ + * ---------------------------------------------------------------------------- + */ + ++#include "config.h" ++ ++#ifndef HAVE_RMD160_H ++ + #if defined(LIBC_SCCS) && !defined(lint) + static char rcsid[] = "$OpenBSD: rmd160hl.c,v 1.2 1999/08/17 09:13:12 millert Exp $"; + #endif /* LIBC_SCCS and not lint */ +@@ -18,12 +22,7 @@ static char rcsid[] = "$OpenBSD: rmd160h + #include <sys/types.h> + #include <sys/uio.h> + #include <unistd.h> +-#include "config.h" +-#ifdef HAVE_RMD160_H +-#include <rmd160.h> +-#else + #include "rmd160.h" +-#endif + + /* ARGSUSED */ + char * +@@ -83,3 +82,4 @@ RMD160Data (data, len, buf) + RMD160Update(&ctx, data, len); + return(RMD160End(&ctx, buf)); + } ++#endif diff --git a/security/skey/patches/patch-ah b/security/skey/patches/patch-ah new file mode 100644 index 00000000000..45eeb4d3c46 --- /dev/null +++ b/security/skey/patches/patch-ah @@ -0,0 +1,22 @@ +$NetBSD: patch-ah,v 1.1 2008/12/13 13:58:31 obache Exp $ + +include "config.h" before using HAVE_* macro. + +--- sha1.c.orig 2001-05-10 16:10:49.000000000 +0000 ++++ sha1.c +@@ -13,13 +13,14 @@ + * A million repetitions of "a" + * 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F + */ ++#include "config.h" ++ + #ifndef HAVE_SHA1_H + + #define SHA1HANDSOFF /* Copies data before messing with it. */ + + #include <sys/param.h> + #include <string.h> +-#include "config.h" + #include "sha1.h" + + #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) diff --git a/security/skey/patches/patch-ai b/security/skey/patches/patch-ai new file mode 100644 index 00000000000..84001aaa6af --- /dev/null +++ b/security/skey/patches/patch-ai @@ -0,0 +1,23 @@ +$NetBSD: patch-ai,v 1.1 2008/12/13 13:58:31 obache Exp $ + +include "config.h" before using HAVE_* macro. + +--- sha1hl.c.orig 2001-05-10 16:10:49.000000000 +0000 ++++ sha1hl.c +@@ -6,6 +6,8 @@ + * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp + * ---------------------------------------------------------------------------- + */ ++#include "config.h" ++ + #ifndef HAVE_SHA1_H + + #if defined(LIBC_SCCS) && !defined(lint) +@@ -19,7 +21,6 @@ static char rcsid[] = "$OpenBSD: sha1hl. + #include <sys/types.h> + #include <sys/uio.h> + #include <unistd.h> +-#include "config.h" + #include "sha1.h" + + /* ARGSUSED */ |