Fri Aug 16 08:30:14 2013 UTC ()
Changes 1.5.3:
Bug fixes
- Fix leaking file descriptors in KDC
- Better socket/timeout handling in libkrb5
- General bug fixes
- Build fixes


(adam)
diff -r1.100 -r1.101 pkgsrc/security/heimdal/Makefile
diff -r1.37 -r1.38 pkgsrc/security/heimdal/distinfo
diff -r1.12 -r1.13 pkgsrc/security/heimdal/patches/patch-ad
cvs diff -r1.100 -r1.101 pkgsrc/security/heimdal/Makefile (expand / switch to unified diff)

--- pkgsrc/security/heimdal/Makefile 2013/08/15 11:15:11 1.100
+++ pkgsrc/security/heimdal/Makefile 2013/08/16 08:30:14 1.101
@@ -1,57 +1,61 @@ @@ -1,57 +1,61 @@
1# $NetBSD: Makefile,v 1.100 2013/08/15 11:15:11 jperkin Exp $ 1# $NetBSD: Makefile,v 1.101 2013/08/16 08:30:14 adam Exp $
2 2
3DISTNAME= heimdal-1.5.2 3DISTNAME= heimdal-1.5.3
4PKGREVISION= 8 
5CATEGORIES= security 4CATEGORIES= security
6MASTER_SITES= http://www.h5l.org/dist/src/ 5MASTER_SITES= http://www.h5l.org/dist/src/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.h5l.org/ 8HOMEPAGE= http://www.h5l.org/
10COMMENT= Kerberos 5 implementation 9COMMENT= Kerberos 5 implementation
11LICENSE= modified-bsd 10LICENSE= modified-bsd
12 11
13CONFLICTS+= arla-[0-9]* 12CONFLICTS+= arla-[0-9]*
14CONFLICTS+= mit-krb5-[0-9]* 13CONFLICTS+= mit-krb5-[0-9]*
15CONFLICTS+= openafs-[0-9]* 14CONFLICTS+= openafs-[0-9]*
16CONFLICTS+= gss-[0-9]* 15CONFLICTS+= gss-[0-9]*
17CONFLICTS+= kth-krb4-[0-9]* 16CONFLICTS+= kth-krb4-[0-9]*
18 17
19MAKE_JOBS_SAFE= no 
20 
21USE_LIBTOOL= yes 18USE_LIBTOOL= yes
22USE_TOOLS+= bison flex 19USE_TOOLS+= bison flex
23PKGCONFIG_OVERRIDE+= tools/heimdal-gssapi.pc.in 20PKGCONFIG_OVERRIDE+= tools/heimdal-gssapi.pc.in
24MAKE_ENV+= INSTALL_CATPAGES=no 21MAKE_ENV+= INSTALL_CATPAGES=no
25 22
26.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
27.include "options.mk" 24.include "options.mk"
28 25
29HEIMDAL_HDB_DIR= ${VARBASE}/heimdal 26HEIMDAL_HDB_DIR= ${VARBASE}/heimdal
30 27
31GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
32CONFIGURE_ARGS+= --enable-kcm 29CONFIGURE_ARGS+= --enable-kcm
33CONFIGURE_ARGS+= --enable-pthread-support 30CONFIGURE_ARGS+= --enable-pthread-support
34CONFIGURE_ARGS+= --includedir=${PREFIX}/include/krb5 31CONFIGURE_ARGS+= --includedir=${PREFIX}/include/krb5
35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
36CONFIGURE_ARGS+= --with-hdbdir=${HEIMDAL_HDB_DIR} 33CONFIGURE_ARGS+= --with-hdbdir=${HEIMDAL_HDB_DIR}
37CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 34CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
38CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} 35CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
39CONFIGURE_ARGS+= --without-x 36CONFIGURE_ARGS+= --without-x
40CONFIGURE_ARGS+= ${ABI:D--with-mips-abi=${ABI}} 37CONFIGURE_ARGS+= ${ABI:D--with-mips-abi=${ABI}}
41CONFIGURE_ENV+= COMPILE_ET=no # build Heimdal's compile_et(1) 38CONFIGURE_ENV+= COMPILE_ET=no # build Heimdal's compile_et(1)
42# XXX Grand Central Dispatch is broken in 1.4 39# XXX Grand Central Dispatch is broken in 1.4
43CONFIGURE_ENV+= ac_cv_funclib_dispatch_async_f=no 40CONFIGURE_ENV+= ac_cv_funclib_dispatch_async_f=no
44 41
 42.include "../../mk/bdb.buildlink3.mk"
 43
 44# XXX Don't detect db1 when a newer version is available; otherwise build fails
 45.if ${BDB_TYPE} != "db1"
 46CONFIGURE_ENV+= ac_cv_funclib_dbopen=no
 47.endif
 48
