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: 05-Sep-2007 08:48:41
Branch: HEAD Handle: 2007090507483901
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.6p1 -> 4.7p1
Summary:
Revision Changes Path
1.21 +7 -41 openpkg-src/openssh/openssh.patch
1.11 +9 -9 openpkg-src/openssh/openssh.patch.alias
1.11 +11 -11 openpkg-src/openssh/openssh.patch.chroot
1.14 +2 -2 openpkg-src/openssh/openssh.patch.scpbindir
1.12 +42 -42 openpkg-src/openssh/openssh.patch.sftplogging
1.198 +4 -2 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch
============================================================================
$ cvs diff -u -r1.20 -r1.21 openssh.patch
--- openpkg-src/openssh/openssh.patch 30 Aug 2007 17:49:39 -0000 1.20
+++ openpkg-src/openssh/openssh.patch 5 Sep 2007 06:48:39 -0000 1.21
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2006-10-23 23:44:47 +0200
-+++ Makefile.in 2007-03-10 09:30:35 +0100
-@@ -234,7 +234,7 @@
+--- Makefile.in.orig 2007-06-11 06:01:42 +0200
++++ Makefile.in 2007-09-05 08:39:34 +0200
+@@ -231,7 +231,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 2007-03-10 09:30:35 +0100
++++ auth-pam.h 2007-09-05 08:39:34 +0200
@@ -28,7 +28,7 @@
#ifdef USE_PAM
@@ -23,45 +23,11 @@
void start_pam(Authctxt *);
Index: version.h
---- version.h.orig 2007-03-06 11:21:37 +0100
-+++ version.h 2007-03-10 09:30:35 +0100
+--- version.h.orig 2007-08-15 11:14:52 +0200
++++ version.h 2007-09-05 08:39:34 +0200
@@ -3,4 +3,4 @@
- #define SSH_VERSION "OpenSSH_4.6"
+ #define SSH_VERSION "OpenSSH_4.7"
#define SSH_PORTABLE "p1"
-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE " @l_openpkg_release@"
-
------------------------------------------------------------------------------
-
-Bugfix (backported from OpenBSD):
-Move C/R -> kbdint special case to after the defaults have been loaded,
-which makes "ChallengeResponse" default to yes again. This was broken by
-the "Match" changes and not fixed properly subsequently.
-
-Index: servconf.c
---- servconf.c.orig 2007-08-30 11:50:17 -0300
-+++ servconf.c 2007-08-30 11:50:38 -0300
-@@ -1387,8 +1387,4 @@
- if (bad_options > 0)
- fatal("%s: terminating, %d bad configuration options",
- filename, bad_options);
--
-- /* challenge-response is implemented via keyboard interactive */
-- if (options->challenge_response_authentication == 1)
-- options->kbd_interactive_authentication = 1;
- }
-Index: sshd.c
---- sshd.c.orig 2007-08-30 11:50:30 -0300
-+++ sshd.c 2007-08-30 11:51:42 -0300
-@@ -1421,6 +1421,10 @@
- /* Fill in default values for those options not explicitly set. */
- fill_default_server_options(&options);
-
-+ /* challenge-response is implemented via keyboard interactive */
-+ if (options.challenge_response_authentication)
-+ options.kbd_interactive_authentication = 1;
-+
- /* set default channel AF */
- channel_set_af(options.address_family);
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.alias
============================================================================
$ cvs diff -u -r1.10 -r1.11 openssh.patch.alias
--- openpkg-src/openssh/openssh.patch.alias 10 Mar 2007 08:35:34 -0000
1.10
+++ openpkg-src/openssh/openssh.patch.alias 5 Sep 2007 06:48:40 -0000
1.11
@@ -1,6 +1,6 @@
Index: auth1.c
--- auth1.c.orig 2006-09-01 07:38:36 +0200
-+++ auth1.c 2007-03-10 09:30:55 +0100
++++ auth1.c 2007-09-05 08:40:36 +0200
@@ -39,6 +39,9 @@
#endif
#include "monitor_wrap.h"
@@ -49,8 +49,8 @@
authctxt->style = style;
Index: auth2.c
---- auth2.c.orig 2007-03-01 11:31:29 +0100
-+++ auth2.c 2007-03-10 09:30:55 +0100
+--- auth2.c.orig 2007-05-20 06:58:41 +0200
++++ auth2.c 2007-09-05 08:40:36 +0200
@@ -44,6 +44,9 @@
#include "dispatch.h"
#include "pathnames.h"
@@ -99,8 +99,8 @@
/* setup auth context */
authctxt->pw = PRIVSEP(getpwnamallow(user));
Index: servconf.c
---- servconf.c.orig 2007-03-01 11:31:29 +0100
-+++ servconf.c 2007-03-10 09:30:55 +0100
+--- servconf.c.orig 2007-05-20 07:03:16 +0200
++++ servconf.c 2007-09-05 08:40:36 +0200
@@ -122,6 +122,9 @@
options->permit_tun = -1;
options->num_permitted_opens = -1;
@@ -131,7 +131,7 @@
{ NULL, sBadOption, 0 }
};
-@@ -1261,6 +1270,26 @@
+@@ -1260,6 +1269,26 @@
arg = strdelim(&cp);
break;
@@ -160,7 +160,7 @@
filename, linenum, arg);
Index: servconf.h
--- servconf.h.orig 2007-02-19 12:25:38 +0100
-+++ servconf.h 2007-03-10 09:30:55 +0100
++++ servconf.h 2007-09-05 08:40:36 +0200
@@ -141,6 +141,14 @@
int permit_tun;
@@ -177,8 +177,8 @@
void initialize_server_options(ServerOptions *);
Index: sshd_config.5
---- sshd_config.5.orig 2007-03-06 11:21:18 +0100
-+++ sshd_config.5 2007-03-10 09:30:55 +0100
+--- sshd_config.5.orig 2007-06-11 06:07:13 +0200
++++ sshd_config.5 2007-09-05 08:40:36 +0200
@@ -95,6 +95,15 @@
(use IPv6 only).
The default is
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.chroot
============================================================================
$ cvs diff -u -r1.10 -r1.11 openssh.patch.chroot
--- openpkg-src/openssh/openssh.patch.chroot 10 Mar 2007 08:35:34 -0000
1.10
+++ openpkg-src/openssh/openssh.patch.chroot 5 Sep 2007 06:48:40 -0000
1.11
@@ -1,7 +1,7 @@
Index: scp.c
---- scp.c.orig 2007-02-19 12:14:11 +0100
-+++ scp.c 2007-03-10 09:31:17 +0100
-@@ -128,6 +128,11 @@
+--- scp.c.orig 2007-08-08 06:29:58 +0200
++++ scp.c 2007-09-05 08:41:00 +0200
+@@ -131,6 +131,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;
-@@ -310,7 +315,11 @@
+@@ -313,7 +318,11 @@
addargs(&args, "-oClearAllForwardings yes");
fflag = tflag = 0;
@@ -25,7 +25,7 @@
switch (ch) {
/* User-visible flags. */
case '1':
-@@ -371,6 +380,11 @@
+@@ -374,6 +383,11 @@
setmode(0, O_BINARY);
#endif
break;
@@ -37,7 +37,7 @@
default:
usage();
}
-@@ -386,6 +400,19 @@
+@@ -389,6 +403,19 @@
remin = STDIN_FILENO;
remout = STDOUT_FILENO;
@@ -58,8 +58,8 @@
/* Follow "protocol", send data. */
(void) response();
Index: session.c
---- session.c.orig 2007-02-19 12:10:25 +0100
-+++ session.c 2007-03-10 09:31:17 +0100
+--- session.c.orig 2007-08-16 15:28:04 +0200
++++ session.c 2007-09-05 08:41:00 +0200
@@ -1337,6 +1337,26 @@
exit(1);
}
@@ -88,9 +88,9 @@
if (options.gss_authentication) {
temporarily_use_uid(pw);
Index: sftp-server.c
---- 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 @@
+--- sftp-server.c.orig 2007-05-20 07:09:05 +0200
++++ sftp-server.c 2007-09-05 08:41:00 +0200
+@@ -1273,6 +1273,38 @@
handle_init();
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.scpbindir
============================================================================
$ cvs diff -u -r1.13 -r1.14 openssh.patch.scpbindir
--- openpkg-src/openssh/openssh.patch.scpbindir 10 Mar 2007 08:35:34
-0000 1.13
+++ openpkg-src/openssh/openssh.patch.scpbindir 5 Sep 2007 06:48:40
-0000 1.14
@@ -1,6 +1,6 @@
Index: session.c
---- session.c.orig 2007-02-19 12:10:25 +0100
-+++ session.c 2007-03-10 09:31:39 +0100
+--- session.c.orig 2007-08-16 15:28:04 +0200
++++ session.c 2007-09-05 08:41:17 +0200
@@ -92,6 +92,10 @@
#include <kafs.h>
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch.sftplogging
============================================================================
$ cvs diff -u -r1.11 -r1.12 openssh.patch.sftplogging
--- openpkg-src/openssh/openssh.patch.sftplogging 10 Mar 2007 08:35:34
-0000 1.11
+++ openpkg-src/openssh/openssh.patch.sftplogging 5 Sep 2007 06:48:40
-0000 1.12
@@ -1,6 +1,6 @@
Index: servconf.c
---- servconf.c.orig 2007-03-01 11:31:29 +0100
-+++ servconf.c 2007-03-10 09:32:01 +0100
+--- servconf.c.orig 2007-05-20 07:03:16 +0200
++++ servconf.c 2007-09-05 08:41:42 +0200
@@ -122,6 +122,12 @@
options->permit_tun = -1;
options->num_permitted_opens = -1;
@@ -62,7 +62,7 @@
#ifdef USE_PAM
{ "usepam", sUsePAM, SSHCFG_GLOBAL },
#else
-@@ -626,6 +659,8 @@
+@@ -625,6 +658,8 @@
u_short port;
u_int i, flags = 0;
size_t len;
@@ -71,7 +71,7 @@
cp = line;
if ((arg = strdelim(&cp)) == NULL)
-@@ -1146,6 +1181,58 @@
+@@ -1145,6 +1180,58 @@
case sBanner:
charptr = &options->banner;
goto parse_filename;
@@ -132,7 +132,7 @@
* connect time, so that you can specify paths like:
Index: servconf.h
--- servconf.h.orig 2007-02-19 12:25:38 +0100
-+++ servconf.h 2007-03-10 09:32:01 +0100
++++ servconf.h 2007-09-05 08:41:42 +0200
@@ -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 2007-02-19 12:10:25 +0100
-+++ session.c 2007-03-10 09:32:01 +0100
+--- session.c.orig 2007-08-16 15:28:04 +0200
++++ session.c 2007-09-05 08:41:42 +0200
@@ -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:14:28 +0200
-+++ sftp-server.8 2007-03-10 09:32:01 +0100
+--- sftp-server.8.orig 2007-06-05 10:27:13 +0200
++++ sftp-server.8 2007-09-05 08:41:42 +0200
@@ -49,6 +49,20 @@
.Cm Subsystem
declaration.
@@ -287,8 +287,8 @@
for more information.
.Pp
Index: sftp-server.c
---- sftp-server.c.orig 2007-01-05 06:31:03 +0100
-+++ sftp-server.c 2007-03-10 09:32:01 +0100
+--- sftp-server.c.orig 2007-05-20 07:09:05 +0200
++++ sftp-server.c 2007-09-05 08:42:11 +0200
@@ -53,6 +53,12 @@
/* Our verbosity */
LogLevel log_level = SYSLOG_LEVEL_ERROR;
@@ -302,7 +302,7 @@
/* Our client */
struct passwd *pw = NULL;
char *client_addr = NULL;
-@@ -498,6 +504,12 @@
+@@ -499,6 +505,12 @@
a = get_attrib();
flags = flags_from_portable(pflags);
mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ? a->perm : 0666;
@@ -315,7 +315,7 @@
logit("open \"%s\" flags %s mode 0%o",
name, string_from_portable(pflags), mode);
fd = open(name, flags, mode);
-@@ -512,6 +524,8 @@
+@@ -513,6 +525,8 @@
status = SSH2_FX_OK;
}
}
@@ -324,7 +324,7 @@
if (status != SSH2_FX_OK)
send_status(id, status);
xfree(name);
-@@ -569,6 +583,8 @@
+@@ -570,6 +584,8 @@
}
}
}
@@ -333,7 +333,7 @@
if (status != SSH2_FX_OK)
send_status(id, status);
}
-@@ -608,6 +624,8 @@
+@@ -609,6 +625,8 @@
}
}
}
@@ -342,7 +342,7 @@
send_status(id, status);
xfree(data);
}
-@@ -708,10 +726,19 @@
+@@ -710,10 +728,19 @@
status = errno_to_portable(errno);
}
if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
@@ -362,7 +362,7 @@
}
if (a->flags & SSH2_FILEXFER_ATTR_ACMODTIME) {
char buf[64];
-@@ -725,11 +752,20 @@
+@@ -727,11 +754,20 @@
status = errno_to_portable(errno);
}
if (a->flags & SSH2_FILEXFER_ATTR_UIDGID) {
@@ -383,7 +383,7 @@
}
send_status(id, status);
xfree(name);
-@@ -743,6 +779,9 @@
+@@ -745,6 +781,9 @@
int handle, fd, ret;
int status = SSH2_FX_OK;
@@ -393,7 +393,7 @@
id = get_int();
handle = get_handle();
a = get_attrib();
-@@ -760,6 +799,7 @@
+@@ -763,6 +802,7 @@
status = errno_to_portable(errno);
}
if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
@@ -401,7 +401,7 @@
logit("set \"%s\" mode %04o", name, a->perm);
#ifdef HAVE_FCHMOD
ret = fchmod(fd, a->perm & 0777);
-@@ -768,6 +808,14 @@
+@@ -771,6 +811,14 @@
#endif
if (ret == -1)
status = errno_to_portable(errno);
@@ -416,7 +416,7 @@
}
if (a->flags & SSH2_FILEXFER_ATTR_ACMODTIME) {
char buf[64];
-@@ -785,6 +833,7 @@
+@@ -788,6 +836,7 @@
status = errno_to_portable(errno);
}
if (a->flags & SSH2_FILEXFER_ATTR_UIDGID) {
@@ -424,7 +424,7 @@
logit("set \"%s\" owner %lu group %lu", name,
(u_long)a->uid, (u_long)a->gid);
#ifdef HAVE_FCHOWN
-@@ -794,6 +843,14 @@
+@@ -797,6 +846,14 @@
#endif
if (ret == -1)
status = errno_to_portable(errno);
@@ -439,7 +439,7 @@
}
}
send_status(id, status);
-@@ -824,6 +881,8 @@
+@@ -827,6 +884,8 @@
}
}
@@ -448,7 +448,7 @@
if (status != SSH2_FX_OK)
send_status(id, status);
xfree(path);
-@@ -899,6 +958,8 @@
+@@ -902,6 +961,8 @@
logit("remove name \"%s\"", name);
ret = unlink(name);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
@@ -457,7 +457,7 @@
send_status(id, status);
xfree(name);
}
-@@ -916,6 +977,12 @@
+@@ -919,6 +980,12 @@
a = get_attrib();
mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ?
a->perm & 0777 : 0777;
@@ -470,7 +470,7 @@
debug3("request %u: mkdir", id);
logit("mkdir name \"%s\" mode 0%o", name, mode);
ret = mkdir(name, mode);
-@@ -937,6 +1004,8 @@
+@@ -940,6 +1007,8 @@
logit("rmdir name \"%s\"", name);
ret = rmdir(name);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
@@ -479,7 +479,7 @@
send_status(id, status);
xfree(name);
}
-@@ -964,6 +1033,8 @@
+@@ -967,6 +1036,8 @@
s.name = s.long_name = resolvedname;
send_names(id, 1, &s);
}
@@ -488,7 +488,7 @@
xfree(path);
}
-@@ -1020,6 +1091,8 @@
+@@ -1023,6 +1094,8 @@
status = SSH2_FX_OK;
}
send_status(id, status);
@@ -497,7 +497,7 @@
xfree(oldpath);
xfree(newpath);
}
-@@ -1046,6 +1119,8 @@
+@@ -1049,6 +1122,8 @@
s.name = s.long_name = buf;
send_names(id, 1, &s);
}
@@ -506,7 +506,7 @@
xfree(path);
}
-@@ -1065,6 +1140,8 @@
+@@ -1068,6 +1143,8 @@
ret = symlink(oldpath, newpath);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
send_status(id, status);
@@ -515,16 +515,16 @@
xfree(oldpath);
xfree(newpath);
}
-@@ -1212,6 +1289,8 @@
+@@ -1215,6 +1292,8 @@
ssize_t len, olen, set_size;
SyslogFacility log_facility = SYSLOG_FACILITY_AUTH;
- char *cp;
-+ unsigned int val = 0;
-+ char *umask_env;
+ char *cp, buf[4*4096];
++ unsigned int val = 0;
++ char *umask_env;
extern char *optarg;
extern char *__progname;
-@@ -1250,6 +1329,12 @@
+@@ -1253,6 +1332,12 @@
}
}
@@ -537,7 +537,7 @@
log_init(__progname, log_level, log_facility, log_stderr);
if ((cp = getenv("SSH_CONNECTION")) != NULL) {
-@@ -1273,6 +1358,39 @@
+@@ -1276,6 +1361,39 @@
in = dup(STDIN_FILENO);
out = dup(STDOUT_FILENO);
@@ -578,8 +578,8 @@
setmode(in, O_BINARY);
setmode(out, O_BINARY);
Index: sshd_config.5
---- sshd_config.5.orig 2007-03-06 11:21:18 +0100
-+++ sshd_config.5 2007-03-10 09:32:01 +0100
+--- sshd_config.5.orig 2007-06-11 06:07:13 +0200
++++ sshd_config.5 2007-09-05 08:41:42 +0200
@@ -483,6 +483,10 @@
DEBUG and DEBUG1 are equivalent.
DEBUG2 and DEBUG3 each specify higher levels of debugging output.
@@ -591,7 +591,7 @@
.It Cm MACs
Specifies the available MAC (message authentication code) algorithms.
The MAC algorithm is used in protocol version 2
-@@ -722,6 +726,37 @@
+@@ -725,6 +729,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.
@@ -630,9 +630,9 @@
Specifies whether
.Xr sshd 8
Index: sshd_config
---- sshd_config.orig 2006-07-24 06:06:47 +0200
-+++ sshd_config 2007-03-10 09:32:01 +0100
-@@ -105,6 +105,17 @@
+--- sshd_config.orig 2007-03-21 10:42:25 +0100
++++ sshd_config 2007-09-05 08:41:42 +0200
+@@ -109,6 +109,17 @@
# override default of no subsystems
Subsystem sftp /usr/libexec/sftp-server
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.197 -r1.198 openssh.spec
--- openpkg-src/openssh/openssh.spec 30 Aug 2007 17:49:39 -0000 1.197
+++ openpkg-src/openssh/openssh.spec 5 Sep 2007 06:48:40 -0000 1.198
@@ -22,8 +22,10 @@
## SUCH DAMAGE.
##
+# FIXME: with_hpn=yes still broken after upgrade
+
# package versions
-%define V_base 4.6
+%define V_base 4.7
%define V_portable p1
%define V_watchdog 4.4p1
%define V_ldap_base 4.6p1
@@ -42,7 +44,7 @@
Group: SSH
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20070830
+Release: 20070905
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
