Tue May 26 13:56:16 2015 UTC ()
Ensure we can find OpenSSL after rpath changes.


(jperkin)
diff -r1.82 -r1.83 pkgsrc/security/mit-krb5/Makefile
diff -r1.52 -r1.53 pkgsrc/security/mit-krb5/distinfo
diff -r0 -r1.1 pkgsrc/security/mit-krb5/patches/patch-configure.in
cvs diff -r1.82 -r1.83 pkgsrc/security/mit-krb5/Makefile (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/Makefile 2015/03/22 20:09:09 1.82
+++ pkgsrc/security/mit-krb5/Makefile 2015/05/26 13:56:16 1.83
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.82 2015/03/22 20:09:09 joerg Exp $ 1# $NetBSD: Makefile,v 1.83 2015/05/26 13:56:16 jperkin Exp $
2 2
3DISTNAME= krb5-1.10.7 3DISTNAME= krb5-1.10.7
4PKGNAME= mit-${DISTNAME} 4PKGNAME= mit-${DISTNAME}
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/ 7MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/
8EXTRACT_SUFX= .tar 8EXTRACT_SUFX= .tar
9DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX}
10 10
11PATCH_SITES= http://web.mit.edu/kerberos/advisories/ 11PATCH_SITES= http://web.mit.edu/kerberos/advisories/
12PATCHFILES= 2014-001-patch.txt 12PATCHFILES= 2014-001-patch.txt
13 13
14MAINTAINER= tez@NetBSD.org 14MAINTAINER= tez@NetBSD.org
@@ -35,26 +35,27 @@ GNU_CONFIGURE= yes @@ -35,26 +35,27 @@ GNU_CONFIGURE= yes
35MIT_KRB5_STATEDIR?= ${VARBASE} 35MIT_KRB5_STATEDIR?= ${VARBASE}
36FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR} 36FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR}
37 37
38BUILD_DEFS+= VARBASE 38BUILD_DEFS+= VARBASE
39 39
40CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR} 40CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR}
41CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 41CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
42CONFIGURE_ARGS+= --enable-shared 42CONFIGURE_ARGS+= --enable-shared
43CONFIGURE_ARGS+= --enable-dns-for-realm 43CONFIGURE_ARGS+= --enable-dns-for-realm
44CONFIGURE_ARGS+= --enable-kdc-replay-cache 44CONFIGURE_ARGS+= --enable-kdc-replay-cache
45CONFIGURE_ARGS+= --disable-thread-support 45CONFIGURE_ARGS+= --disable-thread-support
46CONFIGURE_ARGS+= --without-tcl 46CONFIGURE_ARGS+= --without-tcl
47CONFIGURE_ARGS+= --enable-pkgsrc-libtool 47CONFIGURE_ARGS+= --enable-pkgsrc-libtool
 48CONFIGURE_ENV+= BUILDLINK_PREFIX_OPENSSL=${BUILDLINK_PREFIX.openssl:Q}
