1 |
commit: dcbd5551044f0b23942cdf57265a724c5e5a0fa6 |
2 |
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> |
3 |
AuthorDate: Fri Dec 6 17:27:00 2019 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 10 05:15:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbd5551 |
7 |
|
8 |
net-misc/dahdi: version bump to 3.1.0 |
9 |
|
10 |
Fixes various build issues due to old kernels. |
11 |
|
12 |
Unfortunately drops support for some cards previously maintained by |
13 |
tzafrir (https://notabug.org/tzafrir/dahdi-linux-extra). Unfortunately |
14 |
by his own admission these are really old, and looks like he dropped |
15 |
support for most of those cards as well. |
16 |
|
17 |
If required, please file a bug against me and I'll see what can be done. |
18 |
|
19 |
Closes: https://bugs.gentoo.org/661782 |
20 |
Closes: https://bugs.gentoo.org/661894 |
21 |
Closes: https://bugs.gentoo.org/679212 |
22 |
Closes: https://bugs.gentoo.org/679944 |
23 |
Closes: https://bugs.gentoo.org/701504 |
24 |
Closes: https://bugs.gentoo.org/701612 |
25 |
Package-Manager: Portage-2.3.79, Repoman-2.3.16 |
26 |
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> |
27 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
28 |
|
29 |
net-misc/dahdi/Manifest | 2 + |
30 |
net-misc/dahdi/dahdi-3.1.0.ebuild | 104 ++++++++++++++++++++++++++++++++++++++ |
31 |
net-misc/dahdi/metadata.xml | 1 + |
32 |
3 files changed, 107 insertions(+) |
33 |
|
34 |
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest |
35 |
index 838cf87aff0..8c37cabb721 100644 |
36 |
--- a/net-misc/dahdi/Manifest |
37 |
+++ b/net-misc/dahdi/Manifest |
38 |
@@ -23,8 +23,10 @@ DIST dahdi-linux-2.10.0.1.tar.gz 2042867 BLAKE2B 221f9141e9d05c9322ff75857c32c64 |
39 |
DIST dahdi-linux-2.10.1.tar.gz 2044847 BLAKE2B 242a3f440e0af7a006f2d96f2d9dd7d2e7095f795793301fc2d60e9c6e10124ad9c79e84c0917700dba74ee9cd4b2e49f81e23d7645532ca5af1b257f952c43d SHA512 3ef877ba104e720f3292fc95450968ec1d46cc54f807492a2d41fe768e9dde554a420928f45b7244647b5bf2300863e150ee23c9920fbfb7afa6cb46a77a2087 |
40 |
DIST dahdi-linux-2.10.2.tar.gz 2044873 BLAKE2B 8c6bab0fb4b8436bb3b6f1f002e41fbd4269f5f64bbfe14519ae271c4cdd767a6898df771415960f5ead052f10a3aaff9ea1b67cc64b74da78020b8806ca9e1d SHA512 b585a408ffb7b95a5e1a47dff14be93e2ce7420e5b3b3160ccfc0ca8df153ec1f36c56c96bc4f7b20bebda0559ec03481e1307feb8e10eace68737e8f8783537 |
41 |
DIST dahdi-linux-2.11.1.tar.gz 2045435 BLAKE2B b84b8717a7568b00ab9cb9f6edb5a04f2c085655ee07c9637fbd09faf3e520beaa0f5a13e6864ba06e92bd1bb54b28e08c36f2b5d16dc9510ecae9ea61f745e3 SHA512 db15d9237f157b5349de8f4cdb45573ed42e1dd25c83f900835c7e15637a19e1e95c7c990dc786c1e3f37f32419f3d009e179d27b5d16421789ff9bc76f54224 |
42 |
+DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 |
43 |
DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c1388544710ab69bd727d54963c7df6c7fcd56a450d5ea0242ae1bbbe45855fbe5bd3b3150d28676490713f9dd1331e42c0c2fa5243415b69 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770 |
44 |
DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04 |
45 |
DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517 |
46 |
DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210 |
47 |
+DIST gentoo-dahdi-patchset-3.1.0.tar.bz2 2224 BLAKE2B f07b8a1ecf7996d9e970248216b3ceacd991ecfe4e6e9cbf408c47e7e29e827a5ebedd399d611bc7c286309095c109d30d6c7f03ed4c95c8e89ba816ed59e002 SHA512 ed88dcf023238a8cea33fc32957ec28a237eafd0315fd5b73bfcabb95ef5aa304a94ce38a6233f37810162cfc9467876128003e818145a6942e7133a68243d42 |
48 |
DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 |
49 |
|
50 |
diff --git a/net-misc/dahdi/dahdi-3.1.0.ebuild b/net-misc/dahdi/dahdi-3.1.0.ebuild |
51 |
new file mode 100644 |
52 |
index 00000000000..acefda64fce |
53 |
--- /dev/null |
54 |
+++ b/net-misc/dahdi/dahdi-3.1.0.ebuild |
55 |
@@ -0,0 +1,104 @@ |
56 |
+# Copyright 1999-2020 Gentoo Authors |
57 |
+# Distributed under the terms of the GNU General Public License v2 |
58 |
+ |
59 |
+EAPI=7 |
60 |
+ |
61 |
+inherit flag-o-matic linux-mod toolchain-funcs |
62 |
+ |
63 |
+MY_P="${P/dahdi/dahdi-linux}" |
64 |
+JNET=1.0.14 |
65 |
+GENTOO=3.1.0 |
66 |
+S="${WORKDIR}/${MY_P}" |
67 |
+ |
68 |
+JNET_DRIVERS="cwain qozap ztgsm" |
69 |
+ |
70 |
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" |
71 |
+HOMEPAGE="https://www.asterisk.org" |
72 |
+SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz |
73 |
+ https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz |
74 |
+ https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2 |
75 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz |
76 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz |
77 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz |
78 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz |
79 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz |
80 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz |
81 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz |
82 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz |
83 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz |
84 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz |
85 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz |
86 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz |
87 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz |
88 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz |
89 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz |
90 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz |
91 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz |
92 |
+" |
93 |
+ |
94 |
+LICENSE="LGPL-2.1" |
95 |
+SLOT="0" |
96 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
97 |
+IUSE="flash oslec" |
98 |
+ |
99 |
+DEPEND="" |
100 |
+RDEPEND="" |
101 |
+ |
102 |
+PATCHES=( "${WORKDIR}/dahdi-patchset" ) |
103 |
+ |
104 |
+CONFIG_CHECK="MODULES ~CRC_CCITT" |
105 |
+ |
106 |
+pkg_pretend() { |
107 |
+ use oslec && CONFIG_CHECK+=" ECHO" |
108 |
+ check_extra_config |
109 |
+} |
110 |
+ |
111 |
+src_unpack() { |
112 |
+ unpack ${A} |
113 |
+ # Copy the firmware tarballs over, the makefile will try and download them otherwise |
114 |
+ for file in ${A} ; do |
115 |
+ [[ "${file}" = dahdi-fw* ]] || continue |
116 |
+ cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || |
117 |
+ die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" |
118 |
+ done |
119 |
+ # But without the .bin's it'll still fall over and die, so copy those too. |
120 |
+ mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || |
121 |
+ die "Error moving firmware files into the right folders." |
122 |
+ |
123 |
+ for drv in ${JNET_DRIVERS}; do |
124 |
+ ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || |
125 |
+ die "Error linking ${drv}.c from jnet to DAHDI." |
126 |
+ ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || |
127 |
+ die "Error linking ${drv}.h from jnet to DAHDI." |
128 |
+ done |
129 |
+} |
130 |
+ |
131 |
+src_prepare() { |
132 |
+ if use flash; then |
133 |
+ sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || |
134 |
+ die "Failed to define FXSFLASH" |
135 |
+ sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ |
136 |
+ include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" |
137 |
+ fi |
138 |
+ if use oslec; then |
139 |
+ sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ |
140 |
+ drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." |
141 |
+ fi |
142 |
+ default |
143 |
+} |
144 |
+ |
145 |
+src_compile() { |
146 |
+ unset ARCH |
147 |
+ emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ |
148 |
+ DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ |
149 |
+ LDFLAGS="$(raw-ldflags)" all |
150 |
+} |
151 |
+ |
152 |
+src_install() { |
153 |
+ einfo "Installing kernel module" |
154 |
+ emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ |
155 |
+ DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ |
156 |
+ LDFLAGS="$(raw-ldflags)" install |
157 |
+ |
158 |
+ rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules" |
159 |
+} |
160 |
|
161 |
diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml |
162 |
index 5764b12a1cd..b132a89f1bb 100644 |
163 |
--- a/net-misc/dahdi/metadata.xml |
164 |
+++ b/net-misc/dahdi/metadata.xml |
165 |
@@ -11,5 +11,6 @@ |
166 |
</maintainer> |
167 |
<use> |
168 |
<flag name="flash">Support (short) flash on FXS</flag> |
169 |
+ <flag name="oslec">Enable OSLEC (software) echo canceller (require ECHO in kernel)</flag> |
170 |
</use> |
171 |
</pkgmetadata> |