Closing #60905, #60849 and #60864

5 files changed, 136 insertions, 129 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 23237cdc8f72..b1c81324eead 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openssh
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.98 2004/08/19 23:19:09 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.99 2004/08/20 19:32:32 aliz Exp $
+
+  20 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> openssh-3.9_p1.ebuild,
+  files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch:
+  Enable X509 now that a updated patch is available, closing #60905.
+  Fix skey support by running autoconf, closing #60849.
+  Disable pam if static is in USE, closing #60864.
 
   19 Aug 2004; Chris PeBenito <pebenito@gentoo.org>
   +files/openssh-3.9_p1-selinux.diff, openssh-3.9_p1.ebuild:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 322bd686ccc5..55030a7cba68 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,51 +1,41 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2fc7548ab51d3e0db127dd23f4f2c5f8 openssh-3.7.1_p2-r2.ebuild 4605
+MD5 ec96fb49d91d5e77e391b92b93b76488 openssh-3.7.1_p2-r1.ebuild 4086
 MD5 e03d5b76db7eed6a83a4c849a5249363 openssh-3.8.1_p1-r1.ebuild 4204
-MD5 9f31a515c3f820b775770dfa0d7c08ac ChangeLog 14795
-MD5 685c84b3f8cc4608d391deb65fd75198 openssh-3.8_p1.ebuild 4198
+MD5 07179e41e3c7d022657732605478a8bd openssh-3.8.1_p1.ebuild 4030
+MD5 d6da5e28aa9356bd671276a9199f3f6d openssh-3.9_p1.ebuild 4121
+MD5 2fc7548ab51d3e0db127dd23f4f2c5f8 openssh-3.7.1_p2-r2.ebuild 4605
 MD5 9651f6aa81ee4d5113b1f644a3f020ee openssh-3.8.1_p1-r2.ebuild 4215
+MD5 9f31a515c3f820b775770dfa0d7c08ac ChangeLog 14795
 MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329
-MD5 07179e41e3c7d022657732605478a8bd openssh-3.8.1_p1.ebuild 4030
-MD5 ef231babf0904bcd0eef42f3c195f594 openssh-3.9_p1.ebuild 4124
-MD5 ec96fb49d91d5e77e391b92b93b76488 openssh-3.7.1_p2-r1.ebuild 4086
+MD5 685c84b3f8cc4608d391deb65fd75198 openssh-3.8_p1.ebuild 4198
+MD5 f3838696f97d8942b708798fa021c688 files/openssh-3.8_p1-kerberos.patch 745
 MD5 5e42c267d017c8bcf5a68a8b16398736 files/openssh-3.8_p1-skey.patch 326
-MD5 9e179b1c0e3a139a5a9067c6e5bd6595 files/openssh-3.7.1_p1-selinux.diff 3389
+MD5 2cb187d8f60994c5e1b5fef2bcb6e85d files/openssh-3.5_p1-gentoo-sshd-gcc3.patch 315
 MD5 5dfcc55849d6f192385a209550890cf4 files/openssh-3.9_p1-selinux.diff 3278
-MD5 e95d63b8ba5af76772f92fec4544fa3d files/openssh-3.8.1_p1-largekey.patch 2986
-MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r2 142
 MD5 e62c6cfae268e95fb406080c91713c1a files/digest-openssh-3.8_p1 138
-MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r2 141
+MD5 2cce94a742ab0721d87b1ff63c32d0f9 files/digest-openssh-3.9_p1 136
+MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.8.1_p1-chroot.patch 2884
 MD5 5e42c267d017c8bcf5a68a8b16398736 files/openssh-3.9_p1-skey.patch 326
-MD5 b31110303673214476c57e1bed28e1ce files/openssh-skeychallenge-args.diff 925
-MD5 33b0a1a9cf8349c411da7e97e3a5df64 files/openssh-3.9_p1-opensc.patch 3499
+MD5 9e179b1c0e3a139a5a9067c6e5bd6595 files/openssh-3.7.1_p1-selinux.diff 3389
 MD5 f3838696f97d8942b708798fa021c688 files/openssh-3.8.1_p1-kerberos.patch 745
+MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.8_p1-chroot.patch 2884
 MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r1 141
-MD5 319cf9de283116bf886d3aab3d036249 files/openssh-3.8_p1-resolv_functions.patch 422
-MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294
-MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.9_p1-chroot.patch 2884
-MD5 33b0a1a9cf8349c411da7e97e3a5df64 files/openssh-3.8.1_p1-opensc.patch 3499
+MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r2 141
 MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1 141
-MD5 e7a7b68069e34f966baa81fe2ce239a5 files/openssh-3.9_p1-largekey.patch 3105
-MD5 2cb187d8f60994c5e1b5fef2bcb6e85d files/openssh-3.5_p1-gentoo-sshd-gcc3.patch 315
-MD5 205d23485d062d360fa7f50cc7d28be6 files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch 23272
 MD5 9a7321e9cbe9b8851ee71a85322bab27 files/openssh-3.8.1p1-sftplogging-1.2-gentoo.patch 23240
-MD5 47853493e53ca7d4ac9942d6a76fb855 files/openssh-3.7.1_p2-kerberos.patch 1190
-MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.8.1_p1-chroot.patch 2884
-MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r1 142
+MD5 33b0a1a9cf8349c411da7e97e3a5df64 files/openssh-3.8.1_p1-opensc.patch 3499
+MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.7.1_p2-chroot.patch 2884
+MD5 b31110303673214476c57e1bed28e1ce files/openssh-skeychallenge-args.diff 925
+MD5 e95d63b8ba5af76772f92fec4544fa3d files/openssh-3.8.1_p1-largekey.patch 2986
 MD5 9b53f18685eeb54c381c9bd11b9b80cc files/openssh-3.7.1_p2-skey.patch 326
-MD5 aea1862566d745a6263e0b4f318de80e files/digest-openssh-3.9_p1 65
-MD5 f3838696f97d8942b708798fa021c688 files/openssh-3.8_p1-kerberos.patch 745
+MD5 47853493e53ca7d4ac9942d6a76fb855 files/openssh-3.7.1_p2-kerberos.patch 1190
+MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.9_p1-chroot.patch 2884
+MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294
 MD5 0a1428803057b7d25e624c6b297980d8 files/sshd.rc6 1281
-MD5 319cf9de283116bf886d3aab3d036249 files/openssh-3.8.1_p1-resolv_functions.patch 422
+MD5 319cf9de283116bf886d3aab3d036249 files/openssh-3.8_p1-resolv_functions.patch 422
 MD5 5e42c267d017c8bcf5a68a8b16398736 files/openssh-3.8.1_p1-skey.patch 326
-MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.8_p1-chroot.patch 2884
-MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.7.1_p2-chroot.patch 2884
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBJTWHGFJQsIJWJy4RAgHRAJ0XtpCwlSTwwHzAylJv1eklWtMRfwCfdLOd
-ViRcLnxFC1HDuiDpDzbN2IY=
-=gY1i
------END PGP SIGNATURE-----
+MD5 e7a7b68069e34f966baa81fe2ce239a5 files/openssh-3.9_p1-largekey.patch 3105
+MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r1 142
+MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r2 142
+MD5 33b0a1a9cf8349c411da7e97e3a5df64 files/openssh-3.9_p1-opensc.patch 3499
+MD5 a4c539e47a360dadb5cc56c89f64126b files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch 23587
+MD5 319cf9de283116bf886d3aab3d036249 files/openssh-3.8.1_p1-resolv_functions.patch 422
diff --git a/net-misc/openssh/files/digest-openssh-3.9_p1 b/net-misc/openssh/files/digest-openssh-3.9_p1
index 73509d99cfb7..d0b53cdb61cf 100644
--- a/net-misc/openssh/files/digest-openssh-3.9_p1
+++ b/net-misc/openssh/files/digest-openssh-3.9_p1
@@ -1 +1,2 @@
 MD5 8e1774d0b52aff08f817f3987442a16e openssh-3.9p1.tar.gz 854027
