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: 08-Nov-2006 09:58:50
Branch: OPENPKG_2_STABLE Handle: 2006110808584901
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openssh openssh.patch openssh.patch.alias
openssh.patch.chroot openssh.patch.scpbindir
openssh.patch.sftplogging openssh.spec
Log:
MFC: security fixed version plus HPN patch related packaging fixes
Summary:
Revision Changes Path
1.16.2.2 +7 -7 openpkg-src/openssh/openssh.patch
1.7.2.2 +5 -5 openpkg-src/openssh/openssh.patch.alias
1.7.2.2 +4 -4 openpkg-src/openssh/openssh.patch.chroot
1.10.2.2 +2 -2 openpkg-src/openssh/openssh.patch.scpbindir
1.7.2.2 +9 -9 openpkg-src/openssh/openssh.patch.sftplogging
1.161.2.7 +4 -4 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch
============================================================================
$ cvs diff -u -r1.16.2.1 -r1.16.2.2 openssh.patch
--- openpkg-src/openssh/openssh.patch 29 Sep 2006 06:46:19 -0000 1.16.2.1
+++ openpkg-src/openssh/openssh.patch 8 Nov 2006 08:58:49 -0000 1.16.2.2
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2006-09-12 13:54:10 +0200
-+++ Makefile.in 2006-09-28 08:00:38 +0200
-@@ -233,7 +233,7 @@
+--- Makefile.in.orig 2006-10-23 23:44:47 +0200
++++ Makefile.in 2006-11-08 08:59:53 +0100
+@@ -234,7 +234,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-09-28 08:00:38 +0200
++++ auth-pam.h 2006-11-08 08:59:53 +0100
@@ -28,7 +28,7 @@
#ifdef USE_PAM
@@ -23,10 +23,10 @@
void start_pam(Authctxt *);
Index: version.h
---- version.h.orig 2006-08-30 03:09:01 +0200
-+++ version.h 2006-09-28 08:00:38 +0200
+--- version.h.orig 2006-11-07 13:16:08 +0100
++++ version.h 2006-11-08 08:59:53 +0100
@@ -3,4 +3,4 @@
- #define SSH_VERSION "OpenSSH_4.4"
+ #define SSH_VERSION "OpenSSH_4.5"
#define SSH_PORTABLE "p1"
-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.alias
============================================================================
$ cvs diff -u -r1.7.2.1 -r1.7.2.2 openssh.patch.alias
--- openpkg-src/openssh/openssh.patch.alias 29 Sep 2006 06:46:19 -0000
1.7.2.1
+++ openpkg-src/openssh/openssh.patch.alias 8 Nov 2006 08:58:49 -0000
1.7.2.2
@@ -1,6 +1,6 @@
Index: auth1.c
--- auth1.c.orig 2006-09-01 07:38:36 +0200
-+++ auth1.c 2006-09-28 08:00:58 +0200
++++ auth1.c 2006-11-08 09:00:38 +0100
@@ -39,6 +39,9 @@
#endif
#include "monitor_wrap.h"
@@ -50,7 +50,7 @@
Index: auth2.c
--- auth2.c.orig 2006-08-05 04:39:39 +0200
-+++ auth2.c 2006-09-28 08:00:58 +0200
++++ auth2.c 2006-11-08 09:00:39 +0100
@@ -44,6 +44,9 @@
#include "dispatch.h"
#include "pathnames.h"
@@ -100,7 +100,7 @@
authctxt->pw = PRIVSEP(getpwnamallow(user));
Index: servconf.c
--- servconf.c.orig 2006-08-18 16:23:15 +0200
-+++ servconf.c 2006-09-28 08:01:48 +0200
++++ servconf.c 2006-11-08 09:00:39 +0100
@@ -122,6 +122,9 @@
options->permit_tun = -1;
options->num_permitted_opens = -1;
@@ -160,7 +160,7 @@
filename, linenum, arg);
Index: servconf.h
--- servconf.h.orig 2006-08-18 16:23:15 +0200
-+++ servconf.h 2006-09-28 08:02:15 +0200
++++ servconf.h 2006-11-08 09:00:39 +0100
@@ -141,6 +141,14 @@
int permit_tun;
@@ -178,7 +178,7 @@
void initialize_server_options(ServerOptions *);
Index: sshd_config.5
--- sshd_config.5.orig 2006-08-30 03:06:34 +0200
-+++ sshd_config.5 2006-09-28 08:00:58 +0200
++++ sshd_config.5 2006-11-08 09:00:39 +0100
@@ -97,6 +97,15 @@
(use IPv6 only).
The default is
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.chroot
============================================================================
$ cvs diff -u -r1.7.2.1 -r1.7.2.2 openssh.patch.chroot
--- openpkg-src/openssh/openssh.patch.chroot 29 Sep 2006 06:46:19 -0000
1.7.2.1
+++ openpkg-src/openssh/openssh.patch.chroot 8 Nov 2006 08:58:50 -0000
1.7.2.2
@@ -1,6 +1,6 @@
Index: scp.c
--- scp.c.orig 2006-08-05 04:39:40 +0200
-+++ scp.c 2006-09-28 08:02:41 +0200
++++ scp.c 2006-11-08 09:01:03 +0100
@@ -128,6 +128,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 2006-09-01 07:38:37 +0200
-+++ session.c 2006-09-28 08:02:41 +0200
+--- session.c.orig 2006-10-23 19:01:56 +0200
++++ session.c 2006-11-08 09:01:03 +0100
@@ -1337,6 +1337,26 @@
exit(1);
}
@@ -89,7 +89,7 @@
temporarily_use_uid(pw);
Index: sftp-server.c
--- sftp-server.c.orig 2006-08-05 04:39:40 +0200
-+++ sftp-server.c 2006-09-28 08:02:41 +0200
++++ sftp-server.c 2006-11-08 09:01:03 +0100
@@ -1270,6 +1270,38 @@
handle_init();
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.scpbindir
============================================================================
$ cvs diff -u -r1.10.2.1 -r1.10.2.2 openssh.patch.scpbindir
--- openpkg-src/openssh/openssh.patch.scpbindir 29 Sep 2006 06:46:20
-0000 1.10.2.1
+++ openpkg-src/openssh/openssh.patch.scpbindir 8 Nov 2006 08:58:50
-0000 1.10.2.2
@@ -1,6 +1,6 @@
Index: session.c
---- session.c.orig 2006-09-01 07:38:37 +0200
-+++ session.c 2006-09-28 08:04:00 +0200
+--- session.c.orig 2006-10-23 19:01:56 +0200
++++ session.c 2006-11-08 09:01:31 +0100
@@ -92,6 +92,10 @@
#include <kafs.h>
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.sftplogging
============================================================================
$ cvs diff -u -r1.7.2.1 -r1.7.2.2 openssh.patch.sftplogging
--- openpkg-src/openssh/openssh.patch.sftplogging 29 Sep 2006 06:46:20
-0000 1.7.2.1
+++ openpkg-src/openssh/openssh.patch.sftplogging 8 Nov 2006 08:58:50
-0000 1.7.2.2
@@ -1,6 +1,6 @@
Index: servconf.c
--- servconf.c.orig 2006-08-18 16:23:15 +0200
-+++ servconf.c 2006-09-28 08:06:00 +0200
++++ servconf.c 2006-11-08 09:01:51 +0100
@@ -122,6 +122,12 @@
options->permit_tun = -1;
options->num_permitted_opens = -1;
@@ -132,7 +132,7 @@
* connect time, so that you can specify paths like:
Index: servconf.h
--- servconf.h.orig 2006-08-18 16:23:15 +0200
-+++ servconf.h 2006-09-28 08:05:25 +0200
++++ servconf.h 2006-11-08 09:01:51 +0100
@@ -34,6 +34,19 @@
#define PERMIT_NO_PASSWD 2
#define PERMIT_YES 3
@@ -168,8 +168,8 @@
void initialize_server_options(ServerOptions *);
Index: session.c
---- session.c.orig 2006-09-01 07:38:37 +0200
-+++ session.c 2006-09-28 08:04:35 +0200
+--- session.c.orig 2006-10-23 19:01:56 +0200
++++ session.c 2006-11-08 09:01:51 +0100
@@ -138,6 +138,15 @@
static int is_child = 0;
@@ -263,8 +263,8 @@
if (options.permit_user_env && !options.use_login) {
snprintf(buf, sizeof buf, "%.200s/.ssh/environment",
Index: sftp-server.8
---- sftp-server.8.orig 2006-09-26 12:57:06 +0200
-+++ sftp-server.8 2006-09-28 08:04:35 +0200
+--- sftp-server.8.orig 2006-09-26 12:14:28 +0200
++++ sftp-server.8 2006-11-08 09:01:51 +0100
@@ -49,6 +49,20 @@
.Cm Subsystem
declaration.
@@ -288,7 +288,7 @@
.Pp
Index: sftp-server.c
--- sftp-server.c.orig 2006-08-05 04:39:40 +0200
-+++ sftp-server.c 2006-09-28 08:18:48 +0200
++++ sftp-server.c 2006-11-08 09:01:51 +0100
@@ -53,6 +53,12 @@
/* Our verbosity */
LogLevel log_level = SYSLOG_LEVEL_ERROR;
@@ -579,7 +579,7 @@
setmode(out, O_BINARY);
Index: sshd_config.5
--- sshd_config.5.orig 2006-08-30 03:06:34 +0200
-+++ sshd_config.5 2006-09-28 08:04:35 +0200
++++ sshd_config.5 2006-11-08 09:01:51 +0100
@@ -485,6 +485,10 @@
DEBUG and DEBUG1 are equivalent.
DEBUG2 and DEBUG3 each specify higher levels of debugging output.
@@ -631,7 +631,7 @@
.Xr sshd 8
Index: sshd_config
--- sshd_config.orig 2006-07-24 06:06:47 +0200
-+++ sshd_config 2006-09-28 08:19:22 +0200
++++ sshd_config 2006-11-08 09:01:51 +0100
@@ -105,6 +105,17 @@
# override default of no subsystems
Subsystem sftp /usr/libexec/sftp-server
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.161.2.6 -r1.161.2.7 openssh.spec
--- openpkg-src/openssh/openssh.spec 24 Oct 2006 05:48:50 -0000
1.161.2.6
+++ openpkg-src/openssh/openssh.spec 8 Nov 2006 08:58:50 -0000
1.161.2.7
@@ -23,13 +23,13 @@
##
# package versions
-%define V_base 4.4
+%define V_base 4.5
%define V_portable p1
%define V_watchdog 4.4p1
%define V_ldap_base 4.4p1
%define V_ldap_vers 0.3.7
%define V_connect 1.96
-%define V_hpn 4.4p1-hpn12v12
+%define V_hpn 4.4p1-hpn12v13
# package information
Name: openssh
@@ -42,7 +42,7 @@
Group: SSH
License: BSD
Version: %{V_base}%{V_portable}
-Release: 2.20061024
+Release: 2.20061108
# package options
%option with_fsl yes
@@ -178,7 +178,7 @@
%patch -p0 -P 5
%endif
%if "%{with_hpn}" == "yes"
- %{l_gzip} -d -c %{SOURCE openssh-%{version}-hpn%{V_hpn}.diff.gz} |\
+ %{l_gzip} -d -c %{SOURCE openssh-%{V_hpn}.diff.gz} |\
sed -e '/^diff.*\/version\.h/,$d' | %{l_patch} -p1 -b
%{l_shtool} subst -e 's;\(SSH_VERSION SSH_PORTABLE\);\1 "-hpn";'
version.h
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
