fixed 64-Bit issue in recvdev.cpp, see bug #145982.

Package-Manager: portage-2.1.2_pre2-r1

5 files changed, 192 insertions, 5 deletions

diff --git a/net-misc/capi4hylafax/ChangeLog b/net-misc/capi4hylafax/ChangeLog
index 48618558d008..cab76e462da7 100644
--- a/net-misc/capi4hylafax/ChangeLog
+++ b/net-misc/capi4hylafax/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/capi4hylafax
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/ChangeLog,v 1.19 2006/09/30 00:03:05 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/ChangeLog,v 1.20 2006/10/04 00:23:04 sbriesen Exp $
+
+*capi4hylafax-01.03.00.99.300.3-r1 (04 Oct 2006)
+
+  04 Oct 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/capi4hylafax-01.03.00.99.300.3-recvdev.diff,
+  +capi4hylafax-01.03.00.99.300.3-r1.ebuild:
+  fixed 64-Bit issue in recvdev.cpp, see bug #145982.
 
 *capi4hylafax-01.03.00.99.300.3 (30 Sep 2006)
 
diff --git a/net-misc/capi4hylafax/Manifest b/net-misc/capi4hylafax/Manifest
index dddc9dd2aad4..d18433f7136b 100644
--- a/net-misc/capi4hylafax/Manifest
+++ b/net-misc/capi4hylafax/Manifest
@@ -1,3 +1,7 @@
+AUX capi4hylafax-01.03.00.99.300.3-recvdev.diff 973 RMD160 5fa7ae4b9a3f0684710cb42ad79ef6412d972f0b SHA1 dd18f9abc7ec3b6366f806d889e79fcf9744f0f4 SHA256 9f6d45c7de27846a0b233c8e706c4b360d56266b034dc17588ecf5dba2ee604d
+MD5 8d90d2de45e42bd3e8c5ad546ce98cb2 files/capi4hylafax-01.03.00.99.300.3-recvdev.diff 973
+RMD160 5fa7ae4b9a3f0684710cb42ad79ef6412d972f0b files/capi4hylafax-01.03.00.99.300.3-recvdev.diff 973
+SHA256 9f6d45c7de27846a0b233c8e706c4b360d56266b034dc17588ecf5dba2ee604d files/capi4hylafax-01.03.00.99.300.3-recvdev.diff 973
 AUX capi4hylafax.confd 555 RMD160 1ef65c363b828d5a9651c88b21c6de2aec1d278c SHA1 69f8dd0c5c042646156218d2255d21ba5060f89c SHA256 f61418080f0c7fa5cca6197fa00b007224124e9aa78b4efdb2c9e0e7005fbea3
 MD5 6fefb76ecf87f585bb2144297b7c28d6 files/capi4hylafax.confd 555
 RMD160 1ef65c363b828d5a9651c88b21c6de2aec1d278c files/capi4hylafax.confd 555
@@ -14,14 +18,18 @@ EBUILD capi4hylafax-01.03.00.3.ebuild 4245 RMD160 1188697db5e4a1c9c01902c2ee23c1
 MD5 25be23849559d7fe2bdf2918e3cc2bd4 capi4hylafax-01.03.00.3.ebuild 4245
 RMD160 1188697db5e4a1c9c01902c2ee23c1975782e373 capi4hylafax-01.03.00.3.ebuild 4245
 SHA256 a936ae0ece0de7b4c69d7283f8aaa6d4aff9b8dc59ac45850ed2a7bc57761dad capi4hylafax-01.03.00.3.ebuild 4245