+MD5 eedb263c96a1d7bf208eb2ba70c2e238 openssh-3.9p1+x509h.diff.gz 98011
diff --git a/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch b/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch
index b573f3531800..4109e568b1b3 100644
--- a/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch
+++ b/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch
@@ -1,9 +1,13 @@
-diff -ru openssh-3.8.1p1/servconf.c openssh-3.8.1p1_sftp/servconf.c
---- openssh-3.8.1p1/servconf.c	2004-01-23 11:03:10.000000000 +0000
-+++ openssh-3.8.1p1_sftp/servconf.c	2004-08-18 21:28:18.564861272 +0000
-@@ -102,6 +102,15 @@
- 	options->authorized_keys_file = NULL;
+Common subdirectories: openssh-3.9p1/contrib and openssh-3.9p1_sftp/contrib
+Common subdirectories: openssh-3.9p1/openbsd-compat and openssh-3.9p1_sftp/openbsd-compat
+Common subdirectories: openssh-3.9p1/regress and openssh-3.9p1_sftp/regress
+Common subdirectories: openssh-3.9p1/scard and openssh-3.9p1_sftp/scard
+diff -u openssh-3.9p1/servconf.c openssh-3.9p1_sftp/servconf.c
+--- openssh-3.9p1/servconf.c	2004-08-13 11:30:24.000000000 +0000
++++ openssh-3.9p1_sftp/servconf.c	2004-08-19 10:18:56.795256718 +0000
+@@ -103,6 +103,15 @@
  	options->authorized_keys_file2 = NULL;
+ 	options->num_accept_env = 0;
  
 +	options->log_sftp = LOG_SFTP_NOT_SET;
 +        options->sftp_log_facility = SYSLOG_FACILITY_NOT_SET;
@@ -17,7 +21,7 @@ diff -ru openssh-3.8.1p1/servconf.c openssh-3.8.1p1_sftp/servconf.c
  	/* Needs to be accessable in many places */
  	use_privsep = -1;
  }
