diff --git a/security/krb5-111/Makefile b/security/krb5-111/Makefile index ff239f32eb98..b45bdd7e5b91 100644 --- a/security/krb5-111/Makefile +++ b/security/krb5-111/Makefile @@ -1,135 +1,135 @@ # Created by: nectar@FreeBSD.org # $FreeBSD$ PORTNAME= krb5 PORTVERSION= 1.11.5 PORTREVISION= 4 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PKGNAMESUFFIX= -111 DISTNAME= krb5-${PORTVERSION}-signed EXTRACT_SUFX= .tar -PATCHFILES= 2015-001-patch-r111.txt PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 +PATCHFILES= 2015-001-patch-r111.txt MAINTAINER= cy@FreeBSD.org COMMENT= Authentication system developed at MIT, successor to Kerberos IV LICENSE= MIT BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* krb5-maint-112-* LATEST_LINK= ${PORTNAME}-111 KERBEROSV_URL= http://web.mit.edu/kerberos/ USES= gettext gmake perl5 USE_PERL5= build USE_LDCONFIG= yes USE_CSTD= gnu99 GNU_CONFIGURE= yes CONFIGURE_ARGS?= --without-system-verto -CONFIGURE_ENV= INSTALL="${INSTALL}" YACC="${YACC}" -MAKE_ARGS= INSTALL="${INSTALL}" +CONFIGURE_ENV= NSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" +MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML KRB5_PDF_DESC= Install krb5 PDF documentation KRB5_HTML_DESC= Install krb5 HTML documentation DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names LDAP= Enable LDAP support .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} CFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib LDFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib .if ${KRB5_HOME} != ${LOCALBASE} BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif .endif LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include USE_OPENSSL= yes .include .if ${PORT_OPTIONS:MDNS_FOR_REALM} CONFIGURE_ARGS+= --enable-dns-for-realm .endif .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else PLIST_SUB+= LDAP="@comment " .endif .include "${PORTSDIR}/Mk/bsd.openssl.mk" .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif WRKSRC= ${WRKDIR}/krb5-${PORTVERSION}/src HTML_DOC_DIR= ${WRKDIR}/krb5-${PORTVERSION}/doc/html PDF_DOC_DIR= ${WRKDIR}/krb5-${PORTVERSION}/doc/pdf CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" post-extract: @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/krb5-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/krb5-${PORTVERSION}.tar.gz ${WRKDIR}/krb5-${PORTVERSION}.tar.gz.asc post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 # html documentation .if ${PORT_OPTIONS:MKRB5_PDF} pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d` pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d` for i in $${pdf_dirs}; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \ done; \ for i in $${pdf_files}; do \ ${INSTALL_MAN} $${pdf} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \ ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ done .endif .if ${PORT_OPTIONS:MKRB5_HTML} html_files=`${FIND} ${HTML_DOC_DIR} ! -type d | ${GREP} -v /_sources` html_dirs=`${FIND} ${HTML_DOC_DIR} -type d | ${GREP} -v /_sources` for i in $${html_dirs}; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \ done; \ for i in $${html_files}; do \ ${INSTALL_MAN} $${i} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \ ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ done .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} + ${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST} @${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD @${CHMOD} 444 ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD @${ECHO} "------------------------------------------------------" @${ECHO} "This port of MIT Kerberos 5 includes remote login " @${ECHO} "daemons (telnetd and klogind). These daemons default " @${ECHO} "to using the system login program (/usr/bin/login). " @${ECHO} "Please see the file " @${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD" @${ECHO} "for more information. " @${ECHO} "------------------------------------------------------" .include diff --git a/security/krb5-111/files/patch-config__pre.in b/security/krb5-111/files/patch-config__pre.in index bdd183e98ad4..92545824bb96 100644 --- a/security/krb5-111/files/patch-config__pre.in +++ b/security/krb5-111/files/patch-config__pre.in @@ -1,11 +1,14 @@ ---- 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-01-21 14:11:14.000000000 -0800 ++++ config/pre.in 2015-02-04 19:32:45.595399595 -0800 +@@ -182,9 +182,9 @@ INSTALL=@INSTALL@ INSTALL_STRIP= INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) -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}. diff --git a/security/krb5-111/pkg-plist b/security/krb5-111/pkg-plist index 14dcef45452d..8be0228de9df 100644 --- a/security/krb5-111/pkg-plist +++ b/security/krb5-111/pkg-plist @@ -1,167 +1,152 @@ bin/compile_et bin/gss-client bin/k5srvutil bin/kadmin bin/kdestroy bin/kinit bin/klist bin/kpasswd bin/krb5-config @mode 04755 @owner root @group wheel bin/ksu @mode @owner root @group wheel bin/kswitch bin/ktutil bin/kvno bin/sclient bin/sim_client bin/uuclient include/com_err.h include/gssapi.h include/gssapi/gssapi.h include/gssapi/gssapi_ext.h include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h include/gssapi/mechglue.h include/gssrpc/auth.h include/gssrpc/auth_gss.h include/gssrpc/auth_gssapi.h include/gssrpc/auth_unix.h include/gssrpc/clnt.h include/gssrpc/netdb.h include/gssrpc/pmap_clnt.h include/gssrpc/pmap_prot.h include/gssrpc/pmap_rmt.h include/gssrpc/rename.h include/gssrpc/rpc.h include/gssrpc/rpc_msg.h include/gssrpc/svc.h include/gssrpc/svc_auth.h include/gssrpc/types.h include/gssrpc/xdr.h include/krb5.h include/krb5/ccselect_plugin.h include/krb5/kadm5_hook_plugin.h include/krb5/krb5.h include/krb5/locate_plugin.h include/krb5/plugin.h include/krb5/pwqual_plugin.h include/kadm5/admin.h include/kadm5/chpass_util_strings.h include/kadm5/kadm_err.h include/kdb.h include/krb5/preauth_plugin.h include/profile.h include/verto-module.h include/verto.h lib/libcom_err.so lib/libcom_err.so.3 lib/libcom_err.so.3.0 lib/libgssapi_krb5.so lib/libgssapi_krb5.so.2 lib/libgssapi_krb5.so.2.2 lib/libgssrpc.so lib/libgssrpc.so.4 lib/libgssrpc.so.4.1 lib/libk5crypto.so lib/libk5crypto.so.3 lib/libk5crypto.so.3.1 lib/libkadm5clnt.so lib/libkadm5clnt_mit.so lib/libkadm5clnt_mit.so.8 lib/libkadm5clnt_mit.so.8.0 lib/libkadm5srv.so lib/libkadm5srv_mit.so lib/libkadm5srv_mit.so.8 lib/libkadm5srv_mit.so.8.0 lib/libkdb5.so lib/libkdb5.so.7 lib/libkdb5.so.7.0 lib/libkrb5.so lib/libkrb5.so.3 lib/libkrb5.so.3.3 lib/libkrb5support.so lib/libkrb5support.so.0 lib/libkrb5support.so.0.1 lib/krb5/plugins/kdb/db2.so %%LDAP%%lib/krb5/plugins/kdb/kldap.so lib/krb5/plugins/preauth/pkinit.so %%LDAP%%lib/libkdb_ldap.so %%LDAP%%lib/libkdb_ldap.so.1 %%LDAP%%lib/libkdb_ldap.so.1.0 lib/libverto.so lib/libverto.so.0 lib/libverto.so.0.0 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 man/man1/kdestroy.1.gz man/man1/kswitch.1.gz man/man1/ksu.1.gz man/man1/ktutil.1.gz man/man1/sclient.1.gz man/man1/kvno.1.gz man/man1/compile_et.1.gz man/man5/kadm5.acl.5.gz man/man5/kdc.conf.5.gz man/man5/krb5.conf.5.gz man/man5/.k5identity.5.gz man/man5/.k5login.5.gz man/man5/k5identity.5.gz man/man5/k5login.5.gz man/man8/krb5kdc.8.gz man/man8/kadmin.local.8.gz man/man8/kdb5_ldap_util.8.gz man/man8/kdb5_util.8.gz man/man8/kadmind.8.gz man/man8/kprop.8.gz man/man8/kpropd.8.gz man/man8/kproplog.8.gz man/man8/sserver.8.gz sbin/gss-server sbin/kadmin.local sbin/kadmind %%LDAP%%sbin/kdb5_ldap_util sbin/kdb5_util sbin/kprop sbin/kpropd sbin/kproplog sbin/krb5-send-pr sbin/krb5kdc sbin/sim_server sbin/sserver sbin/uuserver 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 -@exec mkdir -p %D/var/krb5kdc -@dirrmtry var/krb5kdc -@dirrmtry var -@dirrmtry share/locale/en_US/LC_MESSAGES -@dirrmtry share/locale/en_US -@dirrm lib/krb5/plugins/preauth -@dirrm lib/krb5/plugins/libkrb5 -@dirrm lib/krb5/plugins/kdb -@dirrm lib/krb5/plugins/authdata -@dirrm lib/krb5/plugins -@dirrm lib/krb5 -@dirrm include/gssapi -@dirrm include/gssrpc -@dirrm include/krb5 -@dirrm include/kadm5 -@dirrm share/et -@dirrmtry share/gnats -@dirrm share/examples/krb5 +@dir lib/krb5/plugins/authdata +@dir lib/krb5/plugins/libkrb5 +@dir var/krb5kdc diff --git a/security/krb5-112/Makefile b/security/krb5-112/Makefile index 97e3a26e39d1..92319fe508fb 100644 --- a/security/krb5-112/Makefile +++ b/security/krb5-112/Makefile @@ -1,142 +1,148 @@ # Created by: nectar@FreeBSD.org # $FreeBSD$ PORTNAME= krb5 PORTVERSION= 1.12.2 PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PKGNAMESUFFIX= -112 DISTNAME= ${PORTNAME}-${PORTVERSION}-signed EXTRACT_SUFX= .tar -PATCHFILES= 2015-001-patch-r112.txt PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 +PATCHFILES= 2015-001-patch-r112.txt MAINTAINER= cy@FreeBSD.org COMMENT= Authentication system developed at MIT, successor to Kerberos IV LICENSE= MIT BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* krb5-maint-111-* LATEST_LINK= ${PORTNAME}-112 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}" +CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" +MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP READLINE OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML KRB5_PDF_DESC= Install krb5 PDF documentation KRB5_HTML_DESC= Install krb5 HTML documentation DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names LDAP= Enable LDAP support .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 USE_OPENSSL= yes USE_RC_SUBR= kpropd .include .if defined(KRB5_HOME) && ${KRB5_HOME} != ${LOCALBASE} BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif .if ${PORT_OPTIONS:MDNS_FOR_REALM} CONFIGURE_ARGS+= --enable-dns-for-realm .endif .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MREADLINE} +.if ${OSVERSION} >= 1100000 +# libtool has some gas with libreadline in 11-CURRENT. +BUILD_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline +LIB_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline +.else USES+= readline:port CONFIGURE_ARGS+= --with-readline .endif +.endif .include "${PORTSDIR}/Mk/bsd.openssl.mk" .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src 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 --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 # html documentation .if ${PORT_OPTIONS:MKRB5_PDF} pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d` pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d` for i in $${pdf_dirs}; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \ done; \ for i in $${pdf_files}; do \ ${INSTALL_MAN} $${pdf} ${PREFIX}/share/doc/krb5/$${i}; \ ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ done .endif .if ${PORT_OPTIONS:MKRB5_HTML} html_files=`${FIND} ${HTML_DOC_DIR} ! -type d | ${GREP} -v /_sources` html_dirs=`${FIND} ${HTML_DOC_DIR} -type d | ${GREP} -v /_sources` for i in $${html_dirs}; do \ ${MKDIR} ${PREFIX}/share/doc/krb5/$${i}; \ done; \ for i in $${html_files}; do \ ${INSTALL_MAN} $${i} ${PREFIX}/share/doc/krb5/$${i}; \ ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ done .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} + ${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST} @${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD @${CHMOD} 444 ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD @${ECHO} "------------------------------------------------------" @${ECHO} "This port of MIT Kerberos 5 includes remote login " @${ECHO} "daemons (telnetd and klogind). These daemons default " @${ECHO} "to using the system login program (/usr/bin/login). " @${ECHO} "Please see the file " @${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD" @${ECHO} "for more information. " @${ECHO} "------------------------------------------------------" .include diff --git a/security/krb5-112/files/patch-config__pre.in b/security/krb5-112/files/patch-config__pre.in index bdd183e98ad4..06ddd412d618 100644 --- a/security/krb5-112/files/patch-config__pre.in +++ b/security/krb5-112/files/patch-config__pre.in @@ -1,11 +1,23 @@ ---- 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-08-11 15:46:27.000000000 -0700 ++++ config/pre.in 2015-02-04 19:23:51.174245898 -0800 +@@ -178,9 +178,9 @@ INSTALL=@INSTALL@ INSTALL_STRIP= INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) -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 diff --git a/security/krb5-112/pkg-plist b/security/krb5-112/pkg-plist index 95f61efd08d7..e7f6aed868d6 100644 --- a/security/krb5-112/pkg-plist +++ b/security/krb5-112/pkg-plist @@ -1,173 +1,157 @@ bin/compile_et bin/gss-client bin/k5srvutil bin/kadmin bin/kdestroy bin/kinit bin/klist bin/kpasswd bin/krb5-config @mode 04755 @owner root @group wheel bin/ksu @mode @owner root @group wheel bin/kswitch bin/ktutil bin/kvno bin/sclient bin/sim_client bin/uuclient include/com_err.h include/gssapi.h include/gssapi/gssapi.h include/gssapi/gssapi_ext.h include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h include/gssapi/mechglue.h include/gssrpc/auth.h include/gssrpc/auth_gss.h include/gssrpc/auth_gssapi.h include/gssrpc/auth_unix.h include/gssrpc/clnt.h include/gssrpc/netdb.h include/gssrpc/pmap_clnt.h include/gssrpc/pmap_prot.h include/gssrpc/pmap_rmt.h include/gssrpc/rename.h include/gssrpc/rpc.h include/gssrpc/rpc_msg.h include/gssrpc/svc.h include/gssrpc/svc_auth.h include/gssrpc/types.h include/gssrpc/xdr.h include/krad.h include/krb5.h include/krb5/ccselect_plugin.h include/krb5/clpreauth_plugin.h include/krb5/hostrealm_plugin.h include/krb5/kadm5_hook_plugin.h include/krb5/kdcpreauth_plugin.h include/krb5/localauth_plugin.h include/krb5/krb5.h include/krb5/locate_plugin.h include/krb5/plugin.h include/krb5/pwqual_plugin.h include/kadm5/admin.h include/kadm5/chpass_util_strings.h include/kadm5/kadm_err.h include/kdb.h include/krb5/preauth_plugin.h include/profile.h include/verto-module.h include/verto.h lib/libcom_err.so lib/libcom_err.so.3 lib/libgssapi_krb5.so lib/libgssapi_krb5.so.2 lib/libgssrpc.so lib/libgssrpc.so.4 lib/libk5crypto.so lib/libk5crypto.so.3 lib/libkadm5clnt.so lib/libkadm5clnt_mit.so lib/libkadm5clnt_mit.so.9 lib/libkadm5srv.so lib/libkadm5srv_mit.so lib/libkadm5srv_mit.so.9 lib/libkdb5.so lib/libkdb5.so.7 lib/libkrb5.so lib/libkrb5.so.3 lib/libkrb5support.so lib/libkrb5support.so.0 lib/krb5/plugins/kdb/db2.so %%LDAP%%lib/krb5/plugins/kdb/kldap.so lib/krb5/plugins/preauth/otp.so lib/krb5/plugins/preauth/pkinit.so %%LDAP%%lib/libkdb_ldap.so %%LDAP%%lib/libkdb_ldap.so.1 lib/libkrad.so 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 man/man1/kdestroy.1.gz man/man1/kswitch.1.gz man/man1/ksu.1.gz man/man1/ktutil.1.gz man/man1/sclient.1.gz man/man1/kvno.1.gz man/man1/compile_et.1.gz man/man5/kadm5.acl.5.gz man/man5/kdc.conf.5.gz man/man5/krb5.conf.5.gz man/man5/.k5identity.5.gz man/man5/.k5login.5.gz man/man5/k5identity.5.gz man/man5/k5login.5.gz man/man8/krb5kdc.8.gz man/man8/kadmin.local.8.gz man/man8/kdb5_ldap_util.8.gz man/man8/kdb5_util.8.gz man/man8/kadmind.8.gz man/man8/kprop.8.gz man/man8/kpropd.8.gz man/man8/kproplog.8.gz man/man8/sserver.8.gz sbin/gss-server sbin/kadmin.local sbin/kadmind %%LDAP%%sbin/kdb5_ldap_util sbin/kdb5_util sbin/kprop sbin/kpropd sbin/kproplog sbin/krb5-send-pr sbin/krb5kdc sbin/sim_server sbin/sserver sbin/uuserver 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 -@exec mkdir -p %D/var/krb5kdc -@dirrmtry var/krb5kdc -@dirrmtry var -@dirrmtry share/locale/en_US/LC_MESSAGES -@dirrmtry share/locale/en_US -@dirrm lib/pkgconfig -@dirrm lib/krb5/plugins/preauth -@dirrm lib/krb5/plugins/libkrb5 -@dirrm lib/krb5/plugins/kdb -@dirrm lib/krb5/plugins/authdata -@dirrm lib/krb5/plugins -@dirrm lib/krb5 -@dirrm include/gssapi -@dirrm include/gssrpc -@dirrm include/krb5 -@dirrm include/kadm5 -@dirrm share/et -@dirrmtry share/gnats -@dirrm share/examples/krb5 +@dir lib/krb5/plugins/authdata +@dir lib/krb5/plugins/libkrb5 +@dir var/krb5kdc diff --git a/security/krb5/Makefile b/security/krb5/Makefile index 5d19e3ffd7e9..d3ffd759494d 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -1,146 +1,146 @@ # Created by: nectar@FreeBSD.org # $FreeBSD$ PORTNAME= krb5 PORTVERSION= 1.13 PORTREVISION= 1 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 EXTRACT_SUFX= .tar -PATCHFILES= 2015-001-patch-r113.txt PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 +PATCHFILES= 2015-001-patch-r113.txt MAINTAINER= cy@FreeBSD.org COMMENT= Authentication system developed at MIT, successor to Kerberos IV LICENSE= MIT BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-maint-11[0-9]-[0-9]* 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}" +CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" +MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" OPTIONS_DEFINE= KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP READLINE OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML KRB5_PDF_DESC= Install krb5 PDF documentation KRB5_HTML_DESC= Install krb5 HTML documentation DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names LDAP= Enable LDAP support .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 USE_OPENSSL= yes USE_RC_SUBR= kpropd .include .if defined(KRB5_HOME) && ${KRB5_HOME} != ${LOCALBASE} BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif .if ${PORT_OPTIONS:MDNS_FOR_REALM} CONFIGURE_ARGS+= --enable-dns-for-realm .endif .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MREADLINE} .if ${OSVERSION} >= 1100000 # libtool has some gas with libreadline in 11-CURRENT. -BUILD_DEPENDS+= ${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline -LIB_DEPENDS+= ${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline +BUILD_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline +LIB_DEPENDS+= libreadline.so:${PORTSDIR}/devel/readline .else USES+= readline:port .endif CONFIGURE_ARGS+= --with-readline .endif .include "${PORTSDIR}/Mk/bsd.openssl.mk" .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src 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 --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 # html documentation .if ${PORT_OPTIONS:MKRB5_PDF} pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d` pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d` for i in $${pdf_dirs}; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \ done; \ for i in $${pdf_files}; do \ ${INSTALL_MAN} $${pdf} ${PREFIX}/share/doc/krb5/$${i}; \ ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ done .endif .if ${PORT_OPTIONS:MKRB5_HTML} html_files=`${FIND} ${HTML_DOC_DIR} ! -type d | ${GREP} -v /_sources` html_dirs=`${FIND} ${HTML_DOC_DIR} -type d | ${GREP} -v /_sources` for i in $${html_dirs}; do \ ${MKDIR} ${PREFIX}/share/doc/krb5/$${i}; \ done; \ for i in $${html_files}; do \ ${INSTALL_MAN} $${i} ${PREFIX}/share/doc/krb5/$${i}; \ ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ done .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} + ${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST} @${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD @${CHMOD} 444 ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD @${ECHO} "------------------------------------------------------" @${ECHO} "This port of MIT Kerberos 5 includes remote login " @${ECHO} "daemons (telnetd and klogind). These daemons default " @${ECHO} "to using the system login program (/usr/bin/login). " @${ECHO} "Please see the file " @${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD" @${ECHO} "for more information. " @${ECHO} "------------------------------------------------------" .include diff --git a/security/krb5/files/patch-config__pre.in b/security/krb5/files/patch-config__pre.in index bdd183e98ad4..8527c550dc25 100644 --- a/security/krb5/files/patch-config__pre.in +++ b/security/krb5/files/patch-config__pre.in @@ -1,11 +1,23 @@ ---- 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) -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 diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist index ab2b5fc28ce7..ca25dff93ebb 100644 --- a/security/krb5/pkg-plist +++ b/security/krb5/pkg-plist @@ -1,172 +1,157 @@ bin/compile_et bin/gss-client bin/k5srvutil bin/kadmin bin/kdestroy bin/kinit bin/klist bin/kpasswd bin/krb5-config @mode 04755 @owner root @group wheel bin/ksu @mode @owner root @group wheel bin/kswitch bin/ktutil bin/kvno bin/sclient bin/sim_client bin/uuclient include/com_err.h include/gssapi.h include/gssapi/gssapi.h include/gssapi/gssapi_ext.h include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h include/gssapi/mechglue.h include/gssrpc/auth.h include/gssrpc/auth_gss.h include/gssrpc/auth_gssapi.h include/gssrpc/auth_unix.h include/gssrpc/clnt.h include/gssrpc/netdb.h include/gssrpc/pmap_clnt.h include/gssrpc/pmap_prot.h include/gssrpc/pmap_rmt.h include/gssrpc/rename.h include/gssrpc/rpc.h include/gssrpc/rpc_msg.h include/gssrpc/svc.h include/gssrpc/svc_auth.h include/gssrpc/types.h include/gssrpc/xdr.h include/krad.h include/krb5.h include/krb5/ccselect_plugin.h include/krb5/clpreauth_plugin.h include/krb5/hostrealm_plugin.h include/krb5/kadm5_hook_plugin.h include/krb5/kdcpreauth_plugin.h include/krb5/localauth_plugin.h include/krb5/krb5.h include/krb5/locate_plugin.h include/krb5/plugin.h include/krb5/pwqual_plugin.h include/kadm5/admin.h include/kadm5/chpass_util_strings.h include/kadm5/kadm_err.h include/kdb.h include/krb5/preauth_plugin.h include/profile.h include/verto-module.h include/verto.h lib/libcom_err.so lib/libcom_err.so.3 lib/libgssapi_krb5.so lib/libgssapi_krb5.so.2 lib/libgssrpc.so lib/libgssrpc.so.4 lib/libk5crypto.so lib/libk5crypto.so.3 lib/libkadm5clnt.so lib/libkadm5clnt_mit.so lib/libkadm5clnt_mit.so.9 lib/libkadm5srv.so lib/libkadm5srv_mit.so lib/libkadm5srv_mit.so.9 lib/libkdb5.so 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 %%LDAP%%lib/libkdb_ldap.so %%LDAP%%lib/libkdb_ldap.so.1 lib/libkrad.so 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/kpasswd.1.gz man/man1/klist.1.gz man/man1/kinit.1.gz man/man1/kdestroy.1.gz man/man1/kswitch.1.gz man/man1/ksu.1.gz man/man1/ktutil.1.gz man/man1/sclient.1.gz man/man1/kvno.1.gz man/man1/compile_et.1.gz man/man5/kadm5.acl.5.gz man/man5/kdc.conf.5.gz man/man5/krb5.conf.5.gz man/man5/.k5identity.5.gz man/man5/.k5login.5.gz man/man5/k5identity.5.gz man/man5/k5login.5.gz man/man8/krb5kdc.8.gz man/man8/kadmin.local.8.gz man/man8/kdb5_ldap_util.8.gz man/man8/kdb5_util.8.gz man/man8/kadmind.8.gz man/man8/kprop.8.gz man/man8/kpropd.8.gz man/man8/kproplog.8.gz man/man8/sserver.8.gz sbin/gss-server sbin/kadmin.local sbin/kadmind %%LDAP%%sbin/kdb5_ldap_util sbin/kdb5_util sbin/kprop sbin/kpropd sbin/kproplog sbin/krb5-send-pr sbin/krb5kdc sbin/sim_server sbin/sserver sbin/uuserver 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/locale/en_US/LC_MESSAGES/mit-krb5.mo -@exec mkdir -p %D/var/krb5kdc -@dirrmtry var/krb5kdc -@dirrmtry var -@dirrmtry share/locale/en_US/LC_MESSAGES -@dirrmtry share/locale/en_US -@dirrm lib/pkgconfig -@dirrm lib/krb5/plugins/tls -@dirrm lib/krb5/plugins/preauth -@dirrm lib/krb5/plugins/libkrb5 -@dirrm lib/krb5/plugins/kdb -@dirrm lib/krb5/plugins/authdata -@dirrm lib/krb5/plugins -@dirrm lib/krb5 -@dirrm include/gssapi -@dirrm include/gssrpc -@dirrm include/krb5 -@dirrm include/kadm5 -@dirrm share/et -@dirrm share/examples/krb5 +@dir lib/krb5/plugins/authdata +@dir lib/krb5/plugins/libkrb5 +@dir var/run/krb5kdc +@dir var/krb5kdc