+EBUILD capi4hylafax-01.03.00.99.300.3-r1.ebuild 4404 RMD160 47041b7a1dbbf0d18c780ec6a5a3d60553201574 SHA1 56a15a3dc1bfa1715bac326dce3b13b79619a3a5 SHA256 4667dbf0ac3f8831a3c76329001603a2da7fa4e8fd93d4e757f8de7b13545139
+MD5 3854f4647d2023742449208c92928385 capi4hylafax-01.03.00.99.300.3-r1.ebuild 4404
+RMD160 47041b7a1dbbf0d18c780ec6a5a3d60553201574 capi4hylafax-01.03.00.99.300.3-r1.ebuild 4404
+SHA256 4667dbf0ac3f8831a3c76329001603a2da7fa4e8fd93d4e757f8de7b13545139 capi4hylafax-01.03.00.99.300.3-r1.ebuild 4404
 EBUILD capi4hylafax-01.03.00.99.300.3.ebuild 4300 RMD160 5ff05fed75f26b05c2447e1065990f178255c610 SHA1 0e9af76315b8a2234e1ae352dfc85eb36cecf3f7 SHA256 85cffefca4212882a90c2fe1ac588582d79b5dbf24be0ee986447d2225855160
 MD5 658d972e91f45d48eb0897d9399aa68e capi4hylafax-01.03.00.99.300.3.ebuild 4300
 RMD160 5ff05fed75f26b05c2447e1065990f178255c610 capi4hylafax-01.03.00.99.300.3.ebuild 4300
 SHA256 85cffefca4212882a90c2fe1ac588582d79b5dbf24be0ee986447d2225855160 capi4hylafax-01.03.00.99.300.3.ebuild 4300
-MISC ChangeLog 3187 RMD160 a72e53c9046cb08b8d6b2d30966b262f4b910ba9 SHA1 320b23b161d6e1b8b73b0582a36409c8062f7c7a SHA256 391fe50199023152dfb90aa45a7428d8a7def9122f770b8628eabacb9dd13f84
-MD5 2461f3cbb64494c4f53adcd048227201 ChangeLog 3187
-RMD160 a72e53c9046cb08b8d6b2d30966b262f4b910ba9 ChangeLog 3187
-SHA256 391fe50199023152dfb90aa45a7428d8a7def9122f770b8628eabacb9dd13f84 ChangeLog 3187
+MISC ChangeLog 3446 RMD160 23a56097499a84b029bc58251cf035d468ca141d SHA1 2a5f789ee7fdd875e92b146baad16e49cbc07a78 SHA256 878a7b41823151001bbbc3e3790d35822a6a6d8339f9081c95e9f9bb2bea2443
+MD5 f941113c425521705acd27c089e9f438 ChangeLog 3446
+RMD160 23a56097499a84b029bc58251cf035d468ca141d ChangeLog 3446
+SHA256 878a7b41823151001bbbc3e3790d35822a6a6d8339f9081c95e9f9bb2bea2443 ChangeLog 3446
 MISC metadata.xml 774 RMD160 83e385eab3e03dd6d86cd0b1f97fcb7bfe7c80f2 SHA1 88b9b9702ca14797953cc2db52a9e69e11db7718 SHA256 66c01472fce6921767f22c34c3ddf3c079e6bc5ea27e77373e70183e08f901f4
 MD5 4b5e5de33ef080a46f770249b2683500 metadata.xml 774
 RMD160 83e385eab3e03dd6d86cd0b1f97fcb7bfe7c80f2 metadata.xml 774
@@ -32,3 +40,6 @@ SHA256 8a5d00d9fe9e81ef92c574962ac7fa5b30455cf03ce4eafbe2cd382c3b38e407 files/di
 MD5 b7807a0504c56f47662001df6d78932f files/digest-capi4hylafax-01.03.00.99.300.3 620
 RMD160 9083681d7c0d440fa49ceba5c4d7378b3bd37df8 files/digest-capi4hylafax-01.03.00.99.300.3 620
 SHA256 a7206c242f27968ddd14af47873f27bf11f0ee0650f6fc5ad226f3d94d614063 files/digest-capi4hylafax-01.03.00.99.300.3 620
