Patch scavenged by Erich Seifert restores compatibility with 3.2 linux kernels. Closes bug #397959 by Mike "vapier" Frysinger.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 84 insertions, 6 deletions

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index b81448cb3b43..5318cf847845 100644
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dahdi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.32 2011/10/31 14:34:14 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.33 2012/01/16 12:39:26 chainsaw Exp $
+
+*dahdi-2.5.0.2-r2 (16 Jan 2012)
+
+  16 Jan 2012; Tony Vroon <chainsaw@gentoo.org> +dahdi-2.5.0.2-r2.ebuild:
+  Patch scavenged by Erich Seifert restores compatibility with 3.2 linux
+  kernels. Closes bug #397959 by Mike "vapier" Frysinger.
 
   31 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org> dahdi-2.5.0.2-r1.ebuild:
   QA: use KV_OUT_DIR rather than KBUILD_OUTPUT to find which sources to build
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index a76d1a0751ea..fa8ef79e637f 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -5,6 +5,7 @@ DIST dahdi-fw-hx8-2.06.tar.gz 29252 RMD160 b039d046a029dd9ed0dd32df4d8560809429d
 DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 RMD160 bef97e3741c4d5b21d1e728a08984dc1f0431eb0 SHA1 2fb8e5f4f7aedb285ffa21632efd45af877eacd4 SHA256 56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91
 DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 RMD160 3c31b6d4ab7d3455eda75e42f5447880ea491b71 SHA1 bcf07434f4589d07d9b5f67f7b3a8fb115aa9229 SHA256 e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775
 DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 RMD160 8181ffd4bc861122c338e1eb2748e797210f3150 SHA1 9206abda4c9cf192e8cae7e707f2e4e65beb8f87 SHA256 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
+DIST dahdi-fw-vpmoct032-1.11.0.tar.gz 443984 RMD160 a6fcd0fb100a2c4edc6c2e50ffa23824aa472cf5 SHA1 26ceb87ff86b79e34df70306c497e298bd794323 SHA256 ba050ccbdd31d8b2ac682ad559f2122250c75473c079ef082a758691db705064
 DIST dahdi-fw-vpmoct032-1.8.0.tar.gz 443665 RMD160 a1ec32a19f3fd191e09a49724a33541b4814871d SHA1 4568ef1bcef9b5648ef8e71caf5872dff43588c2 SHA256 9ba13f96f4fb0f65564699c23777b28f144235bd4362c4a760d8009a8f248465
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 RMD160 03854bebe670501a15bd8d5691c71dbafd4cc7f7 SHA1 0615613f6179ef927d23ed23daeaf7a718490200 SHA256 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1
 DIST dahdi-linux-2.4.1.tar.gz 1516954 RMD160 7423df78eeefabe1dce3801c7b671842fb4950cd SHA1 a236f0100fc3209c8da6d4ae77a776d8165923d9 SHA256 c5c328ae0b7ad7134950ef6bbd05ec89ff7f07ef4ea64c738b4907eb3922424e
@@ -13,18 +14,20 @@ DIST dahdi-linux-2.5.0.tar.gz 1546486 RMD160 a6ab21554965e403e5869bbae5e404200ca
 DIST gentoo-dahdi-patchset-0.6.tar.bz2 60759 RMD160 d5115d485abfbcba18094409c97bda947a9e85c0 SHA1 607c924e34b13a03bc1f60586134d5b0e6879faa SHA256 5dc02244e88d65cf3af81c58b0266e36d9f5e9ffdfc0dc223b3ab0da3df64621
 DIST gentoo-dahdi-patchset-0.7.tar.bz2 59254 RMD160 b38f73e62a2cac324e9b93ef19544bb1d32c551f SHA1 a273fdc07f7b887caf6a54aeff7e36ca12623126 SHA256 d597c521932c6746df7829e13d40df72de80de5d65745d5d5e8b2ebb9b032eda
 DIST gentoo-dahdi-patchset-0.9.tar.bz2 59614 RMD160 b4e945c133b2134a08d8baa2ce143b8196c64bb2 SHA1 b24135ae9459b1d53cdf3150107c6cbafb512b61 SHA256 c292b899ad70cec834a50e0e1846e98b4dda9644862e22488cb59f62ae786b73
