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: 11-Feb-2006 09:29:39
Branch: HEAD Handle: 2006021108293800
Modified files:
openpkg-src/openssh openssh.patch openssh.patch.alias
openssh.patch.chroot openssh.patch.scpbindir
openssh.patch.sftplogging openssh.spec
Log:
upgrading package: openssh 4.3p1 -> 4.3p2
Summary:
Revision Changes Path
1.16 +5 -5 openpkg-src/openssh/openssh.patch
1.7 +5 -5 openpkg-src/openssh/openssh.patch.alias
1.7 +4 -4 openpkg-src/openssh/openssh.patch.chroot
1.10 +2 -2 openpkg-src/openssh/openssh.patch.scpbindir
1.7 +8 -8 openpkg-src/openssh/openssh.patch.sftplogging
1.158 +2 -2 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 openssh.patch
--- openpkg-src/openssh/openssh.patch 1 Feb 2006 18:49:18 -0000 1.15
+++ openpkg-src/openssh/openssh.patch 11 Feb 2006 08:29:38 -0000 1.16
@@ -1,6 +1,6 @@
Index: Makefile.in
--- Makefile.in.orig 2006-01-01 09:47:05 +0100
-+++ Makefile.in 2006-02-01 19:39:50 +0100
++++ Makefile.in 2006-02-11 09:25:19 +0100
@@ -230,7 +230,7 @@
-rm -rf autom4te.cache
(cd scard && $(MAKE) -f Makefile.in distprep)
@@ -12,7 +12,7 @@
Index: auth-pam.h
--- auth-pam.h.orig 2004-09-11 14:17:26 +0200
-+++ auth-pam.h 2006-02-01 19:39:50 +0100
++++ auth-pam.h 2006-02-11 09:25:19 +0100
@@ -28,7 +28,7 @@
#ifdef USE_PAM
@@ -23,11 +23,11 @@
void start_pam(Authctxt *);
Index: version.h
---- version.h.orig 2006-02-01 12:27:31 +0100
-+++ version.h 2006-02-01 19:39:50 +0100
+--- version.h.orig 2006-02-11 01:00:45 +0100
++++ version.h 2006-02-11 09:25:19 +0100
@@ -3,4 +3,4 @@
#define SSH_VERSION "OpenSSH_4.3"
- #define SSH_PORTABLE "p1"
+ #define SSH_PORTABLE "p2"
-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE " @l_openpkg_release@"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.alias
============================================================================
$ cvs diff -u -r1.6 -r1.7 openssh.patch.alias
--- openpkg-src/openssh/openssh.patch.alias 1 Feb 2006 18:49:18 -0000
1.6
+++ openpkg-src/openssh/openssh.patch.alias 11 Feb 2006 08:29:38 -0000
1.7
@@ -1,6 +1,6 @@
Index: auth1.c
--- auth1.c.orig 2005-07-17 09:26:44 +0200
-+++ auth1.c 2006-02-01 19:40:30 +0100
++++ auth1.c 2006-02-11 09:26:30 +0100
@@ -26,6 +26,9 @@
#include "uidswap.h"
#include "monitor_wrap.h"
@@ -50,7 +50,7 @@
Index: auth2.c
--- auth2.c.orig 2005-09-24 04:43:51 +0200
-+++ auth2.c 2006-02-01 19:40:30 +0100
++++ auth2.c 2006-02-11 09:26:30 +0100
@@ -36,6 +36,9 @@
#include "pathnames.h"
#include "monitor_wrap.h"
@@ -100,7 +100,7 @@
authctxt->pw = PRIVSEP(getpwnamallow(user));
Index: servconf.c
--- servconf.c.orig 2005-12-13 09:33:20 +0100
-+++ servconf.c 2006-02-01 19:41:07 +0100
++++ servconf.c 2006-02-11 09:26:30 +0100
@@ -102,6 +102,9 @@
options->authorized_keys_file2 = NULL;
options->num_accept_env = 0;
@@ -160,7 +160,7 @@
filename, linenum, arg);
Index: servconf.h
--- servconf.h.orig 2005-12-13 09:29:03 +0100
-+++ servconf.h 2006-02-01 19:41:39 +0100
++++ servconf.h 2006-02-11 09:26:30 +0100
@@ -137,6 +137,14 @@
int use_pam; /* Enable auth via PAM */
@@ -178,7 +178,7 @@
void initialize_server_options(ServerOptions *);
Index: sshd_config.5
--- sshd_config.5.orig 2006-01-03 08:47:31 +0100
-+++ sshd_config.5 2006-02-01 19:40:30 +0100
++++ sshd_config.5 2006-02-11 09:26:30 +0100
@@ -94,6 +94,15 @@
(use IPv6 only).
The default is
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.chroot
============================================================================
$ cvs diff -u -r1.6 -r1.7 openssh.patch.chroot
--- openpkg-src/openssh/openssh.patch.chroot 1 Feb 2006 18:49:18 -0000
1.6
+++ openpkg-src/openssh/openssh.patch.chroot 11 Feb 2006 08:29:38 -0000
1.7
@@ -1,6 +1,6 @@
Index: scp.c
--- scp.c.orig 2006-01-31 12:11:38 +0100
-+++ scp.c 2006-02-01 19:42:17 +0100
++++ scp.c 2006-02-11 09:27:20 +0100
@@ -102,6 +102,11 @@
/* This is the program to execute for the secured connection. ("ssh" or -S)
*/
char *ssh_program = _PATH_SSH_PROGRAM;
@@ -58,8 +58,8 @@
/* Follow "protocol", send data. */
(void) response();
Index: session.c
---- session.c.orig 2005-12-24 04:59:12 +0100
-+++ session.c 2006-02-01 19:42:17 +0100
+--- session.c.orig 2006-02-08 00:18:55 +0100
++++ session.c 2006-02-11 09:27:20 +0100
@@ -1301,6 +1301,26 @@
exit(1);
}
@@ -89,7 +89,7 @@
temporarily_use_uid(pw);
Index: sftp-server.c
--- sftp-server.c.orig 2006-01-02 13:40:51 +0100
-+++ sftp-server.c 2006-02-01 19:42:17 +0100
++++ sftp-server.c 2006-02-11 09:27:20 +0100
@@ -1049,6 +1049,38 @@
log_init("sftp-server", SYSLOG_LEVEL_DEBUG1, SYSLOG_FACILITY_AUTH, 0);
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.scpbindir
============================================================================
$ cvs diff -u -r1.9 -r1.10 openssh.patch.scpbindir
--- openpkg-src/openssh/openssh.patch.scpbindir 1 Feb 2006 18:49:18
-0000 1.9
+++ openpkg-src/openssh/openssh.patch.scpbindir 11 Feb 2006 08:29:38
-0000 1.10
@@ -1,6 +1,6 @@
Index: session.c
---- session.c.orig 2005-12-24 04:59:12 +0100
-+++ session.c 2006-02-01 19:43:26 +0100
+--- session.c.orig 2006-02-08 00:18:55 +0100
++++ session.c 2006-02-11 09:27:54 +0100
@@ -67,6 +67,10 @@
#include "ssh-gss.h"
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.sftplogging
============================================================================
$ cvs diff -u -r1.6 -r1.7 openssh.patch.sftplogging
--- openpkg-src/openssh/openssh.patch.sftplogging 1 Feb 2006 18:49:18
-0000 1.6
+++ openpkg-src/openssh/openssh.patch.sftplogging 11 Feb 2006 08:29:38
-0000 1.7
@@ -1,6 +1,6 @@
Index: servconf.c
--- servconf.c.orig 2005-12-13 09:33:20 +0100
-+++ servconf.c 2006-02-01 19:44:14 +0100
++++ servconf.c 2006-02-11 09:28:21 +0100
@@ -103,6 +103,15 @@
options->num_accept_env = 0;
options->permit_tun = -1;
@@ -135,7 +135,7 @@
* connect time, so that you can specify paths like:
Index: servconf.h
--- servconf.h.orig 2005-12-13 09:29:03 +0100
-+++ servconf.h 2006-02-01 19:45:29 +0100
++++ servconf.h 2006-02-11 09:28:21 +0100
@@ -35,6 +35,19 @@
#define PERMIT_NO_PASSWD 2
#define PERMIT_YES 3
@@ -171,8 +171,8 @@
void initialize_server_options(ServerOptions *);
Index: session.c
---- session.c.orig 2005-12-24 04:59:12 +0100
-+++ session.c 2006-02-01 19:44:14 +0100
+--- session.c.orig 2006-02-08 00:18:55 +0100
++++ session.c 2006-02-11 09:28:21 +0100
@@ -113,6 +113,15 @@
static int is_child = 0;
@@ -267,7 +267,7 @@
snprintf(buf, sizeof buf, "%.200s/.ssh/environment",
Index: sftp-server.8
--- sftp-server.8.orig 2003-10-15 07:50:43 +0200
-+++ sftp-server.8 2006-02-01 19:44:14 +0100
++++ sftp-server.8 2006-02-11 09:28:22 +0100
@@ -41,6 +41,20 @@
.Cm Subsystem
option.
@@ -291,7 +291,7 @@
.Sh SEE ALSO
Index: sftp-server.c
--- sftp-server.c.orig 2006-01-02 13:40:51 +0100
-+++ sftp-server.c 2006-02-01 19:44:14 +0100
++++ sftp-server.c 2006-02-11 09:28:22 +0100
@@ -32,6 +32,13 @@
#define get_string(lenp) buffer_get_string(&iqueue, lenp);
#define TRACE debug
@@ -635,7 +635,7 @@
error("read error");
Index: sshd_config.5
--- sshd_config.5.orig 2006-01-03 08:47:31 +0100
-+++ sshd_config.5 2006-02-01 19:44:14 +0100
++++ sshd_config.5 2006-02-11 09:28:22 +0100
@@ -426,6 +426,10 @@
DEBUG and DEBUG1 are equivalent.
DEBUG2 and DEBUG3 each specify higher levels of debugging output.
@@ -687,7 +687,7 @@
.Nm sshd
Index: sshd_config
--- sshd_config.orig 2005-12-13 09:29:03 +0100
-+++ sshd_config 2006-02-01 19:44:14 +0100
++++ sshd_config 2006-02-11 09:28:22 +0100
@@ -103,3 +103,14 @@
# override default of no subsystems
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.157 -r1.158 openssh.spec
--- openpkg-src/openssh/openssh.spec 8 Feb 2006 07:30:54 -0000 1.157
+++ openpkg-src/openssh/openssh.spec 11 Feb 2006 08:29:38 -0000 1.158
@@ -26,7 +26,7 @@
# package versions
%define V_base 4.3
-%define V_portable p1
+%define V_portable p2
%define V_watchdog 4.0p1
%define V_ldap_base 4.1p1
%define V_ldap_vers 0.3.6
@@ -43,7 +43,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20060208
+Release: 20060211
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
