From f9f09f48dd1160a8e34c63c56cd1b62bf22ebcd3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 19 Oct 2005 03:32:26 +0000 Subject: [PATCH] Move default xauth location to /usr/bin/xauth. Package-Manager: portage-2.0.53_rc5 --- net-misc/openssh/ChangeLog | 7 +- net-misc/openssh/Manifest | 78 ++++++++++----------- net-misc/openssh/openssh-3.8.1_p1-r1.ebuild | 49 +++++++------ net-misc/openssh/openssh-3.9_p1-r3.ebuild | 22 +++--- net-misc/openssh/openssh-4.0_p1-r2.ebuild | 26 ++++--- net-misc/openssh/openssh-4.1_p1-r1.ebuild | 26 ++++--- net-misc/openssh/openssh-4.2_p1.ebuild | 26 ++++--- 7 files changed, 127 insertions(+), 107 deletions(-) diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index a5382df8ed7f..c12c737b4de8 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,11 @@ # 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.131 2005/09/17 19:36:00 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.132 2005/10/19 03:32:26 vapier Exp $ + + 19 Oct 2005; Mike Frysinger + 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, openssh-4.2_p1.ebuild: + Move default xauth location to /usr/bin/xauth. *openssh-4.2_p1 (06 Sep 2005) diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 29319f103934..9286740b7af8 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,54 +1,54 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 df82fd7b318276bfdf9204f1a7ce6abc ChangeLog 22109 -MD5 696b539f9b616a10544a99d73833d6ad openssh-4.0_p1-r2.ebuild 5247 -MD5 8caa012de8cb7680420d8e7509bc85e1 openssh-3.9_p1-r3.ebuild 4901 -MD5 42d2e7102c1cd32b40d061d6a9adab48 openssh-3.8.1_p1-r1.ebuild 4415 -MD5 69906a04c4b848278370fab50cbd2ef3 openssh-4.1_p1-r1.ebuild 5208 -MD5 ff0dccf17d2b2b58a8a52554860be9a6 metadata.xml 1430 -MD5 77438fa4b471b43e7451878a8f817e29 openssh-4.2_p1.ebuild 5283 -MD5 4bee5c8ce11f30487154c3742e004f7d files/openssh-4.0_p1-smartcard-ldap-happy.patch 545 -MD5 7937a17eb31fc6139ef42fa04521de27 files/openssh-3.9_p1-configure-openct.patch 995 -MD5 5afc89edd73f522a5b3757a518dffb34 files/sshd.rc6 1293 -MD5 c326cd447fb5f86124295ef943d3bf35 files/openssh-3.9_p1-kerberos-detection.patch 593 -MD5 a26faff36f0ec463cb4ef7366bfdc1e1 files/openssh-3.8_p1-resolv_functions.patch.bz2 315 -MD5 f58807d5d75bc9929883e6876c7ddd46 files/openssh-3.9_p1-terminal_restore.patch.bz2 332 -MD5 6905aafd16d110e8e8b74cad4914ceb7 files/openssh-3.8.1_p1-largekey.patch.bz2 1304 -MD5 21a3d3ba5d33cb010404c562ef1078b1 files/openssh-4.2_p1-kerberos-detection.patch 359 -MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.8_p1-skey.patch.bz2 270 -MD5 857f14fd111169d8838d07fb46769938 files/openssh-3.8.1_p1-kerberos.patch.bz2 465 -MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.8_p1-chroot.patch.bz2 1119 +MD5 e5dad9e44c59ff184004c24966568784 ChangeLog 22339 MD5 2fc26aef45c8705e6da5e3fe6650af47 files/digest-openssh-3.8.1_p1-r1 219 -MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.8.1_p1-skey.patch.bz2 270 -MD5 7880e18b2a91e5927810dddc7bda270f files/openssh-3.7.1_p1-selinux.diff.bz2 1353 -MD5 7205b89215b9dc72e3958c662065b529 files/openssh-3.9_p1-largekey.patch.bz2 1262 -MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294 -MD5 857f14fd111169d8838d07fb46769938 files/openssh-3.8_p1-kerberos.patch.bz2 465 -MD5 2b66f75047edfac5d5e6cdbffa35383e files/sshd.pam_include 205 -MD5 a26faff36f0ec463cb4ef7366bfdc1e1 files/openssh-3.8.1_p1-resolv_functions.patch.bz2 315 -MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.9_p1-skey.patch.bz2 270 -MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.8.1_p1-chroot.patch.bz2 1119 MD5 1c2b632d1118068966049ae41b33c012 files/digest-openssh-3.9_p1-r3 281 -MD5 5c73d0ef570e6326839011abc8045626 files/openssh-3.9_p1-fix_suid-x509.patch 579 -MD5 9da4e1a777f8baaa5caffb5084a68ed4 files/digest-openssh-4.1_p1-r1 360 MD5 c92c33beb73a2d008cb3744ebd7e4f88 files/digest-openssh-4.0_p1-r2 360 -MD5 9cf3a0fb4e8709dde06bd4a3c61eeaff files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 5718 -MD5 87593c73e26e1a3825fcb51f2270b694 files/openssh-3.9_p1-chroot.patch 3027 -MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.8.1_p1-opensc.patch.bz2 1381 -MD5 93d19c0ef91091a730510c46ab8e811e files/openssh-3.9_p1-selinux.diff.bz2 1307 -MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.9_p1-opensc.patch.bz2 1381 +MD5 9da4e1a777f8baaa5caffb5084a68ed4 files/digest-openssh-4.1_p1-r1 360 MD5 0494f3d85ca907c1c771a18ac172c4f7 files/digest-openssh-4.2_p1 213 -MD5 73f3b46d27bd413eb79350a2ce412bf6 files/openssh-3.9_p1-pamfix.patch.bz2 1125 +MD5 7880e18b2a91e5927810dddc7bda270f files/openssh-3.7.1_p1-selinux.diff.bz2 1353 +MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.8.1_p1-chroot.patch.bz2 1119 +MD5 857f14fd111169d8838d07fb46769938 files/openssh-3.8.1_p1-kerberos.patch.bz2 465 +MD5 6905aafd16d110e8e8b74cad4914ceb7 files/openssh-3.8.1_p1-largekey.patch.bz2 1304 +MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.8.1_p1-opensc.patch.bz2 1381 +MD5 a26faff36f0ec463cb4ef7366bfdc1e1 files/openssh-3.8.1_p1-resolv_functions.patch.bz2 315 +MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.8.1_p1-skey.patch.bz2 270 +MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.8_p1-chroot.patch.bz2 1119 +MD5 857f14fd111169d8838d07fb46769938 files/openssh-3.8_p1-kerberos.patch.bz2 465 +MD5 a26faff36f0ec463cb4ef7366bfdc1e1 files/openssh-3.8_p1-resolv_functions.patch.bz2 315 +MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.8_p1-skey.patch.bz2 270 +MD5 87593c73e26e1a3825fcb51f2270b694 files/openssh-3.9_p1-chroot.patch 3027 +MD5 7937a17eb31fc6139ef42fa04521de27 files/openssh-3.9_p1-configure-openct.patch 995 +MD5 5c73d0ef570e6326839011abc8045626 files/openssh-3.9_p1-fix_suid-x509.patch 579 MD5 86dbc28431f831a22b51c2ae8637a611 files/openssh-3.9_p1-fix_suid.patch 492 -MD5 d235f6e0c273e8a968b6759b12a8fd11 files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 5770 MD5 ba87dbfc3be0ab9d70fe24278d9deb02 files/openssh-3.9_p1-infoleak.patch 2496 +MD5 c326cd447fb5f86124295ef943d3bf35 files/openssh-3.9_p1-kerberos-detection.patch 593 +MD5 7205b89215b9dc72e3958c662065b529 files/openssh-3.9_p1-largekey.patch.bz2 1262 +MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.9_p1-opensc.patch.bz2 1381 +MD5 73f3b46d27bd413eb79350a2ce412bf6 files/openssh-3.9_p1-pamfix.patch.bz2 1125 +MD5 93d19c0ef91091a730510c46ab8e811e files/openssh-3.9_p1-selinux.diff.bz2 1307 MD5 1cb38b00876090a79d11989acb60522c files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 5775 +MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.9_p1-skey.patch.bz2 270 +MD5 f58807d5d75bc9929883e6876c7ddd46 files/openssh-3.9_p1-terminal_restore.patch.bz2 332 +MD5 d235f6e0c273e8a968b6759b12a8fd11 files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 5770 +MD5 4bee5c8ce11f30487154c3742e004f7d files/openssh-4.0_p1-smartcard-ldap-happy.patch 545 +MD5 21a3d3ba5d33cb010404c562ef1078b1 files/openssh-4.2_p1-kerberos-detection.patch 359 +MD5 9cf3a0fb4e8709dde06bd4a3c61eeaff files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 5718 MD5 eca7ba0b23754a710b42a79c1fb5e248 files/openssh-securid-1.3.1-updates.patch 445 +MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294 +MD5 2b66f75047edfac5d5e6cdbffa35383e files/sshd.pam_include 205 +MD5 5afc89edd73f522a5b3757a518dffb34 files/sshd.rc6 1293 +MD5 ff0dccf17d2b2b58a8a52554860be9a6 metadata.xml 1430 +MD5 3af6afd052caef27a0707c9b941d41c6 openssh-3.8.1_p1-r1.ebuild 4407 +MD5 007223c0520d91c52557714c4bc6b0ca openssh-3.9_p1-r3.ebuild 5010 +MD5 f57b335cd90d3ec4233a98c6617dce3b openssh-4.0_p1-r2.ebuild 5362 +MD5 6a8c34205a609252e4811a9ff5fbb8bf openssh-4.1_p1-r1.ebuild 5323 +MD5 f6bea92076722e899fd8fd28812f989e openssh-4.2_p1.ebuild 5398 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDLHA/j5H05b2HAEkRAto+AKCl4MKsPPWMpot3KqB1Siwc9Jj1dwCfbSlt -dvPrlafb1O2hGsolUV64AcQ= -=voUj +iD8DBQFDVb7ogIKl8Uu19MoRAvfeAJ9IUdhCyrjq5xwcWFzuvklJkw2oDwCfSCs2 +RdGhNZjX0mzgQZun6JEW4gk= +=d/hW -----END PGP SIGNATURE----- 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 89ecdc571381..a3080ab8f319 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.26 2005/09/08 23:54:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild,v 1.27 2005/10/19 03:32:26 vapier Exp $ inherit eutils flag-o-matic ccc @@ -42,20 +42,25 @@ PROVIDE="virtual/ssh" S=${WORKDIR}/${PARCH} src_unpack() { - unpack ${PARCH}.tar.gz ; cd ${S} + unpack ${PARCH}.tar.gz + cd "${S}" - epatch ${FILESDIR}/${P}-resolv_functions.patch.bz2 + sed -i \ + -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \ + pathnames.h || die - use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2 - use skey && epatch ${FILESDIR}/${P}-skey.patch.bz2 - use chroot && epatch ${FILESDIR}/${P}-chroot.patch.bz2 - use X509 && epatch ${DISTDIR}/${X509_PATCH} - use smartcard && epatch ${FILESDIR}/${P}-opensc.patch.bz2 + epatch "${FILESDIR}"/${P}-resolv_functions.patch.bz2 + + use selinux && epatch "${FILESDIR}"/${SELINUX_PATCH}.bz2 + use skey && epatch "${FILESDIR}"/${P}-skey.patch.bz2 + use chroot && epatch "${FILESDIR}"/${P}-chroot.patch.bz2 + use X509 && epatch "${DISTDIR}"/${X509_PATCH} + use smartcard && epatch "${FILESDIR}"/${P}-opensc.patch.bz2 if use ldap ; then if use X509 ; then ewarn "Sorry, x509 and ldap don't get along" else - epatch ${DISTDIR}/${LDAP_PATCH} + epatch "${DISTDIR}"/${LDAP_PATCH} fi fi @@ -75,13 +80,7 @@ src_compile() { use selinux && append-flags -DWITH_SELINUX use static && append-ldflags -static - autoconf - - local myconf="\ - $( use_with tcpd tcp-wrappers ) \ - $( use_with pam ) \ - $( use_with skey )" - + local myconf="" use ipv6 || myconf="${myconf} --with-ipv4-default" use kerberos && myconf="${myconf} --with-kerberos5=/usr" || \ myconf="${myconf} --without-kerberos5" @@ -96,10 +95,10 @@ src_compile() { --with-privsep-path=/var/empty \ --with-privsep-user=sshd \ --with-md5-passwords \ - `use_with tcpd tcp-wrappers` \ - `use_with pam` \ - `use_with skey` \ - `use_with smartcard opensc` \ + $(use_with tcpd tcp-wrappers) \ + $(use_with pam) \ + $(use_with skey) \ + $(use_with smartcard opensc) \ ${myconf} \ || die "bad configure" @@ -112,11 +111,11 @@ src_compile() { } src_install() { - make install-files DESTDIR=${D} || die - chmod 600 ${D}/etc/ssh/sshd_config + make install-files DESTDIR="${D}" || die + chmod 600 "${D}"/etc/ssh/sshd_config dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config - use pam && ( insinto /etc/pam.d ; newins ${FILESDIR}/sshd.pam sshd ) - exeinto /etc/init.d ; newexe ${FILESDIR}/sshd.rc6 sshd + use pam && ( insinto /etc/pam.d ; newins "${FILESDIR}"/sshd.pam sshd ) + newinitd "${FILESDIR}"/sshd.rc6 sshd keepdir /var/empty dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config use pam && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config @@ -137,7 +136,7 @@ pkg_postinst() { einfo "new one with UID 22. If you have any scripts or programs that" einfo "that referenced the old UID directly, you will need to update them." einfo - use pam >/dev/null 2>&1 && { + use pam && { einfo "Please be aware users need a valid shell in /etc/passwd" einfo "in order to be allowed to login." einfo diff --git a/net-misc/openssh/openssh-3.9_p1-r3.ebuild b/net-misc/openssh/openssh-3.9_p1-r3.ebuild index 1782e874fda0..3224ab9297b1 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.8 2005/09/08 23:54:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r3.ebuild,v 1.9 2005/10/19 03:32:26 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -46,6 +46,10 @@ src_unpack() { unpack ${PARCH}.tar.gz cd "${S}" + sed -i \ + -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \ + pathnames.h || die + epatch "${FILESDIR}"/${P}-pamfix.patch.bz2 #epatch "${FILESDIR}"/${P}-largekey.patch.bz2 use X509 || epatch "${FILESDIR}"/${P}-fix_suid.patch @@ -54,20 +58,20 @@ src_unpack() { epatch "${FILESDIR}"/${P}-configure-openct.patch #78730 epatch "${FILESDIR}"/${P}-kerberos-detection.patch #80811 - use sftplogging && epatch ${FILESDIR}/${P}-sftplogging-1.2-gentoo.patch.bz2 - use skey && epatch ${FILESDIR}/${P}-skey.patch.bz2 - use chroot && epatch ${FILESDIR}/${P}-chroot.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 + use sftplogging && epatch "${FILESDIR}"/${P}-sftplogging-1.2-gentoo.patch.bz2 + use skey && epatch "${FILESDIR}"/${P}-skey.patch.bz2 + use chroot && epatch "${FILESDIR}"/${P}-chroot.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 if use X509 || use sftplogging ; then ewarn "Sorry, x509/sftplogging and ldap don't get along" else - epatch ${DISTDIR}/${LDAP_PATCH} + epatch "${DISTDIR}"/${LDAP_PATCH} fi fi - use hpn && epatch ${DISTDIR}/${HPN_PATCH} + use hpn && epatch "${DISTDIR}"/${HPN_PATCH} autoconf || die "autoconf failed" } diff --git a/net-misc/openssh/openssh-4.0_p1-r2.ebuild b/net-misc/openssh/openssh-4.0_p1-r2.ebuild index cfa9db5d4189..71cfc0b28acc 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.7 2005/09/08 23:54:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r2.ebuild,v 1.8 2005/10/19 03:32:26 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -49,28 +49,32 @@ src_unpack() { unpack ${PARCH}.tar.gz cd "${S}" + sed -i \ + -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \ + pathnames.h || die + #epatch "${FILESDIR}"/openssh-3.9_p1-largekey.patch.bz2 epatch "${FILESDIR}"/openssh-3.9_p1-configure-openct.patch #78730 epatch "${FILESDIR}"/openssh-3.9_p1-kerberos-detection.patch #80811 - use X509 && epatch ${DISTDIR}/${X509_PATCH} - use sftplogging && epatch ${FILESDIR}/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 - use skey && epatch ${FILESDIR}/openssh-3.9_p1-skey.patch.bz2 - use chroot && epatch ${FILESDIR}/openssh-3.9_p1-chroot.patch - use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2 - use smartcard && epatch ${FILESDIR}/openssh-3.9_p1-opensc.patch.bz2 + use X509 && epatch "${DISTDIR}"/${X509_PATCH} + use sftplogging && epatch "${FILESDIR}"/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 + use skey && epatch "${FILESDIR}"/openssh-3.9_p1-skey.patch.bz2 + use chroot && epatch "${FILESDIR}"/openssh-3.9_p1-chroot.patch + use selinux && epatch "${FILESDIR}"/${SELINUX_PATCH}.bz2 + use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch.bz2 if ! use X509 ; then - use smartcard && epatch ${DISTDIR}/${SECURID_PATCH} ${FILESDIR}/openssh-securid-1.3.1-updates.patch - use smartcard && use ldap && epatch ${FILESDIR}/openssh-4.0_p1-smartcard-ldap-happy.patch + use smartcard && epatch "${DISTDIR}"/${SECURID_PATCH} "${FILESDIR}"/openssh-securid-1.3.1-updates.patch + use smartcard && use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch if use sftplogging ; then ewarn "Sorry, sftplogging and ldap don't get along" else - use ldap && epatch ${DISTDIR}/${LDAP_PATCH} + use ldap && epatch "${DISTDIR}"/${LDAP_PATCH} fi elif use smartcard || use ldap ; then ewarn "Sorry, x509 and smartcard/ldap don't get along" fi - use hpn && epatch ${DISTDIR}/${HPN_PATCH} + use hpn && epatch "${DISTDIR}"/${HPN_PATCH} sed -i '/LD.*ssh-keysign/s:$: -Wl,-z,now:' Makefile.in || die "setuid" diff --git a/net-misc/openssh/openssh-4.1_p1-r1.ebuild b/net-misc/openssh/openssh-4.1_p1-r1.ebuild index 96f722dc8a99..51279025d6d6 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.8 2005/09/08 23:54:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.9 2005/10/19 03:32:26 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -49,29 +49,33 @@ src_unpack() { unpack ${PARCH}.tar.gz cd "${S}" + sed -i \ + -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \ + pathnames.h || die + #epatch "${FILESDIR}"/openssh-3.9_p1-largekey.patch.bz2 epatch "${FILESDIR}"/openssh-3.9_p1-kerberos-detection.patch #80811 - use X509 && epatch ${DISTDIR}/${X509_PATCH} - use sftplogging && epatch ${FILESDIR}/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 - use skey && epatch ${FILESDIR}/openssh-3.9_p1-skey.patch.bz2 - use chroot && epatch ${FILESDIR}/openssh-3.9_p1-chroot.patch - use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2 - use smartcard && epatch ${FILESDIR}/openssh-3.9_p1-opensc.patch.bz2 + use X509 && epatch "${DISTDIR}"/${X509_PATCH} + use sftplogging && epatch "${FILESDIR}"/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 + use skey && epatch "${FILESDIR}"/openssh-3.9_p1-skey.patch.bz2 + use chroot && epatch "${FILESDIR}"/openssh-3.9_p1-chroot.patch + use selinux && epatch "${FILESDIR}"/${SELINUX_PATCH}.bz2 + use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch.bz2 if ! use X509 ; then if [[ -n ${SECURID_PATCH} ]] && use smartcard ; then - epatch ${DISTDIR}/${SECURID_PATCH} ${FILESDIR}/openssh-securid-1.3.1-updates.patch - use ldap && epatch ${FILESDIR}/openssh-4.0_p1-smartcard-ldap-happy.patch + epatch "${DISTDIR}"/${SECURID_PATCH} "${FILESDIR}"/openssh-securid-1.3.1-updates.patch + use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch fi if use sftplogging ; then ewarn "Sorry, sftplogging and ldap don't get along" else - use ldap && epatch ${DISTDIR}/${LDAP_PATCH} + use ldap && epatch "${DISTDIR}"/${LDAP_PATCH} fi elif use smartcard || use ldap ; then ewarn "Sorry, x509 and smartcard/ldap don't get along" fi - use hpn && epatch ${DISTDIR}/${HPN_PATCH} + use hpn && epatch "${DISTDIR}"/${HPN_PATCH} sed -i '/LD.*ssh-keysign/s:$: -Wl,-z,now:' Makefile.in || die "setuid" diff --git a/net-misc/openssh/openssh-4.2_p1.ebuild b/net-misc/openssh/openssh-4.2_p1.ebuild index b4179d88c9c0..910e49829d85 100644 --- a/net-misc/openssh/openssh-4.2_p1.ebuild +++ b/net-misc/openssh/openssh-4.2_p1.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.2_p1.ebuild,v 1.2 2005/09/08 23:54:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1.ebuild,v 1.3 2005/10/19 03:32:26 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -49,29 +49,33 @@ src_unpack() { unpack ${PARCH}.tar.gz cd "${S}" + sed -i \ + -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \ + pathnames.h || die + #epatch "${FILESDIR}"/openssh-3.9_p1-largekey.patch.bz2 epatch "${FILESDIR}"/openssh-4.2_p1-kerberos-detection.patch #80811 - use X509 && epatch ${DISTDIR}/${X509_PATCH} - use sftplogging && epatch ${FILESDIR}/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 - use skey && epatch ${FILESDIR}/openssh-3.9_p1-skey.patch.bz2 - use chroot && epatch ${FILESDIR}/openssh-3.9_p1-chroot.patch - use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2 - use smartcard && epatch ${FILESDIR}/openssh-3.9_p1-opensc.patch.bz2 + use X509 && epatch "${DISTDIR}"/${X509_PATCH} + use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 + use skey && epatch "${FILESDIR}"/openssh-3.9_p1-skey.patch.bz2 + use chroot && epatch "${FILESDIR}"/openssh-3.9_p1-chroot.patch + use selinux && epatch "${FILESDIR}"/${SELINUX_PATCH}.bz2 + use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch.bz2 if ! use X509 ; then if [[ -n ${SECURID_PATCH} ]] && use smartcard ; then - epatch ${DISTDIR}/${SECURID_PATCH} ${FILESDIR}/openssh-securid-1.3.1-updates.patch - use ldap && epatch ${FILESDIR}/openssh-4.0_p1-smartcard-ldap-happy.patch + epatch "${DISTDIR}"/${SECURID_PATCH} "${FILESDIR}"/openssh-securid-1.3.1-updates.patch + use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch fi if use sftplogging ; then ewarn "Sorry, sftplogging and ldap don't get along" else - use ldap && epatch ${DISTDIR}/${LDAP_PATCH} + use ldap && epatch "${DISTDIR}"/${LDAP_PATCH} fi elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then ewarn "Sorry, x509 and smartcard/ldap don't get along" fi - [[ -n ${HPN_PATCH} ]] && use hpn && epatch ${DISTDIR}/${HPN_PATCH} + [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH} sed -i '/LD.*ssh-keysign/s:$: -Wl,-z,now:' Makefile.in || die "setuid" -- 2.26.2