+DIST gentoo-dahdi-patchset-1.0.tar.bz2 60109 RMD160 e0b4c2df3e4f5380105cf77a70298ce316796857 SHA1 96b12774111031eb85f6a0b3db6f0d3640405bba SHA256 81ca9ac6d4244a064c1df6a5315ce1de615cf90d928dce2c1e98076327b9bec1
 DIST jnet-dahdi-drivers-1.0.11.tar.gz 60945 RMD160 629c9993e460ca30bfc5adddf1bcd8edbe3694d7 SHA1 31ec44b7a892e8052b6c2cbe5b10e72646960e2d SHA256 31f0a856f0b75533d4880428c29f2e8a4ca4bbab6c062b7ffe70f335126e9234
 DIST jnet-dahdi-drivers-1.0.13.tar.gz 63887 RMD160 195f3f101f8313e8eef0b25c0e6791ac47100618 SHA1 41ff15af95590023086ce66cd7ff2251522b4c3f SHA256 bdf451e610bb9ff966a3493cc9ac16e90be6a3c3df0d6806cb309998690a96e8
 EBUILD dahdi-2.4.1-r1.ebuild 2107 RMD160 447d07c55e53204f5e4b46a4b37b3ed37d4f3a4a SHA1 805734761992371421d78573af65bda47327dea2 SHA256 0f67887e5f8ed90e3b297da8622110c084573ff182dcddad3be1b5b517f2a294
 EBUILD dahdi-2.5.0-r2.ebuild 2680 RMD160 e8c0324087e4e840c1fe205b319cc6d986a94335 SHA1 daac353b835591ec28bf8d18e9c52cb5c1b8cb50 SHA256 fecfdcbc6ef78bcb2674e64ee8bc59df5356cd7a55a880d63314e6882f7b0c29
 EBUILD dahdi-2.5.0.2-r1.ebuild 2682 RMD160 4a03671cf2c30d49ce8560f63294b77499ba7997 SHA1 9b99ee63c15f2d9ec852646c588a4c367da7118a SHA256 22679aeb78e2430dd376b0674af32b6e21e6befa6b7638b39249f91dc9a13aea
+EBUILD dahdi-2.5.0.2-r2.ebuild 2698 RMD160 58ccc0dfc00f2504230deb00af1f350695aa795d SHA1 dac52f40cce6e99684e5db252c030999e55afd3a SHA256 76629189f7025b16f2dea3386840a813724ae9faadc999ca7b0d0a8fbcd0c9ab
 EBUILD dahdi-2.5.0.ebuild 2219 RMD160 dc64c283de18fa53aa9573c527f1545552dc6e7c SHA1 f2036b3f7d80145de410725d484135360650dc8a SHA256 fba5681a6e6765f97c4a1b14fb0999bf3d8da62bd375e88dc8d08581450d59f0
-MISC ChangeLog 8426 RMD160 fe76f9f30646274ca6e3edbe49f4c7836dc8c2d1 SHA1 6f53fd34b0189b298ce7be6520d331c3f0bca3c6 SHA256 eb571b67ceb5419189ff38ec91f2c17f733b1dfeb774d14c0200e8b6f5edd2a7
+MISC ChangeLog 8664 RMD160 27f020de9f15e236cd5d7e3fe31fc16c8f0ddd7e SHA1 52b541e4d94ea62c179735e546a47558a1699239 SHA256 441bb8f0425971ec1e7118c4b42c5d50db979fc1dcff15e49d81fbbd395c2753
 MISC metadata.xml 333 RMD160 4a7f243a6d4b1de974e5c52592cdb310d5c68664 SHA1 f9b073c0c00e12f5f154a7d4209430ac8a736393 SHA256 c7cf56ea7b6f0f6d3707fe2c8a0ac3ff9d13414093c4332dcb2201d8b0966691
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6uscYACgkQAiZjviIA2XjSTgCdEZgoGGFzCONlQhU0kohFk5GJ
-CUIAn06IvjRl2bH9v7HFBL+NIqz/WNrR
-=xBYw
+iEUEARECAAYFAk8UGoQACgkQp5vW4rUFj5qvjwCYtQfgRgfSR8O8w+xr2zJG4Mxt
+7wCgu5zMcizFsmrz83WyUzsHRQsIaSM=
+=ec+P
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild b/net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild
new file mode 100644
index 000000000000..247ca55ef16d
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild,v 1.1 2012/01/16 12:39:26 chainsaw Exp $
+
+EAPI=4
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.13
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-1.0.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES CRC_CCITT"
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	base_src_prepare
+}
+
+src_compile() {
+	unset ARCH
+	emake CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}