From: Mike Frysinger Date: Sun, 4 Sep 2005 06:17:08 +0000 (+0000) Subject: touchup ebuild and add enew{user,group} X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92df2ff6bd4f142832859190001318ceeee91ad7;p=gentoo.git touchup ebuild and add enew{user,group} Package-Manager: portage-2.0.51.22-r2 --- diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index fb3ec397559d..051559d77766 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -1,12 +1,12 @@ +MD5 68c50009dd00b23b70f2c214457a75cf dropbear-0.45.ebuild 1946 MD5 ef25f543b5438ee7595e2ae0f98a5093 metadata.xml 671 -MD5 4957b281fab9c39212a2b37164e53c40 dropbear-0.46.ebuild 1923 MD5 eca949c2fcf358c97cbf8071bf15e3ae dropbear-0.43.ebuild 1685 +MD5 154ed8ccb5610fcc4acf76f05cf36f78 dropbear-0.46.ebuild 2005 MD5 296e97a30664942a7347b9b1403858d3 ChangeLog 2733 -MD5 c408078b029559dd1970739096915668 dropbear-0.45.ebuild 1868 -MD5 c9381e8354263ae69eda6efabca753ad files/digest-dropbear-0.45 67 -MD5 64abc6b82756a97391c12d730c8da084 files/dropbear.conf.d 352 MD5 c7d976a23e72e6dce3c022e588def172 files/dropbear-0.46-dbscp.patch 500 -MD5 8ae09936c352dfd5a8ddb95182b1afc6 files/digest-dropbear-0.46 67 -MD5 c3634543250cd9f910161b351bb15ccc files/digest-dropbear-0.43 67 MD5 34fea1c967596ebcd6d10d38444f2b92 files/dropbear.init.d 913 MD5 2f5c2ef2e357aa5225c9044f33fa2512 files/dropbear-0.45-urandom.patch 1887 +MD5 c3634543250cd9f910161b351bb15ccc files/digest-dropbear-0.43 67 +MD5 64abc6b82756a97391c12d730c8da084 files/dropbear.conf.d 352 +MD5 c9381e8354263ae69eda6efabca753ad files/digest-dropbear-0.45 67 +MD5 8ae09936c352dfd5a8ddb95182b1afc6 files/digest-dropbear-0.46 67 diff --git a/net-misc/ssh/Manifest b/net-misc/ssh/Manifest index edf4bc5e13a1..ed5e4b342d05 100644 --- a/net-misc/ssh/Manifest +++ b/net-misc/ssh/Manifest @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 15747d918c5a2f9815c9e9df1a4909eb ChangeLog 1668 MD5 b2857d10cedc50e23008a1664762b1f6 metadata.xml 321 -MD5 a088a11e2045c71537caa1d257da6748 ssh-3.2.9.1-r1.ebuild 1454 +MD5 c52341cd26208a538ee85c06d076ad7a ssh-3.2.9.1-r1.ebuild 1517 +MD5 15747d918c5a2f9815c9e9df1a4909eb ChangeLog 1668 MD5 1a0c708380931effd610c9567fac4303 files/digest-ssh-3.2.9.1-r1 64 -MD5 5da2716771a56ddd869bed98e9164cc4 files/pamd.sshd2 425 -MD5 161466fa829f8dc1ed1e67f5cd3f20d5 files/patch-readline.diff 1054 MD5 7a42cfc98810322e8999339df7dcd61b files/sshd2 733 +MD5 161466fa829f8dc1ed1e67f5cd3f20d5 files/patch-readline.diff 1054 +MD5 5da2716771a56ddd869bed98e9164cc4 files/pamd.sshd2 425 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFCENLc8zY1VwezZiERAp5sAJ9b93p7KXNt0/hUVUOWndxx+Th09wCghp/e -UQ+pEglf9mj7chnMcGEd2o4= -=g+rb +iD8DBQFDGpGQgIKl8Uu19MoRAqP/AJ4vk0iHCDLZtZELWICW5L3BCcxDWACff0ZQ +a4ryjFXo3WbK6U4mDXIq/vw= +=Vj3d -----END PGP SIGNATURE----- diff --git a/net-misc/ssh/ssh-3.2.9.1-r1.ebuild b/net-misc/ssh/ssh-3.2.9.1-r1.ebuild index 913ac277ce4f..d6f45bf39bc5 100644 --- a/net-misc/ssh/ssh-3.2.9.1-r1.ebuild +++ b/net-misc/ssh/ssh-3.2.9.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ssh-3.2.9.1-r1.ebuild,v 1.1 2005/01/13 23:09:14 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ssh-3.2.9.1-r1.ebuild,v 1.2 2005/09/04 06:17:08 vapier Exp $ -inherit gnuconfig eutils +inherit eutils DESCRIPTION="SSH.COM free for Non-Commercial Use ssh version" HOMEPAGE="http://www.ssh.com/" @@ -10,31 +10,35 @@ SRC_URI="ftp://ftp.ssh.com/pub/ssh/${P}.tar.gz" LICENSE="ssh" SLOT="0" -KEYWORDS="x86 ~amd64" +KEYWORDS="amd64 x86" IUSE="X ipv6 crypt openssh" DEPEND="X? ( virtual/x11 ) !openssh? ( !virtual/ssh )" PROVIDE="virtual/ssh" +pkg_setup() { + enewgroup sshd 22 + enewuser sshd 22 -1 /var/empty sshd +} + src_unpack() { unpack ${A} - cd ${WORKDIR} - epatch ${FILESDIR}/patch-readline.diff + cd "${WORKDIR}" + epatch "${FILESDIR}"/patch-readline.diff } src_compile() { - gnuconfig_update - econf \ - `use_with ipv6 ipv6` \ - `use_with X` \ - `use_with crypt gpg` \ + $(use_with ipv6 ipv6) \ + $(use_with X) \ + $(use_with crypt gpg) \ || die "configure failed" make || die "make failed" } src_install() { + # TODO: fix this crap which messes with $ROOT if [ -e ${ROOT}/etc/ssh2/hostkey ] ; then # this keeps the install from generating these keys again insinto /etc/ssh2 @@ -47,11 +51,9 @@ src_install() { chmod 600 ${D}/etc/ssh2/sshd2_config dodoc CHANGES FAQ HOWTO.anonymous.sftp README* SSH2.QUICKSTART - insinto /etc/pam.d - newins ${FILESDIR}/pamd.sshd2 sshd2 - exeinto /etc/init.d - newexe ${FILESDIR}/sshd2 sshd2 + newpamd "${FILESDIR}"/pamd.sshd2 sshd2 + newinitd "${FILESDIR}"/sshd2 sshd2 - cd ${D}/usr + cd "${D}"/usr use openssh && find bin sbin share/man -type l -exec rm '{}' \; }