45CFLAGS.Darwin+= -DBIND_8_COMPAT 49CFLAGS.Darwin+= -DBIND_8_COMPAT
46 50
47# Though Solaris has a <vis.h> header, it does something very unrelated 51# Though Solaris has a <vis.h> header, it does something very unrelated
48# to the BSD <vis.h> header. 52# to the BSD <vis.h> header.
49OPSYSVARS+= CONFIGURE_ENV 53OPSYSVARS+= CONFIGURE_ENV
50CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no 54CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no
51 55
52.include "../../mk/readline.buildlink3.mk" 56.include "../../mk/readline.buildlink3.mk"
53 57
54.if ${READLINE_TYPE} == "readline" 58.if ${READLINE_TYPE} == "readline"
55CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline} 59CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}
56.elif ${READLINE_TYPE} == "editline" 60.elif ${READLINE_TYPE} == "editline"
57CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editlinereadline} 61CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editlinereadline}
@@ -65,37 +69,31 @@ PLIST.afskauth= yes @@ -65,37 +69,31 @@ PLIST.afskauth= yes
65.include "../../security/openssl/builtin.mk" 69.include "../../security/openssl/builtin.mk"
66 70
67.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \ 71.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \
68 (${OPSYS} == "SunOS" && !empty(USE_BUILTIN.openssl:Myes)) 72 (${OPSYS} == "SunOS" && !empty(USE_BUILTIN.openssl:Myes))
69PLIST.hcrypto= yes 73PLIST.hcrypto= yes
70.endif 74.endif
71 75
72OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 76OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
73SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} 77SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS}
74SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} 78SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
75RCD_SCRIPTS= kadmind kcm kdc kpasswdd 79RCD_SCRIPTS= kadmind kcm kdc kpasswdd
76INFO_FILES= yes 80INFO_FILES= yes
77 81
78# Dynamically determine the "replacement" headers for bits needed by 
79# Heimdal but are missing in the base system and add them to the PLIST. 
80GENERATE_PLIST+= \ 
81 ( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders | \ 
82 ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/roken/," ); 
83 
84TEST_TARGET= check 82TEST_TARGET= check
85 83
86# remove manpages conficting with OpenSSL keeping only the important ones 84# remove manpages conficting with OpenSSL keeping only the important ones
87pre-configure: 85pre-configure:
88 cd ${WRKSRC}/doc/doxyout/hcrypto && \ 86 cd ${WRKSRC}/doc/doxyout/hcrypto && \
89 ${GREP} -e /hcrypto_ -e /page_ manpages > manpages.new && \ 87 ${GREP} -e /hcrypto_ -e /page_ manpages > manpages.new && \
90 mv manpages.new manpages 88 mv manpages.new manpages
91 89
92# Avoid 'cat: cannot open ./localefiles: No such file or directory' 90# Avoid 'cat: cannot open ./localefiles: No such file or directory'
93pre-build: 91pre-build:
94 ${TOUCH} ${WRKSRC}/po/localefiles 92 ${TOUCH} ${WRKSRC}/po/localefiles
95 93
96.include "../../databases/sqlite3/buildlink3.mk" 94.include "../../databases/sqlite3/buildlink3.mk"
97.include "../../security/openssl/buildlink3.mk" 95.include "../../security/openssl/buildlink3.mk"
98.include "../../mk/bdb.buildlink3.mk" 
99.include "../../mk/curses.buildlink3.mk" 96.include "../../mk/curses.buildlink3.mk"
100.include "../../mk/pthread.buildlink3.mk" 97.include "../../mk/pthread.buildlink3.mk"
 98.include "../../mk/readline.buildlink3.mk"
101.include "../../mk/bsd.pkg.mk" 99.include "../../mk/bsd.pkg.mk"
cvs diff -r1.37 -r1.38 pkgsrc/security/heimdal/distinfo (expand / switch to unified diff)

--- pkgsrc/security/heimdal/distinfo 2013/07/26 12:40:06 1.37
+++ pkgsrc/security/heimdal/distinfo 2013/08/16 08:30:14 1.38
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.37 2013/07/26 12:40:06 ryoon Exp $ 1$NetBSD: distinfo,v 1.38 2013/08/16 08:30:14 adam Exp $
2 2
3SHA1 (heimdal-1.5.2.tar.gz) = dd0920a181d18236432e4b3e5eab6e468cda4b89 3SHA1 (heimdal-1.5.3.tar.gz) = 23f39a099ae862dce1f5f4e5c3720861849a4bd0
4RMD160 (heimdal-1.5.2.tar.gz) = 1ab2f835309a916dfbba667d3d0d38a57c312fde 4RMD160 (heimdal-1.5.3.tar.gz) = 834660b4c0fe81a3aac4ffd9d8d37d74add1fa70
5Size (heimdal-1.5.2.tar.gz) = 6798615 bytes 5Size (heimdal-1.5.3.tar.gz) = 6798305 bytes
6SHA1 (patch-ad) = fc7820f21ae6f2aa62126ec360be6d913eef2eb7 6SHA1 (patch-ad) = 3dad4f3dfb19deb37c6b684ddea3e931678c5c6e
7SHA1 (patch-al) = 022d5f3723bd1db7fe5e92eea5d0106851a5d424 7SHA1 (patch-al) = 022d5f3723bd1db7fe5e92eea5d0106851a5d424
8SHA1 (patch-cf_install-catman.sh) = 8eb8ea0c0c8b281c080c85eefc3abbc7dcbe6746 8SHA1 (patch-cf_install-catman.sh) = 8eb8ea0c0c8b281c080c85eefc3abbc7dcbe6746
9SHA1 (patch-cf_libtool.m4) = cd229e0e934649cb04c3f39928d1fa12c2474f62 9SHA1 (patch-cf_libtool.m4) = cd229e0e934649cb04c3f39928d1fa12c2474f62
10SHA1 (patch-cf_pthreads.m4) = eff8f355887d2f9795446073efd67ccf739db2c9 10SHA1 (patch-cf_pthreads.m4) = eff8f355887d2f9795446073efd67ccf739db2c9
11SHA1 (patch-kdc_version-script.map) = 42b0417a16b19a680f30ae34cfffd082f609d4a6 11SHA1 (patch-kdc_version-script.map) = 42b0417a16b19a680f30ae34cfffd082f609d4a6
12SHA1 (patch-lib_hcrypto_libtommath_tommath.h) = 60f223bb23145854f2a144da9e0a9484728b618a 12SHA1 (patch-lib_hcrypto_libtommath_tommath.h) = 60f223bb23145854f2a144da9e0a9484728b618a
13SHA1 (patch-lib_hcrypto_libtommath_tommath_class.h) = 8c7b1e8d30cda79fd59a8ef83094a611b47a43df 13SHA1 (patch-lib_hcrypto_libtommath_tommath_class.h) = 8c7b1e8d30cda79fd59a8ef83094a611b47a43df
14SHA1 (patch-lib_hcrypto_libtommath_tommath_superclass.h) = 141e75b5b310446694769b16a977fa5b25160fbd 14SHA1 (patch-lib_hcrypto_libtommath_tommath_superclass.h) = 141e75b5b310446694769b16a977fa5b25160fbd
15SHA1 (patch-lib_libedit_aclocal.m4) = c50025a3b9bcae9913adab251169462dbc0f3221 15SHA1 (patch-lib_libedit_aclocal.m4) = c50025a3b9bcae9913adab251169462dbc0f3221
16SHA1 (patch-lib_otp_Makefile.in) = 0fe1426000824614f0e31d3ab2348948f3f414d3 16SHA1 (patch-lib_otp_Makefile.in) = 0fe1426000824614f0e31d3ab2348948f3f414d3
cvs diff -r1.12 -r1.13 pkgsrc/security/heimdal/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/security/heimdal/patches/Attic/patch-ad 2013/07/26 12:40:06 1.12
+++ pkgsrc/security/heimdal/patches/Attic/patch-ad 2013/08/16 08:30:14 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ad,v 1.12 2013/07/26 12:40:06 ryoon Exp $ 1$NetBSD: patch-ad,v 1.13 2013/08/16 08:30:14 adam Exp $
2 2
3* GNU/kFreeBSD parts: use host of Debian GNU/kFreeBSD 7.0. 3* GNU/kFreeBSD parts: use host of Debian GNU/kFreeBSD 7.0.
4 4
5--- configure.orig 2012-01-11 13:04:10.000000000 +0000 5--- configure.orig 2012-01-11 13:04:10.000000000 +0000
6+++ configure 6+++ configure
7@@ -6779,7 +6779,7 @@ ia64-*-hpux*) 7@@ -6779,7 +6779,7 @@ ia64-*-hpux*)
8 rm -rf conftest* 8 rm -rf conftest*
9 ;; 9 ;;
10  10
11-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ 11-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
12+x86_64-*kfreebsd*-gnu|x86_64-*-gnukfreebsd*|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ 12+x86_64-*kfreebsd*-gnu|x86_64-*-gnukfreebsd*|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
13 s390*-*linux*|s390*-*tpf*|sparc*-*linux*) 13 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
14 # Find out which ABI we are using. 14 # Find out which ABI we are using.
@@ -43,22 +43,13 @@ $NetBSD: patch-ad,v 1.12 2013/07/26 12:4 @@ -43,22 +43,13 @@ $NetBSD: patch-ad,v 1.12 2013/07/26 12:4
43+#libdir="$libdir$abilibdirext" 43+#libdir="$libdir$abilibdirext"
44  44
45  45
46 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5 46 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
47@@ -14245,7 +14249,7 @@ case "$host" in 47@@ -14245,7 +14249,7 @@ case "$host" in
48 ;; 48 ;;
49 esac 49 esac
50 ;; 50 ;;
51-*-*-kfreebsd*-gnu*) 51-*-*-kfreebsd*-gnu*)
52+*-*-kfreebsd*-gnu*|x86_64-*-gnukfreebsd*) 52+*-*-kfreebsd*-gnu*|x86_64-*-gnukfreebsd*)
53 native_pthread_support=yes 53 native_pthread_support=yes
54 PTHREAD_CFLAGS=-pthread 54 PTHREAD_CFLAGS=-pthread
55 PTHREAD_LIBADD=-pthread 55 PTHREAD_LIBADD=-pthread
56@@ -26547,7 +26551,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ 
57 int 
58 main () 
59 { 
60-unsigned int foo; __sync_add_and_fetch(&foo, 1); 
61+unsigned int foo, bar; bar = __sync_add_and_fetch(&foo, 1); 
62 ; 
63 return 0; 
64 }