Patching to address upstream kernel deprecation of IRQF_DISABLED as reported by Toralf Förster and tested by Jaco Kroon.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

4 files changed, 14 insertions, 92 deletions

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index 7c1b09d24ed3..2a6ba9653974 100644
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dahdi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.76 2015/07/27 10:31:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.77 2015/07/31 12:43:09 chainsaw Exp $
+
+  31 Jul 2015; Tony Vroon <chainsaw@gentoo.org> -dahdi-2.10.1-r1.ebuild,
+  dahdi-2.10.2-r2.ebuild:
+  Patching to address upstream kernel deprecation of IRQF_DISABLED as reported
+  by Toralf Förster and tested by Jaco Kroon.
 
 *dahdi-2.10.2-r2 (27 Jul 2015)
 
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 840da2036518..93dbfbf74f74 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -27,20 +27,18 @@ DIST dahdi-linux-2.10.1.tar.gz 2044847 SHA256 94c532e190fc6372f9731df71f8c590fc6
 DIST dahdi-linux-2.10.2.tar.gz 2044873 SHA256 6270444cb9b345941267b162038cc45f5ef4485139176e88e2c4d22fa35a2c59 SHA512 b585a408ffb7b95a5e1a47dff14be93e2ce7420e5b3b3160ccfc0ca8df153ec1f36c56c96bc4f7b20bebda0559ec03481e1307feb8e10eace68737e8f8783537 WHIRLPOOL 2c640728a31cdd45a34cf78b1f07587242fc3e68eeb37de006bba237cbc89ea7ea4fa9ad568775761225dbdefdaff1de152bbfd05dfbbbc693efdf723835d162
 DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 SHA256 31efbb79403c57e095bd032939d65b3c15eb5964e837476b1ade42cea9c2b9f7 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770 WHIRLPOOL f6aba2558bd8a0bb3998977187d50ea95b0e169aadb18372ee8d7d5df8624e5d2c40e3ae98bcf2c5ed9680920f5d813563d15bdab6c3d167bb1539ba4efe6500
 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 SHA256 00dcc6ac490f6d56c806bde06b9fb76ed09555cb879880d48f8087f50adfbb31 SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04 WHIRLPOOL 4ce8e9930c59da65fe66250009dea21a7bbed4b654d9f6aed832525a56c5265c20acfbcbf38a58a0ce190df3bac66080d4513dcdf796c4823fa6ceefafa51c96
