Mon Jul 16 19:12:33 2012 UTC ()
Changes 1.10.2:
This is a bugfix release.
* Fix an interop issue with Windows Server 2008 R2 Read-Only Domain Controllers.
* Update a workaround for a glibc bug that would cause DNS PTR queries to occur
  even when rdns = false.
* Fix a kadmind denial of service issue (null pointer dereference), which could
  only be triggered by an administrator with the "create" privilege.
  [CVE-2012-1013]

Changes 1.10.1:
This is a bugfix release.
* Fix access controls for KDB string attributes [CVE-2012-1012]
* Make the ASN.1 encoding of key version numbers interoperate with Windows
  Read-Only Domain Controllers
* Avoid generating spurious password expiry warnings in cases where the KDC
  sends an account expiry time without a password expiry time.


(adam)
diff -r1.57 -r1.58 pkgsrc/security/mit-krb5/Makefile
diff -r1.15 -r1.16 pkgsrc/security/mit-krb5/PLIST
diff -r1.34 -r1.35 pkgsrc/security/mit-krb5/distinfo
diff -r1.3 -r1.4 pkgsrc/security/mit-krb5/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/security/mit-krb5/patches/patch-ad
diff -r1.5 -r1.6 pkgsrc/security/mit-krb5/patches/patch-al
diff -r1.4 -r1.5 pkgsrc/security/mit-krb5/patches/patch-af
diff -r1.6 -r1.7 pkgsrc/security/mit-krb5/patches/patch-ag
diff -r1.2 -r1.3 pkgsrc/security/mit-krb5/patches/patch-ah
diff -r1.2 -r1.3 pkgsrc/security/mit-krb5/patches/patch-ak
diff -r1.1 -r0 pkgsrc/security/mit-krb5/patches/patch-ce
diff -r1.1 -r0 pkgsrc/security/mit-krb5/patches/patch-lib_kadm5_srv_svr__principal.c
diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/patch-cf
diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/patch-cg
diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/patch-ch
diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/patch-ck
diff -r0 -r1.1 pkgsrc/security/mit-krb5/patches/patch-util_k5ev_verto-k5ev.c
cvs diff -r1.57 -r1.58 pkgsrc/security/mit-krb5/Makefile (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/Makefile 2012/06/06 18:17:46 1.57
+++ pkgsrc/security/mit-krb5/Makefile 2012/07/16 19:12:33 1.58
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1# $NetBSD: Makefile,v 1.57 2012/06/06 18:17:46 tez Exp $ 1# $NetBSD: Makefile,v 1.58 2012/07/16 19:12:33 adam Exp $
2 2
3DISTNAME= krb5-1.8.6 3DISTNAME= krb5-1.10.2
4PKGNAME= mit-${DISTNAME} 4PKGNAME= mit-${DISTNAME}
5PKGREVISION= 1 
6CATEGORIES= security 5CATEGORIES= security
7MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/1.8/ 6MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/
8EXTRACT_SUFX= .tar 7EXTRACT_SUFX= .tar
9DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX}
10 9
11#PATCH_SITES= http://web.mit.edu/kerberos/advisories/ 10#PATCH_SITES= http://web.mit.edu/kerberos/advisories/
12#PATCHFILES= 2011-006-patch-r18.txt 11#PATCHFILES= 2011-006-patch-r18.txt
13 12
14MAINTAINER= tez@NetBSD.org 13MAINTAINER= tez@NetBSD.org
15HOMEPAGE= http://web.mit.edu/kerberos/ 14HOMEPAGE= http://web.mit.edu/kerberos/
16COMMENT= MIT Kerberos 5 authentication system 15COMMENT= MIT Kerberos 5 authentication system
17 16
18PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
19MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
20 19
21WRKSRC= ${WRKDIR}/${DISTNAME}/src 20WRKSRC= ${WRKDIR}/${DISTNAME}/src
22 21
23BUILD_TARGET= generate-files-mac all 22BUILD_TARGET= generate-files-mac all
24 23
25.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
26 25
27CONFLICTS+= heimdal-[0-9]* 26CONFLICTS+= heimdal-[0-9]*
28CONFLICTS+= kth-krb4-[0-9]* 27CONFLICTS+= kth-krb4-[0-9]*
29 28
 29USE_LANGUAGES= c c++
