fixed deprecation syntax errors in incoming.py and as a precaution also idle.py, solving bug #130234 and #147854.

Package-Manager: portage-2.1.2_pre1

5 files changed, 248 insertions, 5 deletions

diff --git a/net-dialup/capisuite/ChangeLog b/net-dialup/capisuite/ChangeLog
index 5568665612da..1e2098f5242e 100644
--- a/net-dialup/capisuite/ChangeLog
+++ b/net-dialup/capisuite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/capisuite
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.28 2006/09/22 13:41:51 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.29 2006/09/22 13:51:45 sbriesen Exp $
+
+*capisuite-0.4.5-r4 (22 Sep 2006)
+
+  22 Sep 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/capisuite-0.4.5-syntax.patch, +capisuite-0.4.5-r4.ebuild:
+  fixed deprecation syntax errors in incoming.py and as a precaution also
+  idle.py, solving bug #130234 and #147854.
 
   22 Sep 2006; Stefan Briesenick <sbriesen@gentoo.org>
   -files/capisuite-0.4.5-capiv3.patch, -files/capisuite-0.4.5-gentoo.patch,
diff --git a/net-dialup/capisuite/Manifest b/net-dialup/capisuite/Manifest
index 2820522c8a11..6c74a1491652 100644
--- a/net-dialup/capisuite/Manifest
+++ b/net-dialup/capisuite/Manifest
@@ -10,6 +10,10 @@ AUX capisuite-0.4.5-date-header.patch 821 RMD160 3478796dcfa1e18be480a0fd595bccb
 MD5 135be011248d6215905132143e6a7dab files/capisuite-0.4.5-date-header.patch 821
 RMD160 3478796dcfa1e18be480a0fd595bccbe7359e748 files/capisuite-0.4.5-date-header.patch 821
 SHA256 36d7388c9fb3700718cf2df6124d9343a0494c1b802570afa7cc95a44264cc18 files/capisuite-0.4.5-date-header.patch 821
+AUX capisuite-0.4.5-syntax.patch 6589 RMD160 c55076a42b73a6237a1c933405f2340871cbdc78 SHA1 fcfc38c10f2483c547c3ee7ddf3c9629a2211ab1 SHA256 a8d9a678051c155769edfd6d3d6bebf6d6ea282d04738c949aeb4fe83536c04c
+MD5 fc3af885567a818f9696c3c312a6680f files/capisuite-0.4.5-syntax.patch 6589
+RMD160 c55076a42b73a6237a1c933405f2340871cbdc78 files/capisuite-0.4.5-syntax.patch 6589
+SHA256 a8d9a678051c155769edfd6d3d6bebf6d6ea282d04738c949aeb4fe83536c04c files/capisuite-0.4.5-syntax.patch 6589
 AUX capisuite-fax-compatibility.patch 423 RMD160 a09d1b952166318a97115c752db1a2bc95c4829e SHA1 5ab1c7eda924b8e133e8123fc2fa3f280d87ba71 SHA256 a64a3cb28aea777f19a84027fda3594cc4e632ebeab4f8f6c448ab386dfb105a
 MD5 63b5890053139f14a3d3baf78812e0bc files/capisuite-fax-compatibility.patch 423
 RMD160 a09d1b952166318a97115c752db1a2bc95c4829e files/capisuite-fax-compatibility.patch 423
@@ -27,10 +31,14 @@ EBUILD capisuite-0.4.5-r3.ebuild 2240 RMD160 2237f10bd99a892c3de7627f2caecdccea7
 MD5 5fe8a7f74e499b21cab303936301e0bc capisuite-0.4.5-r3.ebuild 2240
 RMD160 2237f10bd99a892c3de7627f2caecdccea760a78 capisuite-0.4.5-r3.ebuild 2240
 SHA256 50861997795f4be3562d0a968b44b3178d99e7b5eb395957c477573df76ada7f capisuite-0.4.5-r3.ebuild 2240
