diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-13 14:01:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-13 15:16:57 +0000 |
| commit | fc06a32e81a7dcf3127e3346c51d41b17ae75a18 (patch) | |
| tree | 20026831591d2c69a770fc05ec3fbcc5b930080c | |
| parent | 4c960805dbb001fdd1c470d732cd17c1e207ce12 (diff) | |
| download | aports-fc06a32e81a7dcf3127e3346c51d41b17ae75a18.tar.bz2 aports-fc06a32e81a7dcf3127e3346c51d41b17ae75a18.tar.xz | |
main/dahdi-linux-grsec: fix zaphfc, upgrade to 2.7.0.1 and kernel 3.10.19-r0
fixes #2337
| -rw-r--r-- | main/dahdi-linux-grsec/APKBUILD | 16 | ||||
| -rw-r--r-- | main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch | 32 |
2 files changed, 42 insertions, 6 deletions
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 4c580b90d6..74e5015ba1 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -3,8 +3,8 @@ _flavor=grsec _kpkg=linux-$_flavor -_kver=3.10.18 -_kpkgrel=1 +_kver=3.10.19 +_kpkgrel=0 _mypkgrel=0 # verify the kernel version before entering chroot @@ -21,7 +21,7 @@ _realname=dahdi-linux pkgname=${_realname}-${_flavor} pkgver=$_kver # when chaning _dahdiver we *must* bump _mypkgrel -_dahdiver=2.7.0 +_dahdiver=2.7.0.1 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" url="http://www.asterisk.org" @@ -41,6 +41,7 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna zaphfc-dahdi-2.4.0.patch zaphfc-dahdi-2.5.0.patch zaphfc-dahdi-2.6.0.patch + zaphfc-dahdi-2.7.0.patch constify.patch " @@ -82,7 +83,7 @@ dev() { ln -s /usr/include "$dir"/include } -md5sums="ac0d7ed711130e8038b304c5e2f96334 dahdi-linux-2.7.0.tar.gz +md5sums="bd91e46c60b6cdcdee95d7b0fec45e32 dahdi-linux-2.7.0.1.tar.gz c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 3bb419ac598534cd4ad5248f23656001 dahdi-bri_dchan.patch c6308ea8aaafba0a9d7f9825d7c9dcf8 dahdi-zaphfc.patch @@ -90,8 +91,9 @@ c6308ea8aaafba0a9d7f9825d7c9dcf8 dahdi-zaphfc.patch 0fdcd8c8c93bc1fe33c0af12b6cc6b05 zaphfc-dahdi-2.4.0.patch 9ed23321512274c6c5c5b76af0411e38 zaphfc-dahdi-2.5.0.patch 6273db53267e1f322d91bf1c8b97ba19 zaphfc-dahdi-2.6.0.patch +72c1481a6dd59e6c84d7ee3e925052aa zaphfc-dahdi-2.7.0.patch 15fd0337d9e592f2f1829770c2e69c86 constify.patch" -sha256sums="7666e83ddbe0b71b34ada30940788bb289c2918e6b8618a65c82674a9da36427 dahdi-linux-2.7.0.tar.gz +sha256sums="4b8ba23c38b0f655344b5ce309b4ed2c13b7790b805a4f7ad3071f3f569eddc6 dahdi-linux-2.7.0.1.tar.gz dea96284bc80184326fb5167d17bbfb9adbfc6bd00076a7b3fa295b424f30fe9 dahdi-depmod.patch d1472df8e32f858f363f6fa733f9260f245bcd6d55ab4aa4b0352a446b1ec7f7 dahdi-bri_dchan.patch 3bc70c81cbf4d7bcafd326a00562066905e425cdebc12b5fc8c69be2af4a557d dahdi-zaphfc.patch @@ -99,8 +101,9 @@ d1472df8e32f858f363f6fa733f9260f245bcd6d55ab4aa4b0352a446b1ec7f7 dahdi-bri_dcha 5fc36e7d7bf2745e42122f52d1399ae016ee127e863c89e495a7bca07ca255b0 zaphfc-dahdi-2.4.0.patch b57979edbeeb957c48cdef3c1bc83034dcec64734e1ca239d1fcca04128b5917 zaphfc-dahdi-2.5.0.patch 3a8d90cfb745ac5caaa704c1507b3f7b63ee365735ade7e0544739e33469477d zaphfc-dahdi-2.6.0.patch +71eb5dab7f81454b4e10cf1dc50e058dac2448b0e28cf21037bd99e39d9ce1da zaphfc-dahdi-2.7.0.patch 56729122b99df3e674f3b7269103c1e56b87e2f319ed5067365c3ba357e8449b constify.patch" -sha512sums="3fc42d71379dfd898930369732be1a0dd0e2051a388910dd47ca14ea1a280dc6cb39bf9fffd4db774548b72d760b629749b753030092e32494958676b63b320e dahdi-linux-2.7.0.tar.gz +sha512sums="b1e894f838b1f6e7d940b065028c7b54ff85dbd56281f40cdfbd6a32fd23c563e5d0eb242bb4dce6aa4171b1b62e066acad59a82ca61ffbb4589336fafb1e5b4 dahdi-linux-2.7.0.1.tar.gz aba01eb90d9db1c595ff22078c76aadb20900486b5794d38b7ee61fa30d2fb51be318a4d059246017640447aee03fb09bb5514c818e3caa1cd98e331ec065173 dahdi-depmod.patch fa2fa9e96eefc0f31a1a4a8f8f44e77936f6da0d7b74fe3c3d1f0de085621744ae4367932ac97a10b7f96b7d0954843b0bfe07a251b85434079cc6da29e243ba dahdi-bri_dchan.patch c6eaaf9119656a55820f44eca5d568eef241be185fa2e89779c1beee0004c81d642365e639c99e7c74a4a9ebd88468f5db20586ef8d65da15a6037607fc48e3f dahdi-zaphfc.patch @@ -108,4 +111,5 @@ c6eaaf9119656a55820f44eca5d568eef241be185fa2e89779c1beee0004c81d642365e639c99e7c 8068fcbba81b819bbd14a1a324457d0febd5350d16c6443be035c50f7759010376bd92d3c7ea69b47309e02603e587387b643f64663652e162853515371a6da5 zaphfc-dahdi-2.4.0.patch 95811d56f5567bbab1e6fac89fdc7a4d78252a54a416e884903ae2709f8922f5cd02c492de0bad5c35fdfd52250ec231ed11457e36ba33f8747c3226491882de zaphfc-dahdi-2.5.0.patch 7533c640817f71789c922bb9a5a3b6132b5b47958770929b1c9a50a1e2e6de914e278f466a85ef99759e291e5907c56d60926c74075f4e731a9910a46c1be3ea zaphfc-dahdi-2.6.0.patch +daca74da31c655265164a854987d45ca5ee3af1defbe2d49a9f1a70a48a43dc2bc3ceba724781ae29e3a9078b827f641d2e29809fb25101986f2f69c767d1382 zaphfc-dahdi-2.7.0.patch c247ce53dd0c9f069d4881c89bd0dc1a816562761874731924af482c40736d6604b360b26642ba5d5d86208c8231de703aa0d858e40911cb0dda46c8fabfd19e constify.patch" diff --git a/main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch b/main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch new file mode 100644 index 0000000000..624cfe7b9a --- /dev/null +++ b/main/dahdi-linux-grsec/zaphfc-dahdi-2.7.0.patch @@ -0,0 +1,32 @@ +--- dahdi-linux-2.7.0/drivers/dahdi/zaphfc.c.orig 2013-11-13 14:47:31.772140792 +0200 ++++ dahdi-linux-2.7.0/drivers/dahdi/zaphfc.c 2013-11-13 14:55:20.136270113 +0200 +@@ -687,19 +687,18 @@ + if (!zthfc->ddev) + return -ENOMEM; + +- zthfc->ddev->manufacturer = "HFC"; +- ++ zthfc->ddev->manufacturer = "Cologne Chips"; ++ zthfc->ddev->devicetype = "HFC-S PCI-A ISDN"; ++ zthfc->ddev->location = kasprintf(GFP_KERNEL, ++ "PCI Bus %02d Slot %02d", ++ hfctmp->pcidev->bus->number, ++ PCI_SLOT(hfctmp->pcidev->devfn) + 1); + memset(&zthfc->span, 0x0, sizeof(struct dahdi_span)); // you never can tell... +- + sprintf(zthfc->span.name, "ZTHFC/%d", hfc_dev_count + 1); +- if (hfctmp->regs.nt_mode == 1) { +- sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [NT]", hfc_dev_count + 1); +- } else { +- sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1); +- } +- ++ sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [%s]", ++ hfc_dev_count + 1, hfctmp->regs.nt_mode ? "NT" : "TE"); ++ zthfc->span.spantype = hfctmp->regs.nt_mode ? SPANTYPE_DIGITAL_BRI_NT : SPANTYPE_DIGITAL_BRI_TE; + zthfc->span.ops = &zaphfc_span_ops; +- + zthfc->span.channels = 3; + zthfc->span.chans = zthfc->_chans; + for (i = 0; i < zthfc->span.channels; i++) + |