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: 01-Sep-2005 20:21:40
Branch: HEAD Handle: 2005090119213901
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.1p1 -> 4.2p1
Summary:
Revision Changes Path
1.14 +6 -21 openpkg-src/openssh/openssh.patch
1.5 +12 -12 openpkg-src/openssh/openssh.patch.alias
1.5 +10 -10 openpkg-src/openssh/openssh.patch.chroot
1.8 +5 -5 openpkg-src/openssh/openssh.patch.scpbindir
1.5 +21 -21 openpkg-src/openssh/openssh.patch.sftplogging
1.153 +2 -2 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 openssh.patch
--- openpkg-src/openssh/openssh.patch 9 Mar 2005 19:03:13 -0000 1.13
+++ openpkg-src/openssh/openssh.patch 1 Sep 2005 18:21:39 -0000 1.14
@@ -1,6 +1,6 @@
Index: Makefile.in
---- Makefile.in.orig 2005-02-26 00:12:38 +0100
-+++ Makefile.in 2005-03-09 19:57:49 +0100
+--- Makefile.in.orig 2005-05-29 09:22:29 +0200
++++ Makefile.in 2005-09-01 20:04:23 +0200
@@ -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 2005-03-09 19:56:10 +0100
++++ auth-pam.h 2005-09-01 20:04:23 +0200
@@ -28,7 +28,7 @@
#ifdef USE_PAM
@@ -22,26 +22,11 @@
#endif
void start_pam(Authctxt *);
-Index: openbsd-compat/fake-rfc2553.h
---- 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
- # define EAI_NODATA 1
-+#endif
-+#ifndef EAI_MEMORY
- # define EAI_MEMORY 2
-+#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
+--- version.h.orig 2005-08-31 11:47:07 +0200
++++ version.h 2005-09-01 20:04:23 +0200
@@ -3,4 +3,4 @@
- #define SSH_VERSION "OpenSSH_4.0"
+ #define SSH_VERSION "OpenSSH_4.2"
#define SSH_PORTABLE "p1"
-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.alias
============================================================================
$ cvs diff -u -r1.4 -r1.5 openssh.patch.alias
--- openpkg-src/openssh/openssh.patch.alias 29 May 2005 08:10:06 -0000
1.4
+++ openpkg-src/openssh/openssh.patch.alias 1 Sep 2005 18:21:39 -0000
1.5
@@ -1,6 +1,6 @@
Index: auth1.c
---- auth1.c.orig 2005-02-08 11:52:48 +0100
-+++ auth1.c 2005-05-29 10:03:31 +0200
+--- auth1.c.orig 2005-07-17 09:26:44 +0200
++++ auth1.c 2005-09-01 20:05:23 +0200
@@ -26,6 +26,9 @@
#include "uidswap.h"
#include "monitor_wrap.h"
@@ -11,7 +11,7 @@
/* import */
extern ServerOptions options;
-@@ -309,6 +312,10 @@
+@@ -371,6 +374,10 @@
{
u_int ulen;
char *user, *style = NULL;
@@ -22,7 +22,7 @@
/* Get the name of the user that we wish to log in as. */
packet_read_expect(SSH_CMSG_USER);
-@@ -320,6 +327,25 @@
+@@ -382,6 +389,25 @@
if ((style = strchr(user, ':')) != NULL)
*style++ = '\0';
@@ -49,8 +49,8 @@
authctxt->style = style;
Index: auth2.c
---- auth2.c.orig 2005-02-08 11:52:48 +0100
-+++ auth2.c 2005-05-29 10:03:31 +0200
+--- auth2.c.orig 2005-07-17 09:26:44 +0200
++++ auth2.c 2005-09-01 20:05:23 +0200
@@ -36,6 +36,9 @@
#include "pathnames.h"
#include "monitor_wrap.h"
@@ -99,8 +99,8 @@
/* setup auth context */
authctxt->pw = PRIVSEP(getpwnamallow(user));
Index: servconf.c
---- servconf.c.orig 2005-03-14 13:08:12 +0100
-+++ servconf.c 2005-05-29 10:03:31 +0200
+--- servconf.c.orig 2005-08-12 14:11:37 +0200
++++ servconf.c 2005-09-01 20:05:23 +0200
@@ -101,6 +101,9 @@
options->authorized_keys_file = NULL;
options->authorized_keys_file2 = NULL;
@@ -131,7 +131,7 @@
{ NULL, sBadOption }
};
-@@ -943,6 +952,26 @@
+@@ -969,6 +978,26 @@
arg = strdelim(&cp);
break;
@@ -160,7 +160,7 @@
filename, linenum, arg);
Index: servconf.h
--- servconf.h.orig 2005-01-20 00:57:56 +0100
-+++ servconf.h 2005-05-29 10:03:31 +0200
++++ servconf.h 2005-09-01 20:05:23 +0200
@@ -134,6 +134,14 @@
char *authorized_keys_file; /* File containing public keys */
char *authorized_keys_file2;
@@ -177,8 +177,8 @@
void initialize_server_options(ServerOptions *);
Index: sshd_config.5
---- sshd_config.5.orig 2005-03-31 13:33:51 +0200
-+++ sshd_config.5 2005-05-29 10:03:31 +0200
+--- sshd_config.5.orig 2005-07-26 13:54:57 +0200
++++ sshd_config.5 2005-09-01 20:05:23 +0200
@@ -94,6 +94,15 @@
(use IPv6 only).
The default is
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.chroot
============================================================================
$ cvs diff -u -r1.4 -r1.5 openssh.patch.chroot
--- openpkg-src/openssh/openssh.patch.chroot 29 May 2005 08:10:06 -0000
1.4
+++ openpkg-src/openssh/openssh.patch.chroot 1 Sep 2005 18:21:39 -0000
1.5
@@ -1,6 +1,6 @@
Index: scp.c
---- scp.c.orig 2005-04-03 02:16:40 +0200
-+++ scp.c 2005-05-29 10:04:09 +0200
+--- scp.c.orig 2005-08-02 09:07:08 +0200
++++ scp.c 2005-09-01 20:05:53 +0200
@@ -102,6 +102,11 @@
/* This is the program to execute for the secured connection. ("ssh" or -S)
*/
char *ssh_program = _PATH_SSH_PROGRAM;
@@ -13,7 +13,7 @@
/* This is used to store the pid of ssh_program */
pid_t do_cmd_pid = -1;
-@@ -229,7 +234,11 @@
+@@ -231,7 +236,11 @@
addargs(&args, "-oClearAllForwardings yes");
fflag = tflag = 0;
@@ -25,7 +25,7 @@
switch (ch) {
/* User-visible flags. */
case '1':
-@@ -290,6 +299,11 @@
+@@ -292,6 +301,11 @@
setmode(0, O_BINARY);
#endif
break;
@@ -37,7 +37,7 @@
default:
usage();
}
-@@ -305,6 +319,19 @@
+@@ -307,6 +321,19 @@
remin = STDIN_FILENO;
remout = STDOUT_FILENO;
@@ -58,9 +58,9 @@
/* Follow "protocol", send data. */
(void) response();
Index: session.c
---- session.c.orig 2005-04-21 11:50:55 +0200
-+++ session.c 2005-05-29 10:04:09 +0200
-@@ -1308,6 +1308,26 @@
+--- session.c.orig 2005-08-31 18:59:49 +0200
++++ session.c 2005-09-01 20:05:53 +0200
+@@ -1310,6 +1310,26 @@
exit(1);
}
endgrent();
@@ -88,8 +88,8 @@
if (options.gss_authentication) {
temporarily_use_uid(pw);
Index: sftp-server.c
---- sftp-server.c.orig 2004-07-17 06:07:42 +0200
-+++ sftp-server.c 2005-05-29 10:04:09 +0200
+--- sftp-server.c.orig 2005-06-17 04:59:35 +0200
++++ sftp-server.c 2005-09-01 20:05:53 +0200
@@ -1045,6 +1045,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.7 -r1.8 openssh.patch.scpbindir
--- openpkg-src/openssh/openssh.patch.scpbindir 29 May 2005 08:10:06
-0000 1.7
+++ openpkg-src/openssh/openssh.patch.scpbindir 1 Sep 2005 18:21:39
-0000 1.8
@@ -7,9 +7,9 @@
the server side).
Index: session.c
---- session.c.orig 2005-04-21 11:50:55 +0200
-+++ session.c 2005-05-29 10:04:45 +0200
-@@ -66,6 +66,10 @@
+--- session.c.orig 2005-08-31 18:59:49 +0200
++++ session.c 2005-09-01 20:06:43 +0200
+@@ -67,6 +67,10 @@
#include "ssh-gss.h"
#endif
@@ -20,7 +20,7 @@
/* func */
Session *session_new(void);
-@@ -659,6 +663,21 @@
+@@ -660,6 +664,21 @@
void
do_exec(Session *s, const char *command)
{
@@ -42,7 +42,7 @@
if (forced_command) {
original_command = command;
command = forced_command;
-@@ -683,6 +702,8 @@
+@@ -684,6 +703,8 @@
do_exec_no_pty(s, command);
original_command = NULL;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.sftplogging
============================================================================
$ cvs diff -u -r1.4 -r1.5 openssh.patch.sftplogging
--- openpkg-src/openssh/openssh.patch.sftplogging 29 May 2005 08:10:06
-0000 1.4
+++ openpkg-src/openssh/openssh.patch.sftplogging 1 Sep 2005 18:21:39
-0000 1.5
@@ -1,6 +1,6 @@
Index: servconf.c
---- servconf.c.orig 2005-03-14 13:08:12 +0100
-+++ servconf.c 2005-05-29 10:05:23 +0200
+--- servconf.c.orig 2005-08-12 14:11:37 +0200
++++ servconf.c 2005-09-01 20:09:58 +0200
@@ -102,6 +102,15 @@
options->authorized_keys_file2 = NULL;
options->num_accept_env = 0;
@@ -65,16 +65,16 @@
#ifdef USE_PAM
{ "usepam", sUsePAM },
#else
-@@ -441,6 +477,8 @@
- int *intptr, value, i, n;
+@@ -442,6 +478,8 @@
ServerOpCodes opcode;
u_short port;
+ u_int i;
+ unsigned int umaskvalue = 0;
+ char *umaskptr;
cp = line;
arg = strdelim(&cp);
-@@ -902,6 +940,58 @@
+@@ -928,6 +966,58 @@
case sBanner:
charptr = &options->banner;
goto parse_filename;
@@ -135,7 +135,7 @@
* connect time, so that you can specify paths like:
Index: servconf.h
--- servconf.h.orig 2005-01-20 00:57:56 +0100
-+++ servconf.h 2005-05-29 10:05:23 +0200
++++ servconf.h 2005-09-01 20:09:17 +0200
@@ -35,6 +35,19 @@
#define PERMIT_NO_PASSWD 2
#define PERMIT_YES 3
@@ -171,9 +171,9 @@
void initialize_server_options(ServerOptions *);
Index: session.c
---- session.c.orig 2005-04-21 11:50:55 +0200
-+++ session.c 2005-05-29 10:05:23 +0200
-@@ -112,6 +112,15 @@
+--- session.c.orig 2005-08-31 18:59:49 +0200
++++ session.c 2005-09-01 20:09:17 +0200
+@@ -113,6 +113,15 @@
static int is_child = 0;
@@ -189,7 +189,7 @@
/* Name and directory of socket for authentication agent forwarding. */
static char *auth_sock_name = NULL;
static char *auth_sock_dir = NULL;
-@@ -982,6 +991,7 @@
+@@ -984,6 +993,7 @@
env = xmalloc(envsize * sizeof(char *));
env[0] = NULL;
@@ -197,7 +197,7 @@
#ifdef HAVE_CYGWIN
/*
* The Windows environment contains some setting which are
-@@ -1142,6 +1152,67 @@
+@@ -1144,6 +1154,67 @@
child_set_env(&env, &envsize, SSH_AUTHSOCKET_ENV_NAME,
auth_sock_name);
@@ -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 2005-05-29 10:05:23 +0200
++++ sftp-server.8 2005-09-01 20:09:17 +0200
@@ -41,6 +41,20 @@
.Cm Subsystem
option.
@@ -290,8 +290,8 @@
for more information.
.Sh SEE ALSO
Index: sftp-server.c
---- sftp-server.c.orig 2004-07-17 06:07:42 +0200
-+++ sftp-server.c 2005-05-29 10:05:23 +0200
+--- sftp-server.c.orig 2005-06-17 04:59:35 +0200
++++ sftp-server.c 2005-09-01 20:09:17 +0200
@@ -31,6 +31,13 @@
#define get_string(lenp) buffer_get_string(&iqueue, lenp);
#define TRACE debug
@@ -348,7 +348,7 @@
send_status(id, status);
}
@@ -483,10 +503,13 @@
- } else if (ret == len) {
+ } else if ((size_t)ret == len) {
status = SSH2_FX_OK;
} else {
+ if ( permit_logging == 1 )
@@ -634,9 +634,9 @@
} else if (len < 0) {
error("read error");
Index: sshd_config.5
---- sshd_config.5.orig 2005-03-31 13:33:51 +0200
-+++ sshd_config.5 2005-05-29 10:05:23 +0200
-@@ -421,6 +421,10 @@
+--- sshd_config.5.orig 2005-07-26 13:54:57 +0200
++++ sshd_config.5 2005-09-01 20:09:17 +0200
+@@ -426,6 +426,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.
@@ -647,7 +647,7 @@
.It Cm MACs
Specifies the available MAC (message authentication code) algorithms.
The MAC algorithm is used in protocol version 2
-@@ -580,6 +584,37 @@
+@@ -585,6 +589,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.
@@ -686,8 +686,8 @@
Specifies whether
.Nm sshd
Index: sshd_config
---- sshd_config.orig 2005-01-20 00:57:56 +0100
-+++ sshd_config 2005-05-29 10:05:23 +0200
+--- sshd_config.orig 2005-07-26 13:54:57 +0200
++++ sshd_config 2005-09-01 20:09:17 +0200
@@ -102,3 +102,14 @@
# override default of no subsystems
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.152 -r1.153 openssh.spec
--- openpkg-src/openssh/openssh.spec 12 Aug 2005 11:56:11 -0000 1.152
+++ openpkg-src/openssh/openssh.spec 1 Sep 2005 18:21:40 -0000 1.153
@@ -25,7 +25,7 @@
# FIXME: rse: with_ldap currently broken due to upgrades
# package versions
-%define V_base 4.1
+%define V_base 4.2
%define V_portable p1
%define V_watchdog 4.0p1
%define V_ldap_base 3.7.1p2
@@ -44,7 +44,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20050812
+Release: 20050901
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