30USE_LIBTOOL= yes 30USE_LIBTOOL= yes
31USE_TOOLS+= autoconf gmake m4 perl yacc 31USE_TOOLS+= autoconf gmake m4 perl yacc
32MAKE_PROGRAM= gmake 32MAKE_PROGRAM= gmake
33GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
34 34
35# The actual KDC databases are stored in ${MIT_KRB5_STATEDIR}/krb5kdc. 35# The actual KDC databases are stored in ${MIT_KRB5_STATEDIR}/krb5kdc.
36MIT_KRB5_STATEDIR?= ${VARBASE} 36MIT_KRB5_STATEDIR?= ${VARBASE}
37FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR} 37FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR}
38 38
39BUILD_DEFS+= VARBASE 39BUILD_DEFS+= VARBASE
40 40
41CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR} 41CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR}
42CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 42CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
cvs diff -r1.15 -r1.16 pkgsrc/security/mit-krb5/PLIST (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/PLIST 2012/02/26 13:14:19 1.15
+++ pkgsrc/security/mit-krb5/PLIST 2012/07/16 19:12:33 1.16
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1@comment $NetBSD: PLIST,v 1.15 2012/02/26 13:14:19 adam Exp $ 1@comment $NetBSD: PLIST,v 1.16 2012/07/16 19:12:33 adam Exp $
2bin/compile_et 2bin/compile_et
3bin/gss-client 3bin/gss-client
4bin/k5srvutil 4bin/k5srvutil
5bin/kadmin 5bin/kadmin
6bin/kdestroy 6bin/kdestroy
7bin/kinit 7bin/kinit
8bin/klist 8bin/klist
9bin/kpasswd 9bin/kpasswd
10bin/krb5-config 10bin/krb5-config
11bin/ksu 11bin/ksu
 12bin/kswitch
12bin/ktutil 13bin/ktutil
13bin/kvno 14bin/kvno
14bin/sclient 15bin/sclient
15bin/sim_client 16bin/sim_client
16bin/uuclient 17bin/uuclient
17include/com_err.h 18include/com_err.h
18include/gssapi.h 19include/gssapi.h
19include/gssapi/gssapi.h 20include/gssapi/gssapi.h
20include/gssapi/gssapi_ext.h 21include/gssapi/gssapi_ext.h
21include/gssapi/gssapi_generic.h 22include/gssapi/gssapi_generic.h
22include/gssapi/gssapi_krb5.h 23include/gssapi/gssapi_krb5.h
23include/gssapi/mechglue.h 24include/gssapi/mechglue.h
24include/gssrpc/auth.h 25include/gssrpc/auth.h
@@ -32,61 +33,72 @@ include/gssrpc/pmap_prot.h @@ -32,61 +33,72 @@ include/gssrpc/pmap_prot.h
32include/gssrpc/pmap_rmt.h 33include/gssrpc/pmap_rmt.h
33include/gssrpc/rename.h 34include/gssrpc/rename.h
34include/gssrpc/rpc.h 35include/gssrpc/rpc.h
35include/gssrpc/rpc_msg.h 36include/gssrpc/rpc_msg.h
36include/gssrpc/svc.h 37include/gssrpc/svc.h
37include/gssrpc/svc_auth.h 38include/gssrpc/svc_auth.h
38include/gssrpc/types.h 39include/gssrpc/types.h
39include/gssrpc/xdr.h 40include/gssrpc/xdr.h
40include/kadm5/admin.h 41include/kadm5/admin.h
41include/kadm5/chpass_util_strings.h 42include/kadm5/chpass_util_strings.h
42include/kadm5/kadm_err.h 43include/kadm5/kadm_err.h
43include/kdb.h 44include/kdb.h
44include/krb5.h 45include/krb5.h
 46include/krb5/kadm5_hook_plugin.h
45include/krb5/krb5.h 47include/krb5/krb5.h
46include/krb5/locate_plugin.h 48include/krb5/locate_plugin.h
 49include/krb5/plugin.h
 50include/krb5/preauth_plugin.h
 51include/krb5/pwqual_plugin.h
47include/profile.h 52include/profile.h
 53include/verto-module.h
 54include/verto.h
48info/krb5-admin.info 55info/krb5-admin.info
49info/krb5-install.info 56info/krb5-install.info
50info/krb5-user.info 57info/krb5-user.info
51lib/krb5/plugins/kdb/libdb2.la 58lib/krb5/plugins/kdb/libdb2.la
52lib/krb5/plugins/preauth/libencrypted_challenge.la 
53lib/krb5/plugins/preauth/libpkinit.la 59lib/krb5/plugins/preauth/libpkinit.la
54lib/libcom_err.la 60lib/libcom_err.la
55lib/libgssapi_krb5.la 61lib/libgssapi_krb5.la
56lib/libgssrpc.la 62lib/libgssrpc.la
57lib/libk5crypto.la 63lib/libk5crypto.la
58lib/libkadm5clnt.la 64lib/libkadm5clnt.la
59lib/libkadm5clnt_mit.la 65lib/libkadm5clnt_mit.la
60lib/libkadm5srv.la 66lib/libkadm5srv.la
61lib/libkadm5srv_mit.la 67lib/libkadm5srv_mit.la
62lib/libkdb5.la 68lib/libkdb5.la
63lib/libkrb5.la 69lib/libkrb5.la
64lib/libkrb5support.la 70lib/libkrb5support.la
 71lib/libverto-k5ev.la
 72lib/libverto.la
65man/man1/compile_et.1 73man/man1/compile_et.1
66man/man1/k5srvutil.1 74man/man1/k5srvutil.1
67man/man1/kadmin.1 75man/man1/kadmin.1
68man/man1/kdestroy.1 76man/man1/kdestroy.1
69man/man1/kerberos.1 77man/man1/kerberos.1
70man/man1/kinit.1 78man/man1/kinit.1
71man/man1/klist.1 79man/man1/klist.1
72man/man1/kpasswd.1 80man/man1/kpasswd.1
73man/man1/krb5-config.1 81man/man1/krb5-config.1
74man/man1/krb5-send-pr.1 82man/man1/krb5-send-pr.1
75man/man1/ksu.1 83man/man1/ksu.1
 84man/man1/kswitch.1
76man/man1/ktutil.1 85man/man1/ktutil.1
77man/man1/kvno.1 86man/man1/kvno.1
78man/man1/sclient.1 87man/man1/sclient.1
 88man/man5/.k5identity.5
79man/man5/.k5login.5 89man/man5/.k5login.5
 90man/man5/k5identity.5
 91man/man5/k5login.5
80man/man5/kdc.conf.5 92man/man5/kdc.conf.5
81man/man5/krb5.conf.5 93man/man5/krb5.conf.5
82man/man8/kadmin.local.8 94man/man8/kadmin.local.8
83man/man8/kadmind.8 95man/man8/kadmind.8
84man/man8/kdb5_util.8 96man/man8/kdb5_util.8
85man/man8/kprop.8 97man/man8/kprop.8
86man/man8/kpropd.8 98man/man8/kpropd.8
87man/man8/kproplog.8 99man/man8/kproplog.8
88man/man8/krb5kdc.8 100man/man8/krb5kdc.8
89man/man8/sserver.8 101man/man8/sserver.8
90sbin/gss-server 102sbin/gss-server
91sbin/kadmin.local 103sbin/kadmin.local
92sbin/kadmind 104sbin/kadmind
@@ -97,13 +109,14 @@ sbin/kproplog @@ -97,13 +109,14 @@ sbin/kproplog
97sbin/krb5-send-pr 109sbin/krb5-send-pr
98sbin/krb5kdc 110sbin/krb5kdc
99sbin/sim_server 111sbin/sim_server
100sbin/sserver 112sbin/sserver
101sbin/uuserver 113sbin/uuserver
102share/et/et_c.awk 114share/et/et_c.awk
103share/et/et_h.awk 115share/et/et_h.awk
104share/examples/krb5/kdc.conf 116share/examples/krb5/kdc.conf
105share/examples/krb5/krb5.conf 117share/examples/krb5/krb5.conf
106share/examples/krb5/services.append 118share/examples/krb5/services.append
107share/examples/rc.d/kadmind 119share/examples/rc.d/kadmind
108share/examples/rc.d/kdc 120share/examples/rc.d/kdc
109share/gnats/mit 121share/gnats/mit
 122share/locale/en_US/LC_MESSAGES/mit-krb5.mo
cvs diff -r1.34 -r1.35 pkgsrc/security/mit-krb5/distinfo (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/distinfo 2012/06/06 18:17:46 1.34
+++ pkgsrc/security/mit-krb5/distinfo 2012/07/16 19:12:33 1.35
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1$NetBSD: distinfo,v 1.34 2012/06/06 18:17:46 tez Exp $ 1$NetBSD: distinfo,v 1.35 2012/07/16 19:12:33 adam Exp $
2 2
3SHA1 (krb5-1.8.6-signed.tar) = 0a1356c6680578f683b6ffd33044f6f02d69b315 3SHA1 (krb5-1.10.2-signed.tar) = 8b6e2c5bf0c65aacd368b3698add7888f2a7332d
4RMD160 (krb5-1.8.6-signed.tar) = 3faad0306482f99c1467d045767090d298a20ce4 4RMD160 (krb5-1.10.2-signed.tar) = 7d8c4a04389695082fd5c95767e49ca560ad953c
5Size (krb5-1.8.6-signed.tar) = 11950080 bytes 5Size (krb5-1.10.2-signed.tar) = 11520000 bytes
6SHA1 (patch-aa) = cd8cdc594bc872d641ceaba0aa0d91b5f1caf2ae 6SHA1 (patch-aa) = 941848a1773dfbe51dff3134d4b8504a850a958d
7SHA1 (patch-ad) = 49a9429d163adb872b1c97ade8ed0e13d8eec3cb 7SHA1 (patch-ad) = b56a7218007560470179dd811c84b8c690c966ac
8SHA1 (patch-ae) = c7395b9de5baf6612b8787fad55dbc051a680bfd 8SHA1 (patch-ae) = c7395b9de5baf6612b8787fad55dbc051a680bfd
9SHA1 (patch-af) = 245b6dea2eff9da9911ac6eabf2ebdbe7fdac305 9SHA1 (patch-af) = 1edab3a5f7eb6a7c5dc287e94ae4401c389dbabf
10SHA1 (patch-ag) = f8daf2dd247365d506e117cb49c5d0f50e9822ed 10SHA1 (patch-ag) = 48c0ce35324f5757134c1c5da666bb0cb7a3aaa6
11SHA1 (patch-ah) = 922542765f73dc25c464715c29c8d63c9cd9c718 11SHA1 (patch-ah) = 4e40f36e8969974b3c2f68b2e3636921133c57ba
12SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6 12SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6
13SHA1 (patch-ak) = 9ba29870084dfcd3f6f66e801b42d6577cda004a 13SHA1 (patch-ak) = 19d9b15048a5920ee15c82b33da50c40cf400e46
14SHA1 (patch-al) = 8660b932c999d5b3ac63be27fc1013cceff368b9 14SHA1 (patch-al) = 7445639b82eadf9b1feb1448c1654fa6ddc937aa
15SHA1 (patch-ce) = 72ec322894facfd75a010f82372cfa9ef96afb5f 15SHA1 (patch-cf) = 806b089d3b12ea9a17c6caab59cbdeb6ec17bbc3
16SHA1 (patch-cf) = 651f223a5c3dff566d0b5c5279d47538576c5979 16SHA1 (patch-cg) = 30b1e8943b0cbe67f37bac6883f4bdd82776e6d1
17SHA1 (patch-cg) = 8c89dd960ebbe444534a849827c78f077cce499b 17SHA1 (patch-ch) = 0f7f45aeb52907b52a2b143c3a2e36a7656c68c5
18SHA1 (patch-ch) = 0e36012b43c498b8920f204bab2ba9a68f8c851a 
19SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970 18SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970
20SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b 19SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b
21SHA1 (patch-ck) = 87b7704ca9de02880ef8b3dbb097e87d0252bd4b 20SHA1 (patch-ck) = 37bfef80329f8ae0fb35c35e70032a0040ba5591
22SHA1 (patch-lib_kadm5_srv_svr__principal.c) = fd8f677ece32ae5ca1b5d66932e79115eb4d982d 
23SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7 21SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7
 22SHA1 (patch-util_k5ev_verto-k5ev.c) = e8f78ec46543793b284c321a6b7362af9f527489
cvs diff -r1.3 -r1.4 pkgsrc/security/mit-krb5/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-aa 2011/03/22 23:31:04 1.3
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-aa 2012/07/16 19:12:33 1.4
@@ -1,48 +1,48 @@ @@ -1,48 +1,48 @@
1$NetBSD: patch-aa,v 1.3 2011/03/22 23:31:04 tez Exp $ 1$NetBSD: patch-aa,v 1.4 2012/07/16 19:12:33 adam Exp $
2 2
3Don't make sunpro warnings into errors (warnings are seen in gcc too) 3Don't make sunpro warnings into errors (warnings are seen in gcc too)
4Add --enable-pkgsrc-libtool option 4Add --enable-pkgsrc-libtool option
5 5
6--- aclocal.m4.orig 2009-11-22 11:00:45.000000000 -0600 6--- aclocal.m4.orig 2012-05-31 23:49:44.000000000 +0000
7+++ aclocal.m4 2011-01-07 17:00:12.222547100 -0600 7+++ aclocal.m4
8@@ -620,7 +620,7 @@ 8@@ -611,7 +611,7 @@ else
9 # works, but it also means that declaration-in-code warnings won't 9 # works, but it also means that declaration-in-code warnings won't
10 # be issued. 10 # be issued.
11 # -v -fd -errwarn=E_DECLARATION_IN_CODE ... 11 # -v -fd -errwarn=E_DECLARATION_IN_CODE ...
12- WARN_CFLAGS="-errtags=yes -errwarn=E_BAD_PTR_INT_COMBINATION,E_BAD_PTR_INT_COMB_ARG,E_PTR_TO_VOID_IN_ARITHMETIC,E_NO_IMPLICIT_DECL_ALLOWED,E_ATTRIBUTE_PARAM_UNDEFINED" 12- WARN_CFLAGS="-errtags=yes -errwarn=E_BAD_PTR_INT_COMBINATION,E_BAD_PTR_INT_COMB_ARG,E_PTR_TO_VOID_IN_ARITHMETIC,E_NO_IMPLICIT_DECL_ALLOWED,E_ATTRIBUTE_PARAM_UNDEFINED"
13+ WARN_CFLAGS="-errtags=yes" 13+ WARN_CFLAGS="-errtags=yes"
14 WARN_CXXFLAGS="-errtags=yes +w +w2 -xport64" 14 WARN_CXXFLAGS="-errtags=yes +w +w2 -xport64"
15 fi 15 fi
16 fi 16 fi
17@@ -1090,6 +1090,9 @@ 17@@ -1038,6 +1038,9 @@ AC_SUBST(SHLIBVEXT)
18 AC_SUBST(SHLIBSEXT) 18 AC_SUBST(SHLIBSEXT)
19 AC_SUBST(DEPLIBEXT) 19 AC_SUBST(DEPLIBEXT)
20 AC_SUBST(PFLIBEXT) 20 AC_SUBST(PFLIBEXT)
21+AC_SUBST(LALIBEXT) 21+AC_SUBST(LALIBEXT)
22+AC_SUBST(LALIB_EXPFLAGS) 22+AC_SUBST(LALIB_EXPFLAGS)
23+AC_SUBST(LIBTOOL_TAIL) 23+AC_SUBST(LIBTOOL_TAIL)
24 AC_SUBST(LIBINSTLIST) 24 AC_SUBST(LIBINSTLIST)
25 AC_SUBST(DYNOBJEXT) 25 AC_SUBST(DYNOBJEXT)
26 AC_SUBST(MAKE_DYNOBJ_COMMAND) 26 AC_SUBST(MAKE_DYNOBJ_COMMAND)
27@@ -1106,6 +1109,7 @@ 27@@ -1054,6 +1057,7 @@ AC_SUBST(OBJLISTS)
28 AC_SUBST(STOBJEXT) 28 AC_SUBST(STOBJEXT)
29 AC_SUBST(SHOBJEXT) 29 AC_SUBST(SHOBJEXT)
30 AC_SUBST(PFOBJEXT) 30 AC_SUBST(PFOBJEXT)
31+AC_SUBST(LAOBJEXT) 31+AC_SUBST(LAOBJEXT)
32 AC_SUBST(PICFLAGS) 32 AC_SUBST(PICFLAGS)
33 AC_SUBST(PROFFLAGS)]) 33 AC_SUBST(PROFFLAGS)])
34  34
35@@ -1214,11 +1218,42 @@ 35@@ -1168,11 +1172,42 @@ else
36 KDB5_PLUGIN_DEPLIBS= 36 KDB5_PLUGIN_DEPLIBS=
37 KDB5_PLUGIN_LIBS= 37 KDB5_PLUGIN_LIBS=
38 fi 38 fi
39+DEPSTLIBEXT=$STLIBEXT 39+DEPSTLIBEXT=$STLIBEXT
40+AC_SUBST(DEPSTLIBEXT) 40+AC_SUBST(DEPSTLIBEXT)
41 CC_LINK="$CC_LINK_SHARED" 41 CC_LINK="$CC_LINK_SHARED"
42 CXX_LINK="$CXX_LINK_SHARED" 42 CXX_LINK="$CXX_LINK_SHARED"
43  43
44+# Check whether to build libtool archives. 44+# Check whether to build libtool archives.
45+AC_ARG_ENABLE([pkgsrc-libtool], 45+AC_ARG_ENABLE([pkgsrc-libtool],
46+[ --enable-pkgsrc-libtool build libtool archives], 46+[ --enable-pkgsrc-libtool build libtool archives],
47+[ 47+[
48+ case $enableval in 48+ case $enableval in
cvs diff -r1.5 -r1.6 pkgsrc/security/mit-krb5/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-ad 2011/03/22 23:31:04 1.5
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-ad 2012/07/16 19:12:33 1.6
@@ -1,65 +1,65 @@ @@ -1,65 +1,65 @@
1$NetBSD: patch-ad,v 1.5 2011/03/22 23:31:04 tez Exp $ 1$NetBSD: patch-ad,v 1.6 2012/07/16 19:12:33 adam Exp $
2 2
3Add --enable-pkgsrc-libtool option 3Add --enable-pkgsrc-libtool option
4 4
5--- config/lib.in.orig 2010-12-12 17:13:42.864774300 -0600 5--- config/lib.in.orig 2012-05-31 23:49:44.000000000 +0000
6+++ config/lib.in 2010-12-12 17:24:08.783385600 -0600 6+++ config/lib.in
7@@ -29,8 +29,9 @@ 7@@ -29,8 +29,9 @@ LIBPREFIX=lib
8 # STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc... 8 # STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc...
9 SHOBJLISTS=$(STOBJLISTS:.ST=.SH) 9 SHOBJLISTS=$(STOBJLISTS:.ST=.SH)
10 PFOBJLISTS=$(STOBJLISTS:.ST=.PF) 10 PFOBJLISTS=$(STOBJLISTS:.ST=.PF)
11+LAOBJLISTS=$(STOBJLISTS:.ST=.LA) 11+LAOBJLISTS=$(STOBJLISTS:.ST=.LA)
12  12
13-dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF): all-recurse 13-dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF): all-recurse
14+dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF) $(SUBDIROBJLISTS:.ST=.LA): all-recurse 14+dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF) $(SUBDIROBJLISTS:.ST=.LA): all-recurse
15  15
16 # Gets invoked as $(PARSE_OBJLISTS) list-of-OBJS.*-files 16 # Gets invoked as $(PARSE_OBJLISTS) list-of-OBJS.*-files
17 PARSE_OBJLISTS= set -x && $(PERL) -p -e 'BEGIN { $$SIG{__WARN__} = sub {die @_} }; $$e=$$ARGV; $$e =~ s/OBJS\...$$//; s/^/ /; s/ $$//; s/ / $$e/g;' 17 PARSE_OBJLISTS= set -x && $(PERL) -p -e 'BEGIN { $$SIG{__WARN__} = sub {die @_} }; $$e=$$ARGV; $$e =~ s/OBJS\...$$//; s/^/ /; s/ $$//; s/ / $$e/g;'
18@@ -99,6 +100,21 @@ 18@@ -101,6 +102,21 @@ lib$(LIBBASE)$(PFLIBEXT): $(PFOBJLISTS)
19 set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist 19 set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist
20 $(RANLIB) $@ 20 $(RANLIB) $@
21  21
22+lib$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) 22+lib$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT)
23+ $(RM) $@ 23+ $(RM) $@
24+ $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@ 24+ $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@
25+ 25+
26+${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS) 26+${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS)
27+ $(RM) $@ 27+ $(RM) $@
28+ @echo "building $(LIBBASE) libtool archive ($(LIBMAJOR).$(LIBMINOR))" 28+ @echo "building $(LIBBASE) libtool archive ($(LIBMAJOR).$(LIBMINOR))"
29+ @dirs=`echo $(LAOBJLISTS) | \ 29+ @dirs=`echo $(LAOBJLISTS) | \
30+ sed -e 's%/OBJS.LA%%g' -e 's%OBJS.LA%.%'`; \ 30+ sed -e 's%/OBJS.LA%%g' -e 's%OBJS.LA%.%'`; \
31+ $(LIBTOOL) --mode=link $(CC) -o $@ `for d in $$dirs; do \ 31+ $(LIBTOOL) --mode=link $(CC) -o $@ `for d in $$dirs; do \
32+ sed -e '/^$$/d' -e "s%^%$$d/%" -e "s% % $$d/%g" \ 32+ sed -e '/^$$/d' -e "s%^%$$d/%" -e "s% % $$d/%g" \
33+ $$d/OBJS.LA; done` \ 33+ $$d/OBJS.LA; done` \
34+ $(LALIB_EXPFLAGS) \ 34+ $(LALIB_EXPFLAGS) \
35+ $(LIBTOOL_TAIL) 35+ $(LIBTOOL_TAIL)
36+ 36+
37 $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT) 37 $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT)
38 $(RM) $@ 38 $(RM) $@
39 (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .) 39 (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .)
40@@ -124,6 +140,7 @@ 40@@ -128,6 +144,7 @@ clean-libs:
41 $(RM) lib$(LIBBASE)$(SHLIBSEXT) 41 $(RM) lib$(LIBBASE)$(SHLIBSEXT)
42 $(RM) lib$(LIBBASE)$(SHLIBEXT) 42 $(RM) lib$(LIBBASE)$(SHLIBEXT)
43 $(RM) lib$(LIBBASE)$(PFLIBEXT) 43 $(RM) lib$(LIBBASE)$(PFLIBEXT)
44+ $(LIBTOOL) --mode=uninstall $(RM) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) 44+ $(LIBTOOL) --mode=uninstall $(RM) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT)
45 $(RM) binutils.versions osf1.exports darwin.exports hpux10.exports 45 $(RM) binutils.versions osf1.exports darwin.exports hpux10.exports
46  46
47 clean-liblinks: 47 clean-liblinks:
48@@ -132,6 +149,7 @@ 48@@ -136,6 +153,7 @@ clean-liblinks:
49 $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT) 49 $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT)
50 $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) 50 $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT)
51 $(RM) $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT) 51 $(RM) $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT)
52+ $(RM) lib$(LIBBASE)$(LALIBEXT) 52+ $(RM) lib$(LIBBASE)$(LALIBEXT)
53  53
54 install-libs: $(LIBINSTLIST) 54 install-libs: $(LIBINSTLIST)
55 install-static: 55 install-static:
56@@ -152,6 +170,9 @@ 56@@ -156,6 +174,9 @@ install-profiled:
57 $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) 57 $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT)
58 $(INSTALL_DATA) lib$(LIBBASE)$(PFLIBEXT) $(DESTDIR)$(KRB5_LIBDIR) 58 $(INSTALL_DATA) lib$(LIBBASE)$(PFLIBEXT) $(DESTDIR)$(KRB5_LIBDIR)
59 $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) 59 $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT)
60+install-libtool: 60+install-libtool:
61+ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(LALIBEXT) 61+ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(LALIBEXT)
62+ $(LIBTOOL) --mode=install $(INSTALL_SHLIB) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $(DESTDIR)$(KRB5_LIBDIR) 62+ $(LIBTOOL) --mode=install $(INSTALL_SHLIB) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $(DESTDIR)$(KRB5_LIBDIR)
63  63
64 Makefile: $(top_srcdir)/config/lib.in 64 Makefile: $(top_srcdir)/config/lib.in
65 $(BUILDTOP)/config.status: $(top_srcdir)/config/shlib.conf 65 $(BUILDTOP)/config.status: $(top_srcdir)/config/shlib.conf
cvs diff -r1.5 -r1.6 pkgsrc/security/mit-krb5/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-al 2011/03/22 23:31:04 1.5
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-al 2012/07/16 19:12:33 1.6
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-al,v 1.5 2011/03/22 23:31:04 tez Exp $ 1$NetBSD: patch-al,v 1.6 2012/07/16 19:12:33 adam Exp $
2 2
3Add DragonFly support. Fallback to LINE_MAX if BUFSIZ is not defined. 3Add DragonFly support. Fallback to LINE_MAX if BUFSIZ is not defined.
4 4
5--- ./lib/gssapi/krb5/import_name.c.orig Sat Dec 11 20:12:52 2010 5--- lib/gssapi/krb5/import_name.c.orig Sat Dec 11 20:12:52 2010
6+++ ./lib/gssapi/krb5/import_name.c Sat Dec 11 20:13:40 2010 6+++ lib/gssapi/krb5/import_name.c Sat Dec 11 20:13:40 2010
7@@ -28,10 +28,15 @@ 7@@ -28,10 +28,15 @@
8 #include "gssapiP_krb5.h" 8 #include "gssapiP_krb5.h"
9  9
10 #ifndef NO_PASSWORD 10 #ifndef NO_PASSWORD
11+#include <limits.h> 11+#include <limits.h>
12 #include <pwd.h> 12 #include <pwd.h>
13 #include <stdio.h> 13 #include <stdio.h>
14 #endif 14 #endif
15  15
16+#ifndef BUFSIZ 16+#ifndef BUFSIZ
17+#define BUFSIZ LINE_MAX 17+#define BUFSIZ LINE_MAX
18+#endif 18+#endif
19+ 19+
cvs diff -r1.4 -r1.5 pkgsrc/security/mit-krb5/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-af 2011/03/22 23:31:04 1.4
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-af 2012/07/16 19:12:33 1.5
@@ -1,99 +1,99 @@ @@ -1,99 +1,99 @@
1$NetBSD: patch-af,v 1.4 2011/03/22 23:31:04 tez Exp $ 1$NetBSD: patch-af,v 1.5 2012/07/16 19:12:33 adam Exp $
2 2
3Add --enable-pkgsrc-libtool option 3Add --enable-pkgsrc-libtool option
4Use $(ROOT_USER) in place of root 4Use $(ROOT_USER) in place of root
5 5
6--- config/pre.in.orig 2010-01-21 16:49:01.000000000 -0600 6--- config/pre.in.orig 2012-05-31 23:49:44.000000000 +0000
7+++ config/pre.in 2010-12-12 17:39:24.427787200 -0600 7+++ config/pre.in
8@@ -170,6 +170,7 @@ 8@@ -172,6 +172,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
9 THREAD_LINKOPTS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) 9 THREAD_LINKOPTS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
10 CPPFLAGS = @CPPFLAGS@ 10 CPPFLAGS = @CPPFLAGS@
11 DEFS = @DEFS@ 11 DEFS = @DEFS@
12+LIBTOOL = @LIBTOOL@ 12+LIBTOOL = @LIBTOOL@
13 CC = @CC@ 13 CC = @CC@
14 CXX = @CXX@ 14 CXX = @CXX@
15 LD = $(PURE) @LD@ 15 LD = $(PURE) @LD@
16@@ -183,11 +184,12 @@ 16@@ -185,11 +186,12 @@ LIBS = @LIBS@
17  17
18 INSTALL=@INSTALL@ 18 INSTALL=@INSTALL@
19 INSTALL_STRIP= 19 INSTALL_STRIP=
20-INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) 20-INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
21-INSTALL_SCRIPT=@INSTALL_PROGRAM@ 21-INSTALL_SCRIPT=@INSTALL_PROGRAM@
22+INSTALL_LIBTOOL=@INSTALL_LIBTOOL@ 22+INSTALL_LIBTOOL=@INSTALL_LIBTOOL@
23+INSTALL_PROGRAM=$(INSTALL_LIBTOOL) @INSTALL_PROGRAM@ $(INSTALL_STRIP) 23+INSTALL_PROGRAM=$(INSTALL_LIBTOOL) @INSTALL_PROGRAM@ $(INSTALL_STRIP)
24+INSTALL_SCRIPT=@INSTALL_SCRIPT@ 24+INSTALL_SCRIPT=@INSTALL_SCRIPT@
25 INSTALL_DATA=@INSTALL_DATA@ 25 INSTALL_DATA=@INSTALL_DATA@
26 INSTALL_SHLIB=@INSTALL_SHLIB@ 26 INSTALL_SHLIB=@INSTALL_SHLIB@
27-INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root 27-INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
28+INSTALL_SETUID=$(INSTALL_LIBTOOL) $(INSTALL) $(INSTALL_STRIP) -m 4555 -o $(ROOT_USER) 28+INSTALL_SETUID=$(INSTALL_LIBTOOL) $(INSTALL) $(INSTALL_STRIP) -m 4555 -o $(ROOT_USER)
29 ## This is needed because autoconf will sometimes define @exec_prefix@ to be 29 ## This is needed because autoconf will sometimes define @exec_prefix@ to be
30 ## ${prefix}. 30 ## ${prefix}.
31 prefix=@prefix@ 31 prefix=@prefix@
32@@ -313,6 +315,10 @@ 32@@ -320,6 +322,10 @@ PROG_RPATH_FLAGS=@PROG_RPATH_FLAGS@
33 # depending on whether we're building with shared libraries. 33 # depending on whether we're building with shared libraries.
34 DEPLIBEXT=@DEPLIBEXT@ 34 DEPLIBEXT=@DEPLIBEXT@
35  35
36+# this gets set by configure to either $(STLIBEXT) or $(LALIBEXT), 36+# this gets set by configure to either $(STLIBEXT) or $(LALIBEXT),
37+# depending on whether we're building libtool archives. 37+# depending on whether we're building libtool archives.
38+DEPSTLIBEXT=@DEPSTLIBEXT@ 38+DEPSTLIBEXT=@DEPSTLIBEXT@
39+ 39+
40 KDB5_PLUGIN_DEPLIBS = @KDB5_PLUGIN_DEPLIBS@ 40 KDB5_PLUGIN_DEPLIBS = @KDB5_PLUGIN_DEPLIBS@
41 KDB5_PLUGIN_LIBS = @KDB5_PLUGIN_LIBS@ 41 KDB5_PLUGIN_LIBS = @KDB5_PLUGIN_LIBS@
42  42
43@@ -329,12 +335,12 @@ 43@@ -337,12 +343,12 @@ COM_ERR_DEPLIB-k5 = $(TOPLIBD)/libcom_er
44 SUPPORT_LIBNAME=krb5support 44 SUPPORT_LIBNAME=krb5support
45 SUPPORT_DEPLIB = $(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(DEPLIBEXT) 45 SUPPORT_DEPLIB = $(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(DEPLIBEXT)
46  46
47-# These are forced to use ".a" as an extension because they're never 47-# These are forced to use ".a" as an extension because they're never
48+# These are forced to use "@DEPSTLIBEXT" as an extension because they're never 48+# These are forced to use "@DEPSTLIBEXT" as an extension because they're never
49 # built shared. 49 # built shared.
50 SS_DEPLIB = $(SS_DEPLIB-@SS_VERSION@) 50 SS_DEPLIB = $(SS_DEPLIB-@SS_VERSION@)
51-SS_DEPLIB-k5 = $(TOPLIBD)/libss.a 51-SS_DEPLIB-k5 = $(TOPLIBD)/libss.a
52+SS_DEPLIB-k5 = $(TOPLIBD)/libss$(DEPSTLIBEXT) 52+SS_DEPLIB-k5 = $(TOPLIBD)/libss$(DEPSTLIBEXT)
53 SS_DEPLIB-sys = 53 SS_DEPLIB-sys =
54-APPUTILS_DEPLIB = $(TOPLIBD)/libapputils.a 54-APPUTILS_DEPLIB = $(TOPLIBD)/libapputils.a
55+APPUTILS_DEPLIB = $(TOPLIBD)/libapputils$(DEPSTLIBEXT) 55+APPUTILS_DEPLIB = $(TOPLIBD)/libapputils$(DEPSTLIBEXT)
56  56
57 KRB5_BASE_DEPLIBS = $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) 57 KRB5_BASE_DEPLIBS = $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
58 KDB5_DEPLIBS = $(KDB5_DEPLIB) $(KDB5_PLUGIN_DEPLIBS) 58 KDB5_DEPLIBS = $(KDB5_DEPLIB) $(KDB5_PLUGIN_DEPLIBS)
59@@ -364,7 +370,7 @@ 59@@ -384,7 +390,7 @@ RL_LIBS = @RL_LIBS@
60  60
61 SS_LIB = $(SS_LIB-@SS_VERSION@) 61 SS_LIB = $(SS_LIB-@SS_VERSION@)
62 SS_LIB-sys = @SS_LIB@ 62 SS_LIB-sys = @SS_LIB@
63-SS_LIB-k5 = $(TOPLIBD)/libss.a 63-SS_LIB-k5 = $(TOPLIBD)/libss.a $(RL_LIBS)
64+SS_LIB-k5 = $(TOPLIBD)/libss$(DEPSTLIBEXT) 64+SS_LIB-k5 = $(TOPLIBD)/libss$(DEPSTLIBEXT) $(RL_LIBS)
65 KDB5_LIB = -lkdb5 $(KDB5_PLUGIN_LIBS) 65 KDB5_LIB = -lkdb5 $(KDB5_PLUGIN_LIBS)
66  66
67 DL_LIB = @DL_LIB@ 67 VERTO_DEPLIB = $(VERTO_DEPLIB-@VERTO_VERSION@)
68@@ -509,6 +515,9 @@ 68@@ -552,6 +558,9 @@ MAKE_DYNOBJ_COMMAND=@MAKE_DYNOBJ_COMMAND
69 DYNOBJ_EXPDEPS=@DYNOBJ_EXPDEPS@ 69 DYNOBJ_EXPDEPS=@DYNOBJ_EXPDEPS@
70 DYNOBJ_EXPFLAGS=@DYNOBJ_EXPFLAGS@ 70 DYNOBJ_EXPFLAGS=@DYNOBJ_EXPFLAGS@
71  71
72+# usually .la 72+# usually .la
73+LALIBEXT=@LALIBEXT@ 73+LALIBEXT=@LALIBEXT@
74+ 74+
75 # File with symbol names to be exported, both functions and data, 75 # File with symbol names to be exported, both functions and data,
76 # currently not distinguished. 76 # currently not distinguished.
77 SHLIB_EXPORT_FILE=$(srcdir)/$(LIBPREFIX)$(LIBBASE).exports 77 SHLIB_EXPORT_FILE=$(srcdir)/$(LIBPREFIX)$(LIBBASE).exports
78@@ -530,6 +539,7 @@ 78@@ -573,6 +582,7 @@ SHLIB_RPATH_FLAGS=@SHLIB_RPATH_FLAGS@
79 # flags for explicit libraries depending on this one, 79 # flags for explicit libraries depending on this one,
80 # e.g. "$(SHLIB_RPATH_FLAGS) $(SHLIB_SHLIB_DIRFLAGS) $(SHLIB_EXPLIBS)" 80 # e.g. "$(SHLIB_RPATH_FLAGS) $(SHLIB_SHLIB_DIRFLAGS) $(SHLIB_EXPLIBS)"
81 SHLIB_EXPFLAGS=@SHLIB_EXPFLAGS@ 81 SHLIB_EXPFLAGS=@SHLIB_EXPFLAGS@
82+LALIB_EXPFLAGS=@LALIB_EXPFLAGS@ 82+LALIB_EXPFLAGS=@LALIB_EXPFLAGS@
83  83
84 ## Parameters to be set by configure for use in libobj.in: 84 ## Parameters to be set by configure for use in libobj.in:
85  85
86@@ -541,10 +551,15 @@ 86@@ -584,10 +594,15 @@ OBJLISTS=@OBJLISTS@
87 # the suffix substitution will break on some platforms! 87 # the suffix substitution will break on some platforms!
88 SHLIBOBJS=$(STLIBOBJS:.o=@SHOBJEXT@) 88 SHLIBOBJS=$(STLIBOBJS:.o=@SHOBJEXT@)
89 PFLIBOBJS=$(STLIBOBJS:.o=@PFOBJEXT@) 89 PFLIBOBJS=$(STLIBOBJS:.o=@PFOBJEXT@)
90+LALIBOBJS=$(STLIBOBJS:.o=@LAOBJEXT@) 90+LALIBOBJS=$(STLIBOBJS:.o=@LAOBJEXT@)
91  91
92 # "$(CC) -G", "$(LD) -Bshareable", etc. 92 # "$(CC) -G", "$(LD) -Bshareable", etc.
93 LDCOMBINE=@LDCOMBINE@ 93 LDCOMBINE=@LDCOMBINE@
94  94
95+# Args to tack on the tail of LIBTOOL to generate versioned, installable 95+# Args to tack on the tail of LIBTOOL to generate versioned, installable
96+# libtool archives. 96+# libtool archives.
97+LIBTOOL_TAIL=@LIBTOOL_TAIL@ 97+LIBTOOL_TAIL=@LIBTOOL_TAIL@
98+ 98+
99 # 99 #
cvs diff -r1.6 -r1.7 pkgsrc/security/mit-krb5/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-ag 2011/03/22 23:31:04 1.6
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-ag 2012/07/16 19:12:33 1.7
@@ -1,74 +1,74 @@ @@ -1,74 +1,74 @@
1$NetBSD: patch-ag,v 1.6 2011/03/22 23:31:04 tez Exp $ 1$NetBSD: patch-ag,v 1.7 2012/07/16 19:12:33 adam Exp $
2 2
3Add --enable-pkgsrc-libtool option 3Add --enable-pkgsrc-libtool option
4 4
5--- config/shlib.conf.orig Mon Feb 8 14:55:48 2010 5--- config/shlib.conf.orig 2012-05-31 23:49:44.000000000 +0000
6+++ config/shlib.conf Thu Jan 6 15:14:39 2011 6+++ config/shlib.conf
7@@ -22,6 +22,7 @@ 7@@ -22,6 +22,7 @@ SHLIBVEXT=.so.v-nobuild
8 SHLIBSEXT=.so.s-nobuild 8 SHLIBSEXT=.so.s-nobuild
9 # Most systems support profiled libraries. 9 # Most systems support profiled libraries.
10 PFLIBEXT=_p.a 10 PFLIBEXT=_p.a
11+LALIBEXT=.la 11+LALIBEXT=.la
12 # Most systems install shared libs as mode 644, etc. while hpux wants 755 12 # Most systems install shared libs as mode 644, etc. while hpux wants 755
13 INSTALL_SHLIB='$(INSTALL_DATA)' 13 INSTALL_SHLIB='$(INSTALL_DATA)'
14 # Most systems use the same objects for shared libraries and dynamically 14 # Most systems use the same objects for shared libraries and dynamically
15@@ -37,6 +38,7 @@ 15@@ -37,6 +38,7 @@ use_linker_fini_option=no
16 STOBJEXT=.o 16 STOBJEXT=.o
17 SHOBJEXT=.so 17 SHOBJEXT=.so
18 PFOBJEXT=.po 18 PFOBJEXT=.po
19+LAOBJEXT=.lo 19+LAOBJEXT=.lo
20 # Default for systems w/o shared libraries 20 # Default for systems w/o shared libraries
21 CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' 21 CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
22 CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)' 22 CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
23@@ -281,7 +283,7 @@ 23@@ -287,7 +289,7 @@ mips-*-netbsd*)
24 PROFFLAGS=-pg 24 PROFFLAGS=-pg
25 ;; 25 ;;
26  26
27-*-*-netbsd*) 27-*-*-netbsd*)
28+*-*-netbsd* | *-*-dragonfly*) 28+*-*-netbsd* | *-*-dragonfly*)
29 PICFLAGS=-fPIC 29 PICFLAGS=-fPIC
30 SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' 30 SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
31 SHLIBEXT=.so 31 SHLIBEXT=.so
32@@ -358,7 +360,7 @@ 32@@ -367,7 +369,7 @@ mips-*-netbsd*)
33 for lib in libkrb5support.1.1.dylib libkadm5srv.5.1.dylib libkdb5.4.0.dylib; do 33 for lib in libkrb5support.1.1.dylib libkadm5srv.5.1.dylib libkdb5.4.0.dylib; do
34 LDCOMBINE_TAIL="$LDCOMBINE_TAIL -dylib_file \"\$(KRB5_LIBDIR)/$lib\":\$(TOPLIBD)/$lib" 34 LDCOMBINE_TAIL="$LDCOMBINE_TAIL -dylib_file \"\$(KRB5_LIBDIR)/$lib\":\$(TOPLIBD)/$lib"
35 done 35 done
36- MAKE_DYNOBJ_COMMAND='$(CC) -bundle $(CFLAGS) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) $(LDFLAGS) -exported_symbols_list darwin.exports'" ${LDCOMBINE_TAIL}" 36- MAKE_DYNOBJ_COMMAND='$(CC) -bundle $(CFLAGS) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) $(LDFLAGS) -exported_symbols_list darwin.exports'" ${LDCOMBINE_TAIL}"
37+ MAKE_DYNOBJ_COMMAND='${LIBTOOL} --mode=link $(CC) -bundle $(CFLAGS) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) $(LDFLAGS) -exported_symbols_list darwin.exports'" ${LDCOMBINE_TAIL}" 37+ MAKE_DYNOBJ_COMMAND='${LIBTOOL} --mode=link $(CC) -bundle $(CFLAGS) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) $(LDFLAGS) -exported_symbols_list darwin.exports'" ${LDCOMBINE_TAIL}"
38 CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)' 38 CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)'
39 CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' 39 CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
40 CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) -dynamic $(CXXFLAGS) $(LDFLAGS)' 40 CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) -dynamic $(CXXFLAGS) $(LDFLAGS)'
41@@ -473,7 +475,7 @@ 41@@ -486,7 +488,7 @@ mips-*-netbsd*)
42 # Assume initialization always delayed. 42 # Assume initialization always delayed.
43 INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done' 43 INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done'
44 use_linker_fini_option=yes 44 use_linker_fini_option=yes
45- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE}" 45- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE}"
46+ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE}" 46+ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE}"
47 RPATH_TAIL=:/usr/lib:/lib 47 RPATH_TAIL=:/usr/lib:/lib
48 PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL" 48 PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"
49 CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' 49 CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
50@@ -509,8 +511,8 @@ 50@@ -523,8 +525,8 @@ mips-*-netbsd*)
51 # Assume initialization always delayed. 51 # Assume initialization always delayed.
52 INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done' 52 INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done'
53 use_linker_fini_option=yes 53 use_linker_fini_option=yes
54- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE}"' && ar cq $@ shr.o.$(LIBMAJOR).$(LIBMINOR) && chmod +x $@ && rm -f shr.o.$(LIBMAJOR).$(LIBMINOR)' 54- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE}"' && ar cq $@ shr.o.$(LIBMAJOR).$(LIBMINOR) && chmod +x $@ && rm -f shr.o.$(LIBMAJOR).$(LIBMINOR)'
55- MAKE_DYNOBJ_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE_DYN}" 55- MAKE_DYNOBJ_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE_DYN}"
56+ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE}"' && ar cq $@ shr.o.$(LIBMAJOR).$(LIBMINOR) && chmod +x $@ && rm -f shr.o.$(LIBMAJOR).$(LIBMINOR)' 56+ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE}"' && ar cq $@ shr.o.$(LIBMAJOR).$(LIBMINOR) && chmod +x $@ && rm -f shr.o.$(LIBMAJOR).$(LIBMINOR)'
57+ MAKE_DYNOBJ_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE_DYN}" 57+ MAKE_DYNOBJ_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE_DYN}"
58 RPATH_TAIL=:/usr/lib:/lib 58 RPATH_TAIL=:/usr/lib:/lib
59 PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL" 59 PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"
60 CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' 60 CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
61@@ -524,8 +526,14 @@ 61@@ -539,8 +541,14 @@ esac
62  62
63 if test "${MAKE_SHLIB_COMMAND}" = "x" ; then 63 if test "${MAKE_SHLIB_COMMAND}" = "x" ; then
64 if test "${INIT_FINI_PREP}" != ":"; then 64 if test "${INIT_FINI_PREP}" != ":"; then
65- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}" 65- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
66+ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}" 66+ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
67 else 67 else
68- MAKE_SHLIB_COMMAND="${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}" 68- MAKE_SHLIB_COMMAND="${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
69+ MAKE_SHLIB_COMMAND="${LIBTOOL} --mode=link ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}" 69+ MAKE_SHLIB_COMMAND="${LIBTOOL} --mode=link ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
70 fi 70 fi
71 fi 71 fi
72+ 72+
73+# Settings for building with pkgsrc libtool. 73+# Settings for building with pkgsrc libtool.
74+CC_LINK_LIBTOOL='$(LIBTOOL) --mode=link '"$CC_LINK_SHARED" 74+CC_LINK_LIBTOOL='$(LIBTOOL) --mode=link '"$CC_LINK_SHARED"
cvs diff -r1.2 -r1.3 pkgsrc/security/mit-krb5/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-ah 2011/03/22 23:31:04 1.2
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-ah 2012/07/16 19:12:33 1.3
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-ah,v 1.2 2011/03/22 23:31:04 tez Exp $ 1$NetBSD: patch-ah,v 1.3 2012/07/16 19:12:33 adam Exp $
2 2
3prefer @SYSCONFDIR as location for krb5.conf and krb5.keytab 3prefer @SYSCONFDIR as location for krb5.conf and krb5.keytab
4 4
5--- include/osconf.hin.orig Sat Dec 11 19:54:46 2010 5--- include/osconf.hin.orig 2012-05-31 23:49:44.000000000 +0000
6+++ include/osconf.hin Sat Dec 11 20:06:48 2010 6+++ include/osconf.hin
7@@ -48,16 +48,16 @@ 7@@ -45,16 +45,16 @@
8 #define DEFAULT_KEYTAB_NAME "FILE:%s\\krb5kt" 8 #define DEFAULT_KEYTAB_NAME "FILE:%s\\krb5kt"
9 #else /* !_WINDOWS */ 9 #else /* !_WINDOWS */
10 #if TARGET_OS_MAC 10 #if TARGET_OS_MAC
11-#define DEFAULT_SECURE_PROFILE_PATH "/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf:@SYSCONFDIR/krb5.conf" 11-#define DEFAULT_SECURE_PROFILE_PATH "/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf:@SYSCONFDIR/krb5.conf"
12-#define DEFAULT_PROFILE_PATH ("~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH) 12-#define DEFAULT_PROFILE_PATH ("~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH)
13+#define DEFAULT_SECURE_PROFILE_PATH "@SYSCONFDIR/krb5.conf:/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf" 13+#define DEFAULT_SECURE_PROFILE_PATH "@SYSCONFDIR/krb5.conf:/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf:@SYSCONFDIR/krb5.conf"
14+#define DEFAULT_PROFILE_PATH ("@SYSCONFDIR/krb5.conf:~/Library/Preferences/edu.mit.Kerberos:/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf") 14+#define DEFAULT_PROFILE_PATH ("@SYSCONFDIR/krb5.conf:~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH)
15 #define KRB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosFrameworkPlugins" 15 #define KRB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosFrameworkPlugins"
16 #define KDB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosDatabasePlugins" 16 #define KDB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosDatabasePlugins"
17 #define KRB5_AUTHDATA_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosAuthDataPlugins" 17 #define KRB5_AUTHDATA_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosAuthDataPlugins"
18 #else 18 #else
19-#define DEFAULT_SECURE_PROFILE_PATH "/etc/krb5.conf:@SYSCONFDIR/krb5.conf" 19-#define DEFAULT_SECURE_PROFILE_PATH "/etc/krb5.conf:@SYSCONFDIR/krb5.conf"
20+#define DEFAULT_SECURE_PROFILE_PATH "@SYSCONFDIR/krb5.conf:/etc/krb5.conf" 20+#define DEFAULT_SECURE_PROFILE_PATH "@SYSCONFDIR/krb5.conf:/etc/krb5.conf"
21 #define DEFAULT_PROFILE_PATH DEFAULT_SECURE_PROFILE_PATH 21 #define DEFAULT_PROFILE_PATH DEFAULT_SECURE_PROFILE_PATH
22 #endif 22 #endif
23-#define DEFAULT_KEYTAB_NAME "FILE:/etc/krb5.keytab" 23-#define DEFAULT_KEYTAB_NAME "FILE:/etc/krb5.keytab"
24+#define DEFAULT_KEYTAB_NAME "FILE:@SYSCONFDIR/krb5.keytab" 24+#define DEFAULT_KEYTAB_NAME "FILE:@SYSCONFDIR/krb5.keytab"
25 #define DEFAULT_LNAME_FILENAME "@PREFIX/lib/krb5.aname" 
26 #endif /* _WINDOWS */ 25 #endif /* _WINDOWS */
27  26
 27 #define DEFAULT_PLUGIN_BASE_DIR "@LIBDIR/krb5/plugins"
