diff options
author | itojun <itojun> | 2000-03-26 14:36:24 +0000 |
---|---|---|
committer | itojun <itojun> | 2000-03-26 14:36:24 +0000 |
commit | 70104b69ff56f725500853518ad55b27d53d1402 (patch) | |
tree | 676b2dd01fae9cf12ec8f03b05e7037e7954fc29 | |
parent | 55bb52fdf76922b43badccea99168d15fd47b949 (diff) | |
download | pkgsrc-70104b69ff56f725500853518ad55b27d53d1402.tar.gz |
upgrade to 1.2.3. make it conflict with security/ssh6.
-rw-r--r-- | security/openssh/Makefile | 9 | ||||
-rw-r--r-- | security/openssh/files/md5 | 4 | ||||
-rw-r--r-- | security/openssh/files/patch-sum | 6 | ||||
-rw-r--r-- | security/openssh/patches/patch-aa | 11 | ||||
-rw-r--r-- | security/openssh/patches/patch-ah | 16 |
5 files changed, 21 insertions, 25 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index d1930681980..5719fadd846 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2000/03/07 12:02:35 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2000/03/26 14:36:24 itojun Exp $ # -DISTNAME= openssh-1.2.2 +DISTNAME= openssh-1.2.3 CATEGORIES= security MASTER_SITES= http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files/ \ http://www.firedrake.org/openssh/files/ \ @@ -14,7 +14,10 @@ HOMEPAGE= http://www.openssh.com/ DEPENDS= openssl-[0-9]*:../../security/openssl BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 -CONFLICTS= ssh-[0-9]* +CONFLICTS= ssh-[0-9]* ssh6-[0-9]* + +# retain the following line, for IPv6-ready pkgsrc webpage +BUILD_DEFS+= USE_INET6 # USE_PERL5= yes RESTRICTED= "Crypto; export-controlled" diff --git a/security/openssh/files/md5 b/security/openssh/files/md5 index c5bffc8d597..61e5c9a4b50 100644 --- a/security/openssh/files/md5 +++ b/security/openssh/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 2000/01/27 17:12:03 hubertf Exp $ +$NetBSD: md5,v 1.3 2000/03/26 14:36:24 itojun Exp $ -MD5 (openssh-1.2.2.tar.gz) = 4eccb907bf7bd6368300dc23b20dc8c2 +MD5 (openssh-1.2.3.tar.gz) = 6aad0cc9ceca55f138ed1ba4cf660349 diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum index 3346c4dff74..e52ca097e94 100644 --- a/security/openssh/files/patch-sum +++ b/security/openssh/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.4 2000/01/27 19:33:33 itojun Exp $ +$NetBSD: patch-sum,v 1.5 2000/03/26 14:36:24 itojun Exp $ -MD5 (patch-aa) = 47133500cc4566c3cff2fae7b797b437 +MD5 (patch-aa) = 64797c48c4837c76f263d9a323012966 MD5 (patch-ab) = b1be98743ffb76d3e0401dda3a420f25 MD5 (patch-ad) = affe7f6d4df103015cb788cac15d2670 MD5 (patch-ag) = 037888228d97283b54d1232daf3945a2 -MD5 (patch-ah) = b31a5dfc27312a091e76108f25e1bf6d +MD5 (patch-ah) = da12bd4977cb30e752ad3a158b2e50cd diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa index e3cda9b30f1..d3c801bc2d8 100644 --- a/security/openssh/patches/patch-aa +++ b/security/openssh/patches/patch-aa @@ -1,15 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2000/01/27 19:33:34 itojun Exp $ +$NetBSD: patch-aa,v 1.5 2000/03/26 14:36:24 itojun Exp $ --- configure.orig Wed Jan 26 19:17:06 2000 +++ configure Thu Jan 27 11:26:51 2000 -@@ -1271,7 +1271,7 @@ - - if test "$ssldir" != "/usr"; then - CFLAGS="$CFLAGS -I$ssldir/include" -- LDFLAGS="$LDFLAGS -L$ssldir/lib" -+ LDFLAGS="$LDFLAGS -L$ssldir/lib -R$ssldir/lib" - fi - echo "$ac_t""$ssldir" 1>&6 - @@ -2293,9 +2293,11 @@ #include <sys/types.h> diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah index 3e1eafc745d..0bfb560c4f0 100644 --- a/security/openssh/patches/patch-ah +++ b/security/openssh/patches/patch-ah @@ -1,7 +1,6 @@ -$NetBSD: patch-ah,v 1.2 2000/01/27 17:12:05 hubertf Exp $ - ---- Makefile.in.orig Thu Jan 27 04:15:48 2000 -+++ Makefile.in Thu Jan 27 17:07:34 2000 +$NetBSD: patch-ah,v 1.3 2000/03/26 14:36:25 itojun Exp $ +--- Makefile.in.orig Thu Mar 16 08:48:26 2000 ++++ Makefile.in Sun Mar 26 23:19:20 2000 @@ -6,6 +6,7 @@ mandir=@mandir@ mansubdir=@mansubdir@ @@ -10,9 +9,9 @@ $NetBSD: patch-ah,v 1.2 2000/01/27 17:12:05 hubertf Exp $ piddir=@piddir@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ -@@ -130,16 +131,16 @@ - $(INSTALL) -s @GNOME_ASKPASS@ $(DESTDIR)${ASKPASS_LOCATION} ; \ - fi +@@ -118,19 +119,19 @@ + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ - $(INSTALL) -d $(DESTDIR)$(sysconfdir); \ @@ -24,6 +23,9 @@ $NetBSD: patch-ah,v 1.2 2000/01/27 17:12:05 hubertf Exp $ + $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(examplesdir)/sshd_config; \ fi + host-key: ssh-keygen + ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N '' + uninstallall: uninstall - -rm -f $(DESTDIR)$(sysconfdir)/ssh_config - -rm -f $(DESTDIR)$(sysconfdir)/sshd_config |