tweak patch to no collide with x509

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 00c8f2bb1b73ea33e7fa64b70757cc2803182b35..bb08044272fbbafdac3ea149c48fa09f9ef49ded 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -3,7 +3,6 @@ Hash: SHA1
 
 MD5 ff0dccf17d2b2b58a8a52554860be9a6 metadata.xml 1430
 MD5 ed6b59b0bf0d03ceadbb10d25c29a76e openssh-3.9_p1-r3.ebuild 4901
-MD5 03577ad7902f9586ab4fa887dc92ffef openssh-3.9_p1-r2.ebuild 4864
 MD5 29184829f11911d742ce4f9548b9644f openssh-4.1_p1-r1.ebuild 5208
 MD5 63b02ee5e5276db017e8f6d4b596c475 openssh-3.8.1_p1-r1.ebuild 4415
 MD5 d5d7fdd37f92afbab73d3fd46f9f2bd0 openssh-4.0_p1-r2.ebuild 5247
@@ -32,8 +31,7 @@ MD5 1cb38b00876090a79d11989acb60522c files/openssh-3.9_p1-sftplogging-1.2-gentoo
 MD5 93d19c0ef91091a730510c46ab8e811e files/openssh-3.9_p1-selinux.diff.bz2 1307
 MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.9_p1-skey.patch.bz2 270
 MD5 c326cd447fb5f86124295ef943d3bf35 files/openssh-3.9_p1-kerberos-detection.patch 593
-MD5 7b6205d809779f26a02fa9b918d9f30a files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 5673
-MD5 0558277d49d667925774731e5e4e989a files/digest-openssh-3.9_p1-r2 277
+MD5 9cf3a0fb4e8709dde06bd4a3c61eeaff files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 5718
 MD5 f58807d5d75bc9929883e6876c7ddd46 files/openssh-3.9_p1-terminal_restore.patch.bz2 332
 MD5 857f14fd111169d8838d07fb46769938 files/openssh-3.8.1_p1-kerberos.patch.bz2 465
 MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.8_p1-chroot.patch.bz2 1119
@@ -50,7 +48,7 @@ MD5 21a3d3ba5d33cb010404c562ef1078b1 files/openssh-4.2_p1-kerberos-detection.pat
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDHPRBgIKl8Uu19MoRAgTaAJwJUuWygY1Df7P3TuE4/Xzr2hI2nwCfTnH9
-SzZqY+iGAxHh/AFx2mB5mXc=
-=Xsat
+iD8DBQFDHhV5gIKl8Uu19MoRAtruAJ9DtyNKCR7NrY2ibCiPpdcymSrO9ACeN3Lt
+YcPSQFkgqtTFeBvFp13EtJA=
+=dTxZ
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 b/net-misc/openssh/files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2
index bd24d0b19c5b1954479b4fef519419a523a62f99..df906e077d9d345efa7f0bc8d7773388fb9f6d3c 100644 (file)
Binary files a/net-misc/openssh/files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 and b/net-misc/openssh/files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 differ