summaryrefslogtreecommitdiff
path: root/security/openssh+gssapi/patches
diff options
context:
space:
mode:
authorkristerw <kristerw@pkgsrc.org>2004-06-01 21:50:37 +0000
committerkristerw <kristerw@pkgsrc.org>2004-06-01 21:50:37 +0000
commit1b0ace13d4d14b71bf9e735e328c952f7f7cc079 (patch)
tree7c3dcbec968f4c56d1bc334d2727626cd80359f1 /security/openssh+gssapi/patches
parent2c882be0504da87fb35b97bfdac42a1ce763c152 (diff)
downloadpkgsrc-1b0ace13d4d14b71bf9e735e328c952f7f7cc079.tar.gz
Remove obsolete packages, per discussion on tech-pkg.
Diffstat (limited to 'security/openssh+gssapi/patches')
-rw-r--r--security/openssh+gssapi/patches/patch-aa34
-rw-r--r--security/openssh+gssapi/patches/patch-ab34
-rw-r--r--security/openssh+gssapi/patches/patch-ah22
-rw-r--r--security/openssh+gssapi/patches/patch-ai62
-rw-r--r--security/openssh+gssapi/patches/patch-aj26
5 files changed, 0 insertions, 178 deletions
diff --git a/security/openssh+gssapi/patches/patch-aa b/security/openssh+gssapi/patches/patch-aa
deleted file mode 100644
index a505c8d77c1..00000000000
--- a/security/openssh+gssapi/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/24 21:01:23 jwise Exp $
-
---- configure.orig Tue Apr 29 02:37:28 2003
-+++ configure Tue Jun 10 13:38:01 2003
-@@ -4939,6 +4939,9 @@
- ;;
- esac
-
-+# pkgsrc handles any rpath settings this package needs
-+need_dash_r=
-+
- # Allow user to specify flags
-
- # Check whether --with-cflags or --without-cflags was given.
-@@ -7030,6 +7033,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+#ifdef HAVE_SYS_CDEFS_H
-+#include <sys/cdefs.h>
-+#endif
-+#include <stdio.h>
- #include <tcpd.h>
- int deny_severity = 0, allow_severity = 0;
-
-@@ -19123,7 +19130,7 @@
- echo " User binaries: $B"
- echo " System binaries: $C"
- echo " Configuration files: $D"
--echo " Askpass program: $E"
-+echo " Askpass program: ${ASKPASS_PROGRAM}"
- echo " Manual pages: $F"
- echo " PID file: $G"
- echo " Privilege separation chroot path: $H"
diff --git a/security/openssh+gssapi/patches/patch-ab b/security/openssh+gssapi/patches/patch-ab
deleted file mode 100644
index 78af9066543..00000000000
--- a/security/openssh+gssapi/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/07/24 21:01:24 jwise Exp $
-
---- configure.ac.orig Thu Sep 26 00:38:47 2002
-+++ configure.ac
-@@ -341,6 +341,9 @@ mips-sony-bsd|mips-sony-newsos4)
- ;;
- esac
-
-+# pkgsrc handles any rpath settings this package needs
-+need_dash_r=
-+
- # Allow user to specify flags
- AC_ARG_WITH(cflags,
- [ --with-cflags Specify additional flags to pass to compiler],
-@@ -575,6 +578,10 @@ AC_ARG_WITH(tcp-wrappers,
- AC_MSG_CHECKING(for libwrap)
- AC_TRY_LINK(
- [
-+#ifdef HAVE_SYS_CDEFS_H
-+#include <sys/cdefs.h>
-+#endif
-+#include <stdio.h>
- #include <tcpd.h>
- int deny_severity = 0, allow_severity = 0;
- ],
-@@ -2449,7 +2456,7 @@ echo "OpenSSH has been configured with t
- echo " User binaries: $B"
- echo " System binaries: $C"
- echo " Configuration files: $D"
--echo " Askpass program: $E"
-+echo " Askpass program: ${ASKPASS_PROGRAM}"
- echo " Manual pages: $F"
- echo " PID file: $G"
- echo " Privilege separation chroot path: $H"
diff --git a/security/openssh+gssapi/patches/patch-ah b/security/openssh+gssapi/patches/patch-ah
deleted file mode 100644
index 195dd6ba600..00000000000
--- a/security/openssh+gssapi/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2003/07/24 21:01:24 jwise Exp $
-
---- Makefile.in.orig Fri Jun 21 10:38:53 2002
-+++ Makefile.in Tue Jun 25 10:50:44 2002
-@@ -21,7 +21,7 @@
- DESTDIR=
- VPATH=@srcdir@
- SSH_PROGRAM=@bindir@/ssh
--ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
-+#ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
- SFTP_SERVER=$(libexecdir)/sftp-server
- SSH_KEYSIGN=$(libexecdir)/ssh-keysign
- RAND_HELPER=$(libexecdir)/ssh-rand-helper
-@@ -203,7 +203,7 @@
- scard-install:
- (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)
-
--install-files: scard-install
-+install-files:
- $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
diff --git a/security/openssh+gssapi/patches/patch-ai b/security/openssh+gssapi/patches/patch-ai
deleted file mode 100644
index 7c5b86be082..00000000000
--- a/security/openssh+gssapi/patches/patch-ai
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/09/17 14:27:07 jwise Exp $
-Index: buffer.c
-===================================================================
-RCS file: /cvs/src/usr.bin/ssh/buffer.c,v
-retrieving revision 1.16
-retrieving revision 1.18
-diff -u -r1.16 -r1.18
---- buffer.c 26 Jun 2002 08:54:18 -0000 1.16
-+++ buffer.c 16 Sep 2003 21:02:39 -0000 1.18
-@@ -23,8 +23,11 @@
- void
- buffer_init(Buffer *buffer)
- {
-- buffer->alloc = 4096;
-- buffer->buf = xmalloc(buffer->alloc);
-+ const u_int len = 4096;
-+
-+ buffer->alloc = 0;
-+ buffer->buf = xmalloc(len);
-+ buffer->alloc = len;
- buffer->offset = 0;
- buffer->end = 0;
- }
-@@ -34,8 +37,10 @@
- void
- buffer_free(Buffer *buffer)
- {
-- memset(buffer->buf, 0, buffer->alloc);
-- xfree(buffer->buf);
-+ if (buffer->alloc > 0) {
-+ memset(buffer->buf, 0, buffer->alloc);
-+ xfree(buffer->buf);
-+ }
- }
-
- /*
-@@ -69,6 +74,7 @@
- void *
- buffer_append_space(Buffer *buffer, u_int len)
- {
-+ u_int newlen;
- void *p;
-
- if (len > 0x100000)
-@@ -98,11 +104,13 @@
- goto restart;
- }
- /* Increase the size of the buffer and retry. */
-- buffer->alloc += len + 32768;
-- if (buffer->alloc > 0xa00000)
-+
-+ newlen = buffer->alloc + len + 32768;
-+ if (newlen > 0xa00000)
- fatal("buffer_append_space: alloc %u not supported",
-- buffer->alloc);
-- buffer->buf = xrealloc(buffer->buf, buffer->alloc);
-+ newlen);
-+ buffer->buf = xrealloc(buffer->buf, newlen);
-+ buffer->alloc = newlen;
- goto restart;
- /* NOTREACHED */
- }
diff --git a/security/openssh+gssapi/patches/patch-aj b/security/openssh+gssapi/patches/patch-aj
deleted file mode 100644
index decfa9b91fa..00000000000
--- a/security/openssh+gssapi/patches/patch-aj
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/09/17 14:27:07 jwise Exp $
-Index: channels.c
-===================================================================
-RCS file: /cvs/src/usr.bin/ssh/channels.c,v
-retrieving revision 1.194
-retrieving revision 1.195
-diff -u -r1.194 -r1.195
---- channels.c 29 Aug 2003 10:04:36 -0000 1.194
-+++ channels.c 16 Sep 2003 21:02:40 -0000 1.195
-@@ -228,12 +228,13 @@
- if (found == -1) {
- /* There are no free slots. Take last+1 slot and expand the array. */
- found = channels_alloc;
-- channels_alloc += 10;
- if (channels_alloc > 10000)
- fatal("channel_new: internal error: channels_alloc %d "
- "too big.", channels_alloc);
-+ channels = xrealloc(channels,
-+ (channels_alloc + 10) * sizeof(Channel *));
-+ channels_alloc += 10;
- debug2("channel: expanding %d", channels_alloc);
-- channels = xrealloc(channels, channels_alloc * sizeof(Channel *));
- for (i = found; i < channels_alloc; i++)
- channels[i] = NULL;
- }
-