[Midnightbsd-cvs] mports [19613] trunk/security/krb5: update to mit kerberos 5 version 1.13.2

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jul 28 07:31:13 EDT 2015 

Revision: 19613
          http://svnweb.midnightbsd.org/mports/?rev=19613
Author:   laffer1
Date:     2015-07-28 07:31:13 -0400 (Tue, 28 Jul 2015)
Log Message:
-----------
update to mit kerberos 5 version 1.13.2

Modified Paths:
--------------
    trunk/security/krb5/Makefile
    trunk/security/krb5/distinfo
    trunk/security/krb5/files/kpropd.in
    trunk/security/krb5/files/patch-config__pre.in
    trunk/security/krb5/files/patch-config__shlib.conf
    trunk/security/krb5/pkg-plist

Removed Paths:
-------------
    trunk/security/krb5/files/patch-lib-apputils-net-server.c

Modified: trunk/security/krb5/Makefile
===================================================================
--- trunk/security/krb5/Makefile	2015-07-28 00:32:51 UTC (rev 19612)
+++ trunk/security/krb5/Makefile	2015-07-28 11:31:13 UTC (rev 19613)
@@ -3,7 +3,8 @@
 # $MidnightBSD$
 
 PORTNAME=		krb5
-PORTVERSION=		1.12.2
+PORTVERSION=		1.13.2
+PORTREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -19,19 +20,24 @@
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-maint-[0-9]*
+CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-maint-11[0-9]-[0-9]*
 
-LATEST_LINK=		${PORTNAME}-19
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_PERL5=		build
 USE_LDCONFIG=		yes
 USE_CSTD=		gnu99
 GNU_CONFIGURE=		yes
-USES=			gettext gmake perl5 libtool:build
-CONFIGURE_ARGS?=	--enable-shared --without-system-verto
-CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC="${YACC}"
-MAKE_ARGS=		INSTALL="${INSTALL}"
+USES=			cpe gettext gmake perl5 libtool:build \
+			gssapi:bootstrap,mit
+CONFIGURE_ARGS?=	--enable-shared --without-system-verto \
+			--disable-rpath --localstatedir="${PREFIX}/var"
+CONFIGURE_ENV=		INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}"
+MAKE_ARGS=		INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}"
 
+CPE_VENDOR=		mit
+CPE_VERSION=		5-${PORTVERSION}
+CPE_PRODUCT=		kerberos
+
 OPTIONS_DEFINE=		KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP READLINE
 OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML
 KRB5_PDF_DESC=		Install krb5 PDF documentation
@@ -41,11 +47,9 @@
 
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
-CFLAGS+=		-Wl,-rpath=${KRB5_HOME}/lib
-LDFLAGS+=		-Wl,-rpath=${KRB5_HOME}/lib
 .endif
-LDFLAGS+=		-L${LOCALBASE}/lib
-CFLAGS+=		-I${LOCALBASE}/include
+CPPFLAGS+=		-I${LOCALBASE}/include -I${OPENSSLINC}
+LDFLAGS+=		-L${LOCALBASE}/lib -L${OPENSSLLIB}
 
 USE_OPENSSL=		yes
 USE_RC_SUBR=		kpropd
@@ -52,6 +56,19 @@
 
 .include <bsd.port.pre.mk>
 
