* 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.diff -r1.21 -r1.22 pkgsrc/security/skey/Makefile
(obache)
@@ -1,29 +1,29 @@ | @@ -1,29 +1,29 @@ | |||
1 | # $NetBSD: Makefile,v 1.21 2008/12/13 13:26:19 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.22 2008/12/13 13:58:31 obache Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= skey-1.1.5 | 4 | DISTNAME= skey-1.1.5 | |
5 | PKGREVISION= 2 | 5 | PKGREVISION= 3 | |
6 | CATEGORIES= security | 6 | CATEGORIES= security | |
7 | MASTER_SITES= http://www.sparc.spb.su/solaris/skey/ | 7 | MASTER_SITES= http://www.sparc.spb.su/solaris/skey/ | |
8 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= ${MASTER_SITES} | 11 | HOMEPAGE= ${MASTER_SITES} | |
12 | COMMENT= Port of OpenBSD s/key implementation | 12 | COMMENT= Port of OpenBSD s/key implementation | |
13 | 13 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 15 | |||
16 | USE_TOOLS+= gmake perl | 16 | USE_TOOLS+= gmake perl:run | |
17 | GNU_CONFIGURE= yes | 17 | GNU_CONFIGURE= yes | |
18 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | 18 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | |
19 | CONF_FILES+= ${PREFIX}/share/examples/skey/skeykeys \ | 19 | CONF_FILES+= ${PREFIX}/share/examples/skey/skeykeys \ | |
20 | ${PKG_SYSCONFDIR}/skeykeys | 20 | ${PKG_SYSCONFDIR}/skeykeys | |
21 | 21 | |||
22 | REPLACE_PERL= skeyprune.pl | 22 | REPLACE_PERL= skeyprune.pl | |
23 | 23 | |||
24 | INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 | 24 | INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 | |
25 | 25 | |||
26 | post-install: | 26 | post-install: | |
27 | ${RANLIB} ${DESTDIR}${PREFIX}/lib/libskey.a | 27 | ${RANLIB} ${DESTDIR}${PREFIX}/lib/libskey.a | |
28 | 28 | |||
29 | .include "../../mk/bsd.pkg.mk" | 29 | .include "../../mk/bsd.pkg.mk" |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2005/06/30 04:06:39 minskim Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2008/12/13 13:58:31 obache Exp $ | |
2 | bin/skey | 2 | bin/skey | |
3 | bin/skeyaudit | 3 | bin/skeyaudit | |
4 | bin/skeyinfo | 4 | bin/skeyinfo | |
5 | bin/skeyinit | 5 | bin/skeyinit | |
6 | bin/skeyprune | 6 | bin/skeyprune | |
7 | include/rmd160.h | 7 | include/rmd160.h | |
8 | include/sha1.h | 8 | include/sha1.h | |
9 | include/skey.h | 9 | include/skey.h | |
10 | lib/libskey.a | 10 | lib/libskey.a | |
11 | man/man1/skey.1 | 11 | man/man1/skey.1 | |
12 | man/man1/skeyaudit.1 | 12 | man/man1/skeyaudit.1 | |
13 | man/man1/skeyinfo.1 | 13 | man/man1/skeyinfo.1 | |
14 | man/man1/skeyinit.1 | 14 | man/man1/skeyinit.1 | |
15 | man/man8/skeyprune.1 | 15 | man/man8/skeyprune.8 | |
16 | share/examples/skey/skeykeys | 16 | share/examples/skey/skeykeys | |
17 | @dirrm share/examples/skey | 17 | @dirrm share/examples/skey |
@@ -1,8 +1,14 @@ | @@ -1,8 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.8 2008/12/13 13:26:19 obache Exp $ | 1 | $NetBSD: distinfo,v 1.9 2008/12/13 13:58:31 obache Exp $ | |
2 | 2 | |||
3 | SHA1 (skey-1.1.5.tar.bz2) = d55fb286098900cdf3eb6b174a720a06c722312a | 3 | SHA1 (skey-1.1.5.tar.bz2) = d55fb286098900cdf3eb6b174a720a06c722312a | |
4 | RMD160 (skey-1.1.5.tar.bz2) = 33d97cbcd6dbc91bdca5b27056d51d1f5d06b68d | 4 | RMD160 (skey-1.1.5.tar.bz2) = 33d97cbcd6dbc91bdca5b27056d51d1f5d06b68d | |
5 | Size (skey-1.1.5.tar.bz2) = 61911 bytes | 5 | Size (skey-1.1.5.tar.bz2) = 61911 bytes | |
6 | SHA1 (patch-aa) = 9ffb4f7c3b562ff5d50ea396ac130d7056b4a216 | 6 | SHA1 (patch-aa) = 78a4f791c5378d0ce2df8a92203859a34bc92bfe | |
7 | SHA1 (patch-ab) = 69d8f92968b3ebffc9b05fe7af1cde7e9d116587 | 7 | SHA1 (patch-ab) = 69d8f92968b3ebffc9b05fe7af1cde7e9d116587 | |
8 | SHA1 (patch-ac) = f3e9a6ebb7ac22116c8d8e6fe8ca0db7f8d37051 | 8 | SHA1 (patch-ac) = f3e9a6ebb7ac22116c8d8e6fe8ca0db7f8d37051 | |
9 | SHA1 (patch-ad) = d1c43f17b52a82679ec554296a853196d8469bc7 | |||
10 | SHA1 (patch-ae) = 344026ab4acffe57aa4d0545a791f845ecafda4b | |||
11 | SHA1 (patch-af) = a2f46213568bb61cebbca658cf8bdb17e4150361 | |||
12 | SHA1 (patch-ag) = 43db09ab58733b773ed30015984f724ba80d0e11 | |||
13 | SHA1 (patch-ah) = dec25286d50cbe0181b9b4bc99bd92556e573b5e | |||
14 | SHA1 (patch-ai) = ad90b480047a22b25bc2c6e416a224e892e501c9 |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-aa,v 1.4 2008/12/13 13:26:19 obache Exp $ | 1 | $NetBSD: patch-aa,v 1.5 2008/12/13 13:58:31 obache Exp $ | |
2 | 2 | |||
3 | --- Makefile.in.orig 2001-05-10 11:10:49.000000000 -0500 | 3 | --- Makefile.in.orig 2001-05-10 16:10:49.000000000 +0000 | |
4 | +++ Makefile.in | 4 | +++ Makefile.in | |
5 | @@ -18,15 +18,18 @@ LIBS=@LIBS@ | 5 | @@ -18,15 +18,18 @@ LIBS=@LIBS@ | |
6 | AR=@AR@ | 6 | AR=@AR@ | |
7 | RANLIB=@RANLIB@ | 7 | RANLIB=@RANLIB@ | |
8 | INSTALL=@INSTALL@ | 8 | INSTALL=@INSTALL@ | |
9 | -INSTALL_PROGRAM=${INSTALL} -c -s -m 555 | 9 | -INSTALL_PROGRAM=${INSTALL} -c -s -m 555 | |
10 | -INSTALL_MAN=${INSTALL} -c -m 444 | 10 | -INSTALL_MAN=${INSTALL} -c -m 444 | |
11 | -INSTALL_SCRIPT=${INSTALL} -c -m 555 | 11 | -INSTALL_SCRIPT=${INSTALL} -c -m 555 | |
12 | -INSTALL_DATA=${INSTALL} -c -m 444 | 12 | -INSTALL_DATA=${INSTALL} -c -m 444 | |
13 | +INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} | 13 | +INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} | |
14 | +INSTALL_MAN=${BSD_INSTALL_MAN} | 14 | +INSTALL_MAN=${BSD_INSTALL_MAN} | |
15 | +INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT} | 15 | +INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT} | |
16 | +INSTALL_DATA=${BSD_INSTALL_DATA} | 16 | +INSTALL_DATA=${BSD_INSTALL_DATA} | |
@@ -45,22 +45,24 @@ $NetBSD: patch-aa,v 1.4 2008/12/13 13:26 | @@ -45,22 +45,24 @@ $NetBSD: patch-aa,v 1.4 2008/12/13 13:26 | |||
45 | install: ${TARGETS} | 45 | install: ${TARGETS} | |
46 | - $(INSTALL) -d $(DESTDIR)$(bindir) | 46 | - $(INSTALL) -d $(DESTDIR)$(bindir) | |
47 | - $(INSTALL) -d $(DESTDIR)$(libdir) | 47 | - $(INSTALL) -d $(DESTDIR)$(libdir) | |
48 | - $(INSTALL) -d $(DESTDIR)$(mandir) | 48 | - $(INSTALL) -d $(DESTDIR)$(mandir) | |
49 | - $(INSTALL) -d $(DESTDIR)$(etcdir) | 49 | - $(INSTALL) -d $(DESTDIR)$(etcdir) | |
50 | - $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)1 | 50 | - $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)1 | |
51 | - $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)8 | 51 | - $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)8 | |
52 | - $(INSTALL) -d $(DESTDIR)$(includedir) | 52 | - $(INSTALL) -d $(DESTDIR)$(includedir) | |
53 | - $(INSTALL) -d $(DESTDIR)$(sysconfdir) | 53 | - $(INSTALL) -d $(DESTDIR)$(sysconfdir) | |
54 | + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/examples/skey | 54 | + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/examples/skey | |
55 | ${INSTALL_DATA} libskey.a $(DESTDIR)$(libdir) | 55 | ${INSTALL_DATA} libskey.a $(DESTDIR)$(libdir) | |
56 | ${INSTALL_DATA} ${HDRS} $(DESTDIR)$(includedir) | 56 | ${INSTALL_DATA} ${HDRS} $(DESTDIR)$(includedir) | |
57 | @for target in ${TARGETS}; do \ | 57 | @for target in ${TARGETS}; do \ | |
58 | @@ -107,7 +110,7 @@ install: ${TARGETS} | 58 | @@ -106,8 +109,8 @@ install: ${TARGETS} | |
59 | ${INSTALL_MAN} skeyinit.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinit.1 | |||
59 | ${INSTALL_MAN} skeyinfo.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinfo.1 | 60 | ${INSTALL_MAN} skeyinfo.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyinfo.1 | |
60 | ${INSTALL_MAN} skeyaudit.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyaudit.1 | 61 | ${INSTALL_MAN} skeyaudit.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/skeyaudit.1 | |
61 | ${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.1 | 62 | - ${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.1 | |
62 | - ${TOUCH} ${DESTDIR}${sysconfdir}/skeykeys | 63 | - ${TOUCH} ${DESTDIR}${sysconfdir}/skeykeys | |
64 | + ${INSTALL_MAN} skeyprune.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/skeyprune.8 | |||
63 | + ${TOUCH} ${DESTDIR}$(prefix)/share/examples/skey/skeykeys | 65 | + ${TOUCH} ${DESTDIR}$(prefix)/share/examples/skey/skeykeys | |
64 | 66 | |||
65 | uninstallall: uninstall | 67 | uninstallall: uninstall | |
66 | -rm -f $(DESTDIR)$(sysconfdir)/skeykeys | 68 | -rm -f $(DESTDIR)$(sysconfdir)/skeykeys |
$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 */
$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"
$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"
/********************************************************************/
$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
$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))))
$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 */