added ppp-2.4.5 support, redesigned pppd version detection.

Package-Manager: portage-2.2_rc77/cvs/Linux x86_64

3 files changed, 176 insertions, 2 deletions

diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog
index b1ccfb8375ac..da07ff7aa221 100644
--- a/net-dialup/capi4k-utils/ChangeLog
+++ b/net-dialup/capi4k-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/capi4k-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.66 2010/07/21 14:03:38 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.67 2010/09/08 23:58:29 sbriesen Exp $
+
+*capi4k-utils-20050718-r5 (08 Sep 2010)
+
+  08 Sep 2010; Stefan Briesenick <sbriesen@gentoo.org>
+  +capi4k-utils-20050718-r5.ebuild:
+  added ppp-2.4.5 support, redesigned pppd version detection.
 
 *capi4k-utils-20050718-r4 (21 Jul 2010)
 
diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest
index 78f9215aca32..825b185c2183 100644
--- a/net-dialup/capi4k-utils/Manifest
+++ b/net-dialup/capi4k-utils/Manifest
@@ -12,10 +12,13 @@ AUX capi20-types.diff 268 RMD160 ba48d076fd4570bbbd65ea5a6583f949414c36b5 SHA1 7
 AUX config 195 RMD160 73c580942621e1e4fcbe75c7953c5122206be67f SHA1 6eb4ac945b8a4811f74a407b3fe92aa0e352e970 SHA256 961697c42ebbf04ba5f0e9b7aa84129580445e80ebc4ab3d8fafa6dae0987717
 AUX rcapid.xinetd 236 RMD160 070f398e02331f62849d0ff9469beae6d14076ef SHA1 ba58782573aa19545c97b8b28552d67a96197608 SHA256 c0bed83e2e4b7eb08ef7be5f2d3ee0de97cbbb45f5043a9d037c0daca4ebf595
 DIST capi4k-files-20050718-r4.tar.xz 3864 RMD160 a06c303953bfbc386f04939bd367bdadd2c230cb SHA1 ead92900de2759f1ade47cf9790cd5ad1e237121 SHA256 ffeb2985c5eea7b64f95ac94e7f1065921b141a07b1b3c1e79f660edf20176a8
+DIST capi4k-files-20050718-r5.tar.xz 3864 RMD160 a06c303953bfbc386f04939bd367bdadd2c230cb SHA1 ead92900de2759f1ade47cf9790cd5ad1e237121 SHA256 ffeb2985c5eea7b64f95ac94e7f1065921b141a07b1b3c1e79f660edf20176a8
 DIST capi4k-patches-20050718-r3.tar.bz2 11871 RMD160 010ef7c6f7cdfc87c7d4ef7622407a5d596c3600 SHA1 429f54974716ea4b3c4379d81bad507eb7739466 SHA256 aa085e7ce700e3a698af99675da419952e6afd8d76b9c641faedc098547c08b3
 DIST capi4k-patches-20050718-r4.tar.xz 12288 RMD160 1b9b5d67f4f1cae6b44fce25c4cec476b29348a7 SHA1 d65f9a2044e87b3cdcf73b97f7007ad84a268f48 SHA256 3b6b5f9e57a027a35ad930c7b543ec845b5c4219d30a369b08fdf0167c2bbd7f
+DIST capi4k-patches-20050718-r5.tar.xz 12564 RMD160 242e9d3c6740b253bb40fbccf25118a2d094cc53 SHA1 f8b34609945ee81b0d840db6c077a51920577fc5 SHA256 e390c9a87b9b31a6934198a2c6e9e99f0dea43daa8a04ce604f13ae72c1ee24b
 DIST capi4k-utils-2005-07-18.tar.gz 862826 RMD160 cadd13328aeef50ab26218614176b4f368b0b19d SHA1 df8590d2b933d8230838667666790ca0ba708b5c SHA256 b162d726a31310fc29e7c0a25a4f82a590457f6a95c1b1168bcd72b6497b5746
 EBUILD capi4k-utils-20050718-r3.ebuild 5342 RMD160 cb53d5cdaf18142a141b4130c62a9d928da22e5b SHA1 e96cade9bb44da0e9aeebb147c8bf0fc659f2804 SHA256 296584e007f4bac12693d73e3f82b51d4814d133b0da696977501ecf5ed9b0f3
 EBUILD capi4k-utils-20050718-r4.ebuild 4698 RMD160 59e7dc52331e80f86d04a2f07dfe91d2e56a1bad SHA1 d449f4a93494f2fba428a9f705e444435d7c97b9 SHA256 0a08fe6a1c600cbb1cfdc5832884dbc05f7aa781767c12137b4d197316dcedfe
