Version bump. Patch by Stefan "stkn" Knoblich fixes compatibility with recent hardened-sources, with thanks to Anthony "blueness" Basile for review.

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

3 files changed, 82 insertions, 5 deletions

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index a5d32528f689..3760085336c8 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.27 2011/09/12 13:59:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.28 2011/10/20 10:50:01 chainsaw Exp $
+
+*dahdi-2.5.0.1 (20 Oct 2011)
+
+  20 Oct 2011; Tony Vroon <chainsaw@gentoo.org> +dahdi-2.5.0.1.ebuild:
+  Version bump. Patch by Stefan "stkn" Knoblich fixes compatibility with recent
+  hardened-sources, with thanks to Anthony "blueness" Basile for review.
 
   12 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> dahdi-2.4.1-r1.ebuild,
   dahdi-2.5.0.ebuild, dahdi-2.5.0-r2.ebuild:
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 930fc2464c02..e06bda6de5da 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -8,19 +8,22 @@ DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 RMD160 8181ffd4bc861122c338e1eb2748e7
 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
+DIST dahdi-linux-2.5.0.1.tar.gz 1549836 RMD160 1b186e69a68f2e0b6c88a9e2022c42ed77e79e34 SHA1 5d48b0ac5c2d7afc27cf1a3fc1053466b9c9d1b4 SHA256 2fe8a3d5324dc94a9747328a14d9d7f001bc81be1efe3e0bf4ab641733c479a8
 DIST dahdi-linux-2.5.0.tar.gz 1546486 RMD160 a6ab21554965e403e5869bbae5e404200caaef2c SHA1 90d5f75df45426c01320fa5c3a0f58a6a9d00fb5 SHA256 08953e96a59f313594ee83caad45687293433c21603f0edbefd6b6513dbd80ad
 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.8.tar.bz2 59640 RMD160 b5ef0c65d0797be8575c67efe1a8b0323995608e SHA1 a57a68c97c388ea41ff36826d03dba3640290615 SHA256 4d7c9af9a00d269d7f7d7b62607c756f59e4ebccdc0488e4f349edb2eac28abf
 DIST jnet-dahdi-drivers-1.0.11.tar.gz 60945 RMD160 629c9993e460ca30bfc5adddf1bcd8edbe3694d7 SHA1 31ec44b7a892e8052b6c2cbe5b10e72646960e2d SHA256 31f0a856f0b75533d4880428c29f2e8a4ca4bbab6c062b7ffe70f335126e9234
 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.1.ebuild 2679 RMD160 38ee9f4143ce35360bd9a1dedd0730b68f890241 SHA1 01d852c4eff4c4a988446139ab35a390b476ec0b SHA256 1f6289ddc6e4933c79e59573e7f4ed7baa15adb504037371c143dbc30232e5cf
 EBUILD dahdi-2.5.0.ebuild 2219 RMD160 dc64c283de18fa53aa9573c527f1545552dc6e7c SHA1 f2036b3f7d80145de410725d484135360650dc8a SHA256 fba5681a6e6765f97c4a1b14fb0999bf3d8da62bd375e88dc8d08581450d59f0
-MISC ChangeLog 7096 RMD160 cdbdc68631c644f3e2ce6e3d9330c5d327a1a1b7 SHA1 8c34feab077c5e2b4b286253b61003b3ead01a80 SHA256 d7adeb31f93bb94d70e2bd2265428ac16451ddc16294f62dd8bd70e7d27e3b89
+MISC ChangeLog 7350 RMD160 fe1dab817ae9354be127d46ac4e90c559b0f9472 SHA1 27d20da98aa41738638b1362b92cb061e66e33a0 SHA256 0179e29103a41786eaaf07441357c259aef24c40596f304499c85dade85db722
 MISC metadata.xml 333 RMD160 4a7f243a6d4b1de974e5c52592cdb310d5c68664 SHA1 f9b073c0c00e12f5f154a7d4209430ac8a736393 SHA256 c7cf56ea7b6f0f6d3707fe2c8a0ac3ff9d13414093c4332dcb2201d8b0966691
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5uEEsACgkQAiZjviIA2XiP0gCbBsdearOPmruJ3DCULewgeoJ7
-zKMAnA6SyST7ftO2V1DTB+hj+0rPa4vC
-=v6Ic
+iEYEARECAAYFAk6f/OkACgkQp5vW4rUFj5pN7wCgqB/h9g3wpm35UctY9goCXCNN
+sRwAn1fbBLdevV9V8HfPNtLO+4AV3XHZ
+=mQ29
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dahdi/dahdi-2.5.0.1.ebuild b/net-misc/dahdi/dahdi-2.5.0.1.ebuild
new file mode 100644
index 000000000000..02845865152b
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.5.0.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 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.1.ebuild,v 1.1 2011/10/20 10:50:01 chainsaw Exp $
+
+EAPI=4
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+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.8.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-0.8.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.11.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-1.0.11/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-1.0.11/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-1.0.11/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="${KERNEL_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}