New SSL patch (Bug 93737), cleanup.

Package-Manager: portage-2.1_pre6-r1

diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index 90358243a5833ec4f95a45ae3a959d936bacfcd2..4217c6a0bef4fe4b92affb6ecd7999b550870979 100644 (file)
--- a/sys-apps/ucspi-tcp/ChangeLog
+++ b/sys-apps/ucspi-tcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/ucspi-tcp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.41 2005/10/19 18:40:41 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.42 2006/03/12 18:32:48 hansmi Exp $
+
+*ucspi-tcp-0.88-r14 (12 Mar 2006)
+
+  12 Mar 2006; Michael Hanselmann <hansmi@gentoo.org>
+  +ucspi-tcp-0.88-r14.ebuild:
+  New SSL patch (Bug 93737), cleanup.
 
   19 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
   ucspi-tcp-0.88-r13.ebuild:

diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index b117675c7523c7d393429a8183f4ed1c9a51ce05..1f7e00e75461f92659438d030af4c95de2ed25d1 100644 (file)
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5d439633e96c5f5a7837cd407a693490 ChangeLog 6015
-RMD160 fc0eb43ea6601e7572126919232910994c99ae2d ChangeLog 6015
-SHA256 f25884b372195882937aeb86c31228b0e281c3312293a9733462d10ed08c617d ChangeLog 6015
+MD5 f426b3ce5411a0cdd9b9a49fa1e0c665 ChangeLog 6173
+RMD160 c8d41f54be8435cccd25a8583cee22a14de45124 ChangeLog 6173
+SHA256 2e05073cb13b81e1d3abd938bea8df4a45cc63f78b10286d70fc2b84dfb190e1 ChangeLog 6173
 MD5 fb41d7c55db5124d7488a923e4223576 files/0.88-bigendian.patch 478
 RMD160 65025a0a97e83bf920353c874ae0c484660c7d4b files/0.88-bigendian.patch 478
 SHA256 843738c0888c3072605dea0c536f5dc0f3ed2779a1cd7e0e959ccd2e4e705b6c files/0.88-bigendian.patch 478
@@ -31,9 +28,12 @@ SHA256 519a19bb9966ad88a1b1aa83bc51a168079c64da18231c29db8827d96db95f0b files/di
 MD5 57161a76734c44c65d46f0f93826aaf3 files/digest-ucspi-tcp-0.88-r12 350
 RMD160 870f5ccae51787704f123b0d0410faf3fa5bf246 files/digest-ucspi-tcp-0.88-r12 350
 SHA256 2acceaa26fe4ed1fade86120341916c34a789bf7291063d634d5a21fd730eadf files/digest-ucspi-tcp-0.88-r12 350
-MD5 280de8eb44681996de47516ea0413be0 files/digest-ucspi-tcp-0.88-r13 350
-RMD160 ab467950b2cc71ee5c7a41a6e155edc48c23b61e files/digest-ucspi-tcp-0.88-r13 350
-SHA256 0336b20958d17ad4c8e8af85c11eb990e25faa31e6f09d4f40ae01e3288daf14 files/digest-ucspi-tcp-0.88-r13 350
+MD5 ba0262caca7fe4a0243e22ed4885e2bb files/digest-ucspi-tcp-0.88-r13 1280
+RMD160 348b971f583357a1bcb5b529e0ee94ed45a76adb files/digest-ucspi-tcp-0.88-r13 1280
+SHA256 f15ca8feb82bcf99899d7bef80c31652853a1b51cbbdcf08f33ece359966d160 files/digest-ucspi-tcp-0.88-r13 1280
+MD5 71e4142fc5f0ff226abf84b1d720ff0d files/digest-ucspi-tcp-0.88-r14 1289
+RMD160 76246806e54aa7b4664226289b8ebc25e3de9fed files/digest-ucspi-tcp-0.88-r14 1289
+SHA256 082c9111937c7712373c4fcd27332a6213753c97c363a8835659d628f1016f70 files/digest-ucspi-tcp-0.88-r14 1289
 MD5 9eab9910e2978160e33f6c4e9b227efa files/digest-ucspi-tcp-0.88-r8 350
 RMD160 21260cd7e7f522f076277dceaa74097f1d06212c files/digest-ucspi-tcp-0.88-r8 350
 SHA256 cd3654696ae70cc964599da097241f1be56409556f5820786176895fef45ff78 files/digest-ucspi-tcp-0.88-r8 350
@@ -58,16 +58,12 @@ SHA256 08f6c3a17201006fb0aaa7922b2abe62034be48d9c46a7572e051451760ca688 ucspi-tc
 MD5 31a2a67e361969a49292fa865de144cf ucspi-tcp-0.88-r13.ebuild 2623
 RMD160 f6bd35916a4cab50ef254451830760a0b023a6d4 ucspi-tcp-0.88-r13.ebuild 2623
 SHA256 4d68b7605d884ff1def0ccfd55548ab29429064a3ebf459159672440d40a35d3 ucspi-tcp-0.88-r13.ebuild 2623
