From 5f0c4b6514ad7dd7f1d2f8fa1f6a5559be2bd227 Mon Sep 17 00:00:00 2001 From: Jacques Vidrine Date: Mon, 4 Oct 1999 14:32:28 +0000 Subject: Update 1.0.6 -> 1.1 --- security/krb5-16/Makefile | 170 +++++++++++--------------------------- security/krb5-16/distinfo | 4 +- security/krb5-16/files/patch-ai | 42 ++++------ security/krb5-16/files/patch-aj | 27 ------ security/krb5-16/files/patch-as | 4 +- security/krb5-16/files/patch-av | 10 ++- security/krb5-16/pkg-plist | 159 ++++++++++++++++++----------------- security/krb5-17/Makefile | 170 +++++++++++--------------------------- security/krb5-17/distinfo | 4 +- security/krb5-17/files/patch-ai | 42 ++++------ security/krb5-17/files/patch-aj | 27 ------ security/krb5-17/files/patch-as | 4 +- security/krb5-17/files/patch-av | 10 ++- security/krb5-17/pkg-plist | 159 ++++++++++++++++++----------------- security/krb5-appl/Makefile | 170 +++++++++++--------------------------- security/krb5-appl/distinfo | 4 +- security/krb5-appl/files/patch-ai | 42 ++++------ security/krb5-appl/files/patch-aj | 27 ------ security/krb5-appl/files/patch-as | 4 +- security/krb5-appl/files/patch-av | 10 ++- security/krb5-appl/pkg-plist | 159 ++++++++++++++++++----------------- security/krb5/Makefile | 170 +++++++++++--------------------------- security/krb5/distinfo | 4 +- security/krb5/files/patch-ai | 42 ++++------ security/krb5/files/patch-aj | 27 ------ security/krb5/files/patch-as | 4 +- security/krb5/files/patch-av | 10 ++- security/krb5/pkg-plist | 159 ++++++++++++++++++----------------- 28 files changed, 628 insertions(+), 1036 deletions(-) (limited to 'security') diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile index c493c76fc6ab..3c37aafcaeeb 100644 --- a/security/krb5-16/Makefile +++ b/security/krb5-16/Makefile @@ -6,40 +6,21 @@ # $FreeBSD$ # -DISTNAME= krb5-1.0.6 +DISTNAME= krb5-1.1 CATEGORIES= security -MASTER_SITES= # empty here. See below for real setting. -DISTFILES= krb5-1.0.6.src.tar.gz \ - krb5-1.0.6.doc.tar.gz \ - krb5-1.0.6.crypto.tar.gz +MASTER_SITES= # manual download +EXTRACT_SUFX= .tar MAINTAINER= nectar@FreeBSD.org BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -DIST_SUBDIR= krb5 - -# Deal with "secret" subdirectory on the canonical MASTER_SITE. -# If USA_RESIDENT=YES then: -# we fetch from the canonical MASTER_SITE in the USA, -# and deal with a "secret" subdirectory whose name -# we obtain by using an awk script to search a README file. -# If USA_RESIDENT=NO then: -# we fetch from a MASTER_SITE outside the USA, -# and we don't need to deal with any "secret" subdirectory, -# so we use an empty awk script. -README_KRB5= README.KRB5-1.0.6 -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES" -MASTER_SITES= ftp://athena-dist.mit.edu/pub/kerberos/ -AWK_SCRIPT= '(/1\) Change into the directory/) { if (match($$0, "dist/[0-9]+")) print substr($$0, RSTART, RLENGTH) }' -.else -MASTER_SITES= ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/ -AWK_SCRIPT= '' -.endif - +KERBEROSV_URL= http://web.mit.edu/network/kerberos-form.html USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared --with-ccopts="${CFLAGS}" +CONFIGURE_ENV= INSTALL="${INSTALL}" +MAKE_ARGS= INSTALL="${INSTALL}" KRB5_KRB4_COMPAT?= YES .if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO" @@ -57,47 +38,15 @@ INFO_FILES= krb425.info krb5-admin.info krb5-admin.info-1 \ krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \ krb5-install.info-1 krb5-install.info-2 krb5-user.info -pre-fetch: -.if !defined(KRB5_KRB4_COMPAT) - @${ECHO} "------------------------------------------------------" - @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build " - @${ECHO} "the KerberosIV compatibility libraries. " - @${ECHO} "------------------------------------------------------" -.endif -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES" - @${ECHO} - @${ECHO} ">> If you are a US resident, understand that this software" - @${ECHO} " may be export restricted." -.elif defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO" - @${ECHO} - @${ECHO} ">> If you are not a US resident, then you cannot obtain" - @${ECHO} " Kerberos V source from a server within the United" - @${ECHO} " States. If automatic fetching of the sources from" - @${ECHO} " a server outside the US fails then you will have to" - @${ECHO} " find the sources elsewhere yourself, and put them" - @${ECHO} " in ${_DISTDIR}." -.else - @${ECHO} - @${ECHO} ">> You must set the variable USA_RESIDENT to YES if you are" - @${ECHO} " a United States resident, otherwise NO." - @${ECHO} " If you are a US resident, understand that this software" - @${ECHO} " may be export restricted." - @${ECHO} " If you are not a US resident, then you cannot obtain" - @${ECHO} " Kerberos V source from a server within the United" - @${ECHO} " States." - @${FALSE} -.endif - MAN1= krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \ kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1 \ - v4rcp.1 ftp.1 telnet.1 kerberos.1 + v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1 MAN5= kdc.conf.5 krb5.conf.5 .k5login.5 MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \ ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \ kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 WRKSRC= ${WRKDIR}/${DISTNAME}/src -RECONF_COOKIE= ${WRKDIR}/.reconf_done WANT_HTML?= YES HTML_DOC_DIR= ${WRKDIR}/${DISTNAME}/doc @@ -105,70 +54,56 @@ HTML_DOCS= admin.html install_foot.html user-guide.html \ admin_foot.html install_toc.html user-guide_foot.html \ admin_toc.html krb425.html user-guide_toc.html \ install.html krb425_toc.html -SETUID_EXE= bin/ksu bin/v4rcp - -SUPERUSER?= root - -.include do-fetch: - @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ - if [ ! -f ${README_KRB5} ]; then \ - for site in ${MASTER_SITES}; do \ - ${ECHO_MSG} ">> Attempting to fetch ${README_KRB5} from $${site}."; \ - if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}/${README_KRB5} \ - ${FETCH_AFTER_ARGS}; then \ - break; \ - fi \ - done; fi; ${DO_NADA}) - @(if [ ! -f ${_DISTDIR}/${README_KRB5} ]; then \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve"; \ - ${ECHO_MSG} ">> this port manually into ${_DISTDIR} and try"; \ - ${ECHO_MSG} ">> again."; \ - ${FALSE}; \ - fi) - @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ - secret=`${AWK} ${AWK_SCRIPT} < ${_DISTDIR}/${README_KRB5}`; \ - for file in ${DISTFILES}; do \ - if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \ - if [ -h $$file -o -h `${BASENAME} $$file` ]; then \ - ${ECHO_MSG} ">> ${_DISTDIR}/$$file is a broken symlink."; \ - ${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ - ${ECHO_MSG} ">> Please correct this problem and try again."; \ - exit 1; \ - fi ; \ - ${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \ - for site in ${MASTER_SITES}; do \ - ${ECHO_MSG} ">> Attempting to fetch from $${site}/$${secret}."; \ - if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}/$${secret}/$${file} ${FETCH_AFTER_ARGS}; then \ - continue 2; \ - fi \ - done; \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve this";\ - ${ECHO_MSG} ">> port manually into ${_DISTDIR} and try again."; \ - exit 1; \ - fi \ - done) - -pre-configure: ${RECONF_COOKIE} - -${RECONF_COOKIE}: - ${SETENV} PORTOBJFORMAT="${PORTOBJFORMAT}" \ - ${SH} -c 'cd ${WRKSRC}/util/autoconf && ./configure && ${GMAKE} && cd ${WRKSRC} && ./util/reconf --force' - ${TOUCH} ${RECONF_COOKIE} + @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ + ${ECHO} ""; \ + ${ECHO} ">> Kerberos V contains encryption software and is"; \ + ${ECHO} " export restricted. If you are not a USA resident,";\ + ${ECHO} " then you cannot obtain the Kerberos V sources from";\ + ${ECHO} " within the United States."; \ + ${ECHO} ""; \ + ${ECHO} ">> The Kerberos V sources must be fetched manually."; \ + ${ECHO} " Please visit ${KERBEROSV_URL}"; \ + ${ECHO} " to download ${DISTNAME}${EXTRACT_SUFX} and place"; \ + ${ECHO} " it in ${DISTDIR}. Then run make again."; \ + ${FALSE}; \ + fi + +# the distfile is actually a tar of three compressed tars and their +# signatures +do-extract: + @${RM} -rf ${WRKDIR} + @${MKDIR} ${WRKDIR} + @(cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) + @for f in crypto doc src; do \ + cd ${WRKDIR} && \ + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.$$f.tar.gz \ + ${EXTRACT_AFTER_ARGS} && \ + ${RM} ${DISTNAME}.$$f.tar.gz ${DISTNAME}.$$f.tar.gz.asc; \ + done +.if !defined(EXTRACT_PRESERVE_OWNERSHIP) + @if [ `id -u` = 0 ]; then \ + ${CHMOD} -R ug-s ${WRKDIR}; \ + ${CHOWN} -R 0:0 ${WRKDIR}; \ + fi +.endif + +pre-build: +.if !defined(KRB5_KRB4_COMPAT) + @${ECHO} "------------------------------------------------------" + @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build " + @${ECHO} "the KerberosIV compatibility libraries. " + @${ECHO} "------------------------------------------------------" +.endif post-build: @(cd ${WRKSRC}/../doc && \ ${MAKE} ${INFO_FILES}) +.include + post-install: -# XXX Not sure why tmac.doc is installed here -- I don't think -# we need it. I should patch the distribution to not install -# it, I think. - @${RM} -f ${PREFIX}/man/man1/tmac.doc -# shared libs ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib # html documentation .if defined(WANT_HTML) && ${WANT_HTML} == "YES" @@ -177,10 +112,6 @@ post-install: ${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5 .endfor .endif -# fixup setuid executables -.for setuid in ${SETUID_EXE} - ${CHOWN} ${SUPERUSER} ${PREFIX}/${setuid} -.endfor # handle info files .for info in ${INFO_FILES} ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info} @@ -197,6 +128,3 @@ post-install: .endif .include - -# XXX deal with these patches: -# patch-aw diff --git a/security/krb5-16/distinfo b/security/krb5-16/distinfo index 36fa7156a9e0..e465f8c0c7b1 100644 --- a/security/krb5-16/distinfo +++ b/security/krb5-16/distinfo @@ -1,3 +1 @@ -MD5 (krb5/krb5-1.0.6.src.tar.gz) = fb7de72ffba768ffe977a4b2022f7900 -MD5 (krb5/krb5-1.0.6.doc.tar.gz) = ff7777d2319e68f0d86975dcac66ac43 -MD5 (krb5/krb5-1.0.6.crypto.tar.gz) = a77c493a986ecddbd76d5bd1559bf468 +MD5 (krb5-1.1.tar) = 7a2c9796f40cd5d0c71e4caa75d2aa7b diff --git a/security/krb5-16/files/patch-ai b/security/krb5-16/files/patch-ai index 5eacca9caf86..ddfff3d3aff9 100644 --- a/security/krb5-16/files/patch-ai +++ b/security/krb5-16/files/patch-ai @@ -1,25 +1,17 @@ -*** appl/gssftp/ftpd/ftpd.c.ORIG Fri Feb 6 19:41:25 1998 ---- appl/gssftp/ftpd/ftpd.c Tue Jun 30 19:46:01 1998 -*************** -*** 374,380 **** - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); ---- 374,386 ---- - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! -! #ifndef LOG_FTP -! #define FACILITY LOG_DAEMON -! #else -! #define FACILITY LOG_FTP -! #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); +--- appl/gssftp/ftpd/ftpd.c.orig Wed Sep 1 13:38:40 1999 ++++ appl/gssftp/ftpd/ftpd.c Sat Sep 25 10:25:04 1999 +@@ -477,7 +477,13 @@ + #ifndef LOG_DAEMON + #define LOG_DAEMON 0 + #endif +- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); ++ ++#ifndef LOG_FTP ++#define FACILITY LOG_DAEMON ++#else ++#define FACILITY LOG_FTP ++#endif ++ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); + + addrlen = sizeof (his_addr); + if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { diff --git a/security/krb5-16/files/patch-aj b/security/krb5-16/files/patch-aj index 29e845803294..c3bb8dfd6960 100644 --- a/security/krb5-16/files/patch-aj +++ b/security/krb5-16/files/patch-aj @@ -1,33 +1,6 @@ *** appl/gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998 --- appl/gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998 *************** -*** 44,55 **** - #include - #include - -! #ifdef WTMP_FILE -! #define WTMPFILE WTMP_FILE - #endif - -! #ifndef WTMPFILE -! #define WTMPFILE "/usr/adm/wtmp" - #endif - - static int fd = -1; ---- 44,55 ---- - #include - #include - -! #if !defined(WTMP_FILE) && defined(_PATH_WTMP) -! #define WTMP_FILE _PATH_WTMP - #endif - -! #ifndef WTMP_FILE -! #define WTMP_FILE "/usr/adm/wtmp" - #endif - - static int fd = -1; -*************** *** 66,72 **** struct stat buf; time_t time(); diff --git a/security/krb5-16/files/patch-as b/security/krb5-16/files/patch-as index 8ab90bb8494e..519a1c74d4cb 100644 --- a/security/krb5-16/files/patch-as +++ b/security/krb5-16/files/patch-as @@ -42,7 +42,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; @@ -50,7 +50,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; diff --git a/security/krb5-16/files/patch-av b/security/krb5-16/files/patch-av index 86bd04e8ad23..8363b8bb1e2d 100644 --- a/security/krb5-16/files/patch-av +++ b/security/krb5-16/files/patch-av @@ -1,13 +1,15 @@ *** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998 --- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998 *************** -*** 1,4 **** +*** 3,7 **** + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ ---- 1,4 ---- +--- 3,7 ---- + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ diff --git a/security/krb5-16/pkg-plist b/security/krb5-16/pkg-plist index 7b23d1f3ab37..9ecf19c0055a 100644 --- a/security/krb5-16/pkg-plist +++ b/security/krb5-16/pkg-plist @@ -1,121 +1,126 @@ -bin/krb524init -bin/kpasswd -bin/v5passwd -bin/klist -bin/kinit +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@unexec install-info --delete %D/info/krb425.info %D/info/dir +@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir +@unexec install-info --delete %D/info/krb5-install.info %D/info/dir +@unexec install-info --delete %D/info/krb5-user.info %D/info/dir +bin/ftp +bin/gss-client bin/kdestroy +bin/kinit +bin/klist +bin/kpasswd +bin/krb524init bin/ksu +bin/kvno +bin/rcp +bin/rlogin +bin/rsh bin/sclient bin/sim_client +bin/telnet bin/uuclient -bin/rsh -bin/rcp -bin/rlogin bin/v4rcp -bin/gss-client -bin/ftp -bin/telnet -include/gssapi/gssapi_generic.h +bin/v5passwd +include/com_err.h include/gssapi/gssapi.h +include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h -include/kerberosIV/krb.h include/kerberosIV/des.h include/kerberosIV/kadm.h -include/kerberosIV/mit-copyright.h +include/kerberosIV/krb.h include/kerberosIV/krb_err.h -include/com_err.h -include/mit-sipb-copyright.h -include/libpty.h +include/kerberosIV/mit-copyright.h include/krb5.h +include/libpty.h +include/mit-sipb-copyright.h +include/port-sockets.h +include/profile.h +info/krb425.info +info/krb5-admin.info +info/krb5-admin.info-1 +info/krb5-admin.info-2 +info/krb5-admin.info-3 +info/krb5-install.info +info/krb5-install.info-1 +info/krb5-install.info-2 +info/krb5-user.info lib/libcom_err.a lib/libcom_err.so -lib/libcom_err.so.1 -lib/libpty.a +lib/libcom_err.so.3 +lib/libdes425.a +lib/libdes425.so +lib/libdes425.so.3 lib/libdyn.a lib/libdyn.so lib/libdyn.so.1 -lib/libcrypto.so -lib/libcrypto.so.1 -lib/libcrypto.a -lib/libkrb5.so -lib/libkrb5.so.1 -lib/libkrb5.a -lib/libdes425.a -lib/libdes425.so -lib/libdes425.so.1 -lib/libkrb4.so -lib/libkrb4.so.1 -lib/libkrb4.a -lib/libkrb5util.a -lib/libkdb5.so -lib/libkdb5.so.1 -lib/libkdb5.a lib/libgssapi_krb5.a lib/libgssapi_krb5.so -lib/libgssapi_krb5.so.1 +lib/libgssapi_krb5.so.2 lib/libgssrpc.a lib/libgssrpc.so -lib/libgssrpc.so.1 +lib/libgssrpc.so.3 +lib/libk5crypto.a +lib/libk5crypto.so +lib/libk5crypto.so.2 lib/libkadm5clnt.a lib/libkadm5clnt.so -lib/libkadm5clnt.so.1 +lib/libkadm5clnt.so.3 lib/libkadm5srv.a lib/libkadm5srv.so -lib/libkadm5srv.so.1 +lib/libkadm5srv.so.3 +lib/libkdb5.a +lib/libkdb5.so +lib/libkdb5.so.3 +lib/libkrb4.a +lib/libkrb4.so +lib/libkrb4.so.2 +lib/libkrb5.a +lib/libkrb5.so +lib/libkrb5.so.2 lib/libkrb524.a -@exec /sbin/ldconfig -m %D/lib -sbin/krb5-send-pr -sbin/krb524d -sbin/krb5kdc -sbin/kadmin.local +lib/libpty.a +lib/libpty.so +lib/libpty.so.1 +lib/libss.a +sbin/ftpd +sbin/gss-server sbin/kadmin -sbin/kdb5_util -sbin/ktutil +sbin/kadmin.local sbin/kadmind sbin/kadmind4 -sbin/v5passwdd +sbin/kdb5_util +sbin/klogind sbin/kprop sbin/kpropd -sbin/sserver -sbin/sim_server -sbin/uuserver +sbin/krb5-send-pr +sbin/krb524d +sbin/krb5kdc sbin/kshd -sbin/klogind +sbin/ktutil sbin/login.krb5 -sbin/gss-server -sbin/ftpd +sbin/sim_server +sbin/sserver sbin/telnetd -share/gnats/mit +sbin/uuserver +sbin/v5passwdd share/doc/krb5/admin.html -share/doc/krb5/install_foot.html -share/doc/krb5/user-guide.html share/doc/krb5/admin_foot.html -share/doc/krb5/install_toc.html -share/doc/krb5/user-guide_foot.html share/doc/krb5/admin_toc.html -share/doc/krb5/krb425.html -share/doc/krb5/user-guide_toc.html share/doc/krb5/install.html +share/doc/krb5/install_foot.html +share/doc/krb5/install_toc.html +share/doc/krb5/krb425.html share/doc/krb5/krb425_toc.html +share/doc/krb5/user-guide.html +share/doc/krb5/user-guide_foot.html +share/doc/krb5/user-guide_toc.html +share/gnats/mit +@dirrm include/gssapi +@dirrm include/kerberosIV +@dirrm share/doc/krb5 +@exec /sbin/ldconfig -m %D/lib @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@unexec install-info --delete %D/info/krb425.info %D/info/dir -@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir -@unexec install-info --delete %D/info/krb5-install.info %D/info/dir -@unexec install-info --delete %D/info/krb5-user.info %D/info/dir -info/krb425.info -info/krb5-admin.info -info/krb5-admin.info-1 -info/krb5-admin.info-2 -info/krb5-admin.info-3 -info/krb5-install.info -info/krb5-install.info-1 -info/krb5-install.info-2 -info/krb5-user.info @exec install-info %D/info/krb425.info %D/info/dir @exec install-info %D/info/krb5-admin.info %D/info/dir @exec install-info %D/info/krb5-install.info %D/info/dir @exec install-info %D/info/krb5-user.info %D/info/dir -@dirrm include/gssapi -@dirrm include/kerberosIV -@dirrm share/doc/krb5 diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile index c493c76fc6ab..3c37aafcaeeb 100644 --- a/security/krb5-17/Makefile +++ b/security/krb5-17/Makefile @@ -6,40 +6,21 @@ # $FreeBSD$ # -DISTNAME= krb5-1.0.6 +DISTNAME= krb5-1.1 CATEGORIES= security -MASTER_SITES= # empty here. See below for real setting. -DISTFILES= krb5-1.0.6.src.tar.gz \ - krb5-1.0.6.doc.tar.gz \ - krb5-1.0.6.crypto.tar.gz +MASTER_SITES= # manual download +EXTRACT_SUFX= .tar MAINTAINER= nectar@FreeBSD.org BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -DIST_SUBDIR= krb5 - -# Deal with "secret" subdirectory on the canonical MASTER_SITE. -# If USA_RESIDENT=YES then: -# we fetch from the canonical MASTER_SITE in the USA, -# and deal with a "secret" subdirectory whose name -# we obtain by using an awk script to search a README file. -# If USA_RESIDENT=NO then: -# we fetch from a MASTER_SITE outside the USA, -# and we don't need to deal with any "secret" subdirectory, -# so we use an empty awk script. -README_KRB5= README.KRB5-1.0.6 -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES" -MASTER_SITES= ftp://athena-dist.mit.edu/pub/kerberos/ -AWK_SCRIPT= '(/1\) Change into the directory/) { if (match($$0, "dist/[0-9]+")) print substr($$0, RSTART, RLENGTH) }' -.else -MASTER_SITES= ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/ -AWK_SCRIPT= '' -.endif - +KERBEROSV_URL= http://web.mit.edu/network/kerberos-form.html USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared --with-ccopts="${CFLAGS}" +CONFIGURE_ENV= INSTALL="${INSTALL}" +MAKE_ARGS= INSTALL="${INSTALL}" KRB5_KRB4_COMPAT?= YES .if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO" @@ -57,47 +38,15 @@ INFO_FILES= krb425.info krb5-admin.info krb5-admin.info-1 \ krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \ krb5-install.info-1 krb5-install.info-2 krb5-user.info -pre-fetch: -.if !defined(KRB5_KRB4_COMPAT) - @${ECHO} "------------------------------------------------------" - @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build " - @${ECHO} "the KerberosIV compatibility libraries. " - @${ECHO} "------------------------------------------------------" -.endif -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES" - @${ECHO} - @${ECHO} ">> If you are a US resident, understand that this software" - @${ECHO} " may be export restricted." -.elif defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO" - @${ECHO} - @${ECHO} ">> If you are not a US resident, then you cannot obtain" - @${ECHO} " Kerberos V source from a server within the United" - @${ECHO} " States. If automatic fetching of the sources from" - @${ECHO} " a server outside the US fails then you will have to" - @${ECHO} " find the sources elsewhere yourself, and put them" - @${ECHO} " in ${_DISTDIR}." -.else - @${ECHO} - @${ECHO} ">> You must set the variable USA_RESIDENT to YES if you are" - @${ECHO} " a United States resident, otherwise NO." - @${ECHO} " If you are a US resident, understand that this software" - @${ECHO} " may be export restricted." - @${ECHO} " If you are not a US resident, then you cannot obtain" - @${ECHO} " Kerberos V source from a server within the United" - @${ECHO} " States." - @${FALSE} -.endif - MAN1= krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \ kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1 \ - v4rcp.1 ftp.1 telnet.1 kerberos.1 + v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1 MAN5= kdc.conf.5 krb5.conf.5 .k5login.5 MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \ ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \ kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 WRKSRC= ${WRKDIR}/${DISTNAME}/src -RECONF_COOKIE= ${WRKDIR}/.reconf_done WANT_HTML?= YES HTML_DOC_DIR= ${WRKDIR}/${DISTNAME}/doc @@ -105,70 +54,56 @@ HTML_DOCS= admin.html install_foot.html user-guide.html \ admin_foot.html install_toc.html user-guide_foot.html \ admin_toc.html krb425.html user-guide_toc.html \ install.html krb425_toc.html -SETUID_EXE= bin/ksu bin/v4rcp - -SUPERUSER?= root - -.include do-fetch: - @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ - if [ ! -f ${README_KRB5} ]; then \ - for site in ${MASTER_SITES}; do \ - ${ECHO_MSG} ">> Attempting to fetch ${README_KRB5} from $${site}."; \ - if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}/${README_KRB5} \ - ${FETCH_AFTER_ARGS}; then \ - break; \ - fi \ - done; fi; ${DO_NADA}) - @(if [ ! -f ${_DISTDIR}/${README_KRB5} ]; then \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve"; \ - ${ECHO_MSG} ">> this port manually into ${_DISTDIR} and try"; \ - ${ECHO_MSG} ">> again."; \ - ${FALSE}; \ - fi) - @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ - secret=`${AWK} ${AWK_SCRIPT} < ${_DISTDIR}/${README_KRB5}`; \ - for file in ${DISTFILES}; do \ - if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \ - if [ -h $$file -o -h `${BASENAME} $$file` ]; then \ - ${ECHO_MSG} ">> ${_DISTDIR}/$$file is a broken symlink."; \ - ${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ - ${ECHO_MSG} ">> Please correct this problem and try again."; \ - exit 1; \ - fi ; \ - ${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \ - for site in ${MASTER_SITES}; do \ - ${ECHO_MSG} ">> Attempting to fetch from $${site}/$${secret}."; \ - if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}/$${secret}/$${file} ${FETCH_AFTER_ARGS}; then \ - continue 2; \ - fi \ - done; \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve this";\ - ${ECHO_MSG} ">> port manually into ${_DISTDIR} and try again."; \ - exit 1; \ - fi \ - done) - -pre-configure: ${RECONF_COOKIE} - -${RECONF_COOKIE}: - ${SETENV} PORTOBJFORMAT="${PORTOBJFORMAT}" \ - ${SH} -c 'cd ${WRKSRC}/util/autoconf && ./configure && ${GMAKE} && cd ${WRKSRC} && ./util/reconf --force' - ${TOUCH} ${RECONF_COOKIE} + @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ + ${ECHO} ""; \ + ${ECHO} ">> Kerberos V contains encryption software and is"; \ + ${ECHO} " export restricted. If you are not a USA resident,";\ + ${ECHO} " then you cannot obtain the Kerberos V sources from";\ + ${ECHO} " within the United States."; \ + ${ECHO} ""; \ + ${ECHO} ">> The Kerberos V sources must be fetched manually."; \ + ${ECHO} " Please visit ${KERBEROSV_URL}"; \ + ${ECHO} " to download ${DISTNAME}${EXTRACT_SUFX} and place"; \ + ${ECHO} " it in ${DISTDIR}. Then run make again."; \ + ${FALSE}; \ + fi + +# the distfile is actually a tar of three compressed tars and their +# signatures +do-extract: + @${RM} -rf ${WRKDIR} + @${MKDIR} ${WRKDIR} + @(cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) + @for f in crypto doc src; do \ + cd ${WRKDIR} && \ + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.$$f.tar.gz \ + ${EXTRACT_AFTER_ARGS} && \ + ${RM} ${DISTNAME}.$$f.tar.gz ${DISTNAME}.$$f.tar.gz.asc; \ + done +.if !defined(EXTRACT_PRESERVE_OWNERSHIP) + @if [ `id -u` = 0 ]; then \ + ${CHMOD} -R ug-s ${WRKDIR}; \ + ${CHOWN} -R 0:0 ${WRKDIR}; \ + fi +.endif + +pre-build: +.if !defined(KRB5_KRB4_COMPAT) + @${ECHO} "------------------------------------------------------" + @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build " + @${ECHO} "the KerberosIV compatibility libraries. " + @${ECHO} "------------------------------------------------------" +.endif post-build: @(cd ${WRKSRC}/../doc && \ ${MAKE} ${INFO_FILES}) +.include + post-install: -# XXX Not sure why tmac.doc is installed here -- I don't think -# we need it. I should patch the distribution to not install -# it, I think. - @${RM} -f ${PREFIX}/man/man1/tmac.doc -# shared libs ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib # html documentation .if defined(WANT_HTML) && ${WANT_HTML} == "YES" @@ -177,10 +112,6 @@ post-install: ${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5 .endfor .endif -# fixup setuid executables -.for setuid in ${SETUID_EXE} - ${CHOWN} ${SUPERUSER} ${PREFIX}/${setuid} -.endfor # handle info files .for info in ${INFO_FILES} ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info} @@ -197,6 +128,3 @@ post-install: .endif .include - -# XXX deal with these patches: -# patch-aw diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo index 36fa7156a9e0..e465f8c0c7b1 100644 --- a/security/krb5-17/distinfo +++ b/security/krb5-17/distinfo @@ -1,3 +1 @@ -MD5 (krb5/krb5-1.0.6.src.tar.gz) = fb7de72ffba768ffe977a4b2022f7900 -MD5 (krb5/krb5-1.0.6.doc.tar.gz) = ff7777d2319e68f0d86975dcac66ac43 -MD5 (krb5/krb5-1.0.6.crypto.tar.gz) = a77c493a986ecddbd76d5bd1559bf468 +MD5 (krb5-1.1.tar) = 7a2c9796f40cd5d0c71e4caa75d2aa7b diff --git a/security/krb5-17/files/patch-ai b/security/krb5-17/files/patch-ai index 5eacca9caf86..ddfff3d3aff9 100644 --- a/security/krb5-17/files/patch-ai +++ b/security/krb5-17/files/patch-ai @@ -1,25 +1,17 @@ -*** appl/gssftp/ftpd/ftpd.c.ORIG Fri Feb 6 19:41:25 1998 ---- appl/gssftp/ftpd/ftpd.c Tue Jun 30 19:46:01 1998 -*************** -*** 374,380 **** - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); ---- 374,386 ---- - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! -! #ifndef LOG_FTP -! #define FACILITY LOG_DAEMON -! #else -! #define FACILITY LOG_FTP -! #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); +--- appl/gssftp/ftpd/ftpd.c.orig Wed Sep 1 13:38:40 1999 ++++ appl/gssftp/ftpd/ftpd.c Sat Sep 25 10:25:04 1999 +@@ -477,7 +477,13 @@ + #ifndef LOG_DAEMON + #define LOG_DAEMON 0 + #endif +- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); ++ ++#ifndef LOG_FTP ++#define FACILITY LOG_DAEMON ++#else ++#define FACILITY LOG_FTP ++#endif ++ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); + + addrlen = sizeof (his_addr); + if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { diff --git a/security/krb5-17/files/patch-aj b/security/krb5-17/files/patch-aj index 29e845803294..c3bb8dfd6960 100644 --- a/security/krb5-17/files/patch-aj +++ b/security/krb5-17/files/patch-aj @@ -1,33 +1,6 @@ *** appl/gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998 --- appl/gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998 *************** -*** 44,55 **** - #include - #include - -! #ifdef WTMP_FILE -! #define WTMPFILE WTMP_FILE - #endif - -! #ifndef WTMPFILE -! #define WTMPFILE "/usr/adm/wtmp" - #endif - - static int fd = -1; ---- 44,55 ---- - #include - #include - -! #if !defined(WTMP_FILE) && defined(_PATH_WTMP) -! #define WTMP_FILE _PATH_WTMP - #endif - -! #ifndef WTMP_FILE -! #define WTMP_FILE "/usr/adm/wtmp" - #endif - - static int fd = -1; -*************** *** 66,72 **** struct stat buf; time_t time(); diff --git a/security/krb5-17/files/patch-as b/security/krb5-17/files/patch-as index 8ab90bb8494e..519a1c74d4cb 100644 --- a/security/krb5-17/files/patch-as +++ b/security/krb5-17/files/patch-as @@ -42,7 +42,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; @@ -50,7 +50,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; diff --git a/security/krb5-17/files/patch-av b/security/krb5-17/files/patch-av index 86bd04e8ad23..8363b8bb1e2d 100644 --- a/security/krb5-17/files/patch-av +++ b/security/krb5-17/files/patch-av @@ -1,13 +1,15 @@ *** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998 --- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998 *************** -*** 1,4 **** +*** 3,7 **** + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ ---- 1,4 ---- +--- 3,7 ---- + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ diff --git a/security/krb5-17/pkg-plist b/security/krb5-17/pkg-plist index 7b23d1f3ab37..9ecf19c0055a 100644 --- a/security/krb5-17/pkg-plist +++ b/security/krb5-17/pkg-plist @@ -1,121 +1,126 @@ -bin/krb524init -bin/kpasswd -bin/v5passwd -bin/klist -bin/kinit +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@unexec install-info --delete %D/info/krb425.info %D/info/dir +@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir +@unexec install-info --delete %D/info/krb5-install.info %D/info/dir +@unexec install-info --delete %D/info/krb5-user.info %D/info/dir +bin/ftp +bin/gss-client bin/kdestroy +bin/kinit +bin/klist +bin/kpasswd +bin/krb524init bin/ksu +bin/kvno +bin/rcp +bin/rlogin +bin/rsh bin/sclient bin/sim_client +bin/telnet bin/uuclient -bin/rsh -bin/rcp -bin/rlogin bin/v4rcp -bin/gss-client -bin/ftp -bin/telnet -include/gssapi/gssapi_generic.h +bin/v5passwd +include/com_err.h include/gssapi/gssapi.h +include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h -include/kerberosIV/krb.h include/kerberosIV/des.h include/kerberosIV/kadm.h -include/kerberosIV/mit-copyright.h +include/kerberosIV/krb.h include/kerberosIV/krb_err.h -include/com_err.h -include/mit-sipb-copyright.h -include/libpty.h +include/kerberosIV/mit-copyright.h include/krb5.h +include/libpty.h +include/mit-sipb-copyright.h +include/port-sockets.h +include/profile.h +info/krb425.info +info/krb5-admin.info +info/krb5-admin.info-1 +info/krb5-admin.info-2 +info/krb5-admin.info-3 +info/krb5-install.info +info/krb5-install.info-1 +info/krb5-install.info-2 +info/krb5-user.info lib/libcom_err.a lib/libcom_err.so -lib/libcom_err.so.1 -lib/libpty.a +lib/libcom_err.so.3 +lib/libdes425.a +lib/libdes425.so +lib/libdes425.so.3 lib/libdyn.a lib/libdyn.so lib/libdyn.so.1 -lib/libcrypto.so -lib/libcrypto.so.1 -lib/libcrypto.a -lib/libkrb5.so -lib/libkrb5.so.1 -lib/libkrb5.a -lib/libdes425.a -lib/libdes425.so -lib/libdes425.so.1 -lib/libkrb4.so -lib/libkrb4.so.1 -lib/libkrb4.a -lib/libkrb5util.a -lib/libkdb5.so -lib/libkdb5.so.1 -lib/libkdb5.a lib/libgssapi_krb5.a lib/libgssapi_krb5.so -lib/libgssapi_krb5.so.1 +lib/libgssapi_krb5.so.2 lib/libgssrpc.a lib/libgssrpc.so -lib/libgssrpc.so.1 +lib/libgssrpc.so.3 +lib/libk5crypto.a +lib/libk5crypto.so +lib/libk5crypto.so.2 lib/libkadm5clnt.a lib/libkadm5clnt.so -lib/libkadm5clnt.so.1 +lib/libkadm5clnt.so.3 lib/libkadm5srv.a lib/libkadm5srv.so -lib/libkadm5srv.so.1 +lib/libkadm5srv.so.3 +lib/libkdb5.a +lib/libkdb5.so +lib/libkdb5.so.3 +lib/libkrb4.a +lib/libkrb4.so +lib/libkrb4.so.2 +lib/libkrb5.a +lib/libkrb5.so +lib/libkrb5.so.2 lib/libkrb524.a -@exec /sbin/ldconfig -m %D/lib -sbin/krb5-send-pr -sbin/krb524d -sbin/krb5kdc -sbin/kadmin.local +lib/libpty.a +lib/libpty.so +lib/libpty.so.1 +lib/libss.a +sbin/ftpd +sbin/gss-server sbin/kadmin -sbin/kdb5_util -sbin/ktutil +sbin/kadmin.local sbin/kadmind sbin/kadmind4 -sbin/v5passwdd +sbin/kdb5_util +sbin/klogind sbin/kprop sbin/kpropd -sbin/sserver -sbin/sim_server -sbin/uuserver +sbin/krb5-send-pr +sbin/krb524d +sbin/krb5kdc sbin/kshd -sbin/klogind +sbin/ktutil sbin/login.krb5 -sbin/gss-server -sbin/ftpd +sbin/sim_server +sbin/sserver sbin/telnetd -share/gnats/mit +sbin/uuserver +sbin/v5passwdd share/doc/krb5/admin.html -share/doc/krb5/install_foot.html -share/doc/krb5/user-guide.html share/doc/krb5/admin_foot.html -share/doc/krb5/install_toc.html -share/doc/krb5/user-guide_foot.html share/doc/krb5/admin_toc.html -share/doc/krb5/krb425.html -share/doc/krb5/user-guide_toc.html share/doc/krb5/install.html +share/doc/krb5/install_foot.html +share/doc/krb5/install_toc.html +share/doc/krb5/krb425.html share/doc/krb5/krb425_toc.html +share/doc/krb5/user-guide.html +share/doc/krb5/user-guide_foot.html +share/doc/krb5/user-guide_toc.html +share/gnats/mit +@dirrm include/gssapi +@dirrm include/kerberosIV +@dirrm share/doc/krb5 +@exec /sbin/ldconfig -m %D/lib @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@unexec install-info --delete %D/info/krb425.info %D/info/dir -@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir -@unexec install-info --delete %D/info/krb5-install.info %D/info/dir -@unexec install-info --delete %D/info/krb5-user.info %D/info/dir -info/krb425.info -info/krb5-admin.info -info/krb5-admin.info-1 -info/krb5-admin.info-2 -info/krb5-admin.info-3 -info/krb5-install.info -info/krb5-install.info-1 -info/krb5-install.info-2 -info/krb5-user.info @exec install-info %D/info/krb425.info %D/info/dir @exec install-info %D/info/krb5-admin.info %D/info/dir @exec install-info %D/info/krb5-install.info %D/info/dir @exec install-info %D/info/krb5-user.info %D/info/dir -@dirrm include/gssapi -@dirrm include/kerberosIV -@dirrm share/doc/krb5 diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index c493c76fc6ab..3c37aafcaeeb 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -6,40 +6,21 @@ # $FreeBSD$ # -DISTNAME= krb5-1.0.6 +DISTNAME= krb5-1.1 CATEGORIES= security -MASTER_SITES= # empty here. See below for real setting. -DISTFILES= krb5-1.0.6.src.tar.gz \ - krb5-1.0.6.doc.tar.gz \ - krb5-1.0.6.crypto.tar.gz +MASTER_SITES= # manual download +EXTRACT_SUFX= .tar MAINTAINER= nectar@FreeBSD.org BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -DIST_SUBDIR= krb5 - -# Deal with "secret" subdirectory on the canonical MASTER_SITE. -# If USA_RESIDENT=YES then: -# we fetch from the canonical MASTER_SITE in the USA, -# and deal with a "secret" subdirectory whose name -# we obtain by using an awk script to search a README file. -# If USA_RESIDENT=NO then: -# we fetch from a MASTER_SITE outside the USA, -# and we don't need to deal with any "secret" subdirectory, -# so we use an empty awk script. -README_KRB5= README.KRB5-1.0.6 -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES" -MASTER_SITES= ftp://athena-dist.mit.edu/pub/kerberos/ -AWK_SCRIPT= '(/1\) Change into the directory/) { if (match($$0, "dist/[0-9]+")) print substr($$0, RSTART, RLENGTH) }' -.else -MASTER_SITES= ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/ -AWK_SCRIPT= '' -.endif - +KERBEROSV_URL= http://web.mit.edu/network/kerberos-form.html USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared --with-ccopts="${CFLAGS}" +CONFIGURE_ENV= INSTALL="${INSTALL}" +MAKE_ARGS= INSTALL="${INSTALL}" KRB5_KRB4_COMPAT?= YES .if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO" @@ -57,47 +38,15 @@ INFO_FILES= krb425.info krb5-admin.info krb5-admin.info-1 \ krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \ krb5-install.info-1 krb5-install.info-2 krb5-user.info -pre-fetch: -.if !defined(KRB5_KRB4_COMPAT) - @${ECHO} "------------------------------------------------------" - @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build " - @${ECHO} "the KerberosIV compatibility libraries. " - @${ECHO} "------------------------------------------------------" -.endif -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES" - @${ECHO} - @${ECHO} ">> If you are a US resident, understand that this software" - @${ECHO} " may be export restricted." -.elif defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO" - @${ECHO} - @${ECHO} ">> If you are not a US resident, then you cannot obtain" - @${ECHO} " Kerberos V source from a server within the United" - @${ECHO} " States. If automatic fetching of the sources from" - @${ECHO} " a server outside the US fails then you will have to" - @${ECHO} " find the sources elsewhere yourself, and put them" - @${ECHO} " in ${_DISTDIR}." -.else - @${ECHO} - @${ECHO} ">> You must set the variable USA_RESIDENT to YES if you are" - @${ECHO} " a United States resident, otherwise NO." - @${ECHO} " If you are a US resident, understand that this software" - @${ECHO} " may be export restricted." - @${ECHO} " If you are not a US resident, then you cannot obtain" - @${ECHO} " Kerberos V source from a server within the United" - @${ECHO} " States." - @${FALSE} -.endif - MAN1= krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \ kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1 \ - v4rcp.1 ftp.1 telnet.1 kerberos.1 + v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1 MAN5= kdc.conf.5 krb5.conf.5 .k5login.5 MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \ ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \ kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 WRKSRC= ${WRKDIR}/${DISTNAME}/src -RECONF_COOKIE= ${WRKDIR}/.reconf_done WANT_HTML?= YES HTML_DOC_DIR= ${WRKDIR}/${DISTNAME}/doc @@ -105,70 +54,56 @@ HTML_DOCS= admin.html install_foot.html user-guide.html \ admin_foot.html install_toc.html user-guide_foot.html \ admin_toc.html krb425.html user-guide_toc.html \ install.html krb425_toc.html -SETUID_EXE= bin/ksu bin/v4rcp - -SUPERUSER?= root - -.include do-fetch: - @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ - if [ ! -f ${README_KRB5} ]; then \ - for site in ${MASTER_SITES}; do \ - ${ECHO_MSG} ">> Attempting to fetch ${README_KRB5} from $${site}."; \ - if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}/${README_KRB5} \ - ${FETCH_AFTER_ARGS}; then \ - break; \ - fi \ - done; fi; ${DO_NADA}) - @(if [ ! -f ${_DISTDIR}/${README_KRB5} ]; then \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve"; \ - ${ECHO_MSG} ">> this port manually into ${_DISTDIR} and try"; \ - ${ECHO_MSG} ">> again."; \ - ${FALSE}; \ - fi) - @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ - secret=`${AWK} ${AWK_SCRIPT} < ${_DISTDIR}/${README_KRB5}`; \ - for file in ${DISTFILES}; do \ - if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \ - if [ -h $$file -o -h `${BASENAME} $$file` ]; then \ - ${ECHO_MSG} ">> ${_DISTDIR}/$$file is a broken symlink."; \ - ${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ - ${ECHO_MSG} ">> Please correct this problem and try again."; \ - exit 1; \ - fi ; \ - ${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \ - for site in ${MASTER_SITES}; do \ - ${ECHO_MSG} ">> Attempting to fetch from $${site}/$${secret}."; \ - if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}/$${secret}/$${file} ${FETCH_AFTER_ARGS}; then \ - continue 2; \ - fi \ - done; \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve this";\ - ${ECHO_MSG} ">> port manually into ${_DISTDIR} and try again."; \ - exit 1; \ - fi \ - done) - -pre-configure: ${RECONF_COOKIE} - -${RECONF_COOKIE}: - ${SETENV} PORTOBJFORMAT="${PORTOBJFORMAT}" \ - ${SH} -c 'cd ${WRKSRC}/util/autoconf && ./configure && ${GMAKE} && cd ${WRKSRC} && ./util/reconf --force' - ${TOUCH} ${RECONF_COOKIE} + @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ + ${ECHO} ""; \ + ${ECHO} ">> Kerberos V contains encryption software and is"; \ + ${ECHO} " export restricted. If you are not a USA resident,";\ + ${ECHO} " then you cannot obtain the Kerberos V sources from";\ + ${ECHO} " within the United States."; \ + ${ECHO} ""; \ + ${ECHO} ">> The Kerberos V sources must be fetched manually."; \ + ${ECHO} " Please visit ${KERBEROSV_URL}"; \ + ${ECHO} " to download ${DISTNAME}${EXTRACT_SUFX} and place"; \ + ${ECHO} " it in ${DISTDIR}. Then run make again."; \ + ${FALSE}; \ + fi + +# the distfile is actually a tar of three compressed tars and their +# signatures +do-extract: + @${RM} -rf ${WRKDIR} + @${MKDIR} ${WRKDIR} + @(cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) + @for f in crypto doc src; do \ + cd ${WRKDIR} && \ + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.$$f.tar.gz \ + ${EXTRACT_AFTER_ARGS} && \ + ${RM} ${DISTNAME}.$$f.tar.gz ${DISTNAME}.$$f.tar.gz.asc; \ + done +.if !defined(EXTRACT_PRESERVE_OWNERSHIP) + @if [ `id -u` = 0 ]; then \ + ${CHMOD} -R ug-s ${WRKDIR}; \ + ${CHOWN} -R 0:0 ${WRKDIR}; \ + fi +.endif + +pre-build: +.if !defined(KRB5_KRB4_COMPAT) + @${ECHO} "------------------------------------------------------" + @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build " + @${ECHO} "the KerberosIV compatibility libraries. " + @${ECHO} "------------------------------------------------------" +.endif post-build: @(cd ${WRKSRC}/../doc && \ ${MAKE} ${INFO_FILES}) +.include + post-install: -# XXX Not sure why tmac.doc is installed here -- I don't think -# we need it. I should patch the distribution to not install -# it, I think. - @${RM} -f ${PREFIX}/man/man1/tmac.doc -# shared libs ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib # html documentation .if defined(WANT_HTML) && ${WANT_HTML} == "YES" @@ -177,10 +112,6 @@ post-install: ${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5 .endfor .endif -# fixup setuid executables -.for setuid in ${SETUID_EXE} - ${CHOWN} ${SUPERUSER} ${PREFIX}/${setuid} -.endfor # handle info files .for info in ${INFO_FILES} ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info} @@ -197,6 +128,3 @@ post-install: .endif .include - -# XXX deal with these patches: -# patch-aw diff --git a/security/krb5-appl/distinfo b/security/krb5-appl/distinfo index 36fa7156a9e0..e465f8c0c7b1 100644 --- a/security/krb5-appl/distinfo +++ b/security/krb5-appl/distinfo @@ -1,3 +1 @@ -MD5 (krb5/krb5-1.0.6.src.tar.gz) = fb7de72ffba768ffe977a4b2022f7900 -MD5 (krb5/krb5-1.0.6.doc.tar.gz) = ff7777d2319e68f0d86975dcac66ac43 -MD5 (krb5/krb5-1.0.6.crypto.tar.gz) = a77c493a986ecddbd76d5bd1559bf468 +MD5 (krb5-1.1.tar) = 7a2c9796f40cd5d0c71e4caa75d2aa7b diff --git a/security/krb5-appl/files/patch-ai b/security/krb5-appl/files/patch-ai index 5eacca9caf86..ddfff3d3aff9 100644 --- a/security/krb5-appl/files/patch-ai +++ b/security/krb5-appl/files/patch-ai @@ -1,25 +1,17 @@ -*** appl/gssftp/ftpd/ftpd.c.ORIG Fri Feb 6 19:41:25 1998 ---- appl/gssftp/ftpd/ftpd.c Tue Jun 30 19:46:01 1998 -*************** -*** 374,380 **** - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); ---- 374,386 ---- - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! -! #ifndef LOG_FTP -! #define FACILITY LOG_DAEMON -! #else -! #define FACILITY LOG_FTP -! #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); +--- appl/gssftp/ftpd/ftpd.c.orig Wed Sep 1 13:38:40 1999 ++++ appl/gssftp/ftpd/ftpd.c Sat Sep 25 10:25:04 1999 +@@ -477,7 +477,13 @@ + #ifndef LOG_DAEMON + #define LOG_DAEMON 0 + #endif +- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); ++ ++#ifndef LOG_FTP ++#define FACILITY LOG_DAEMON ++#else ++#define FACILITY LOG_FTP ++#endif ++ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); + + addrlen = sizeof (his_addr); + if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { diff --git a/security/krb5-appl/files/patch-aj b/security/krb5-appl/files/patch-aj index 29e845803294..c3bb8dfd6960 100644 --- a/security/krb5-appl/files/patch-aj +++ b/security/krb5-appl/files/patch-aj @@ -1,33 +1,6 @@ *** appl/gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998 --- appl/gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998 *************** -*** 44,55 **** - #include - #include - -! #ifdef WTMP_FILE -! #define WTMPFILE WTMP_FILE - #endif - -! #ifndef WTMPFILE -! #define WTMPFILE "/usr/adm/wtmp" - #endif - - static int fd = -1; ---- 44,55 ---- - #include - #include - -! #if !defined(WTMP_FILE) && defined(_PATH_WTMP) -! #define WTMP_FILE _PATH_WTMP - #endif - -! #ifndef WTMP_FILE -! #define WTMP_FILE "/usr/adm/wtmp" - #endif - - static int fd = -1; -*************** *** 66,72 **** struct stat buf; time_t time(); diff --git a/security/krb5-appl/files/patch-as b/security/krb5-appl/files/patch-as index 8ab90bb8494e..519a1c74d4cb 100644 --- a/security/krb5-appl/files/patch-as +++ b/security/krb5-appl/files/patch-as @@ -42,7 +42,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; @@ -50,7 +50,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; diff --git a/security/krb5-appl/files/patch-av b/security/krb5-appl/files/patch-av index 86bd04e8ad23..8363b8bb1e2d 100644 --- a/security/krb5-appl/files/patch-av +++ b/security/krb5-appl/files/patch-av @@ -1,13 +1,15 @@ *** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998 --- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998 *************** -*** 1,4 **** +*** 3,7 **** + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ ---- 1,4 ---- +--- 3,7 ---- + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ diff --git a/security/krb5-appl/pkg-plist b/security/krb5-appl/pkg-plist index 7b23d1f3ab37..9ecf19c0055a 100644 --- a/security/krb5-appl/pkg-plist +++ b/security/krb5-appl/pkg-plist @@ -1,121 +1,126 @@ -bin/krb524init -bin/kpasswd -bin/v5passwd -bin/klist -bin/kinit +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@unexec install-info --delete %D/info/krb425.info %D/info/dir +@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir +@unexec install-info --delete %D/info/krb5-install.info %D/info/dir +@unexec install-info --delete %D/info/krb5-user.info %D/info/dir +bin/ftp +bin/gss-client bin/kdestroy +bin/kinit +bin/klist +bin/kpasswd +bin/krb524init bin/ksu +bin/kvno +bin/rcp +bin/rlogin +bin/rsh bin/sclient bin/sim_client +bin/telnet bin/uuclient -bin/rsh -bin/rcp -bin/rlogin bin/v4rcp -bin/gss-client -bin/ftp -bin/telnet -include/gssapi/gssapi_generic.h +bin/v5passwd +include/com_err.h include/gssapi/gssapi.h +include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h -include/kerberosIV/krb.h include/kerberosIV/des.h include/kerberosIV/kadm.h -include/kerberosIV/mit-copyright.h +include/kerberosIV/krb.h include/kerberosIV/krb_err.h -include/com_err.h -include/mit-sipb-copyright.h -include/libpty.h +include/kerberosIV/mit-copyright.h include/krb5.h +include/libpty.h +include/mit-sipb-copyright.h +include/port-sockets.h +include/profile.h +info/krb425.info +info/krb5-admin.info +info/krb5-admin.info-1 +info/krb5-admin.info-2 +info/krb5-admin.info-3 +info/krb5-install.info +info/krb5-install.info-1 +info/krb5-install.info-2 +info/krb5-user.info lib/libcom_err.a lib/libcom_err.so -lib/libcom_err.so.1 -lib/libpty.a +lib/libcom_err.so.3 +lib/libdes425.a +lib/libdes425.so +lib/libdes425.so.3 lib/libdyn.a lib/libdyn.so lib/libdyn.so.1 -lib/libcrypto.so -lib/libcrypto.so.1 -lib/libcrypto.a -lib/libkrb5.so -lib/libkrb5.so.1 -lib/libkrb5.a -lib/libdes425.a -lib/libdes425.so -lib/libdes425.so.1 -lib/libkrb4.so -lib/libkrb4.so.1 -lib/libkrb4.a -lib/libkrb5util.a -lib/libkdb5.so -lib/libkdb5.so.1 -lib/libkdb5.a lib/libgssapi_krb5.a lib/libgssapi_krb5.so -lib/libgssapi_krb5.so.1 +lib/libgssapi_krb5.so.2 lib/libgssrpc.a lib/libgssrpc.so -lib/libgssrpc.so.1 +lib/libgssrpc.so.3 +lib/libk5crypto.a +lib/libk5crypto.so +lib/libk5crypto.so.2 lib/libkadm5clnt.a lib/libkadm5clnt.so -lib/libkadm5clnt.so.1 +lib/libkadm5clnt.so.3 lib/libkadm5srv.a lib/libkadm5srv.so -lib/libkadm5srv.so.1 +lib/libkadm5srv.so.3 +lib/libkdb5.a +lib/libkdb5.so +lib/libkdb5.so.3 +lib/libkrb4.a +lib/libkrb4.so +lib/libkrb4.so.2 +lib/libkrb5.a +lib/libkrb5.so +lib/libkrb5.so.2 lib/libkrb524.a -@exec /sbin/ldconfig -m %D/lib -sbin/krb5-send-pr -sbin/krb524d -sbin/krb5kdc -sbin/kadmin.local +lib/libpty.a +lib/libpty.so +lib/libpty.so.1 +lib/libss.a +sbin/ftpd +sbin/gss-server sbin/kadmin -sbin/kdb5_util -sbin/ktutil +sbin/kadmin.local sbin/kadmind sbin/kadmind4 -sbin/v5passwdd +sbin/kdb5_util +sbin/klogind sbin/kprop sbin/kpropd -sbin/sserver -sbin/sim_server -sbin/uuserver +sbin/krb5-send-pr +sbin/krb524d +sbin/krb5kdc sbin/kshd -sbin/klogind +sbin/ktutil sbin/login.krb5 -sbin/gss-server -sbin/ftpd +sbin/sim_server +sbin/sserver sbin/telnetd -share/gnats/mit +sbin/uuserver +sbin/v5passwdd share/doc/krb5/admin.html -share/doc/krb5/install_foot.html -share/doc/krb5/user-guide.html share/doc/krb5/admin_foot.html -share/doc/krb5/install_toc.html -share/doc/krb5/user-guide_foot.html share/doc/krb5/admin_toc.html -share/doc/krb5/krb425.html -share/doc/krb5/user-guide_toc.html share/doc/krb5/install.html +share/doc/krb5/install_foot.html +share/doc/krb5/install_toc.html +share/doc/krb5/krb425.html share/doc/krb5/krb425_toc.html +share/doc/krb5/user-guide.html +share/doc/krb5/user-guide_foot.html +share/doc/krb5/user-guide_toc.html +share/gnats/mit +@dirrm include/gssapi +@dirrm include/kerberosIV +@dirrm share/doc/krb5 +@exec /sbin/ldconfig -m %D/lib @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@unexec install-info --delete %D/info/krb425.info %D/info/dir -@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir -@unexec install-info --delete %D/info/krb5-install.info %D/info/dir -@unexec install-info --delete %D/info/krb5-user.info %D/info/dir -info/krb425.info -info/krb5-admin.info -info/krb5-admin.info-1 -info/krb5-admin.info-2 -info/krb5-admin.info-3 -info/krb5-install.info -info/krb5-install.info-1 -info/krb5-install.info-2 -info/krb5-user.info @exec install-info %D/info/krb425.info %D/info/dir @exec install-info %D/info/krb5-admin.info %D/info/dir @exec install-info %D/info/krb5-install.info %D/info/dir @exec install-info %D/info/krb5-user.info %D/info/dir -@dirrm include/gssapi -@dirrm include/kerberosIV -@dirrm share/doc/krb5 diff --git a/security/krb5/Makefile b/security/krb5/Makefile index c493c76fc6ab..3c37aafcaeeb 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -6,40 +6,21 @@ # $FreeBSD$ # -DISTNAME= krb5-1.0.6 +DISTNAME= krb5-1.1 CATEGORIES= security -MASTER_SITES= # empty here. See below for real setting. -DISTFILES= krb5-1.0.6.src.tar.gz \ - krb5-1.0.6.doc.tar.gz \ - krb5-1.0.6.crypto.tar.gz +MASTER_SITES= # manual download +EXTRACT_SUFX= .tar MAINTAINER= nectar@FreeBSD.org BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -DIST_SUBDIR= krb5 - -# Deal with "secret" subdirectory on the canonical MASTER_SITE. -# If USA_RESIDENT=YES then: -# we fetch from the canonical MASTER_SITE in the USA, -# and deal with a "secret" subdirectory whose name -# we obtain by using an awk script to search a README file. -# If USA_RESIDENT=NO then: -# we fetch from a MASTER_SITE outside the USA, -# and we don't need to deal with any "secret" subdirectory, -# so we use an empty awk script. -README_KRB5= README.KRB5-1.0.6 -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES" -MASTER_SITES= ftp://athena-dist.mit.edu/pub/kerberos/ -AWK_SCRIPT= '(/1\) Change into the directory/) { if (match($$0, "dist/[0-9]+")) print substr($$0, RSTART, RLENGTH) }' -.else -MASTER_SITES= ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/ -AWK_SCRIPT= '' -.endif - +KERBEROSV_URL= http://web.mit.edu/network/kerberos-form.html USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared --with-ccopts="${CFLAGS}" +CONFIGURE_ENV= INSTALL="${INSTALL}" +MAKE_ARGS= INSTALL="${INSTALL}" KRB5_KRB4_COMPAT?= YES .if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO" @@ -57,47 +38,15 @@ INFO_FILES= krb425.info krb5-admin.info krb5-admin.info-1 \ krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \ krb5-install.info-1 krb5-install.info-2 krb5-user.info -pre-fetch: -.if !defined(KRB5_KRB4_COMPAT) - @${ECHO} "------------------------------------------------------" - @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build " - @${ECHO} "the KerberosIV compatibility libraries. " - @${ECHO} "------------------------------------------------------" -.endif -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES" - @${ECHO} - @${ECHO} ">> If you are a US resident, understand that this software" - @${ECHO} " may be export restricted." -.elif defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO" - @${ECHO} - @${ECHO} ">> If you are not a US resident, then you cannot obtain" - @${ECHO} " Kerberos V source from a server within the United" - @${ECHO} " States. If automatic fetching of the sources from" - @${ECHO} " a server outside the US fails then you will have to" - @${ECHO} " find the sources elsewhere yourself, and put them" - @${ECHO} " in ${_DISTDIR}." -.else - @${ECHO} - @${ECHO} ">> You must set the variable USA_RESIDENT to YES if you are" - @${ECHO} " a United States resident, otherwise NO." - @${ECHO} " If you are a US resident, understand that this software" - @${ECHO} " may be export restricted." - @${ECHO} " If you are not a US resident, then you cannot obtain" - @${ECHO} " Kerberos V source from a server within the United" - @${ECHO} " States." - @${FALSE} -.endif - MAN1= krb5-send-pr.1 kpasswd.1 v5passwd.1 klist.1 kinit.1 \ kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 rlogin.1 \ - v4rcp.1 ftp.1 telnet.1 kerberos.1 + v4rcp.1 ftp.1 telnet.1 kerberos.1 kvno.1 MAN5= kdc.conf.5 krb5.conf.5 .k5login.5 MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \ ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \ kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 WRKSRC= ${WRKDIR}/${DISTNAME}/src -RECONF_COOKIE= ${WRKDIR}/.reconf_done WANT_HTML?= YES HTML_DOC_DIR= ${WRKDIR}/${DISTNAME}/doc @@ -105,70 +54,56 @@ HTML_DOCS= admin.html install_foot.html user-guide.html \ admin_foot.html install_toc.html user-guide_foot.html \ admin_toc.html krb425.html user-guide_toc.html \ install.html krb425_toc.html -SETUID_EXE= bin/ksu bin/v4rcp - -SUPERUSER?= root - -.include do-fetch: - @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ - if [ ! -f ${README_KRB5} ]; then \ - for site in ${MASTER_SITES}; do \ - ${ECHO_MSG} ">> Attempting to fetch ${README_KRB5} from $${site}."; \ - if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}/${README_KRB5} \ - ${FETCH_AFTER_ARGS}; then \ - break; \ - fi \ - done; fi; ${DO_NADA}) - @(if [ ! -f ${_DISTDIR}/${README_KRB5} ]; then \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve"; \ - ${ECHO_MSG} ">> this port manually into ${_DISTDIR} and try"; \ - ${ECHO_MSG} ">> again."; \ - ${FALSE}; \ - fi) - @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ - secret=`${AWK} ${AWK_SCRIPT} < ${_DISTDIR}/${README_KRB5}`; \ - for file in ${DISTFILES}; do \ - if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \ - if [ -h $$file -o -h `${BASENAME} $$file` ]; then \ - ${ECHO_MSG} ">> ${_DISTDIR}/$$file is a broken symlink."; \ - ${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ - ${ECHO_MSG} ">> Please correct this problem and try again."; \ - exit 1; \ - fi ; \ - ${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \ - for site in ${MASTER_SITES}; do \ - ${ECHO_MSG} ">> Attempting to fetch from $${site}/$${secret}."; \ - if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}/$${secret}/$${file} ${FETCH_AFTER_ARGS}; then \ - continue 2; \ - fi \ - done; \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve this";\ - ${ECHO_MSG} ">> port manually into ${_DISTDIR} and try again."; \ - exit 1; \ - fi \ - done) - -pre-configure: ${RECONF_COOKIE} - -${RECONF_COOKIE}: - ${SETENV} PORTOBJFORMAT="${PORTOBJFORMAT}" \ - ${SH} -c 'cd ${WRKSRC}/util/autoconf && ./configure && ${GMAKE} && cd ${WRKSRC} && ./util/reconf --force' - ${TOUCH} ${RECONF_COOKIE} + @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ + ${ECHO} ""; \ + ${ECHO} ">> Kerberos V contains encryption software and is"; \ + ${ECHO} " export restricted. If you are not a USA resident,";\ + ${ECHO} " then you cannot obtain the Kerberos V sources from";\ + ${ECHO} " within the United States."; \ + ${ECHO} ""; \ + ${ECHO} ">> The Kerberos V sources must be fetched manually."; \ + ${ECHO} " Please visit ${KERBEROSV_URL}"; \ + ${ECHO} " to download ${DISTNAME}${EXTRACT_SUFX} and place"; \ + ${ECHO} " it in ${DISTDIR}. Then run make again."; \ + ${FALSE}; \ + fi + +# the distfile is actually a tar of three compressed tars and their +# signatures +do-extract: + @${RM} -rf ${WRKDIR} + @${MKDIR} ${WRKDIR} + @(cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) + @for f in crypto doc src; do \ + cd ${WRKDIR} && \ + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.$$f.tar.gz \ + ${EXTRACT_AFTER_ARGS} && \ + ${RM} ${DISTNAME}.$$f.tar.gz ${DISTNAME}.$$f.tar.gz.asc; \ + done +.if !defined(EXTRACT_PRESERVE_OWNERSHIP) + @if [ `id -u` = 0 ]; then \ + ${CHMOD} -R ug-s ${WRKDIR}; \ + ${CHOWN} -R 0:0 ${WRKDIR}; \ + fi +.endif + +pre-build: +.if !defined(KRB5_KRB4_COMPAT) + @${ECHO} "------------------------------------------------------" + @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build " + @${ECHO} "the KerberosIV compatibility libraries. " + @${ECHO} "------------------------------------------------------" +.endif post-build: @(cd ${WRKSRC}/../doc && \ ${MAKE} ${INFO_FILES}) +.include + post-install: -# XXX Not sure why tmac.doc is installed here -- I don't think -# we need it. I should patch the distribution to not install -# it, I think. - @${RM} -f ${PREFIX}/man/man1/tmac.doc -# shared libs ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib # html documentation .if defined(WANT_HTML) && ${WANT_HTML} == "YES" @@ -177,10 +112,6 @@ post-install: ${INSTALL_MAN} ${HTML_DOC_DIR}/${html} ${PREFIX}/share/doc/krb5 .endfor .endif -# fixup setuid executables -.for setuid in ${SETUID_EXE} - ${CHOWN} ${SUPERUSER} ${PREFIX}/${setuid} -.endfor # handle info files .for info in ${INFO_FILES} ${INSTALL_MAN} ${WRKSRC}/../doc/${info} ${PREFIX}/info/${info} @@ -197,6 +128,3 @@ post-install: .endif .include - -# XXX deal with these patches: -# patch-aw diff --git a/security/krb5/distinfo b/security/krb5/distinfo index 36fa7156a9e0..e465f8c0c7b1 100644 --- a/security/krb5/distinfo +++ b/security/krb5/distinfo @@ -1,3 +1 @@ -MD5 (krb5/krb5-1.0.6.src.tar.gz) = fb7de72ffba768ffe977a4b2022f7900 -MD5 (krb5/krb5-1.0.6.doc.tar.gz) = ff7777d2319e68f0d86975dcac66ac43 -MD5 (krb5/krb5-1.0.6.crypto.tar.gz) = a77c493a986ecddbd76d5bd1559bf468 +MD5 (krb5-1.1.tar) = 7a2c9796f40cd5d0c71e4caa75d2aa7b diff --git a/security/krb5/files/patch-ai b/security/krb5/files/patch-ai index 5eacca9caf86..ddfff3d3aff9 100644 --- a/security/krb5/files/patch-ai +++ b/security/krb5/files/patch-ai @@ -1,25 +1,17 @@ -*** appl/gssftp/ftpd/ftpd.c.ORIG Fri Feb 6 19:41:25 1998 ---- appl/gssftp/ftpd/ftpd.c Tue Jun 30 19:46:01 1998 -*************** -*** 374,380 **** - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); ---- 374,386 ---- - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! -! #ifndef LOG_FTP -! #define FACILITY LOG_DAEMON -! #else -! #define FACILITY LOG_FTP -! #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); +--- appl/gssftp/ftpd/ftpd.c.orig Wed Sep 1 13:38:40 1999 ++++ appl/gssftp/ftpd/ftpd.c Sat Sep 25 10:25:04 1999 +@@ -477,7 +477,13 @@ + #ifndef LOG_DAEMON + #define LOG_DAEMON 0 + #endif +- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); ++ ++#ifndef LOG_FTP ++#define FACILITY LOG_DAEMON ++#else ++#define FACILITY LOG_FTP ++#endif ++ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); + + addrlen = sizeof (his_addr); + if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { diff --git a/security/krb5/files/patch-aj b/security/krb5/files/patch-aj index 29e845803294..c3bb8dfd6960 100644 --- a/security/krb5/files/patch-aj +++ b/security/krb5/files/patch-aj @@ -1,33 +1,6 @@ *** appl/gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998 --- appl/gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998 *************** -*** 44,55 **** - #include - #include - -! #ifdef WTMP_FILE -! #define WTMPFILE WTMP_FILE - #endif - -! #ifndef WTMPFILE -! #define WTMPFILE "/usr/adm/wtmp" - #endif - - static int fd = -1; ---- 44,55 ---- - #include - #include - -! #if !defined(WTMP_FILE) && defined(_PATH_WTMP) -! #define WTMP_FILE _PATH_WTMP - #endif - -! #ifndef WTMP_FILE -! #define WTMP_FILE "/usr/adm/wtmp" - #endif - - static int fd = -1; -*************** *** 66,72 **** struct stat buf; time_t time(); diff --git a/security/krb5/files/patch-as b/security/krb5/files/patch-as index 8ab90bb8494e..519a1c74d4cb 100644 --- a/security/krb5/files/patch-as +++ b/security/krb5/files/patch-as @@ -42,7 +42,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; @@ -50,7 +50,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; diff --git a/security/krb5/files/patch-av b/security/krb5/files/patch-av index 86bd04e8ad23..8363b8bb1e2d 100644 --- a/security/krb5/files/patch-av +++ b/security/krb5/files/patch-av @@ -1,13 +1,15 @@ *** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998 --- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998 *************** -*** 1,4 **** +*** 3,7 **** + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ ---- 1,4 ---- +--- 3,7 ---- + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist index 7b23d1f3ab37..9ecf19c0055a 100644 --- a/security/krb5/pkg-plist +++ b/security/krb5/pkg-plist @@ -1,121 +1,126 @@ -bin/krb524init -bin/kpasswd -bin/v5passwd -bin/klist -bin/kinit +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@unexec install-info --delete %D/info/krb425.info %D/info/dir +@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir +@unexec install-info --delete %D/info/krb5-install.info %D/info/dir +@unexec install-info --delete %D/info/krb5-user.info %D/info/dir +bin/ftp +bin/gss-client bin/kdestroy +bin/kinit +bin/klist +bin/kpasswd +bin/krb524init bin/ksu +bin/kvno +bin/rcp +bin/rlogin +bin/rsh bin/sclient bin/sim_client +bin/telnet bin/uuclient -bin/rsh -bin/rcp -bin/rlogin bin/v4rcp -bin/gss-client -bin/ftp -bin/telnet -include/gssapi/gssapi_generic.h +bin/v5passwd +include/com_err.h include/gssapi/gssapi.h +include/gssapi/gssapi_generic.h include/gssapi/gssapi_krb5.h -include/kerberosIV/krb.h include/kerberosIV/des.h include/kerberosIV/kadm.h -include/kerberosIV/mit-copyright.h +include/kerberosIV/krb.h include/kerberosIV/krb_err.h -include/com_err.h -include/mit-sipb-copyright.h -include/libpty.h +include/kerberosIV/mit-copyright.h include/krb5.h +include/libpty.h +include/mit-sipb-copyright.h +include/port-sockets.h +include/profile.h +info/krb425.info +info/krb5-admin.info +info/krb5-admin.info-1 +info/krb5-admin.info-2 +info/krb5-admin.info-3 +info/krb5-install.info +info/krb5-install.info-1 +info/krb5-install.info-2 +info/krb5-user.info lib/libcom_err.a lib/libcom_err.so -lib/libcom_err.so.1 -lib/libpty.a +lib/libcom_err.so.3 +lib/libdes425.a +lib/libdes425.so +lib/libdes425.so.3 lib/libdyn.a lib/libdyn.so lib/libdyn.so.1 -lib/libcrypto.so -lib/libcrypto.so.1 -lib/libcrypto.a -lib/libkrb5.so -lib/libkrb5.so.1 -lib/libkrb5.a -lib/libdes425.a -lib/libdes425.so -lib/libdes425.so.1 -lib/libkrb4.so -lib/libkrb4.so.1 -lib/libkrb4.a -lib/libkrb5util.a -lib/libkdb5.so -lib/libkdb5.so.1 -lib/libkdb5.a lib/libgssapi_krb5.a lib/libgssapi_krb5.so -lib/libgssapi_krb5.so.1 +lib/libgssapi_krb5.so.2 lib/libgssrpc.a lib/libgssrpc.so -lib/libgssrpc.so.1 +lib/libgssrpc.so.3 +lib/libk5crypto.a +lib/libk5crypto.so +lib/libk5crypto.so.2 lib/libkadm5clnt.a lib/libkadm5clnt.so -lib/libkadm5clnt.so.1 +lib/libkadm5clnt.so.3 lib/libkadm5srv.a lib/libkadm5srv.so -lib/libkadm5srv.so.1 +lib/libkadm5srv.so.3 +lib/libkdb5.a +lib/libkdb5.so +lib/libkdb5.so.3 +lib/libkrb4.a +lib/libkrb4.so +lib/libkrb4.so.2 +lib/libkrb5.a +lib/libkrb5.so +lib/libkrb5.so.2 lib/libkrb524.a -@exec /sbin/ldconfig -m %D/lib -sbin/krb5-send-pr -sbin/krb524d -sbin/krb5kdc -sbin/kadmin.local +lib/libpty.a +lib/libpty.so +lib/libpty.so.1 +lib/libss.a +sbin/ftpd +sbin/gss-server sbin/kadmin -sbin/kdb5_util -sbin/ktutil +sbin/kadmin.local sbin/kadmind sbin/kadmind4 -sbin/v5passwdd +sbin/kdb5_util +sbin/klogind sbin/kprop sbin/kpropd -sbin/sserver -sbin/sim_server -sbin/uuserver +sbin/krb5-send-pr +sbin/krb524d +sbin/krb5kdc sbin/kshd -sbin/klogind +sbin/ktutil sbin/login.krb5 -sbin/gss-server -sbin/ftpd +sbin/sim_server +sbin/sserver sbin/telnetd -share/gnats/mit +sbin/uuserver +sbin/v5passwdd share/doc/krb5/admin.html -share/doc/krb5/install_foot.html -share/doc/krb5/user-guide.html share/doc/krb5/admin_foot.html -share/doc/krb5/install_toc.html -share/doc/krb5/user-guide_foot.html share/doc/krb5/admin_toc.html -share/doc/krb5/krb425.html -share/doc/krb5/user-guide_toc.html share/doc/krb5/install.html +share/doc/krb5/install_foot.html +share/doc/krb5/install_toc.html +share/doc/krb5/krb425.html share/doc/krb5/krb425_toc.html +share/doc/krb5/user-guide.html +share/doc/krb5/user-guide_foot.html +share/doc/krb5/user-guide_toc.html +share/gnats/mit +@dirrm include/gssapi +@dirrm include/kerberosIV +@dirrm share/doc/krb5 +@exec /sbin/ldconfig -m %D/lib @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@unexec install-info --delete %D/info/krb425.info %D/info/dir -@unexec install-info --delete %D/info/krb5-admin.info %D/info/dir -@unexec install-info --delete %D/info/krb5-install.info %D/info/dir -@unexec install-info --delete %D/info/krb5-user.info %D/info/dir -info/krb425.info -info/krb5-admin.info -info/krb5-admin.info-1 -info/krb5-admin.info-2 -info/krb5-admin.info-3 -info/krb5-install.info -info/krb5-install.info-1 -info/krb5-install.info-2 -info/krb5-user.info @exec install-info %D/info/krb425.info %D/info/dir @exec install-info %D/info/krb5-admin.info %D/info/dir @exec install-info %D/info/krb5-install.info %D/info/dir @exec install-info %D/info/krb5-user.info %D/info/dir -@dirrm include/gssapi -@dirrm include/kerberosIV -@dirrm share/doc/krb5 -- cgit v1.2.3