cvs diff -r1.2 -r1.3 pkgsrc/security/mit-krb5/patches/Attic/patch-ak (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-ak 2011/03/22 23:31:04 1.2
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-ak 2012/07/16 19:12:33 1.3
@@ -1,24 +1,33 @@ @@ -1,24 +1,33 @@
1$NetBSD: patch-ak,v 1.2 2011/03/22 23:31:04 tez Exp $ 1$NetBSD: patch-ak,v 1.3 2012/07/16 19:12:33 adam Exp $
2 2
 3Don't build kadm5_hook and avoid libtool problem.
3No idea why... copied from previous instance of this package. 4No idea why... copied from previous instance of this package.
4 5
5--- Makefile.in.orig 2010-12-12 17:50:34.797814500 -0600 6--- Makefile.in.orig 2012-05-31 23:49:44.000000000 +0000
6+++ Makefile.in 2010-12-12 17:51:28.015746400 -0600 7+++ Makefile.in
7@@ -88,7 +88,7 @@ 8@@ -9,7 +9,6 @@ mydir=.
 9 # plugins/authdata/greet
 10 SUBDIRS=util include lib \
 11 @sam2_plugin@ \
 12- plugins/kadm5_hook/test \
 13 plugins/kdb/db2 \
 14 @ldap_plugin_dir@ \
 15 plugins/preauth/pkinit \
 16@@ -64,7 +63,7 @@ INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROO
8 install-strip: 17 install-strip:
9 $(MAKE) install INSTALL_STRIP=-s 18 $(MAKE) install INSTALL_STRIP=-s
10  19
11-install-recurse: install-mkdirs 20-install-recurse: install-mkdirs
12+install-recurse: 21+install-recurse:
13  22
14 install-mkdirs: 23 install-mkdirs:
15 @for i in $(INSTALLMKDIRS); do \ 24 @for i in $(INSTALLMKDIRS); do \
16@@ -99,7 +99,7 @@ 25@@ -75,7 +74,7 @@ install-headers-mkdirs:
17 $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR) 26 $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)
18 $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssapi 27 $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssapi
19 $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssrpc 28 $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssrpc
20-install-headers-prerecurse: install-headers-mkdirs 29-install-headers-prerecurse: install-headers-mkdirs
21+install-headers-prerecurse: 30+install-headers-prerecurse:
22  31
23 # install:: 32 # install::
24 # $(MAKE) $(MFLAGS) install.man 33 # $(MAKE) $(MFLAGS) install.man
File Deleted: pkgsrc/security/mit-krb5/patches/Attic/patch-ce
File Deleted: pkgsrc/security/mit-krb5/patches/Attic/patch-lib_kadm5_srv_svr__principal.c
cvs diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/Attic/patch-cf (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-cf 2011/03/22 23:31:05 1.1
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-cf 2012/07/16 19:12:33 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-cf,v 1.1 2011/03/22 23:31:05 tez Exp $ 1$NetBSD: patch-cf,v 1.2 2012/07/16 19:12:33 adam Exp $
2 2
3add needed headers 3Add needed headers
4 4
5--- lib/gssapi/Makefile.in.orig 2010-12-22 17:13:19.073797300 -0600 5--- lib/gssapi/Makefile.in.orig 2010-12-22 17:13:19.073797300 -0600
6+++ lib/gssapi/Makefile.in 2010-12-22 17:14:58.061262500 -0600 6+++ lib/gssapi/Makefile.in 2010-12-22 17:14:58.061262500 -0600
7@@ -125,7 +125,7 @@ 7@@ -96,7 +96,7 @@
8 # appears to be properly serializing the subdir processing and local 8 # appears to be properly serializing the subdir processing and local
9 # compiles... so far. 9 # compiles... so far.
10 ##DOS##!if 0 10 ##DOS##!if 0
11-$(EXPORTED_HEADERS) generic/gssapi.h krb5/gssapi_err_krb5.h generic/gssapi_err_generic.h krb5/gssapi_krb5.h: all-recurse 11-$(EXPORTED_HEADERS) generic/gssapi.h krb5/gssapi_err_krb5.h generic/gssapi_err_generic.h krb5/gssapi_krb5.h: all-recurse
12+$(EXPORTED_HEADERS) generic/gssapi.h generic/errmap.h krb5/error_map.h krb5/gssapi_err_krb5.h generic/gssapi_err_generic.h krb5/gssapi_krb5.h: all-recurse 12+$(EXPORTED_HEADERS) generic/gssapi.h generic/errmap.h krb5/error_map.h krb5/gssapi_err_krb5.h generic/gssapi_err_generic.h krb5/gssapi_krb5.h: all-recurse
13 : $@ updated by recursion rule 13 : $@ updated by recursion rule
14 ##DOS##!endif 14 ##DOS##!endif
15  15
cvs diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/Attic/patch-cg (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-cg 2011/03/22 23:31:05 1.1
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-cg 2012/07/16 19:12:33 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-cg,v 1.1 2011/03/22 23:31:05 tez Exp $ 1$NetBSD: patch-cg,v 1.2 2012/07/16 19:12:33 adam Exp $
2 2
3add two files that need to be generated and otherwise are not 3Add two files that need to be generated and otherwise are not
4 4
5--- lib/kdb/Makefile.in.orig 2010-12-23 11:35:38.448878800 -0600 5--- lib/kdb/Makefile.in.orig 2012-05-31 23:49:44.000000000 +0000
6+++ lib/kdb/Makefile.in 2010-12-23 11:40:32.324026100 -0600 6+++ lib/kdb/Makefile.in
7@@ -57,7 +57,7 @@ 7@@ -62,7 +62,7 @@ clean-unix:: clean-liblinks clean-libs c
8 clean-unix:: clean-liblinks clean-libs clean-libobjs 8 check-pytests:: t_stringattr
9 $(RM) adb_err.c adb_err.h 9 $(RUNPYTEST) $(srcdir)/t_stringattr.py $(PYTESTFLAGS)
10  10
11-generate-files-mac: darwin.exports 11-generate-files-mac: darwin.exports
12+generate-files-mac: darwin.exports adb_err.h adb_err.c 12+generate-files-mac: darwin.exports adb_err.h adb_err.c
13  13
14 depend:: adb_err.h 14 depend:: adb_err.h
15  15
cvs diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/Attic/patch-ch (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-ch 2011/03/22 23:31:05 1.1
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-ch 2012/07/16 19:12:33 1.2
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-ch,v 1.1 2011/03/22 23:31:05 tez Exp $ 1$NetBSD: patch-ch,v 1.2 2012/07/16 19:12:33 adam Exp $
2 2
3Add --enable-pkgsrc-libtool option 3Add --enable-pkgsrc-libtool option
4 4
5--- plugins/kdb/db2/Makefile.in.orig 2009-11-22 12:13:29.000000000 -0600 5--- plugins/kdb/db2/Makefile.in.orig 2009-11-22 12:13:29.000000000 -0600
6+++ plugins/kdb/db2/Makefile.in 2011-01-04 17:08:39.419207800 -0600 6+++ plugins/kdb/db2/Makefile.in 2011-01-04 17:08:39.419207800 -0600
7@@ -35,8 +35,8 @@ 7@@ -35,8 +35,8 @@
8 # Also on gssrpc, for xdr stuff. 8 # Also on gssrpc, for xdr stuff.
9 SHLIB_EXPDEPS = \ 9 SHLIB_EXPDEPS = \
10 $(GSSRPC_DEPLIBS) \ 10 $(GSSRPC_DEPLIBS) \
11- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ 11- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
12- $(TOPLIBD)/libkrb5$(SHLIBEXT) 12- $(TOPLIBD)/libkrb5$(SHLIBEXT)
13+ $(TOPLIBD)/libk5crypto$(DEPLIBEXT) \ 13+ $(TOPLIBD)/libk5crypto$(DEPLIBEXT) \
14+ $(TOPLIBD)/libkrb5$(DEPLIBEXT) 14+ $(TOPLIBD)/libkrb5$(DEPLIBEXT)
15 SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(KADMSRV_LIBS) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@ 15 SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(KADMSRV_LIBS) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@
16  16
17 SHLIB_DIRS=-L$(TOPLIBD) 17 SHLIB_DIRS=-L$(TOPLIBD)
18@@ -47,7 +47,7 @@ 18@@ -47,7 +47,7 @@
19 DBOBJLISTS-sys = 19 DBOBJLISTS-sys =
20 DBOBJLISTS-k5 = $(DBDIR)/hash/OBJS.ST $(DBDIR)/btree/OBJS.ST \ 20 DBOBJLISTS-k5 = $(DBDIR)/hash/OBJS.ST $(DBDIR)/btree/OBJS.ST \
21 $(DBDIR)/db/OBJS.ST $(DBDIR)/mpool/OBJS.ST $(DBDIR)/recno/OBJS.ST 21 $(DBDIR)/db/OBJS.ST $(DBDIR)/mpool/OBJS.ST $(DBDIR)/recno/OBJS.ST
22-DBSHOBJLISTS = $(DBOBJLISTS:.ST=.SH) 22-DBSHOBJLISTS = $(DBOBJLISTS:.ST=.SH)
23+DBSHOBJLISTS = $(DBOBJLISTS:.ST=.LA) 23+DBSHOBJLISTS = $(DBOBJLISTS:.ST=.LA)
24  24
25 SRCS= \ 25 SRCS= \
26 $(srcdir)/kdb_xdr.c \ 26 $(srcdir)/kdb_xdr.c \
27@@ -59,7 +59,7 @@ 27@@ -58,7 +58,7 @@
28 $(srcdir)/db2_exp.c \ 28 $(srcdir)/db2_exp.c \
29 $(srcdir)/lockout.c 29 $(srcdir)/lockout.c
30  30
31-STOBJLISTS=OBJS.ST $(DBOBJLISTS) 31-STOBJLISTS=OBJS.ST $(DBOBJLISTS)
32+STOBJLISTS=OBJS.LA $(DBOBJLISTS) 32+STOBJLISTS=OBJS.LA $(DBOBJLISTS)
33 STLIBOBJS= \ 33 STLIBOBJS= \
34 kdb_xdr.o \ 34 kdb_xdr.o \
35 adb_openclose.o \ 35 adb_openclose.o \
cvs diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/Attic/patch-ck (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/Attic/patch-ck 2011/04/09 00:16:18 1.1
+++ pkgsrc/security/mit-krb5/patches/Attic/patch-ck 2012/07/16 19:12:33 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ck,v 1.1 2011/04/09 00:16:18 tez Exp $ 1$NetBSD: patch-ck,v 1.2 2012/07/16 19:12:33 adam Exp $
2 2
3fix build where libtool chokes on "--version-info : " (at least OS X) 3Fix build where libtool chokes on "--version-info : " (at least OS X)
4 4
5--- lib/apputils/Makefile.in.orig 2009-11-22 12:13:29.000000000 -0600 5--- lib/apputils/Makefile.in.orig 2012-05-31 23:49:44.000000000 +0000
6+++ lib/apputils/Makefile.in 2011-04-08 16:54:37.000000000 -0500 6+++ lib/apputils/Makefile.in
7@@ -18,6 +18,8 @@ 7@@ -16,6 +16,8 @@ DEFS=
8 STLIBOBJS=dummy.o @LIBOBJS@ 8 STLIBOBJS=net-server.o @LIBOBJS@
9 STOBJLISTS=OBJS.ST 9 STOBJLISTS=OBJS.ST
10 LIBBASE=apputils 10 LIBBASE=apputils
11+LIBMAJOR=0 11+LIBMAJOR=0
12+LIBMINOR=0 12+LIBMINOR=0
13  13
14 all-unix:: all-liblinks 14 all-unix:: all-liblinks
15 clean-unix:: clean-liblinks clean-libs clean-libobjs 15 clean-unix:: clean-liblinks clean-libs clean-libobjs
File Added: pkgsrc/security/mit-krb5/patches/patch-util_k5ev_verto-k5ev.c
$NetBSD: patch-util_k5ev_verto-k5ev.c,v 1.1 2012/07/16 19:12:33 adam Exp $

Fix include file path

--- util/k5ev/verto-k5ev.c.orig	2012-06-27 13:41:58.000000000 +0000
+++ util/k5ev/verto-k5ev.c
@@ -34,7 +34,7 @@
 
 #include "verto-k5ev.h"
 #include <verto-module.h>
-#include "rename.h"
+#include "gssrpc/rename.h"
 #include "autoconf.h"
 #define EV_STANDALONE 1
 /* Avoids using clock_gettime; we probably shouldn't have to do this. */