+MD5 2262b7a6f90adfef5a02451cbf68db75 ucspi-tcp-0.88-r14.ebuild 2562
+RMD160 3c98b32de91186eb18b20c2711562af29f868c21 ucspi-tcp-0.88-r14.ebuild 2562
+SHA256 cd3ff560d2e219f109208d9e7252ded5db3e124c8d860ab8ab321e60c8d49a53 ucspi-tcp-0.88-r14.ebuild 2562
 MD5 6d6eeeea3f3e9764796103a945a665f8 ucspi-tcp-0.88-r8.ebuild 2155
 RMD160 28275bc5d26c04228c6e8b8d7d90b23f667eac1e ucspi-tcp-0.88-r8.ebuild 2155
 SHA256 b8ac8fff57b579be092a858b06030e2c59938529e1b071331fb8b343efb7e4bf ucspi-tcp-0.88-r8.ebuild 2155
 MD5 2836ebfcd1aba8c99cc53adbc699fff7 ucspi-tcp-0.88-r9.ebuild 2254
 RMD160 f51a1335128be9311d69c842823f58d19d3d9873 ucspi-tcp-0.88-r9.ebuild 2254
 SHA256 7f1929a997a953da36cd538afd96198b2a220ff2351578acc3271056f2139152 ucspi-tcp-0.88-r9.ebuild 2254
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD+Qak2+ySkm8kpY0RAg21AKCa7eZRvS/Nwyvx95YrVtgc5hg2dQCgoYle
-VQ0b0PzcRbT25yCIWJOyXxA=
-=8VYx
------END PGP SIGNATURE-----

diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r13 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r13
index 1e993be074f9cfadc513a4d407a20814a9adbad9..46116df6d7341cae7e42801e4b643ed59619b38b 100644 (file)
--- a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r13
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r13
@@ -1,5 +1,15 @@
 MD5 554ec0eb60f619667efde3fb5325310d ucspi-rss.diff 1828
+RMD160 e65f7317351f45eab70ed7b66d98e3c4b4494389 ucspi-rss.diff 1828
+SHA256 5101354eb86d8e11edefd7b83df4e9c274a55b845f4cb2ce36dda912aced56f4 ucspi-rss.diff 1828
 MD5 2dfc47b1a142e1021a49c678dfbb7a03 ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2 3212
+RMD160 f7e90e7d8466ee2544b41f85b27fbfd170e3f659 ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2 3212
+SHA256 7e1516ba4946526a4e104de1290efc29a9a889e4d1475072c31209aa48848a4a ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2 3212
 MD5 355259551301e93c6cd70b6461a78d34 ucspi-tcp-0.88-ipv6.diff17.bz2 22514
+RMD160 ce9bc1cfe8f27f573662d0993aca0ed5318df91e ucspi-tcp-0.88-ipv6.diff17.bz2 22514
+SHA256 94c8aa47a34b1afe2ebdc0957a543bda7e03ab200e522eebdbbe964700aac97b ucspi-tcp-0.88-ipv6.diff17.bz2 22514
 MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+RMD160 eb20085ea6ffd5d137a805f7c8768e0312c1f56a ucspi-tcp-0.88.tar.gz 53019
+SHA256 4a0615cab74886f5b4f7e8fd32933a07b955536a3476d74ea087a3ea66a23e9c ucspi-tcp-0.88.tar.gz 53019
 MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084
+RMD160 c30ae215c607a7af5cb3b3ba50c7127c32336fa5 ucspi-tcp-ssl-20020705.patch.gz 3084
+SHA256 3d5cd9c7a663ed6b55b9712cbb8c88658f9720999a9fc7a7a40e98564827a97a ucspi-tcp-ssl-20020705.patch.gz 3084

diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r14 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r14
new file mode 100644 (file)
index 0000000..d2cf3a3
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r14
@@ -0,0 +1,15 @@
+MD5 554ec0eb60f619667efde3fb5325310d ucspi-rss.diff 1828
+RMD160 e65f7317351f45eab70ed7b66d98e3c4b4494389 ucspi-rss.diff 1828
+SHA256 5101354eb86d8e11edefd7b83df4e9c274a55b845f4cb2ce36dda912aced56f4 ucspi-rss.diff 1828
+MD5 bc9fe9b5a65193bbc3629f91fa5644f4 ucspi-tcp-0.88-ipv6-ssl-20050405.patch 19411
+RMD160 f7c7f36429eef7dd36b691cc3a17805e4947d65b ucspi-tcp-0.88-ipv6-ssl-20050405.patch 19411
+SHA256 80d4112de4cb556b0a1bf823cde175d55f1ecd0da2ad80951280adc6a8ab9407 ucspi-tcp-0.88-ipv6-ssl-20050405.patch 19411
+MD5 355259551301e93c6cd70b6461a78d34 ucspi-tcp-0.88-ipv6.diff17.bz2 22514
+RMD160 ce9bc1cfe8f27f573662d0993aca0ed5318df91e ucspi-tcp-0.88-ipv6.diff17.bz2 22514
+SHA256 94c8aa47a34b1afe2ebdc0957a543bda7e03ab200e522eebdbbe964700aac97b ucspi-tcp-0.88-ipv6.diff17.bz2 22514
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+RMD160 eb20085ea6ffd5d137a805f7c8768e0312c1f56a ucspi-tcp-0.88.tar.gz 53019
+SHA256 4a0615cab74886f5b4f7e8fd32933a07b955536a3476d74ea087a3ea66a23e9c ucspi-tcp-0.88.tar.gz 53019
+MD5 cbe2443539d5289ffb5ae2a036e0ba3d ucspi-tcp-ssl-20050405.patch.gz 13173
+RMD160 8afbe6362aa23b56731a2e05262fcaf49382058b ucspi-tcp-ssl-20050405.patch.gz 13173
+SHA256 931ebeb9ca3ceb9394464aca0c4585048d04fc194fc5a9d4bb49bdd8ac249467 ucspi-tcp-ssl-20050405.patch.gz 13173

diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild
new file mode 100644 (file)
index 0000000..ce43fc9
--- /dev/null
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild,v 1.1 2006/03/12 18:32:48 hansmi Exp $
+
+inherit eutils toolchain-funcs fixheadtails
+
+IPV6_PATCH="diff17"
+
+DESCRIPTION="Collection of tools for managing UNIX services"
+HOMEPAGE="http://cr.yp.to/ucspi-tcp.html"
+SRC_URI="
+       http://cr.yp.to/${PN}/${P}.tar.gz
+       ipv6? ( http://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.${IPV6_PATCH}.bz2 )
+       mirror://qmail/ucspi-rss.diff
+       ssl? (
+               !ipv6? ( http://www.nrg4u.com/qmail/ucspi-tcp-ssl-20050405.patch.gz )
+               ipv6? ( mirror://ucspi-tcp-0.88-ipv6-ssl-20050405.patch )
+       )
+"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ipv6 selinux doc"
+RESTRICT="test"
+
+DEPEND="virtual/libc
+               ssl? ( >=dev-libs/openssl-0.9.6g )"
+RDEPEND="${DEPEND}
+               doc? ( app-doc/ucspi-tcp-man )
+               selinux? ( sec-policy/selinux-ucspi-tcp )"
+PROVIDE="virtual/inetd"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       if use ipv6; then
+               epatch ${WORKDIR}/ucspi-tcp-0.88-ipv6.${IPV6_PATCH}
+               # Fixes bug 18892
+               epatch ${FILESDIR}/${PV}-bigendian.patch
+               epatch ${FILESDIR}/${PV}-tcprules.patch
+       fi
+
+       if use ssl; then
+               if use ipv6 ; then
+                       # Rediffed patch by hansmi@g.o
+                       epatch ${DISTDIR}/ucspi-tcp-0.88-ipv6-ssl-20050405.patch
+               else
+                       epatch ${DISTDIR}/ucspi-tcp-ssl-20050405.patch.gz
+               fi
+       fi
+
+       if use !ssl && use !ipv6; then
+               epatch ${FILESDIR}/${PV}-errno.patch
+       fi
+
+       epatch ${DISTDIR}/ucspi-rss.diff
+       epatch ${FILESDIR}/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
+
+       # Bug 98726
+       #epatch ${FILESDIR}/${PV}-limits.patch
+       #use ipv6 && epatch ${FILESDIR}/${PV}-limits-ipv6.patch
+
+       ht_fix_file Makefile
+
+       echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+       echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+       echo "/usr/" > conf-home
+
+       # allow larger responses
+       sed -i 's|if (text.len > 200) text.len = 200;|if (text.len > 500) text.len = 500;|g' ${S}/rblsmtpd.c
+}
+
+src_compile() {
+       emake || die
+}
+
+src_install() {
+       dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd || die
+       doman *.[15]
+       dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+       dodoc README.tcpserver-limits-patch
+       insinto /etc/tcprules.d/
+       newins ${FILESDIR}/tcprules-Makefile Makefile
+}
+
+pkg_postinst() {
+       einfo "We have started a move to get all tcprules files into"
+       einfo "/etc/tcprules.d/, where we have provided a Makefile to"
+       einfo "easily update the CDB file."
+}