48MAKE_ENV+= ROOT_USER=${ROOT_USER} 49MAKE_ENV+= ROOT_USER=${ROOT_USER}
49LIBS.SunOS= -lrt 50LIBS.SunOS= -lrt
50 51
51PATCH_DIST_ARGS= -d ${WRKSRC} -p2 52PATCH_DIST_ARGS= -d ${WRKSRC} -p2
52 53
53INFO_FILES= YES 54INFO_FILES= YES
54 55
55OWN_DIRS_PERMS= ${MIT_KRB5_STATEDIR}/krb5kdc \ 56OWN_DIRS_PERMS= ${MIT_KRB5_STATEDIR}/krb5kdc \
56 ${ROOT_USER} ${ROOT_GROUP} 0700 57 ${ROOT_USER} ${ROOT_GROUP} 0700
57RCD_SCRIPTS= kadmind kdc 58RCD_SCRIPTS= kadmind kdc
58 59
59INSTALLATION_DIRS= bin include/gssapi include/gssrpc ${PKGINFODIR} \ 60INSTALLATION_DIRS= bin include/gssapi include/gssrpc ${PKGINFODIR} \
60 ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ 61 ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
cvs diff -r1.52 -r1.53 pkgsrc/security/mit-krb5/distinfo (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/distinfo 2015/03/22 20:09:09 1.52
+++ pkgsrc/security/mit-krb5/distinfo 2015/05/26 13:56:16 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.52 2015/03/22 20:09:09 joerg Exp $ 1$NetBSD: distinfo,v 1.53 2015/05/26 13:56:16 jperkin Exp $
2 2
3SHA1 (2014-001-patch.txt) = 919402bf3b7c289e847e9adc03a7c30f26966769 3SHA1 (2014-001-patch.txt) = 919402bf3b7c289e847e9adc03a7c30f26966769
4RMD160 (2014-001-patch.txt) = a39c8e12e79ab273d562b04c1e7811c414dd70e8 4RMD160 (2014-001-patch.txt) = a39c8e12e79ab273d562b04c1e7811c414dd70e8
5Size (2014-001-patch.txt) = 592 bytes 5Size (2014-001-patch.txt) = 592 bytes
6SHA1 (krb5-1.10.7-signed.tar) = 982087d617d0b038676bbe8030047421683d508b 6SHA1 (krb5-1.10.7-signed.tar) = 982087d617d0b038676bbe8030047421683d508b
7RMD160 (krb5-1.10.7-signed.tar) = 16e3a2cdeb410d84d055431679eb81851ae685e9 7RMD160 (krb5-1.10.7-signed.tar) = 16e3a2cdeb410d84d055431679eb81851ae685e9
8Size (krb5-1.10.7-signed.tar) = 11632640 bytes 8Size (krb5-1.10.7-signed.tar) = 11632640 bytes
9SHA1 (patch-2015-001-patch-r110) = 17343091958096cfb45caae490018e60c79430cf 9SHA1 (patch-2015-001-patch-r110) = 17343091958096cfb45caae490018e60c79430cf
10SHA1 (patch-CVE-2014-4341) = 97b316fb3c5dfc626827a13baa5dcf623d67da3c 10SHA1 (patch-CVE-2014-4341) = 97b316fb3c5dfc626827a13baa5dcf623d67da3c
11SHA1 (patch-CVE-2014-4343) = e7d4604d81671f71c9cd9461b65a9e87b5982baa 11SHA1 (patch-CVE-2014-4343) = e7d4604d81671f71c9cd9461b65a9e87b5982baa
12SHA1 (patch-CVE-2014-4344) = b7ae530beaffcf1c095e6f94bdf608b7a140b064 12SHA1 (patch-CVE-2014-4344) = b7ae530beaffcf1c095e6f94bdf608b7a140b064
13SHA1 (patch-CVE-2014-5351) = 2948e2a9f7adb97b8cb70bb8f0043c45e5822465 13SHA1 (patch-CVE-2014-5351) = 2948e2a9f7adb97b8cb70bb8f0043c45e5822465
14SHA1 (patch-CVE-2014-5353) = 93217bb5f249b153b8dcb0be07a565ee8cca879a 14SHA1 (patch-CVE-2014-5353) = 93217bb5f249b153b8dcb0be07a565ee8cca879a
@@ -18,18 +18,19 @@ SHA1 (patch-ad) = b56a7218007560470179dd @@ -18,18 +18,19 @@ SHA1 (patch-ad) = b56a7218007560470179dd
18SHA1 (patch-ae) = c7395b9de5baf6612b8787fad55dbc051a680bfd 18SHA1 (patch-ae) = c7395b9de5baf6612b8787fad55dbc051a680bfd
19SHA1 (patch-af) = 1edab3a5f7eb6a7c5dc287e94ae4401c389dbabf 19SHA1 (patch-af) = 1edab3a5f7eb6a7c5dc287e94ae4401c389dbabf
20SHA1 (patch-ag) = a63d8929b02c41423123ee722d02af00645eda2c 20SHA1 (patch-ag) = a63d8929b02c41423123ee722d02af00645eda2c
21SHA1 (patch-ah) = 4e40f36e8969974b3c2f68b2e3636921133c57ba 21SHA1 (patch-ah) = 4e40f36e8969974b3c2f68b2e3636921133c57ba
22SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6 22SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6
23SHA1 (patch-ak) = 19d9b15048a5920ee15c82b33da50c40cf400e46 23SHA1 (patch-ak) = 19d9b15048a5920ee15c82b33da50c40cf400e46
24SHA1 (patch-al) = 7445639b82eadf9b1feb1448c1654fa6ddc937aa 24SHA1 (patch-al) = 7445639b82eadf9b1feb1448c1654fa6ddc937aa
25SHA1 (patch-cf) = 806b089d3b12ea9a17c6caab59cbdeb6ec17bbc3 25SHA1 (patch-cf) = 806b089d3b12ea9a17c6caab59cbdeb6ec17bbc3
26SHA1 (patch-cg) = 30b1e8943b0cbe67f37bac6883f4bdd82776e6d1 26SHA1 (patch-cg) = 30b1e8943b0cbe67f37bac6883f4bdd82776e6d1
27SHA1 (patch-ch) = 0f7f45aeb52907b52a2b143c3a2e36a7656c68c5 27SHA1 (patch-ch) = 0f7f45aeb52907b52a2b143c3a2e36a7656c68c5
28SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970 28SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970
29SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b 29SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b
30SHA1 (patch-ck) = 6a483684c68f045bf6f8e165a8935338af7422db 30SHA1 (patch-ck) = 6a483684c68f045bf6f8e165a8935338af7422db
 31SHA1 (patch-configure.in) = 66fc241ec9d6339268dc37548494ef87b09bc521
31SHA1 (patch-kadmin_dbutil_dump.c) = 4b49c116dbed9e6be4a0bf0a731c3ae82808d82e 32SHA1 (patch-kadmin_dbutil_dump.c) = 4b49c116dbed9e6be4a0bf0a731c3ae82808d82e
32SHA1 (patch-lib_apputils_net-server.c) = 4f54924cca60e75b1b835d35c5eeb96d9f95a90e 33SHA1 (patch-lib_apputils_net-server.c) = 4f54924cca60e75b1b835d35c5eeb96d9f95a90e
33SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7 34SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7
34SHA1 (patch-util_k5ev_verto-k5ev.c) = 79a2be64fa4f9b0dc3a333271e8a3ff7944e5c18 35SHA1 (patch-util_k5ev_verto-k5ev.c) = 79a2be64fa4f9b0dc3a333271e8a3ff7944e5c18
35SHA1 (patch-util_ss_Makefile.in) = 4ec8cd8640e0631b3c6738693b5318aadc9ef278 36SHA1 (patch-util_ss_Makefile.in) = 4ec8cd8640e0631b3c6738693b5318aadc9ef278
File Added: pkgsrc/security/mit-krb5/patches/Attic/patch-configure.in
$NetBSD: patch-configure.in,v 1.1 2015/05/26 13:56:16 jperkin Exp $

Find the correct libcrypto.

--- configure.in.orig	2013-11-06 20:52:23.000000000 +0000
+++ configure.in
@@ -202,7 +202,7 @@ AC_MSG_RESULT("pkinit will use \'$withva
 ], withval=$PKINIT_CRYPTO_IMPL)
 case "$withval" in
 builtin|openssl)
-  AC_CHECK_LIB(crypto, PKCS7_get_signer_info, PKINIT_CRYPTO_IMPL_LIBS=-lcrypto)
+  AC_CHECK_LIB(crypto, PKCS7_get_signer_info, PKINIT_CRYPTO_IMPL_LIBS="-L${BUILDLINK_PREFIX_OPENSSL}/lib -lcrypto")
   PKINIT_CRYPTO_IMPL=openssl
   ;;
 nss)