added gcc 4.3 + python 2.5 patches, minor ebuild cleanup. Solving bugs #221557, #226589, #232734 and #236777.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

6 files changed, 178 insertions, 33 deletions

diff --git a/net-dialup/capisuite/ChangeLog b/net-dialup/capisuite/ChangeLog
index aa779ebde3e7..d0ab3b18416f 100644
--- a/net-dialup/capisuite/ChangeLog
+++ b/net-dialup/capisuite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/capisuite
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.32 2008/05/29 14:29:53 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.33 2008/09/13 22:39:00 sbriesen Exp $
+
+*capisuite-0.4.5-r5 (13 Sep 2008)
+
+  13 Sep 2008; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/capisuite-0.4.5-gcc43.patch, +files/capisuite-0.4.5-python25.patch,
+  -files/capisuite, +capisuite-0.4.5-r5.ebuild:
+  added gcc 4.3 + python 2.5 patches, minor ebuild cleanup. Solving bugs
+  #221557, #226589, #232734 and #236777.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> capisuite-0.4.5-r4.ebuild:
   python_mod_compile is ROOT aware. Fixed python_mod_cleanup.
diff --git a/net-dialup/capisuite/Manifest b/net-dialup/capisuite/Manifest
index 8a253ecf490c..47f64dfaba61 100644
--- a/net-dialup/capisuite/Manifest
+++ b/net-dialup/capisuite/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX capisuite 487 RMD160 88091c7a9041ca43b4c0204efcb4624bb3d2e517 SHA1 12c83f7bf323368718006f5ea8ff2fc350bbfa59 SHA256 280de49af348cfc838c22c942e61ae59e478867924935a4c9fd2ea4887d63ea9
 AUX capisuite-0.4.5-as-needed.patch 761 RMD160 af5d008fa6a8780b3211439640de71795f3a47e7 SHA1 68a314a3126507c80513e7812c7f4c5f455cd47e SHA256 53751ba6c6a2cbc99b250ba2e089642c73d2f6235babcee05f43cdc36eaf8001
 AUX capisuite-0.4.5-capi4linux_v3.diff 4395 RMD160 fe35892044e30b3ddc8c9259e2afccb8d567c334 SHA1 8a8be7685c2b508e0d002b68c57ea1b8400b2f81 SHA256 69d1e2ea6668bb237b0b4bbfb4058ebb9c53b4c3b4e676c7ce1cb422031b1693
 AUX capisuite-0.4.5-date-header.patch 821 RMD160 3478796dcfa1e18be480a0fd595bccbe7359e748 SHA1 f484e07bed321ad88eb0191db4e283f3af655fca SHA256 36d7388c9fb3700718cf2df6124d9343a0494c1b802570afa7cc95a44264cc18
+AUX capisuite-0.4.5-gcc43.patch 656 RMD160 cdcb12694b74ffe4dfcba5b1f5ee7922c6638cbf SHA1 5b4ab9517670b226ffc58c4dff05993e6e2d9dad SHA256 a177c318ea08d199129f39f5fb1236cfb51d2186374451d52c58b5fdd0f20764
+AUX capisuite-0.4.5-python25.patch 2146 RMD160 57c7befe06546f9a020b39a5a3863377b11168df SHA1 fb067b217ddf4eb6d62c8d66346e961819ed6117 SHA256 54c219bff3e358117b869c59b22502f463854745c55492929c3ea16dade43680
 AUX capisuite-0.4.5-syntax.patch 6589 RMD160 c55076a42b73a6237a1c933405f2340871cbdc78 SHA1 fcfc38c10f2483c547c3ee7ddf3c9629a2211ab1 SHA256 a8d9a678051c155769edfd6d3d6bebf6d6ea282d04738c949aeb4fe83536c04c
 AUX capisuite-fax-compatibility.patch 423 RMD160 a09d1b952166318a97115c752db1a2bc95c4829e SHA1 5ab1c7eda924b8e133e8123fc2fa3f280d87ba71 SHA256 a64a3cb28aea777f19a84027fda3594cc4e632ebeab4f8f6c448ab386dfb105a
 AUX capisuite.initd 1417 RMD160 980820221421d8e8a1f417344dd891c5204a8be8 SHA1 22460b69f59c36ca3ec6ee4519f812170a38113a SHA256 35ad8798dd863cc5f6f2d9c429274a19b04dcab1f96b26c02f8e00f268f5df58
 AUX capisuite.logrotated 1003 RMD160 9ededfb533e51659da71f052b921c01901425ec6 SHA1 0995e58533ea116dbafc46bc5ea0a88e191c99b1 SHA256 d8e3135693c5040f1b817c2776235fd35fa926a98e378a9ce6f2733d0095cc53
 DIST capisuite-0.4.5.tar.gz 1184603 RMD160 f28b9cb42a6cfa6d790ec76e74a33a0b7a799762 SHA1 c0a8b19a23df1272f56fd6692ee7e758013ab5d2 SHA256 3e94e42eae6477a222c608c2cd040568fd9fcfa4e8eb0b06a538175d44cbae96
 EBUILD capisuite-0.4.5-r4.ebuild 2325 RMD160 c643a795de24704e3aea4cedc637b6dd925303d0 SHA1 48b94af999dc0704391731223ec8cde59a085b63 SHA256 b14f9ec0c2df462693564036ab88f7a287b4402c5a532022bb77c21e8103a836
