diff options
Diffstat (limited to 'security/krb5-16')
31 files changed, 0 insertions, 1186 deletions
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile deleted file mode 100644 index 75ae16913d57..000000000000 --- a/security/krb5-16/Makefile +++ /dev/null @@ -1,195 +0,0 @@ -# Ports collection Makefile for: MIT Kerberos V -# Date created: 6/5/1998 -# Whom: nectar@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= krb5 -PORTVERSION= 1.6.3 -PORTREVISION= 8 -CATEGORIES= security -MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ -PATCH_SITES= http://web.mit.edu/kerberos/advisories/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-signed -EXTRACT_SUFX= .tar -PATCHFILES= 2008-001-patch.txt -PATCH_DIST_STRIP= -p1 - -MAINTAINER= cy@FreeBSD.org -COMMENT= An authentication system developed at MIT, successor to Kerberos IV - -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 - -CONFLICTS= krb4-[0-9]* heimdal-[0-9]* srp-[0-9]* - -LATEST_LINK= ${PORTNAME} -KERBEROSV_URL= http://web.mit.edu/kerberos/ -USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes -USE_GMAKE= yes -USE_PERL5_BUILD= yes -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS?= --enable-shared -CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \ - CFLAGS="${CFLAGS}" -MAKE_ARGS= INSTALL="${INSTALL}" - -OPTIONS= KRB5_RENAME_FTP "Rename ftp to kftp" off \ - KRB5_RENAME_TELNET "Rename telnet to ktelnet" off \ - KRB5_RENAME_RLOGIN "Rename rlogin to krlogin" off \ - KRB5_RENAME_RSH "Rename rsh to krsh" off \ - KRB5_RENAME_RCP "Rename rcp to krcp" off \ - KRB5_KRB4_COMPAT "Build and install krb4 compatibility" off \ - KRB5_DOC "Build and install krb5 documentation" on \ - WANT_HTML "Want HTML documentation too" on - -.include <bsd.port.pre.mk> - -.if defined(WITH_KRB5_DOC) -BUILD_DEPENDS+= texi2dvi:${PORTSDIR}/print/texinfo \ - dvips:${PORTSDIR}/print/dvipsk-tetex -INFO= krb425 krb5-admin krb5-install krb5-user -.endif - -.if !defined(WITH_KRB5_KRB4_COMPAT) -CONFIGURE_ARGS+= --without-krb4 -PLIST_SUB+= KRB4="@comment " -.else -PLIST_SUB+= KRB4="" -.endif - -.if defined(KRB5_HOME) -PREFIX= ${KRB5_HOME} -.endif - -MAN1= krb5-send-pr.1 krb5-config.1 kpasswd.1 klist.1 \ - kinit.1 kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 \ - rlogin.1 ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.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 \ - k5srvutil.8 -.if defined(WITH_KRB5_KRB4_COMPAT) -MAN8+= krb524d.8 -.endif - -.if defined(WITH_KRB5_RENAME_FTP) -MAN1:= ${MAN1:C/ftp/kftp/} -MAN8:= ${MAN8:C/ftp/kftp/} -PROGRAM_TRANSFORM_NAME+= s/^ftp/kftp/; -PLIST_SUB+= FTP_PROG="kftp" -.else -PLIST_SUB+= FTP_PROG="ftp" -.endif - -.if defined(WITH_KRB5_RENAME_TELNET) -MAN1:= ${MAN1:C/telnet/ktelnet/} -MAN8:= ${MAN8:C/telnet/ktelnet/} -PROGRAM_TRANSFORM_NAME+= s/^telnet/ktelnet/; -PLIST_SUB+= TELNET_PROG="ktelnet" -.else -PLIST_SUB+= TELNET_PROG="telnet" -.endif - -.if defined(WITH_KRB5_RENAME_RLOGIN) -MAN1:= ${MAN1:C/rlogin/krlogin/} -PROGRAM_TRANSFORM_NAME+= s/^rlogin/krlogin/; -PLIST_SUB+= RLOGIN_PROG="krlogin" -.else -PLIST_SUB+= RLOGIN_PROG="rlogin" -.endif - -.if defined(WITH_KRB5_RENAME_RSH) -MAN1:= ${MAN1:C/rsh/krsh/} -PROGRAM_TRANSFORM_NAME+= s/^rsh/krsh/; -PLIST_SUB+= RSH_PROG="krsh" -.else -PLIST_SUB+= RSH_PROG="rsh" -.endif - -.if defined(WITH_KRB5_RENAME_RCP) -MAN1:= ${MAN1:C/rcp/krcp/} -PROGRAM_TRANSFORM_NAME+= s/^rcp/krcp/; -PLIST_SUB+= RCP_PROG="krcp" -.else -PLIST_SUB+= RCP_PROG="rcp" -.endif - -.if defined(WITH_KRB5_KRB4_COMPAT) -MAN1+= krb524init.1 v4rcp.1 -.endif - -.if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" -CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" -.endif - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src - -HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc -HTML_DOCS= ftp.html kdestroy.html kinit.html klist.html \ - kpasswd.html krb425.html krb5-admin.html \ - krb5-install.html krb5-user.html ksu.html \ - rcp.html rlogin.html rsh.html telnet.html - -CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" - -post-extract: - @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz - @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ - ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - fi -.endif - -post-patch: - @${REINPLACE_CMD} -e '1s,^#!\/usr\/athena/bin/perl,#!${PERL5},' \ - ${WRKSRC}/../doc/man2html - -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: -.if defined(WITH_KRB5_DOC) - @cd ${WRKSRC}/../doc && \ - ${MAKE} all -.endif - -post-install: - @${MKDIR} ${PREFIX}/share/doc/krb5 -# html documentation -.if defined(WITH_KRB5_DOC) && defined(WITH_WANT_HTML) - for html in ${HTML_DOC_DIR}/*.html; do \ - ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \ - ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \ - done -.endif - ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST} -# handle info files -.if defined(WITH_KRB5_DOC) -.for info in ${INFO} - ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info -.endfor -.endif - - @${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD - @${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD - @${ECHO} "------------------------------------------------------" - @${ECHO} "This port of MIT Kerberos 5 includes remote login " - @${ECHO} "daemons (telnetd and klogind). These daemons default " - @${ECHO} "to using the system login program (/usr/bin/login). " - @${ECHO} "Please see the file " - @${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD" - @${ECHO} "for more information. " - @${ECHO} "------------------------------------------------------" - -.include <bsd.port.post.mk> diff --git a/security/krb5-16/distinfo b/security/krb5-16/distinfo deleted file mode 100644 index 76109873f356..000000000000 --- a/security/krb5-16/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (krb5-1.6.3-signed.tar) = 2dc1307686eb1c2bf1ab08ea805dad46 -SHA256 (krb5-1.6.3-signed.tar) = 7a1bd7d4bd326828c8ee382ed2b69ccd6c58762601df897d6a32169d84583d2a -SIZE (krb5-1.6.3-signed.tar) = 11909120 -MD5 (2008-001-patch.txt) = 3bbb7a6a7738c086f5d5dfcf09da9cbb -SHA256 (2008-001-patch.txt) = 4d02be765ff12d21ddf1cfa170e5ff4067e9c364a401d7e06ece329566139736 -SIZE (2008-001-patch.txt) = 10854 diff --git a/security/krb5-16/files/README.FreeBSD b/security/krb5-16/files/README.FreeBSD deleted file mode 100644 index e888e689eb04..000000000000 --- a/security/krb5-16/files/README.FreeBSD +++ /dev/null @@ -1,32 +0,0 @@ -The MIT KRB5 port provides its own login program at -${PREFIX}/sbin/login.krb5. However, login.krb5 does not make use of -the FreeBSD login.conf and login.access files that provide a means of -setting up and controlling sessions under FreeBSD. To overcome this, -the MIT KRB5 port uses the FreeBSD /usr/bin/login program to provide -interactive login password authentication instead of the login.krb5 -program provided by MIT KRB5. The FreeBSD /usr/bin/login program does -not have support for Kerberos V password authentication, -e.g. authentication at the console. The pam_krb5 port must be used to -provide Kerberos V password authentication. - -For more information about pam_krb5, please see pam(8) and pam_krb5(8). - -If you wish to use login.krb5 that is provided by the MIT KRB5 port, -the arguments "-L ${PREFIX}/sbin/login.krb5" must be -specified as arguments to klogind and KRB5 telnetd, e.g. - -klogin stream tcp nowait root ${PREFIX}/sbin/klogind klogind -k -c -L ${PREFIX}/sbin/login.krb5 -eklogin stream tcp nowait root ${PREFIX}/sbin/klogind klogind -k -c -e -L ${PREFIX}/sbin/login.krb5 -telnet stream tcp nowait root ${PREFIX}/sbin/telnetd telnetd -a none -L ${PREFIX}/sbin/login.krb5 - -Additionally, if you wish to use the MIT KRB5 provided login.krb5 instead -of the FreeBSD provided /usr/bin/login for local tty logins, -"lo=${PREFIX}/sbin/login.krb5" must be specified in /etc/gettytab, e.g., - -default:\ - :cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\ - :if=/etc/issue:\ - :lo=${PREFIX}/sbin/login.krb5: - -It is recommended that the FreeBSD /usr/bin/login be used with the -pam_krb5 port instead of the MIT KRB5 provided login.krb5. diff --git a/security/krb5-16/files/patch-ac b/security/krb5-16/files/patch-ac deleted file mode 100644 index 8bca5437d964..000000000000 --- a/security/krb5-16/files/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ ---- ../doc/admin.texinfo Fri Feb 6 21:40:56 1998 -+++ admin.texinfo Fri Jun 19 15:13:45 1998 -@@ -5,6 +5,10 @@ - @c guide - @setfilename krb5-admin.info - @settitle Kerberos V5 System Administrator's Guide -+@dircategory Kerberos V5 -+@direntry -+* Admin Guide: (krb5-admin). Kerberos V5 System Admin's Guide -+@end direntry - @setchapternewpage odd @c chapter begins on next odd page - @c @setchapternewpage on @c chapter begins on next page - @c @smallbook @c Format for 7" X 9.25" paper diff --git a/security/krb5-16/files/patch-ad b/security/krb5-16/files/patch-ad deleted file mode 100644 index c8b6d3e99e91..000000000000 --- a/security/krb5-16/files/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ ---- ../doc/user-guide.texinfo Fri Feb 6 21:40:58 1998 -+++ user-guide.texinfo Fri Jun 19 15:13:45 1998 -@@ -3,6 +3,10 @@ - @c guide - @setfilename krb5-user.info - @settitle Kerberos V5 UNIX User's Guide -+@dircategory Kerberos V5 -+@direntry -+* User's Guide: (krb5-user). Kerberos V5 UNIX User's Guide -+@end direntry - @setchapternewpage odd @c chapter begins on next odd page - @c @setchapternewpage on @c chapter begins on next page - @c @smallbook @c Format for 7" X 9.25" paper diff --git a/security/krb5-16/files/patch-ae b/security/krb5-16/files/patch-ae deleted file mode 100644 index f5643b5aa04f..000000000000 --- a/security/krb5-16/files/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ ---- ../doc/install.texinfo Fri Feb 6 21:40:56 1998 -+++ install.texinfo Fri Jun 19 15:13:45 1998 -@@ -5,6 +5,10 @@ - @c guide - @setfilename krb5-install.info - @settitle Kerberos V5 Installation Guide -+@dircategory Kerberos V5 -+@direntry -+* Installation Guide: (krb5-install). Kerberos V5 Installation Guide -+@end direntry - @setchapternewpage odd @c chapter begins on next odd page - @c @setchapternewpage on @c chapter begins on next page - @c @smallbook @c Format for 7" X 9.25" paper diff --git a/security/krb5-16/files/patch-af b/security/krb5-16/files/patch-af deleted file mode 100644 index 49425d6efceb..000000000000 --- a/security/krb5-16/files/patch-af +++ /dev/null @@ -1,13 +0,0 @@ ---- ../doc/krb425.texinfo Fri Feb 6 21:40:57 1998 -+++ krb425.texinfo Fri Jun 19 15:13:45 1998 -@@ -5,6 +5,10 @@ - @c guide - @setfilename krb425.info - @settitle Upgrading to Kerberos V5 from Kerberos V4 -+@dircategory Kerberos V5 -+@direntry -+* Upgrading from V4 to V5: (krb425). Upgrading from Kerberos V4 to V5 -+@end direntry - @c @setchapternewpage odd @c chapter begins on next odd page - @c @setchapternewpage on @c chapter begins on next page - @c @smallbook @c Format for 7" X 9.25" paper diff --git a/security/krb5-16/files/patch-ai b/security/krb5-16/files/patch-ai deleted file mode 100644 index 3588a76ed199..000000000000 --- a/security/krb5-16/files/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ ---- appl/gssftp/ftpd/ftpd.c.orig Wed Jan 9 14:26:51 2002 -+++ appl/gssftp/ftpd/ftpd.c Thu Jan 10 19:00:13 2002 -@@ -487,7 +487,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 deleted file mode 100644 index c3bb8dfd6960..000000000000 --- a/security/krb5-16/files/patch-aj +++ /dev/null @@ -1,19 +0,0 @@ -*** 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 -*************** -*** 66,72 **** - struct stat buf; - time_t time(); - -! if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0) - return; - if (fstat(fd, &buf) == 0) { - (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line)); ---- 66,72 ---- - struct stat buf; - time_t time(); - -! if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) - return; - if (fstat(fd, &buf) == 0) { - (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line)); diff --git a/security/krb5-16/files/patch-appl::bsd::Makefile.in b/security/krb5-16/files/patch-appl::bsd::Makefile.in deleted file mode 100644 index 581048933264..000000000000 --- a/security/krb5-16/files/patch-appl::bsd::Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- appl/bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001 -+++ appl/bsd/Makefile.in Mon Dec 31 21:52:45 2001 -@@ -31,8 +31,8 @@ - -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\" - - DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \ -- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ -+ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ - -DHEIMDAL_FRIENDLY - - all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP) - diff --git a/security/krb5-16/files/patch-appl::bsd::klogind.M b/security/krb5-16/files/patch-appl::bsd::klogind.M deleted file mode 100644 index 9cddd5fc222d..000000000000 --- a/security/krb5-16/files/patch-appl::bsd::klogind.M +++ /dev/null @@ -1,35 +0,0 @@ ---- appl/bsd/klogind.M.orig Wed Feb 28 14:06:43 2001 -+++ appl/bsd/klogind.M Mon Dec 31 21:22:27 2001 -@@ -14,7 +14,7 @@ - .B \-kr54cpPef - ] - [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ] --[ \fB\-D\fP \fIport\fP ] -+[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP] - .SH DESCRIPTION - .I Klogind - is the server for the -@@ -107,6 +108,10 @@ - Beta5 (May 1995)--present bogus checksums that prevent Kerberos - authentication from succeeding in the default mode. - -+.IP \fB\-L\ loginpath\fP -+Specify pathname to an alternative login program. Default: /usr/bin/login. -+KRB5_HOME/sbin/login.krb5 may be specified. -+ - - .PP - If the -@@ -157,12 +162,6 @@ - - .IP \fB\-M\ realm\fP - Set the Kerberos realm to use. -- --.IP \fB\-L\ login\fP --Set the login program to use. This option only has an effect if --DO_NOT_USE_K_LOGIN was not defined when --.I klogind --was compiled. - - .IP \fB\-D\ port\fP - Run in standalone mode, listening on \fBport\fP. The daemon will exit diff --git a/security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h deleted file mode 100644 index 256e929aa68f..000000000000 --- a/security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h +++ /dev/null @@ -1,23 +0,0 @@ ---- appl/gssftp/ftp/ftp_var.h.orig Tue Jun 17 02:37:40 2003 -+++ appl/gssftp/ftp/ftp_var.h Sat Aug 30 05:30:44 2003 -@@ -33,6 +33,10 @@ - * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90 - */ - -+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000 -+#undef __BSD_VISIBLE -+#endif -+ - #ifdef _WIN32 - #include <windows.h> - #include <winsock2.h> -@@ -57,9 +61,7 @@ - typedef void (*sig_t)(int); - typedef void sigtype; - #else --#define sig_t my_sig_t - #define sigtype krb5_sigtype --typedef sigtype (*sig_t)(); - #endif - - /* diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in b/security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in deleted file mode 100644 index cb5a0e26d49d..000000000000 --- a/security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- appl/telnet/telnetd/Makefile.in.orig Wed Feb 28 14:06:51 2001 -+++ appl/telnet/telnetd/Makefile.in Mon Dec 31 21:51:19 2001 -@@ -24,7 +24,7 @@ - # @(#)Makefile.generic 5.5 (Berkeley) 3/1/91 - # - --AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN -+AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\" - OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON - LOCALINCLUDES=-I.. -I$(srcdir)/.. - DEFINES = $(AUTH_DEF) $(OTHERDEFS) diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.8 b/security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.8 deleted file mode 100644 index 951ee0d5692a..000000000000 --- a/security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.8 +++ /dev/null @@ -1,22 +0,0 @@ ---- appl/telnet/telnetd/telnetd.8.orig Wed Feb 28 14:06:51 2001 -+++ appl/telnet/telnetd/telnetd.8 Mon Dec 31 21:16:55 2001 -@@ -43,7 +43,7 @@ - [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP] - [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP] - [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]] --[\fB\-debug\fP [\fIport\fP]] -+[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP] - .SH DESCRIPTION - The - .B telnetd -@@ -221,6 +221,10 @@ - in response to a - .SM DO TIMING-MARK) - for kludge linemode support. -+.TP -+\fB\-L\fP \fIloginpath\fP -+Specify pathname to an alternative login program. Default: /usr/bin/login. -+KRB5_HOME/sbin/login.krb5 may be specified. - .TP - .B \-l - Specifies line mode. Tries to force clients to use line-at-a-time diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-16/files/patch-appl::telnet::telnetd::utility.c deleted file mode 100644 index 8bb656dc0673..000000000000 --- a/security/krb5-16/files/patch-appl::telnet::telnetd::utility.c +++ /dev/null @@ -1,38 +0,0 @@ ---- appl/telnet/telnetd/utility.c.orig Wed Jan 9 14:26:59 2002 -+++ appl/telnet/telnetd/utility.c Fri Jan 11 13:10:33 2002 -@@ -408,18 +408,25 @@ - int - netwrite(const char *buf, size_t len) - { -- size_t remain; -+ int remaining, copied; -+ -+ remaining = BUFSIZ - (nfrontp - netobuf); -+ while (len > 0) { -+ /* Free up enough space if the room is too low*/ -+ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) { -+ netflush(); -+ remaining = BUFSIZ - (nfrontp - netobuf); -+ } - -- remain = sizeof(netobuf) - (nfrontp - netobuf); -- if (remain < len) { -- netflush(); -- remain = sizeof(netobuf) - (nfrontp - netobuf); -+ /* Copy out as much as will fit */ -+ copied = remaining > len ? len : remaining; -+ memmove(nfrontp, buf, copied); -+ nfrontp += copied; -+ len -= copied; -+ remaining -= copied; -+ buf += copied; - } -- if (remain < len) -- return 0; -- memcpy(nfrontp, buf, len); -- nfrontp += len; -- return len; -+ return copied; - } - - /* diff --git a/security/krb5-16/files/patch-as b/security/krb5-16/files/patch-as deleted file mode 100644 index de19886eac08..000000000000 --- a/security/krb5-16/files/patch-as +++ /dev/null @@ -1,195 +0,0 @@ ---- clients/ksu/main.c.orig Wed Aug 14 12:14:49 2002 -+++ clients/ksu/main.c Tue Jul 29 18:46:00 2003 -@@ -32,6 +32,10 @@ - #include <signal.h> - #include <grp.h> - -+#ifdef LOGIN_CAP -+#include <login_cap.h> -+#endif -+ - /* globals */ - char * prog_name; - int auth_debug =0; -@@ -61,7 +65,7 @@ - ill specified arguments to commands */ - - void usage (){ -- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); -+ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name); - } - - /* for Ultrix and friends ... */ -@@ -77,6 +81,7 @@ - int argc; - char ** argv; - { -+ int asme = 0; - int hp =0; - int some_rest_copy = 0; - int all_rest_copy = 0; -@@ -91,6 +96,7 @@ - char * cc_target_tag = NULL; - char * target_user = NULL; - char * source_user; -+ char * source_shell; - - krb5_ccache cc_source = NULL; - const char * cc_source_tag = NULL; -@@ -117,6 +123,11 @@ - krb5_principal kdc_server; - krb5_boolean zero_password; - char * dir_of_cc_target; -+ -+#ifdef LOGIN_CAP -+ login_cap_t *lc; -+ int setwhat; -+#endif - - options.opt = KRB5_DEFAULT_OPTIONS; - options.lifetime = KRB5_DEFAULT_TKT_LIFE; -@@ -181,7 +192,7 @@ - com_err (prog_name, errno, "while setting euid to source user"); - exit (1); - } -- while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkql:e:")) != -1)){ -+ while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkmql:e:")) != -1)){ - switch (option) { - case 'r': - options.opt |= KDC_OPT_RENEWABLE; -@@ -227,6 +238,9 @@ - errflg++; - } - break; -+ case 'm': -+ asme = 1; -+ break; - case 'n': - if ((retval = krb5_parse_name(ksu_context, optarg, &client))){ - com_err(prog_name, retval, "when parsing name %s", optarg); -@@ -341,6 +355,7 @@ - - /* allocate space and copy the usernamane there */ - source_user = xstrdup(pwd->pw_name); -+ source_shell = xstrdup(pwd->pw_shell); - source_uid = pwd->pw_uid; - source_gid = pwd->pw_gid; - -@@ -672,43 +687,64 @@ - /* get the shell of the user, this will be the shell used by su */ - target_pwd = getpwnam(target_user); - -- if (target_pwd->pw_shell) -- shell = xstrdup(target_pwd->pw_shell); -- else { -- shell = _DEF_CSH; /* default is cshell */ -+ if (asme) { -+ if (source_shell && *source_shell) { -+ shell = strdup(source_shell); -+ } else { -+ shell = _DEF_CSH; -+ } -+ } else { -+ if (target_pwd->pw_shell) -+ shell = strdup(target_pwd->pw_shell); -+ else { -+ shell = _DEF_CSH; /* default is cshell */ -+ } - } - - #ifdef HAVE_GETUSERSHELL - - /* insist that the target login uses a standard shell (root is omited) */ - -- if (!standard_shell(target_pwd->pw_shell) && source_uid) { -- fprintf(stderr, "ksu: permission denied (shell).\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -+ if (asme) { -+ if (!standard_shell(pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } else { -+ if (!standard_shell(target_pwd->pw_shell) && source_uid) { -+ fprintf(stderr, "ksu: permission denied (shell).\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } - } - #endif /* HAVE_GETUSERSHELL */ - -- if (target_pwd->pw_uid){ -- -- if(set_env_var("USER", target_pwd->pw_name)){ -+ if (!asme) { -+ if (target_pwd->pw_uid){ -+ if (set_env_var("USER", target_pwd->pw_name)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } -+ -+ if (set_env_var( "HOME", target_pwd->pw_dir)){ - fprintf(stderr,"ksu: couldn't set environment variable USER\n"); - sweep_up(ksu_context, cc_target); - exit(1); -- } -- } -- -- if(set_env_var( "HOME", target_pwd->pw_dir)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ } - -- if(set_env_var( "SHELL", shell)){ -- fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -- sweep_up(ksu_context, cc_target); -- exit(1); -- } -+ if (set_env_var( "SHELL", shell)){ -+ fprintf(stderr,"ksu: couldn't set environment variable USER\n"); -+ sweep_up(ksu_context, cc_target); -+ exit(1); -+ } -+ } -+ -+#ifdef LOGIN_CAP -+ lc = login_getpwclass(pwd); -+#endif - - /* set the cc env name to target */ - -@@ -718,7 +754,19 @@ - sweep_up(ksu_context, cc_target); - exit(1); - } -- -+ -+#ifdef LOGIN_CAP -+ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; -+ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV; -+ /* -+ * Don't touch resource/priority settings if -m has been -+ * used or -l and -c hasn't, and we're not su'ing to root. -+ */ -+ if (target_pwd->pw_uid) -+ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES); -+ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0) -+ err(1, "setusercontext"); -+#else - /* set permissions */ - if (setgid(target_pwd->pw_gid) < 0) { - perror("ksu: setgid"); -@@ -759,6 +807,7 @@ - sweep_up(ksu_context, cc_target); - exit(1); - } -+#endif - - if (access( cc_target_tag_tmp, R_OK | W_OK )){ - com_err(prog_name, errno, diff --git a/security/krb5-16/files/patch-at b/security/krb5-16/files/patch-at deleted file mode 100644 index 060207ec644a..000000000000 --- a/security/krb5-16/files/patch-at +++ /dev/null @@ -1,14 +0,0 @@ -*** include/syslog.h.ORIG Fri Feb 6 19:42:12 1998 ---- include/syslog.h Tue Jun 30 19:46:02 1998 -*************** -*** 34,39 **** ---- 34,42 ---- - #define LOG_LPR (6<<3) /* line printer subsystem */ - #define LOG_NEWS (7<<3) /* network news subsystem */ - #define LOG_UUCP (8<<3) /* UUCP subsystem */ -+ #if (defined(BSD) && (BSD >= 199306)) -+ #define LOG_FTP (11<<3) /* ftp daemon */ -+ #endif - /* other codes through 15 reserved for system use */ - #define LOG_LOCAL0 (16<<3) /* reserved for local use */ - #define LOG_LOCAL1 (17<<3) /* reserved for local use */ diff --git a/security/krb5-16/files/patch-av b/security/krb5-16/files/patch-av deleted file mode 100644 index 8363b8bb1e2d..000000000000 --- a/security/krb5-16/files/patch-av +++ /dev/null @@ -1,15 +0,0 @@ -*** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998 ---- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998 -*************** -*** 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) - ---- 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) - diff --git a/security/krb5-16/files/patch-ax b/security/krb5-16/files/patch-ax deleted file mode 100644 index 6cbb8289f93e..000000000000 --- a/security/krb5-16/files/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ ---- ../doc/Makefile.orig 2007-09-17 20:36:09.000000000 -0700 -+++ ../doc/Makefile 2007-10-25 14:04:48.000000000 -0700 -@@ -1,8 +1,8 @@ - SRCDIR=../src --DVI=texi2dvi4a2ps # texi2dvi -+DVI=texi2dvi # texi2dvi - DVIPS=dvips -o "$@" - PSPDF=ps2pdf --INFO=makeinfo -+INFO=makeinfo --no-validate --no-split - HTML=makeinfo --html --no-split - RM=rm -f - TAR=tar -chvf diff --git a/security/krb5-16/files/patch-ay b/security/krb5-16/files/patch-ay deleted file mode 100644 index a6cb9ebbfd13..000000000000 --- a/security/krb5-16/files/patch-ay +++ /dev/null @@ -1,50 +0,0 @@ ---- appl/libpty/getpty.c.orig Wed Jan 9 14:28:37 2002 -+++ appl/libpty/getpty.c Thu Jan 10 21:30:40 2002 -@@ -24,13 +24,26 @@ - #include "libpty.h" - #include "pty-int.h" - -+#ifdef __FreeBSD__ -+#define PTYCHARS1 "pqrsPQRS" -+#define PTYCHARS2 "0123456789abcdefghijklmnopqrstuv" -+#endif -+ -+#ifndef PTYCHARS1 -+#define PTYCHARS1 "pqrstuvwxyzPQRST" -+#endif -+ -+#ifndef PTYCHARS2 -+#define PTYCHARS2 "0123456789abcdef" -+#endif -+ - long - ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt) - { -+ int ptynum; -+ char *cp1, *cp2; - #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY) -- char *cp; - char *p; -- int i,ptynum; - struct stat stb; - char slavebuf[1024]; - #endif -@@ -115,14 +128,14 @@ - strncpy(slave, slavebuf, slavelength); - return 0; - } else { -- for (cp = "pqrstuvwxyzPQRST";*cp; cp++) { -+ for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) { - sprintf(slavebuf,"/dev/ptyXX"); -- slavebuf[sizeof("/dev/pty") - 1] = *cp; -+ slavebuf[sizeof("/dev/pty") - 1] = *cp1; - slavebuf[sizeof("/dev/ptyp") - 1] = '0'; - if (stat(slavebuf, &stb) < 0) - break; -- for (i = 0; i < 16; i++) { -- slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i]; -+ for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) { -+ slavebuf[sizeof("/dev/ptyp") - 1] = *cp2; - *fd = open(slavebuf, O_RDWR); - if (*fd < 0) continue; - diff --git a/security/krb5-16/files/patch-ba b/security/krb5-16/files/patch-ba deleted file mode 100644 index dd0c760df7d2..000000000000 --- a/security/krb5-16/files/patch-ba +++ /dev/null @@ -1,77 +0,0 @@ ---- appl/bsd/login.c.orig Tue May 27 21:06:25 2003 -+++ appl/bsd/login.c Tue Jul 29 20:52:25 2003 -@@ -1342,19 +1342,6 @@ - setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); - } - -- /* Policy: If local password is good, user is good. -- We really can't trust the Kerberos password, -- because somebody on the net could spoof the -- Kerberos server (not easy, but possible). -- Some sites might want to use it anyways, in -- which case they should change this line -- to: -- if (kpass_ok) -- */ -- -- if (lpass_ok) -- break; -- - if (got_v5_tickets) { - retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, - NULL, &xtra_creds, -@@ -1378,6 +1365,9 @@ - } - #endif /* KRB4_GET_TICKETS */ - -+ if (lpass_ok) -+ break; -+ - bad_login: - setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); - -@@ -1667,21 +1657,23 @@ - /* set up credential cache -- obeying KRB5_ENV_CCNAME - set earlier */ - /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */ -- if ((retval = krb5_cc_default(kcontext, &ccache))) { -+ if ((retval = krb5_cc_default(kcontext, &ccache))) - com_err(argv[0], retval, "while getting default ccache"); -- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) { -- com_err(argv[0], retval, "when initializing cache"); -- } else if ((retval = krb5_cc_store_cred(kcontext, ccache, -- &my_creds))) { -- com_err(argv[0], retval, "while storing credentials"); -- } else if (xtra_creds && -- (retval = krb5_cc_copy_creds(kcontext, xtra_creds, -- ccache))) { -- com_err(argv[0], retval, "while storing credentials"); -+ else { -+ if (retval = krb5_cc_initialize(kcontext, ccache, me)) -+ com_err(argv[0], retval, "when initializing cache"); -+ else { -+ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) -+ com_err(argv[0], retval, "while storing credentials"); -+ else { -+ if (xtra_creds && -+ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) { -+ com_err(argv[0], retval, "while storing credentials"); -+ krb5_cc_destroy(kcontext, xtra_creds); -+ } -+ } -+ } - } -- -- if (xtra_creds) -- krb5_cc_destroy(kcontext, xtra_creds); - } else if (forwarded_v5_tickets && rewrite_ccache) { - if ((retval = krb5_cc_initialize (kcontext, ccache, me))) { - syslog(LOG_ERR, -@@ -1762,6 +1754,7 @@ - - if (ccname) - setenv("KRB5CCNAME", ccname, 1); -+ krb5_cc_set_default_name(kcontext, ccname); - - setenv("HOME", pwd->pw_dir, 1); - setenv("PATH", LPATH, 1); diff --git a/security/krb5-16/files/patch-bb b/security/krb5-16/files/patch-bb deleted file mode 100644 index 6545ae682c53..000000000000 --- a/security/krb5-16/files/patch-bb +++ /dev/null @@ -1,10 +0,0 @@ ---- appl/telnet/telnet/Makefile.in.orig Sat Dec 18 10:47:05 1999 -+++ appl/telnet/telnet/Makefile.in Sat Dec 18 10:47:13 1999 -@@ -58,7 +58,6 @@ - $(INSTALL_DATA) $(srcdir)/$$f.1 \ - ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \ - done -- $(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc - - authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) - commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) diff --git a/security/krb5-16/files/patch-config::pre.in b/security/krb5-16/files/patch-config::pre.in deleted file mode 100644 index bdd183e98ad4..000000000000 --- a/security/krb5-16/files/patch-config::pre.in +++ /dev/null @@ -1,11 +0,0 @@ ---- config/pre.in.orig Fri Nov 19 13:47:51 2004 -+++ config/pre.in Thu Jan 27 17:43:12 2005 -@@ -177,7 +177,7 @@ - INSTALL=@INSTALL@ - INSTALL_STRIP= - INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) --INSTALL_SCRIPT=@INSTALL_PROGRAM@ -+INSTALL_SCRIPT=@INSTALL_SCRIPT@ - INSTALL_DATA=@INSTALL_DATA@ - INSTALL_SHLIB=@INSTALL_SHLIB@ - INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root diff --git a/security/krb5-16/files/patch-config::shlib.conf b/security/krb5-16/files/patch-config::shlib.conf deleted file mode 100644 index 5d680b5487ca..000000000000 --- a/security/krb5-16/files/patch-config::shlib.conf +++ /dev/null @@ -1,27 +0,0 @@ ---- config/shlib.conf.orig 2009-07-13 14:48:25.000000000 +0200 -+++ config/shlib.conf 2009-07-13 14:49:49.000000000 +0200 -@@ -258,19 +258,13 @@ - ;; - - *-*-freebsd*) -- if test -x /usr/bin/objformat ; then -- objformat=`/usr/bin/objformat` -- else -- objformat="aout" -- fi -- PICFLAGS=-fpic -- if test "x$objformat" = "xelf" ; then -+ case $krb5_cv_host in -+ sparc64-*) PICFLAGS=-fPIC;; -+ *) PICFLAGS=-fpic;; -+ esac - SHLIBVEXT='.so.$(LIBMAJOR)' - RPATH_FLAG='-Wl,-rpath -Wl,' -- else -- RPATH_FLAG=-R -- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' -- fi -+ - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' - SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' diff --git a/security/krb5-16/files/patch-lib-krb5-os-localaddr.c b/security/krb5-16/files/patch-lib-krb5-os-localaddr.c deleted file mode 100644 index 9e701ba97985..000000000000 --- a/security/krb5-16/files/patch-lib-krb5-os-localaddr.c +++ /dev/null @@ -1,75 +0,0 @@ ---- lib/krb5/os/localaddr.c.orig Wed Apr 13 09:55:43 2005 -+++ lib/krb5/os/localaddr.c Sun Jul 16 09:29:05 2006 -@@ -436,12 +436,14 @@ - #endif - if ((ifp->ifa_flags & IFF_UP) == 0) - continue; -+#if 0 - if (ifp->ifa_flags & IFF_LOOPBACK) { - /* Pretend it's not up, so the second pass will skip - it. */ - ifp->ifa_flags &= ~IFF_UP; - continue; - } -+#endif - if (ifp->ifa_addr == NULL) { - /* Can't use an interface without an address. Linux - apparently does this sometimes. [RT ticket 1770 from -@@ -459,8 +461,10 @@ - for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) { - if ((ifp2->ifa_flags & IFF_UP) == 0) - continue; -+#if 0 - if (ifp2->ifa_flags & IFF_LOOPBACK) - continue; -+#endif - if (addr_eq (ifp->ifa_addr, ifp2->ifa_addr)) { - match = 1; - ifp->ifa_flags &= ~IFF_UP; -@@ -583,6 +587,7 @@ - } - /*@=moduncon@*/ - -+#if 0 - #ifdef IFF_LOOPBACK - /* None of the current callers want loopback addresses. */ - if (lifreq.lifr_flags & IFF_LOOPBACK) { -@@ -590,6 +595,7 @@ - goto skip; - } - #endif -+#endif - /* Ignore interfaces that are down. */ - if ((lifreq.lifr_flags & IFF_UP) == 0) { - Tprintf ((" down\n")); -@@ -755,6 +761,7 @@ - } - /*@=moduncon@*/ - -+#if 0 - #ifdef IFF_LOOPBACK - /* None of the current callers want loopback addresses. */ - if (lifreq.iflr_flags & IFF_LOOPBACK) { -@@ -762,6 +769,7 @@ - goto skip; - } - #endif -+#endif - /* Ignore interfaces that are down. */ - if ((lifreq.iflr_flags & IFF_UP) == 0) { - Tprintf ((" down\n")); -@@ -971,12 +979,14 @@ - } - /*@=moduncon@*/ - -+#if 0 - #ifdef IFF_LOOPBACK - /* None of the current callers want loopback addresses. */ - if (ifreq.ifr_flags & IFF_LOOPBACK) { - Tprintf ((" loopback\n")); - goto skip; - } -+#endif - #endif - /* Ignore interfaces that are down. */ - if ((ifreq.ifr_flags & IFF_UP) == 0) { diff --git a/security/krb5-16/files/patch-lib-rpc-svc.c b/security/krb5-16/files/patch-lib-rpc-svc.c deleted file mode 100644 index 395039040b04..000000000000 --- a/security/krb5-16/files/patch-lib-rpc-svc.c +++ /dev/null @@ -1,24 +0,0 @@ -=== lib/rpc/svc.c -================================================================== ---- lib/rpc/svc.c (revision 1666) -+++ lib/rpc/svc.c (local) -@@ -109,15 +109,17 @@ - if (sock < FD_SETSIZE) { - xports[sock] = xprt; - FD_SET(sock, &svc_fdset); -+ if (sock > svc_maxfd) -+ svc_maxfd = sock; - } - #else - if (sock < NOFILE) { - xports[sock] = xprt; - svc_fds |= (1 << sock); -+ if (sock > svc_maxfd) -+ svc_maxfd = sock; - } - #endif /* def FD_SETSIZE */ -- if (sock > svc_maxfd) -- svc_maxfd = sock; - } - - /* diff --git a/security/krb5-16/files/patch-lib-rpc-svc_tcp.c b/security/krb5-16/files/patch-lib-rpc-svc_tcp.c deleted file mode 100644 index 9c51fafc62bf..000000000000 --- a/security/krb5-16/files/patch-lib-rpc-svc_tcp.c +++ /dev/null @@ -1,51 +0,0 @@ -=== lib/rpc/svc_tcp.c -================================================================== ---- lib/rpc/svc_tcp.c (revision 1666) -+++ lib/rpc/svc_tcp.c (local) -@@ -54,6 +54,14 @@ - extern errno; - */ - -+#ifndef FD_SETSIZE -+#ifdef NBBY -+#define NOFILE (sizeof(int) * NBBY) -+#else -+#define NOFILE (sizeof(int) * 8) -+#endif -+#endif -+ - /* - * Ops vector for TCP/IP based rpc service handle - */ -@@ -215,6 +223,19 @@ - register SVCXPRT *xprt; - register struct tcp_conn *cd; - -+#ifdef FD_SETSIZE -+ if (fd >= FD_SETSIZE) { -+ (void) fprintf(stderr, "svc_tcp: makefd_xprt: fd too high\n"); -+ xprt = NULL; -+ goto done; -+ } -+#else -+ if (fd >= NOFILE) { -+ (void) fprintf(stderr, "svc_tcp: makefd_xprt: fd too high\n"); -+ xprt = NULL; -+ goto done; -+ } -+#endif - xprt = (SVCXPRT *)mem_alloc(sizeof(SVCXPRT)); - if (xprt == (SVCXPRT *)NULL) { - (void) fprintf(stderr, "svc_tcp: makefd_xprt: out of memory\n"); -@@ -271,6 +292,10 @@ - * make a new transporter (re-uses xprt) - */ - xprt = makefd_xprt(sock, r->sendsize, r->recvsize); -+ if (xprt == NULL) { -+ close(sock); -+ return (FALSE); -+ } - xprt->xp_raddr = addr; - xprt->xp_addrlen = len; - xprt->xp_laddr = laddr; - diff --git a/security/krb5-16/files/patch-lib::gssapi::krb5::import_name.c b/security/krb5-16/files/patch-lib::gssapi::krb5::import_name.c deleted file mode 100644 index 40f116af2196..000000000000 --- a/security/krb5-16/files/patch-lib::gssapi::krb5::import_name.c +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005 -+++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005 -@@ -33,6 +33,11 @@ - #endif - #endif - -+#include <sys/param.h> -+#if __FreeBSD_version < 500100 -+#include <stdio.h> -+#endif -+ - #ifdef HAVE_STRING_H - #include <string.h> - #else diff --git a/security/krb5-16/files/patch-plugins-preauth-pkinit-Makefile.in b/security/krb5-16/files/patch-plugins-preauth-pkinit-Makefile.in deleted file mode 100644 index cb464470b1cf..000000000000 --- a/security/krb5-16/files/patch-plugins-preauth-pkinit-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/preauth/pkinit/Makefile.in.orig 2007-09-28 18:02:10.000000000 -0700 -+++ plugins/preauth/pkinit/Makefile.in 2007-10-29 07:03:24.000000000 -0700 -@@ -21,7 +21,7 @@ - $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(TOPLIBD)/libkrb5$(SHLIBEXT) - LIBS+= -lcrypto --SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto -ldl $(SUPPORT_LIB) $(LIBS) -+SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS) - - SHLIB_DIRS=-L$(TOPLIBD) - SHLIB_RDIRS=$(KRB5_LIBDIR) diff --git a/security/krb5-16/pkg-descr b/security/krb5-16/pkg-descr deleted file mode 100644 index d11e2e6d1c15..000000000000 --- a/security/krb5-16/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -Kerberos V5 is an authentication system developed at MIT. -WWW: http://web.mit.edu/kerberos/ - -Abridged from the User Guide: - Under Kerberos, a client sends a request for a ticket to the - Key Distribution Center (KDC). The KDC creates a ticket-granting - ticket (TGT) for the client, encrypts it using the client's - password as the key, and sends the encrypted TGT back to the - client. The client then attempts to decrypt the TGT, using - its password. If the client successfully decrypts the TGT, it - keeps the decrypted TGT, which indicates proof of the client's - identity. The TGT permits the client to obtain additional tickets, - which give permission for specific services. - Since Kerberos negotiates authenticated, and optionally encrypted, - communications between two points anywhere on the internet, it - provides a layer of security that is not dependent on which side of a - firewall either client is on. - The Kerberos V5 package is designed to be easy to use. Most of the - commands are nearly identical to UNIX network programs you are already - used to. Kerberos V5 is a single-sign-on system, which means that you - have to type your password only once per session, and Kerberos does - the authenticating and encrypting transparently. - -Jacques Vidrine <n@nectar.com> diff --git a/security/krb5-16/pkg-plist b/security/krb5-16/pkg-plist deleted file mode 100644 index 1f5aa77cda2b..000000000000 --- a/security/krb5-16/pkg-plist +++ /dev/null @@ -1,113 +0,0 @@ -bin/compile_et -bin/%%FTP_PROG%% -bin/gss-client -bin/kdestroy -bin/kinit -bin/klist -bin/kpasswd -bin/krb5-config -%%KRB4%%bin/krb524init -bin/ksu -bin/kvno -bin/%%RCP_PROG%% -bin/%%RLOGIN_PROG%% -bin/%%RSH_PROG%% -bin/sclient -bin/sim_client -bin/%%TELNET_PROG%% -bin/uuclient -%%KRB4%%bin/v4rcp -include/com_err.h -include/gssapi.h -include/gssapi/gssapi.h -include/gssapi/gssapi_generic.h -include/gssapi/gssapi_krb5.h -include/gssapi/mechglue.h -include/gssrpc/auth.h -include/gssrpc/auth_gss.h -include/gssrpc/auth_gssapi.h -include/gssrpc/auth_unix.h -include/gssrpc/clnt.h -include/gssrpc/netdb.h -include/gssrpc/pmap_clnt.h -include/gssrpc/pmap_prot.h -include/gssrpc/pmap_rmt.h -include/gssrpc/rename.h -include/gssrpc/rpc.h -include/gssrpc/rpc_msg.h -include/gssrpc/svc.h -include/gssrpc/svc_auth.h -include/gssrpc/types.h -include/gssrpc/xdr.h -%%KRB4%%include/kerberosIV/des.h -%%KRB4%%include/kerberosIV/kadm_err.h -%%KRB4%%include/kerberosIV/krb.h -%%KRB4%%include/kerberosIV/krb_err.h -%%KRB4%%include/kerberosIV/mit-copyright.h -include/krb5.h -include/krb5/krb5.h -include/krb5/locate_plugin.h -include/profile.h -lib/libcom_err.so -lib/libcom_err.so.3 -lib/libdes425.so -lib/libdes425.so.3 -lib/libgssapi_krb5.so -lib/libgssapi_krb5.so.2 -lib/libgssrpc.so -lib/libgssrpc.so.4 -lib/libk5crypto.so -lib/libk5crypto.so.3 -lib/libkadm5clnt.so -lib/libkadm5clnt.so.5 -lib/libkadm5srv.so -lib/libkadm5srv.so.5 -lib/libkdb5.so -lib/libkdb5.so.4 -%%KRB4%%lib/libkrb4.so -%%KRB4%%lib/libkrb4.so.2 -lib/libkrb5.so -lib/libkrb5.so.3 -lib/libkrb5support.so -lib/libkrb5support.so.0 -lib/krb5/plugins/kdb/db2.so -lib/krb5/plugins/preauth/pkinit.so -sbin/%%FTP_PROG%%d -sbin/gss-server -sbin/k5srvutil -sbin/kadmin -sbin/kadmin.local -sbin/kadmind -sbin/kdb5_util -sbin/klogind -sbin/kprop -sbin/kpropd -sbin/krb5-send-pr -%%KRB4%%sbin/krb524d -sbin/krb5kdc -sbin/kshd -sbin/ktutil -sbin/login.krb5 -sbin/sim_server -sbin/sserver -sbin/%%TELNET_PROG%%d -sbin/uuserver -share/doc/krb5/README.FreeBSD -share/et/et_c.awk -share/et/et_h.awk -share/examples/krb5/kdc.conf -share/examples/krb5/krb5.conf -share/examples/krb5/services.append -share/gnats/mit -@dirrm lib/krb5/plugins/preauth -@dirrm lib/krb5/plugins/libkrb5 -@dirrm lib/krb5/plugins/kdb -@dirrm lib/krb5/plugins -@dirrm lib/krb5 -@dirrm include/gssapi -@dirrm include/gssrpc -@dirrm include/kerberosIV -@dirrm include/krb5 -@dirrm share/et -@dirrmtry share/gnats -@dirrm share/examples/krb5 |