-@@ -109,7 +118,7 @@
+@@ -110,7 +119,7 @@
  void
  fill_default_server_options(ServerOptions *options)
  {
@@ -26,7 +30,7 @@ diff -ru openssh-3.8.1p1/servconf.c openssh-3.8.1p1_sftp/servconf.c
  	if (options->use_pam == -1)
  		options->use_pam = 0;
  
-@@ -228,6 +237,24 @@
+@@ -231,6 +240,24 @@
  	if (options->authorized_keys_file == NULL)
  		options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;
  
@@ -51,7 +55,7 @@ diff -ru openssh-3.8.1p1/servconf.c openssh-3.8.1p1_sftp/servconf.c
  	/* Turn privilege separation on by default */
  	if (use_privsep == -1)
  		use_privsep = 1;
-@@ -249,6 +276,9 @@
+@@ -252,6 +279,9 @@
  	/* Portable-specific options */
  	sUsePAM,
  	/* Standard Options */
@@ -61,7 +65,7 @@ diff -ru openssh-3.8.1p1/servconf.c openssh-3.8.1p1_sftp/servconf.c
  	sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime,
  	sPermitRootLogin, sLogFacility, sLogLevel,
  	sRhostsRSAAuthentication, sRSAAuthentication,
-@@ -334,6 +364,12 @@
+@@ -338,6 +368,12 @@
  	{ "printmotd", sPrintMotd },
  	{ "printlastlog", sPrintLastLog },
  	{ "ignorerhosts", sIgnoreRhosts },
@@ -74,7 +78,7 @@ diff -ru openssh-3.8.1p1/servconf.c openssh-3.8.1p1_sftp/servconf.c
  	{ "ignoreuserknownhosts", sIgnoreUserKnownHosts },
  	{ "x11forwarding", sX11Forwarding },
  	{ "x11displayoffset", sX11DisplayOffset },
-@@ -431,6 +467,8 @@
+@@ -437,6 +473,8 @@
  	char *cp, **charptr, *arg, *p;
  	int *intptr, value, i, n;
  	ServerOpCodes opcode;
@@ -83,7 +87,7 @@ diff -ru openssh-3.8.1p1/servconf.c openssh-3.8.1p1_sftp/servconf.c
  
  	cp = line;
  	arg = strdelim(&cp);
-@@ -871,6 +909,58 @@
+@@ -881,6 +919,58 @@
  	case sBanner:
  		charptr = &options->banner;
  		goto parse_filename;
@@ -142,7 +146,7 @@ diff -ru openssh-3.8.1p1/servconf.c openssh-3.8.1p1_sftp/servconf.c
  	/*
  	 * These options can contain %X options expanded at
  	 * connect time, so that you can specify paths like:
-@@ -913,6 +1003,7 @@
+@@ -936,6 +1026,7 @@
  	if ((arg = strdelim(&cp)) != NULL && *arg != '\0')
  		fatal("%s line %d: garbage at end of line; \"%.200s\".",
  		    filename, linenum, arg);
@@ -150,13 +154,13 @@ diff -ru openssh-3.8.1p1/servconf.c openssh-3.8.1p1_sftp/servconf.c
  	return 0;
  }
  
-Only in openssh-3.8.1p1_sftp/: servconf.c.orig
-diff -ru openssh-3.8.1p1/servconf.h openssh-3.8.1p1_sftp/servconf.h
---- openssh-3.8.1p1/servconf.h	2003-12-31 00:37:34.000000000 +0000
-+++ openssh-3.8.1p1_sftp/servconf.h	2004-08-18 21:30:53.354147322 +0000
-@@ -13,6 +13,19 @@
-  * called by a name other than "ssh" or "Secure Shell".
-  */
+Only in openssh-3.9p1_sftp/: servconf.c.orig
+diff -u openssh-3.9p1/servconf.h openssh-3.9p1_sftp/servconf.h
+--- openssh-3.9p1/servconf.h	2004-06-25 03:33:20.000000000 +0000
++++ openssh-3.9p1_sftp/servconf.h	2004-08-19 10:20:25.728487142 +0000
+@@ -20,6 +20,19 @@
+ 
+ #define MAX_PORTS		256	/* Max # ports. */
  
 +/* sftp-server logging */
 +#define LOG_SFTP_NOT_SET	-1
@@ -171,10 +175,10 @@ diff -ru openssh-3.8.1p1/servconf.h openssh-3.8.1p1_sftp/servconf.h
 +#define SFTP_PERMIT_NO		0
 +#define SFTP_PERMIT_YES		1
 +
- #ifndef SERVCONF_H
- #define SERVCONF_H
- 
-@@ -94,6 +107,12 @@
+ #define MAX_ALLOW_USERS		256	/* Max # users on allow list. */
+ #define MAX_DENY_USERS		256	/* Max # users on deny list. */
+ #define MAX_ALLOW_GROUPS	256	/* Max # groups on allow list. */
+@@ -98,6 +111,12 @@
  	int     use_login;	/* If true, login(1) is used */
  	int     compression;	/* If true, compression is allowed */
  	int	allow_tcp_forwarding;
@@ -187,10 +191,10 @@ diff -ru openssh-3.8.1p1/servconf.h openssh-3.8.1p1_sftp/servconf.h
  	u_int num_allow_users;
  	char   *allow_users[MAX_ALLOW_USERS];
  	u_int num_deny_users;
-Only in openssh-3.8.1p1_sftp/: servconf.h.orig
-diff -ru openssh-3.8.1p1/session.c openssh-3.8.1p1_sftp/session.c
---- openssh-3.8.1p1/session.c	2004-04-16 12:47:55.000000000 +0000
-+++ openssh-3.8.1p1_sftp/session.c	2004-08-18 21:06:14.440083846 +0000
+Only in openssh-3.9p1_sftp/: servconf.h.orig
+diff -u openssh-3.9p1/session.c openssh-3.9p1_sftp/session.c
+--- openssh-3.9p1/session.c	2004-08-12 12:40:25.000000000 +0000
++++ openssh-3.9p1_sftp/session.c	2004-08-19 10:18:56.796256473 +0000
 @@ -112,6 +112,15 @@
  
  static int is_child = 0;
@@ -207,7 +211,7 @@ diff -ru openssh-3.8.1p1/session.c openssh-3.8.1p1_sftp/session.c
  /* Name and directory of socket for authentication agent forwarding. */
  static char *auth_sock_name = NULL;
  static char *auth_sock_dir = NULL;
-@@ -979,6 +988,7 @@
+@@ -974,6 +983,7 @@
  	env = xmalloc(envsize * sizeof(char *));
  	env[0] = NULL;
  
@@ -215,7 +219,7 @@ diff -ru openssh-3.8.1p1/session.c openssh-3.8.1p1_sftp/session.c
  #ifdef HAVE_CYGWIN
  	/*
  	 * The Windows environment contains some setting which are
-@@ -1119,6 +1129,67 @@
+@@ -1118,6 +1128,67 @@
  		child_set_env(&env, &envsize, SSH_AUTHSOCKET_ENV_NAME,
  		    auth_sock_name);
  
@@ -283,10 +287,10 @@ diff -ru openssh-3.8.1p1/session.c openssh-3.8.1p1_sftp/session.c
  	/* read $HOME/.ssh/environment. */
  	if (options.permit_user_env && !options.use_login) {
  		snprintf(buf, sizeof buf, "%.200s/.ssh/environment",
-Only in openssh-3.8.1p1_sftp/: session.c.orig
-diff -ru openssh-3.8.1p1/sftp-server.8 openssh-3.8.1p1_sftp/sftp-server.8
---- openssh-3.8.1p1/sftp-server.8	2003-10-15 05:50:43.000000000 +0000
-+++ openssh-3.8.1p1_sftp/sftp-server.8	2004-08-18 21:06:14.441083601 +0000
+Only in openssh-3.9p1_sftp/: session.c.orig
+diff -u openssh-3.9p1/sftp-server.8 openssh-3.9p1_sftp/sftp-server.8
+--- openssh-3.9p1/sftp-server.8	2003-10-15 05:50:43.000000000 +0000
++++ openssh-3.9p1_sftp/sftp-server.8	2004-08-19 10:18:56.797256229 +0000
 @@ -42,12 +42,27 @@
  option.
  See
@@ -316,12 +320,12 @@ diff -ru openssh-3.8.1p1/sftp-server.8 openssh-3.8.1p1_sftp/sftp-server.8
  .Rs
  .%A T. Ylonen
  .%A S. Lehtinen
-diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
---- openssh-3.8.1p1/sftp-server.c	2004-02-23 22:19:15.000000000 +0000
-+++ openssh-3.8.1p1_sftp/sftp-server.c	2004-08-18 21:06:14.443083113 +0000
+diff -u openssh-3.9p1/sftp-server.c openssh-3.9p1_sftp/sftp-server.c
+--- openssh-3.9p1/sftp-server.c	2004-07-17 04:07:42.000000000 +0000
++++ openssh-3.9p1_sftp/sftp-server.c	2004-08-19 10:18:56.798255984 +0000
 @@ -31,6 +31,13 @@
- #define get_string(lenp)               buffer_get_string(&iqueue, lenp);
- #define TRACE                          debug
+ #define get_string(lenp)		buffer_get_string(&iqueue, lenp);
+ #define TRACE				debug
  
 +/* SFTP_UMASK */
 +static mode_t setumask = 0;
@@ -333,7 +337,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  extern char *__progname;
  
  /* input and output queue */
-@@ -385,6 +392,14 @@
+@@ -381,6 +388,14 @@
  	a = get_attrib();
  	flags = flags_from_portable(pflags);
  	mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ? a->perm : 0666;
@@ -348,7 +352,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	TRACE("open id %u name %s flags %d mode 0%o", id, name, pflags, mode);
  	fd = open(name, flags, mode);
  	if (fd < 0) {
-@@ -398,6 +413,8 @@
+@@ -394,6 +409,8 @@
  			status = SSH2_FX_OK;
  		}
  	}
@@ -357,7 +361,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	if (status != SSH2_FX_OK)
  		send_status(id, status);
  	xfree(name);
-@@ -434,6 +451,7 @@
+@@ -430,6 +447,7 @@
  	    (u_int64_t)off, len);
  	if (len > sizeof buf) {
  		len = sizeof buf;
@@ -365,7 +369,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  		logit("read change len %d", len);
  	}
  	fd = handle_to_fd(handle);
-@@ -453,6 +471,8 @@
+@@ -449,6 +467,8 @@
  			}
  		}
  	}