-MISC ChangeLog 4841 RMD160 9cb129d62488d9db96aead64ac657ba66c0bc655 SHA1 a196f05e95adfcd70fb9fa1fdff9250b9a870ffe SHA256 761b93b1de0c1a0d55925079a2aaf8fa42b825537d598a337625dcc756532cdd
-MD5 550fef85a5ab05a708a167d0c5c0fc69 ChangeLog 4841
-RMD160 9cb129d62488d9db96aead64ac657ba66c0bc655 ChangeLog 4841
-SHA256 761b93b1de0c1a0d55925079a2aaf8fa42b825537d598a337625dcc756532cdd ChangeLog 4841
+EBUILD capisuite-0.4.5-r4.ebuild 2336 RMD160 dbea912cda9b3fe30127128623be98de8cdb0e7c SHA1 aeb10c99bf11f16c17f089a7a3e0116dfabaa192 SHA256 5b352698fa094cbd764f056a233224a5ea2f4870c4bd4976a78787b6bf3ff2f1
+MD5 8b60300f910456ec3d05b7ab8a087a44 capisuite-0.4.5-r4.ebuild 2336
+RMD160 dbea912cda9b3fe30127128623be98de8cdb0e7c capisuite-0.4.5-r4.ebuild 2336
+SHA256 5b352698fa094cbd764f056a233224a5ea2f4870c4bd4976a78787b6bf3ff2f1 capisuite-0.4.5-r4.ebuild 2336
+MISC ChangeLog 5117 RMD160 a0a0d97efc5506ef74f71bf8ee8ab819115bbfb0 SHA1 28af2ba14b895f9ce7b6af4cd1a58c728883de85 SHA256 f497785a10f02684c1c202d4f2287dd7b89e29019f59b42622d7b18d0b5946b6
+MD5 6f834d596ba3ad94678af2690a51e6f8 ChangeLog 5117
+RMD160 a0a0d97efc5506ef74f71bf8ee8ab819115bbfb0 ChangeLog 5117
+SHA256 f497785a10f02684c1c202d4f2287dd7b89e29019f59b42622d7b18d0b5946b6 ChangeLog 5117
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -38,3 +46,6 @@ SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata
 MD5 6a8be9e8fe8118a0fe77a1abd91ed4fc files/digest-capisuite-0.4.5-r3 250
 RMD160 2a72ca3e4b5cee3982affea7a62598efe66e3e85 files/digest-capisuite-0.4.5-r3 250
 SHA256 04079b93ff77674c492ff98f2d6d1e56ec57d7a46b67f67f91bbad5a7e6e405c files/digest-capisuite-0.4.5-r3 250
