OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Mar-2005 20:03:13
Branch: HEAD Handle: 2005030919031300
Modified files:
openpkg-src/openssh openssh.patch openssh.spec
Log:
upgrading package: openssh 3.9p1 -> 4.0p1
Summary:
Revision Changes Path
1.13 +22 -21 openpkg-src/openssh/openssh.patch
1.145 +2 -2 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 openssh.patch
--- openpkg-src/openssh/openssh.patch 27 Dec 2004 19:01:49 -0000 1.12
+++ openpkg-src/openssh/openssh.patch 9 Mar 2005 19:03:13 -0000 1.13
@@ -1,18 +1,18 @@
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 @@
+--- Makefile.in.orig 2005-02-26 00:12:38 +0100
++++ Makefile.in 2005-03-09 19:57:49 +0100
+@@ -230,7 +230,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
+-install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
install-files install-sysconf host-key check-config
++install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
install-files install-sysconf host-key
+ install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
install-files install-sysconf
+ install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
install-files
- 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
+--- auth-pam.h.orig 2004-09-11 14:17:26 +0200
++++ auth-pam.h 2005-03-09 19:56:10 +0100
@@ -28,7 +28,7 @@
#ifdef USE_PAM
@@ -21,18 +21,10 @@
+# define SSHD_PAM_SERVICE "openssh"
#endif
- void start_pam(const char *);
-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 $ */
-
--#define SSH_VERSION "OpenSSH_3.9p1"
-+#define SSH_VERSION "OpenSSH_3.9p1 @l_openpkg_release@"
+ void start_pam(Authctxt *);
Index: openbsd-compat/fake-rfc2553.h
---- openbsd-compat/fake-rfc2553.h.orig 2004-03-10 11:06:33 +0100
-+++ openbsd-compat/fake-rfc2553.h 2004-12-27 19:42:35 +0100
+--- openbsd-compat/fake-rfc2553.h.orig 2005-02-11 08:32:13 +0100
++++ openbsd-compat/fake-rfc2553.h 2005-03-09 19:56:10 +0100
@@ -115,7 +115,11 @@
#ifndef EAI_NODATA
@@ -43,5 +35,14 @@
+#endif
+#ifndef EAI_NONAME
# define EAI_NONAME 3
+ # define EAI_SYSTEM 4
#endif
-
+Index: version.h
+--- version.h.orig 2005-03-09 01:00:43 +0100
++++ version.h 2005-03-09 19:57:28 +0100
+@@ -3,4 +3,4 @@
+ #define SSH_VERSION "OpenSSH_4.0"
+
+ #define SSH_PORTABLE "p1"
+-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
++#define SSH_RELEASE SSH_VERSION SSH_PORTABLE " @l_openpkg_release@"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.144 -r1.145 openssh.spec
--- openpkg-src/openssh/openssh.spec 12 Feb 2005 21:39:50 -0000 1.144
+++ openpkg-src/openssh/openssh.spec 9 Mar 2005 19:03:13 -0000 1.145
@@ -24,7 +24,7 @@
##
# package versions
-%define V_base 3.9
+%define V_base 4.0
%define V_portable p1
%define V_watchdog 3.9p1
%define V_ldap_base 3.7.1p2
@@ -42,7 +42,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20050212
+Release: 20050309
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
