diff options
author | joerg <joerg> | 2015-01-04 12:07:51 +0000 |
---|---|---|
committer | joerg <joerg> | 2015-01-04 12:07:51 +0000 |
commit | 4ee38e2bfe4960b3bd5e6483b855f70891750500 (patch) | |
tree | bae9d56d09beec2e10c41c4075b813d9b38afae8 | |
parent | 798b6153bec69e1c8b04abb2b1f9c123a20ac0d4 (diff) | |
download | pkgsrc-4ee38e2bfe4960b3bd5e6483b855f70891750500.tar.gz |
At long last, remove KerberosIV support. Just use ROT13 if you need a
similar encryption strength.
29 files changed, 1 insertions, 911 deletions
diff --git a/security/Makefile b/security/Makefile index 5d1d11a69e8..91bd8c31eb9 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.538 2015/01/02 12:53:35 imil Exp $ +# $NetBSD: Makefile,v 1.539 2015/01/04 12:07:51 joerg Exp $ # COMMENT= Security tools @@ -116,7 +116,6 @@ SUBDIR+= knc SUBDIR+= kpcli SUBDIR+= kssh SUBDIR+= kstart -SUBDIR+= kth-krb4 SUBDIR+= kwalletmanager SUBDIR+= lasso SUBDIR+= libassuan diff --git a/security/kth-krb4/DESCR b/security/kth-krb4/DESCR deleted file mode 100644 index f8bf6e81c04..00000000000 --- a/security/kth-krb4/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -This is a severly hacked up version of Eric Young's eBones-p9 kerberos -version. The DES library has been updated with his 3.23 version and -numerous patches collected over the years have been applied to both -the kerberos and DES sources, most notably the CMU patches for extended -lifetimes that AFS uses. There is also support for AFS built into most -programs. diff --git a/security/kth-krb4/MESSAGE b/security/kth-krb4/MESSAGE deleted file mode 100644 index dbc1978eba6..00000000000 --- a/security/kth-krb4/MESSAGE +++ /dev/null @@ -1,17 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.4 2003/05/06 17:42:31 jmmv Exp $ - -Kth-krb4 now has been installed on your system. - -To complete the installation you'll have to configure Kerberos. -More information on how to configure Kerberos is available via the "info" -command. Sample configuration files are installed in -${PREFIX}/share/examples/kth-krb4. - -At a minimum, to configure a Kerberos client, copy -${PREFIX}/share/examples/kth-krb4/{krb.conf,krb.realms} to /etc and -customize them. Also, apply the patches provided in services-1.4.2.diff -(for NetBSD-1.4.2) or services-1.5.diff (for NetBSD-1.5/1.5.x) -to /etc/services. - -=========================================================================== diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile deleted file mode 100644 index e0728f7c77d..00000000000 --- a/security/kth-krb4/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# $NetBSD: Makefile,v 1.61 2014/02/12 23:18:33 tron Exp $ -# - -DISTNAME= krb4-1.2.2 -PKGNAME= kth-krb4-1.2.2 -PKGREVISION= 8 -CATEGORIES= security net -MASTER_SITES= ftp://ftp.pdc.kth.se/pub/krb/src/ - -MAINTAINER= wennmach@NetBSD.org -HOMEPAGE= http://www.pdc.kth.se/kth-krb/ -COMMENT= Kerberos IV distribution from KTH - -CONFLICTS+= arla-[0-9]* -CONFLICTS+= libdes-[0-9]* -CONFLICTS+= man-pages-[0-9]* -CONFLICTS+= heimdal-[0-9]* - -CRYPTO= yes - -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= yacc -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/kerberosIV - -.include "../../mk/bsd.prefs.mk" -KERBEROS_PREFIX_CMDS?= no -KRB4_PREFIX_CMDS?= ${KERBEROS_PREFIX_CMDS} -BUILD_DEFS+= KRB4_PREFIX_CMDS -.if !empty(KRB4_PREFIX_CMDS:M[yY][eE][sS]) -KTH_KRB4_TRANSFORM= s/^ftp/k4&/;\ - s/^rcp/k4&/;\ - s/^rlogin/k4&/;\ - s/^rsh/k4&/;\ - s/^su/k4&/;\ - s/^telnet/k4&/ -PLIST_SUBST+= KRB4_PREFIX=k4 -.else -KTH_KRB4_TRANSFORM= s/^ftp$$/k4&/ # always k4ftp -PLIST_SUBST+= KRB4_PREFIX= -.endif -CONFIGURE_ARGS+= --program-transform=${KTH_KRB4_TRANSFORM:Q} - -INFO_FILES= yes -EXAMPLEDIR= ${PREFIX}/share/examples/kth-krb4 - -SUBST_CLASSES+= paths -SUBST_FILES.paths= ${WRKSRC}/lib/kafs/kafs.h -SUBST_SED.paths+= -e 's|/usr/arla/etc/|${PKG_SYSCONFDIR}|g' -SUBST_STAGE.paths= post-patch - -# On some systems, kth-krb4's libroken installs a glob.h to compensate -# for the system not having one. Please turn PLIST support for this -# on narrowly. -INSTALLS_GLOB= no -.if ${INSTALLS_GLOB} == yes -PLIST.glob= yes -.endif - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --with-readline=yes \ - --with-readline-lib=${BUILDLINK_PREFIX.editlinereadline}/lib \ - --with-readline-include=${BUILDLINK_PREFIX.editlinereadline}/include/readline \ - ac_cv_funclib_bswap16=yes \ - ac_cv_funclib_bswap32=yes - -.include "../../mk/readline.buildlink3.mk" -.endif - -PLIST_VARS+= glob wantdes - -.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" -CPPFLAGS+= -DOPENSSL_DES_LIBDES_COMPATIBILITY -.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "amd64" -CFLAGS+= -fPIC -.endif -.else -PLIST.wantdes= yes -.endif - -post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLEDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${DESTDIR}${EXAMPLEDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/krb.realms ${DESTDIR}${EXAMPLEDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/inetd.conf.changes ${DESTDIR}${EXAMPLEDIR} - ${INSTALL_DATA} ${FILESDIR}/services-1.4.2.diff ${DESTDIR}${EXAMPLEDIR} - ${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${DESTDIR}${EXAMPLEDIR} - -SPECIAL_PERMS+= bin/${KRB4_PREFIX}rsh ${SETUID_ROOT_PERMS} -SPECIAL_PERMS+= bin/${KRB4_PREFIX}rcp ${SETUID_ROOT_PERMS} -SPECIAL_PERMS+= bin/${KRB4_PREFIX}rlogin ${SETUID_ROOT_PERMS} -SPECIAL_PERMS+= bin/${KRB4_PREFIX}su ${SETUID_ROOT_PERMS} -SPECIAL_PERMS+= bin/otp ${SETUID_ROOT_PERMS} - -.include "../../security/openssl/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST deleted file mode 100644 index e24928f59e4..00000000000 --- a/security/kth-krb4/PLIST +++ /dev/null @@ -1,179 +0,0 @@ -@comment $NetBSD: PLIST,v 1.18 2011/11/28 19:33:13 marino Exp $ -bin/afslog -bin/compile_et -bin/k4ftp -bin/kadmin -bin/kauth -bin/kdestroy -bin/kinit -bin/kip -bin/klist -bin/kpasswd -bin/${KRB4_PREFIX}rcp -bin/${KRB4_PREFIX}rlogin -bin/${KRB4_PREFIX}rsh -bin/${KRB4_PREFIX}su -bin/${KRB4_PREFIX}telnet -bin/krb4-config -bin/ksrvtgt -bin/kstring2key -bin/kx -bin/login -bin/mk_cmds -bin/otp -bin/otpprint -bin/pagsh -bin/pfrom -bin/rxtelnet -bin/rxterm -bin/sample_client -bin/simple_client -bin/tenletxr -bin/xnlock -bin/zrefresh -include/kerberosIV/acl.h -include/kerberosIV/base64.h -include/kerberosIV/com_err.h -include/kerberosIV/com_right.h -include/kerberosIV/des.h -include/kerberosIV/editline.h -include/kerberosIV/getarg.h -${PLIST.glob}include/kerberosIV/glob.h -include/kerberosIV/kadm.h -include/kerberosIV/kadm_err.h -include/kerberosIV/kafs.h -include/kerberosIV/kdc.h -include/kerberosIV/klog.h -include/kerberosIV/krb-archaeology.h -include/kerberosIV/krb-protos.h -include/kerberosIV/krb.h -include/kerberosIV/krb_db.h -include/kerberosIV/krb_err.h -include/kerberosIV/krb_log.h -include/kerberosIV/ktypes.h -${PLIST.wantdes}include/kerberosIV/md4.h -${PLIST.wantdes}include/kerberosIV/md5.h -include/kerberosIV/otp.h -include/kerberosIV/parse_bytes.h -include/kerberosIV/parse_time.h -include/kerberosIV/parse_units.h -include/kerberosIV/prot.h -include/kerberosIV/protos.h -${PLIST.wantdes}include/kerberosIV/rc4.h -include/kerberosIV/resolve.h -include/kerberosIV/roken-common.h -include/kerberosIV/roken.h -include/kerberosIV/rtbl.h -${PLIST.wantdes}include/kerberosIV/sha.h -include/kerberosIV/sl.h -include/kerberosIV/ss/ss.h -include/kerberosIV/xdbm.h -info/kth-krb.info -lib/libacl.la -lib/libcom_err.la -${PLIST.wantdes}lib/libdes.la -lib/libeditline.la -lib/libkadm.la -lib/libkafs.la -lib/libkdb.la -lib/libkrb.la -lib/libotp.la -lib/libroken.la -lib/libsl.la -lib/libss.la -libexec/${KRB4_PREFIX}ftpd -libexec/${KRB4_PREFIX}rlogind -libexec/${KRB4_PREFIX}rshd -libexec/${KRB4_PREFIX}telnetd -libexec/kadmind -libexec/kauthd -libexec/kerberos -libexec/kip-join-network -libexec/kipd -libexec/kipd-control -libexec/kprop -libexec/kpropd -libexec/kxd -libexec/movemail -libexec/popper -libexec/push -libexec/sample_server -libexec/simple_server -man/man1/${KRB4_PREFIX}rcp.1 -man/man1/${KRB4_PREFIX}rlogin.1 -man/man1/${KRB4_PREFIX}rsh.1 -man/man1/${KRB4_PREFIX}su.1 -man/man1/${KRB4_PREFIX}telnet.1 -man/man1/afslog.1 -man/man1/k4ftp.1 -man/man1/kauth.1 -man/man1/kdestroy.1 -man/man1/kerberos.1 -man/man1/kinit.1 -man/man1/klist.1 -man/man1/krb4-config.1 -man/man1/ksrvtgt.1 -man/man1/kx.1 -man/man1/login.1 -man/man1/otp.1 -man/man1/otpprint.1 -man/man1/pagsh.1 -man/man1/pfrom.1 -man/man1/rxtelnet.1 -man/man1/rxterm.1 -man/man1/tenletxr.1 -man/man1/xnlock.1 -man/man3/acl_check.3 -man/man3/arg_printusage.3 -${PLIST.wantdes}man/man3/des_crypt.3 -man/man3/editline.3 -man/man3/getarg.3 -man/man3/k_afs_cell_of_file.3 -man/man3/k_hasafs.3 -man/man3/k_pioctl.3 -man/man3/k_setpag.3 -man/man3/k_unlog.3 -man/man3/kafs.3 -man/man3/kerberos.3 -man/man3/krb_afslog.3 -man/man3/krb_afslog_uid.3 -man/man3/krb_realmofhost.3 -man/man3/krb_sendauth.3 -man/man3/krb_set_tkt_string.3 -man/man3/kuserok.3 -man/man3/tf_util.3 -man/man5/${KRB4_PREFIX}ftpusers.5 -man/man5/krb.conf.5 -man/man5/krb.extra.5 -man/man5/krb.realms.5 -man/man5/login.access.5 -man/man8/${KRB4_PREFIX}ftpd.8 -man/man8/${KRB4_PREFIX}rlogind.8 -man/man8/${KRB4_PREFIX}rshd.8 -man/man8/${KRB4_PREFIX}telnetd.8 -man/man8/ext_srvtab.8 -man/man8/kauthd.8 -man/man8/kdb_destroy.8 -man/man8/kdb_edit.8 -man/man8/kdb_init.8 -man/man8/kdb_util.8 -man/man8/kerberos.8 -man/man8/kprop.8 -man/man8/kpropd.8 -man/man8/kstash.8 -man/man8/kxd.8 -man/man8/movemail.8 -man/man8/popper.8 -man/man8/push.8 -sbin/ext_srvtab -sbin/kdb_destroy -sbin/kdb_edit -sbin/kdb_init -sbin/kdb_util -sbin/ksrvutil -sbin/kstash -share/examples/kth-krb4/inetd.conf.changes -share/examples/kth-krb4/krb.conf -share/examples/kth-krb4/krb.realms -share/examples/kth-krb4/services-1.4.2.diff -share/examples/kth-krb4/services-1.5.diff diff --git a/security/kth-krb4/buildlink3.mk b/security/kth-krb4/buildlink3.mk deleted file mode 100644 index c99c97bdadd..00000000000 --- a/security/kth-krb4/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:56 dholland Exp $ - -BUILDLINK_TREE+= kth-krb4 - -.if !defined(KTH_KRB4_BUILDLINK3_MK) -KTH_KRB4_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.kth-krb4+= kth-krb4>=1.1.1 -BUILDLINK_ABI_DEPENDS.kth-krb4+= kth-krb4>=1.2.1nb5 -BUILDLINK_ABI_DEPENDS.kth-krb4+= kth-krb4>=1.2.1nb6 -BUILDLINK_PKGSRCDIR.kth-krb4?= ../../security/kth-krb4 -.endif # KTH_KRB4_BUILDLINK3_MK - -BUILDLINK_TREE+= -kth-krb4 diff --git a/security/kth-krb4/distinfo b/security/kth-krb4/distinfo deleted file mode 100644 index 684cd2aff61..00000000000 --- a/security/kth-krb4/distinfo +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: distinfo,v 1.14 2011/11/28 19:33:13 marino Exp $ - -SHA1 (krb4-1.2.2.tar.gz) = 41379763161d0b94646adb8847b83f92e5c985a4 -RMD160 (krb4-1.2.2.tar.gz) = 585f19767c610c31ca5be59d8cf61724739969f1 -Size (krb4-1.2.2.tar.gz) = 1876603 bytes -SHA1 (patch-aa) = 7e5978bc3e4b5c6d65cb00a092b1fa9f06e062e8 -SHA1 (patch-ab) = 94e4abdeeb0263eac7207fac120e10d190fb0f30 -SHA1 (patch-ac) = 8e3f1ea92fdb45c1d48c5f1719dcf3eb0ed2a52d -SHA1 (patch-ad) = 48ebf93893662ecc10e56e0653351f80359b12b0 -SHA1 (patch-ae) = 654d92268a6c693d566acde1a7c881dc6dea2166 -SHA1 (patch-ah) = 5d09fc774b0d35070036aebd1339b32ed38137de -SHA1 (patch-ai) = dc9db52ff819cc08753e8fe98397187df1dd0310 -SHA1 (patch-appl_ftp_ftpd_ftpcmd.y) = bdc54dd4e955b0202afd4fcd45ef6c9a08e8863d -SHA1 (patch-appl_ftp_ftpd_pathnames.h) = b55d56593aaff44b0ffd5f89fe46eccce53e5f50 -SHA1 (patch-cf_Makefile.am.common) = 259477799fd5c473ec6561c1046dd5977eb58cdb -SHA1 (patch-lib_kadm_kadm_cli_wrap.c) = c99ab4c066e03b7545b36089588ab7b6b3043d9d -SHA1 (patch-lib_krb_krb-protos.h) = 44721a1a231cc6794b298962cb1e5078fb0c5770 -SHA1 (patch-lib_krb_krb_check_auth.c) = dd8b1724ba8448f0478bb1eee1477deebc985955 -SHA1 (patch-lib_krb_mk_priv.c) = 7e55c4927021850f7f4a59ee18139d54cc9b97a1 -SHA1 (patch-lib_krb_rd_priv.c) = f2d9956089a07ffa74634e0397c71ff099134441 -SHA1 (patch-lib_krb_recvauth.c) = 036dc80a0dd452d3d323b44734b39826c8d8806c -SHA1 (patch-lib_krb_sendauth.c) = 1beb1514eae8876eae0efd758a38f1e6055942f7 -SHA1 (patch-lib_krb_solaris_compat.c) = a12a1f2338a8cf750945d8295cc2fbdd621d7d4e -SHA1 (patch-lib_roken_Makefile.in) = 2d29e181a45ba5618f409fe41ecd0c1e7e6b895b diff --git a/security/kth-krb4/files/services-1.4.2.diff b/security/kth-krb4/files/services-1.4.2.diff deleted file mode 100644 index 4ae835d8be5..00000000000 --- a/security/kth-krb4/files/services-1.4.2.diff +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: services-1.4.2.diff,v 1.1 2001/08/02 12:46:48 wennmach Exp $ -This patch is relative to NetBSD-1.4.2. - ---- /etc/services.orig Thu Apr 20 10:29:34 2000 -+++ /etc/services Thu May 4 10:38:16 2000 -@@ -52,8 +52,8 @@ - www 80/tcp http # WorldWideWeb HTTP - www 80/udp # HyperText Transfer Protocol - link 87/tcp ttylink --kerberos 88/tcp krb5 # Kerberos v5 --kerberos 88/udp -+#kerberos 88/tcp krb5 # Kerberos v5 -+#kerberos 88/udp - supdup 95/tcp - # 100 - reserved - hostnames 101/tcp hostname # usually from sri-nic -@@ -122,6 +122,8 @@ - ldap 389/tcp # Lightweight Directory Access Protocol - ldap 389/udp # Lightweight Directory Access Protocol - -+kpasswd 464/udp # password changing -+kpasswd 464/tdp # password changing - # - # UNIX specific services - # -@@ -181,16 +183,29 @@ - # Kerberos (Project Athena/MIT) services - # Note that these are for Kerberos v4, and are unofficial. - # -+#kerberos 88/tcp krb5 # Kerberos v5 -+#kerberos 88/udp -+kerberos-sec 88/tcp krb5 # Kerberos secondary port TCP -+kerberos-sec 88/udp # Kerberos secondary port UDP - klogin 543/tcp # Kerberos `rlogin' - kshell 544/tcp krcmd # Kerberos `rsh' -+ekshell 545/tcp # Kerberos encrypted remote shell -kfall -+kerberos-adm 749/udp # v5 kadmin - kerberos-adm 749/tcp # Kerberos `kadmin' (v5) --kerberos4 750/udp kdc # Kerberos (server) udp --kerberos4 750/tcp kdc # Kerberos (server) tcp --kerberos-master 751/udp # Kerberos admin server udp --kerberos-master 751/tcp # Kerberos admin server tcp -+kerberos4 750/udp kdc kerberos kerberos-iv # Kerberos (server) udp -+kerberos4 750/tcp kdc kerberos kerberos-iv # Kerberos (server) tcp -+kerberos-master 751/udp kerberos_master # Kerberos admin server udp -+kerberos-master 751/tcp kerberos_master # Kerberos admin server tcp -+krb_prop 754/tcp hprop # Kerberos slave propagation - krbupdate 760/tcp kreg # BSD Kerberos registration - kpasswd 761/tcp kpwd # BSD Kerberos `passwd' -+kpop 1109/tcp # Pop with Kerberos - eklogin 2105/tcp # Kerberos encrypted `rlogin' -+ekshell2 2106/tcp # What U of Colorado @ Boulder uses? -+rkinit 2108/tcp # Kerberos remote kinit -+kx 2111/tcp # X over kerberos -+kip 2112/tcp # IP over kerberos -+kauth 2120/tcp # Remote kauth - - # - # Unofficial but necessary (for NetBSD) services diff --git a/security/kth-krb4/files/services-1.5.diff b/security/kth-krb4/files/services-1.5.diff deleted file mode 100644 index b20e0bc408f..00000000000 --- a/security/kth-krb4/files/services-1.5.diff +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: services-1.5.diff,v 1.1 2001/08/02 12:46:49 wennmach Exp $ -This patch is relative to NetBSD-1.5/1.5.1 - ---- /etc/services.orig Wed Aug 1 19:29:26 2001 -+++ /etc/services Wed Aug 1 19:42:33 2001 -@@ -52,8 +52,8 @@ - www 80/tcp http # WorldWideWeb HTTP - www 80/udp # HyperText Transfer Protocol - link 87/tcp ttylink --kerberos 88/tcp krb5 # Kerberos v5 --kerberos 88/udp -+#kerberos 88/tcp krb5 # Kerberos v5 -+#kerberos 88/udp - supdup 95/tcp - # 100 - reserved - hostnames 101/tcp hostname # usually from sri-nic -@@ -211,11 +211,11 @@ - kshell 544/tcp krcmd # Kerberos `rsh' - ekshell 545/tcp # Encrypted kshell - kerberos-adm 749/tcp # Kerberos `kadmin' (v5) --kerberos-iv 750/udp kdc kerberos4 # Kerberos (server) udp --kerberos-iv 750/tcp kdc kerberos4 # Kerberos (server) tcp --kerberos-master 751/udp # Kerberos admin server udp --kerberos-master 751/tcp # Kerberos admin server tcp --hprop 754/tcp # Heimdal KDC database propagation -+#kerberos-iv 750/udp kdc kerberos4 # Kerberos (server) udp -+#kerberos-iv 750/tcp kdc kerberos4 # Kerberos (server) tcp -+#kerberos-master 751/udp # Kerberos admin server udp -+#kerberos-master 751/tcp # Kerberos admin server tcp -+#hprop 754/tcp # Heimdal KDC database propagation - krbupdate 760/tcp kreg # BSD Kerberos registration - kpasswd 761/tcp kpwd # BSD Kerberos `passwd' - kpop 1109/tcp # Kerberos POP server -@@ -265,3 +265,21 @@ - codasrv 2432/udp # server port - codasrv-se 2433/tcp # tcp side effects - codasrv-se 2433/udp # udp sftp side effect -+ -+# -+# KTH Kerberos IV implementation -+# Substitutes and/or adds alternate names with respect to Kerberos V -+# services. -+# -+kerberos-sec 88/tcp krb5 # Kerberos secondary port TCP -+kerberos-sec 88/udp # Kerberos secondary port UDP -+kerberos-adm 749/udp # v5 kadmin -+kerberos-iv 750/udp kdc kerberos kerberos4 # Kerberos (server) udp -+kerberos-iv 750/tcp kdc kerberos kerberos4 # Kerberos (server) tcp -+kerberos-master 751/udp kerberos_master # Kerberos admin server udp -+kerberos-master 751/tcp kerberos_master # Kerberos admin server tcp -+hprop 754/tcp krb_prop # Heimdal KDC database propagation -+rkinit 2108/tcp # Kerberos remote kinit -+kx 2111/tcp # X over kerberos -+kip 2112/tcp # IP over kerberos -+kauth 2120/tcp # Remote kauth diff --git a/security/kth-krb4/hacks.mk b/security/kth-krb4/hacks.mk deleted file mode 100644 index ab1c5dd4059..00000000000 --- a/security/kth-krb4/hacks.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2007/05/30 09:10:26 schmonz Exp $ - -.include "../../mk/bsd.prefs.mk" - -# Fix build on OS X with BIND9 system resolver -.if ${OPSYS} == "Darwin" -PKG_HACKS+= macosx-bind9-bind8compat -CFLAGS+= -DBIND_8_COMPAT=1 -.endif diff --git a/security/kth-krb4/patches/patch-aa b/security/kth-krb4/patches/patch-aa deleted file mode 100644 index c7c4343c0bb..00000000000 --- a/security/kth-krb4/patches/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2011/11/28 19:33:13 marino Exp $ - ---- appl/bsd/encrypt.c.orig 2001-09-09 20:27:22.000000000 +0000 -+++ appl/bsd/encrypt.c -@@ -63,12 +63,15 @@ RCSID("$Id: encrypt.c,v 1.6 2001/09/09 2 - *((c)++)=(unsigned char)(((l) )&0xff)) - - /* This has some uglies in it but it works - even over sockets. */ --extern int errno; - int des_rw_mode=DES_PCBC_MODE; - int LEFT_JUSTIFIED = 0; - - int -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+bsd_des_enc_read(int fd, char *buf, int len, des_key_schedule sched, des_cblock *iv) -+#else - bsd_des_enc_read(int fd, char *buf, int len, struct des_ks_struct *sched, des_cblock *iv) -+#endif - { - /* data to be unencrypted */ - int net_num=0; -@@ -213,7 +216,11 @@ bsd_des_enc_read(int fd, char *buf, int - } - - int -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+bsd_des_enc_write(int fd, char *buf, int len, des_key_schedule sched, des_cblock *iv) -+#else - bsd_des_enc_write(int fd, char *buf, int len, struct des_ks_struct *sched, des_cblock *iv) -+#endif - { - long rnum; - int i,j,k,outnum; diff --git a/security/kth-krb4/patches/patch-ab b/security/kth-krb4/patches/patch-ab deleted file mode 100644 index 43144097209..00000000000 --- a/security/kth-krb4/patches/patch-ab +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2006/04/12 19:43:31 joerg Exp $ - ---- cf/install-catman.sh.orig 2001-09-29 16:05:38.000000000 +0000 -+++ cf/install-catman.sh -@@ -17,13 +17,6 @@ for f in "$@"; do - catdir="$manbase/cat$section" - c="$base.cat$section" - -- if test -f "$srcdir/$c"; then -- if test \! -d "$catdir"; then -- eval "$mkinstalldirs $catdir" -- fi -- eval "echo $INSTALL_DATA $srcdir/$c $catdir/$base.$suffix" -- eval "$INSTALL_DATA $srcdir/$c $catdir/$base.$suffix" -- fi - for link in `sed -n -e '/SYNOPSIS/q;/DESCRIPTION/q;s/^\.Nm \([^ ]*\).*/\1/p' $srcdir/$f`; do - if [ "$link" != "$base" ]; then - target="$mandir/$link.$section" -@@ -36,18 +29,6 @@ for f in "$@"; do - break - fi - done -- if test -f "$srcdir/$c"; then -- target="$catdir/$link.$suffix" -- for cmd in "ln -f $catdir/$base.$suffix $target" \ -- "ln -fs $base.$suffix $target" \ -- "cp -f $catdir/$base.$suffix $target" -- do -- if eval "$cmd"; then -- eval echo "$cmd" -- break -- fi -- done -- fi - fi - done - done diff --git a/security/kth-krb4/patches/patch-ac b/security/kth-krb4/patches/patch-ac deleted file mode 100644 index bc66ae125db..00000000000 --- a/security/kth-krb4/patches/patch-ac +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2006/09/07 08:46:20 wennmach Exp $ - -Do not install the des executable, nor the des.1 man page. This avoids -a conflict with the openssl package, which installs an executable with -the same name (and functionality) into the same place. - ---- lib/des/Makefile.am.orig Mon Apr 1 11:48:01 2002 -+++ lib/des/Makefile.am Mon Apr 1 11:49:39 2002 -@@ -13,7 +13,7 @@ - - TESTS = destest mdtest md5crypt_test - CHECK_LOCAL = --bin_PROGRAMS = des #rpw speed -+bin_PROGRAMS = - - des_SOURCES = des.c des_ver.h - -@@ -59,7 +59,7 @@ - EXTRA_libdes_la_SOURCES = dllmain.c passwd_dialog.aps passwd_dialog.clw \ - passwd_dialog.rc passwd_dialog.res passwd_dlg.c passwd_dlg.h resource.h - --man_MANS = des.1 des_crypt.3 -+man_MANS = des_crypt.3 - - ## this is an awful lot of junk, but it's just as well to include everything - EXTRA_DIST = \ diff --git a/security/kth-krb4/patches/patch-ad b/security/kth-krb4/patches/patch-ad deleted file mode 100644 index 22d3a688479..00000000000 --- a/security/kth-krb4/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2006/09/07 08:46:20 wennmach Exp $ - -Do not install man/man5/krb.equiv.5 to avoid a conflict with the -cyrus-imapd package. - ---- lib/krb/Makefile.am.orig Mon Apr 1 11:53:16 2002 -+++ lib/krb/Makefile.am Mon Apr 1 11:53:42 2002 -@@ -18,7 +18,7 @@ - noinst_PROGRAMS = sizetest - - man_MANS = kerberos.1 kerberos.3 krb_realmofhost.3 krb_sendauth.3 \ -- krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 krb.equiv.5 \ -+ krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 \ - krb.extra.5 krb.realms.5 - - diff --git a/security/kth-krb4/patches/patch-ae b/security/kth-krb4/patches/patch-ae deleted file mode 100644 index c483640e0b2..00000000000 --- a/security/kth-krb4/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2008/09/17 16:11:28 joerg Exp $ - ---- lib/roken/roken.awk.orig 2008-09-17 17:44:57.000000000 +0200 -+++ lib/roken/roken.awk -@@ -15,7 +15,7 @@ BEGIN { - print "puts(\"\");" - } - --$1 == "\#ifdef" || $1 == "\#ifndef" || $1 == "\#if" || $1 == "\#else" || $1 == "\#elif" || $1 == "\#endif" || $1 == "#ifdef" || $1 == "#ifndef" || $1 == "#if" || $1 == "#else" || $1 == "#elif" || $1 == "#endif" { -+$1 == "#ifdef" || $1 == "#ifndef" || $1 == "#if" || $1 == "#else" || $1 == "#elif" || $1 == "#endif" || $1 == "#ifdef" || $1 == "#ifndef" || $1 == "#if" || $1 == "#else" || $1 == "#elif" || $1 == "#endif" { - print $0; - next - } diff --git a/security/kth-krb4/patches/patch-ah b/security/kth-krb4/patches/patch-ah deleted file mode 100644 index 236381e7f5b..00000000000 --- a/security/kth-krb4/patches/patch-ah +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2006/09/07 08:46:20 wennmach Exp $ - -Do not install the des executable, nor the des.1 man page. This avoids -a conflict with the openssl package, which installs an executable with -the same name (and functionality) into the same place. - ---- lib/des/Makefile.in.orig Wed Oct 23 06:39:44 2002 -+++ lib/des/Makefile.in Mon Oct 28 15:26:36 2002 -@@ -213,7 +213,7 @@ - - TESTS = destest mdtest md5crypt_test - CHECK_LOCAL = --bin_PROGRAMS = des #rpw speed -+bin_PROGRAMS = - - des_SOURCES = des.c des_ver.h - -@@ -261,7 +261,7 @@ - passwd_dialog.rc passwd_dialog.res passwd_dlg.c passwd_dlg.h resource.h - - --man_MANS = des.1 des_crypt.3 -+man_MANS = des_crypt.3 - - EXTRA_DIST = \ - COPYRIGHT \ -@@ -322,7 +322,7 @@ - pcbc_enc.lo qud_cksm.lo rc4_skey.lo rc4_enc.lo read_pwd.lo \ - rnd_keys.lo set_key.lo sha.lo str2key.lo xcbc_enc.lo - libdes_la_OBJECTS = $(am_libdes_la_OBJECTS) --bin_PROGRAMS = des$(EXEEXT) -+bin_PROGRAMS = - check_PROGRAMS = destest$(EXEEXT) mdtest$(EXEEXT) md5crypt_test$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - diff --git a/security/kth-krb4/patches/patch-ai b/security/kth-krb4/patches/patch-ai deleted file mode 100644 index b0699961739..00000000000 --- a/security/kth-krb4/patches/patch-ai +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2006/09/07 08:46:20 wennmach Exp $ - -Do not install man/man5/krb.equiv.5 to avoid a conflict with the -cyrus-imapd package. - ---- lib/krb/Makefile.in.orig Thu Apr 4 16:37:53 2002 -+++ lib/krb/Makefile.in Thu Apr 4 16:38:11 2002 -@@ -216,7 +216,7 @@ - noinst_PROGRAMS = sizetest - - man_MANS = kerberos.1 kerberos.3 krb_realmofhost.3 krb_sendauth.3 \ -- krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 krb.equiv.5 \ -+ krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 \ - krb.extra.5 krb.realms.5 - - diff --git a/security/kth-krb4/patches/patch-appl_ftp_ftpd_ftpcmd.y b/security/kth-krb4/patches/patch-appl_ftp_ftpd_ftpcmd.y deleted file mode 100644 index be9101d1ab9..00000000000 --- a/security/kth-krb4/patches/patch-appl_ftp_ftpd_ftpcmd.y +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-appl_ftp_ftpd_ftpcmd.y,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- appl/ftp/ftpd/ftpcmd.y.orig 2001-08-05 06:39:29.000000000 +0000 -+++ appl/ftp/ftpd/ftpcmd.y -@@ -103,7 +103,7 @@ static int yylex (void); - UMASK IDLE CHMOD - - AUTH ADAT PROT PBSZ CCC MIC -- CONF ENC -+ CNFX ENC - - KAUTH KLIST KDESTROY KRBTKFILE AFSLOG - LOCATE URL -@@ -695,7 +695,7 @@ rcmd - mec($3, prot_safe); - free($3); - } -- | CONF SP STRING CRLF -+ | CNFX SP STRING CRLF - { - mec($3, prot_confidential); - free($3); -@@ -984,7 +984,7 @@ struct tab cmdtab[] = { /* In order def - { "PROT", PROT, STR1, 1, "<sp> prot-level" }, - { "CCC", CCC, ARGS, 1, "" }, - { "MIC", MIC, STR1, 1, "<sp> integrity command" }, -- { "CONF", CONF, STR1, 1, "<sp> confidentiality command" }, -+ { "CONF", CNFX, STR1, 1, "<sp> confidentiality command" }, - { "ENC", ENC, STR1, 1, "<sp> privacy command" }, - - /* RFC2389 */ diff --git a/security/kth-krb4/patches/patch-appl_ftp_ftpd_pathnames.h b/security/kth-krb4/patches/patch-appl_ftp_ftpd_pathnames.h deleted file mode 100644 index 518241cfa54..00000000000 --- a/security/kth-krb4/patches/patch-appl_ftp_ftpd_pathnames.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-appl_ftp_ftpd_pathnames.h,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- appl/ftp/ftpd/pathnames.h.orig 2002-08-12 15:09:14.000000000 +0000 -+++ appl/ftp/ftpd/pathnames.h -@@ -49,7 +49,9 @@ - #define _PATH_BSHELL "/bin/sh" - #endif - -+#ifndef _PATH_FTPUSERS - #define _PATH_FTPUSERS SYSCONFDIR "/ftpusers" -+#endif - #define _PATH_FTPCHROOT SYSCONFDIR "/ftpchroot" - #define _PATH_FTPWELCOME SYSCONFDIR "/ftpwelcome" - #define _PATH_FTPLOGINMESG SYSCONFDIR "/motd" diff --git a/security/kth-krb4/patches/patch-cf_Makefile.am.common b/security/kth-krb4/patches/patch-cf_Makefile.am.common deleted file mode 100644 index 13b97526131..00000000000 --- a/security/kth-krb4/patches/patch-cf_Makefile.am.common +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cf_Makefile.am.common,v 1.1 2011/03/24 05:38:01 obache Exp $ - -* require install-man before install-cat-mans to create alias links. - ---- cf/Makefile.am.common.orig 2002-08-19 16:10:25.000000000 +0000 -+++ cf/Makefile.am.common -@@ -187,7 +187,7 @@ dist-cat8-mans: - - dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans - --install-cat-mans: -+install-cat-mans: install-man - $(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS) - - install-data-local: install-cat-mans diff --git a/security/kth-krb4/patches/patch-lib_kadm_kadm_cli_wrap.c b/security/kth-krb4/patches/patch-lib_kadm_kadm_cli_wrap.c deleted file mode 100644 index d452c43e79e..00000000000 --- a/security/kth-krb4/patches/patch-lib_kadm_kadm_cli_wrap.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-lib_kadm_kadm_cli_wrap.c,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- lib/kadm/kadm_cli_wrap.c.orig 2011-11-28 02:10:03.761978000 +0000 -+++ lib/kadm/kadm_cli_wrap.c -@@ -138,7 +143,12 @@ kadm_cli_conn(void) - /* takes in the sess_key and key_schedule and sets them appropriately */ - static int - kadm_cli_keyd(des_cblock (*s_k), /* session key */ -- struct des_ks_struct *s_s) /* session key schedule */ -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule s_s -+#else -+ struct des_ks_struct *s_s -+#endif -+) /* session key schedule */ - { - CREDENTIALS cred; /* to get key data */ - int stat; diff --git a/security/kth-krb4/patches/patch-lib_krb_krb-protos.h b/security/kth-krb4/patches/patch-lib_krb_krb-protos.h deleted file mode 100644 index 7230e8dbc8a..00000000000 --- a/security/kth-krb4/patches/patch-lib_krb_krb-protos.h +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-lib_krb_krb-protos.h,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- lib/krb/krb-protos.h.orig 2001-08-26 01:46:51.000000000 +0000 -+++ lib/krb/krb-protos.h -@@ -177,7 +177,11 @@ krb_check_auth __P(( - u_int32_t checksum, - MSG_DAT *msg_data, - des_cblock *session, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else - struct des_ks_struct *schedule, -+#endif - struct sockaddr_in *laddr, - struct sockaddr_in *faddr)); - -@@ -457,7 +461,11 @@ krb_mk_priv __P(( - void *in, - void *out, - u_int32_t length, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else - struct des_ks_struct *schedule, -+#endif - des_cblock *key, - struct sockaddr_in *sender, - struct sockaddr_in *receiver)); -@@ -540,7 +548,11 @@ int32_t KRB_LIB_FUNCTION - krb_rd_priv __P(( - void *in, - u_int32_t in_length, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else - struct des_ks_struct *schedule, -+#endif - des_cblock *key, - struct sockaddr_in *sender, - struct sockaddr_in *receiver, -@@ -583,7 +595,11 @@ krb_recvauth __P(( - struct sockaddr_in *laddr, - AUTH_DAT *kdata, - char *filename, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else - struct des_ks_struct *schedule, -+#endif - char *version)); - - int KRB_LIB_FUNCTION -@@ -597,7 +613,11 @@ krb_sendauth __P(( - u_int32_t checksum, - MSG_DAT *msg_data, - CREDENTIALS *cred, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else - struct des_ks_struct *schedule, -+#endif - struct sockaddr_in *laddr, - struct sockaddr_in *faddr, - char *version)); diff --git a/security/kth-krb4/patches/patch-lib_krb_krb_check_auth.c b/security/kth-krb4/patches/patch-lib_krb_krb_check_auth.c deleted file mode 100644 index 6de326a7729..00000000000 --- a/security/kth-krb4/patches/patch-lib_krb_krb_check_auth.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-lib_krb_krb_check_auth.c,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- lib/krb/krb_check_auth.c.orig 1999-12-02 16:58:42.000000000 +0000 -+++ lib/krb/krb_check_auth.c -@@ -50,7 +50,11 @@ krb_check_auth(KTEXT packet, - u_int32_t checksum, - MSG_DAT *msg_data, - des_cblock *session, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else - struct des_ks_struct *schedule, -+#endif - struct sockaddr_in *laddr, - struct sockaddr_in *faddr) - { diff --git a/security/kth-krb4/patches/patch-lib_krb_mk_priv.c b/security/kth-krb4/patches/patch-lib_krb_mk_priv.c deleted file mode 100644 index ad90ad41b40..00000000000 --- a/security/kth-krb4/patches/patch-lib_krb_mk_priv.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-lib_krb_mk_priv.c,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- lib/krb/mk_priv.c.orig 2001-09-16 22:41:58.000000000 +0000 -+++ lib/krb/mk_priv.c -@@ -78,7 +78,12 @@ RCSID("$Id: mk_priv.c,v 1.25 2001/09/16 - - int32_t - krb_mk_priv(void *in, void *out, u_int32_t length, -- struct des_ks_struct *schedule, des_cblock *key, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else -+ struct des_ks_struct *schedule, -+#endif -+ des_cblock *key, - struct sockaddr_in *sender, struct sockaddr_in *receiver) - { - unsigned char *p = (unsigned char*)out; diff --git a/security/kth-krb4/patches/patch-lib_krb_rd_priv.c b/security/kth-krb4/patches/patch-lib_krb_rd_priv.c deleted file mode 100644 index fa9dd1054a9..00000000000 --- a/security/kth-krb4/patches/patch-lib_krb_rd_priv.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-lib_krb_rd_priv.c,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- lib/krb/rd_priv.c.orig 2001-09-16 22:41:58.000000000 +0000 -+++ lib/krb/rd_priv.c -@@ -57,7 +57,12 @@ RCSID("$Id: rd_priv.c,v 1.30 2001/09/16 - - int32_t - krb_rd_priv(void *in, u_int32_t in_length, -- struct des_ks_struct *schedule, des_cblock *key, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else -+ struct des_ks_struct *schedule, -+#endif -+ des_cblock *key, - struct sockaddr_in *sender, struct sockaddr_in *receiver, - MSG_DAT *m_data) - { diff --git a/security/kth-krb4/patches/patch-lib_krb_recvauth.c b/security/kth-krb4/patches/patch-lib_krb_recvauth.c deleted file mode 100644 index 0630df9a906..00000000000 --- a/security/kth-krb4/patches/patch-lib_krb_recvauth.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-lib_krb_recvauth.c,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- lib/krb/recvauth.c.orig 2001-08-26 02:52:18.000000000 +0000 -+++ lib/krb/recvauth.c -@@ -108,7 +108,11 @@ krb_recvauth(int32_t options, /* bit-pat - struct sockaddr_in *laddr, /* local address */ - AUTH_DAT *kdata, /* kerberos data (returned) */ - char *filename, /* name of file with service keys */ -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else - struct des_ks_struct *schedule, /* key schedule (return) */ -+#endif - char *version) /* version string (filled in) */ - { - char krb_vers[KRB_SENDAUTH_VLEN + 1]; /* + 1 for the null terminator */ diff --git a/security/kth-krb4/patches/patch-lib_krb_sendauth.c b/security/kth-krb4/patches/patch-lib_krb_sendauth.c deleted file mode 100644 index 2d458c2aaf5..00000000000 --- a/security/kth-krb4/patches/patch-lib_krb_sendauth.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-lib_krb_sendauth.c,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- lib/krb/sendauth.c.orig 1999-09-16 20:41:55.000000000 +0000 -+++ lib/krb/sendauth.c -@@ -103,7 +103,11 @@ krb_sendauth(int32_t options, /* bit-pat - u_int32_t checksum, /* checksum to include in request */ - MSG_DAT *msg_data, /* mutual auth MSG_DAT (return) */ - CREDENTIALS *cred, /* credentials (return) */ -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else - struct des_ks_struct *schedule, /* key schedule (return) */ -+#endif - struct sockaddr_in *laddr, /* local address */ - struct sockaddr_in *faddr, /* address of foreign host on fd */ - char *version) /* version string */ diff --git a/security/kth-krb4/patches/patch-lib_krb_solaris_compat.c b/security/kth-krb4/patches/patch-lib_krb_solaris_compat.c deleted file mode 100644 index 6ef3473bec0..00000000000 --- a/security/kth-krb4/patches/patch-lib_krb_solaris_compat.c +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-lib_krb_solaris_compat.c,v 1.1 2011/11/28 19:33:13 marino Exp $ - ---- lib/krb/solaris_compat.c.orig 1999-12-02 16:58:44.000000000 +0000 -+++ lib/krb/solaris_compat.c -@@ -42,7 +42,12 @@ RCSID("$Id: solaris_compat.c,v 1.4 1999/ - - int32_t - _C0095C2A(void *in, void *out, u_int32_t length, -- struct des_ks_struct *schedule, des_cblock *key, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else -+ struct des_ks_struct *schedule, -+#endif -+ des_cblock *key, - struct sockaddr_in *sender, struct sockaddr_in *receiver) - { - return krb_mk_priv (in, out, length, schedule, key, sender, receiver); -@@ -50,7 +55,12 @@ _C0095C2A(void *in, void *out, u_int32_t - - int32_t - _C0095C2B(void *in, u_int32_t in_length, -- struct des_ks_struct *schedule, des_cblock *key, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ des_key_schedule schedule, -+#else -+ struct des_ks_struct *schedule, -+#endif -+ des_cblock *key, - struct sockaddr_in *sender, struct sockaddr_in *receiver, - MSG_DAT *m_data) - { diff --git a/security/kth-krb4/patches/patch-lib_roken_Makefile.in b/security/kth-krb4/patches/patch-lib_roken_Makefile.in deleted file mode 100644 index 6432b5e7ba7..00000000000 --- a/security/kth-krb4/patches/patch-lib_roken_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_roken_Makefile.in,v 1.1 2011/03/24 05:38:01 obache Exp $ - -* require install-man before install-cat-mans to create alias links. - ---- lib/roken/Makefile.in.orig 2011-03-24 05:23:13.000000000 +0000 -+++ lib/roken/Makefile.in -@@ -1059,7 +1059,7 @@ dist-cat8-mans: - - dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans - --install-cat-mans: -+install-cat-mans: install-man - $(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS) - - install-data-local: install-cat-mans |