Fix path to xauth #314645 by Jochen Schlick.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index f7ca2da64b06b22319d7de86f9b5a6a019750f90..b17fc09487270e93d85ff600270a0de282fc3b80 100644 (file)
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dropbear
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.77 2009/11/05 16:02:47 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.78 2010/04/20 08:04:34 vapier Exp $
+
+*dropbear-0.52-r1 (20 Apr 2010)
+
+  20 Apr 2010; Mike Frysinger <vapier@gentoo.org> dropbear-0.52.ebuild,
+  +dropbear-0.52-r1.ebuild:
+  Fix path to xauth #314645 by Jochen Schlick.
 
   05 Nov 2009; Raúl Porcel <armin76@gentoo.org> dropbear-0.52.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #282028

diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 6d0989282d85466d7fc4c14801b534cdb8ad5a55..7bd62d96eaa8e639b56d84026b8a84c6e4367f2c 100644 (file)
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,15 +1,18 @@
-AUX dropbear-0.45-urandom.patch 1889 RMD160 3b259eeac0c52bbaa560a78cb30dfab835f03789 SHA1 8d2644b81522b3efa73158b9520d0b1da01b3ff7 SHA256 629b6326de36c04668fb12b3912082459db426b1ab90159849b9104be2c9106b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX dropbear-0.46-dbscp.patch 500 RMD160 72d7aeee568eae941e3fc45935be1b2bb81f6319 SHA1 f6e78796135988216e1008ba8c5b75de85fe1a49 SHA256 b133670f2417a112e06ae0e4ec7fe50eeb76015e44a5c19d4f55a8df3636ed2d
 AUX dropbear.conf.d 190 RMD160 c877b7ead880060ddafe8deaf4cf478dbb33c1b0 SHA1 ade70c7c07a2f16075fd14feeba9c6e11f42a09b SHA256 e891255a49d408eb11514662faa4d724a1df27cc2ee90268507dbd2573b67334
 AUX dropbear.init.d 913 RMD160 be9cd23f061b0773966812b7f48552253c312d35 SHA1 86cca7f1b8a9e591c61c23aa8ed176d6dbbae4ae SHA256 b115e922fa679adca29e24464dd7ffb1a21a0962333d7822a11e0bcea29ea5ed
-DIST dropbear-0.49.tar.gz 1764444 RMD160 1e9606fb7e20c62c86629d7c97eaedc4fe22c099 SHA1 97ac3d863ffca386aa25b6f60c71ab086aaef591 SHA256 152f87b4fbfe3976c0409fb9e0812af17c9aa0907b04549604110c05248f810f
-DIST dropbear-0.50.tar.gz 1790358 RMD160 c5e643cf068d6cdc19f5da8318ec90e0a0dfb0c3 SHA1 6f56bc88bc29a99c58fe85c98a60249b9782ef36 SHA256 39999c5bfb663404f6450da66d98d69193a5d0ab496d2d47cc53cd0202c4051c
-DIST dropbear-0.51.tar.gz 1777963 RMD160 94af59c474e914d3ef26853aa92a2699b72fcd66 SHA1 78c07d63d74e7f4fb09283ed9fab4defe9e3c35c SHA256 9e81261c39f51812d43c8eb23af64224f5182fe44acb3b5e4bbbef2738a7f29e
 DIST dropbear-0.52.tar.bz2 1601843 RMD160 396d06d612bbd2e49f9f2ad6fe17aa51e8ab452a SHA1 8c1745a9b64ffae79f28e25c6fe9a8b96cac86d8 SHA256 8c7b727a4c9066e90a14f7f01c47cab698afb5a854ffa0404da162d4286f04c1
-EBUILD dropbear-0.49.ebuild 2169 RMD160 8a37eb3c76cbb4d91656998442d379c7624ef6db SHA1 8e0466bd4a09502da4720e1dbbf5e9d22b98af0d SHA256 ce42530a97f4a3be7dd120afe93f6b4898f25c78561b6a9260455d4734c9140e
-EBUILD dropbear-0.50-r1.ebuild 2430 RMD160 5163259626e31b0f4d914bceeb193ac689a33afc SHA1 90a27a36c9b285c417048bd6ecd9c9b8e444b123 SHA256 bbc34a50aa105033e762800e3cbc884134855f32663ebab27447784c8561bbf4
-EBUILD dropbear-0.50.ebuild 2163 RMD160 1bf75000efbd9143718f5f92f1bd2e9f650d5f9c SHA1 03d53694131599a1345726013f2986bd9dcf6b57 SHA256 500777645950f7b1fc05ead1d76a0c7c5c7b202f039cdf265db45f331116f8e7
-EBUILD dropbear-0.51.ebuild 2421 RMD160 20f1068dcc4aade57081bcd893508e57bac71a9f SHA1 effeed74fcf441fa37cab7c33134634500809207 SHA256 6c27ce663b52ce96b8aa9a1e975e80cccfdffe02091ce1c1852052320bef258f
-EBUILD dropbear-0.52.ebuild 2636 RMD160 cd2a2aca5de7e2859c36869511105ec8e18e0927 SHA1 5bd26b891151f6c32798e98712b3ec8dfa65bcd4 SHA256 e83569ede1ebc640e915d2fffaea67555c9069c010bb19a66fa8a2da7805ed0a
-MISC ChangeLog 9754 RMD160 dbc97ec115d3b70410bb2c3ff18e55b0843a82b3 SHA1 8206cebbff0fbe4097c5ef59265709fbb3d3d10b SHA256 97dcbe614764184d64a2f0ae15adc08755010adb81394d73679839685f139635
+EBUILD dropbear-0.52-r1.ebuild 2687 RMD160 f8220985a936bb92737c35fdd76d3c7b0a6fa628 SHA1 9f54f10f00b189665d3c097670ff5e0867133d2b SHA256 7b4ffeb6cfcab483535d164122460e9b9fbc9c721cb329646eeed2abee64cd18
+EBUILD dropbear-0.52.ebuild 2673 RMD160 e36b8d2e3f37fb5638adc481d089356e88736525 SHA1 7a2f798e39c9b0ae972455711cd18163252aefda SHA256 624f38c49d00f834ce43751ffd7b4c21343adb86109365c42a663061088e1575
+MISC ChangeLog 9934 RMD160 fe4f1029496cd624ca58f7e21ec4db9d1a00ef77 SHA1 af5faa9b205a8fdee5097ee74ca45e3114c54126 SHA256 b283643cea68fd1f05fc2a30189f92c1893b5de290de33e98dce8ba1265f8717
 MISC metadata.xml 1535 RMD160 b952e11afa75b9db8d37003b87fc34e98aa1c817 SHA1 3292a14d570d524cca3b4823b864b32fabae07a5 SHA256 5394fdf87301c239a38e2f616f03ba1eaf25cdb43cdfb4c0db28555c7284fcda
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkvNYCMACgkQTwhj9JtAlp72owD+MvhEW0ib81CyqS3MQrgJKsjN
+QIwxbZ5F7aVmP/PRUXQA/jLGRtunC14hjEZTA0AMTC16avxyioHsN384KPDe1KuG
+=bsoD
+-----END PGP SIGNATURE-----

