aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-10-28 09:02:05 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-10-28 09:02:05 +0000
commit2fd071071a872dd78b321a1446c5ab1a81168021 (patch)
tree72df6c84d21745ed8c535d62df1917afab0e27c6 /main
parent41395d31a10fe74bb207ea0fcc97a90d66004252 (diff)
downloadaports-2fd071071a872dd78b321a1446c5ab1a81168021.tar.bz2
aports-2fd071071a872dd78b321a1446c5ab1a81168021.tar.xz
main/dahdi-linux-grsec: fix build and enable
Diffstat (limited to 'main')
-rw-r--r--main/dahdi-linux-grsec/APKBUILD15
-rw-r--r--main/dahdi-linux-grsec/dahdi-zaphfc.patch2
-rw-r--r--main/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff2
3 files changed, 9 insertions, 10 deletions
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index a7d9405d3a..1fbb77c2e3 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -25,8 +25,7 @@ _dahdiver=2.10.2
pkgrel=$(( $_kpkgrel + $_mypkgrel ))
pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver"
url="http://www.asterisk.org"
-#arch="x86 x86_64"
-arch=""
+arch="x86 x86_64"
license="GPL"
depends="dahdi-linux linux-${_flavor}=${_kpkgver}"
# we need wget and tar because make install downloads firmware and uses fancy
@@ -88,8 +87,8 @@ dev() {
md5sums="0281de245f4fa056f765ae2a6e1f1a4b dahdi-linux-2.10.2.tar.gz
c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch
3bb419ac598534cd4ad5248f23656001 dahdi-bri_dchan.patch
-c6308ea8aaafba0a9d7f9825d7c9dcf8 dahdi-zaphfc.patch
-035a6d91b2fb56a9b76a60a2e494fe9e zaphfc-dahdi-flortz.diff
+6be8afbf60d3e70aaccace7f57ac2cf1 dahdi-zaphfc.patch
+c56e31450dc10601e7d41f66bcae4072 zaphfc-dahdi-flortz.diff
0fdcd8c8c93bc1fe33c0af12b6cc6b05 zaphfc-dahdi-2.4.0.patch
9ed23321512274c6c5c5b76af0411e38 zaphfc-dahdi-2.5.0.patch
6273db53267e1f322d91bf1c8b97ba19 zaphfc-dahdi-2.6.0.patch
@@ -99,8 +98,8 @@ c6308ea8aaafba0a9d7f9825d7c9dcf8 dahdi-zaphfc.patch
sha256sums="6270444cb9b345941267b162038cc45f5ef4485139176e88e2c4d22fa35a2c59 dahdi-linux-2.10.2.tar.gz
dea96284bc80184326fb5167d17bbfb9adbfc6bd00076a7b3fa295b424f30fe9 dahdi-depmod.patch
d1472df8e32f858f363f6fa733f9260f245bcd6d55ab4aa4b0352a446b1ec7f7 dahdi-bri_dchan.patch
-3bc70c81cbf4d7bcafd326a00562066905e425cdebc12b5fc8c69be2af4a557d dahdi-zaphfc.patch
-94288eb882fc71afd358fc937a16befa02681bcc9a619d088f82d6f53514cc33 zaphfc-dahdi-flortz.diff
+0a854145662d49d7d302e326ebfa461d3f3cab9fb30a3c09bd8b0f120c05e7a3 dahdi-zaphfc.patch
+3f3b43d5129981b759394120cf3faaf32fff86dfa4bc787aaad0384267ac8847 zaphfc-dahdi-flortz.diff
5fc36e7d7bf2745e42122f52d1399ae016ee127e863c89e495a7bca07ca255b0 zaphfc-dahdi-2.4.0.patch
b57979edbeeb957c48cdef3c1bc83034dcec64734e1ca239d1fcca04128b5917 zaphfc-dahdi-2.5.0.patch
3a8d90cfb745ac5caaa704c1507b3f7b63ee365735ade7e0544739e33469477d zaphfc-dahdi-2.6.0.patch
@@ -110,8 +109,8 @@ b57979edbeeb957c48cdef3c1bc83034dcec64734e1ca239d1fcca04128b5917 zaphfc-dahdi-2
sha512sums="b585a408ffb7b95a5e1a47dff14be93e2ce7420e5b3b3160ccfc0ca8df153ec1f36c56c96bc4f7b20bebda0559ec03481e1307feb8e10eace68737e8f8783537 dahdi-linux-2.10.2.tar.gz
aba01eb90d9db1c595ff22078c76aadb20900486b5794d38b7ee61fa30d2fb51be318a4d059246017640447aee03fb09bb5514c818e3caa1cd98e331ec065173 dahdi-depmod.patch
fa2fa9e96eefc0f31a1a4a8f8f44e77936f6da0d7b74fe3c3d1f0de085621744ae4367932ac97a10b7f96b7d0954843b0bfe07a251b85434079cc6da29e243ba dahdi-bri_dchan.patch
-c6eaaf9119656a55820f44eca5d568eef241be185fa2e89779c1beee0004c81d642365e639c99e7c74a4a9ebd88468f5db20586ef8d65da15a6037607fc48e3f dahdi-zaphfc.patch
-5bff725e6fbdab9942f0d4b2b7d00680914c82d6f09ff2843c9e9c19ac6bad6583305fc371355570f4efaf1a25d8fea1db4e2947a32fcb91abbaf374977e155e zaphfc-dahdi-flortz.diff
+8ef31c9723237da83954832df5aee1f5daa23f8fefe07a1a191a2c5da2c2308001d68cee83500f7ef43166bfc0d65552b0ca5362789c5c82a7217e09362fd5fe dahdi-zaphfc.patch
+f18043fd18a05be7e49daa9d8c96c8a8c45936b14e82e30523e4d88b1620a73147f765d24d2038c4ec0855901e36e8e2b188d596f94437dfb80f6d76ab699d9d zaphfc-dahdi-flortz.diff
8068fcbba81b819bbd14a1a324457d0febd5350d16c6443be035c50f7759010376bd92d3c7ea69b47309e02603e587387b643f64663652e162853515371a6da5 zaphfc-dahdi-2.4.0.patch
95811d56f5567bbab1e6fac89fdc7a4d78252a54a416e884903ae2709f8922f5cd02c492de0bad5c35fdfd52250ec231ed11457e36ba33f8747c3226491882de zaphfc-dahdi-2.5.0.patch
7533c640817f71789c922bb9a5a3b6132b5b47958770929b1c9a50a1e2e6de914e278f466a85ef99759e291e5907c56d60926c74075f4e731a9910a46c1be3ea zaphfc-dahdi-2.6.0.patch
diff --git a/main/dahdi-linux-grsec/dahdi-zaphfc.patch b/main/dahdi-linux-grsec/dahdi-zaphfc.patch
index 3e6c7e0a36..931c5b5cf6 100644
--- a/main/dahdi-linux-grsec/dahdi-zaphfc.patch
+++ b/main/dahdi-linux-grsec/dahdi-zaphfc.patch
@@ -990,7 +990,7 @@ Index: dahdi-linux-2.1.0/drivers/dahdi/zaphfc.c
+ /* we need no stinking irq */
+ hfctmp->irq = 0;
+#else
-+ if (request_irq(hfctmp->irq, &hfc_interrupt, DAHDI_IRQ_SHARED, "zaphfc", hfctmp)) {
++ if (request_irq(hfctmp->irq, &hfc_interrupt, IRQF_SHARED, "zaphfc", hfctmp)) {
+ printk(KERN_WARNING "zaphfc: unable to register irq\n");
+ kfree(hfctmp->fifomem);
+ kfree(hfctmp);
diff --git a/main/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff b/main/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
index f1ecc093af..dc856c97c7 100644
--- a/main/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
+++ b/main/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
@@ -1083,7 +1083,7 @@ Index: dahdi-linux-2.1.0.4/drivers/dahdi/zaphfc.c
- /* we need no stinking irq */
- hfctmp->irq = 0;
-#else
- if (request_irq(hfctmp->irq, &hfc_interrupt, DAHDI_IRQ_SHARED, "zaphfc", hfctmp)) {
+ if (request_irq(hfctmp->irq, &hfc_interrupt, IRQF_SHARED, "zaphfc", hfctmp)) {
printk(KERN_WARNING "zaphfc: unable to register irq\n");
- kfree(hfctmp->fifomem);
- kfree(hfctmp);