version bump

Package-Manager: portage-2.1.3.15

5 files changed, 266 insertions, 19 deletions

diff --git a/net-dialup/misdn/ChangeLog b/net-dialup/misdn/ChangeLog
index a903f244bcc6..a16225b7d855 100644
--- a/net-dialup/misdn/ChangeLog
+++ b/net-dialup/misdn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/misdn
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.24 2007/07/07 10:21:39 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.25 2007/10/22 19:03:01 genstef Exp $
+
+*misdn-1.1.6 (22 Oct 2007)
+
+  22 Oct 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/misdn-2.6.23.diff, +misdn-1.1.6.ebuild:
+  version bump
 
 *misdn-1.1.5 (07 Jul 2007)
 
diff --git a/net-dialup/misdn/Manifest b/net-dialup/misdn/Manifest
index ebb6f39cd0f6..96ffe1962933 100644
--- a/net-dialup/misdn/Manifest
+++ b/net-dialup/misdn/Manifest
@@ -1,17 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX README.hfcmulti 2488 RMD160 6c4e62fdfd6ce872b0ec270271ce97954c6374f4 SHA1 94af469baeab0972539a9dc707d1a334dfe0b1b5 SHA256 29793879cd9a752fb1f71e9f9aebc8988024b5ec8cdb53d0d551fc75ade0377f
 MD5 4be2313e0dafa1a491fc57e2bf3edca8 files/README.hfcmulti 2488
 RMD160 6c4e62fdfd6ce872b0ec270271ce97954c6374f4 files/README.hfcmulti 2488
 SHA256 29793879cd9a752fb1f71e9f9aebc8988024b5ec8cdb53d0d551fc75ade0377f files/README.hfcmulti 2488
+AUX misdn-2.6.23.diff 1329 RMD160 d78ea95e4c1847ee865fef10e2b44346607c4fc8 SHA1 47c0661681a09d5ee54368bec58a81fda2b1d921 SHA256 a31e4b8f29f0bc9d032eb3f1d382274e36e105b679ddb9ff23128bf75e5b763e
+MD5 6aecd1d26a49520fd1770022eb1e5854 files/misdn-2.6.23.diff 1329
+RMD160 d78ea95e4c1847ee865fef10e2b44346607c4fc8 files/misdn-2.6.23.diff 1329
+SHA256 a31e4b8f29f0bc9d032eb3f1d382274e36e105b679ddb9ff23128bf75e5b763e files/misdn-2.6.23.diff 1329
 DIST mISDN-1_1_2.tar.gz 502737 RMD160 5abcf20310bf12d2c79a4e2d3f04ae87658fab85 SHA1 a974879d6a82632d2688e841bbc25c9081a3931b SHA256 32052781349a420fa8b638e42beb2911dd5fa1bb6acb29b5a1b0bc6df6a9f29e
 DIST mISDN-1_1_3.tar.gz 12414364 RMD160 2b0b1275ca44de4b103b645175d47ba518545a7e SHA1 5f5b7f31853d55167e839afd245f01d1fe8d01f2 SHA256 cf7c6bdb28709f4831080f52369f54dc9780844d0ff995f7eb60da201bc7cc3b
 DIST mISDN-1_1_5.tar.gz 473618 RMD160 ecfcc83f9450c5e7e1ff2b1b4bab6a066999182b SHA1 1949c66bcf95462667ac26456b185c6158136fa0 SHA256 894f97f7cb5af1f0f9a368dcdf7a2886b272e498d3f245daace7617e144be69d
