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: 10-Mar-2007 09:35:34
Branch: HEAD Handle: 2007031008353400
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.5p1 -> 4.6p1
Summary:
Revision Changes Path
1.19 +5 -5 openpkg-src/openssh/openssh.patch
1.10 +13 -13 openpkg-src/openssh/openssh.patch.alias
1.10 +6 -6 openpkg-src/openssh/openssh.patch.chroot
1.13 +2 -2 openpkg-src/openssh/openssh.patch.scpbindir
1.11 +14 -14 openpkg-src/openssh/openssh.patch.sftplogging
1.191 +2 -2 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 openssh.patch
--- openpkg-src/openssh/openssh.patch 8 Nov 2006 08:03:37 -0000 1.18
+++ openpkg-src/openssh/openssh.patch 10 Mar 2007 08:35:34 -0000 1.19
@@ -1,6 +1,6 @@
Index: Makefile.in
--- Makefile.in.orig 2006-10-23 23:44:47 +0200
-+++ Makefile.in 2006-11-08 08:59:53 +0100
++++ Makefile.in 2007-03-10 09:30:35 +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-11-08 08:59:53 +0100
++++ auth-pam.h 2007-03-10 09:30:35 +0100
@@ -28,7 +28,7 @@
#ifdef USE_PAM
@@ -23,10 +23,10 @@
void start_pam(Authctxt *);
Index: version.h
---- version.h.orig 2006-11-07 13:16:08 +0100
-+++ version.h 2006-11-08 08:59:53 +0100
+--- version.h.orig 2007-03-06 11:21:37 +0100
++++ version.h 2007-03-10 09:30:35 +0100
@@ -3,4 +3,4 @@
- #define SSH_VERSION "OpenSSH_4.5"
+ #define SSH_VERSION "OpenSSH_4.6"
#define SSH_PORTABLE "p1"
-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.alias
============================================================================
$ cvs diff -u -r1.9 -r1.10 openssh.patch.alias
--- openpkg-src/openssh/openssh.patch.alias 8 Nov 2006 08:03:37 -0000
1.9
+++ openpkg-src/openssh/openssh.patch.alias 10 Mar 2007 08:35:34 -0000
1.10
@@ -1,6 +1,6 @@
Index: auth1.c
--- auth1.c.orig 2006-09-01 07:38:36 +0200
-+++ auth1.c 2006-11-08 09:00:38 +0100
++++ auth1.c 2007-03-10 09:30:55 +0100
@@ -39,6 +39,9 @@
#endif
#include "monitor_wrap.h"
@@ -49,8 +49,8 @@
authctxt->style = style;
Index: auth2.c
---- auth2.c.orig 2006-08-05 04:39:39 +0200
-+++ auth2.c 2006-11-08 09:00:39 +0100
+--- auth2.c.orig 2007-03-01 11:31:29 +0100
++++ auth2.c 2007-03-10 09:30:55 +0100
@@ -44,6 +44,9 @@
#include "dispatch.h"
#include "pathnames.h"
@@ -61,7 +61,7 @@
#ifdef GSSAPI
#include "ssh-gss.h"
-@@ -147,6 +150,10 @@
+@@ -143,6 +146,10 @@
Authmethod *m = NULL;
char *user, *service, *method, *style = NULL;
int authenticated = 0;
@@ -72,7 +72,7 @@
if (authctxt == NULL)
fatal("input_userauth_request: no authctxt");
-@@ -160,6 +167,25 @@
+@@ -156,6 +163,25 @@
if ((style = strchr(user, ':')) != NULL)
*style++ = 0;
@@ -99,8 +99,8 @@
/* setup auth context */
authctxt->pw = PRIVSEP(getpwnamallow(user));
Index: servconf.c
---- servconf.c.orig 2006-08-18 16:23:15 +0200
-+++ servconf.c 2006-11-08 09:00:39 +0100
+--- servconf.c.orig 2007-03-01 11:31:29 +0100
++++ servconf.c 2007-03-10 09:30:55 +0100
@@ -122,6 +122,9 @@
options->permit_tun = -1;
options->num_permitted_opens = -1;
@@ -131,7 +131,7 @@
{ NULL, sBadOption, 0 }
};
-@@ -1260,6 +1269,26 @@
+@@ -1261,6 +1270,26 @@
arg = strdelim(&cp);
break;
@@ -159,8 +159,8 @@
logit("%s line %d: Unsupported option %s",
filename, linenum, arg);
Index: servconf.h
---- servconf.h.orig 2006-08-18 16:23:15 +0200
-+++ servconf.h 2006-11-08 09:00:39 +0100
+--- servconf.h.orig 2007-02-19 12:25:38 +0100
++++ servconf.h 2007-03-10 09:30:55 +0100
@@ -141,6 +141,14 @@
int permit_tun;
@@ -177,9 +177,9 @@
void initialize_server_options(ServerOptions *);
Index: sshd_config.5
---- sshd_config.5.orig 2006-08-30 03:06:34 +0200
-+++ sshd_config.5 2006-11-08 09:00:39 +0100
-@@ -97,6 +97,15 @@
+--- sshd_config.5.orig 2007-03-06 11:21:18 +0100
++++ sshd_config.5 2007-03-10 09:30:55 +0100
+@@ -95,6 +95,15 @@
(use IPv6 only).
The default is
.Dq any .
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.chroot
============================================================================
$ cvs diff -u -r1.9 -r1.10 openssh.patch.chroot
--- openpkg-src/openssh/openssh.patch.chroot 8 Nov 2006 08:03:37 -0000
1.9
+++ openpkg-src/openssh/openssh.patch.chroot 10 Mar 2007 08:35:34 -0000
1.10
@@ -1,6 +1,6 @@
Index: scp.c
---- scp.c.orig 2006-08-05 04:39:40 +0200
-+++ scp.c 2006-11-08 09:01:03 +0100
+--- scp.c.orig 2007-02-19 12:14:11 +0100
++++ scp.c 2007-03-10 09:31:17 +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-10-23 19:01:56 +0200
-+++ session.c 2006-11-08 09:01:03 +0100
+--- session.c.orig 2007-02-19 12:10:25 +0100
++++ session.c 2007-03-10 09:31:17 +0100
@@ -1337,6 +1337,26 @@
exit(1);
}
@@ -88,8 +88,8 @@
if (options.gss_authentication) {
temporarily_use_uid(pw);
Index: sftp-server.c
---- sftp-server.c.orig 2006-08-05 04:39:40 +0200
-+++ sftp-server.c 2006-11-08 09:01:03 +0100
+--- sftp-server.c.orig 2007-01-05 06:31:03 +0100
++++ sftp-server.c 2007-03-10 09:31:17 +0100
@@ -1270,6 +1270,38 @@
handle_init();
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.scpbindir
============================================================================
$ cvs diff -u -r1.12 -r1.13 openssh.patch.scpbindir
--- openpkg-src/openssh/openssh.patch.scpbindir 8 Nov 2006 08:03:37
-0000 1.12
+++ openpkg-src/openssh/openssh.patch.scpbindir 10 Mar 2007 08:35:34
-0000 1.13
@@ -1,6 +1,6 @@
Index: session.c
---- session.c.orig 2006-10-23 19:01:56 +0200
-+++ session.c 2006-11-08 09:01:31 +0100
+--- session.c.orig 2007-02-19 12:10:25 +0100
++++ session.c 2007-03-10 09:31:39 +0100
@@ -92,6 +92,10 @@
#include <kafs.h>
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.sftplogging
============================================================================
$ cvs diff -u -r1.10 -r1.11 openssh.patch.sftplogging
--- openpkg-src/openssh/openssh.patch.sftplogging 9 Nov 2006 21:41:57
-0000 1.10
+++ openpkg-src/openssh/openssh.patch.sftplogging 10 Mar 2007 08:35:34
-0000 1.11
@@ -1,6 +1,6 @@
Index: servconf.c
---- servconf.c.orig 2006-08-18 16:23:15 +0200
-+++ servconf.c 2006-11-09 22:39:22 +0100
+--- servconf.c.orig 2007-03-01 11:31:29 +0100
++++ servconf.c 2007-03-10 09:32:01 +0100
@@ -122,6 +122,12 @@
options->permit_tun = -1;
options->num_permitted_opens = -1;
@@ -131,8 +131,8 @@
* These options can contain %X options expanded at
* 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-11-09 22:37:15 +0100
+--- servconf.h.orig 2007-02-19 12:25:38 +0100
++++ servconf.h 2007-03-10 09:32:01 +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-10-23 19:01:56 +0200
-+++ session.c 2006-11-09 22:37:15 +0100
+--- session.c.orig 2007-02-19 12:10:25 +0100
++++ session.c 2007-03-10 09:32:01 +0100
@@ -138,6 +138,15 @@
static int is_child = 0;
@@ -264,7 +264,7 @@
snprintf(buf, sizeof buf, "%.200s/.ssh/environment",
Index: sftp-server.8
--- sftp-server.8.orig 2006-09-26 12:14:28 +0200
-+++ sftp-server.8 2006-11-09 22:37:15 +0100
++++ sftp-server.8 2007-03-10 09:32:01 +0100
@@ -49,6 +49,20 @@
.Cm Subsystem
declaration.
@@ -287,8 +287,8 @@
for more information.
.Pp
Index: sftp-server.c
---- sftp-server.c.orig 2006-08-05 04:39:40 +0200
-+++ sftp-server.c 2006-11-09 22:37:15 +0100
+--- sftp-server.c.orig 2007-01-05 06:31:03 +0100
++++ sftp-server.c 2007-03-10 09:32:01 +0100
@@ -53,6 +53,12 @@
/* Our verbosity */
LogLevel log_level = SYSLOG_LEVEL_ERROR;
@@ -578,9 +578,9 @@
setmode(in, O_BINARY);
setmode(out, O_BINARY);
Index: sshd_config.5
---- sshd_config.5.orig 2006-08-30 03:06:34 +0200
-+++ sshd_config.5 2006-11-09 22:37:15 +0100
-@@ -485,6 +485,10 @@
+--- sshd_config.5.orig 2007-03-06 11:21:18 +0100
++++ sshd_config.5 2007-03-10 09:32:01 +0100
+@@ -483,6 +483,10 @@
DEBUG and DEBUG1 are equivalent.
DEBUG2 and DEBUG3 each specify higher levels of debugging output.
Logging with a DEBUG level violates the privacy of users and is not
recommended.
@@ -591,7 +591,7 @@
.It Cm MACs
Specifies the available MAC (message authentication code) algorithms.
The MAC algorithm is used in protocol version 2
-@@ -717,6 +721,37 @@
+@@ -722,6 +726,37 @@
.It Cm ServerKeyBits
Defines the number of bits in the ephemeral protocol version 1 server key.
The minimum value is 512, and the default is 768.
@@ -631,7 +631,7 @@
.Xr sshd 8
Index: sshd_config
--- sshd_config.orig 2006-07-24 06:06:47 +0200
-+++ sshd_config 2006-11-09 22:37:15 +0100
++++ sshd_config 2007-03-10 09:32:01 +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.190 -r1.191 openssh.spec
--- openpkg-src/openssh/openssh.spec 26 Feb 2007 18:22:29 -0000 1.190
+++ openpkg-src/openssh/openssh.spec 10 Mar 2007 08:35:34 -0000 1.191
@@ -23,7 +23,7 @@
##
# package versions
-%define V_base 4.5
+%define V_base 4.6
%define V_portable p1
%define V_watchdog 4.4p1
%define V_ldap_base 4.5p1
@@ -42,7 +42,7 @@
Group: SSH
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20070226
+Release: 20070310
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
