diff options
author | wennmach <wennmach@pkgsrc.org> | 2004-02-09 12:54:31 +0000 |
---|---|---|
committer | wennmach <wennmach@pkgsrc.org> | 2004-02-09 12:54:31 +0000 |
commit | e3b0c42311f7733402b91dfc66b1506bc0ff78f6 (patch) | |
tree | 0362c0e56d817c3157c12594b755a6c119664a79 /security/kth-krb4 | |
parent | e0b50bf587a079454c55a8187c9726c4c7187f9b (diff) | |
download | pkgsrc-e3b0c42311f7733402b91dfc66b1506bc0ff78f6.tar.gz |
Do not install bin/ftp (this will overwrite the ftp installed as part
of bootstrap-pkgsrc).
ftp is now always installed as bin/k4ftp. In addition, if the variable
KRB4_PREFIX_CMDS is set to YES, rcp, rlogin, rsh, su, and telnet will
be installed with a "k4" prefix.
This has been achieved by stealing the transform code from security/heimdal
and by tayloring it a bit.
Closes PR pkg/24354 by Tracy Di Marco White.
Diffstat (limited to 'security/kth-krb4')
-rw-r--r-- | security/kth-krb4/Makefile | 32 | ||||
-rw-r--r-- | security/kth-krb4/PLIST | 44 |
2 files changed, 45 insertions, 31 deletions
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index ec5011c6c47..e488df609eb 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2004/01/15 10:35:49 grant Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/09 12:54:31 wennmach Exp $ # DISTNAME= krb4-1.2.1 PKGNAME= kth-krb4-1.2.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security net MASTER_SITES= ftp://ftp.pdc.kth.se/pub/krb/src/ @@ -16,9 +16,6 @@ COMMENT= Kerberos IV distribution from KTH #AUTOCONF_REQD= 2.52 #AUTOMAKE_REQD= 1.7 -CONFLICTS+= wu-ftpd-[0-9]* -CONFLICTS+= lukemftp-[0-9]* -CONFLICTS+= tnftp-[0-9]* CONFLICTS+= zephyr-[0-9]* CONFLICTS+= libdes-[0-9]* @@ -27,7 +24,24 @@ CRYPTO= yes USE_BUILDLINK2= yes USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/kerberosIV +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/kerberosIV + +.include "../../mk/bsd.prefs.mk" +KRB4_PREFIX_CMDS?= no +BUILD_DEFS+= KRB4_PREFIX_CMDS +.if !empty(KRB4_PREFIX_CMDS:M[yY][eE][sS]) +MIT_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 +MIT_KRB4_TRANSFORM= s/^ftp$$/k4&/ # always k4ftp +PLIST_SUBST+= KRB4_PREFIX= +.endif +CONFIGURE_ARGS+= --program-transform="${MIT_KRB4_TRANSFORM}" USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -38,9 +52,9 @@ EXAMPLEDIR= ${PREFIX}/share/examples/kth-krb4 # this hangs while compiling one of the files, at least with the # toolchain as of 1.5ZC (20020329) -.if ${MACHINE_ARCH} == "sparc64" -BROKEN= toolchain problems on sparc64 (1.5ZC, 20020329) -.endif +#.if ${MACHINE_ARCH} == "sparc64" +#BROKEN= toolchain problems on sparc64 (1.5ZC, 20020329) +#.endif post-patch: @for file in ${WRKSRC}/lib/kafs/kafs.h; do \ diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST index 2d168dfcff7..f3aaaf0adcf 100644 --- a/security/kth-krb4/PLIST +++ b/security/kth-krb4/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.7 2003/08/05 10:04:49 seb Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/02/09 12:54:31 wennmach Exp $ bin/afslog bin/compile_et -bin/ftp +bin/k4ftp bin/kadmin bin/kauth bin/kdestroy @@ -19,15 +19,15 @@ bin/otp bin/otpprint bin/pagsh bin/pfrom -bin/rcp -bin/rlogin -bin/rsh +bin/${KRB4_PREFIX}rcp +bin/${KRB4_PREFIX}rlogin +bin/${KRB4_PREFIX}rsh bin/rxtelnet bin/rxterm bin/sample_client bin/simple_client -bin/su -bin/telnet +bin/${KRB4_PREFIX}su +bin/${KRB4_PREFIX}telnet bin/tenletxr bin/xnlock bin/zrefresh @@ -118,7 +118,7 @@ lib/libss.la lib/libss.so lib/libss.so.1 lib/libss.so.1.4 -libexec/ftpd +libexec/${KRB4_PREFIX}ftpd libexec/kadmind libexec/kauthd libexec/kerberos @@ -131,11 +131,11 @@ libexec/kxd libexec/movemail libexec/popper libexec/push -libexec/rlogind -libexec/rshd +libexec/${KRB4_PREFIX}rlogind +libexec/${KRB4_PREFIX}rshd libexec/sample_server libexec/simple_server -libexec/telnetd +libexec/${KRB4_PREFIX}telnetd man/cat1/afslog.0 man/cat1/ftp.0 man/cat1/kauth.0 @@ -194,7 +194,7 @@ man/cat8/push.0 man/cat8/rlogind.0 man/cat8/telnetd.0 man/man1/afslog.1 -man/man1/ftp.1 +man/man1/k4ftp.1 man/man1/kauth.1 man/man1/kdestroy.1 man/man1/kerberos.1 @@ -208,13 +208,13 @@ man/man1/otp.1 man/man1/otpprint.1 man/man1/pagsh.1 man/man1/pfrom.1 -man/man1/rcp.1 -man/man1/rlogin.1 -man/man1/rsh.1 +man/man1/${KRB4_PREFIX}rcp.1 +man/man1/${KRB4_PREFIX}rlogin.1 +man/man1/${KRB4_PREFIX}rsh.1 man/man1/rxtelnet.1 man/man1/rxterm.1 -man/man1/su.1 -man/man1/telnet.1 +man/man1/${KRB4_PREFIX}su.1 +man/man1/${KRB4_PREFIX}telnet.1 man/man1/tenletxr.1 man/man1/xnlock.1 man/man3/acl_check.3 @@ -235,13 +235,13 @@ man/man3/krb_sendauth.3 man/man3/krb_set_tkt_string.3 man/man3/kuserok.3 man/man3/tf_util.3 -man/man5/ftpusers.5 +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/ext_srvtab.8 -man/man8/ftpd.8 +man/man8/${KRB4_PREFIX}ftpd.8 man/man8/kauthd.8 man/man8/kdb_destroy.8 man/man8/kdb_edit.8 @@ -255,9 +255,9 @@ man/man8/kxd.8 man/man8/movemail.8 man/man8/popper.8 man/man8/push.8 -man/man8/rlogind.8 -man/man8/rshd.8 -man/man8/telnetd.8 +man/man8/${KRB4_PREFIX}rlogind.8 +man/man8/${KRB4_PREFIX}rshd.8 +man/man8/${KRB4_PREFIX}telnetd.8 sbin/ext_srvtab sbin/kdb_destroy sbin/kdb_edit |