diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-19 12:17:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-19 12:25:16 +0000 |
| commit | eafaf07e8659fad3be7d2d274ce56de338d23e9a (patch) | |
| tree | b7a67f27c677b268b7fbe993963364de1bc521d6 | |
| parent | db39e00d746029b5a8b5a683be67074edb735c5e (diff) | |
main/linux-dahdi-linux-{grsec,vserver}: fix warning from zaphfc driver
Patch from tteras.
ref #410
| -rw-r--r-- | main/dahdi-linux-grsec/APKBUILD | 16 | ||||
| -rw-r--r-- | main/dahdi-linux-grsec/dahdi-zaphfc2.patch | 12 | ||||
| -rw-r--r-- | main/dahdi-linux-vserver/APKBUILD | 14 | ||||
| -rw-r--r-- | main/dahdi-linux-vserver/dahdi-zaphfc2.patch | 12 |
4 files changed, 45 insertions, 9 deletions
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 4885faca1a3..cedaec5c4a2 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -17,7 +17,7 @@ pkgname=${_realname}-${_flavor} pkgver=$pkgver # when chaning _dahdiver we *must* bump _mypkgrel _dahdiver=2.3.0.1 -_mypkgrel=3 +_mypkgrel=4 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" url="http://www.asterisk.org" @@ -33,13 +33,18 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna dahdi-bri_dchan.patch dahdi-zaphfc.patch zaphfc-dahdi-flortz.diff + dahdi-zaphfc2.patch " prepare() { cd "$srcdir/$_realname-$_dahdiver" - for i in ../*.patch ../*.diff; do - msg "Applying $i" - patch -p1 < $i || return 1; + for i in $source; do + case $i in + *.patch|*.diff) + msg "Applying $i" + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac done } @@ -72,4 +77,5 @@ md5sums="ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch a822c092f0548cd13f5e8d8cba053af6 dahdi-zaphfc.patch -291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff" +291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff +854008afc44b7a5c920f4ae4a2860e3b dahdi-zaphfc2.patch" diff --git a/main/dahdi-linux-grsec/dahdi-zaphfc2.patch b/main/dahdi-linux-grsec/dahdi-zaphfc2.patch new file mode 100644 index 00000000000..33ebafd990e --- /dev/null +++ b/main/dahdi-linux-grsec/dahdi-zaphfc2.patch @@ -0,0 +1,12 @@ +Index: dahdi-linux-2.3.0.1/drivers/dahdi/zaphfc.c + =================================================================== + --- dahdi-linux-2.3.0.1.orig/drivers/dahdi/zaphfc.c 2010-08-19 14:50:10.000000000 +0300 + +++ dahdi-linux-2.3.0.1/drivers/dahdi/zaphfc.c 2010-08-19 14:50:44.000000000 +0300 + @@ -676,6 +676,7 @@ + sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1); + } + + + zthfc->span.owner = THIS_MODULE; + zthfc->span.spanconfig = zthfc_spanconfig; + zthfc->span.chanconfig = zthfc_chanconfig; + zthfc->span.startup = zthfc_startup; diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD index cfc07ef3141..2fc54cb2020 100644 --- a/main/dahdi-linux-vserver/APKBUILD +++ b/main/dahdi-linux-vserver/APKBUILD @@ -17,7 +17,7 @@ pkgname=${_realname}-${_flavor} pkgver=$pkgver # when bumping _dahdiver we *must* bump _mypkgrel _dahdiver=2.3.0.1 -_mypkgrel=3 +_mypkgrel=4 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" url="http://www.asterisk.org" @@ -32,15 +32,20 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna dahdi-depmod.patch dahdi-bri_dchan.patch dahdi-zaphfc.patch + dahdi-zaphfc2.patch zaphfc-dahdi-flortz.diff dahdi-2.2.0.2-gcc44-hack.patch " prepare() { cd "$srcdir/$_realname-$_dahdiver" - for i in ../*.patch ../*.diff; do - msg "Applying $i" - patch -p1 < $i || return 1; + for i in $source; do + case $i in + *.patch|*.diff) + msg "Applying $i" + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac done } @@ -73,5 +78,6 @@ md5sums="ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch 3be420539f5e2e2b94a1bf3d711ec630 dahdi-zaphfc.patch +854008afc44b7a5c920f4ae4a2860e3b dahdi-zaphfc2.patch 291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff eeb4b2870d23d7c020cd99b5b1a633e9 dahdi-2.2.0.2-gcc44-hack.patch" diff --git a/main/dahdi-linux-vserver/dahdi-zaphfc2.patch b/main/dahdi-linux-vserver/dahdi-zaphfc2.patch new file mode 100644 index 00000000000..33ebafd990e --- /dev/null +++ b/main/dahdi-linux-vserver/dahdi-zaphfc2.patch @@ -0,0 +1,12 @@ +Index: dahdi-linux-2.3.0.1/drivers/dahdi/zaphfc.c + =================================================================== + --- dahdi-linux-2.3.0.1.orig/drivers/dahdi/zaphfc.c 2010-08-19 14:50:10.000000000 +0300 + +++ dahdi-linux-2.3.0.1/drivers/dahdi/zaphfc.c 2010-08-19 14:50:44.000000000 +0300 + @@ -676,6 +676,7 @@ + sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [TE]", hfc_dev_count + 1); + } + + + zthfc->span.owner = THIS_MODULE; + zthfc->span.spanconfig = zthfc_spanconfig; + zthfc->span.chanconfig = zthfc_chanconfig; + zthfc->span.startup = zthfc_startup; |