import from #71022

9 files changed, 266 insertions, 13 deletions

diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog
index 983cd732c4c6..ab38975e7bd3 100644
--- a/net-dialup/capi4k-utils/ChangeLog
+++ b/net-dialup/capi4k-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/capi4k-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.17 2004/11/10 22:39:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.18 2004/11/13 10:29:19 mrness Exp $
+
+*capi4k-utils-20041006-r2 (13 Nov 2004)
+
+  13 Nov 2004; Alin Nastac <mrness@gentoo.org> +files/20041006/README.gentoo,
+  +files/20041006/capi.init, +files/20041006/capi4k-utils.patch,
+  +files/20041006/config, +files/20041006/rcapid.xinetd,
+  +capi4k-utils-20041006-r2.ebuild:
+  Import from #71022, thanks to Stefan Briesenick <sbriesen@gmx.de>
 
 *capi4k-utils-20041006-r1 (11 Nov 2004)
 
diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest
index 4543926f751b..17b87f0fbbad 100644
--- a/net-dialup/capi4k-utils/Manifest
+++ b/net-dialup/capi4k-utils/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 65bc18212452f8314d9717b5dadd3aaa ChangeLog 2571
+MD5 1d224e8114b40ba22cddcf1f83c76951 ChangeLog 2917
 MD5 03aaea36415b2221e3057baee7f1662f capi4k-utils-20021026.ebuild 1346
 MD5 8a68cd59daa9bd143ce9987778320b62 capi4k-utils-20040810.ebuild 1760
+MD5 5828a0246b9775e74d584023dbbf8024 capi4k-utils-20041006-r1.ebuild 2740
 MD5 22354caf6445da21e5ebe8609a9e7012 capi4k-utils-20041006.ebuild 2267
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 5828a0246b9775e74d584023dbbf8024 capi4k-utils-20041006-r1.ebuild 2740
+MD5 54bfdfe863e68764164036a00781ce91 capi4k-utils-20041006-r2.ebuild 3104
 MD5 6c75232315b3bb9c63d8e566c24e396a files/capi 543
 MD5 befd926d2f898c15846c2f7452853ec1 files/capi-init-20040810 609
 MD5 b1de4263d145b4fb13baf0e4791e49a0 files/capi-init-20041006 617
