Index: head/security/krb5/Makefile =================================================================== --- head/security/krb5/Makefile (revision 378416) +++ head/security/krb5/Makefile (revision 378417) @@ -1,138 +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 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}" 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 +.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}; \ done | ${TAIL} -r >> ${TMPPLIST} .endif .if ${PORT_OPTIONS:MKRB5_HTML} for i in $${html_dirs}; do \ ${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \ done | ${TAIL} -r >> ${TMPPLIST} .endif ${ECHO_CMD} @dirrm 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 Index: head/security/krb5/distinfo =================================================================== --- head/security/krb5/distinfo (revision 378416) +++ head/security/krb5/distinfo (revision 378417) @@ -1,2 +1,4 @@ SHA256 (krb5-1.13-signed.tar) = dc8f79ae9ab777d0f815e84ed02ac4ccfe3d5826eb4947a195dfce9fd95a9582 SIZE (krb5-1.13-signed.tar) = 12083200 +SHA256 (2015-001-patch-r113.txt) = c41cb0dd88abb53543697a6e91832d6e0639a99a811c3092904eff03fa4b5ec6 +SIZE (2015-001-patch-r113.txt) = 12569 Index: head/security/krb5-111/Makefile =================================================================== --- head/security/krb5-111/Makefile (revision 378416) +++ head/security/krb5-111/Makefile (revision 378417) @@ -1,134 +1,135 @@ # Created by: nectar@FreeBSD.org # $FreeBSD$ PORTNAME= krb5 PORTVERSION= 1.11.5 -PORTREVISION= 3 +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 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}" 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}; \ done | ${TAIL} -r >> ${TMPPLIST} .endif .if ${PORT_OPTIONS:MKRB5_HTML} for i in $${html_dirs}; do \ ${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \ done | ${TAIL} -r >> ${TMPPLIST} .endif ${ECHO_CMD} @dirrm 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 Index: head/security/krb5-111/distinfo =================================================================== --- head/security/krb5-111/distinfo (revision 378416) +++ head/security/krb5-111/distinfo (revision 378417) @@ -1,2 +1,4 @@ SHA256 (krb5-1.11.5-signed.tar) = d3cee29a50b510526fa692c7c23832df60d4d1cfa66de21e288a897bed6b98c2 SIZE (krb5-1.11.5-signed.tar) = 11714560 +SHA256 (2015-001-patch-r111.txt) = d7e1ac2abf76e546680d2789d11aaafe3119a13bbdcd1008b742efea016816e2 +SIZE (2015-001-patch-r111.txt) = 12128 Index: head/security/krb5-112/Makefile =================================================================== --- head/security/krb5-112/Makefile (revision 378416) +++ head/security/krb5-112/Makefile (revision 378417) @@ -1,140 +1,142 @@ # 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 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}" 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} USES+= readline:port 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}; \ done | ${TAIL} -r >> ${TMPPLIST} .endif .if ${PORT_OPTIONS:MKRB5_HTML} for i in $${html_dirs}; do \ ${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \ done | ${TAIL} -r >> ${TMPPLIST} .endif ${ECHO_CMD} @dirrm 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 Index: head/security/krb5-112/distinfo =================================================================== --- head/security/krb5-112/distinfo (revision 378416) +++ head/security/krb5-112/distinfo (revision 378417) @@ -1,2 +1,4 @@ SHA256 (krb5-1.12.2-signed.tar) = 09bd180107b5c2b3b7378c57c023fb02a103d4cac39d6f2dd600275d7a4f3744 SIZE (krb5-1.12.2-signed.tar) = 11991040 +SHA256 (2015-001-patch-r112.txt) = 75d1d070293fef7faa2c5ffbe8de4afaefb95449564e7dd5da458588ba637449 +SIZE (2015-001-patch-r112.txt) = 12130