@@ -374,7 +378,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	if (status != SSH2_FX_OK)
  		send_status(id, status);
  }
-@@ -487,10 +507,13 @@
+@@ -483,10 +503,13 @@
  			} else if (ret == len) {
  				status = SSH2_FX_OK;
  			} else {
@@ -388,7 +392,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	send_status(id, status);
  	xfree(data);
  }
-@@ -583,24 +606,46 @@
+@@ -579,24 +602,46 @@
  	a = get_attrib();
  	TRACE("setstat id %u name %s", id, name);
  	if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
@@ -441,7 +445,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	}
  	send_status(id, status);
  	xfree(name);
-@@ -615,6 +660,9 @@
+@@ -611,6 +656,9 @@
  	int status = SSH2_FX_OK;
  	char *name;
  
@@ -451,7 +455,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	id = get_int();
  	handle = get_handle();
  	a = get_attrib();
-@@ -625,20 +673,33 @@
+@@ -621,20 +669,33 @@
  		status = SSH2_FX_FAILURE;
  	} else {
  		if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
@@ -489,7 +493,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  #ifdef HAVE_FUTIMES
  			ret = futimes(fd, attrib_to_tv(a));
  #else
-@@ -648,13 +709,22 @@
+@@ -644,13 +705,22 @@
  				status = errno_to_portable(errno);
  		}
  		if (a->flags & SSH2_FILEXFER_ATTR_UIDGID) {
@@ -516,7 +520,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  		}
  	}
  	send_status(id, status);
