From: Alin Năstac Date: Wed, 16 Nov 2005 05:59:10 +0000 (+0000) Subject: remove old test version; x86 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ec524565e2106de524e357cc564954dade498ba;p=gentoo.git remove old test version; x86 Package-Manager: portage-2.0.51.22-r3 --- diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog index 40db928b56ea..b435331d9f5d 100644 --- a/net-proxy/dante/ChangeLog +++ b/net-proxy/dante/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-proxy/dante # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.18 2005/11/15 22:19:50 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.19 2005/11/16 05:59:10 mrness Exp $ + + 16 Nov 2005; Alin Nastac + -files/dante-1.1.17-socksify.patch, -dante-1.1.17.ebuild, + dante-1.1.18.ebuild: + Remove old test version. Mark stable on x86. 15 Nov 2005; Alin Nastac dante-1.1.17.ebuild, dante-1.1.18.ebuild: diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest index 2ba157cc464e..44b58de362a8 100644 --- a/net-proxy/dante/Manifest +++ b/net-proxy/dante/Manifest @@ -2,13 +2,11 @@ Hash: SHA1 MD5 633c678a48846de5c6ecb2729f85aedc dante-1.1.15-r2.ebuild 2500 -MD5 c4c8d17c4d4835e0951d25805785059c dante-1.1.17.ebuild 2290 MD5 4d196387e01aa6fa4f0f852781b47a58 dante-1.1.15-r1.ebuild 2320 -MD5 0d3d93ec3c9f224e53dbc5c2a9d03c3b dante-1.1.18.ebuild 2282 -MD5 a020ba8aa5360c8bfed882c1343b6838 ChangeLog 9760 +MD5 5e777d238d82b10510315857d20689fa dante-1.1.18.ebuild 2281 +MD5 94782333471ce2757ab311039d413fbc ChangeLog 9938 MD5 19688263fcbda666eeb085869012f86a metadata.xml 246 MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.15_pre1-socksify.patch 811 -MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.17-socksify.patch 811 MD5 7573426ad7edc9ea4dd95f020205fda4 files/sockd.conf-with-pam.patch 295 MD5 5e74662c76571e30e6a190a2d4d1193a files/dante-1.1.15-optionalpam.patch 10896 MD5 0a5831b02f1ee3c0b9810c4354839906 files/digest-dante-1.1.15-r1 64 @@ -20,13 +18,12 @@ MD5 72d9add89e45e3cb921c99d79bdf31a7 files/dante-1.1.15-bindresvport.patch 485 MD5 30064015b5702cf8059a1639167e8a3f files/dante-1.1.15-getipnodebyname.patch 789 MD5 eb2041b3f61750335f8702515cb20b7c files/dante-sockd-conf 463 MD5 1ff7ae828153ebdd013aa82e5c247b7f files/dante-sockd-init 1722 -MD5 38aeb8f6554e02b57e1624594e62cfd9 files/digest-dante-1.1.17 64 MD5 d4207d41125a3aa07fab48cc977a786c files/digest-dante-1.1.18 64 MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.18-socksify.patch 811 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFDel8bNSP4Vda7IdsRAqULAJoCfdnud1mITevUoWV8HHKJ4IVj8gCeOwc4 -Zrwi/kV+EWQOFwjROSK86Uw= -=mAj5 +iD8DBQFDesrDNSP4Vda7IdsRAm70AJ0SaFJzP7UJg4UhikC/1XQKfTSE1wCffr89 +Ttp72bEH09Pwb2O6cTlVHZs= +=Wrfn -----END PGP SIGNATURE----- diff --git a/net-proxy/dante/dante-1.1.17.ebuild b/net-proxy/dante/dante-1.1.17.ebuild deleted file mode 100644 index 7ebecbab6cda..000000000000 --- a/net-proxy/dante/dante-1.1.17.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.17.ebuild,v 1.6 2005/11/15 22:19:50 mrness Exp $ - -inherit fixheadtails eutils - -DESCRIPTION="A free socks4,5 and msproxy implementation" -HOMEPAGE="http://www.inet.no/dante/" -SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="tcpd debug selinux pam" - -RDEPEND="virtual/libc - pam? ( sys-libs/pam ) - tcpd? ( sys-apps/tcp-wrappers ) - selinux? ( sec-policy/selinux-dante ) - userland_GNU? ( sys-apps/shadow )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}"/${P}-socksify.patch - - ht_fix_file configure - sed -i \ - -e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \ - -e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \ - doc/{faq.ps,faq.tex,sockd.8,sockd.conf.5,socks.conf.5} -} - -src_compile() { - econf \ - `use_enable debug` \ - `use_enable tcpd libwrap` \ - `use_with pam` \ - --with-socks-conf=/etc/socks/socks.conf \ - --with-sockd-conf=/etc/socks/sockd.conf \ - || die "bad ./configure" - # the comments in the source say this is only useful for 2.0 kernels ... - # well it may fix 2.0 but it breaks with 2.6 :) - [ "${KV:0:3}" == "2.6" ] && sed -i 's:if HAVE_LINUX_ECCENTRICITIES:if 0:' include/common.h - emake || die "compile problem" -} - -src_install() { - make DESTDIR=${D} install || die - - # bor: comment libdl.so out it seems to work just fine without it - sed -i -e 's:libdl\.so::' ${D}/usr/bin/socksify || die 'sed failed' - - # default configuration files - insinto /etc/socks - doins ${FILESDIR}/sock?.conf - cd ${D}/etc/socks && { - use pam && epatch ${FILESDIR}/sockd.conf-with-pam.patch - use tcpd && epatch ${FILESDIR}/sockd.conf-with-libwrap.patch - } - cd ${S} - - # our init script - exeinto /etc/init.d - newexe ${FILESDIR}/dante-sockd-init dante-sockd - insinto /etc/conf.d - newins ${FILESDIR}/dante-sockd-conf dante-sockd - - # install documentation - dodoc BUGS CREDITS NEWS README SUPPORT TODO VERSION - docinto txt - cd doc - dodoc README* *.txt SOCKS4.* - docinto example - cd ../example - dodoc *.conf -} - -pkg_postinst() { - enewuser sockd -1 -1 /etc/socks daemon -} diff --git a/net-proxy/dante/dante-1.1.18.ebuild b/net-proxy/dante/dante-1.1.18.ebuild index 7d8cbc0c8f9f..12dbc9d57138 100644 --- a/net-proxy/dante/dante-1.1.18.ebuild +++ b/net-proxy/dante/dante-1.1.18.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-proxy/dante/dante-1.1.18.ebuild,v 1.2 2005/11/15 22:19:50 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.18.ebuild,v 1.3 2005/11/16 05:59:10 mrness Exp $ inherit fixheadtails eutils @@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="tcpd debug selinux pam" RDEPEND="virtual/libc diff --git a/net-proxy/dante/files/dante-1.1.17-socksify.patch b/net-proxy/dante/files/dante-1.1.17-socksify.patch deleted file mode 100644 index 632deb1f9b58..000000000000 --- a/net-proxy/dante/files/dante-1.1.17-socksify.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- dante-1.1.15-pre1/bin/socksify.in.agriffis 2004-11-04 16:07:04.000000000 -0500 -+++ dante-1.1.15-pre1/bin/socksify.in 2004-11-04 16:07:08.977460049 -0500 -@@ -60,7 +60,11 @@ - @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}" - export @PRELOAD_VARIABLE@ - --LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}" --export LD_LIBRARY_PATH -+# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where -+# LD_PRELOAD can contain a full path to the library. Setting the -+# following breaks socksify on Linux/Alpha at least with -+# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis) -+#LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}" -+#export LD_LIBRARY_PATH - - exec "$@" diff --git a/net-proxy/dante/files/digest-dante-1.1.17 b/net-proxy/dante/files/digest-dante-1.1.17 deleted file mode 100644 index 3f164a039ddb..000000000000 --- a/net-proxy/dante/files/digest-dante-1.1.17 +++ /dev/null @@ -1 +0,0 @@ -MD5 da9b9fcf8a5c9fb6e8e18a4c6a31cbbc dante-1.1.17.tar.gz 845155