+# Fix up -Wl,-rpath in LDFLAGS
+.if !empty(KRB5_HOME)
+_RPATH=	${KRB5_HOME}/lib:
+.else
+_RPATH=	${LOCALBASE}/lib:
+.endif
+.if !empty(LDFLAGS:M-Wl,-rpath,*)
+.for F in ${LDFLAGS:M-Wl,-rpath,*}
+LDFLAGS:=	-Wl,-rpath,${_RPATH}${F:S/-Wl,-rpath,//} \
+		${LDFLAGS:N-Wl,-rpath,*}
+.endfor
+.endif
+
 .if defined(KRB5_HOME) && ${KRB5_HOME} != ${LOCALBASE}
 BROKEN=			LIB_DEPENDS when using KRB5_HOME is broken
 .endif
@@ -84,17 +101,9 @@
 HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html
 PDF_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf
 
-CONFIGURE_ARGS+=	CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include"
-
 post-extract:
-	@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
+	@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions
 	@${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
-	@if [ `id -u` = 0 ]; then \
-		${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
-		${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
-	fi
-.endif
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/doc/krb5
@@ -123,12 +132,12 @@
 .endif
 .if ${PORT_OPTIONS:MKRB5_PDF}
 	for i in $${pdf_dirs}; do \
-		${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \
+		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done | ${TAIL} -r >> ${TMPPLIST}
 .endif
 .if ${PORT_OPTIONS:MKRB5_HTML}
 	for i in $${html_dirs}; do \
-		${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \
+		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done | ${TAIL} -r >> ${TMPPLIST}
 .endif
 	${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}

Modified: trunk/security/krb5/distinfo
===================================================================
--- trunk/security/krb5/distinfo	2015-07-28 00:32:51 UTC (rev 19612)
+++ trunk/security/krb5/distinfo	2015-07-28 11:31:13 UTC (rev 19613)
@@ -1,2 +1,2 @@
-SHA256 (krb5-1.12.2-signed.tar) = 09bd180107b5c2b3b7378c57c023fb02a103d4cac39d6f2dd600275d7a4f3744
-SIZE (krb5-1.12.2-signed.tar) = 11991040
+SHA256 (krb5-1.13.2-signed.tar) = e528c30b0209c741f6f320cb83122ded92f291802b6a1a1dc1a01dcdb3ff6de1
+SIZE (krb5-1.13.2-signed.tar) = 12113920

Modified: trunk/security/krb5/files/kpropd.in
===================================================================
--- trunk/security/krb5/files/kpropd.in	2015-07-28 00:32:51 UTC (rev 19612)
+++ trunk/security/krb5/files/kpropd.in	2015-07-28 11:31:13 UTC (rev 19613)
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# $MidnightBSD$
 # $FreeBSD: head/security/krb5/files/kpropd.in 351689 2014-04-21 15:55:07Z brd $
 #
 # PROVIDE: kpropd

Modified: trunk/security/krb5/files/patch-config__pre.in
===================================================================
--- trunk/security/krb5/files/patch-config__pre.in	2015-07-28 00:32:51 UTC (rev 19612)
+++ trunk/security/krb5/files/patch-config__pre.in	2015-07-28 11:31:13 UTC (rev 19613)
@@ -1,6 +1,6 @@
---- config/pre.in.orig	Fri Nov 19 13:47:51 2004
-+++ config/pre.in	Thu Jan 27 17:43:12 2005
-@@ -177,7 +177,7 @@
+--- config/pre.in.orig	2014-10-15 16:55:10.000000000 -0700
++++ config/pre.in	2015-02-04 12:43:45.693875606 -0800
+@@ -178,9 +178,9 @@
  INSTALL=@INSTALL@
  INSTALL_STRIP=
  INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
@@ -7,5 +7,17 @@
 -INSTALL_SCRIPT=@INSTALL_PROGRAM@
 +INSTALL_SCRIPT=@INSTALL_SCRIPT@
  INSTALL_DATA=@INSTALL_DATA@
- INSTALL_SHLIB=@INSTALL_SHLIB@
+-INSTALL_SHLIB=@INSTALL_SHLIB@
++INSTALL_SHLIB=$(INSTALL_LIB)
  INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
+ ## This is needed because autoconf will sometimes define @exec_prefix@ to be
+ ## ${prefix}.
+@@ -197,7 +197,7 @@
+ ADMIN_BINDIR = @sbindir@
+ SERVER_BINDIR = @sbindir@
+ CLIENT_BINDIR =@bindir@
+-PKGCONFIG_DIR = @libdir@/pkgconfig
++PKGCONFIG_DIR = $(prefix)/libdata/pkgconfig
+ ADMIN_MANDIR = $(KRB5MANROOT)/man8
+ SERVER_MANDIR = $(KRB5MANROOT)/man8
+ CLIENT_MANDIR = $(KRB5MANROOT)/man1

Modified: trunk/security/krb5/files/patch-config__shlib.conf
===================================================================
--- trunk/security/krb5/files/patch-config__shlib.conf	2015-07-28 00:32:51 UTC (rev 19612)
+++ trunk/security/krb5/files/patch-config__shlib.conf	2015-07-28 11:31:13 UTC (rev 19613)
@@ -5,7 +5,7 @@
  	esac
  	SHLIBVEXT='.so.$(LIBMAJOR)'
 -	RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,'
-+	LDCOMBINE="libtool --mode=link cc -Xcompiler -shared"
++	LDCOMBINE="libtool --tag=CC --mode=link cc -Xcompiler -shared"
 +	RPATH_FLAG='-Wl,-rpath -Wl,'
  	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'

Deleted: trunk/security/krb5/files/patch-lib-apputils-net-server.c
===================================================================
--- trunk/security/krb5/files/patch-lib-apputils-net-server.c	2015-07-28 00:32:51 UTC (rev 19612)
+++ trunk/security/krb5/files/patch-lib-apputils-net-server.c	2015-07-28 11:31:13 UTC (rev 19613)
@@ -1,15 +0,0 @@
---- lib/apputils/net-server.c.orig	2014-08-11 15:46:27.000000000 -0700
-+++ lib/apputils/net-server.c	2014-08-13 05:33:48.913580280 -0700
-@@ -992,8 +992,12 @@
-     case RTM_NEWADDR: return "RTM_NEWADDR";
-     case RTM_DELADDR: return "RTM_DELADDR";
-     case RTM_IFINFO: return "RTM_IFINFO";
-+#ifdef RTM_OLDADD
-     case RTM_OLDADD: return "RTM_OLDADD";
-+#endif
-+#ifdef RTM_OLDDEL
-     case RTM_OLDDEL: return "RTM_OLDDEL";
-+#endif
-     case RTM_RESOLVE: return "RTM_RESOLVE";
- #ifdef RTM_NEWMADDR
-     case RTM_NEWMADDR: return "RTM_NEWMADDR";

Modified: trunk/security/krb5/pkg-plist
===================================================================
--- trunk/security/krb5/pkg-plist	2015-07-28 00:32:51 UTC (rev 19612)
+++ trunk/security/krb5/pkg-plist	2015-07-28 11:31:13 UTC (rev 19613)
@@ -78,12 +78,13 @@
 lib/libkadm5srv_mit.so
 lib/libkadm5srv_mit.so.9
 lib/libkdb5.so
-lib/libkdb5.so.7
+lib/libkdb5.so.8
 lib/libkrb5.so
 lib/libkrb5.so.3
 lib/libkrb5support.so
 lib/libkrb5support.so.0
 lib/krb5/plugins/kdb/db2.so
+lib/krb5/plugins/tls/k5tls.so
 %%LDAP%%lib/krb5/plugins/kdb/kldap.so
 lib/krb5/plugins/preauth/otp.so
 lib/krb5/plugins/preauth/pkinit.so
@@ -93,18 +94,17 @@
 lib/libkrad.so.0
 lib/libverto.so.0
 lib/libverto.so
-lib/pkgconfig/gssrpc.pc
-lib/pkgconfig/kadm-client.pc
-lib/pkgconfig/kadm-server.pc
-lib/pkgconfig/kdb.pc
-lib/pkgconfig/krb5-gssapi.pc
-lib/pkgconfig/krb5.pc
-lib/pkgconfig/mit-krb5-gssapi.pc
-lib/pkgconfig/mit-krb5.pc
+libdata/pkgconfig/gssrpc.pc
+libdata/pkgconfig/kadm-client.pc
+libdata/pkgconfig/kadm-server.pc
+libdata/pkgconfig/kdb.pc
+libdata/pkgconfig/krb5-gssapi.pc
+libdata/pkgconfig/krb5.pc
+libdata/pkgconfig/mit-krb5-gssapi.pc
+libdata/pkgconfig/mit-krb5.pc
 man/man1/k5srvutil.1.gz
 man/man1/kadmin.1.gz
 man/man1/krb5-config.1.gz
-man/man1/krb5-send-pr.1.gz
 man/man1/kpasswd.1.gz
 man/man1/klist.1.gz
 man/man1/kinit.1.gz
@@ -144,30 +144,14 @@
 sbin/sim_server
 sbin/sserver
 sbin/uuserver
-share/doc/krb5/README.MidnightBSD
+share/doc/krb5/README.FreeBSD
 share/et/et_c.awk
 share/et/et_h.awk
 share/examples/krb5/kdc.conf
 share/examples/krb5/krb5.conf
 share/examples/krb5/services.append
-share/gnats/mit
 share/locale/en_US/LC_MESSAGES/mit-krb5.mo
- at exec mkdir -p %D/var/krb5kdc
- at dirrmtry var/krb5kdc
- at dirrmtry var
- at dirrmtry share/locale/en_US/LC_MESSAGES
- at dirrmtry share/locale/en_US
- at dirrm lib/pkgconfig
- at dirrm lib/krb5/plugins/preauth
- at dirrm lib/krb5/plugins/libkrb5
- at dirrm lib/krb5/plugins/kdb
- at dirrm lib/krb5/plugins/authdata
- at dirrm lib/krb5/plugins
- at dirrm lib/krb5
- at dirrm include/gssapi
- at dirrm include/gssrpc
- at dirrm include/krb5
- at dirrm include/kadm5
- at dirrm share/et
- at dirrmtry share/gnats
- at dirrm share/examples/krb5
+ at dir lib/krb5/plugins/authdata
+ at dir lib/krb5/plugins/libkrb5
+ at dir var/run/krb5kdc
+ at dir var/krb5kdc

More information about the Midnightbsd-cvs mailing list