-@@ -684,6 +754,8 @@
+@@ -680,6 +750,8 @@
  		}
  
  	}
@@ -525,7 +529,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	if (status != SSH2_FX_OK)
  		send_status(id, status);
  	xfree(path);
-@@ -757,6 +829,8 @@
+@@ -753,6 +825,8 @@
  	TRACE("remove id %u name %s", id, name);
  	ret = unlink(name);
  	status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
@@ -534,7 +538,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	send_status(id, status);
  	xfree(name);
  }
-@@ -774,9 +848,19 @@
+@@ -770,9 +844,19 @@
  	a = get_attrib();
  	mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ?
  	    a->perm & 0777 : 0777;
@@ -554,7 +558,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	send_status(id, status);
  	xfree(name);
  }
-@@ -793,6 +877,8 @@
+@@ -789,6 +873,8 @@
  	TRACE("rmdir id %u name %s", id, name);
  	ret = rmdir(name);
  	status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
@@ -563,7 +567,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	send_status(id, status);
  	xfree(name);
  }
-@@ -819,6 +905,8 @@
+@@ -815,6 +901,8 @@
  		s.name = s.long_name = resolvedname;
  		send_names(id, 1, &s);
  	}
@@ -572,7 +576,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	xfree(path);
  }
  
-@@ -854,6 +942,8 @@
+@@ -870,6 +958,8 @@
  			status = SSH2_FX_OK;
  	}
  	send_status(id, status);
@@ -581,8 +585,8 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	xfree(oldpath);
  	xfree(newpath);
  }
-@@ -879,6 +969,8 @@
- 		s.name = s.long_name = link;
+@@ -895,6 +985,8 @@
+ 		s.name = s.long_name = buf;
  		send_names(id, 1, &s);
  	}
 +	if ( permit_logging == 1 )
@@ -590,7 +594,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	xfree(path);
  }
  
-@@ -897,6 +989,8 @@
+@@ -913,6 +1005,8 @@
  	ret = symlink(oldpath, newpath);
  	status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
  	send_status(id, status);
@@ -599,7 +603,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	xfree(oldpath);
  	xfree(newpath);
  }