+MD5 6a8be9e8fe8118a0fe77a1abd91ed4fc files/digest-capisuite-0.4.5-r4 250
+RMD160 2a72ca3e4b5cee3982affea7a62598efe66e3e85 files/digest-capisuite-0.4.5-r4 250
+SHA256 04079b93ff77674c492ff98f2d6d1e56ec57d7a46b67f67f91bbad5a7e6e405c files/digest-capisuite-0.4.5-r4 250
diff --git a/net-dialup/capisuite/capisuite-0.4.5-r4.ebuild b/net-dialup/capisuite/capisuite-0.4.5-r4.ebuild
new file mode 100644
index 000000000000..00896d53ecce
--- /dev/null
+++ b/net-dialup/capisuite/capisuite-0.4.5-r4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2006 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-r4.ebuild,v 1.1 2006/09/22 13:51:45 sbriesen Exp $
+
+inherit eutils 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="~x86 ~amd64 ~ppc"
+IUSE=""
+
+DEPEND="virtual/python
+	sys-devel/automake
+	>=sys-devel/autoconf-2.50
+	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}"
+
+	# taken from capisuite-0.4.5-5.src.rpm (SuSE-9.3)
+	epatch "${FILESDIR}/${P}-capi4linux_v3.diff"
+
+	# patched scripts/cs_helpers.pyin for bug #96540
+	epatch "${FILESDIR}/${P}-date-header.patch"
+
+	# patched src/backend/connection.cpp for bug #69522
+	epatch "${FILESDIR}/${PN}-fax-compatibility.patch"
+
+	# patched scripts/{incoming,idle}.py for bug #147854
+	epatch "${FILESDIR}/${P}-syntax.patch"
+}
+
+src_compile() {
+	strip-flags  # see bug #90901
+	ebegin "Updating autotools-generated files"
+	aclocal -I . || die "aclocal failed"
+	automake -a || die "automake failed"
+	autoheader || die "autoheader failed"
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
+	eend $?
+
+	econf --localstatedir=/var \
+		--with-docdir="/usr/share/doc/${PF}" || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make 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 ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/cs_helpers.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${ROOT}usr/$(get_libdir)/python*/site-packages
+}
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-syntax.patch b/net-dialup/capisuite/files/capisuite-0.4.5-syntax.patch
new file mode 100644
index 000000000000..0a0725f9b6b3
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-syntax.patch
@@ -0,0 +1,133 @@
+--- scripts/incoming.py.orig	2004-11-28 14:35:23.000000000 +0100
++++ scripts/incoming.py	2006-09-22 15:17:28.000000000 +0200
+@@ -1,3 +1,4 @@
++# -*- coding: UTF-8 -*-
+ #              incoming.py - standard incoming script for capisuite
+ #              ----------------------------------------------------
+ #    copyright            : (C) 2002 by Gernot Hillier
+@@ -48,7 +49,7 @@
+ 			if config.has_option(u,'fax_numbers'):
+ 				numbers=config.get(u,'fax_numbers')
+ 				if (call_to in numbers.split(',') or numbers=="*"):
+-				 	if (service in (capisuite.SERVICE_FAXG3,capisuite.SERVICE_VOICE)):
++					if (service in (capisuite.SERVICE_FAXG3,capisuite.SERVICE_VOICE)):
+ 						curr_user=u
+ 						curr_service=capisuite.SERVICE_FAXG3
+ 						break
+@@ -133,8 +134,8 @@
+ 
+ 	if (os.access(filename,os.R_OK)):
+ 		cs_helpers.writeDescription(filename,
+-		  "call_from=\""+call_from+"\"\ncall_to=\""+call_to+"\"\ntime=\""
+-		  +time.ctime()+"\"\ncause=\"0x%x/0x%x\"\n" % (cause,causeB3))
++			"call_from=\""+call_from+"\"\ncall_to=\""+call_to+"\"\ntime=\""
++			+time.ctime()+"\"\ncause=\"0x%x/0x%x\"\n" % (cause,causeB3))
+ 		userdata=pwd.getpwnam(curr_user)
+ 		os.chmod(filename,0600)
+ 		os.chown(filename,userdata[2],userdata[3])
+@@ -153,8 +154,8 @@
+ 			action="saveonly"
+ 		if (action=="mailandsave"):
+ 			cs_helpers.sendMIMEMail(fromaddress, mailaddress, "Fax received from "+call_from+" to "+call_to, faxFormat,
+-			  "You got a fax from "+call_from+" to "+call_to+"\nDate: "+time.ctime()+"\n\n"
+-			  +"See attached file.\nThe original file was saved to file://"+filename+"\n\n", filename)
++				"You got a fax from "+call_from+" to "+call_to+"\nDate: "+time.ctime()+"\n\n"
++				+"See attached file.\nThe original file was saved to file://"+filename+"\n\n", filename)
+ 
+ # @brief called by callIncoming when an incoming voice call is received
+ #
+@@ -234,8 +235,8 @@
+ 
+ 	if (os.access(filename,os.R_OK)):
+ 		cs_helpers.writeDescription(filename,
+-		  "call_from=\""+call_from+"\"\ncall_to=\""+call_to+"\"\ntime=\""
+-		  +time.ctime()+"\"\ncause=\"0x%x/0x%x\"\n" % (cause,causeB3))
++			"call_from=\""+call_from+"\"\ncall_to=\""+call_to+"\"\ntime=\""
++			+time.ctime()+"\"\ncause=\"0x%x/0x%x\"\n" % (cause,causeB3))
+ 		userdata=pwd.getpwnam(curr_user)
+ 		os.chmod(filename,0600)
+ 		os.chown(filename,userdata[2],userdata[3])
+@@ -250,8 +251,8 @@
+ 			mailaddress=curr_user
+ 		if (action=="mailandsave"):
+ 			cs_helpers.sendMIMEMail(fromaddress, mailaddress, "Voice call received from "+call_from+" to "+call_to, "la",
+-			  "You got a voice call from "+call_from+" to "+call_to+"\nDate: "+time.ctime()+"\n\n"
+-			  +"See attached file.\nThe original file was saved to file://"+filename+"\n\n", filename)
++				"You got a voice call from "+call_from+" to "+call_to+"\nDate: "+time.ctime()+"\n\n"
++				+"See attached file.\nThe original file was saved to file://"+filename+"\n\n", filename)
+ 
+ 
+ # @brief remote inquiry function (uses german wave snippets!)
+@@ -418,7 +419,7 @@
+ #
+ # Revision 1.9  2003/06/27 07:51:09  gernot
+ # - replaced german umlaut in filename "nachricht-gelscht.la", can cause
+-#   problems on Redhat, thx to Herbert Hübner for reporting
++#   problems on Redhat, thx to Herbert Hübner for reporting
+ #
+ # Revision 1.8  2003/06/16 10:21:05  gernot
+ # - define filename in any case (thx to Axel Schneck for reporting and
+--- scripts/idle.py.orig	2004-11-28 14:35:16.000000000 +0100
++++ scripts/idle.py	2006-09-22 15:33:50.000000000 +0200
+@@ -1,3 +1,4 @@
++# -*- coding: UTF-8 -*-
+ #                  idle.py - default script for capisuite
+ #              ---------------------------------------------
+ #    copyright            : (C) 2002 by Gernot Hillier
+@@ -105,13 +106,13 @@
+ 				movejob(job_fax,sendq,done,user)
+ 				capisuite.log("job "+job_fax+": finished successfully",1)
+ 				mailtext="Your fax job to "+addressee+" ("+dialstring+") was sent successfully.\n\n" \
+-				  +"Subject: "+subject+"\nFilename: "+job_fax \
+-				  +"\nNeeded tries: "+str(tries) \
+-				  +("\nLast result: 0x%x/0x%x" % (result,resultB3)) \
+-				  +"\n\nIt was moved to file://"+done+user+"-"+job_fax
++					+"Subject: "+subject+"\nFilename: "+job_fax \
++					+"\nNeeded tries: "+str(tries) \
++					+("\nLast result: 0x%x/0x%x" % (result,resultB3)) \
++					+"\n\nIt was moved to file://"+done+user+"-"+job_fax
+ 				cs_helpers.sendSimpleMail(fromaddress,mailaddress,
+-				  "Fax to "+addressee+" ("+dialstring+") sent successfully.",
+-				  mailtext)
++					"Fax to "+addressee+" ("+dialstring+") sent successfully.",
++					mailtext)
+ 			else:
+ 				max_tries=int(cs_helpers.getOption(config,"","send_tries","10"))
+ 				delays=cs_helpers.getOption(config,"","send_delays","60,60,60,300,300,3600,3600,18000,36000").split(",")
+@@ -123,19 +124,19 @@
+ 				starttime=time.time()+next_delay
+ 				capisuite.log("job "+job_fax+": delayed for "+str(next_delay)+" seconds",2)
+ 				cs_helpers.writeDescription(sendq+job_fax,"dialstring=\""+dialstring+"\"\n"
+-				  +"starttime=\""+time.ctime(starttime)+"\"\ntries=\""+str(tries)+"\"\n"
+-				  +"user=\""+user+"\"\naddressee=\""+addressee+"\"\nsubject=\""+subject+"\"\n")
++					+"starttime=\""+time.ctime(starttime)+"\"\ntries=\""+str(tries)+"\"\n"
++					+"user=\""+user+"\"\naddressee=\""+addressee+"\"\nsubject=\""+subject+"\"\n")
+ 				if (tries>=max_tries):
+ 					movejob(job_fax,sendq,failed,user)
+ 					capisuite.log("job "+job_fax+": failed finally",1)
+ 					mailtext="I'm sorry, but your fax job to "+addressee+" ("+dialstring \
+-					  +") failed finally.\n\nSubject: "+subject \
+-					  +"\nFilename: "+job_fax+"\nTries: "+str(tries) \
+-					  +"\nLast result: 0x%x/0x%x" % (result,resultB3) \
+-					  +"\n\nIt was moved to file://"+failed+user+"-"+job_fax
++						+") failed finally.\n\nSubject: "+subject \
++						+"\nFilename: "+job_fax+"\nTries: "+str(tries) \
++						+"\nLast result: 0x%x/0x%x" % (result,resultB3) \
++						+"\n\nIt was moved to file://"+failed+user+"-"+job_fax
+ 					cs_helpers.sendSimpleMail(fromaddress,mailaddress,
+-					  "Fax to "+addressee+" ("+dialstring+") FAILED.",
+-					  mailtext)
++						"Fax to "+addressee+" ("+dialstring+") FAILED.",
++						mailtext)
+ 
+ 			fcntl.lockf(lockfile,fcntl.LOCK_UN)
+ 			lockfile.close()
+@@ -149,7 +150,7 @@
+ 		if (stationID==None):
+ 			capisuite.error("Warning: fax_stationID for user "+user+" not set")
+ 			stationID=""
+- 		headline=cs_helpers.getOption(config,user,"fax_headline","")
++		headline=cs_helpers.getOption(config,user,"fax_headline","")
+ 		(call,result)=capisuite.call_faxG3(capi,controller,outgoing_nr,dialstring,timeout,stationID,headline)
+ 		if (result!=0):
+ 			return(result,0)
diff --git a/net-dialup/capisuite/files/digest-capisuite-0.4.5-r4 b/net-dialup/capisuite/files/digest-capisuite-0.4.5-r4
new file mode 100644
index 000000000000..38c12bea5c04
--- /dev/null
+++ b/net-dialup/capisuite/files/digest-capisuite-0.4.5-r4
@@ -0,0 +1,3 @@
+MD5 2197c8650be74db8904c7e54ff43ab7b capisuite-0.4.5.tar.gz 1184603
+RMD160 f28b9cb42a6cfa6d790ec76e74a33a0b7a799762 capisuite-0.4.5.tar.gz 1184603
+SHA256 3e94e42eae6477a222c608c2cd040568fd9fcfa4e8eb0b06a538175d44cbae96 capisuite-0.4.5.tar.gz 1184603