diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/mit-krb5/Makefile | 6 | ||||
| -rw-r--r-- | security/mit-krb5/PLIST | 13 | ||||
| -rw-r--r-- | security/mit-krb5/distinfo | 6 | ||||
| -rw-r--r-- | security/mit-krb5/options.mk | 16 | ||||
| -rw-r--r-- | security/mit-krb5/patches/patch-aclocal.m4 | 4 | ||||
| -rw-r--r-- | security/mit-krb5/patches/patch-config_libnover.in | 20 |
6 files changed, 43 insertions, 22 deletions
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index 46609259b1f..8d4b9a56033 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.100 2019/05/06 08:20:32 wiz Exp $ +# $NetBSD: Makefile,v 1.101 2019/07/12 15:40:55 jperkin Exp $ DISTNAME= krb5-1.16.2 PKGNAME= mit-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/ @@ -69,6 +69,8 @@ INSTALLATION_DIRS= bin include/gssapi include/gssrpc ${PKGINFODIR} \ lib/krb5/plugins/tls include/krb5 include/kadm5 \ lib/pkgconfig +.include "options.mk" + pre-configure: cd ${WRKSRC} && autoconf -I ${WRKSRC} -f diff --git a/security/mit-krb5/PLIST b/security/mit-krb5/PLIST index d1b2aaeb609..07dba6c1da8 100644 --- a/security/mit-krb5/PLIST +++ b/security/mit-krb5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2018/12/21 15:45:13 adam Exp $ +@comment $NetBSD: PLIST,v 1.21 2019/07/12 15:40:55 jperkin Exp $ bin/compile_et bin/gss-client bin/k5srvutil @@ -61,10 +61,11 @@ include/krb5/pwqual_plugin.h include/profile.h include/verto-module.h include/verto.h -lib/krb5/plugins/kdb/libdb2.la -lib/krb5/plugins/preauth/libotp.la -lib/krb5/plugins/preauth/libpkinit.la -lib/krb5/plugins/tls/libk5tls.la +lib/krb5/plugins/kdb/db2.la +${PLIST.ldap}lib/krb5/plugins/kdb/kldap.la +lib/krb5/plugins/preauth/otp.la +lib/krb5/plugins/preauth/pkinit.la +lib/krb5/plugins/tls/k5tls.la lib/libcom_err.la lib/libgssapi_krb5.la lib/libgssrpc.la @@ -74,6 +75,7 @@ lib/libkadm5clnt_mit.la lib/libkadm5srv.la lib/libkadm5srv_mit.la lib/libkdb5.la +${PLIST.ldap}lib/libkdb_ldap.la lib/libkrad.la lib/libkrb5.la lib/libkrb5support.la @@ -119,6 +121,7 @@ man/man8/sserver.8 sbin/gss-server sbin/kadmin.local sbin/kadmind +${PLIST.ldap}sbin/kdb5_ldap_util sbin/kdb5_util sbin/kprop sbin/kpropd diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo index 295157afe26..be4f6698f8a 100644 --- a/security/mit-krb5/distinfo +++ b/security/mit-krb5/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.68 2019/05/06 14:06:05 wiz Exp $ +$NetBSD: distinfo,v 1.69 2019/07/12 15:40:55 jperkin Exp $ SHA1 (krb5-1.16.2.tar.gz) = 6d6ef205194be386fb5f4e6bef32cb9fc79e853b RMD160 (krb5-1.16.2.tar.gz) = 76188113d13eb9667d6057fe23d653a3d09d4817 SHA512 (krb5-1.16.2.tar.gz) = 738c071a90e0f38680bb17bdcf950310bc4549f3cb851e1d34de11239ae88178e6ee1a5e5d48c6d3efef544339b07d22dba5347dd763a4266d8d4df7cf47afc9 Size (krb5-1.16.2.tar.gz) = 9652415 bytes SHA1 (patch-Makefile.in) = adacbcb9d569107e6b7af9b0e7ee177f79a9103c -SHA1 (patch-aclocal.m4) = f94e587c4b3e15bcf7dde215cf146ba077202218 +SHA1 (patch-aclocal.m4) = 07b5d9ae38c74eaea6ba62aed9062dca1bf7f3fb SHA1 (patch-build-tools_krb5-config.in) = 4ab922df1d86d86f9ef043f2c5cdf048c0477d3a SHA1 (patch-config_lib.in) = 974db26486b3239e4fcd53be7280b32c802f6007 -SHA1 (patch-config_libnover.in) = 53f539cf98a961483e2b4ccf278c7376dbcf52d9 +SHA1 (patch-config_libnover.in) = 9337e06792e2dcc50c610503ef842ebfc18fc08b SHA1 (patch-config_libobj.in) = c7395b9de5baf6612b8787fad55dbc051a680bfd SHA1 (patch-config_libpriv.in) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b SHA1 (patch-config_pre.in) = 255973132db9327190211214c3e33b4551bd283b diff --git a/security/mit-krb5/options.mk b/security/mit-krb5/options.mk new file mode 100644 index 00000000000..f0c2cfe75d4 --- /dev/null +++ b/security/mit-krb5/options.mk @@ -0,0 +1,16 @@ +# $NetBSD: options.mk,v 1.1 2019/07/12 15:40:55 jperkin Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.mit-krb5 +PKG_SUPPORTED_OPTIONS= ldap + +PLIST_VARS+= ldap + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mldap) +PLIST.ldap= yes +CONFIGURE_ARGS+= --with-ldap +.include "../../databases/openldap-client/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-ldap +.endif diff --git a/security/mit-krb5/patches/patch-aclocal.m4 b/security/mit-krb5/patches/patch-aclocal.m4 index ceec2f986f4..9c5e7c284e1 100644 --- a/security/mit-krb5/patches/patch-aclocal.m4 +++ b/security/mit-krb5/patches/patch-aclocal.m4 @@ -1,4 +1,4 @@ -$NetBSD: patch-aclocal.m4,v 1.1 2018/12/21 15:45:13 adam Exp $ +$NetBSD: patch-aclocal.m4,v 1.2 2019/07/12 15:40:55 jperkin Exp $ Don't make sunpro warnings into errors (warnings are seen in gcc too) Add --enable-pkgsrc-libtool option @@ -56,7 +56,7 @@ Add --enable-pkgsrc-libtool option + LIBINSTLIST=install-libtool + DEPLIBEXT=$LALIBEXT + DEPSTLIBEXT=$LALIBEXT -+ PLUGIN='lib$(LIBBASE)$(LALIBEXT)' ++ PLUGIN='$(LIBBASE)$(LALIBEXT)' + PLUGININST=install-libtool + CC_LINK="$CC_LINK_LIBTOOL" + INSTALL_LIBTOOL='$(LIBTOOL) --mode=install' diff --git a/security/mit-krb5/patches/patch-config_libnover.in b/security/mit-krb5/patches/patch-config_libnover.in index 92805ecea89..ea3023588c4 100644 --- a/security/mit-krb5/patches/patch-config_libnover.in +++ b/security/mit-krb5/patches/patch-config_libnover.in @@ -1,9 +1,9 @@ -$NetBSD: patch-config_libnover.in,v 1.2 2018/06/15 20:46:01 tez Exp $ +$NetBSD: patch-config_libnover.in,v 1.3 2019/07/12 15:40:55 jperkin Exp $ Add --enable-pkgsrc-libtool option (was patch-ci) ---- config/libnover.in.orig 2016-02-29 19:50:13.000000000 +0000 +--- config/libnover.in.orig 2018-11-01 23:51:07.000000000 +0000 +++ config/libnover.in @@ -20,8 +20,10 @@ LIBPREFIX= @@ -21,15 +21,15 @@ Add --enable-pkgsrc-libtool option set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist $(RANLIB) $@ -+lib$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) ++$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/$(LIBBASE)$(LALIBEXT) + $(RM) $@ -+ $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@ ++ $(LN_S) ${TOPLIBD}/$(LIBBASE)$(LALIBEXT) $@ + -+../lib$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) ++../$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/$(LIBBASE)$(LALIBEXT) + $(RM) $@ -+ $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@ ++ $(LN_S) ${TOPLIBD}/$(LIBBASE)$(LALIBEXT) $@ + -+${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS) ++${TOPLIBD}/$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS) + $(RM) $@ + @echo "building $(LIBBASE) libtool archive ($(LIBMAJOR).$(LIBMINOR))" + @dirs=`echo $(LAOBJLISTS) | \ @@ -47,7 +47,7 @@ Add --enable-pkgsrc-libtool option clean-libs: $(RM) $(LIBBASE)$(DYNOBJEXT) -+ $(LIBTOOL) --mode=uninstall $(RM) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) ++ $(LIBTOOL) --mode=uninstall $(RM) ${TOPLIBD}/$(LIBBASE)$(LALIBEXT) $(RM) binutils.versions osf1.exports darwin.exports hpux.exports clean-liblinks: @@ -56,8 +56,8 @@ Add --enable-pkgsrc-libtool option $(RM) $(DESTDIR)$(MODULE_INSTALL_DIR)/$(LIBBASE)$(DYNOBJEXT) $(INSTALL_SHLIB) $(LIBBASE)$(DYNOBJEXT) $(DESTDIR)$(MODULE_INSTALL_DIR) +install-libtool: -+ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(MODULE_INSTALL_DIR)/lib$(LIBBASE)$(LALIBEXT) -+ $(LIBTOOL) --mode=install $(INSTALL_SHLIB) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $(DESTDIR)$(MODULE_INSTALL_DIR)/lib$(LIBBASE)$(LALIBEXT) ++ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(MODULE_INSTALL_DIR)/$(LIBBASE)$(LALIBEXT) ++ $(LIBTOOL) --mode=install $(INSTALL_SHLIB) ${TOPLIBD}/$(LIBBASE)$(LALIBEXT) $(DESTDIR)$(MODULE_INSTALL_DIR)/$(LIBBASE)$(LALIBEXT) Makefile: $(top_srcdir)/config/libnover.in $(BUILDTOP)/config.status: $(top_srcdir)/config/shlib.conf |