-@@ -1018,6 +1112,8 @@
+@@ -1034,6 +1128,8 @@
  {
  	fd_set *rset, *wset;
  	int in, out, max;
@@ -608,7 +612,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	ssize_t len, olen, set_size;
  
  	/* XXX should use getopt */
-@@ -1025,10 +1121,53 @@
+@@ -1041,10 +1137,53 @@
  	__progname = ssh_get_progname(av[0]);
  	handle_init();
  
@@ -662,7 +666,7 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  	in = dup(STDIN_FILENO);
  	out = dup(STDOUT_FILENO);
  
-@@ -1071,6 +1210,8 @@
+@@ -1087,6 +1226,8 @@
  			len = read(in, buf, sizeof buf);
  			if (len == 0) {
  				debug("read eof");
@@ -671,11 +675,11 @@ diff -ru openssh-3.8.1p1/sftp-server.c openssh-3.8.1p1_sftp/sftp-server.c
  				exit(0);
  			} else if (len < 0) {
  				error("read error");
-Only in openssh-3.8.1p1_sftp/: sftp-server.c.orig
-diff -ru openssh-3.8.1p1/sshd_config openssh-3.8.1p1_sftp/sshd_config
---- openssh-3.8.1p1/sshd_config	2003-12-31 00:38:32.000000000 +0000
-+++ openssh-3.8.1p1_sftp/sshd_config	2004-08-18 21:06:14.443083113 +0000
-@@ -95,3 +95,14 @@
+Only in openssh-3.9p1_sftp/: sftp-server.c.orig
+diff -u openssh-3.9p1/sshd_config openssh-3.9p1_sftp/sshd_config
+--- openssh-3.9p1/sshd_config	2004-05-24 00:36:24.000000000 +0000
++++ openssh-3.9p1_sftp/sshd_config	2004-08-19 10:18:56.798255984 +0000
+@@ -101,3 +101,14 @@
  
  # override default of no subsystems
  Subsystem	sftp	/usr/libexec/sftp-server
@@ -690,10 +694,10 @@ diff -ru openssh-3.8.1p1/sshd_config openssh-3.8.1p1_sftp/sshd_config
 +
 +#SftpPermitChmod yes
 +#SftpPermitChown yes
-diff -ru openssh-3.8.1p1/sshd_config.5 openssh-3.8.1p1_sftp/sshd_config.5
---- openssh-3.8.1p1/sshd_config.5	2004-04-14 03:04:36.000000000 +0000
-+++ openssh-3.8.1p1_sftp/sshd_config.5	2004-08-18 21:06:14.444082869 +0000
-@@ -379,6 +379,10 @@
+diff -u openssh-3.9p1/sshd_config.5 openssh-3.9p1_sftp/sshd_config.5
+--- openssh-3.9p1/sshd_config.5	2004-06-30 12:39:34.000000000 +0000
++++ openssh-3.9p1_sftp/sshd_config.5	2004-08-19 10:18:56.799255739 +0000
+@@ -407,6 +407,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.
@@ -704,7 +708,7 @@ diff -ru openssh-3.8.1p1/sshd_config.5 openssh-3.8.1p1_sftp/sshd_config.5
  .It Cm MACs
  Specifies the available MAC (message authentication code) algorithms.
  The MAC algorithm is used in protocol version 2
-@@ -533,6 +537,37 @@
+@@ -567,6 +571,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.
@@ -742,14 +746,14 @@ diff -ru openssh-3.8.1p1/sshd_config.5 openssh-3.8.1p1_sftp/sshd_config.5
  .It Cm StrictModes
  Specifies whether
  .Nm sshd
-Only in openssh-3.8.1p1_sftp/: sshd_config.5.orig
-Only in openssh-3.8.1p1_sftp/: sshd_config.orig
-diff -ru openssh-3.8.1p1/version.h openssh-3.8.1p1_sftp/version.h
---- openssh-3.8.1p1/version.h	2004-03-21 22:39:10.000000000 +0000
-+++ openssh-3.8.1p1_sftp/version.h	2004-08-18 21:06:14.436084823 +0000
+Only in openssh-3.9p1_sftp/: sshd_config.5.orig
+Only in openssh-3.9p1_sftp/: sshd_config.orig
+diff -u openssh-3.9p1/version.h openssh-3.9p1_sftp/version.h
+--- openssh-3.9p1/version.h	2004-08-17 12:47:41.000000000 +0000
++++ openssh-3.9p1_sftp/version.h	2004-08-19 10:18:56.799255739 +0000
 @@ -1,3 +1,3 @@
- /* $OpenBSD: version.h,v 1.41 2004/03/20 10:40:59 markus Exp $ */
+ /* $OpenBSD: version.h,v 1.42 2004/08/16 08:17:01 markus Exp $ */
  
 -#define SSH_VERSION	"OpenSSH_3.9p1"
 +#define SSH_VERSION	"OpenSSH_3.9p1+sftplogging-v1.2"
-Only in openssh-3.8.1p1_sftp/: version.h.orig
+Only in openssh-3.9p1_sftp/: version.h.orig
diff --git a/net-misc/openssh/openssh-3.9_p1.ebuild b/net-misc/openssh/openssh-3.9_p1.ebuild
index 1b838604ea2e..c66e0eb593de 100644
--- a/net-misc/openssh/openssh-3.9_p1.ebuild
+++ b/net-misc/openssh/openssh-3.9_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1.ebuild,v 1.3 2004/08/19 23:19:09 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1.ebuild,v 1.4 2004/08/20 19:32:32 aliz Exp $
 
 inherit eutils flag-o-matic ccc gnuconfig
 
@@ -15,8 +15,8 @@ SELINUX_PATCH="openssh-3.9_p1-selinux.diff"
 S=${WORKDIR}/${PARCH}
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.com/"
-SRC_URI="mirror://openssh/${PARCH}.tar.gz"
-#	X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} )"
+SRC_URI="mirror://openssh/${PARCH}.tar.gz
+	X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} )"
 
 LICENSE="as-is"
 SLOT="0"