-DIST gentoo-dahdi-patchset-1.2.1.tar.bz2 103141 SHA256 cefcb8d6b4975b4d9fea8e0a34397b5b2453179f2ff95935c4a47569b5d8eb44 SHA512 e7187b5aef6d4b5ffd5338cc86ec058089e4c06a35eaa3d59341939319a573091a3bd9bd6a9a2319c0f0eec61c8ccbfd2b7812d2fdaf99c4df0a626b7f596f2e WHIRLPOOL 28edeb0b9d9da36ae6c898f23adeef6516ce2e9759589542d5239ec63da03f8bd5e2f86ba27d4852c44b3bf309a8b184c72820ac6ac37cfb219a05e6ce0e81ac
-DIST gentoo-dahdi-patchset-1.2.2.tar.bz2 102794 SHA256 ffd1e9bcb96b878d24a2e8bf277cac8e36c016d2057e9a11e27bfd8e51ead9c5 SHA512 0d8dd1c9a7fca2262347cafb52a20039f56697dc75273c32daef01664ee5ea75701c10793132b6f501c797d56cd3b2e55674de622e43b83b4f5bf76d4334f80e WHIRLPOOL 45c848af9a9b1e7e2128663bfa73e20ca80e6dad40822b919cf3dcb147a1dd680316225b7fdcd5717052ba625de42900359685693fe30aad13c0d5bf8dac032a
+DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 SHA256 4bd57ffa61d718b847080af274fdf2414bf83a6567dffa05786e3e9b900cdf5f SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517 WHIRLPOOL fbf86b33f7961cdd8053fe7898908088fb1579705915e5cddee01d5bae3cc996a061af622d4868e5b82270b22043529f69a50580d45451a3400b664835965760
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 SHA256 c71d1ac29c78511b59914cc9aa1798529ae7b344cdc8403a797dbcddbe486974 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 WHIRLPOOL 15c34f728806f5f94d64c791491b4928342a0df94a336c8c09a26ec020245dd8e13722d73779cce3cd73029c07be68c2d440be51407b83d56ce5a8645b6bfb24
 EBUILD dahdi-2.10.0.1-r1.ebuild 3735 SHA256 c731d20a4429566bab74a286aa50f1103aa881c4fbfe66dddd370c87fdb9f61a SHA512 085c803023565594eed67159013dd12f050dafbdb8258832c7182f36614732f123ace4203f491b1fa21815dbe37d2218f04244df0b7736100991af3626703e05 WHIRLPOOL 0f39cd7cff908f870f445f8fe6a8c25abdc8aa6a596ab9ea73db3d992dc411b1dee8225ceff8f7f1b77428a26d2a33c13787fc26b8e59b7ae0e13b57ccec2783
 EBUILD dahdi-2.10.0.1.ebuild 3725 SHA256 7f5cd88e969213f35b517657169326d4810e84975e743da6477dd732602d34d7 SHA512 3ae8d2c1689397046a53cc3d3b20fb0caf0fe482eac6585d526be98e2393d903f795c9461e2343054ba3fe85da9b3e334030d65e3248553c689445166d9e5255 WHIRLPOOL 530ebefe8fc2edfff55413b3ce8d077ef40522b66124318c44940231f8bb97d5ebfef72da0437394bb5136fb9fab364d7294ff1c81c0ac48bd0547d8310f268c
-EBUILD dahdi-2.10.1-r1.ebuild 3733 SHA256 18df4526d61907ec33e57e25906a82b378f3d808f3546a31f841df0daa65bd87 SHA512 e31c593c641d3ebf2ebdcb07981461696316366c7426d188dc6282b76d2f3a30e51d3f3c7293d14227826ccd375a189597359f027407c6cffd4eb8ef300c75cc WHIRLPOOL 4c29e6ea61274513b5d246efe2ff9f0915452a82642e5f5b8a7f68ea04fbba54477b0989c797bc5184e4488766be9cd195c2da863cb0a1aa0b676751d673f789
 EBUILD dahdi-2.10.1.ebuild 3723 SHA256 731808a131489846335e48c56c2a900e5b2d88fc5e34157383d82852c34611ac SHA512 34a5647277946f9c51724dff0508e24767284a3c2c947d3f7aa7e86d31afe8df2089f3b942a741439decab957bd815fcde23ada16f34013ac7feda396bf72e41 WHIRLPOOL c3fe78d87b08b97db0aeaa716a45f7fab7081e5f6a8234931a174ae6ba79a820a0b610f5235d3964fc903f3b56b7f759c3b68d44fd12535139c3220804e22bdf
