OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Feb-2004 20:36:27
Branch: HEAD Handle: 2004022419362700
Modified files:
openpkg-src/openssh openssh.patch openssh.spec
Log:
upgrading package: openssh 3.7.1p2 -> 3.8p1
Summary:
Revision Changes Path
1.8 +37 -230 openpkg-src/openssh/openssh.patch
1.124 +3 -3 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 openssh.patch
--- openpkg-src/openssh/openssh.patch 23 Dec 2003 21:14:54 -0000 1.7
+++ openpkg-src/openssh/openssh.patch 24 Feb 2004 19:36:27 -0000 1.8
@@ -1,15 +1,31 @@
-Index: version.h
---- version.h.orig 2003-09-23 11:26:51.000000000 +0200
-+++ version.h 2003-09-27 12:30:35.000000000 +0200
-@@ -1,3 +1,3 @@
- /* $OpenBSD: version.h,v 1.39 2003/09/16 21:02:40 markus Exp $ */
+Index: Makefile.in
+--- Makefile.in.orig 2004-02-18 04:35:11.000000000 +0100
++++ Makefile.in 2004-02-24 20:25:23.000000000 +0100
+@@ -226,7 +226,7 @@
+ -rm -rf autom4te.cache
+ (cd scard && $(MAKE) -f Makefile.in distprep)
+
+-install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
host-key check-config
++install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
host-key
+ install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
install-files
--#define SSH_VERSION "OpenSSH_3.7.1p2"
-+#define SSH_VERSION "OpenSSH_3.7.1p2 @l_openpkg_release@"
+ check-config:
+Index: auth-pam.h
+--- auth-pam.h.orig 2004-02-10 03:23:29.000000000 +0100
++++ auth-pam.h 2004-02-24 20:25:23.000000000 +0100
+@@ -28,7 +28,7 @@
+ #ifdef USE_PAM
+
+ #if !defined(SSHD_PAM_SERVICE)
+-# define SSHD_PAM_SERVICE __progname
++# define SSHD_PAM_SERVICE "openssh"
+ #endif
+
+ void start_pam(const char *);
Index: session.c
---- session.c.orig 2003-09-23 10:59:08.000000000 +0200
-+++ session.c 2003-09-27 12:29:28.000000000 +0200
-@@ -1268,6 +1268,26 @@
+--- session.c.orig 2004-02-23 14:01:27.000000000 +0100
++++ session.c 2004-02-24 20:25:23.000000000 +0100
+@@ -1270,6 +1270,26 @@
exit(1);
}
endgrent();
@@ -35,11 +51,11 @@
+# endif /* USE_CHROOT */
# ifdef USE_PAM
/*
- * PAM credentials may take the form of supplementary groups.
+ * PAM credentials may take the form of supplementary groups.
Index: sftp-server.c
---- sftp-server.c.orig 2003-08-22 01:34:41.000000000 +0200
-+++ sftp-server.c 2003-12-23 22:02:33.000000000 +0100
-@@ -1037,6 +1037,38 @@
+--- sftp-server.c.orig 2004-02-23 23:19:15.000000000 +0100
++++ sftp-server.c 2004-02-24 20:25:23.000000000 +0100
+@@ -1029,6 +1029,38 @@
log_init("sftp-server", SYSLOG_LEVEL_DEBUG1, SYSLOG_FACILITY_AUTH, 0);
#endif
@@ -78,220 +94,11 @@
in = dup(STDIN_FILENO);
out = dup(STDOUT_FILENO);
-Index: auth-pam.h
---- auth-pam.h.orig 2003-09-02 15:18:53.000000000 +0200
-+++ auth-pam.h 2003-09-27 12:29:28.000000000 +0200
-@@ -28,7 +28,7 @@
- #ifdef USE_PAM
-
- #if !defined(SSHD_PAM_SERVICE)
--# define SSHD_PAM_SERVICE __progname
-+# define SSHD_PAM_SERVICE "openssh"
- #endif
-
- void start_pam(const char *);
-Index: Makefile.in
---- Makefile.in.orig 2003-09-22 03:00:12.000000000 +0200
-+++ Makefile.in 2003-09-27 12:29:28.000000000 +0200
-@@ -224,7 +224,7 @@
- $(AUTORECONF)
- (cd scard && $(MAKE) -f Makefile.in distprep)
-
--install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
host-key check-config
-+install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
host-key
- install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
install-files
-
- check-config:
-Index: configure
---- configure.orig 2003-12-03 18:30:30.000000000 +0100
-+++ configure 2003-12-03 18:29:05.000000000 +0100
-@@ -6452,92 +6452,6 @@
-
- fi;
-
--# Check whether user wants TCP wrappers support
--TCPW_MSG="no"
--
--# Check whether --with-tcp-wrappers or --without-tcp-wrappers was given.
--if test "${with_tcp_wrappers+set}" = set; then
-- withval="$with_tcp_wrappers"
--
-- if test "x$withval" != "xno" ; then
-- saved_LIBS="$LIBS"
-- saved_LDFLAGS="$LDFLAGS"
-- saved_CPPFLAGS="$CPPFLAGS"
-- if test -n "${withval}" -a "${withval}" != "yes"; then
-- if test -d "${withval}/lib"; then
-- if test -n "${need_dash_r}"; then
-- LDFLAGS="-L${withval}/lib
-R${withval}/lib ${LDFLAGS}"
-- else
-- LDFLAGS="-L${withval}/lib ${LDFLAGS}"
-- fi
-- else
-- if test -n "${need_dash_r}"; then
-- LDFLAGS="-L${withval} -R${withval}
${LDFLAGS}"
-- else
-- LDFLAGS="-L${withval} ${LDFLAGS}"
-- fi
-- fi
-- if test -d "${withval}/include"; then
-- CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
-- else
-- CPPFLAGS="-I${withval} ${CPPFLAGS}"
-- fi
-- fi
-- LIBWRAP="-lwrap"
-- LIBS="$LIBWRAP $LIBS"
-- echo "$as_me:6488: checking for libwrap" >&5
--echo $ECHO_N "checking for libwrap... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
--#line 6491 "configure"
--#include "confdefs.h"
--
--#include <tcpd.h>
-- int deny_severity = 0, allow_severity = 0;
--
--int
--main ()
--{
--hosts_access(0);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6506: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:6509: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:6512: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:6515: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
-- echo "$as_me:6518: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- cat >>confdefs.h <<\EOF
--#define LIBWRAP 1
--EOF
--
-- TCPW_MSG="yes"
--
--else
-- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--
-- { { echo "$as_me:6530: error: *** libwrap
missing" >&5
--echo "$as_me: error: *** libwrap missing" >&2;}
-- { (exit 1); exit 1; }; }
--
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-- LIBS="$saved_LIBS"
-- fi
--
--fi;
--
- for ac_func in \
- arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename \
- bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
-@@ -15674,6 +15588,96 @@
-
- fi;
+Index: version.h
+--- version.h.orig 2004-02-23 23:24:02.000000000 +0100
++++ version.h 2004-02-24 20:25:23.000000000 +0100
+@@ -1,3 +1,3 @@
+ /* $OpenBSD: version.h,v 1.40 2004/02/23 15:16:46 markus Exp $ */
-+#---------------------------------------------------
-+
-+# Check whether user wants TCP wrappers support
-+TCPW_MSG="no"
-+
-+# Check whether --with-tcp-wrappers or --without-tcp-wrappers was given.
-+if test "${with_tcp_wrappers+set}" = set; then
-+ withval="$with_tcp_wrappers"
-+
-+ if test "x$withval" != "xno" ; then
-+ saved_LIBS="$LIBS"
-+ saved_LDFLAGS="$LDFLAGS"
-+ saved_CPPFLAGS="$CPPFLAGS"
-+ if test -n "${withval}" -a "${withval}" != "yes"; then
-+ if test -d "${withval}/lib"; then
-+ if test -n "${need_dash_r}"; then
-+ LDFLAGS="-L${withval}/lib
-R${withval}/lib ${LDFLAGS}"
-+ else
-+ LDFLAGS="-L${withval}/lib ${LDFLAGS}"
-+ fi
-+ else
-+ if test -n "${need_dash_r}"; then
-+ LDFLAGS="-L${withval} -R${withval}
${LDFLAGS}"
-+ else
-+ LDFLAGS="-L${withval} ${LDFLAGS}"
-+ fi
-+ fi
-+ if test -d "${withval}/include"; then
-+ CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
-+ else
-+ CPPFLAGS="-I${withval} ${CPPFLAGS}"
-+ fi
-+ fi
-+ LIBWRAP="-lwrap"
-+ LIBS="$LIBWRAP $LIBS"
-+ echo "$as_me:6488: checking for libwrap" >&5
-+echo $ECHO_N "checking for libwrap... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6491 "configure"
-+#include "confdefs.h"
-+
-+#include <tcpd.h>
-+ int deny_severity = 0, allow_severity = 0;
-+
-+int
-+main ()
-+{
-+hosts_access(0);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6506: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6509: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6512: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6515: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+ echo "$as_me:6518: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ cat >>confdefs.h <<\EOF
-+#define LIBWRAP 1
-+EOF
-+
-+ TCPW_MSG="yes"
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+
-+ { { echo "$as_me:6530: error: *** libwrap
missing" >&5
-+echo "$as_me: error: *** libwrap missing" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS="$saved_LIBS"
-+ fi
-+
-+fi;
-+
-+#---------------------------------------------------
-+
- echo "$as_me:15677: checking if we need to convert IPv4 in IPv6-mapped addresses"
>&5
- echo $ECHO_N "checking if we need to convert IPv4 in IPv6-mapped addresses...
$ECHO_C" >&6
- IPV4_IN6_HACK_MSG="no"
+-#define SSH_VERSION "OpenSSH_3.8p1"
++#define SSH_VERSION "OpenSSH_3.8p1 @l_openpkg_release@"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.123 -r1.124 openssh.spec
--- openpkg-src/openssh/openssh.spec 7 Feb 2004 17:57:17 -0000 1.123
+++ openpkg-src/openssh/openssh.spec 24 Feb 2004 19:36:27 -0000 1.124
@@ -24,8 +24,8 @@
##
# package versions
-%define V_base 3.7.1
-%define V_portable p2
+%define V_base 3.8
+%define V_portable p1
%define V_watchdog 3.7.1p1
%define V_ldap_base 3.7.1p2
%define V_ldap_vers1 v2.01
@@ -42,7 +42,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20040207
+Release: 20040224
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