-MISC ChangeLog 5620 RMD160 d9ce44fe019bf4ecbbf55f2f7172b96a2887021b SHA1 74d342798a1dfe341ab101a5c2f3f38df08a5b27 SHA256 c63c4845954287d5c956095fd68824ce242b0d78e45776353b1bff5c04ba19c9
+EBUILD capisuite-0.4.5-r5.ebuild 2293 RMD160 e84eeedcc8793ba7807d1f38da83afb8fd9515f8 SHA1 247b634794a8081468e99a91efeda4c4b3395c11 SHA256 576149079dbe67d8f0fe39fe237fdb3f28f2bf4132cbfc67fd494996d686d52e
+MISC ChangeLog 5951 RMD160 e1d6e2604cd3f229dcbc1af856539586cf980006 SHA1 936bd1bfef50a4f73ce8c6b16c6dc1e0ce95994b SHA256 249a0e146ca7e62ff2e09cf4f2a05cccecb9732a7e91cabf6d4902a9f5890d69
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg+veQACgkQQU4yORhF8iBC8QCfQPtVm5LYL7xIDHLFWrV5OQx2
-1oQAn0uk4Z77PUhI35w9qzKf/w+ddoID
-=O+vT
------END PGP SIGNATURE-----
diff --git a/net-dialup/capisuite/capisuite-0.4.5-r5.ebuild b/net-dialup/capisuite/capisuite-0.4.5-r5.ebuild
new file mode 100644
index 000000000000..8b846afdf376
--- /dev/null
+++ b/net-dialup/capisuite/capisuite-0.4.5-r5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.5-r5.ebuild,v 1.1 2008/09/13 22:39:00 sbriesen Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools flag-o-matic multilib python
+
+DESCRIPTION="ISDN telecommunication suite providing fax and voice services"
+HOMEPAGE="http://www.capisuite.de"
+SRC_URI="http://www.capisuite.de/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/python
+	media-sound/sox
+	>=media-libs/tiff-3.7.1
+	media-gfx/jpeg2ps
+	media-gfx/sfftobmp
+	virtual/ghostscript
+	net-dialup/capi4k-utils"
+RDEPEND="${DEPEND}
+	virtual/mta"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	# taken from capisuite-0.4.5-5.src.rpm (SuSE-9.3)
+	epatch "${FILESDIR}/${P}-capi4linux_v3.diff"
+
+	# patched scripts/cs_helpers.pyin (bug #96540)
+	epatch "${FILESDIR}/${P}-date-header.patch"
+
+	# patched src/backend/connection.cpp (bug #69522)
+	epatch "${FILESDIR}/${PN}-fax-compatibility.patch"
+
+	# patched scripts/{incoming,idle}.py (bug #147854)
+	epatch "${FILESDIR}/${P}-syntax.patch"
+
+	# GCC 4.3 patches (bug #236777)
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
+	# Python 2.5 patches (bug #232734)
+	epatch "${FILESDIR}/${P}-python25.patch"
+
+	# run autotools
+	eautoreconf
+}
+
+src_compile() {
+	strip-flags  # see bug #90901
+
+	econf --localstatedir=/var \
+		--with-docdir="/usr/share/doc/${PF}" || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed."
+
+	rm -f "${D}"/usr/{lib,share}/capisuite/README
+	rmdir -p --ignore-fail-on-non-empty "${D}/var/log"
+	rm -f "${D}/usr/share/doc/${PF}"/{COPYING,manual.pdf}
+	keepdir /var/spool/capisuite/{done,failed,sendq,users}
+
+	dodir /etc/init.d
+	newinitd "${FILESDIR}/capisuite.initd" capisuite
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/capisuite.logrotated" capisuite
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	exeinto /etc/cron.daily
+	doexe capisuite.cron
+
+	insinto /etc/capisuite
+	doins cronjob.conf
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/cs_helpers.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
diff --git a/net-dialup/capisuite/files/capisuite b/net-dialup/capisuite/files/capisuite
deleted file mode 100644
index 36e878eb1dbc..000000000000
--- a/net-dialup/capisuite/files/capisuite
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/files/capisuite,v 1.3 2004/07/14 23:14:33 agriffis Exp $
-
-depend() {
-	need capi
-}
-
-start() {
-	ebegin "Starting capisuite"
-	start-stop-daemon --start --quiet --pidfile /var/run/capisuite.pid --exec /usr/sbin/capisuite -- -d
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping capisuite"
-	killall -9 capisuite
-	eend $?
-}
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch b/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch
new file mode 100644
index 000000000000..51326c30af6b
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch
@@ -0,0 +1,21 @@
+--- src/backend/connection.cpp.orig	2008-09-05 08:53:19.000000000 +0200
++++ src/backend/connection.cpp	2008-09-05 08:54:08.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <pthread.h>
+ #include <errno.h> // for errno
+ #include <iconv.h> // for iconv(), iconv_open(), iconv_close()
++#include <cstring>
+ #include "capi.h"
+ #include "callinterface.h"
+ #include "connection.h"
+
+--- src/backend/capi.cpp.orig	2008-09-05 09:01:18.000000000 +0200
++++ src/backend/capi.cpp	2008-09-05 09:01:38.000000000 +0200
+@@ -16,6 +16,7 @@
+ 
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+ #include "connection.h"
+ #include "applicationinterface.h"
+ #include "capi.h"
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch b/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch
new file mode 100644
index 000000000000..e86919a2336d
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch
@@ -0,0 +1,49 @@
+--- src/application/pythonscript.cpp.orig	2004-11-28 14:35:24.000000000 +0100
++++ src/application/pythonscript.cpp	2008-08-03 17:12:45.000000000 +0200
+@@ -99,14 +99,14 @@
+ 			if ( !(py_traceback=cStringIO->cgetvalue(catch_stderr)) )
+ 				throw ApplicationError("unable to get traceback","PythonScript::run()");
+ 			
+-			int length;
++			Py_ssize_t length;
+ 			char *traceback;
+ 			if (PyString_AsStringAndSize(py_traceback, &traceback, &length))
+ 				throw ApplicationError("unable to convert traceback to char*","PythonScript::run()");
+ 
+                         error << prefix() << "A python error occured. See traceback below." << endl;
+ 			error << prefix(false) << "Python traceback: ";
+-			for (int i=0;i<length-1;i++) {
++			for (Py_ssize_t i=0;i<length-1;i++) {
+ 				error << traceback[i];
+ 				if (traceback[i]=='\n')
+ 					error << prefix(false) << "Traceback: ";
+--- src/application/idlescript.cpp.orig	2004-11-28 14:35:24.000000000 +0100
++++ src/application/idlescript.cpp	2008-08-03 17:13:55.000000000 +0200
+@@ -28,6 +28,7 @@
+ 	IdleScript *instance=static_cast<IdleScript*>(arg);
+ 	instance->run();
+ 	pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
++	return NULL;
+ }
+ 
+ void idlescript_cleanup_handler(void* arg)
+--- src/application/incomingscript.cpp.orig	2004-11-28 14:35:24.000000000 +0100
++++ src/application/incomingscript.cpp	2008-08-03 17:14:36.000000000 +0200
+@@ -31,6 +31,7 @@
+ 	IncomingScript *instance=static_cast<IncomingScript*>(arg);
+ 	instance->run();
+ 	pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
++	return NULL;
+ }
+ 
+ void incomingscript_cleanup_handler(void* arg)
+--- src/backend/capi.cpp.orig	2008-08-03 17:10:41.000000000 +0200
++++ src/backend/capi.cpp	2008-08-03 17:21:37.000000000 +0200
+@@ -30,6 +30,7 @@
+ 
+ 	Capi *instance=static_cast<Capi*>(arg);
+ 	instance->run();
++	return NULL;
+ }
+ 
+ Capi::Capi (ostream& debug, unsigned short debug_level, ostream &error, unsigned short DDILength, unsigned short DDIBaseLength, vector<string> DDIStopNumbers, unsigned maxLogicalConnection, unsigned maxBDataBlocks,unsigned maxBDataLen) throw (CapiError, CapiMsgError)