+MD5 b7807a0504c56f47662001df6d78932f files/digest-capi4hylafax-01.03.00.99.300.3-r1 620
+RMD160 9083681d7c0d440fa49ceba5c4d7378b3bd37df8 files/digest-capi4hylafax-01.03.00.99.300.3-r1 620
+SHA256 a7206c242f27968ddd14af47873f27bf11f0ee0650f6fc5ad226f3d94d614063 files/digest-capi4hylafax-01.03.00.99.300.3-r1 620
diff --git a/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.3-r1.ebuild b/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.3-r1.ebuild
new file mode 100644
index 000000000000..dc50f608317e
--- /dev/null
+++ b/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.3-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.3-r1.ebuild,v 1.1 2006/10/04 00:23:04 sbriesen Exp $
+
+inherit eutils versionator
+
+FAX_SPOOL_DIR="/var/spool/fax"
+
+MY_PV1="$(get_version_component_range 1-4)"
+MY_PV2="$(get_version_component_range 5)"
+MY_PV3="$(get_version_component_range 6)"
+MY_P="${PN}_${MY_PV1}.svn.${MY_PV2}"
+
+DESCRIPTION="capi4hylafax adds a faxcapi modem to the hylafax enviroment."
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/capi4hylafax/${MY_P}.orig.tar.gz
+		http://ftp.debian.org/debian/pool/main/c/capi4hylafax/${MY_P}-${MY_PV3}.diff.gz"
+HOMEPAGE="http://packages.qa.debian.org/c/capi4hylafax.html"
+
+S="${WORKDIR}/${PN}-svn"
+
+IUSE="unicode"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="net-dialup/capi4k-utils
+	media-libs/tiff
+	media-libs/jpeg
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	dev-util/dialog"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# apply debian patches + update configs
+	epatch "${WORKDIR}/${MY_P}-${MY_PV3}.diff"
+
+	# apply bugfix patch (see bug #145982)
+	epatch "${FILESDIR}/${P}-recvdev.diff"
+
+	# run libtoolize	
+	libtoolize --copy --force
+
+	# fix location of fax spool
+	for i in config.faxCAPI Readme_src src/defaults.h.in debian/*.1; do
+		[ -f "${i}" ] && sed -i -e "s:/var/spool/hylafax:${FAX_SPOOL_DIR}:g" "${i}"
+	done
+
+	# fix location of fax config
+	sed -i -e "s:/etc/hylafax:${FAX_SPOOL_DIR}/etc:g" setupconffile
+
+	# fix name and location of logfile
+	sed -i -e "s:/var/spool/fax/log/capi4hylafax:/var/log/${PN}.log:" config.faxCAPI
+	sed -i -e "s:/tmp/capifax.log:/var/log/${PN}.log:" src/defaults.h.in config.faxCAPI
+
+	# patch man pages
+	sed -i -e "s:/usr/share/doc/capi4hylafax/:/usr/share/doc/${PF}/html/:g" \
+		-e "s:c2send:c2faxsend:g" -e "s:c2recv:c2faxrecv:g" \
+		-e "s:CAPI4HYLAFAXCONFIG \"1\":C2FAXADDMODEM \"8\":g" \
+		-e "s:capi4hylafaxconfig:c2faxaddmodem:g" debian/*.1
+	cp -f debian/capi4hylafaxconfig.1 debian/c2faxaddmodem.8
+
+	# if specified, convert all relevant files from latin1 to UTF-8
+	if use unicode; then
+		for i in config.faxCAPI; do
+			einfo "Converting ${i} to UTF-8"
+			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+		done
+	fi
+}
+
+src_compile() {
+	econf --with-hylafax-spooldir="${FAX_SPOOL_DIR}" || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	keepdir "${FAX_SPOOL_DIR}"/{etc,recvq,pollq,log,status}
+	fowners uucp:uucp "${FAX_SPOOL_DIR}" "${FAX_SPOOL_DIR}"/{etc,recvq,pollq,log,status}
+	fperms 0700 "${FAX_SPOOL_DIR}"
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# install setup script
+	newsbin setupconffile c2faxaddmodem
+
+	# install sample config
+	insinto "${FAX_SPOOL_DIR}/etc"
+	newins config.faxCAPI config.faxCAPI.default
+
+	# install docs
+	dodoc AUTHORS ChangeLog Readme_src
+	newdoc debian/changelog ChangeLog.debian
+	dohtml README.html LIESMICH.html
+
+	# install man pages
+	doman debian/c2fax*.[18]
+
+	# install examples
+	insinto /usr/share/doc/${PF}/examples
+	doins sample_faxrcvd faxrcvd config.faxCAPI fritz_pic.tif GenerateFileMail.pl
+	newins sample_AVMC4_config.faxCAPI config.faxCAPI_AVMC4
+	newins debian/faxsend sample_faxsend
+
+	# finally install init-script + config
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
+
+pkg_postinst() {
+	einfo "To use capi4hylafax:"
+	einfo "Make sure that your isdn/capi devices are owned by"
+	einfo "the \"uucp\" user (see udev or devfsd config)."
+	einfo "Modify ${FAX_SPOOL_DIR}/etc/config.faxCAPI"
+	einfo "to suit your system."
+
+	if [ -f "${FAX_SPOOL_DIR}/etc/config.faxCAPI" ]; then
+		einfo
+		einfo "If you're upgrading from a previous version"
+		einfo "please check for new or changed options."
+		einfo "A sample default config is installed as:"
+		einfo "${FAX_SPOOL_DIR}/etc/config.faxCAPI.default"
+	else
+		# install default config
+		cp -f "${FAX_SPOOL_DIR}/etc/config.faxCAPI.default" \
+			"${FAX_SPOOL_DIR}/etc/config.faxCAPI"
+	fi
+
+	einfo
+	einfo "You should also check special options in:"
+	einfo "/etc/conf.d/${PN}"
+	einfo
+	einfo "If you want to use capi4hylafax together with"
+	einfo "hylafax, then please emerge net-misc/hylafax"
+	einfo
+	einfo "Then append the following line to your hylafax"
+	einfo "config file (${FAX_SPOOL_DIR}/etc/config):"
+	einfo "SendFaxCmd:             /usr/bin/c2faxsend"
+}
diff --git a/net-misc/capi4hylafax/files/capi4hylafax-01.03.00.99.300.3-recvdev.diff b/net-misc/capi4hylafax/files/capi4hylafax-01.03.00.99.300.3-recvdev.diff
new file mode 100644
index 000000000000..ae56d740c929
--- /dev/null
+++ b/net-misc/capi4hylafax/files/capi4hylafax-01.03.00.99.300.3-recvdev.diff
@@ -0,0 +1,20 @@
+--- src/faxrecv/recvdev.cpp.orig	2006-08-15 11:13:33.000000000 +0200
++++ src/faxrecv/recvdev.cpp	2006-10-04 02:09:46.000000000 +0200
+@@ -114,7 +114,7 @@
+     CMultiString   tmpDDIs;
+     CMultiString   tmpMSNs;
+     CMultiString  *pMSNs;
+-    tSize          FindPos;
++    tUInt          FindPos;
+ 
+     ConfigAssignment_Item CntrlAssignments[] = {
+         { "Controller",       ConfigAssignment_UInt,       &tmpController },
+@@ -162,7 +162,7 @@
+                     MSNlauf->RemoveChars ((tChar *)" \t_()[]{}\"'`TtPp,.:;");
+                     if (MSNlauf->IsEmpty() == vFalse) {
+                         FindPos = MSNlauf->FindChar ('-');
+-                        if (FindPos == MAXVAL_tSize) {
++                        if (FindPos == MAXVAL_tUInt) {
+                             dprint ("Add MSN-Value=(%s) ", MSNlauf->GetPointer());
+                             switch (CIPMSNList.AddMSN (tmpController, MSNlauf)) {
+                             case iErr_OutOfMemory:
diff --git a/net-misc/capi4hylafax/files/digest-capi4hylafax-01.03.00.99.300.3-r1 b/net-misc/capi4hylafax/files/digest-capi4hylafax-01.03.00.99.300.3-r1
new file mode 100644
index 000000000000..46f1f6ec12fb
--- /dev/null
+++ b/net-misc/capi4hylafax/files/digest-capi4hylafax-01.03.00.99.300.3-r1
@@ -0,0 +1,6 @@
+MD5 641d17f1c4bb681ba526cff44cd18b6e capi4hylafax_01.03.00.99.svn.300-3.diff.gz 155360
+RMD160 2001d97e99e938823d922d800ba85df74200f520 capi4hylafax_01.03.00.99.svn.300-3.diff.gz 155360
+SHA256 dec167255e2307d12b5093e11ddbb6b1f96d0ac94985643579cfd6b534313ed2 capi4hylafax_01.03.00.99.svn.300-3.diff.gz 155360
+MD5 af2610c5219e89ef9dc47eead30276b4 capi4hylafax_01.03.00.99.svn.300.orig.tar.gz 533410
+RMD160 163374cfcaa91909a5f70169203aa6c7df6a590d capi4hylafax_01.03.00.99.svn.300.orig.tar.gz 533410
+SHA256 8c5433fda85d5f178382c0a4fbc07cf22fc22c448146a4b7a090bc6a0b1789c2 capi4hylafax_01.03.00.99.svn.300.orig.tar.gz 533410