@@ -16,10 +14,9 @@ MD5 14a08bf121eef97390c18eafd8458bc7 files/digest-capi4k-utils-20021026 75
 MD5 daf5a35ac5aeac77c4ac69274ed15395 files/digest-capi4k-utils-20040810 75
 MD5 f2524d2cc37ffcbc2096a4f0ac7177c7 files/digest-capi4k-utils-20041006 75
 MD5 41806879bfb1f3d6784fc8ba60cfa936 files/digest-capi4k-utils-20041006-r1 419
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBkpjGjtv59x0+BrURAuYKAJ9zHQw0lzCEPDiJiQ6+Xk3d13FA3ACgqd4w
-Q0akfkak/zQhfxNgVpL3LoE=
-=DDjN
------END PGP SIGNATURE-----
+MD5 cb15a2735647985444a8e80b295363b4 files/digest-capi4k-utils-20041006-r2 149
+MD5 2fe94d2623c5b129780b72bacaf4a7bc files/20041006/rcapid.xinetd 236
+MD5 b2b12a474e6fa76bb7864d6bb63acbfe files/20041006/config 189
+MD5 2892db0b497c4141318dbf30ef60e550 files/20041006/capi4k-utils.patch 1075
+MD5 2c94e9d125d5c9af8c485d8b844f55a2 files/20041006/README.gentoo 1548
+MD5 9d4d4a380b587eca9c897c3c3547dbc8 files/20041006/capi.init 719
diff --git a/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild
new file mode 100644
index 000000000000..3caa9824aaba
--- /dev/null
+++ b/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild,v 1.1 2004/11/13 10:29:19 mrness Exp $
+
+inherit eutils rpm
+
+YEAR_PV=${PV:0:4}
+MON_PV=${PV:4:2}
+DAY_PV=${PV:6:2}
+
+MY_FILES=${FILESDIR}/${PV}
+MY_P=${PN}-${YEAR_PV}-${MON_PV}-${DAY_PV}
+PPPVERSIONS="2.4.2"  # versions in portage
+
+DESCRIPTION="CAPI4Linux Utils"
+HOMEPAGE="ftp://ftp.in-berlin.de/pub/capi4linux/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+S=${WORKDIR}/${PN}
+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
+	ftp://ftp.suse.com/pub/suse/i386/9.2/suse/src/i4l-base-2004.9.27-2.src.rpm"
+
+DEPEND="virtual/linux-sources
+	dev-lang/perl
+	>=sys-apps/sed-4
+	virtual/os-headers
+	sys-devel/automake
+	sys-devel/autoconf
+	sys-devel/libtool
+	app-arch/rpm"
+RDEPEND=""
+
+src_unpack() {
+	rpm_src_unpack || die "failed to unpack sources or firmware files"
+	cd ${S}
+	# set our config
+	cp -f ${MY_FILES}/config .config
+	# fix the little odd bugs
+	epatch ${MY_FILES}/${PN}.patch || die "patch failed"
+	# patch includes of all *.c files
+	sed -i -e "s:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g" */*.c || die "sed failed"
+	# patch all Makefile.am and Rules.make to use our CFLAGS
+	sed -i -e "s:^CFLAGS\(.*\)-O2:CFLAGS\1${CFLAGS}:g" */Makefile.am */Rules.make || die "sed failed"
+	# patch capi20/Makefile.am to use -fPIC for shared library
+	sed -i -e "s:^\(libcapi20_la_CFLAGS = \):\1-fPIC :g" capi20/Makefile.am || die "sed failed"
+	# patch pppdcapiplugin/Makefile to use only the ppp versions we want
+	sed -i -e "s:^\(PPPVERSIONS = \).*$:\1${PPPVERSIONS}:g" pppdcapiplugin/Makefile || die "sed failed"
+}
+
+src_compile() {
+	# required by fPIC patch
+	cd ${S}/capi20 || die "capi20 directory not found"
+	ebegin "Updating autotools-generated files"
+	aclocal -I . || die "aclocal failed"
+	automake -a || die "automake failed"
+	autoconf || die "autoconf failed"
+	libtoolize -f -c || die "libtoolize failed"
+	eend $?
+	cd ${S}
+
+	emake subconfig || die "make subconfig failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /dev
+	emake DESTDIR=${D} install || die "make install failed"
+
+	# install docs
+	newdoc rcapid/README README.rcapid
+	newdoc pppdcapiplugin/README README.pppdcapiplugin
+	dodoc scripts/makedev.sh ${MY_FILES}/README.gentoo
+	docinto pppdcapiplugin.examples; dodoc pppdcapiplugin/examples/*
+
+	# install init-script
+	newinitd ${FILESDIR}/${PV}/capi.init capi
+
+	# example config
+	insinto /etc
+	insopts -m 0600
+	doins capiinit/capi.conf
+
+	# rcapid config for xinetd
+	insinto /etc/xinetd.d
+	insopts -m 0644
+	newins ${FILESDIR}/${PV}/rcapid.xinetd rcapid
+
+	# very useful tool ;-)
+	dobin scripts/isdncause
+
+	# install AVM firmware files
+	insinto /usr/share/isdn
+	insopts -m 0444
+	doins ${WORKDIR}/i4l_suse/firm/{*.t4,*.frm,c[24].bin}
+}
+
+pkg_postinst() {
+	einfo "Please read the instructions in:"
+	einfo "/usr/share/doc/${PN}/README.gentoo.gz"
+	einfo ""
+	einfo "Annotation for active AVM ISDN boards (B1 ISA/PCI, ...):"
+	einfo "This ebuild has installed a bunch of firmware files"
+	einfo "which are to be found in /usr/share/isdn"
+}
diff --git a/net-dialup/capi4k-utils/files/20041006/README.gentoo b/net-dialup/capi4k-utils/files/20041006/README.gentoo
new file mode 100644
index 000000000000..dee179dda060
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/README.gentoo
@@ -0,0 +1,49 @@
+####################################################################
+# CAPI4Linux / Gentoo usage instructions                           #
+####################################################################
+
+First edit /etc/capi.conf to match your configuration.
+
+here an example for the AVM B1 PCI card:
+
+    # card   file    proto   io    irq    mem   cardnr  options
+    b1pci    b1.t4   DSS1    -     -      -     -
+
+First option is the name of the kernel driver, second is the firmware
+file which will be uploaded to the card. All firmware files for the
+active AVM controllers can be found in /usr/share/isdn which is the
+location where all firmware files have to be placed.
+
+The 'cardnr' option can be left '-' if you only have one card.
+Otherwise fill in the card number you want to assign to this card.
+
+Now you can start the CAPI with
+
+    /etc/init.d/capi start
+
+It should show the loaded drivers/cards after the initialization.
+You can check the CAPI with the 'capiinfo' command.
+
+So, if all runs smoothly, then fixate it
+
+    rc-update add capi boot
+
+You can now install the package net-dialup/isdn4k-utils if you
+want to use all the legacy ISDN apps, such as 'isdnlog'. The
+needed driver is 'capidrv' (instead of 'hisax'). 
+
+
+pppdcapiplugin
+~~~~~~~~~~~~~~
+please read the README and have a look at the examples.
+
+
+rcapid
+~~~~~~
+if you want to use 'rcapid' (remote capi daemon), then install
+sys-apps/xinetd and configure it in /etc/xinetd.d/rcapid
+and read the rcapid documentation.
+
+
+--
+Stefan Briesenick <sbriesen@gmx.de> 2004-11-13
diff --git a/net-dialup/capi4k-utils/files/20041006/capi.init b/net-dialup/capi4k-utils/files/20041006/capi.init
new file mode 100644
index 000000000000..b5a98bf13d77
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/capi.init
@@ -0,0 +1,45 @@
+#!/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/capi4k-utils/files/20041006/capi.init,v 1.1 2004/11/13 10:29:19 mrness Exp $
+
+opts="start stop info show"
+
+depend() {
+	after isapnp
+}
+
+start() {
+	if [ ! -e /etc/capi.conf ] ; then
+		eerror "You're missing /etc/capi.conf (comes with a capi-driver)."
+		eerror "Emerge net-dialup/fcpci if you are having an AVM Fritz!Card PCI"
+		return 1
+	fi
+
+	ebegin "Loading CAPI"
+	
+	if /usr/sbin/capiinit start ; then
+		/usr/sbin/capiinit status | while read INFO; do
+			einfo "  $INFO"
+		done
+	fi
+	
+	eend $?
+}
+
+stop() {
+	ebegin "Unloading CAPI"
+	
+	/usr/sbin/capiinit stop 2>/dev/null
+	
+	eend $?
+}
+
+info() {
+	/usr/sbin/capiinit status
+}
+
+show() {
+	/usr/sbin/capiinit show
+}
+
diff --git a/net-dialup/capi4k-utils/files/20041006/capi4k-utils.patch b/net-dialup/capi4k-utils/files/20041006/capi4k-utils.patch
new file mode 100644
index 000000000000..646557d336b1
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/capi4k-utils.patch
@@ -0,0 +1,24 @@
+diff -Naur capi4k-utils_old/capi20/capiutils.h capi4k-utils/capi20/capiutils.h
+--- capi4k-utils_old/capi20/capiutils.h	2004-10-06 17:13:33.000000000 +0200
++++ capi4k-utils/capi20/capiutils.h	2004-10-14 11:18:07.049529668 +0200
+@@ -918,7 +918,7 @@
+ 		,_cstruct BChannelinformation
+ 		,_cstruct Keypadfacility
+ 		,_cstruct Useruserdata
+-                ,_cstruct Facilitydataarra);
++                ,_cstruct Facilitydataarray);
+ unsigned CONNECT_REQ (_cmsg *cmsg, _cword ApplId, _cword Messagenumber
+ 		,_cdword adr
+ 		,_cword CIPValue
+diff -Naur capi4k-utils_old/capifax/capi.c capi4k-utils/capifax/capi.c
+--- capi4k-utils_old/capifax/capi.c	2004-08-10 14:11:20.000000000 +0200
++++ capi4k-utils/capifax/capi.c	2004-10-14 11:16:52.699740737 +0200
+@@ -82,7 +82,7 @@
+ 			 * of the application
+ 			 */
+ 			ALERT_REQ (CMSG, Appl_Id, 0, CONNECT_IND_PLCI(CMSG),
+-				   NULL, NULL, NULL, NULL, NULL);
++				   NULL, NULL, NULL, NULL);
+ 			/* inform the user application */
+ 			SetState(Connection, D_ConnectPending);
+ 			IncomingCall(Connection, GetCallingPartyNumber (Connection));
diff --git a/net-dialup/capi4k-utils/files/20041006/config b/net-dialup/capi4k-utils/files/20041006/config
new file mode 100644
index 000000000000..99435ee6f45a
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/config
@@ -0,0 +1,8 @@
+CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_BINDIR='/usr/bin'
+CONFIG_SBINDIR='/usr/sbin'
+CONFIG_MANDIR='/usr/man'
+CONFIG_AVMCAPICTRL=y
+CONFIG_CAPIFAX=y
+CONFIG_RCAPID=y
+CONFIG_PPPDCAPIPLUGIN=y
diff --git a/net-dialup/capi4k-utils/files/20041006/rcapid.xinetd b/net-dialup/capi4k-utils/files/20041006/rcapid.xinetd
new file mode 100644
index 000000000000..01208331873f
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/rcapid.xinetd
@@ -0,0 +1,13 @@
+service rcapid
+{
+	port			= 2662 
+ 	socket_type		= stream
+ 	wait			= no
+ 	user			= root
+	type			= unlisted
+ 	server			= /usr/sbin/rcapid 
+	server_args		= -l 5 
+ 	log_on_success		+= USERID
+ 	log_on_failure		+= USERID
+ 	disable			 = yes
+}
diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2
new file mode 100644
index 000000000000..68471e5613f3
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2
@@ -0,0 +1,2 @@
+MD5 54992ff362ca44629fdf59773a6864cd capi4k-utils-2004-10-06.tar.gz 743667
+MD5 e04c301fce86343f8b60d5bfd14db409 i4l-base-2004.9.27-2.src.rpm 8380094