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-Feb-2006 19:49:18
Branch: HEAD Handle: 2006020118491800
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.2p1 -> 4.3p1
Summary:
Revision Changes Path
1.15 +6 -6 openpkg-src/openssh/openssh.patch
1.6 +19 -19 openpkg-src/openssh/openssh.patch.alias
1.6 +11 -11 openpkg-src/openssh/openssh.patch.chroot
1.9 +4 -12 openpkg-src/openssh/openssh.patch.scpbindir
1.6 +58 -58 openpkg-src/openssh/openssh.patch.sftplogging
1.156 +4 -2 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 openssh.patch
--- openpkg-src/openssh/openssh.patch 1 Sep 2005 18:21:39 -0000 1.14
+++ openpkg-src/openssh/openssh.patch 1 Feb 2006 18:49:18 -0000 1.15
@@ -1,6 +1,6 @@
Index: Makefile.in
---- Makefile.in.orig 2005-05-29 09:22:29 +0200
-+++ Makefile.in 2005-09-01 20:04:23 +0200
+--- Makefile.in.orig 2006-01-01 09:47:05 +0100
++++ Makefile.in 2006-02-01 19:39:50 +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 2005-09-01 20:04:23 +0200
++++ auth-pam.h 2006-02-01 19:39:50 +0100
@@ -28,7 +28,7 @@
#ifdef USE_PAM
@@ -23,10 +23,10 @@
void start_pam(Authctxt *);
Index: version.h
---- version.h.orig 2005-08-31 11:47:07 +0200
-+++ version.h 2005-09-01 20:04:23 +0200
+--- version.h.orig 2006-02-01 12:27:31 +0100
++++ version.h 2006-02-01 19:39:50 +0100
@@ -3,4 +3,4 @@
- #define SSH_VERSION "OpenSSH_4.2"
+ #define SSH_VERSION "OpenSSH_4.3"
#define SSH_PORTABLE "p1"
-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.alias
============================================================================
$ cvs diff -u -r1.5 -r1.6 openssh.patch.alias
--- openpkg-src/openssh/openssh.patch.alias 1 Sep 2005 18:21:39 -0000
1.5
+++ openpkg-src/openssh/openssh.patch.alias 1 Feb 2006 18:49:18 -0000
1.6
@@ -1,6 +1,6 @@
Index: auth1.c
--- auth1.c.orig 2005-07-17 09:26:44 +0200
-+++ auth1.c 2005-09-01 20:05:23 +0200
++++ auth1.c 2006-02-01 19:40:30 +0100
@@ -26,6 +26,9 @@
#include "uidswap.h"
#include "monitor_wrap.h"
@@ -49,8 +49,8 @@
authctxt->style = style;
Index: auth2.c
---- auth2.c.orig 2005-07-17 09:26:44 +0200
-+++ auth2.c 2005-09-01 20:05:23 +0200
+--- auth2.c.orig 2005-09-24 04:43:51 +0200
++++ auth2.c 2006-02-01 19:40:30 +0100
@@ -36,6 +36,9 @@
#include "pathnames.h"
#include "monitor_wrap.h"
@@ -99,21 +99,21 @@
/* setup auth context */
authctxt->pw = PRIVSEP(getpwnamallow(user));
Index: servconf.c
---- 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;
+--- servconf.c.orig 2005-12-13 09:33:20 +0100
++++ servconf.c 2006-02-01 19:41:07 +0100
+@@ -102,6 +102,9 @@
options->authorized_keys_file2 = NULL;
options->num_accept_env = 0;
+ options->permit_tun = -1;
+#ifdef USE_ALIAS
+ options->num_alias = 0;
+#endif
/* Needs to be accessable in many places */
use_privsep = -1;
-@@ -272,6 +275,9 @@
+@@ -275,6 +278,9 @@
sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
- sGssAuthentication, sGssCleanupCreds, sAcceptEnv,
+ sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
sUsePrivilegeSeparation,
+#ifdef USE_ALIAS
+ sAlias,
@@ -121,17 +121,17 @@
sDeprecated, sUnsupported
} ServerOpCodes;
-@@ -373,6 +379,9 @@
- { "authorizedkeysfile2", sAuthorizedKeysFile2 },
+@@ -377,6 +383,9 @@
{ "useprivilegeseparation", sUsePrivilegeSeparation},
{ "acceptenv", sAcceptEnv },
+ { "permittunnel", sPermitTunnel },
+#ifdef USE_ALIAS
+ { "alias", sAlias },
+#endif
{ NULL, sBadOption }
};
-@@ -969,6 +978,26 @@
+@@ -995,6 +1004,26 @@
arg = strdelim(&cp);
break;
@@ -159,12 +159,12 @@
logit("%s line %d: Unsupported option %s",
filename, linenum, arg);
Index: servconf.h
---- servconf.h.orig 2005-01-20 00:57:56 +0100
-+++ 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;
+--- servconf.h.orig 2005-12-13 09:29:03 +0100
++++ servconf.h 2006-02-01 19:41:39 +0100
+@@ -137,6 +137,14 @@
int use_pam; /* Enable auth via PAM */
+
+ int permit_tun;
+#ifdef USE_ALIAS
+#define MAX_ALIAS 256
+ u_int num_alias;
@@ -177,8 +177,8 @@
void initialize_server_options(ServerOptions *);
Index: sshd_config.5
---- sshd_config.5.orig 2005-07-26 13:54:57 +0200
-+++ sshd_config.5 2005-09-01 20:05:23 +0200
+--- sshd_config.5.orig 2006-01-03 08:47:31 +0100
++++ sshd_config.5 2006-02-01 19:40: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.5 -r1.6 openssh.patch.chroot
--- openpkg-src/openssh/openssh.patch.chroot 1 Sep 2005 18:21:39 -0000
1.5
+++ openpkg-src/openssh/openssh.patch.chroot 1 Feb 2006 18:49:18 -0000
1.6
@@ -1,6 +1,6 @@
Index: scp.c
---- scp.c.orig 2005-08-02 09:07:08 +0200
-+++ scp.c 2005-09-01 20:05:53 +0200
+--- scp.c.orig 2006-01-31 12:11:38 +0100
++++ scp.c 2006-02-01 19:42:17 +0100
@@ -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;
-@@ -231,7 +236,11 @@
+@@ -278,7 +283,11 @@
addargs(&args, "-oClearAllForwardings yes");
fflag = tflag = 0;
@@ -25,7 +25,7 @@
switch (ch) {
/* User-visible flags. */
case '1':
-@@ -292,6 +301,11 @@
+@@ -339,6 +348,11 @@
setmode(0, O_BINARY);
#endif
break;
@@ -37,7 +37,7 @@
default:
usage();
}
-@@ -307,6 +321,19 @@
+@@ -354,6 +368,19 @@
remin = STDIN_FILENO;
remout = STDOUT_FILENO;
@@ -58,9 +58,9 @@
/* Follow "protocol", send data. */
(void) response();
Index: session.c
---- session.c.orig 2005-08-31 18:59:49 +0200
-+++ session.c 2005-09-01 20:05:53 +0200
-@@ -1310,6 +1310,26 @@
+--- session.c.orig 2005-12-24 04:59:12 +0100
++++ session.c 2006-02-01 19:42:17 +0100
+@@ -1301,6 +1301,26 @@
exit(1);
}
endgrent();
@@ -88,9 +88,9 @@
if (options.gss_authentication) {
temporarily_use_uid(pw);
Index: sftp-server.c
---- 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 @@
+--- sftp-server.c.orig 2006-01-02 13:40:51 +0100
++++ sftp-server.c 2006-02-01 19:42:17 +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.8 -r1.9 openssh.patch.scpbindir
--- openpkg-src/openssh/openssh.patch.scpbindir 1 Sep 2005 18:21:39
-0000 1.8
+++ openpkg-src/openssh/openssh.patch.scpbindir 1 Feb 2006 18:49:18
-0000 1.9
@@ -1,14 +1,6 @@
-This patch provides a workaround for the nasty issue that scp(1) is
-found on the server side only if it is in $PATH (due to a ~/.bashrc,
-/etc/profile, etc). The default $PATH is out of scope for OpenPKG and is
-different across platforms anyway. Nevertheless we want to ensure that
-with OpenPKG on the server side, scp(1) is always usable (on the client
-side) without having to adjust the system and/or user environment (on
-the server side).
-
Index: session.c
---- session.c.orig 2005-08-31 18:59:49 +0200
-+++ session.c 2005-09-01 20:06:43 +0200
+--- session.c.orig 2005-12-24 04:59:12 +0100
++++ session.c 2006-02-01 19:43:26 +0100
@@ -67,6 +67,10 @@
#include "ssh-gss.h"
#endif
@@ -20,7 +12,7 @@
/* func */
Session *session_new(void);
-@@ -660,6 +664,21 @@
+@@ -651,6 +655,21 @@
void
do_exec(Session *s, const char *command)
{
@@ -42,7 +34,7 @@
if (forced_command) {
original_command = command;
command = forced_command;
-@@ -684,6 +703,8 @@
+@@ -675,6 +694,8 @@
do_exec_no_pty(s, command);
original_command = NULL;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.sftplogging
============================================================================
$ cvs diff -u -r1.5 -r1.6 openssh.patch.sftplogging
--- openpkg-src/openssh/openssh.patch.sftplogging 1 Sep 2005 18:21:39
-0000 1.5
+++ openpkg-src/openssh/openssh.patch.sftplogging 1 Feb 2006 18:49:18
-0000 1.6
@@ -1,9 +1,9 @@
Index: servconf.c
---- 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;
+--- servconf.c.orig 2005-12-13 09:33:20 +0100
++++ servconf.c 2006-02-01 19:44:14 +0100
+@@ -103,6 +103,15 @@
options->num_accept_env = 0;
+ options->permit_tun = -1;
+ options->log_sftp = LOG_SFTP_NOT_SET;
+ options->sftp_log_facility = SYSLOG_FACILITY_NOT_SET;
@@ -17,9 +17,9 @@
/* Needs to be accessable in many places */
use_privsep = -1;
}
-@@ -230,6 +239,24 @@
- if (options->authorized_keys_file == NULL)
- options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;
+@@ -233,6 +242,24 @@
+ if (options->permit_tun == -1)
+ options->permit_tun = SSH_TUNMODE_NO;
+ /* Turn sftp-server logging off by default */
+ if (options->log_sftp == LOG_SFTP_NOT_SET)
@@ -42,9 +42,9 @@
/* Turn privilege separation on by default */
if (use_privsep == -1)
use_privsep = 1;
-@@ -272,6 +299,9 @@
+@@ -275,6 +302,9 @@
sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
- sGssAuthentication, sGssCleanupCreds, sAcceptEnv,
+ sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
sUsePrivilegeSeparation,
+ sLogSftp, sSftpLogFacility, sSftpLogLevel,
+ sSftpUmask,
@@ -52,7 +52,7 @@
sDeprecated, sUnsupported
} ServerOpCodes;
-@@ -281,6 +311,12 @@
+@@ -284,6 +314,12 @@
ServerOpCodes opcode;
} keywords[] = {
/* Portable-specific options */
@@ -65,7 +65,7 @@
#ifdef USE_PAM
{ "usepam", sUsePAM },
#else
-@@ -442,6 +478,8 @@
+@@ -446,6 +482,8 @@
ServerOpCodes opcode;
u_short port;
u_int i;
@@ -74,7 +74,7 @@
cp = line;
arg = strdelim(&cp);
-@@ -928,6 +966,58 @@
+@@ -932,6 +970,58 @@
case sBanner:
charptr = &options->banner;
goto parse_filename;
@@ -134,8 +134,8 @@
* These options can contain %X options expanded at
* 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-09-01 20:09:17 +0200
+--- servconf.h.orig 2005-12-13 09:29:03 +0100
++++ servconf.h 2006-02-01 19:45:29 +0100
@@ -35,6 +35,19 @@
#define PERMIT_NO_PASSWD 2
#define PERMIT_YES 3
@@ -156,13 +156,13 @@
#define DEFAULT_AUTH_FAIL_MAX 6 /* Default for MaxAuthTries */
typedef struct {
-@@ -134,6 +147,13 @@
- char *authorized_keys_file; /* File containing public keys */
- char *authorized_keys_file2;
+@@ -137,6 +150,13 @@
int use_pam; /* Enable auth via PAM */
+
+ int permit_tun;
+ int log_sftp; /* perform sftp-server logging */
-+ SyslogFacility sftp_log_facility; /* Facility for sftp subsystem
logging. */
-+ LogLevel sftp_log_level; /* Level for sftp subsystem logging. */
++ SyslogFacility sftp_log_facility; /* Facility for sftp subsystem
logging. */
++ LogLevel sftp_log_level; /* Level for sftp subsystem logging. */
+ char sftp_umask[SFTP_UMASK_LENGTH]; /* Sftp Umask */
+ int sftp_permit_chmod;
+ int sftp_permit_chown;
@@ -171,8 +171,8 @@
void initialize_server_options(ServerOptions *);
Index: session.c
---- session.c.orig 2005-08-31 18:59:49 +0200
-+++ session.c 2005-09-01 20:09:17 +0200
+--- session.c.orig 2005-12-24 04:59:12 +0100
++++ session.c 2006-02-01 19:44:14 +0100
@@ -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;
-@@ -984,6 +993,7 @@
+@@ -975,6 +984,7 @@
env = xmalloc(envsize * sizeof(char *));
env[0] = NULL;
@@ -197,7 +197,7 @@
#ifdef HAVE_CYGWIN
/*
* The Windows environment contains some setting which are
-@@ -1144,6 +1154,67 @@
+@@ -1135,6 +1145,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-09-01 20:09:17 +0200
++++ sftp-server.8 2006-02-01 19:44:14 +0100
@@ -41,6 +41,20 @@
.Cm Subsystem
option.
@@ -290,9 +290,9 @@
for more information.
.Sh SEE ALSO
Index: sftp-server.c
---- 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 @@
+--- sftp-server.c.orig 2006-01-02 13:40:51 +0100
++++ sftp-server.c 2006-02-01 19:44:14 +0100
+@@ -32,6 +32,13 @@
#define get_string(lenp) buffer_get_string(&iqueue, lenp);
#define TRACE debug
@@ -306,7 +306,7 @@
extern char *__progname;
/* input and output queue */
-@@ -381,6 +388,14 @@
+@@ -382,6 +389,14 @@
a = get_attrib();
flags = flags_from_portable(pflags);
mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ? a->perm : 0666;
@@ -321,7 +321,7 @@
TRACE("open id %u name %s flags %d mode 0%o", id, name, pflags, mode);
fd = open(name, flags, mode);
if (fd < 0) {
-@@ -394,6 +409,8 @@
+@@ -395,6 +410,8 @@
status = SSH2_FX_OK;
}
}
@@ -330,15 +330,15 @@
if (status != SSH2_FX_OK)
send_status(id, status);
xfree(name);
-@@ -430,6 +447,7 @@
- (u_int64_t)off, len);
+@@ -431,6 +448,7 @@
+ (unsigned long long)off, len);
if (len > sizeof buf) {
len = sizeof buf;
+ if ( permit_logging == 1 )
logit("read change len %d", len);
}
fd = handle_to_fd(handle);
-@@ -449,6 +467,8 @@
+@@ -450,6 +468,8 @@
}
}
}
@@ -347,7 +347,7 @@
if (status != SSH2_FX_OK)
send_status(id, status);
}
-@@ -483,10 +503,13 @@
+@@ -484,10 +504,13 @@
} else if ((size_t)ret == len) {
status = SSH2_FX_OK;
} else {
@@ -361,7 +361,7 @@
send_status(id, status);
xfree(data);
}
-@@ -579,24 +602,46 @@
+@@ -580,24 +603,46 @@
a = get_attrib();
TRACE("setstat id %u name %s", id, name);
if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
@@ -408,7 +408,7 @@
}
send_status(id, status);
xfree(name);
-@@ -611,6 +656,9 @@
+@@ -612,6 +657,9 @@
int status = SSH2_FX_OK;
char *name;
@@ -418,7 +418,7 @@
id = get_int();
handle = get_handle();
a = get_attrib();
-@@ -621,11 +669,14 @@
+@@ -622,11 +670,14 @@
status = SSH2_FX_FAILURE;
} else {
if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
@@ -433,7 +433,7 @@
#ifdef HAVE_FCHMOD
ret = fchmod(fd, a->perm & 0777);
#else
-@@ -633,8 +684,18 @@
+@@ -634,8 +685,18 @@
#endif
if (ret == -1)
status = errno_to_portable(errno);
@@ -452,7 +452,7 @@
#ifdef HAVE_FUTIMES
ret = futimes(fd, attrib_to_tv(a));
#else
-@@ -644,6 +705,7 @@
+@@ -645,6 +706,7 @@
status = errno_to_portable(errno);
}
if (a->flags & SSH2_FILEXFER_ATTR_UIDGID) {
@@ -460,7 +460,7 @@
#ifdef HAVE_FCHOWN
ret = fchown(fd, a->uid, a->gid);
#else
-@@ -651,6 +713,14 @@
+@@ -652,6 +714,14 @@
#endif
if (ret == -1)
status = errno_to_portable(errno);
@@ -475,7 +475,7 @@
}
}
send_status(id, status);
-@@ -680,6 +750,8 @@
+@@ -681,6 +751,8 @@
}
}
@@ -484,7 +484,7 @@
if (status != SSH2_FX_OK)
send_status(id, status);
xfree(path);
-@@ -753,6 +825,8 @@
+@@ -754,6 +826,8 @@
TRACE("remove id %u name %s", id, name);
ret = unlink(name);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
@@ -493,7 +493,7 @@
send_status(id, status);
xfree(name);
}
-@@ -770,9 +844,19 @@
+@@ -771,9 +845,19 @@
a = get_attrib();
mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ?
a->perm & 0777 : 0777;
@@ -513,7 +513,7 @@
send_status(id, status);
xfree(name);
}
-@@ -789,6 +873,8 @@
+@@ -790,6 +874,8 @@
TRACE("rmdir id %u name %s", id, name);
ret = rmdir(name);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
@@ -522,7 +522,7 @@
send_status(id, status);
xfree(name);
}
-@@ -815,6 +901,8 @@
+@@ -816,6 +902,8 @@
s.name = s.long_name = resolvedname;
send_names(id, 1, &s);
}
@@ -531,7 +531,7 @@
xfree(path);
}
-@@ -870,6 +958,8 @@
+@@ -871,6 +959,8 @@
status = SSH2_FX_OK;
}
send_status(id, status);
@@ -540,7 +540,7 @@
xfree(oldpath);
xfree(newpath);
}
-@@ -895,6 +985,8 @@
+@@ -896,6 +986,8 @@
s.name = s.long_name = buf;
send_names(id, 1, &s);
}
@@ -549,7 +549,7 @@
xfree(path);
}
-@@ -913,6 +1005,8 @@
+@@ -914,6 +1006,8 @@
ret = symlink(oldpath, newpath);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
send_status(id, status);
@@ -558,7 +558,7 @@
xfree(oldpath);
xfree(newpath);
}
-@@ -1034,6 +1128,8 @@
+@@ -1035,6 +1129,8 @@
{
fd_set *rset, *wset;
int in, out, max;
@@ -566,8 +566,8 @@
+ char *umask_env;
ssize_t len, olen, set_size;
- /* XXX should use getopt */
-@@ -1041,6 +1137,16 @@
+ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
+@@ -1045,6 +1141,16 @@
__progname = ssh_get_progname(av[0]);
handle_init();
@@ -584,7 +584,7 @@
#ifdef DEBUG_SFTP_SERVER
log_init("sftp-server", SYSLOG_LEVEL_DEBUG1, SYSLOG_FACILITY_AUTH, 0);
#endif
-@@ -1048,6 +1154,39 @@
+@@ -1052,6 +1158,39 @@
in = dup(STDIN_FILENO);
out = dup(STDOUT_FILENO);
@@ -624,7 +624,7 @@
#ifdef HAVE_CYGWIN
setmode(in, O_BINARY);
setmode(out, O_BINARY);
-@@ -1087,6 +1226,8 @@
+@@ -1091,6 +1230,8 @@
len = read(in, buf, sizeof buf);
if (len == 0) {
debug("read eof");
@@ -634,8 +634,8 @@
} else if (len < 0) {
error("read error");
Index: sshd_config.5
---- sshd_config.5.orig 2005-07-26 13:54:57 +0200
-+++ sshd_config.5 2005-09-01 20:09:17 +0200
+--- sshd_config.5.orig 2006-01-03 08:47:31 +0100
++++ sshd_config.5 2006-02-01 19:44:14 +0100
@@ -426,6 +426,10 @@
DEBUG and DEBUG1 are equivalent.
DEBUG2 and DEBUG3 each specify higher levels of debugging output.
@@ -647,7 +647,7 @@
.It Cm MACs
Specifies the available MAC (message authentication code) algorithms.
The MAC algorithm is used in protocol version 2
-@@ -585,6 +589,37 @@
+@@ -597,6 +601,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,9 +686,9 @@
Specifies whether
.Nm sshd
Index: sshd_config
---- sshd_config.orig 2005-07-26 13:54:57 +0200
-+++ sshd_config 2005-09-01 20:09:17 +0200
-@@ -102,3 +102,14 @@
+--- sshd_config.orig 2005-12-13 09:29:03 +0100
++++ sshd_config 2006-02-01 19:44:14 +0100
+@@ -103,3 +103,14 @@
# override default of no subsystems
Subsystem sftp /usr/libexec/sftp-server
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.155 -r1.156 openssh.spec
--- openpkg-src/openssh/openssh.spec 1 Jan 2006 13:18:09 -0000 1.155
+++ openpkg-src/openssh/openssh.spec 1 Feb 2006 18:49:18 -0000 1.156
@@ -22,8 +22,10 @@
## SUCH DAMAGE.
##
+# FIXME: rse: with_ldap broken after upgrade to OpenSSH 4.3p1
+
# package versions
-%define V_base 4.2
+%define V_base 4.3
%define V_portable p1
%define V_watchdog 4.0p1
%define V_ldap_base 4.1p1
@@ -41,7 +43,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20051226
+Release: 20060201
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
