summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authortez <tez>2011-03-22 23:35:59 +0000
committertez <tez>2011-03-22 23:35:59 +0000
commit2e9ef6a51f5d1b8ef7f61e086f60901a4aae861b (patch)
tree0b18b4a2aef4191611ca5f6a6b5378929ba50379 /security
parenta4f945ea06314a582e39731dd04f9544e60cf8e4 (diff)
downloadpkgsrc-2e9ef6a51f5d1b8ef7f61e086f60901a4aae861b.tar.gz
remove 3 more old patches that got missed
Diffstat (limited to 'security')
-rw-r--r--security/mit-krb5/patches/patch-ab23
-rw-r--r--security/mit-krb5/patches/patch-ac15
-rw-r--r--security/mit-krb5/patches/patch-ai44
3 files changed, 0 insertions, 82 deletions
diff --git a/security/mit-krb5/patches/patch-ab b/security/mit-krb5/patches/patch-ab
deleted file mode 100644
index 210470c42d6..00000000000
--- a/security/mit-krb5/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2010/03/26 21:44:59 joerg Exp $
-
---- appl/telnet/telnet/Makefile.in.orig 2004-04-24 18:20:46.000000000 -0400
-+++ appl/telnet/telnet/Makefile.in
-@@ -47,8 +47,8 @@ OBJS= authenc.o commands.o main.o networ
-
- all:: telnet
-
--telnet: $(OBJS) $(KRB4COMPAT_DEPLIBS) ../libtelnet/libtelnet.a
-- $(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet.a $(KRB4COMPAT_LIBS)
-+telnet: $(OBJS) $(KRB4COMPAT_DEPLIBS) ../../../lib/libtelnet$(DEPSTLIBEXT)
-+ $(CC_LINK) -o $@ $(OBJS) ../../../lib/libtelnet$(DEPSTLIBEXT) $(KRB4COMPAT_LIBS)
-
- clean::
- $(RM) telnet
-@@ -60,7 +60,6 @@ install::
- $(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/mit-krb5/patches/patch-ac b/security/mit-krb5/patches/patch-ac
deleted file mode 100644
index fa3c8c6ad4a..00000000000
--- a/security/mit-krb5/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/03/26 21:44:59 joerg Exp $
-
---- appl/telnet/telnetd/Makefile.in.orig 2004-09-22 18:59:45.000000000 -0400
-+++ appl/telnet/telnetd/Makefile.in
-@@ -60,8 +60,8 @@ OBJS= telnetd.o \
-
- all:: telnetd
-
--telnetd: $(OBJS) $(PTY_DEPLIB) $(KRB4COMPAT_DEPLIBS) ../libtelnet/libtelnet.a
-- $(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet.a $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS)
-+telnetd: $(OBJS) $(PTY_DEPLIB) $(KRB4COMPAT_DEPLIBS) ../../../lib/libtelnet$(DEPSTLIBEXT)
-+ $(CC_LINK) -o $@ $(OBJS) ../../../lib/libtelnet$(DEPSTLIBEXT) $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS)
-
- clean::
- $(RM) telnetd
diff --git a/security/mit-krb5/patches/patch-ai b/security/mit-krb5/patches/patch-ai
deleted file mode 100644
index 005054695c0..00000000000
--- a/security/mit-krb5/patches/patch-ai
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2008/06/07 20:22:18 tonnerre Exp $
-
---- appl/telnet/telnetd/sys_term.c.orig 2008-06-07 15:55:51.000000000 +0200
-+++ appl/telnet/telnetd/sys_term.c
-@@ -1287,6 +1287,16 @@ start_login(host, autologin, name)
- #endif
- #if defined (AUTHENTICATION)
- if (auth_level >= 0 && autologin == AUTH_VALID) {
-+ if (name[0] == '-') {
-+ /* Authenticated and authorized to log in to an
-+ account starting with '-'? Even if that
-+ unlikely case comes to pass, the current login
-+ program will not parse the resulting command
-+ line properly. */
-+ syslog(LOG_ERR, "user name cannot start with '-'");
-+ fatal(net, "user name cannot start with '-'");
-+ exit(1);
-+ }
- # if !defined(NO_LOGIN_F)
- #if defined(LOGIN_CAP_F)
- argv = addarg(argv, "-F");
-@@ -1377,12 +1387,20 @@ start_login(host, autologin, name)
- } else
- #endif
- if (getenv("USER")) {
-- argv = addarg(argv, getenv("USER"));
-+ char *user = getenv("USER");
-+ if (user[0] == '-') {
-+ /* "telnet -l-x ..." */
-+ syslog(LOG_ERR, "user name cannot start with '-'");
-+ fatal(net, "user name cannot start with '-'");
-+ exit(EXIT_FAILURE);
-+ }
-+ argv = addarg(argv, user);
- #if defined(LOGIN_ARGS) && defined(NO_LOGIN_P)
- {
- register char **cpp;
- for (cpp = environ; *cpp; cpp++)
-- argv = addarg(argv, *cpp);
-+ if ((*cpp)[0] != '-')
-+ argv = addarg(argv, *cpp);
- }
- #endif
- /*