diff --git a/net-misc/dropbear/dropbear-0.52-r1.ebuild b/net-misc/dropbear/dropbear-0.52-r1.ebuild
new file mode 100644 (file)
index 0000000..f022ae0
--- /dev/null
+++ b/net-misc/dropbear/dropbear-0.52-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52-r1.ebuild,v 1.1 2010/04/20 08:04:34 vapier Exp $
+
+inherit eutils savedconfig pam
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+       http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bsdpty minimal multicall pam static syslog zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )
+       pam? ( virtual/pam )"
+RDEPEND="${DEPEND}
+       pam? ( >=sys-auth/pambase-20080219.1 )"
+PROVIDE="virtual/ssh"
+
+set_options() {
+       use minimal \
+               && progs="dropbear dbclient dropbearkey" \
+               || progs="dropbear dbclient dropbearkey dropbearconvert scp"
+       use multicall && makeopts="${makeopts} MULTI=1"
+       use static && makeopts="${makeopts} STATIC=1"
+}
+
+pkg_setup() {
+       if use pam && use static ; then
+               die "USE='pam static' makes no sense ... pick one"
+       fi
+
+       enewgroup sshd 22
+       enewuser sshd 22 -1 /var/empty sshd
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
+       sed -i \
+               -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+               -e '/XAUTH_COMMAND/s:/X11R6/:/:' \
+               options.h
+       sed -i \
+               -e '/pam_start/s:sshd:dropbear:' \
+               svr-authpam.c || die
+       restore_config options.h
+}
+
+src_compile() {
+       if use static && use pam ; then
+               ewarn "You cannot have USE='static pam'.  Assuming static is more important."
+       fi
+       econf \
+               $(use_enable zlib) \
+               $(use_enable pam) \
+               $(use_enable !bsdpty openpty) \
+               $(use_enable syslog) \
+               || die
+       set_options
+       emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed"
+}
+
+src_install() {
+       set_options
+       emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed"
+       doman *.8
+       newinitd "${FILESDIR}"/dropbear.init.d dropbear || die
+       newconfd "${FILESDIR}"/dropbear.conf.d dropbear || die
+       dodoc CHANGES README TODO SMALL MULTI
+
+       # The multi install target does not install the links
+       if use multicall ; then
+               cd "${D}"/usr/bin
+               local x
+               for x in ${progs} ; do
+                       ln -s dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+               done
+               rm -f dropbear
+               dodir /usr/sbin
+               dosym ../bin/dropbearmulti /usr/sbin/dropbear
+               cd "${S}"
+       fi
+       save_config options.h
+
+       if ! use minimal ; then
+               mv "${D}"/usr/bin/{,db}scp || die
+       fi
+
+       pamd_mimic system-remote-login dropbear auth account password session \
+               || die "unable to mimic system-remote-login pamd file."
+}

diff --git a/net-misc/dropbear/dropbear-0.52.ebuild b/net-misc/dropbear/dropbear-0.52.ebuild
index 10c42adfbf2283cbff5b8f5fc14ee1bdd52c81b1..755dc6ee22eae760a1057dcfda61dd6634330423 100644 (file)
--- a/net-misc/dropbear/dropbear-0.52.ebuild
+++ b/net-misc/dropbear/dropbear-0.52.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild,v 1.9 2009/11/05 16:02:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild,v 1.10 2010/04/20 08:04:34 vapier Exp $
 
 inherit eutils savedconfig pam
 
@@ -43,6 +43,7 @@ src_unpack() {
        epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
        sed -i \
                -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+               -e '/XAUTH_COMMAND/s:/X11R6/:/:' \
                options.h
        sed -i \
                -e '/pam_start/s:sshd:dropbear:' \