-EBUILD dahdi-2.10.2-r2.ebuild 3734 SHA256 c4c6774e2bc4f454ab855d1ce37e00404d35e1c98ff99eb822bfbaa8c1b95055 SHA512 076ed75ce1b20988ed1d215a1d9f482809fd72ee2ceb52161193183d03cac2aac607372cd22a53e8772eff1bb65389c3fdd404ecf8fe2963a98c8f0a6f45a110 WHIRLPOOL 2efe01655271fd73287a17ddd19322486c4b9a66e2bd66e85016465d8ef05e486632e077348b72ddd240bc221543006425f36d5e8a39eff0b270ba6013d126d1
-MISC ChangeLog 16997 SHA256 0a4332386683ddee372b8b0f89063392056677a23d4f1ad62346caa24c0963bb SHA512 e51942428bedcfe38fb2fa0df6b5b8052932af44c8110b342d42055ad04d9a095a4b9308f43003b78f17c44612bd51b858348453eee1b4617a534202e1fb3e3f WHIRLPOOL ced3a2e7031b5e1978de13facdc2e3301d0322861e0ec4d7bee6109e9ee0c19416a4cb016c294c168f37594a1335b9368adc0b2b0998526e78d50edf592c1b90
+EBUILD dahdi-2.10.2-r2.ebuild 3734 SHA256 4973bb022f5e3e75393d6b1093504b892c970e1bbf4623b2d9936d97698f24e9 SHA512 a0e05dc68b345a3cd8ba4b1498d448659985d9389806710ad96d306f632cc2a3c951d1e72a0df8e6b86be63bc1f3316d03fe2306a91a674f0e9eed49c5035cd8 WHIRLPOOL 2205bea3d9032cecce1cf45bd47dd3d295739501a1f80cad07da4d8494fd914123cc5123721f717c8459c9fe49b1b9699f5e5c0df5e8d4ce39ace65b4fa20f50
+MISC ChangeLog 17223 SHA256 cf56ce5050e717e29debe7c9f38f5fa00f71ea7c7396da46ef49a20ea9317d26 SHA512 ede12caf4ce9c72a7f60d509a7c036914e488e0a07d68998e7ded8334c513f1f91b80edc5edefe26d871303f2c2966c8c792b877598955dcb3381868f9db7ebf WHIRLPOOL 4801f0d4e288cfdcb37d0c8f8e4cdda14446a5985794b8047fab291d01d124f7c722d46fb15e2ae7c1a8504c1bf2b752d78dc32e08d8a8b72ce3518a3ee50cc4
 MISC metadata.xml 313 SHA256 bdeaff3e2154c5664ac49b3dfdd9f59dccfa127ec8c5813c3f8441718e364374 SHA512 241cb7ea094d588b2ea8af11a26c1f6dd635a39120d0d15cf0531884cc9c05ad67c3c669924fdc5f292cc360629c34a5370a746199df19d0d2267f48c2beb90c WHIRLPOOL c9714fd598a731fff5103cb573cd4e3a0fc4b9c8f3a165917797aadd4592e332d7ae29036ca79f712a8ee5137193a9db3591673c2780de6c354fac497ffc8455
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlW2CEEACgkQp5vW4rUFj5r/GgCeKIx4+nGhMAw9puPxsaPtX59w
-KFoAnR/jQQmhrHcvvpQzC3Ry3lZm5Atv
-=Zi2w
+iEYEAREIAAYFAlW7bSQACgkQp5vW4rUFj5oY0QCgwOYw0UEBcBdlNhmJlWICg/HK
+K84AnilQttE5TjFD3Fv+IrIYBn0u1OFJ
+=ZJru
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dahdi/dahdi-2.10.1-r1.ebuild b/net-misc/dahdi/dahdi-2.10.1-r1.ebuild
deleted file mode 100644
index a20f185664a9..000000000000
--- a/net-misc/dahdi/dahdi-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.10.1-r1.ebuild,v 1.1 2015/05/14 13:21:16 chainsaw Exp $
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=1.2.1
-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-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.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-oct6114-256-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-te133-780019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.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 V=1 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 V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
-	rm -rf "$D"/lib/modules/*/modules.*
-}
diff --git a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
index 24df258d37c9..938b8c2f6b92 100644
--- a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
+++ b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.10.2-r2.ebuild,v 1.1 2015/07/27 10:31:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.10.2-r2.ebuild,v 1.2 2015/07/31 12:43:09 chainsaw Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit base linux-mod eutils flag-o-matic toolchain-funcs
 
 MY_P="${P/dahdi/dahdi-linux}"
 JNET=1.0.14
-GENTOO=1.2.2
+GENTOO=1.2.3
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"