diff options
Diffstat (limited to 'security/krb5-appl/files')
| -rw-r--r-- | security/krb5-appl/files/patch-af | 13 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-ai | 11 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-appl::bsd::klogind.M | 27 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-at | 14 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-ay | 5 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-config::shlib.conf | 18 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-lib-krb5-os-localaddr.c | 64 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-lib-rpc-svc.c | 24 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-lib-rpc-svc_tcp.c | 51 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-plugins-preauth-pkinit-Makefile.in | 11 |
10 files changed, 54 insertions, 184 deletions
diff --git a/security/krb5-appl/files/patch-af b/security/krb5-appl/files/patch-af deleted file mode 100644 index 49425d6efceb..000000000000 --- a/security/krb5-appl/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-appl/files/patch-ai b/security/krb5-appl/files/patch-ai index f5b733194344..3588a76ed199 100644 --- a/security/krb5-appl/files/patch-ai +++ b/security/krb5-appl/files/patch-ai @@ -15,14 +15,3 @@ addrlen = sizeof (his_addr); if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { -@@ -2312,6 +2318,10 @@ - if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum), - &kdata.session,&ctrl_addr, &his_addr)) == -1) { - secure_error("ADAT: krb_mk_safe failed"); -+ return(0); -+ } -+ if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) { -+ secure_error("ADAT: reply too long"); - return(0); - } - if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) { diff --git a/security/krb5-appl/files/patch-appl::bsd::klogind.M b/security/krb5-appl/files/patch-appl::bsd::klogind.M index 9cddd5fc222d..48544cba8955 100644 --- a/security/krb5-appl/files/patch-appl::bsd::klogind.M +++ b/security/krb5-appl/files/patch-appl::bsd::klogind.M @@ -1,7 +1,7 @@ ---- 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 +--- appl/bsd/klogind.M.orig 2008-12-15 12:29:01.000000000 -0800 ++++ appl/bsd/klogind.M 2009-08-28 13:13:28.000000000 -0700 +@@ -13,7 +13,7 @@ + .B \-rcpPef ] [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ] -[ \fB\-D\fP \fIport\fP ] @@ -9,27 +9,18 @@ .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 @@ - +@@ -136,11 +136,9 @@ .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\-L\ loginpath\fP ++Specify pathname to an alternative login program. Default: /usr/bin/login. ++KRB5_HOME/sbin/login.krb5 may be specified. .IP \fB\-D\ port\fP Run in standalone mode, listening on \fBport\fP. The daemon will exit diff --git a/security/krb5-appl/files/patch-at b/security/krb5-appl/files/patch-at deleted file mode 100644 index 060207ec644a..000000000000 --- a/security/krb5-appl/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-appl/files/patch-ay b/security/krb5-appl/files/patch-ay index a6cb9ebbfd13..a2141724855b 100644 --- a/security/krb5-appl/files/patch-ay +++ b/security/krb5-appl/files/patch-ay @@ -1,8 +1,9 @@ --- 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 @@ +@@ -24,14 +24,27 @@ #include "libpty.h" #include "pty-int.h" + #include "k5-platform.h" +#ifdef __FreeBSD__ +#define PTYCHARS1 "pqrsPQRS" @@ -35,7 +36,7 @@ } else { - for (cp = "pqrstuvwxyzPQRST";*cp; cp++) { + for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) { - sprintf(slavebuf,"/dev/ptyXX"); + snprintf(slavebuf,sizeof(slavebuf),"/dev/ptyXX"); - slavebuf[sizeof("/dev/pty") - 1] = *cp; + slavebuf[sizeof("/dev/pty") - 1] = *cp1; slavebuf[sizeof("/dev/ptyp") - 1] = '0'; diff --git a/security/krb5-appl/files/patch-config::shlib.conf b/security/krb5-appl/files/patch-config::shlib.conf index 18f91fffc6d5..210d812ede50 100644 --- a/security/krb5-appl/files/patch-config::shlib.conf +++ b/security/krb5-appl/files/patch-config::shlib.conf @@ -1,6 +1,6 @@ ---- config/shlib.conf.orig Mon Oct 23 05:20:11 2006 -+++ config/shlib.conf Wed Mar 28 17:17:55 2007 -@@ -258,22 +258,15 @@ +--- config/shlib.conf.orig 2008-12-08 14:33:07.000000000 -0800 ++++ config/shlib.conf 2009-08-28 13:27:39.000000000 -0700 +@@ -299,24 +299,17 @@ ;; *-*-freebsd*) @@ -12,8 +12,8 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then + case $krb5_cv_host in -+ sparc64-*) PICFLAGS=-fPIC;; -+ *) PICFLAGS=-fpic;; ++ sparc64-*) PICFLAGS=-fPIC;; ++ *) PICFLAGS=-fpic;; + esac SHLIBVEXT='.so.$(LIBMAJOR)' + LDCOMBINE="libtool --mode=link cc -shared" @@ -22,9 +22,11 @@ - RPATH_FLAG=-R - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - fi - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' + CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' + SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' diff --git a/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c b/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c index 9e701ba97985..d8956daea367 100644 --- a/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c +++ b/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c @@ -1,75 +1,75 @@ ---- 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 @@ +--- lib/krb5/os/localaddr.c.orig 2009-02-18 10:14:48.000000000 -0800 ++++ lib/krb5/os/localaddr.c 2009-08-28 13:37:41.000000000 -0700 +@@ -173,6 +173,7 @@ + } #endif - if ((ifp->ifa_flags & IFF_UP) == 0) + ++#if 0 + static int + is_loopback_address(struct sockaddr *sa) + { +@@ -189,6 +190,7 @@ + return 0; + } + } ++#endif + + #ifdef HAVE_IFADDRS_H + #include <ifaddrs.h> +@@ -464,12 +466,14 @@ + ifp->ifa_flags &= ~IFF_UP; continue; + } +#if 0 - if (ifp->ifa_flags & IFF_LOOPBACK) { + if (is_loopback_address(ifp->ifa_addr)) { /* 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 @@ + /* If this address is a duplicate, punt. */ + match = 0; 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 @@ +@@ -598,11 +602,13 @@ } /*@=moduncon@*/ +#if 0 - #ifdef IFF_LOOPBACK /* None of the current callers want loopback addresses. */ - if (lifreq.lifr_flags & IFF_LOOPBACK) { -@@ -590,6 +595,7 @@ + if (is_loopback_address((struct sockaddr *)&lifr->lifr_addr)) { + Tprintf ((" loopback\n")); goto skip; } - #endif +#endif /* Ignore interfaces that are down. */ if ((lifreq.lifr_flags & IFF_UP) == 0) { Tprintf ((" down\n")); -@@ -755,6 +761,7 @@ +@@ -769,11 +775,13 @@ } /*@=moduncon@*/ +#if 0 - #ifdef IFF_LOOPBACK /* None of the current callers want loopback addresses. */ - if (lifreq.iflr_flags & IFF_LOOPBACK) { -@@ -762,6 +769,7 @@ + if (is_loopback_address(&lifr->iflr_addr)) { + Tprintf ((" loopback\n")); goto skip; } - #endif +#endif /* Ignore interfaces that are down. */ if ((lifreq.iflr_flags & IFF_UP) == 0) { Tprintf ((" down\n")); -@@ -971,12 +979,14 @@ +@@ -984,11 +992,13 @@ } /*@=moduncon@*/ +#if 0 - #ifdef IFF_LOOPBACK /* None of the current callers want loopback addresses. */ - if (ifreq.ifr_flags & IFF_LOOPBACK) { + if (is_loopback_address(&ifreq.ifr_addr)) { Tprintf ((" loopback\n")); goto skip; } +#endif - #endif /* Ignore interfaces that are down. */ if ((ifreq.ifr_flags & IFF_UP) == 0) { + Tprintf ((" down\n")); diff --git a/security/krb5-appl/files/patch-lib-rpc-svc.c b/security/krb5-appl/files/patch-lib-rpc-svc.c deleted file mode 100644 index 395039040b04..000000000000 --- a/security/krb5-appl/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-appl/files/patch-lib-rpc-svc_tcp.c b/security/krb5-appl/files/patch-lib-rpc-svc_tcp.c deleted file mode 100644 index 9c51fafc62bf..000000000000 --- a/security/krb5-appl/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-appl/files/patch-plugins-preauth-pkinit-Makefile.in b/security/krb5-appl/files/patch-plugins-preauth-pkinit-Makefile.in deleted file mode 100644 index cb464470b1cf..000000000000 --- a/security/krb5-appl/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) |