-EBUILD misdn-1.1.2.ebuild 5279 RMD160 49edb788a1f5da02bc7edf4fbef8d45c4ca37e28 SHA1 ac5b702c26524a95a6dd1cf088bfd3f06dd1fa72 SHA256 20537352451bfc4c6bae385bb2a7e2f3475d7cfde99772d87feac959cb0e6488
-MD5 97411904c204fd2ac7c4a4295975455e misdn-1.1.2.ebuild 5279
-RMD160 49edb788a1f5da02bc7edf4fbef8d45c4ca37e28 misdn-1.1.2.ebuild 5279
-SHA256 20537352451bfc4c6bae385bb2a7e2f3475d7cfde99772d87feac959cb0e6488 misdn-1.1.2.ebuild 5279
+DIST mISDN-1_1_6.tar.gz 474225 RMD160 1d0391f9ded51fd89124f4ad2d381a9127b45ea1 SHA1 46a4cbd5f0a29db700f25b26f08ea7a7a5c1747c SHA256 86885e44c42d5d9cde0b32d7ba03267a58f21dc263381a98e0db76a1360c718b
+EBUILD misdn-1.1.2.ebuild 5285 RMD160 903a56d1330f1d28d3ced61711a8b428e407d0d9 SHA1 7d82d3fb063187f1ef22eddc5828bfb3b81dbb7d SHA256 0f18bdfc231b9cca531656d9179defde0d8b14f995b5a543592c368ed766dce6
+MD5 a0ca9c7726f4ccf5d72fdcc6c7595772 misdn-1.1.2.ebuild 5285
+RMD160 903a56d1330f1d28d3ced61711a8b428e407d0d9 misdn-1.1.2.ebuild 5285
+SHA256 0f18bdfc231b9cca531656d9179defde0d8b14f995b5a543592c368ed766dce6 misdn-1.1.2.ebuild 5285
 EBUILD misdn-1.1.3.ebuild 5279 RMD160 beac6eed8acadd8171d1450724186fdf2c737cd2 SHA1 d04d7adc42420b6ce4cc954383895a046d00e391 SHA256 5ea3a90f3243265a2ea42f641202c1e63db6f2d07f021f485c8d6d2dfcdaf550
 MD5 00c10f56a9309db38b1500cd7f203197 misdn-1.1.3.ebuild 5279
 RMD160 beac6eed8acadd8171d1450724186fdf2c737cd2 misdn-1.1.3.ebuild 5279
@@ -20,10 +22,14 @@ EBUILD misdn-1.1.5.ebuild 5279 RMD160 5c779f71c65700de4b6532e12020b2f53e067efd S
 MD5 8d898cb637f80144d5975d9570e99001 misdn-1.1.5.ebuild 5279
 RMD160 5c779f71c65700de4b6532e12020b2f53e067efd misdn-1.1.5.ebuild 5279
 SHA256 cc68e131ca97e06aaf15d19cb18d632f937da68536b8f9b5cd8257762a852c1d misdn-1.1.5.ebuild 5279
-MISC ChangeLog 4392 RMD160 65fe4625cd07af2d80e93d396428f86cbef41bde SHA1 7b1da6b79275695e5c9a9393c5423d4d85311697 SHA256 0483c0a244285cf5a166c62b0b3d9288154cee5ccdd01080ee0930f676c0727a
-MD5 bc0ff9a95ec1ef77d5656671847157b9 ChangeLog 4392
-RMD160 65fe4625cd07af2d80e93d396428f86cbef41bde ChangeLog 4392
-SHA256 0483c0a244285cf5a166c62b0b3d9288154cee5ccdd01080ee0930f676c0727a ChangeLog 4392
+EBUILD misdn-1.1.6.ebuild 5341 RMD160 f6ea24c24fd7b873ad4bd1ed38bef36ecbc76d40 SHA1 8adefb77f82a943b8132a7d157b3a8511d43a8c5 SHA256 681853e3897f378473345ba7821a3e344888e9b2e3bca3ffa494bd1b01cb379f
+MD5 a91f1ee2ad6a06cdd1b595159e5e0597 misdn-1.1.6.ebuild 5341
+RMD160 f6ea24c24fd7b873ad4bd1ed38bef36ecbc76d40 misdn-1.1.6.ebuild 5341
+SHA256 681853e3897f378473345ba7821a3e344888e9b2e3bca3ffa494bd1b01cb379f misdn-1.1.6.ebuild 5341
+MISC ChangeLog 4538 RMD160 1180e4ec216d42675afa0acb57755000d7376382 SHA1 b15cd841a7fb34e686f3a8199fd585750e2dcdc4 SHA256 292283c625cc586ef8c940fb40fa4a21306119c3d919389efc928cc3853cfb81
+MD5 c9646840e4d3331e715d9b91b2664042 ChangeLog 4538
+RMD160 1180e4ec216d42675afa0acb57755000d7376382 ChangeLog 4538
+SHA256 292283c625cc586ef8c940fb40fa4a21306119c3d919389efc928cc3853cfb81 ChangeLog 4538
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -37,10 +43,6 @@ SHA256 0c623770a0f70a796064d45f65b17a0849999a571be61d116d2357004d4d09e7 files/di
 MD5 48831d6abe44f2b0cc86dfda1a0d4092 files/digest-misdn-1.1.5 235
 RMD160 90264ef11d31e7014ffe96fd4b384a1389968f75 files/digest-misdn-1.1.5 235
 SHA256 a86d9685a6ad79d8ee5de5d0155006da958332e0f385e46648043297f1f22661 files/digest-misdn-1.1.5 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGj62f/ejvha5XGaMRAoP/AKDK3qdg8FWRFcv2nwVll8tfEHJOowCcDOng
