From c744e534539a7531751fb8ff8536a328f9602545 Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Mon, 2 Mar 2015 09:43:03 +0000 Subject: [PATCH] Version bump, reverting to earlier patchset as suggested by Oliver Jaksch in bug #541006. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xB5058F9A --- net-misc/dahdi/ChangeLog | 8 ++- net-misc/dahdi/Manifest | 10 ++-- net-misc/dahdi/dahdi-2.10.1.ebuild | 81 ++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 net-misc/dahdi/dahdi-2.10.1.ebuild diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog index d7ca9da23a5b..29fb72c06203 100644 --- a/net-misc/dahdi/ChangeLog +++ b/net-misc/dahdi/ChangeLog @@ -1,6 +1,12 @@ # 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.69 2015/02/12 16:09:35 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.70 2015/03/02 09:42:58 chainsaw Exp $ + +*dahdi-2.10.1 (02 Mar 2015) + + 02 Mar 2015; Tony Vroon +dahdi-2.10.1.ebuild: + Version bump, reverting to earlier patchset as suggested by Oliver Jaksch in + bug #541006. *dahdi-2.10.0.1-r1 (12 Feb 2015) diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest index f2b2de597a1f..0d0a60407536 100644 --- a/net-misc/dahdi/Manifest +++ b/net-misc/dahdi/Manifest @@ -19,17 +19,19 @@ DIST dahdi-fw-te820-1.76.tar.gz 54303 SHA256 5b823e25828e2c1c6548886ad408b2e31db DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 SHA256 6b199cf836f150f9cb35f763f0f502fb52cfa2724a449b500429c746973904ad SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3 WHIRLPOOL 9dc3e1bdfdb458eca3e943b89c64460af13c7aa8ca0e6fb56228df54520979c47659828f199c10c2359804156955b9fb956ade47b50f46adb60e10a8bddc125f DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 SHA256 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1 SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047 WHIRLPOOL 0151914828f6cee593905ef6ce81e66da32f1c7752900332f10907638c2a37e331606215152e846a58ee3f1031a7c162eeb1bf0c17691e8dd66add79dcd8e015 DIST dahdi-linux-2.10.0.1.tar.gz 2042867 SHA256 7b129903c517fbcb74e9600cd2baaf1721d8684c53525314620db7c0410055fe SHA512 7d03717947063a037e83fc13ab42e4ecc4aeb12a2d8e1f0cae5b491d2dcd948aa51381f0111e5013f355faf4d6ff00df8238e19be91852e99040a836fbf51318 WHIRLPOOL 6fcb613fbaf20a4a664a0f20c15c31b2ac8c4c54bf6c40ee951e61b0600f9700f61d73005b8ba6e34b75c62ffbc1cfc97af9d926ce3caa04e420e84212df1edb +DIST dahdi-linux-2.10.1.tar.gz 2044847 SHA256 94c532e190fc6372f9731df71f8c590fc6f6f184d5394339ce892ac6788843aa SHA512 3ef877ba104e720f3292fc95450968ec1d46cc54f807492a2d41fe768e9dde554a420928f45b7244647b5bf2300863e150ee23c9920fbfb7afa6cb46a77a2087 WHIRLPOOL e114b8e200aaa94283bcf57f54e6e0be33fe7bbb5680acba43b5704733cd7e6c27eae5a6fbb9cc0314ac022c1b2892839da5b710b21991247944847e3819b0c8 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 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 -MISC ChangeLog 15519 SHA256 f8f7b15835b6086db94a6be5996266935237755086acc945ae9a3bfaa9594798 SHA512 fb8f485bcc64f0d6cbf758672eb3e4965c250426dc184b8dcbb2f0435255b1dc614f37d5173ecd6a533756cd527fbd674987929d68fab20b18815fb0b445ffd7 WHIRLPOOL a4e471762de8ad0ae9d3ef20a67758dd7ceee8aff6fbd748e150376891ab0cb56d976d1e0b50601c8683289755de34b7d7a9555706bdd60d67e32ba3660c9cec +EBUILD dahdi-2.10.1.ebuild 3730 SHA256 69520d104ac5482979f7ee887b5f303fd8764cf701dec4c4e70c85754baef6f8 SHA512 69185c3d878652a09948aa6f66ba424af3562486656478bddba7a0f99d16dc4fc1c421a071603b061b73f75e7396a8a46058ae88e065d6eb400c5bdb7bdb53c3 WHIRLPOOL 9df20942423b6a06234e78e12dd5d5f25730ea2e48ed72678022fe72149216fffa65cafcbfac8e94e42ac07525017c666b81d80b3867c9f2b71446332f286edd +MISC ChangeLog 15713 SHA256 a0d1bf3d0b041468127c2ecf9a7f425ab21b71a9f9488fb756e73a9891ca03d5 SHA512 37591db4d84859dba54a81dd926226616749d61132744e577a12f3824fc21e9d7c09cdc6db124c78d22aa1f55035e4b5a8fe03aadf6f6eb779928256b6318569 WHIRLPOOL 2a5104c08eda1a81a77b5cb596c94815c411ea37b5cdfadabcbe49035c9e673bfb8f74972a9526e8d905e0d97f1c26287a1a9041c3fe9879df11bc739292d6a9 MISC metadata.xml 313 SHA256 bdeaff3e2154c5664ac49b3dfdd9f59dccfa127ec8c5813c3f8441718e364374 SHA512 241cb7ea094d588b2ea8af11a26c1f6dd635a39120d0d15cf0531884cc9c05ad67c3c669924fdc5f292cc360629c34a5370a746199df19d0d2267f48c2beb90c WHIRLPOOL c9714fd598a731fff5103cb573cd4e3a0fc4b9c8f3a165917797aadd4592e332d7ae29036ca79f712a8ee5137193a9db3591673c2780de6c354fac497ffc8455 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlTc0FcACgkQp5vW4rUFj5qVJwCeL2m3EYp3Z4MI4hgcrEoIdRhi -qaIAn3ahgzMQi6tZLD4tSgmgbo+CWIia -=bAi/ +iEYEAREIAAYFAlT0L7wACgkQp5vW4rUFj5pG5wCgva5MfgVrg2yvf209Fn8LvGUK ++lsAn1YUN4INpXFNihOKWulx/cfc4EeF +=KUCJ -----END PGP SIGNATURE----- diff --git a/net-misc/dahdi/dahdi-2.10.1.ebuild b/net-misc/dahdi/dahdi-2.10.1.ebuild new file mode 100644 index 000000000000..22df594f2854 --- /dev/null +++ b/net-misc/dahdi/dahdi-2.10.1.ebuild @@ -0,0 +1,81 @@ +# 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.ebuild,v 1.1 2015/03/02 09:42:58 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.1.9 +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.* +} -- 2.26.2