aboutsummaryrefslogtreecommitdiffstats
path: root/main/dahdi-linux-vserver
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-10-22 13:20:41 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-10-22 13:20:41 +0000
commit91f083c0cc2993c261b578eaf17eca561f6ab705 (patch)
tree58f066bb4c90ebb7f87f60a9db7e0b8d63d0c603 /main/dahdi-linux-vserver
parent934550384dbf3e9fe3502bd4dfa4ae06857a4912 (diff)
downloadaports-91f083c0cc2993c261b578eaf17eca561f6ab705.tar.bz2
aports-91f083c0cc2993c261b578eaf17eca561f6ab705.tar.xz
main/dahdi-linux-vserver: update patches and enable
patches are updated from -grsec
Diffstat (limited to 'main/dahdi-linux-vserver')
-rw-r--r--main/dahdi-linux-vserver/APKBUILD6
-rw-r--r--main/dahdi-linux-vserver/dahdi-zaphfc.patch2
-rw-r--r--main/dahdi-linux-vserver/zaphfc-dahdi-flortz.diff2
3 files changed, 5 insertions, 5 deletions
diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD
index acb06c66ad..34885215eb 100644
--- a/main/dahdi-linux-vserver/APKBUILD
+++ b/main/dahdi-linux-vserver/APKBUILD
@@ -20,7 +20,7 @@ _mypkgrel=2
pkgrel=$(( $_kpkgrel + $_mypkgrel ))
pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver"
url="http://www.asterisk.org"
-arch=""
+arch="all"
license="GPL"
depends="dahdi-linux linux-${_flavor}=${_kernelver}"
# we need wget and tar because make install downloads firmware and uses fancy
@@ -80,7 +80,7 @@ md5sums="d7efc5ebc9bf81a5263321e5e9891fc1 dahdi-linux-2.5.0.1.tar.gz
c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch
3bb419ac598534cd4ad5248f23656001 dahdi-bri_dchan.patch
9088ee5cd24f94b7f90c24e5ed6071e0 dahdi-2.5.0-bri-fixes.patch
-a822c092f0548cd13f5e8d8cba053af6 dahdi-zaphfc.patch
-291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff
+c6308ea8aaafba0a9d7f9825d7c9dcf8 dahdi-zaphfc.patch
+035a6d91b2fb56a9b76a60a2e494fe9e zaphfc-dahdi-flortz.diff
0fdcd8c8c93bc1fe33c0af12b6cc6b05 zaphfc-dahdi-2.4.0.patch
fc49cf22258d63487a83560385c3f6fa zaphfc-dahdi-2.5.0.patch"
diff --git a/main/dahdi-linux-vserver/dahdi-zaphfc.patch b/main/dahdi-linux-vserver/dahdi-zaphfc.patch
index b711c07ff9..3e6c7e0a36 100644
--- a/main/dahdi-linux-vserver/dahdi-zaphfc.patch
+++ b/main/dahdi-linux-vserver/dahdi-zaphfc.patch
@@ -77,7 +77,7 @@ Index: dahdi-linux-2.1.0/drivers/dahdi/zaphfc.c
+static int modes = 0; // all TE
+static int debug = 0;
+static struct pci_dev *multi_hfc = NULL;
-+static spinlock_t registerlock = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(registerlock);
+
+void hfc_shutdownCard(struct hfc_card *hfctmp) {
+ unsigned long flags;
diff --git a/main/dahdi-linux-vserver/zaphfc-dahdi-flortz.diff b/main/dahdi-linux-vserver/zaphfc-dahdi-flortz.diff
index 719accdc69..f1ecc093af 100644
--- a/main/dahdi-linux-vserver/zaphfc-dahdi-flortz.diff
+++ b/main/dahdi-linux-vserver/zaphfc-dahdi-flortz.diff
@@ -164,7 +164,7 @@ Index: dahdi-linux-2.1.0.4/drivers/dahdi/zaphfc.c
+static int jitterbuffer = 1;
static int debug = 0;
static struct pci_dev *multi_hfc = NULL;
- static spinlock_t registerlock = SPIN_LOCK_UNLOCKED;
+ static DEFINE_SPINLOCK(registerlock);
-void hfc_shutdownCard(struct hfc_card *hfctmp) {
- unsigned long flags;