pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/openssh Update to 3.8.1p1:
details: https://anonhg.NetBSD.org/pkgsrc/rev/522a80c8675d
branches: trunk
changeset: 475142:522a80c8675d
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon May 10 18:12:23 2004 +0000
description:
Update to 3.8.1p1:
Minor bugfixes.
diffstat:
security/openssh/Makefile | 13 +++----------
security/openssh/distinfo | 15 ++++++---------
security/openssh/patches/patch-aa | 23 ++++++-----------------
security/openssh/patches/patch-ab | 23 ++++++-----------------
security/openssh/patches/patch-ac | 6 +++---
5 files changed, 24 insertions(+), 56 deletions(-)
diffs (171 lines):
diff -r d311a916994e -r 522a80c8675d security/openssh/Makefile
--- a/security/openssh/Makefile Mon May 10 18:05:49 2004 +0000
+++ b/security/openssh/Makefile Mon May 10 18:12:23 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2004/05/02 17:30:37 xtraeme Exp $
+# $NetBSD: Makefile,v 1.137 2004/05/10 18:12:23 wiz Exp $
-DISTNAME= openssh-3.8p1
-PKGNAME= openssh-3.8.1
-PKGREVISION= 3
+DISTNAME= openssh-3.8.1p1
+PKGNAME= openssh-3.8.1.1
SVR4_PKGNAME= ossh
CATEGORIES= security
MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
@@ -78,12 +77,6 @@
.if (${OPSYS} == "NetBSD") || (${OPSYS} == "Darwin") || (${OPSYS} == "SunOS")
. include "../../security/skey/buildlink3.mk"
CONFIGURE_ARGS+= --with-skey=${BUILDLINK_PREFIX.skey}
-#
-# NetBSD's skeychallenge() takes 4 args (int: sslen) instead of 3.
-#
-. if ${OPSYS} == "NetBSD"
-CPPFLAGS+= -DSKEYCHALLENGE=SKEYCHALLENGE4
-. endif
.else
CONFIGURE_ARGS+= --without-skey
.endif
diff -r d311a916994e -r 522a80c8675d security/openssh/distinfo
--- a/security/openssh/distinfo Mon May 10 18:05:49 2004 +0000
+++ b/security/openssh/distinfo Mon May 10 18:12:23 2004 +0000
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.32 2004/04/28 04:00:17 jlam Exp $
+$NetBSD: distinfo,v 1.33 2004/05/10 18:12:23 wiz Exp $
-SHA1 (openssh-3.8p1.tar.gz) = b30c4ec4945f4e8b1691470495c15caf522fbc16
-Size (openssh-3.8p1.tar.gz) = 826588 bytes
-SHA1 (patch-aa) = 7cc830cfe60afa021c1ac69e27e566c259994f61
-SHA1 (patch-ab) = 9893f9aa4cbd022328358f0d93ba1cd27ee5e320
-SHA1 (patch-ac) = ae77aa9a6bdbb69231d24ed6b01e6cefa13b38ee
+SHA1 (openssh-3.8.1p1.tar.gz) = 772c3a69014a8a7bf8c1bde8ab6770f9c91049e4
+Size (openssh-3.8.1p1.tar.gz) = 817932 bytes
+SHA1 (patch-aa) = 37c5f14230f97f895fb8ad9de627dca00e39762c
+SHA1 (patch-ab) = e4ee4fa13fee7cf962f6c8d894a417bf2c977faa
+SHA1 (patch-ac) = 2652a918c43bb780c8b0e5e3691d2a1ffba74700
SHA1 (patch-ad) = 644e2fe1f2967fe97c51a7cc61cad557bc42ed6a
SHA1 (patch-ah) = 8f1fa190e4fb115bb5311b4ccd839a649e1b09e5
-SHA1 (patch-aq) = 0718e96922ca30ca12915399c176504f10addd82
-SHA1 (patch-ar) = 6d026300d159094beb308a4e17b07003fa41a050
-SHA1 (patch-as) = 00b5d247f3aded042e262f3a162096c60fd9c259
diff -r d311a916994e -r 522a80c8675d security/openssh/patches/patch-aa
--- a/security/openssh/patches/patch-aa Mon May 10 18:05:49 2004 +0000
+++ b/security/openssh/patches/patch-aa Mon May 10 18:12:23 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.33 2004/04/27 12:30:23 markd Exp $
+$NetBSD: patch-aa,v 1.34 2004/05/10 18:12:24 wiz Exp $
---- configure.orig 2004-02-24 19:22:59.000000000 +1300
+--- configure.orig 2004-04-18 14:51:57.000000000 +0200
+++ configure
-@@ -4803,6 +4803,9 @@ EOF
+@@ -4816,6 +4816,9 @@ EOF
;;
esac
@@ -12,18 +12,7 @@
# Allow user to specify flags
# Check whether --with-cflags or --without-cflags was given.
-@@ -6809,6 +6812,10 @@ echo $ECHO_N "checking for libwrap... $E
- #line 6809 "configure"
- #include "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;
-
-@@ -17009,12 +17016,20 @@ fi
+@@ -17263,12 +17266,20 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
if test -z "$conf_utmpx_location"; then
if test x"$system_utmpx_path" = x"no" ; then
@@ -46,7 +35,7 @@
cat >>confdefs.h <<EOF
#define CONF_UTMPX_FILE "$conf_utmpx_location"
EOF
-@@ -17069,12 +17084,20 @@ fi
+@@ -17323,12 +17334,20 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
if test -z "$conf_wtmpx_location"; then
if test x"$system_wtmpx_path" = x"no" ; then
@@ -69,7 +58,7 @@
cat >>confdefs.h <<EOF
#define CONF_WTMPX_FILE "$conf_wtmpx_location"
EOF
-@@ -17983,7 +18006,7 @@ echo "OpenSSH has been configured with t
+@@ -18237,7 +18256,7 @@ echo "OpenSSH has been configured with t
echo " User binaries: $B"
echo " System binaries: $C"
echo " Configuration files: $D"
diff -r d311a916994e -r 522a80c8675d security/openssh/patches/patch-ab
--- a/security/openssh/patches/patch-ab Mon May 10 18:05:49 2004 +0000
+++ b/security/openssh/patches/patch-ab Mon May 10 18:12:23 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.16 2004/04/27 12:30:23 markd Exp $
+$NetBSD: patch-ab,v 1.17 2004/05/10 18:12:24 wiz Exp $
---- configure.ac.orig 2004-02-24 18:47:04.000000000 +1300
+--- configure.ac.orig 2004-04-17 05:03:07.000000000 +0200
+++ configure.ac
-@@ -438,6 +438,9 @@ mips-sony-bsd|mips-sony-newsos4)
+@@ -456,6 +456,9 @@ mips-sony-bsd|mips-sony-newsos4)
;;
esac
@@ -12,18 +12,7 @@
# Allow user to specify flags
AC_ARG_WITH(cflags,
[ --with-cflags Specify additional flags to pass to compiler],
-@@ -767,6 +770,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;
- ],
-@@ -2725,9 +2732,17 @@ AC_TRY_COMPILE([
+@@ -2824,9 +2827,17 @@ AC_TRY_COMPILE([
)
if test -z "$conf_utmpx_location"; then
if test x"$system_utmpx_path" = x"no" ; then
@@ -43,7 +32,7 @@
AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location")
fi
-@@ -2750,9 +2765,17 @@ AC_TRY_COMPILE([
+@@ -2849,9 +2860,17 @@ AC_TRY_COMPILE([
)
if test -z "$conf_wtmpx_location"; then
if test x"$system_wtmpx_path" = x"no" ; then
@@ -63,7 +52,7 @@
AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location")
fi
-@@ -2793,7 +2816,7 @@ echo "OpenSSH has been configured with t
+@@ -2892,7 +2911,7 @@ echo "OpenSSH has been configured with t
echo " User binaries: $B"
echo " System binaries: $C"
echo " Configuration files: $D"
diff -r d311a916994e -r 522a80c8675d security/openssh/patches/patch-ac
--- a/security/openssh/patches/patch-ac Mon May 10 18:05:49 2004 +0000
+++ b/security/openssh/patches/patch-ac Mon May 10 18:12:23 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2004/04/27 12:30:23 markd Exp $
+$NetBSD: patch-ac,v 1.10 2004/05/10 18:12:24 wiz Exp $
---- defines.h.orig 2004-02-10 15:01:14.000000000 +1300
+--- defines.h.orig 2004-04-14 09:24:30.000000000 +0200
+++ defines.h
-@@ -574,6 +574,24 @@ struct winsize {
+@@ -584,6 +584,24 @@ struct winsize {
# endif
# endif
#endif
Home |
Main Index |
Thread Index |
Old Index