-MISC ChangeLog 11813 RMD160 524baed642ab85a1cba4ffc4fd9cbedc221a1b7b SHA1 84ba07991a8e758a9c8847687194302a99591487 SHA256 c79c750ea0d7555a77c8de7e3ab7bb42a32f8d77c79f6524130163c0fe24159d
+EBUILD capi4k-utils-20050718-r5.ebuild 5621 RMD160 e6df40d63542dec522788db901a9b3a56747c93d SHA1 fb50e31d30549cbd62744b7369ba2c91c98d9246 SHA256 e4a945ea29d4532eb5c402aeefb7405bf56545a862c904bfec5d69da0ae7ac3c
+MISC ChangeLog 12008 RMD160 c4fd6cce7d994f39aabf86c0ebf3537f2893f41c SHA1 9f574434e1470b2c4d71279f9e174864871aef64 SHA256 1411de0878e8d02a2406fbb8655d3223b6ea7e7eddb7fb779b6627028045032f
 MISC metadata.xml 801 RMD160 8eec4a9c8021dea927a98c83dc555036986405ff SHA1 597751618d11d6d3e7ded29873c171bc92ea90d7 SHA256 1ad2f48b7193700efce6c70e7bde59186d3f6b28ad9aaee3fa6b39cab1113ee8
