Added date-header patch for cs_helpers.py, thanks to Torben Janssen (see bug #96540)

(Portage version: 2.0.51.22-r1)

5 files changed, 125 insertions, 11 deletions

diff --git a/net-dialup/capisuite/ChangeLog b/net-dialup/capisuite/ChangeLog
index 1d126b0dd8cb..f35e7d7c3e38 100644
--- a/net-dialup/capisuite/ChangeLog
+++ b/net-dialup/capisuite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/capisuite
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.18 2005/06/04 15:53:51 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.19 2005/06/20 20:26:54 sbriesen Exp $
+
+*capisuite-0.4.5-r2 (20 Jun 2005)
+
+  20 Jun 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/capisuite-0.4.5-date-header.patch, +capisuite-0.4.5-r2.ebuild:
+  Added date-header patch for cs_helpers.py, thanks to Torben Janssen (see bug
+  #96540)
 
 *capisuite-0.4.5-r1 (04 Jun 2005)
 
diff --git a/net-dialup/capisuite/Manifest b/net-dialup/capisuite/Manifest
index 33094b0021b2..b40b476ceb8b 100644
--- a/net-dialup/capisuite/Manifest
+++ b/net-dialup/capisuite/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0294f1d40412a7a1a5e64f10ad4ba22f capisuite-0.4.5-r1.ebuild 2099
 MD5 017f50ded5070f5b725deda3ba7d7e9e capisuite-0.4.5.3.ebuild 1796
 MD5 9a1a55d18f62b4adcfa40bcf19eefba2 capisuite-0.4.5.ebuild 1357
+MD5 634988a308dc08d9d386df5ac0da0cd0 capisuite-0.4.5-r2.ebuild 2194
 MD5 b93abbab72cb71fba0fad75ce24472ab ChangeLog 3175
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 63b5890053139f14a3d3baf78812e0bc files/capisuite-fax-compatibility.patch 423
@@ -12,14 +10,9 @@ MD5 d0b0dd46c8f863d3849ee1ce118da842 files/capisuite-0.4.5-gentoo.patch 1979
 MD5 ae0010a9739f9b1273dd9a679d43d913 files/capisuite-0.4.5-capi4linux_v3.diff 4395
 MD5 b6dc0c2a3cd0d7fb36b716a0e6514186 files/digest-capisuite-0.4.5 68
 MD5 bd2ad19acf9244ce2fcfaa06ad5f53e1 files/capisuite.logrotated 1003
+MD5 135be011248d6215905132143e6a7dab files/capisuite-0.4.5-date-header.patch 821
 MD5 b89c96393c676a2977e9b0b55b553b9f files/capisuite-0.4.5-capiv3.patch 2151
 MD5 f8cc369b2ad959cf9f00457f2729d5da files/digest-capisuite-0.4.5.3 137
 MD5 b6dc0c2a3cd0d7fb36b716a0e6514186 files/digest-capisuite-0.4.5-r1 68
+MD5 b6dc0c2a3cd0d7fb36b716a0e6514186 files/digest-capisuite-0.4.5-r2 68
 MD5 78748205ff049b27b92175e818a06e0d files/capisuite.initd 1417
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCodmpI1lqEGTUzyQRArJFAJ9vWkd5S1JcSqrdNzEdKxnZgM33PwCg1yE3
-79Vh0d0TWBl224F+oRTNSd0=
-=2YgU
------END PGP SIGNATURE-----
diff --git a/net-dialup/capisuite/capisuite-0.4.5-r2.ebuild b/net-dialup/capisuite/capisuite-0.4.5-r2.ebuild
new file mode 100644
index 000000000000..cd8fddb23eda
--- /dev/null
+++ b/net-dialup/capisuite/capisuite-0.4.5-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/06/20 20:26:54 sbriesen Exp $
+
+inherit eutils 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
+	virtual/libc
+	sys-devel/automake
+	>=sys-devel/autoconf-2.50
+	media-sound/sox
+	media-libs/tiff
+	media-gfx/jpeg2ps
+	media-gfx/sfftobmp
+	virtual/ghostscript"
+RDEPEND="${DEPEND}
+	net-dialup/capi4k-utils
+	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
+}
+
+src_compile() {
+	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 "parallel make 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 INSTALL 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/lib/python${PYVER}/site-packages/cs_helpers.py
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
+}
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-date-header.patch b/net-dialup/capisuite/files/capisuite-0.4.5-date-header.patch
new file mode 100644
index 000000000000..76738fb78a74
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-date-header.patch
@@ -0,0 +1,26 @@
+--- scripts/cs_helpers.pyin.orig	2004-11-28 14:35:23.000000000 +0100
++++ scripts/cs_helpers.pyin	2005-06-19 20:55:49.000000000 +0200
+@@ -10,6 +10,7 @@
+ #  (at your option) any later version.
+ 
+ import os
++import time
+ 
+ # the name of the config file read by the scripts; see there for options and
+ # descriptions
+@@ -170,6 +171,7 @@
+ 	msg['Subject']=mail_subject
+ 	msg['From']=mail_from
+ 	msg['To']=mail_to
++	msg['Date']=time.strftime('%a, %d %b %Y %H:%M:%S %z')
+ 
+ 	msg.preamble = 'This is a Multipart-MIME-message. Please use a capable mailer.\n'
+ 	msg.epilogue = '' # To guarantee the message ends with a newline
+@@ -267,6 +269,7 @@
+ 	msg['Subject'] = mail_subject
+ 	msg['From'] = mail_from
+ 	msg['To'] = mail_to
++	msg['Date'] = time.strftime('%a, %d %b %Y %H:%M:%S %z')
+ 
+ 	try:
+ 		server = smtplib.SMTP('localhost')
diff --git a/net-dialup/capisuite/files/digest-capisuite-0.4.5-r2 b/net-dialup/capisuite/files/digest-capisuite-0.4.5-r2
new file mode 100644
index 000000000000..cd9a1796e371
--- /dev/null
+++ b/net-dialup/capisuite/files/digest-capisuite-0.4.5-r2
@@ -0,0 +1 @@
+MD5 2197c8650be74db8904c7e54ff43ab7b capisuite-0.4.5.tar.gz 1184603