diff options
author | Timo Teräs <timo.teras@iki.fi> | 2010-10-26 15:04:34 +0300 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2010-10-26 15:05:44 +0300 |
commit | 153c38dde26bbbac83b42b7b367c2e17c1cab7bc (patch) | |
tree | 12f4d437666bf0fa41f13450ad8005fd83fa28d4 | |
parent | f036d3c8ae9a0606d1a84ff9d16a259ad4bfffd8 (diff) | |
download | alpine_aports-153c38dde26bbbac83b42b7b367c2e17c1cab7bc.tar.bz2 alpine_aports-153c38dde26bbbac83b42b7b367c2e17c1cab7bc.tar.xz alpine_aports-153c38dde26bbbac83b42b7b367c2e17c1cab7bc.zip |
main/dahdi-linux-grsec: update to 2.4.0
and update zaphfc to compile with new dahdi
-rw-r--r-- | main/dahdi-linux-grsec/APKBUILD | 10 | ||||
-rw-r--r-- | main/dahdi-linux-grsec/dahdi-zaphfc2.patch | 12 | ||||
-rw-r--r-- | main/dahdi-linux-grsec/zaphfc-dahdi-2.4.0.patch | 58 |
3 files changed, 63 insertions, 17 deletions
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index cedaec5c4a..4dee6d67b0 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD | |||
@@ -16,8 +16,8 @@ _realname=dahdi-linux | |||
16 | pkgname=${_realname}-${_flavor} | 16 | pkgname=${_realname}-${_flavor} |
17 | pkgver=$pkgver | 17 | pkgver=$pkgver |
18 | # when chaning _dahdiver we *must* bump _mypkgrel | 18 | # when chaning _dahdiver we *must* bump _mypkgrel |
19 | _dahdiver=2.3.0.1 | 19 | _dahdiver=2.4.0 |
20 | _mypkgrel=4 | 20 | _mypkgrel=0 |
21 | pkgrel=$(( $_kpkgrel + $_mypkgrel )) | 21 | pkgrel=$(( $_kpkgrel + $_mypkgrel )) |
22 | pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" | 22 | pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" |
23 | url="http://www.asterisk.org" | 23 | url="http://www.asterisk.org" |
@@ -33,7 +33,7 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna | |||
33 | dahdi-bri_dchan.patch | 33 | dahdi-bri_dchan.patch |
34 | dahdi-zaphfc.patch | 34 | dahdi-zaphfc.patch |
35 | zaphfc-dahdi-flortz.diff | 35 | zaphfc-dahdi-flortz.diff |
36 | dahdi-zaphfc2.patch | 36 | zaphfc-dahdi-2.4.0.patch |
37 | " | 37 | " |
38 | 38 | ||
39 | prepare() { | 39 | prepare() { |
@@ -73,9 +73,9 @@ dev() { | |||
73 | ln -s /usr/include "$dir"/include | 73 | ln -s /usr/include "$dir"/include |
74 | } | 74 | } |
75 | 75 | ||
76 | md5sums="ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz | 76 | md5sums="0114826395f76713486142b90d772f82 dahdi-linux-2.4.0.tar.gz |
77 | c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch | 77 | c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch |
78 | 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch | 78 | 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch |
79 | a822c092f0548cd13f5e8d8cba053af6 dahdi-zaphfc.patch | 79 | a822c092f0548cd13f5e8d8cba053af6 dahdi-zaphfc.patch |
80 | 291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff | 80 | 291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff |
81 | 854008afc44b7a5c920f4ae4a2860e3b dahdi-zaphfc2.patch" | 81 | 0fdcd8c8c93bc1fe33c0af12b6cc6b05 zaphfc-dahdi-2.4.0.patch" |
diff --git a/main/dahdi-linux-grsec/dahdi-zaphfc2.patch b/main/dahdi-linux-grsec/dahdi-zaphfc2.patch deleted file mode 100644 index 33ebafd990..0000000000 --- a/main/dahdi-linux-grsec/dahdi-zaphfc2.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: dahdi-linux-2.3.0.1/drivers/dahdi/zaphfc.c | ||
2 | =================================================================== | ||
3 | --- dahdi-linux-2.3.0.1.orig/drivers/dahdi/zaphfc.c 2010-08-19 14:50:10.000000000 +0300 | ||
4 | +++ dahdi-linux-2.3.0.1/drivers/dahdi/zaphfc.c 2010-08-19 14:50:44.000000000 +0300 | ||
5 | @@ -676,6 +676,7 @@ | ||
6 | sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1); | ||
7 | } | ||
8 | |||
9 | + zthfc->span.owner = THIS_MODULE; | ||
10 | zthfc->span.spanconfig = zthfc_spanconfig; | ||
11 | zthfc->span.chanconfig = zthfc_chanconfig; | ||
12 | zthfc->span.startup = zthfc_startup; | ||
diff --git a/main/dahdi-linux-grsec/zaphfc-dahdi-2.4.0.patch b/main/dahdi-linux-grsec/zaphfc-dahdi-2.4.0.patch new file mode 100644 index 0000000000..80500a574a --- /dev/null +++ b/main/dahdi-linux-grsec/zaphfc-dahdi-2.4.0.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | Index: dahdi-linux-2.4.0/drivers/dahdi/zaphfc.c | ||
2 | =================================================================== | ||
3 | --- dahdi-linux-2.4.0.orig/drivers/dahdi/zaphfc.c 2010-10-26 14:41:21.000000000 +0300 | ||
4 | +++ dahdi-linux-2.4.0/drivers/dahdi/zaphfc.c 2010-10-26 14:50:14.000000000 +0300 | ||
5 | @@ -617,7 +617,7 @@ | ||
6 | } | ||
7 | |||
8 | static int zthfc_startup(struct dahdi_span *span) { | ||
9 | - struct dahdi_hfc *zthfc = span->pvt; | ||
10 | + struct dahdi_hfc *zthfc = container_of(span, struct dahdi_hfc, span); | ||
11 | struct hfc_card *hfctmp = zthfc->card; | ||
12 | int alreadyrunning; | ||
13 | |||
14 | @@ -663,6 +663,19 @@ | ||
15 | return 0; | ||
16 | } | ||
17 | |||
18 | +static const struct dahdi_span_ops zaphfc_span_ops = { | ||
19 | + .owner = THIS_MODULE, | ||
20 | + .spanconfig = zthfc_spanconfig, | ||
21 | + .chanconfig = zthfc_chanconfig, | ||
22 | + .startup = zthfc_startup, | ||
23 | + .shutdown = zthfc_shutdown, | ||
24 | + .maint = zthfc_maint, | ||
25 | + .rbsbits = zthfc_rbsbits, | ||
26 | + .open = zthfc_open, | ||
27 | + .close = zthfc_close, | ||
28 | + .ioctl = zthfc_ioctl, | ||
29 | +}; | ||
30 | + | ||
31 | static int zthfc_initialize(struct dahdi_hfc *zthfc) { | ||
32 | struct hfc_card *hfctmp = zthfc->card; | ||
33 | int i; | ||
34 | @@ -676,15 +689,7 @@ | ||
35 | sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1); | ||
36 | } | ||
37 | |||
38 | - zthfc->span.spanconfig = zthfc_spanconfig; | ||
39 | - zthfc->span.chanconfig = zthfc_chanconfig; | ||
40 | - zthfc->span.startup = zthfc_startup; | ||
41 | - zthfc->span.shutdown = zthfc_shutdown; | ||
42 | - zthfc->span.maint = zthfc_maint; | ||
43 | - zthfc->span.rbsbits = zthfc_rbsbits; | ||
44 | - zthfc->span.open = zthfc_open; | ||
45 | - zthfc->span.close = zthfc_close; | ||
46 | - zthfc->span.ioctl = zthfc_ioctl; | ||
47 | + zthfc->span.ops = &zaphfc_span_ops; | ||
48 | |||
49 | zthfc->span.channels = 3; | ||
50 | zthfc->span.chans = zthfc->_chans; | ||
51 | @@ -695,7 +700,6 @@ | ||
52 | zthfc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS; // <--- this is really BS | ||
53 | zthfc->span.offset = 0; | ||
54 | init_waitqueue_head(&zthfc->span.maintq); | ||
55 | - zthfc->span.pvt = zthfc; | ||
56 | |||
57 | for (i = 0; i < zthfc->span.channels; i++) { | ||
58 | memset(&(zthfc->chans[i]), 0x0, sizeof(struct dahdi_chan)); | ||