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-Nov-2006 22:41:57
Branch: HEAD Handle: 2006110921415700
Modified files:
openpkg-src/openssh openssh.patch.sftplogging openssh.spec
Log:
fix the sftplogging patch by moving some local variables from the
wrong to the right function
Summary:
Revision Changes Path
1.10 +15 -15 openpkg-src/openssh/openssh.patch.sftplogging
1.181 +1 -1 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.sftplogging
============================================================================
$ cvs diff -u -r1.9 -r1.10 openssh.patch.sftplogging
--- openpkg-src/openssh/openssh.patch.sftplogging 8 Nov 2006 08:03:37
-0000 1.9
+++ openpkg-src/openssh/openssh.patch.sftplogging 9 Nov 2006 21:41:57
-0000 1.10
@@ -1,6 +1,6 @@
Index: servconf.c
--- servconf.c.orig 2006-08-18 16:23:15 +0200
-+++ servconf.c 2006-11-08 09:01:51 +0100
++++ servconf.c 2006-11-09 22:39:22 +0100
@@ -122,6 +122,12 @@
options->permit_tun = -1;
options->num_permitted_opens = -1;
@@ -62,15 +62,15 @@
#ifdef USE_PAM
{ "usepam", sUsePAM, SSHCFG_GLOBAL },
#else
-@@ -431,6 +464,8 @@
- add_listen_addr(ServerOptions *options, char *addr, u_short port)
- {
- u_int i;
-+ unsigned int umaskvalue = 0;
-+ char *umaskptr;
+@@ -626,6 +659,8 @@
+ u_short port;
+ u_int i, flags = 0;
+ size_t len;
++ unsigned int umaskvalue = 0;
++ char *umaskptr;
- if (options->num_ports == 0)
- options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
+ cp = line;
+ if ((arg = strdelim(&cp)) == NULL)
@@ -1146,6 +1181,58 @@
case sBanner:
charptr = &options->banner;
@@ -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-11-08 09:01:51 +0100
++++ servconf.h 2006-11-09 22:37:15 +0100
@@ -34,6 +34,19 @@
#define PERMIT_NO_PASSWD 2
#define PERMIT_YES 3
@@ -169,7 +169,7 @@
void initialize_server_options(ServerOptions *);
Index: session.c
--- session.c.orig 2006-10-23 19:01:56 +0200
-+++ session.c 2006-11-08 09:01:51 +0100
++++ session.c 2006-11-09 22:37:15 +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-08 09:01:51 +0100
++++ sftp-server.8 2006-11-09 22:37:15 +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-11-08 09:01:51 +0100
++++ sftp-server.c 2006-11-09 22:37:15 +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-11-08 09:01:51 +0100
++++ sshd_config.5 2006-11-09 22:37:15 +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-11-08 09:01:51 +0100
++++ sshd_config 2006-11-09 22:37:15 +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.180 -r1.181 openssh.spec
--- openpkg-src/openssh/openssh.spec 8 Nov 2006 08:56:38 -0000 1.180
+++ openpkg-src/openssh/openssh.spec 9 Nov 2006 21:41:57 -0000 1.181
@@ -42,7 +42,7 @@
Group: SSH
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20061108
+Release: 20061109
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
