From 90a96e419575eca707acf7c60231ee5cca343fa2 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 17 Jan 2007 03:22:59 +0000 Subject: [PATCH] Cleanup ebuild/source/patchsets. Package-Manager: portage-2.1.2 --- sys-apps/tcp-wrappers/ChangeLog | 8 +++- sys-apps/tcp-wrappers/Manifest | 32 +++++++------- .../files/digest-tcp-wrappers-7.6-r8 | 6 +-- .../tcp-wrappers/tcp-wrappers-7.6-r8.ebuild | 42 +++++++------------ 4 files changed, 41 insertions(+), 47 deletions(-) diff --git a/sys-apps/tcp-wrappers/ChangeLog b/sys-apps/tcp-wrappers/ChangeLog index c64d4f3f303f..f8ffc17d82ba 100644 --- a/sys-apps/tcp-wrappers/ChangeLog +++ b/sys-apps/tcp-wrappers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/tcp-wrappers -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.38 2006/12/11 02:50:13 flameeyes Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.39 2007/01/17 03:22:59 vapier Exp $ + + 17 Jan 2007; Mike Frysinger + tcp-wrappers-7.6-r8.ebuild: + Cleanup ebuild/source/patchsets. 11 Dec 2006; Diego Pettenò tcp-wrappers-7.6-r8.ebuild: diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest index f5e5f7500816..27f52801983a 100644 --- a/sys-apps/tcp-wrappers/Manifest +++ b/sys-apps/tcp-wrappers/Manifest @@ -5,27 +5,27 @@ AUX hosts.allow.example 585 RMD160 7bb172c17bad9ad17222e260cc87f66bd4522158 SHA1 MD5 da6fe337f8e6ddda00b5d52c588ca70a files/hosts.allow.example 585 RMD160 7bb172c17bad9ad17222e260cc87f66bd4522158 files/hosts.allow.example 585 SHA256 fbcdcedbdc985d8f0cc79e9a8752e69553b48aa38662321046cd4eae9f4d7e3b files/hosts.allow.example 585 -DIST tcp-wrappers-7.6-r8-patches.tar.bz2 19279 RMD160 965f221530a245317524e66b9bce4e1786ac3ae5 SHA1 7fc8d9787a0d5cbf47b38ad5cad01662f2f51940 SHA256 d1854fd9943d9653a8c1986033a8112b117f094339227e96d186436a46ce49a5 +DIST tcp-wrappers-7.6-patches-1.0.tar.bz2 16128 RMD160 ff714d5d91d1d59ce7824859e66a2ad1b2f9c452 SHA1 b6ab8cac024c35429c7c1d50498b9e54a4740ca2 SHA256 dcb10f194684b16ae6aa9faf05dd8b063d81a3dde1431b664260dcf385089256 DIST tcp_wrappers_7.6.tar.gz 99438 RMD160 f592fec30f8b76ce8790182185dde709871095e0 SHA1 61689ec85b80f4ca0560aef3473eccd9e9e80481 SHA256 9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d -EBUILD tcp-wrappers-7.6-r8.ebuild 2294 RMD160 a4ff05a07938f8d4121e2b7cd118258dcf89110b SHA1 394f3382e11dfb917f872e8256f02fe5fca681c0 SHA256 68ef8616b600f0f47c5ef21ee8b93d91e3f19f790a8c4faed5c0c2cf8942bac5 -MD5 0c7a9667fd67b4d5d38e4e21b0981962 tcp-wrappers-7.6-r8.ebuild 2294 -RMD160 a4ff05a07938f8d4121e2b7cd118258dcf89110b tcp-wrappers-7.6-r8.ebuild 2294 -SHA256 68ef8616b600f0f47c5ef21ee8b93d91e3f19f790a8c4faed5c0c2cf8942bac5 tcp-wrappers-7.6-r8.ebuild 2294 -MISC ChangeLog 5678 RMD160 e527a102ee6b77b6ed96f93ab18e42adfb1d431c SHA1 bacb372646c43756ac6cfe6e458b61029af0fded SHA256 ae8a668ae1535db465ff9d1e4f14cbe0d8eb6ecf3c1c9191a2f857f4c751ee82 -MD5 94e02ff674dc0837da178da1b2522312 ChangeLog 5678 -RMD160 e527a102ee6b77b6ed96f93ab18e42adfb1d431c ChangeLog 5678 -SHA256 ae8a668ae1535db465ff9d1e4f14cbe0d8eb6ecf3c1c9191a2f857f4c751ee82 ChangeLog 5678 +EBUILD tcp-wrappers-7.6-r8.ebuild 1989 RMD160 9f9f2fcb5ab0a99e156920647506f2e326ea2f9f SHA1 b5e8f3bfbcf0b9e9513eb4327e1b01737f1db355 SHA256 4a096b53c3afb45b86d0dc4d91241cb5d2bcd43614bf853b245142df62d746cd +MD5 2c8039c0446d79d5c1231f22ec8d338c tcp-wrappers-7.6-r8.ebuild 1989 +RMD160 9f9f2fcb5ab0a99e156920647506f2e326ea2f9f tcp-wrappers-7.6-r8.ebuild 1989 +SHA256 4a096b53c3afb45b86d0dc4d91241cb5d2bcd43614bf853b245142df62d746cd tcp-wrappers-7.6-r8.ebuild 1989 +MISC ChangeLog 5791 RMD160 e9fa10a1c7bde184486e56efe695f91084710535 SHA1 276125984cb35f7b979d9ac3b6a4a7019ae0ff4f SHA256 7230342f00b46cee06c7b93ce53d0dd8d2f322154fea55baa9191725ba65b531 +MD5 7df1e995b2e9a427a47a21c7eb5fdd17 ChangeLog 5791 +RMD160 e9fa10a1c7bde184486e56efe695f91084710535 ChangeLog 5791 +SHA256 7230342f00b46cee06c7b93ce53d0dd8d2f322154fea55baa9191725ba65b531 ChangeLog 5791 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 -MD5 5ff147f85fc9e9577971d7a20b065546 files/digest-tcp-wrappers-7.6-r8 530 -RMD160 394c8fe052e46b198b715f608e3594fca24ca94a files/digest-tcp-wrappers-7.6-r8 530 -SHA256 141ab486af79dcc75d76fefb132a09ac4de49c4186d0b682bfc9f2a84405d613 files/digest-tcp-wrappers-7.6-r8 530 +MD5 546dfc415803b609e7c46015ae777e58 files/digest-tcp-wrappers-7.6-r8 533 +RMD160 d0e11b35ec1c70435859042105bcccd505a168a0 files/digest-tcp-wrappers-7.6-r8 533 +SHA256 be7e0388c8290b7edc9d3f9492d94b14f5a990aaab1d205d35b44420cbbc5702 files/digest-tcp-wrappers-7.6-r8 533 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlZMu8bi6rjpTunYRAjl7AKDipG0lQz1/USEIGFgBVzHtFyCuZgCbBmPC -1Wpw9EYoxuHFCSenOFCSoJ4= -=yZrk +iD4DBQFFrZa48bi6rjpTunYRAhUjAJUe0DUOGv1g4sCWodgmIaIcjmDwAJ9ggU2M +DZvoNzbMRqHAe+R4TxrRbQ== +=XuAf -----END PGP SIGNATURE----- diff --git a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8 b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8 index 884b867ff2f9..0494715f8510 100644 --- a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8 +++ b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8 @@ -1,6 +1,6 @@ -MD5 3050aa30cb6f4e3aa8f3d6ccefc2bef8 tcp-wrappers-7.6-r8-patches.tar.bz2 19279 -RMD160 965f221530a245317524e66b9bce4e1786ac3ae5 tcp-wrappers-7.6-r8-patches.tar.bz2 19279 -SHA256 d1854fd9943d9653a8c1986033a8112b117f094339227e96d186436a46ce49a5 tcp-wrappers-7.6-r8-patches.tar.bz2 19279 +MD5 e40c4f8f90c274af23a38a698b6d1695 tcp-wrappers-7.6-patches-1.0.tar.bz2 16128 +RMD160 ff714d5d91d1d59ce7824859e66a2ad1b2f9c452 tcp-wrappers-7.6-patches-1.0.tar.bz2 16128 +SHA256 dcb10f194684b16ae6aa9faf05dd8b063d81a3dde1431b664260dcf385089256 tcp-wrappers-7.6-patches-1.0.tar.bz2 16128 MD5 e6fa25f71226d090f34de3f6b122fb5a tcp_wrappers_7.6.tar.gz 99438 RMD160 f592fec30f8b76ce8790182185dde709871095e0 tcp_wrappers_7.6.tar.gz 99438 SHA256 9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d tcp_wrappers_7.6.tar.gz 99438 diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild index 6a43a10f37c4..03d138d63684 100644 --- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild +++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild @@ -1,51 +1,41 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.23 2006/12/29 22:13:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.24 2007/01/17 03:22:59 vapier Exp $ inherit eutils toolchain-funcs MY_P="${P//-/_}" -S="${WORKDIR}/${MY_P}" +PATCH_VER="1.0" DESCRIPTION="TCP Wrappers" HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html" SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz - mirror://gentoo/${PF}-patches.tar.bz2" + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" LICENSE="tcp_wrappers_license" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" IUSE="ipv6" -RDEPEND="virtual/libc" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" +DEPEND="" + +S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} - cd ${S} + cd "${S}" chmod ug+w Makefile - sed -i \ - -e "s:-O:${CFLAGS}:" \ - -e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" \ - Makefile || die "makefile patch prep" - PATCHDIR=${WORKDIR}/${PV}-patches - epatch ${PATCHDIR}/${P}-makefile.patch.bz2 + EPATCH_SUFFIX="patch" + PATCHDIR=${WORKDIR}/${PV} + epatch ${PATCHDIR}/${P}-makefile.patch epatch ${PATCHDIR}/generic - epatch ${PATCHDIR}/${P}-shared.patch.bz2 - use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff.bz2 - - # make it parallel/cross-compile friendly. - sed -i \ - -e 's:gcc:$(CC):' \ - -e 's:@make :@$(MAKE) :' \ - -e 's:make;:$(MAKE);:' \ - Makefile || die "sed Makefile failed" + epatch ${PATCHDIR}/${P}-shared.patch + use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff } src_compile() { - tc-export CC + tc-export AR CC RANLIB local myconf="-DHAVE_WEAKSYMS" use ipv6 && myconf="${myconf} -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" @@ -67,8 +57,8 @@ src_install() { dosbin tcpd tcpdchk tcpdmatch safe_finger try-from || die doman *.[358] - dosym hosts_access.5.gz /usr/share/man/man5/hosts.allow.5.gz - dosym hosts_access.5.gz /usr/share/man/man5/hosts.deny.5.gz + dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5 + dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5 insinto /usr/include doins tcpd.h -- 2.26.2