summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/openssh/files/md54
-rw-r--r--security/openssh/files/patch-sum8
-rw-r--r--security/openssh/patches/patch-aa23
-rw-r--r--security/openssh/patches/patch-ah26
-rw-r--r--security/openssh/patches/patch-al42
-rw-r--r--security/openssh/patches/patch-am11
7 files changed, 79 insertions, 39 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 31ec2c9b188..10f832a8dce 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2000/07/01 01:16:39 itojun Exp $
+# $NetBSD: Makefile,v 1.15 2000/07/02 22:07:55 itojun Exp $
#
-DISTNAME= openssh-2.1.1p1
+DISTNAME= openssh-2.1.1p2
CATEGORIES= security
MASTER_SITES= http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files/ \
http://www.firedrake.org/openssh/files/ \
diff --git a/security/openssh/files/md5 b/security/openssh/files/md5
index 11d5db8fe82..2912b9210ec 100644
--- a/security/openssh/files/md5
+++ b/security/openssh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/06/15 04:56:50 itojun Exp $
+$NetBSD: md5,v 1.6 2000/07/02 22:07:56 itojun Exp $
-MD5 (openssh-2.1.1p1.tar.gz) = e043cabc802d7d0790f5aaaea31185b2
+MD5 (openssh-2.1.1p2.tar.gz) = 261de4f02ea8f50f1f0566b40821034a
diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum
index d95aec6470b..ed59caf032f 100644
--- a/security/openssh/files/patch-sum
+++ b/security/openssh/files/patch-sum
@@ -1,11 +1,13 @@
-$NetBSD: patch-sum,v 1.10 2000/06/15 04:56:50 itojun Exp $
+$NetBSD: patch-sum,v 1.11 2000/07/02 22:07:56 itojun Exp $
-MD5 (patch-aa) = 45b54d94970c6b58478641edaea06ee8
+MD5 (patch-aa) = 9de9202a42d721e8027f9f829a3af96c
MD5 (patch-ac) = 5bdf4a142210aea600f3bf6f3ac14010
MD5 (patch-ae) = 0076ca9d2343f21a304a3eee1a82c3cc
MD5 (patch-af) = 601161a5721c12fa31ae5dcfc1f88a91
MD5 (patch-ag) = 037888228d97283b54d1232daf3945a2
-MD5 (patch-ah) = 2699d4a4c560b1896d756d3799e1614b
+MD5 (patch-ah) = 0c144a44edc914f64ebf5bb5fb0ff401
MD5 (patch-ai) = c2621996e146a82e7deea0363a0e68c9
MD5 (patch-aj) = 5397d9fbfe54544fd186831cfe979329
MD5 (patch-ak) = 1bd755c11128b2b8d7ecc894e70b82c7
+MD5 (patch-al) = dde98ebfbbe801c5042a803e0e0df0d3
+MD5 (patch-am) = 6b53bafd568db64bf16d9aa5582733e3
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 56f3f09ef0e..4d7e5ff7beb 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,14 +1,11 @@
-$NetBSD: patch-aa,v 1.7 2000/05/31 15:32:44 itojun Exp $
+$NetBSD: patch-aa,v 1.8 2000/07/02 22:07:56 itojun Exp $
---- configure.in Tue May 30 11:57:47 2000
-+++ configure.in Wed May 31 18:31:52 2000
-@@ -447,3 +447,5 @@
- [
-+#include <sys/types.h>
- #include <netinet/in.h>
-+#include <sys/socket.h>
- ],
-@@ -461,2 +463,3 @@
- [
-+#include <sys/types.h>
- #include <netinet/in.h>
+--- configure.in.orig Sat Jul 1 15:52:55 2000
++++ configure.in Mon Jul 3 06:49:00 2000
+@@ -647,2 +647,6 @@
+
++OSSH_CHECK_HEADER_FOR_FIELD(ut_name, utmp.h, HAVE_NAME_IN_UTMP)
++OSSH_CHECK_HEADER_FOR_FIELD(ut_name, utmpx.h, HAVE_NAME_IN_UTMPX)
++OSSH_CHECK_HEADER_FOR_FIELD(ut_user, utmp.h, HAVE_USER_IN_UTMP)
++OSSH_CHECK_HEADER_FOR_FIELD(ut_user, utmpx.h, HAVE_USER_IN_UTMPX)
+ OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP)
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah
index c15b1b265ae..f23fe12d35b 100644
--- a/security/openssh/patches/patch-ah
+++ b/security/openssh/patches/patch-ah
@@ -1,19 +1,13 @@
-$NetBSD: patch-ah,v 1.5 2000/05/31 15:32:44 itojun Exp $
+$NetBSD: patch-ah,v 1.6 2000/07/02 22:07:56 itojun Exp $
---- Makefile.in.orig Sat May 20 14:33:44 2000
-+++ Makefile.in Wed May 31 18:55:11 2000
-@@ -6,6 +6,7 @@
- mandir=@mandir@
- mansubdir=@mansubdir@
+--- Makefile.in.orig Tue Jun 27 15:24:49 2000
++++ Makefile.in Sun Jul 2 14:30:43 2000
+@@ -8,2 +8,3 @@
sysconfdir=@sysconfdir@
+examplesdir=@prefix@/share/examples/ssh
piddir=@piddir@
- srcdir=@srcdir@
- top_srcdir=@top_srcdir@
-@@ -131,14 +132,14 @@
- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
+@@ -141,6 +142,6 @@
ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
-
- if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
- ./mkinstalldirs $(DESTDIR)$(sysconfdir); \
- $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
@@ -23,16 +17,12 @@ $NetBSD: patch-ah,v 1.5 2000/05/31 15:32:44 itojun Exp $
+ $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(examplesdir)/ssh_config; \
+ $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(examplesdir)/sshd_config; \
fi
- if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
+@@ -148,3 +149,3 @@
$(PERL) fixprogs ssh_prng_cmds $(ENT); \
- $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
+ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \
fi
-
- host-key: ssh-keygen
-@@ -146,10 +147,10 @@
- ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N ""
-
+@@ -168,6 +169,6 @@
uninstallall: uninstall
- -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
- -rm -f $(DESTDIR)$(sysconfdir)/sshd_config
@@ -43,5 +33,3 @@ $NetBSD: patch-ah,v 1.5 2000/05/31 15:32:44 itojun Exp $
+ -rm -f $(DESTDIR)$(examplesdir)/ssh_prng_cmds
+ -rmdir $(DESTDIR)$(examplesdir)
-rmdir $(DESTDIR)$(bindir)
- -rmdir $(DESTDIR)$(sbindir)
- -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1
diff --git a/security/openssh/patches/patch-al b/security/openssh/patches/patch-al
new file mode 100644
index 00000000000..97badb24e03
--- /dev/null
+++ b/security/openssh/patches/patch-al
@@ -0,0 +1,42 @@
+$NetBSD: patch-al,v 1.1 2000/07/02 22:07:56 itojun Exp $
+
+--- loginrec.c- Mon Jul 3 06:49:20 2000
++++ loginrec.c Mon Jul 3 06:51:59 2000
+@@ -618,3 +618,9 @@
+ /* Use strncpy because we don't necessarily want null termination */
++# ifdef HAVE_USER_IN_UTMP
+ strncpy(ut->ut_user, li->username, MIN_SIZEOF(ut->ut_user, li->username));
++# elif defined(HAVE_NAME_IN_UTMP)
++ strncpy(ut->ut_name, li->username, MIN_SIZEOF(ut->ut_name, li->username));
++# else
++# error no ut_user nor ut_name
++# endif
+ # ifdef HAVE_HOST_IN_UTMP
+@@ -1008,4 +1014,12 @@
+ {
++# ifdef HAVE_USER_IN_UTMP
+ if (strncmp(li->username, ut->ut_user,
+- MIN_SIZEOF(li->username, ut->ut_user)) == 0) {
++ MIN_SIZEOF(li->username, ut->ut_user)) == 0)
++# elif defined(HAVE_NAME_IN_UTMP)
++ if (strncmp(li->username, ut->ut_name,
++ MIN_SIZEOF(li->username, ut->ut_name)) == 0)
++# else
++# error no ut_user nor ut_name
++# endif
++ {
+ # ifdef HAVE_TYPE_IN_UTMP
+@@ -1163,4 +1177,12 @@
+ {
++# ifdef HAVE_USER_IN_UTMP
+ if ( strncmp(li->username, utx->ut_user,
+- MIN_SIZEOF(li->username, utx->ut_user)) == 0 ) {
++ MIN_SIZEOF(li->username, utx->ut_user)) == 0 )
++# elif defined(HAVE_NAME_IN_UTMP)
++ if ( strncmp(li->username, utx->ut_name,
++ MIN_SIZEOF(li->username, utx->ut_name)) == 0 )
++# else
++# error no ut_user nor ut_name
++# endif
++ {
+ # ifdef HAVE_TYPE_IN_UTMPX
diff --git a/security/openssh/patches/patch-am b/security/openssh/patches/patch-am
new file mode 100644
index 00000000000..aff55275033
--- /dev/null
+++ b/security/openssh/patches/patch-am
@@ -0,0 +1,11 @@
+$NetBSD: patch-am,v 1.1 2000/07/02 22:07:56 itojun Exp $
+
+--- acconfig.h- Mon Jul 3 06:58:28 2000
++++ acconfig.h Mon Jul 3 06:58:09 2000
+@@ -49,2 +49,6 @@
+ /* struct utmp and struct utmpx fields */
++#undef HAVE_NAME_IN_UTMP
++#undef HAVE_NAME_IN_UTMPX
++#undef HAVE_USER_IN_UTMP
++#undef HAVE_USER_IN_UTMPX
+ #undef HAVE_HOST_IN_UTMP
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 18:08:36 +0000