diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-09-05 22:09:36 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-05 22:09:36 +0000 |
commit | c09f431d38d85120a55974e7d85b5497b9ffc2b6 (patch) | |
tree | 43b81ca176b9961c1301ad5249e0ce9eaae309f4 | |
parent | renamed ebuild to correct version, fixing activefilter issue, adding mschap s... (diff) | |
download | gentoo-2-c09f431d38d85120a55974e7d85b5497b9ffc2b6.tar.gz gentoo-2-c09f431d38d85120a55974e7d85b5497b9ffc2b6.tar.bz2 gentoo-2-c09f431d38d85120a55974e7d85b5497b9ffc2b6.zip |
Update the x509 patches.
(Portage version: 2.0.51.22-r2)
-rw-r--r-- | net-misc/openssh/ChangeLog | 10 | ||||
-rw-r--r-- | net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 | 2 | ||||
-rw-r--r-- | net-misc/openssh/files/digest-openssh-3.9_p1-r3 | 2 | ||||
-rw-r--r-- | net-misc/openssh/files/digest-openssh-4.0_p1-r2 | 2 | ||||
-rw-r--r-- | net-misc/openssh/files/digest-openssh-4.1_p1-r1 | 2 | ||||
-rw-r--r-- | net-misc/openssh/files/openssh-3.9_p1-fix_suid-x509.patch | 11 | ||||
-rw-r--r-- | net-misc/openssh/files/openssh-3.9_p1-fix_suid.patch | 11 | ||||
-rw-r--r-- | net-misc/openssh/files/openssh-3.9_p1-fix_suid.patch.bz2 | bin | 304 -> 0 bytes | |||
-rw-r--r-- | net-misc/openssh/openssh-3.8.1_p1-r1.ebuild | 6 | ||||
-rw-r--r-- | net-misc/openssh/openssh-3.9_p1-r3.ebuild | 10 | ||||
-rw-r--r-- | net-misc/openssh/openssh-4.0_p1-r2.ebuild | 7 | ||||
-rw-r--r-- | net-misc/openssh/openssh-4.1_p1-r1.ebuild | 6 |
12 files changed, 49 insertions, 20 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 90625e511ef3..88902255767c 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.127 2005/09/05 20:16:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.128 2005/09/05 22:09:36 vapier Exp $ + + 05 Sep 2005; Mike Frysinger <vapier@gentoo.org> + +files/openssh-3.9_p1-fix_suid.patch, + -files/openssh-3.9_p1-fix_suid.patch.bz2, + +files/openssh-3.9_p1-fix_suid-x509.patch, openssh-3.8.1_p1-r1.ebuild, + openssh-3.9_p1-r3.ebuild, openssh-4.0_p1-r2.ebuild, + openssh-4.1_p1-r1.ebuild: + Update the x509 patches. 05 Sep 2005; Mike Frysinger <vapier@gentoo.org> openssh-4.1_p1-r1.ebuild: Re-enable smartcard support. diff --git a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 b/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 index 8c60f849d56b..e799b8d05c6a 100644 --- a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 +++ b/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 @@ -1,3 +1,3 @@ MD5 1dbfd40ae683f822ae917eebf171ca42 openssh-3.8.1p1.tar.gz 817932 MD5 48db8e4857a32aa93506be8abd84b6b4 openssh-lpk-3.8.1p1-0.3.4.patch 44245 -MD5 52e42ecdf2b0498220661d4bf1cfaeae openssh-3.8.1p1+x509h.diff.gz 143652 +MD5 c1cad487473e826dd8de554ac9856bc6 openssh-3.8.1p1+x509-5.1.diff.gz 161552 diff --git a/net-misc/openssh/files/digest-openssh-3.9_p1-r3 b/net-misc/openssh/files/digest-openssh-3.9_p1-r3 index 32d24bfd09a8..173e61a1a751 100644 --- a/net-misc/openssh/files/digest-openssh-3.9_p1-r3 +++ b/net-misc/openssh/files/digest-openssh-3.9_p1-r3 @@ -1,4 +1,4 @@ MD5 8e1774d0b52aff08f817f3987442a16e openssh-3.9p1.tar.gz 854027 MD5 e6b4c237887d76819e4c626016077907 openssh-lpk-3.9p1-0.3.6.patch 60920 -MD5 eedb263c96a1d7bf208eb2ba70c2e238 openssh-3.9p1+x509h.diff.gz 98011 +MD5 d556d5694c21d18fe3707afb08f2087a openssh-3.9p1+x509-5.2.diff.gz 121839 MD5 b91d73e58e2b72aecb3025ee550411fb openssh-3.9p1-hpn11.diff 13237 diff --git a/net-misc/openssh/files/digest-openssh-4.0_p1-r2 b/net-misc/openssh/files/digest-openssh-4.0_p1-r2 index 790840e807eb..9a0a943ce94a 100644 --- a/net-misc/openssh/files/digest-openssh-4.0_p1-r2 +++ b/net-misc/openssh/files/digest-openssh-4.0_p1-r2 @@ -1,5 +1,5 @@ MD5 7b36f28fc16e1b7f4ba3c1dca191ac92 openssh-4.0p1.tar.gz 889880 MD5 28ffb4f9c62e73f2e0f436f88ee1d718 openssh-lpk-4.0p1-0.3.6.patch 60557 -MD5 a47391f0b77ad10264950c56363d4317 openssh-4.0p1+x509-5.1.diff.gz 117420 +MD5 36b87d7b49ca92d066363d38d1251859 openssh-4.0p1+x509-5.2.diff.gz 123547 MD5 997c4f320c171d7dce1e00fba481ccf2 openssh-4.0p1-hpn11.diff 14225 MD5 79f5648305c8b8a1bc1414e8f6c6134c openssh-4.0p1+SecurID_v1.3.1.patch 610662 diff --git a/net-misc/openssh/files/digest-openssh-4.1_p1-r1 b/net-misc/openssh/files/digest-openssh-4.1_p1-r1 index 96e19e2352bd..3f1a1e7b9ba3 100644 --- a/net-misc/openssh/files/digest-openssh-4.1_p1-r1 +++ b/net-misc/openssh/files/digest-openssh-4.1_p1-r1 @@ -1,5 +1,5 @@ MD5 959c663e709c981f07a3315bfd64f3d0 openssh-4.1p1.tar.gz 894234 MD5 b779906d657d63794144cabe2bf978b8 openssh-lpk-4.1p1-0.3.6.patch 60312 -MD5 8d4ef926ec329c8ae551fd0133ba91e6 openssh-4.1p1+x509-5.1.diff.gz 117293 +MD5 ebc18c981d3a1d6b3772b14316f6d5ad openssh-4.1p1+x509-5.2.diff.gz 123415 MD5 7a9abefaf7078da86ac2e70bf154127f openssh-4.1p1-hpn11.diff 14223 MD5 7c5798757b7efc79a897f92de5f80539 openssh-4.1p1+SecurID_v1.3.1.patch 612445 diff --git a/net-misc/openssh/files/openssh-3.9_p1-fix_suid-x509.patch b/net-misc/openssh/files/openssh-3.9_p1-fix_suid-x509.patch new file mode 100644 index 000000000000..1d993146b160 --- /dev/null +++ b/net-misc/openssh/files/openssh-3.9_p1-fix_suid-x509.patch @@ -0,0 +1,11 @@ +--- Makefile.in ++++ Makefile.in +@@ -149,7 +149,7 @@ + $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + + ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o $(X509STORE_OBJS) +- $(LD) -o $@ ssh-keysign.o readconf.o $(X509STORE_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBLDAP) $(LIBS) ++ $(LD) -o $@ ssh-keysign.o readconf.o $(X509STORE_OBJS) $(LDFLAGS) -Wl,-z,now -lssh -lopenbsd-compat $(LIBLDAP) $(LIBS) + + ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o + $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) diff --git a/net-misc/openssh/files/openssh-3.9_p1-fix_suid.patch b/net-misc/openssh/files/openssh-3.9_p1-fix_suid.patch new file mode 100644 index 000000000000..207907af61ce --- /dev/null +++ b/net-misc/openssh/files/openssh-3.9_p1-fix_suid.patch @@ -0,0 +1,11 @@ +--- Makefile.in ++++ Makefile.in +@@ -149,7 +149,7 @@ + $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + + ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o +- $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ++ $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -Wl,-z,now -lssh -lopenbsd-compat $(LIBS) + + ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o + $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) diff --git a/net-misc/openssh/files/openssh-3.9_p1-fix_suid.patch.bz2 b/net-misc/openssh/files/openssh-3.9_p1-fix_suid.patch.bz2 Binary files differdeleted file mode 100644 index 49e491cbafe2..000000000000 --- a/net-misc/openssh/files/openssh-3.9_p1-fix_suid.patch.bz2 +++ /dev/null diff --git a/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild b/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild index 50f9f920a3c5..45b1c69daf0e 100644 --- a/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild +++ b/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild,v 1.23 2005/08/24 00:07:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild,v 1.24 2005/09/05 22:09:36 vapier Exp $ inherit eutils flag-o-matic ccc @@ -8,7 +8,7 @@ inherit eutils flag-o-matic ccc # and _p? releases. PARCH=${P/_/} -X509_PATCH="${PARCH}+x509h.diff.gz" +X509_PATCH="${PARCH}+x509-5.1.diff.gz" SELINUX_PATCH="openssh-3.7.1_p1-selinux.diff" LDAP_PATCH="${PARCH/-/-lpk-}-0.3.4.patch" @@ -16,7 +16,7 @@ DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="http://www.openssh.com/" SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} ) - X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} )" + X509? ( http://roumenpetrov.info/openssh/x509-5.1/${X509_PATCH} )" LICENSE="as-is" SLOT="0" diff --git a/net-misc/openssh/openssh-3.9_p1-r3.ebuild b/net-misc/openssh/openssh-3.9_p1-r3.ebuild index 45a1edd46bb0..fa145a2a2fe8 100644 --- a/net-misc/openssh/openssh-3.9_p1-r3.ebuild +++ b/net-misc/openssh/openssh-3.9_p1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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-r3.ebuild,v 1.5 2005/09/05 20:10:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r3.ebuild,v 1.6 2005/09/05 22:09:36 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -9,7 +9,7 @@ inherit eutils flag-o-matic ccc pam PARCH=${P/_/} SFTPLOG_PATCH_VER="1.2" -X509_PATCH="${PARCH}+x509h.diff.gz" +X509_PATCH="${PARCH}+x509-5.2.diff.gz" SELINUX_PATCH="openssh-3.9_p1-selinux.diff" LDAP_PATCH="${PARCH/-/-lpk-}-0.3.6.patch" HPN_PATCH="${PARCH}-hpn11.diff" @@ -18,7 +18,7 @@ DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="http://www.openssh.com/" SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} ) - X509? ( http://roumenpetrov.info/openssh/x509h/${X509_PATCH} ) + X509? ( http://roumenpetrov.info/openssh/x509-5.2/${X509_PATCH} ) hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )" LICENSE="as-is" @@ -48,7 +48,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-pamfix.patch.bz2 #epatch "${FILESDIR}"/${P}-largekey.patch.bz2 - epatch "${FILESDIR}"/${P}-fix_suid.patch.bz2 + use X509 || epatch "${FILESDIR}"/${P}-fix_suid.patch epatch "${FILESDIR}"/${P}-infoleak.patch #59361 epatch "${FILESDIR}"/${P}-terminal_restore.patch.bz2 epatch "${FILESDIR}"/${P}-configure-openct.patch #78730 @@ -58,7 +58,7 @@ src_unpack() { use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch.bz2 use skey && epatch ${FILESDIR}/${P}-skey.patch.bz2 use chroot && epatch ${FILESDIR}/${P}-chroot.patch - use X509 && epatch ${DISTDIR}/${X509_PATCH} + use X509 && epatch ${DISTDIR}/${X509_PATCH} && epatch "${FILESDIR}"/${P}-fix_suid-x509.patch use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2 use smartcard && epatch ${FILESDIR}/${P}-opensc.patch.bz2 if use ldap ; then diff --git a/net-misc/openssh/openssh-4.0_p1-r2.ebuild b/net-misc/openssh/openssh-4.0_p1-r2.ebuild index 91bf271debc1..c6ded543321c 100644 --- a/net-misc/openssh/openssh-4.0_p1-r2.ebuild +++ b/net-misc/openssh/openssh-4.0_p1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r2.ebuild,v 1.4 2005/08/24 00:07:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r2.ebuild,v 1.5 2005/09/05 22:09:36 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -9,7 +9,7 @@ inherit eutils flag-o-matic ccc pam PARCH=${P/_/} SFTPLOG_PATCH_VER="1.2" -X509_PATCH="${PARCH}+x509-5.1.diff.gz" +X509_PATCH="${PARCH}+x509-5.2.diff.gz" SELINUX_PATCH="openssh-3.9_p1-selinux.diff" SECURID_PATCH="${PARCH}+SecurID_v1.3.1.patch" LDAP_PATCH="${PARCH/-/-lpk-}-0.3.6.patch" @@ -19,11 +19,10 @@ DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="http://www.openssh.com/" SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} ) - X509? ( http://roumenpetrov.info/openssh/x509-5.1/${X509_PATCH} ) + X509? ( http://roumenpetrov.info/openssh/x509-5.2/${X509_PATCH} ) hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} ) smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )" - LICENSE="as-is" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" diff --git a/net-misc/openssh/openssh-4.1_p1-r1.ebuild b/net-misc/openssh/openssh-4.1_p1-r1.ebuild index f3bf5b1b1a67..3fd5000026ce 100644 --- a/net-misc/openssh/openssh-4.1_p1-r1.ebuild +++ b/net-misc/openssh/openssh-4.1_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.5 2005/09/05 20:16:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.6 2005/09/05 22:09:36 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -9,7 +9,7 @@ inherit eutils flag-o-matic ccc pam PARCH=${P/_/} SFTPLOG_PATCH_VER="1.2" -X509_PATCH="${PARCH}+x509-5.1.diff.gz" +X509_PATCH="${PARCH}+x509-5.2.diff.gz" SELINUX_PATCH="openssh-3.9_p1-selinux.diff" SECURID_PATCH="${PARCH}+SecurID_v1.3.1.patch" LDAP_PATCH="${PARCH/-/-lpk-}-0.3.6.patch" @@ -19,7 +19,7 @@ DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="http://www.openssh.com/" SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} ) - X509? ( http://roumenpetrov.info/openssh/x509-5.1/${X509_PATCH} ) + X509? ( http://roumenpetrov.info/openssh/x509-5.2/${X509_PATCH} ) hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} ) smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )" |