@@ -41,13 +41,6 @@ DEPEND="${RDEPEND}
 	sys-devel/autoconf"
 PROVIDE="virtual/ssh"
 
-pkg_setup() {
-	if use X509; then
-		eerror "No updated patch available for ${P}."
-		die
-	fi
-}
-
 src_unpack() {
 	unpack ${PARCH}.tar.gz ; cd ${S}
 
@@ -57,12 +50,16 @@ src_unpack() {
 	use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch
 	use skey && epatch ${FILESDIR}/${P}-skey.patch
 	use chroot && epatch ${FILESDIR}/${P}-chroot.patch
-#	use X509 && epatch ${DISTDIR}/${X509_PATCH}
+	use X509 && epatch ${DISTDIR}/${X509_PATCH}
 	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
 	use smartcard && epatch ${FILESDIR}/${P}-opensc.patch
+
+	autoconf || die
 }
 
 src_compile() {
+	local myconf
+
 	addwrite /dev/ptmx
 	gnuconfig_update
 
@@ -70,10 +67,20 @@ src_compile() {
 	use skey && use alpha && append-ldflags -mlarge-data
 	use ldap && filter-flags -funroll-loops
 	use selinux && append-flags "-DWITH_SELINUX"
-	use static && append-ldflags -static
-	export LDFLAGS
 
-	local myconf=""
+	if use static; then
+		append-ldflags -static
+		export LDFLAGS
+		if use pam; then
+			ewarn "Disabling pam support becuse of static flag."
+			myconf="${myconf} --without-pam"
+		else
+			myconf="${myconf} --without-pam"
+		fi
+	else
+		myconf="${myconf} `use_with pam`"
+	fi
+
 	use ipv6 || myconf="${myconf} --with-ipv4-default"
 
 	econf \
@@ -86,7 +93,6 @@ src_compile() {
 		--with-md5-passwords \
 		`use_with kerberos kerberos5 /usr` \
 		`use_with tcpd tcp-wrappers` \
-		`use_with pam` \
 		`use_with skey` \
 		`use_with smartcard opensc` \
 		${myconf} \