diff --git a/net-dialup/capi4k-utils/capi4k-utils-20050718-r5.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20050718-r5.ebuild
new file mode 100644
index 000000000000..3277ce7cccef
--- /dev/null
+++ b/net-dialup/capi4k-utils/capi4k-utils-20050718-r5.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r5.ebuild,v 1.1 2010/09/08 23:58:29 sbriesen Exp $
+
+EAPI="3"
+
+inherit eutils multilib linux-info
+
+YEAR_PV="${PV:0:4}"
+MON_PV="${PV:4:2}"
+DAY_PV="${PV:6:2}"
+MY_P="${PN}-${YEAR_PV}-${MON_PV}-${DAY_PV}"
+
+DESCRIPTION="CAPI4Linux Utils"
+HOMEPAGE="ftp://ftp.in-berlin.de/pub/capi4linux/"
+SRC_URI="ftp://ftp.in-berlin.de/pub/capi4linux/${MY_P}.tar.gz
+	ftp://ftp.in-berlin.de/pub/capi4linux/OLD/${MY_P}.tar.gz
+	http://sbriesen.de/gentoo/distfiles/${PF/utils/files}.tar.xz
+	http://sbriesen.de/gentoo/distfiles/${PF/utils/patches}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="fax pppd rcapid"
+
+COMMON_DEP="pppd? ( net-dialup/ppp )"
+
+DEPEND="${COMMON_DEP}
+	virtual/linux-sources
+	virtual/os-headers
+	app-arch/xz-utils
+	>=sys-apps/sed-4"
+
+RDEPEND="${COMMON_DEP}
+	dev-lang/perl"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	# check kernel config
+	CONFIG_CHECK="~ISDN ~ISDN_CAPI ~ISDN_CAPI_CAPI20"
+	use pppd && CONFIG_CHECK="${CONFIG_CHECK} ~ISDN_CAPI_MIDDLEWARE ~ISDN_CAPI_CAPIFS_BOOL"
+	get_version  # config checked later in pkg_postinst
+
+	# find installed pppd version
+	if use pppd; then
+		PPPVERSION=$(/usr/sbin/pppd 2>&1 --version | sed -n "s:^.* \([0-9.]\+\)\$:\1:p")
+		if [ -n "${PPPVERSION}" ]; then
+			einfo "Found installed pppd version:"
+			einfo "    pppd version ${PPPVERSION}"
+		else
+			die "No pppd installation found"
+		fi
+	fi
+}
+
+src_prepare() {
+	# add ppp-2.4.4 support
+	epatch "${WORKDIR}/capi4k-patches/pppd244.diff"
+
+	# add ppp-2.4.5 support
+	epatch "${WORKDIR}/capi4k-patches/pppd245.diff"
+
+	# apply rcapid patches
+	epatch "${WORKDIR}/capi4k-patches/rcapid.diff"
+
+	# apply msg2str-safety patch (see bug #170870)
+	epatch "${WORKDIR}/capi4k-patches/msg2str-safety.diff"
+
+	# apply capi20.h patches (needed for glibc-2.7)
+	epatch "${WORKDIR}/capi4k-patches/capi20-include.diff"
+
+	# set our config
+	cp -f "${WORKDIR}/capi4k-files/config" .config
+	# patch all Makefile.* and Rules.make to use our CFLAGS
+	sed -i -e "s:^\(CFLAGS.*\)-O2:\1${CFLAGS}:g" */Makefile.* */Rules.make || die "sed failed"
+	# patch capi20/Makefile.* to use -fPIC for shared library
+	sed -i -e "s:^\(CFLAGS.*\):\1 -fPIC:g" capi20/Makefile.* || die "sed failed"
+	# patch pppdcapiplugin/Makefile to use only the ppp versions we want
+	sed -i -e "s:^\(PPPVERSIONS = \).*$:\1${PPPVERSION}:g" pppdcapiplugin/Makefile || die "sed failed"
+	# patch capiinit/capiinit.c to look also in /lib/firmware
+	sed -i -e "s:\(\"/lib/firmware/isdn\",\):\1 \"/lib/firmware\",:g" capiinit/capiinit.c || die "sed failed"
+	# no, we don't need any devices nodes
+	sed -i -e "s:\(sh scripts/makedev.sh\):echo \1:g" Makefile || die "sed failed"
+	# add --libdir to configure call in Makefile
+	sed -i -e "s:\(\./configure \):\1--libdir=/usr/$(get_libdir) :g" Makefile || die "sed failed"
+	# patch /usr/lib/pppd in pppdcapiplugin tree
+	sed -i -e "s:/usr/lib/pppd:/usr/$(get_libdir)/pppd:g" \
+		pppdcapiplugin/ppp-*/Makefile pppdcapiplugin/{README,*.8} || die "sed failed"
+	# respecting LDFLAGS (see bug #293209)
+	sed -i -e "s:^LDFLAGS\s\(\s*\)=:LDFLAGS+\1=:g" \
+		{capiinfo,capiinit,capifax,rcapid,avmb1}/Makefile* pppdcapiplugin/Rules.make
+	# build rcapid
+	use rcapid || sed -i -e "s:^\(CONFIG_RCAPID=.*\)$:# \1:g" .config
+	# build pppdcapiplugin
+	if use pppd; then
+		[ -d "pppdcapiplugin/ppp-${PPPVERSION}" ] || die "ERROR: no pppdcapiplugin for version ${PPPVERSION}"
+	else
+		sed -i -e "s:^\(CONFIG_PPPDCAPIPLUGIN=.*\)$:# \1:g" .config
+	fi
+	# build capifax
+	use fax || sed -i -e "s:^\(CONFIG_CAPIFAX=.*\)$:# \1:g" .config
+}
+
+src_configure() {
+	emake subconfig || die "emake subconfig failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# install base
+	dobin scripts/isdncause
+	newinitd "${WORKDIR}/capi4k-files/capi.initd" capi
+	newconfd "${WORKDIR}/capi4k-files/capi.confd" capi
+	insinto /etc
+	doins "${WORKDIR}/capi4k-files/capi.conf"
+	dodoc "${WORKDIR}/capi4k-files/README.gentoo" scripts/makedev.sh
+
+	# install rcapid stuff
+	if use rcapid; then
+		insinto /etc/xinetd.d
+		newins "${WORKDIR}/capi4k-files/rcapid.xinetd" rcapid
+		newdoc rcapid/README README.rcapid
+	fi
+
+	# install pppdcapiplugin stuff
+	if use pppd; then
+		insinto /etc/ppp/peers
+		doins pppdcapiplugin/peers/t-dsl
+		docinto pppdcapiplugin
+		dodoc pppdcapiplugin/README pppdcapiplugin/examples/*
+		# fixing permissions (see bug #136120)
+		fperms 0644 /usr/share/man/man8/capiplugin.8
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "Please read the instructions in README.gentoo in:"
+	elog "/usr/share/doc/${PF}/"
+	elog
+	elog "Annotation for active AVM ISDN boards (B1 ISA/PCI, ...):"
+	elog "If you run"
+	elog "  emerge isdn-firmware"
+	elog "you will probably find your board's firmware in /lib/firmware."
+	elog
+	elog "If you have another active ISDN board, you should create"
+	elog "/lib/firmware and copy there your board's firmware."
+	elog
+	ewarn "If you're upgrading from an older capi4k-utils, you must recompile"
+	ewarn "the other packages on your system that link with libcapi after the"
+	ewarn "upgrade completes. To perform this action, please run revdep-rebuild"
+	ewarn "in package app-portage/gentoolkit."
+	if use pppd; then
+		ewarn
+		ewarn "If you're upgrading net-dialup/ppp you have to recompile"
+		ewarn "capi4k-utils to get the capiplugin for your pppd version."
+	fi
+	elog
+	elog "If any of the following kernel configuration options is missing, you"
+	elog "should reconfigure and rebuild your kernel before using capi4k-utils."
+	linux-info_pkg_setup
+	elog
+}