-9Z9qcKmQTl8boT1Vt+kSxp4=
-=qSju
------END PGP SIGNATURE-----
+MD5 fee798a9ed4abc355ea3cd09a6a08675 files/digest-misdn-1.1.6 235
+RMD160 5bf91a5fa5f25cc403f2ac204a9426da8c5007bc files/digest-misdn-1.1.6 235
+SHA256 2298807f1c0d9cbfe40586ab369665b8ff2fac11e09fa3ef20a01095f9d60c91 files/digest-misdn-1.1.6 235
diff --git a/net-dialup/misdn/files/digest-misdn-1.1.6 b/net-dialup/misdn/files/digest-misdn-1.1.6
new file mode 100644
index 000000000000..412e6fdd5382
--- /dev/null
+++ b/net-dialup/misdn/files/digest-misdn-1.1.6
@@ -0,0 +1,3 @@
+MD5 c378fcef555ad20835bc54b0b83b2b5b mISDN-1_1_6.tar.gz 474225
+RMD160 1d0391f9ded51fd89124f4ad2d381a9127b45ea1 mISDN-1_1_6.tar.gz 474225
+SHA256 86885e44c42d5d9cde0b32d7ba03267a58f21dc263381a98e0db76a1360c718b mISDN-1_1_6.tar.gz 474225
diff --git a/net-dialup/misdn/files/misdn-2.6.23.diff b/net-dialup/misdn/files/misdn-2.6.23.diff
new file mode 100644
index 000000000000..df38ba619068
--- /dev/null
+++ b/net-dialup/misdn/files/misdn-2.6.23.diff
@@ -0,0 +1,53 @@
+diff -ur mISDN.orig/capi.c mISDN/capi.c
+--- mISDN.orig/capi.c	2007-10-22 20:29:42.000000000 +0200
++++ mISDN/capi.c	2007-10-22 20:31:18.000000000 +0200
+@@ -258,7 +258,7 @@
+ #else
+ 				sizeof(_cmsg),
+ #endif
+-				0, 0, NULL, NULL);
++				0, 0, NULL);
+ 	if (!mISDN_cmsg_cp) {
+ 		CapiCachesFree();
+ 		return(-ENOMEM);
+@@ -269,7 +269,7 @@
+ #else
+ 				sizeof(AppPlci_t),
+ #endif
+-				0, 0, NULL, NULL);
++				0, 0, NULL);
+ 	if (!mISDN_AppPlci_cp) {
+ 		CapiCachesFree();
+ 		return(-ENOMEM);
+@@ -280,7 +280,7 @@
+ #else
+ 				sizeof(Ncci_t),
+ #endif
+-				0, 0, NULL, NULL);
++				0, 0, NULL);
+ 	if (!mISDN_ncci_cp) {
+ 		CapiCachesFree();
+ 		return(-ENOMEM);
+@@ -291,7 +291,7 @@
+ #else
+ 				sizeof(SSProcess_t),
+ #endif
+-				0, 0, NULL, NULL);
++				0, 0, NULL);
+ 	if (!mISDN_sspc_cp) {
+ 		CapiCachesFree();
+ 		return(-ENOMEM);
+diff -ur mISDN.orig/udevice.c mISDN/udevice.c
+--- mISDN.orig/udevice.c	2007-10-22 20:29:42.000000000 +0200
++++ mISDN/udevice.c	2007-10-22 20:33:35.000000000 +0200
+@@ -2025,9 +2025,7 @@
+ 	if ((err = mISDN_unregister(&udev_obj))) {
+ 		printk(KERN_ERR "Can't unregister UserDevice(%d)\n", err);
+ 	}
+-	if ((err = unregister_chrdev(mISDN_MAJOR, "mISDN"))) {
+-		printk(KERN_WARNING "mISDN: devices busy on remove\n");
+-	}
++	unregister_chrdev(mISDN_MAJOR, "mISDN");
+ #ifdef CONFIG_DEVFS_FS
+ 	devfs_remove("mISDN");
+ #endif
diff --git a/net-dialup/misdn/misdn-1.1.6.ebuild b/net-dialup/misdn/misdn-1.1.6.ebuild
new file mode 100644
index 000000000000..58aa7ab63649
--- /dev/null
+++ b/net-dialup/misdn/misdn-1.1.6.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-1.1.6.ebuild,v 1.1 2007/10/22 19:03:01 genstef Exp $
+
+inherit eutils linux-mod
+
+MY_P=mISDN-${PV//./_}
+DESCRIPTION="mISDN is the new ISDN stack of the linux kernel 2.6."
+HOMEPAGE="http://www.misdn.org/"
+SRC_URI="http://www.misdn.org/downloads/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+
+# list of echo canceller use flags,
+# first active in this list is selected (=order does matter)
+MISDN_EC_FLAGS="ecmg2 eckb1 ecmark2"
+
+# list of card modules
+MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "hfcsmini" "xhfc" "sedlfax" "w6692pci" "netjetpci")
+MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "HFCMINI" "XHFC" "SPEEDFAX" "W6692" "NETJET")
+
+IUSE="ecaggressive ${MISDN_EC_FLAGS}"
+for i in ${MISDN_MODULES[@]}; do IUSE="${IUSE} misdn_cards_${i}"; done
+
+RDEPEND=">=net-dialup/capi4k-utils-20050718
+	sys-devel/bc"
+
+S=${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN
+
+### Begin: Helper functions
+
+select_echo_cancel() {
+	local myEC=""
+	for x in ${MISDN_EC_FLAGS}; do
+		if use ${x}; then
+			myEC=$(echo "${x}" | sed -e "s:^ec\(.*\):\U\1\E:")
+			break;
+		fi
+	done
+	echo ${myEC}
+}
+
+dsp_enable() {
+	local i
+	for i in "${@}"; do
+		sed -i -e "s:.*\(#include.*dsp_${i}\):\1:m" dsp.h
+	done
+}
+
+dsp_disable() {
+	local i
+	for i in "${@}"; do
+		sed -i -e "s:.*\(#include.*dsp_${i}\)://\1:m" dsp.h
+	done
+}
+
+### End: Helper functions
+
+pkg_setup() {
+	local numec=0
+
+	CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL"
+	linux-mod_pkg_setup
+	MODULE_NAMES="mISDN_capi(net:) mISDN_dtmf(net:) mISDN_l1(net:)
+	mISDN_x25dte(net:) l3udss1(net:) mISDN_core(net:) mISDN_isac(net:)
+	mISDN_l2(net:) mISDN_dsp(net:)"
+	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} MINCLUDES=${WORKDIR}/${MY_P}/include CONFIG_MISDN_DRV=m CONFIG_MISDN_DSP=y"
+	BUILD_TARGETS="modules"
+	#I4LmISDN(net:) does not compile :( CONFIG_I4L_CAPI_LAYER=m
+	# the i4l->capi simulation seems to be only for kernel 2.4
+
+	# check if multiple echo cancellers have been selected
+	for x in ${MISDN_EC_FLAGS}; do
+		use ${x} && : $((numec++))
+	done
+	if [[ ${numec} -gt 1 ]]; then
+		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
+		# will be used, make sure the user knows about this
+		ewarn
+		ewarn "Multiple echo canceller flags are active but only one will be used!"
+		ewarn "Selected: $(select_echo_cancel)"
+	fi
+
+	# Check existence of user selected cards
+	if [ -n "${MISDN_CARDS}" ]; then
+		for USERCARD in ${MISDN_CARDS} ; do
+			for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
+				if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then
+					MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
+					#[ "sedlfax" = "${MISDN_MODULES[CARD]}" ] && MODULE_NAMES="${MODULE_NAMES} faxl3(net:)"
+					BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
+					continue 2
+				fi
+			done
+			die "Module ${USERCARD} not present in ${P}"
+		done
+	else
+		elog
+		elog "You can control the modules which are built with the variable"
+		elog "MISDN_CARDS which should contain a blank separated list"
+		elog "of a selection from the following cards:"
+		elog "   ${MISDN_MODULES[*]}"
+		elog
+		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
+		ewarn "adjustments in /etc/make.conf."
+
+		# enable everything
+		for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
+			MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
+			#[ "sedlfax" = "${MISDN_MODULES[CARD]}" ] && MODULE_NAMES="${MODULE_NAMES} faxl3(net:)"
+			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
+		done
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	kernel_is ge 2 6 23 && epatch ${FILESDIR}/misdn-2.6.23.diff
+
+	if use ecaggressive; then
+		sed -i -e "s:.*#define \(AGGRESSIVE_SUPPRESSOR\):#define \1:m" dsp.h
+	fi
+
+	case "$(select_echo_cancel)" in
+		MG2)
+			dsp_enable  mg2ec
+			dsp_disable kb1ec mec2
+			;;
+		KB1)
+			dsp_enable  kb1ec
+			dsp_disable mg2ec mec2
+			;;
+		MARK2)
+			dsp_enable  mec2
+			dsp_disable mg2ec kb1ec
+			;;
+	esac
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/include/linux
+	doins "${WORKDIR}/${MY_P}/"include/linux/*.h
+
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="obj-*", NAME="mISDN", GROUP="dialout", MODE="0660"' \
+		> "${D}/etc/udev/rules.d/53-${PN}.rules"
+
+	insinto /etc/modules.d
+	newins "${WORKDIR}/${MY_P}/"mISDN.modprobe.d ${PN}
+
+	sed -i -e "s:USER=.*:USER=root:" \
+		-e "s:GROUP=.*:GROUP=dialout:" "${WORKDIR}/${MY_P}/"misdn-init
+	dosbin "${WORKDIR}/${MY_P}/"misdn-init
+
+	dodoc Kconfig.v2.6
+	dodoc "${FILESDIR}/README.hfcmulti" "${WORKDIR}/${MY_P}/"README.misdn-init
+}
+
+pkg_preinst() {
+	if [ -e "${ROOT}"/etc/misdn-init.conf ]; then
+		cp "${ROOT}"/etc/misdn-init.conf "${D}"/etc
+	else
+		sed -i -e "s:/etc/misdn-init.conf:${D}\0:" "${D}"/usr/sbin/misdn-init
+		"${D}"/usr/sbin/misdn-init config
+		sed -i -e "s:${D}/etc/misdn-init.conf:/etc/misdn-init.conf:" "${D}"/usr/sbin/misdn-init
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	ewarn
+	ewarn "This driver is still under heavy development"
+	ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org"
+	ewarn "Please report driver bugs to the mISDN mailing-list:"
+	ewarn "    https://www.isdn4linux.de/mailman/listinfo/isdn4linux"
+}