diff options
author | Andrew Manison <amanison@anselsystems.com> | 2010-06-24 11:01:05 +0000 |
---|---|---|
committer | Andrew Manison <amanison@anselsystems.com> | 2010-06-24 11:01:05 +0000 |
commit | 00630fd78516f529daf3005c7defcd6baf4b95f9 (patch) | |
tree | 5c2e5d37c90464e39140d0869dccd15ee409a185 | |
parent | cd39cdcaac4bb080e939cd79288a3fa626528f7f (diff) | |
parent | f80afdde72c0845edc2ce78b3f415cd692269fda (diff) | |
download | alpine_aports-00630fd78516f529daf3005c7defcd6baf4b95f9.tar.bz2 alpine_aports-00630fd78516f529daf3005c7defcd6baf4b95f9.tar.xz alpine_aports-00630fd78516f529daf3005c7defcd6baf4b95f9.zip |
Merge remote branch 'alpine/master'
85 files changed, 1012 insertions, 1710 deletions
diff --git a/main/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD index ad9ef36e46..daf88d6fe8 100644 --- a/main/amavisd-new/APKBUILD +++ b/main/amavisd-new/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> | 2 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> |
3 | pkgname=amavisd-new | 3 | pkgname=amavisd-new |
4 | pkgver=2.6.4 | 4 | pkgver=2.6.4 |
5 | pkgrel=1 | 5 | pkgrel=2 |
6 | pkgdesc="High-performance interface between mailer (MTA) and content checkers" | 6 | pkgdesc="High-performance interface between mailer (MTA) and content checkers" |
7 | url="http://www.ijs.si/software/amavisd" | 7 | url="http://www.ijs.si/software/amavisd" |
8 | license="GPL-2" | 8 | license="GPL-2" |
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 77b699adfb..a8c5d110a0 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Contributor: Timo Teras <timo.teras@iki.fi> | 1 | # Contributor: Timo Teras <timo.teras@iki.fi> |
2 | # Maintainer: Timo Teras <timo.teras@iki.fi> | 2 | # Maintainer: Timo Teras <timo.teras@iki.fi> |
3 | pkgname=asterisk | 3 | pkgname=asterisk |
4 | pkgver=1.6.2.8 | 4 | pkgver=1.6.2.9 |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="Asterisk: A Module Open Source PBX System" | 6 | pkgdesc="Asterisk: A Module Open Source PBX System" |
7 | url="http://www.asterisk.org/" | 7 | url="http://www.asterisk.org/" |
@@ -9,10 +9,11 @@ license="GPL" | |||
9 | depends= | 9 | depends= |
10 | makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev | 10 | makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev |
11 | postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar | 11 | postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar |
12 | freetds-dev openssl-dev lua-dev alsa-lib-dev spandsp-dev tiff-dev" | 12 | freetds-dev openssl-dev lua-dev alsa-lib-dev spandsp-dev tiff-dev |
13 | libresample sqlite-dev" | ||
13 | install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-install" | 14 | install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-install" |
14 | subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc | 15 | subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc |
15 | $pkgname-tds $pkgname-fax $pkgname-sample-config:sample" | 16 | $pkgname-tds $pkgname-fax $pkgname-sample-config:sample $pkgname-sqlite" |
16 | source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz | 17 | source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz |
17 | 100-uclibc-daemon.patch | 18 | 100-uclibc-daemon.patch |
18 | 101-caps-uclibc.patch | 19 | 101-caps-uclibc.patch |
@@ -48,6 +49,8 @@ build() { | |||
48 | --without-iconv --with-popt --with-z --with-newt \ | 49 | --without-iconv --with-popt --with-z --with-newt \ |
49 | --with-odbc --with-postgres --with-tds \ | 50 | --with-odbc --with-postgres --with-tds \ |
50 | --with-dahdi --with-pri --with-tonezone \ | 51 | --with-dahdi --with-pri --with-tonezone \ |
52 | --with-resample \ | ||
53 | --with-sqlite3 \ | ||
51 | --with-asound \ | 54 | --with-asound \ |
52 | --without-x11 \ | 55 | --without-x11 \ |
53 | --with-spandsp \ | 56 | --with-spandsp \ |
@@ -86,6 +89,12 @@ pgsql() { | |||
86 | _find_and_move '*_pgsql*' | 89 | _find_and_move '*_pgsql*' |
87 | } | 90 | } |
88 | 91 | ||
92 | sqlite() { | ||
93 | depends= | ||
94 | install= | ||
95 | _find_and_move '*_sqlite*' | ||
96 | } | ||
97 | |||
89 | odbc() { | 98 | odbc() { |
90 | depends= | 99 | depends= |
91 | install= | 100 | install= |
@@ -110,7 +119,7 @@ sample() { | |||
110 | make samples DESTDIR="$subpkgdir" | 119 | make samples DESTDIR="$subpkgdir" |
111 | } | 120 | } |
112 | 121 | ||
113 | md5sums="2ee5bbb91771c7c9b131da473971bc2f asterisk-1.6.2.8.tar.gz | 122 | md5sums="1f947d951c419b8039d53a6e6168fd69 asterisk-1.6.2.9.tar.gz |
114 | b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch | 123 | b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch |
115 | 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch | 124 | 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch |
116 | 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch | 125 | 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch |
diff --git a/testing/cairomm/APKBUILD b/main/cairomm/APKBUILD index 9942749e0a..9942749e0a 100644 --- a/testing/cairomm/APKBUILD +++ b/main/cairomm/APKBUILD | |||
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD index 2848bb64d5..b7eb252eb7 100644 --- a/main/ccache/APKBUILD +++ b/main/ccache/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=ccache | 2 | pkgname=ccache |
3 | pkgver=2.4 | 3 | pkgver=3.0 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="ccache is a compiler cache" | 5 | pkgdesc="ccache is a compiler cache" |
6 | url="http://ccache.samba.org/" | 6 | url="http://ccache.samba.org/" |
7 | license="GPL" | 7 | license="GPL" |
@@ -15,6 +15,10 @@ build () | |||
15 | cd "$srcdir"/$pkgname-$pkgver | 15 | cd "$srcdir"/$pkgname-$pkgver |
16 | ./configure --prefix=/usr | 16 | ./configure --prefix=/usr |
17 | make || return 1 | 17 | make || return 1 |
18 | } | ||
19 | |||
20 | package() { | ||
21 | cd "$srcdir"/$pkgname-$pkgver | ||
18 | install -Dm 755 ccache "$pkgdir"/usr/bin/ccache | 22 | install -Dm 755 ccache "$pkgdir"/usr/bin/ccache |
19 | install -Dm 644 ccache.1 "$pkgdir"/usr/share/man/man1/ccache.1 | 23 | install -Dm 644 ccache.1 "$pkgdir"/usr/share/man/man1/ccache.1 |
20 | mkdir -p "$pkgdir"/usr/lib/ccache/bin | 24 | mkdir -p "$pkgdir"/usr/lib/ccache/bin |
@@ -29,4 +33,4 @@ build () | |||
29 | ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/${CHOST}-cpp | 33 | ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/${CHOST}-cpp |
30 | ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/${CHOST}-c++ | 34 | ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/${CHOST}-c++ |
31 | } | 35 | } |
32 | md5sums="73c1ed1e767c1752dd0f548ec1e66ce7 ccache-2.4.tar.gz" | 36 | md5sums="98145b8ad69a96bf1abf9a52d550e507 ccache-3.0.tar.gz" |
diff --git a/testing/collectd/APKBUILD b/main/collectd/APKBUILD index 2905922a6d..617accbd9d 100644 --- a/testing/collectd/APKBUILD +++ b/main/collectd/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: | 2 | # Maintainer: |
3 | pkgname=collectd | 3 | pkgname=collectd |
4 | pkgver=4.9.1 | 4 | pkgver=4.9.1 |
5 | pkgrel=2 | 5 | pkgrel=3 |
6 | pkgdesc="The system statistics collection daemon" | 6 | pkgdesc="The system statistics collection daemon" |
7 | url="http://collectd.org" | 7 | url="http://collectd.org" |
8 | license="GPL" | 8 | license="GPL" |
@@ -14,7 +14,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp $pkgname-curl | |||
14 | $pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql | 14 | $pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql |
15 | $pkgname-mysql $pkgname-network" | 15 | $pkgname-mysql $pkgname-network" |
16 | 16 | ||
17 | source="http://collectd.org/files/collectd-$pkgver.tar.bz2" | 17 | source="http://collectd.org/files/collectd-$pkgver.tar.bz2 |
18 | collectd.initd" | ||
18 | 19 | ||
19 | _builddir="$srcdir"/$pkgname-$pkgver | 20 | _builddir="$srcdir"/$pkgname-$pkgver |
20 | 21 | ||
@@ -33,11 +34,15 @@ prepare() { | |||
33 | build() { | 34 | build() { |
34 | cd "$_builddir" | 35 | cd "$_builddir" |
35 | ./configure --prefix=/usr \ | 36 | ./configure --prefix=/usr \ |
36 | --sysconfdir=/etc \ | 37 | --sysconfdir=/etc/collectd \ |
37 | --mandir=/usr/share/man \ | 38 | --mandir=/usr/share/man \ |
38 | --infodir=/usr/share/info \ | 39 | --infodir=/usr/share/info \ |
40 | --localstate=/var \ | ||
39 | || return 1 | 41 | || return 1 |
40 | make || return 1 | 42 | make || return 1 |
43 | # disable network plugin by default since its in a subpackage | ||
44 | sed -i -e 's/^LoadPlugin network/#LoadPlugin network/' \ | ||
45 | src/collectd.conf | ||
41 | } | 46 | } |
42 | 47 | ||
43 | package() { | 48 | package() { |
@@ -45,9 +50,7 @@ package() { | |||
45 | make DESTDIR="$pkgdir" install | 50 | make DESTDIR="$pkgdir" install |
46 | 51 | ||
47 | find "$pkgdir" -name perllocal.pod -delete | 52 | find "$pkgdir" -name perllocal.pod -delete |
48 | # remove the 2 lines below (and this) if there is no init.d script | 53 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname |
49 | # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | ||
50 | # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | ||
51 | } | 54 | } |
52 | 55 | ||
53 | perl() { | 56 | perl() { |
@@ -76,4 +79,5 @@ postgresql() { _plugin postgresql; } | |||
76 | mysql() { _plugin mysql; } | 79 | mysql() { _plugin mysql; } |
77 | network() { _plugin network; } | 80 | network() { _plugin network; } |
78 | 81 | ||
79 | md5sums="5753496651c8c84afaea1fe290876bfc collectd-4.9.1.tar.bz2" | 82 | md5sums="5753496651c8c84afaea1fe290876bfc collectd-4.9.1.tar.bz2 |
83 | 13a36ae2f92634b5619ab94224e1b77d collectd.initd" | ||
diff --git a/main/collectd/collectd.initd b/main/collectd/collectd.initd new file mode 100644 index 0000000000..de5705a032 --- /dev/null +++ b/main/collectd/collectd.initd | |||
@@ -0,0 +1,20 @@ | |||
1 | #!/sbin/runscript | ||
2 | |||
3 | DAEMON=/usr/sbin/collectd | ||
4 | |||
5 | depend() { | ||
6 | need net | ||
7 | } | ||
8 | |||
9 | start() { | ||
10 | ebegin "Starting collectd" | ||
11 | start-stop-daemon --start --exec $DAEMON -- $collectd_options | ||
12 | eend $? | ||
13 | } | ||
14 | |||
15 | stop () { | ||
16 | ebegin "Stopping collectd" | ||
17 | start-stop-daemon --stop --exec $DAEMON | ||
18 | eend $? | ||
19 | } | ||
20 | |||
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 247826c313..4885faca1a 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD | |||
@@ -15,8 +15,9 @@ _realname=dahdi-linux | |||
15 | 15 | ||
16 | pkgname=${_realname}-${_flavor} | 16 | pkgname=${_realname}-${_flavor} |
17 | pkgver=$pkgver | 17 | pkgver=$pkgver |
18 | _dahdiver=2.2.0.2 | 18 | # when chaning _dahdiver we *must* bump _mypkgrel |
19 | _mypkgrel=2 | 19 | _dahdiver=2.3.0.1 |
20 | _mypkgrel=3 | ||
20 | pkgrel=$(( $_kpkgrel + $_mypkgrel )) | 21 | pkgrel=$(( $_kpkgrel + $_mypkgrel )) |
21 | pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" | 22 | pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" |
22 | url="http://www.asterisk.org" | 23 | url="http://www.asterisk.org" |
@@ -32,9 +33,6 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna | |||
32 | dahdi-bri_dchan.patch | 33 | dahdi-bri_dchan.patch |
33 | dahdi-zaphfc.patch | 34 | dahdi-zaphfc.patch |
34 | zaphfc-dahdi-flortz.diff | 35 | zaphfc-dahdi-flortz.diff |
35 | dahdi-linux-2.2.0-hfc-4s.patch | ||
36 | dahdi-2.6.31.patch | ||
37 | dahdi-2.2.0.2-driver_data-2.6.32.patch | ||
38 | " | 36 | " |
39 | 37 | ||
40 | prepare() { | 38 | prepare() { |
@@ -65,16 +63,13 @@ depends_dev="dahdi-linux-dev" | |||
65 | dev() { | 63 | dev() { |
66 | default_dev | 64 | default_dev |
67 | local dir="$subpkgdir"/usr/src/dahdi-headers-${_abi_release} | 65 | local dir="$subpkgdir"/usr/src/dahdi-headers-${_abi_release} |
68 | install -D "$srcdir"/$_realname-$pkgver/drivers/dahdi/Module.symvers \ | 66 | install -D "$srcdir"/$_realname-$_dahdiver/drivers/dahdi/Module.symvers \ |
69 | "$dir"/drivers/dahdi/Module.symvers | 67 | "$dir"/drivers/dahdi/Module.symvers |
70 | ln -s /usr/include "$dir"/include | 68 | ln -s /usr/include "$dir"/include |
71 | } | 69 | } |
72 | 70 | ||
73 | md5sums="1f932729ad28f2f028afcf2cc5ccf7ba dahdi-linux-2.2.0.2.tar.gz | 71 | md5sums="ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz |
74 | c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch | 72 | c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch |
75 | 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch | 73 | 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch |
76 | a822c092f0548cd13f5e8d8cba053af6 dahdi-zaphfc.patch | 74 | a822c092f0548cd13f5e8d8cba053af6 dahdi-zaphfc.patch |
77 | 291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff | 75 | 291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff" |
78 | 68dfe17a49cca15ae439fd83f4ccfbc5 dahdi-linux-2.2.0-hfc-4s.patch | ||
79 | bd5e7457ee8f37c10ed7ec383995e4fa dahdi-2.6.31.patch | ||
80 | 7f9452ef37385e03e05147081d6951a1 dahdi-2.2.0.2-driver_data-2.6.32.patch" | ||
diff --git a/main/dahdi-linux-grsec/dahdi-2.2.0.2-driver_data-2.6.32.patch b/main/dahdi-linux-grsec/dahdi-2.2.0.2-driver_data-2.6.32.patch deleted file mode 100644 index 3085218c09..0000000000 --- a/main/dahdi-linux-grsec/dahdi-2.2.0.2-driver_data-2.6.32.patch +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | diff -uNr dahdi-linux-2.2.0.2.ORIg/drivers/dahdi/xpp/xbus-sysfs.c dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-sysfs.c | ||
2 | --- dahdi-linux-2.2.0.2.ORIg/drivers/dahdi/xpp/xbus-sysfs.c 2009-10-22 18:04:47.000000000 +0100 | ||
3 | +++ dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-sysfs.c 2009-10-22 18:05:54.000000000 +0100 | ||
4 | @@ -707,7 +707,11 @@ | ||
5 | dev->parent = &xbus->astribank; | ||
6 | dev_set_name(dev, "%02d:%1x:%1x", xbus->num, xpd->addr.unit, | ||
7 | xpd->addr.subunit); | ||
8 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
9 | + dev_set_drvdata(dev, xpd); | ||
10 | +#else | ||
11 | dev->driver_data = xpd; | ||
12 | +#endif | ||
13 | dev->release = xpd_release; | ||
14 | ret = device_register(dev); | ||
15 | if(ret) { | ||
16 | @@ -728,11 +732,21 @@ | ||
17 | BUG_ON(!xbus); | ||
18 | XPD_DBG(DEVICES, xpd, "SYSFS\n"); | ||
19 | dev = &xpd->xpd_dev; | ||
20 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
21 | + if(!dev_get_drvdata(dev)) | ||
22 | + return; | ||
23 | + BUG_ON(dev_get_drvdata(dev) != xpd); | ||
24 | +#else | ||
25 | if(!dev->driver_data) | ||
26 | return; | ||
27 | BUG_ON(dev->driver_data != xpd); | ||
28 | +#endif | ||
29 | device_unregister(dev); | ||
30 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
31 | + dev_set_drvdata(dev, NULL); | ||
32 | +#else | ||
33 | dev->driver_data = NULL; | ||
34 | +#endif | ||
35 | } | ||
36 | |||
37 | /*--------- Sysfs Device handling ----*/ | ||
38 | @@ -746,9 +760,15 @@ | ||
39 | astribank = &xbus->astribank; | ||
40 | BUG_ON(!astribank); | ||
41 | sysfs_remove_link(&astribank->kobj, "transport"); | ||
42 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
43 | + if(!dev_get_drvdata(astribank)) | ||
44 | + return; | ||
45 | + BUG_ON(dev_get_drvdata(astribank) != xbus); | ||
46 | +#else | ||
47 | if(!astribank->driver_data) | ||
48 | return; | ||
49 | BUG_ON(astribank->driver_data != xbus); | ||
50 | +#endif | ||
51 | device_unregister(&xbus->astribank); | ||
52 | } | ||
53 | |||
54 | @@ -764,18 +784,30 @@ | ||
55 | astribank->bus = &toplevel_bus_type; | ||
56 | astribank->parent = xbus->transport.transport_device; | ||
57 | dev_set_name(astribank, "xbus-%02d", xbus->num); | ||
58 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
59 | + dev_set_drvdata(astribank, xbus); | ||
60 | +#else | ||
61 | astribank->driver_data = xbus; | ||
62 | +#endif | ||
63 | astribank->release = astribank_release; | ||
64 | ret = device_register(astribank); | ||
65 | if(ret) { | ||
66 | XBUS_ERR(xbus, "%s: device_register failed: %d\n", __FUNCTION__, ret); | ||
67 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
68 | + dev_set_drvdata(astribank, NULL); | ||
69 | +#else | ||
70 | astribank->driver_data = NULL; | ||
71 | +#endif | ||
72 | goto out; | ||
73 | } | ||
74 | ret = sysfs_create_link(&astribank->kobj, &astribank->parent->kobj, "transport"); | ||
75 | if(ret < 0) { | ||
76 | XBUS_ERR(xbus, "%s: sysfs_create_link failed: %d\n", __FUNCTION__, ret); | ||
77 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
78 | + dev_set_drvdata(astribank, NULL); | ||
79 | +#else | ||
80 | astribank->driver_data = NULL; | ||
81 | +#endif | ||
82 | goto out; | ||
83 | } | ||
84 | out: | ||
diff --git a/main/dahdi-linux-grsec/dahdi-2.6.31.patch b/main/dahdi-linux-grsec/dahdi-2.6.31.patch deleted file mode 100644 index 35fe4383e2..0000000000 --- a/main/dahdi-linux-grsec/dahdi-2.6.31.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | Index: drivers/dahdi/wctc4xxp/base.c | ||
2 | =================================================================== | ||
3 | --- a/drivers/dahdi/wctc4xxp/base.c (revision 6716) | ||
4 | +++ b/drivers/dahdi/wctc4xxp/base.c (revision 6717) | ||
5 | @@ -742,6 +742,17 @@ | ||
6 | return 0; | ||
7 | } | ||
8 | |||
9 | +#ifdef HAVE_NET_DEVICE_OPS | ||
10 | +const struct net_device_ops wctc4xxp_netdev_ops = { | ||
11 | + .ndo_set_multicast_list = &wctc4xxp_net_set_multi, | ||
12 | + .ndo_open = &wctc4xxp_net_up, | ||
13 | + .ndo_stop = &wctc4xxp_net_down, | ||
14 | + .ndo_start_xmit = &wctc4xxp_net_hard_start_xmit, | ||
15 | + .ndo_get_stats = &wctc4xxp_net_get_stats, | ||
16 | + .ndo_do_ioctl = &wctc4xxp_net_ioctl, | ||
17 | +}; | ||
18 | +#endif | ||
19 | + | ||
20 | /** | ||
21 | * wctc4xxp_net_register - Register a new network interface. | ||
22 | * @wc: transcoder card to register the interface for. | ||
23 | @@ -773,14 +784,21 @@ | ||
24 | netdev->priv = wc; | ||
25 | # endif | ||
26 | memcpy(netdev->dev_addr, our_mac, sizeof(our_mac)); | ||
27 | + | ||
28 | +# ifdef HAVE_NET_DEVICE_OPS | ||
29 | + netdev->netdev_ops = &wctc4xxp_netdev_ops; | ||
30 | +# else | ||
31 | netdev->set_multicast_list = &wctc4xxp_net_set_multi; | ||
32 | netdev->open = &wctc4xxp_net_up; | ||
33 | netdev->stop = &wctc4xxp_net_down; | ||
34 | netdev->hard_start_xmit = &wctc4xxp_net_hard_start_xmit; | ||
35 | netdev->get_stats = &wctc4xxp_net_get_stats; | ||
36 | netdev->do_ioctl = &wctc4xxp_net_ioctl; | ||
37 | +# endif | ||
38 | + | ||
39 | netdev->promiscuity = 0; | ||
40 | netdev->flags |= IFF_NOARP; | ||
41 | + | ||
42 | # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) | ||
43 | netdev->poll = &wctc4xxp_poll; | ||
44 | netdev->weight = 64; | ||
diff --git a/main/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch b/main/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch deleted file mode 100644 index 67857e2f7d..0000000000 --- a/main/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch +++ /dev/null | |||
@@ -1,553 +0,0 @@ | |||
1 | --- a/drivers/dahdi/wcb4xxp/base.c 2009-06-24 13:17:03.000000000 +0000 | ||
2 | +++ b/drivers/dahdi/wcb4xxp/base.c 2009-06-24 13:40:15.000000000 +0000 | ||
3 | @@ -75,7 +75,7 @@ | ||
4 | #define DBG_SPANFILTER ((1 << bspan->port) & spanfilter) | ||
5 | |||
6 | static int debug = 0; | ||
7 | -static int spanfilter = 15; | ||
8 | +static int spanfilter = 255; /* Bitmap .. 1, 2, 4, 8, 16, 32, 64, 128 for ports 1-8 */ | ||
9 | #ifdef LOOPBACK_SUPPORTED | ||
10 | static int loopback = 0; | ||
11 | #endif | ||
12 | @@ -114,9 +114,21 @@ | ||
13 | struct devtype { | ||
14 | char *desc; | ||
15 | unsigned int flags; | ||
16 | + int ports; /* Number of ports the card has */ | ||
17 | + int has_ec; /* Does the card have an Echo Canceller */ | ||
18 | + enum cards_ids card_type; /* Card type - Digium B410P, ... */ | ||
19 | }; | ||
20 | |||
21 | -static struct devtype wcb4xxp = { "Wildcard B410P", 0 }; | ||
22 | +static struct devtype wcb4xxp = { "Wildcard B410P", .ports = 4, .has_ec = 1, .card_type = B410P }; | ||
23 | +static struct devtype hfc2s = { "HFC-2S Junghanns.NET duoBRI PCI", .ports = 2, .has_ec = 0, .card_type = DUOBRI }; | ||
24 | +static struct devtype hfc4s = { "HFC-4S Junghanns.NET quadBRI PCI", .ports = 4, .has_ec = 0, .card_type = QUADBRI }; | ||
25 | +static struct devtype hfc8s = { "HFC-4S Junghanns.NET octoBRI PCI", .ports = 8, .has_ec = 0, .card_type = OCTOBRI }; | ||
26 | +static struct devtype hfc2s_OV ={ "OpenVox B200P", .ports = 2, .has_ec = 0, .card_type = B200P_OV }; | ||
27 | +static struct devtype hfc4s_OV ={ "OpenVox B400P", .ports = 4, .has_ec = 0, .card_type = B400P_OV }; | ||
28 | +static struct devtype hfc8s_OV ={ "OpenVox B800P", .ports = 8, .has_ec = 0, .card_type = B800P_OV }; | ||
29 | +static struct devtype hfc2s_BN ={ "BeroNet BN2S0", .ports = 2, .has_ec = 0, .card_type = BN2S0 }; | ||
30 | +static struct devtype hfc4s_BN ={ "BeroNet BN4S0", .ports = 4, .has_ec = 0, .card_type = BN4S0 }; | ||
31 | +static struct devtype hfc8s_BN ={ "BeroNet BN8S0", .ports = 8, .has_ec = 0, .card_type = BN8S0 }; | ||
32 | |||
33 | static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp, | ||
34 | struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec); | ||
35 | @@ -403,7 +415,14 @@ | ||
36 | |||
37 | mb(); | ||
38 | |||
39 | - b4xxp_setreg8(b4, R_GPIO_SEL, 0xf0); /* GPIO0..7 S/T, 8..15 GPIO */ | ||
40 | + if ((b4->card_type == OCTOBRI) || (b4->card_type == B800P_OV) || (b4->card_type == BN8S0)) | ||
41 | + { | ||
42 | + b4xxp_setreg8(b4, R_GPIO_SEL, 0x00); /* GPIO0..15 S/T - HFC-8S uses GPIO8-15 for S/T ports 5-8 */ | ||
43 | + } | ||
44 | + else | ||
45 | + { | ||
46 | + b4xxp_setreg8(b4, R_GPIO_SEL, 0xf0); /* GPIO0..7 S/T, 8..15 GPIO */ | ||
47 | + } | ||
48 | |||
49 | mb(); | ||
50 | |||
51 | @@ -618,13 +637,16 @@ | ||
52 | unsigned char b; | ||
53 | unsigned int i, j, mask; | ||
54 | |||
55 | + if (! b4->has_ec) /* Avoid Echo Cancelling for non hardware echo canceller cards */ | ||
56 | + return; | ||
57 | + | ||
58 | /* Setup GPIO */ | ||
59 | for (i=0; i < NUM_EC; i++) { | ||
60 | b = ec_read(b4, i, 0x1a0); | ||
61 | |||
62 | dev_info(b4->dev, "VPM %d/%d init: chip ver %02x\n", i, NUM_EC - 1, b); | ||
63 | |||
64 | - for (j=0; j < 4; j++) { | ||
65 | + for (j=0; j < b4->numspans; j++) { | ||
66 | ec_write(b4, i, 0x1a8 + j, 0x00); /* GPIO out */ | ||
67 | ec_write(b4, i, 0x1ac + j, 0x00); /* GPIO dir */ | ||
68 | ec_write(b4, i, 0x1b0 + j, 0x00); /* GPIO sel */ | ||
69 | @@ -1008,7 +1030,15 @@ | ||
70 | int fifo, hfc_chan; | ||
71 | unsigned long irq_flags; | ||
72 | |||
73 | - fifo = port + 8; | ||
74 | + if ((b4->card_type == B800P_OV) || (b4->card_type == OCTOBRI) || (b4->card_type == BN8S0)) | ||
75 | + { | ||
76 | + fifo = port + 16; /* In HFC-8S cards we can't use ports 8-11 for dchan FIFOs */ | ||
77 | + } | ||
78 | + else | ||
79 | + { | ||
80 | + fifo = port + 8; | ||
81 | + } | ||
82 | + | ||
83 | hfc_chan = (port * 4) + 2; | ||
84 | |||
85 | /* record the host's FIFO # in the span fifo array */ | ||
86 | @@ -1210,7 +1240,7 @@ | ||
87 | int i, j; | ||
88 | struct b4xxp_span *s; | ||
89 | |||
90 | - for (i=0; i < 4; i++) { | ||
91 | + for (i=0; i < b4->numspans; i++) { | ||
92 | s = &b4->spans[i]; | ||
93 | |||
94 | for (j=HFC_T1; j <= HFC_T3; j++) { | ||
95 | @@ -1413,12 +1443,21 @@ | ||
96 | |||
97 | gpio = b4xxp_getreg8(b4, R_GPI_IN3); | ||
98 | |||
99 | - for (i=0; i < 4; i++) { | ||
100 | + for (i=0; i < b4->numspans; i++) { | ||
101 | s = &b4->spans[i]; | ||
102 | s->parent = b4; | ||
103 | s->port = i; | ||
104 | |||
105 | - nt = ((gpio & (1 << (i + 4))) == 0); /* GPIO=0 = NT mode */ | ||
106 | + /* The way the Digium B410P card reads the NT/TE mode | ||
107 | + * jumper is the oposite of how other HFC-4S cards do: | ||
108 | + * - In B410P: GPIO=0: NT | ||
109 | + * - In Junghanns: GPIO=0: TE | ||
110 | + */ | ||
111 | + if (b4->card_type == B410P) | ||
112 | + nt = ((gpio & (1 << (i + 4))) == 0); | ||
113 | + else | ||
114 | + nt = ((gpio & (1 << (i + 4))) != 0); | ||
115 | + | ||
116 | s->te_mode = !nt; | ||
117 | |||
118 | dev_info(b4->dev, "Port %d: %s mode\n", i + 1, (nt ? "NT" : "TE")); | ||
119 | @@ -1774,9 +1813,15 @@ | ||
120 | |||
121 | /* | ||
122 | * set up the clock controller | ||
123 | - * we have a 24.576MHz crystal, so the PCM clock is 2x the incoming clock. | ||
124 | + * B410P has a 24.576MHz crystal, so the PCM clock is 2x the incoming clock. | ||
125 | + * Other cards have a 49.152Mhz crystal, so the PCM clock equals incoming clock. | ||
126 | */ | ||
127 | - b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x02); | ||
128 | + | ||
129 | + if (b4->card_type == B410P) | ||
130 | + b4xxp_setreg8(b4, R_BRG_PCM_CFG,0x02); | ||
131 | + else | ||
132 | + b4xxp_setreg8(b4, R_BRG_PCM_CFG, V_PCM_CLK); | ||
133 | + | ||
134 | flush_pci(); | ||
135 | |||
136 | udelay(100); /* wait a bit for clock to settle */ | ||
137 | @@ -1807,7 +1852,7 @@ | ||
138 | |||
139 | /* | ||
140 | * set up the flow controller. | ||
141 | - * B channel map: | ||
142 | + * B channel map: (4 ports cards with Hardware Echo Cancel present & active) | ||
143 | * FIFO 0 connects Port 1 B0 using HFC channel 16 and PCM timeslots 0/1. | ||
144 | * FIFO 1 connects Port 1 B1 using HFC channel 17 and PCM timeslots 4/5. | ||
145 | * FIFO 2 connects Port 2 B0 using HFC channel 20 and PCM timeslots 8/9. | ||
146 | @@ -1822,14 +1867,35 @@ | ||
147 | * | ||
148 | * D channels are handled by FIFOs 8-11. | ||
149 | * FIFO 8 connects Port 1 D using HFC channel 3 | ||
150 | - * FIFO 9 connects Port 1 D using HFC channel 7 | ||
151 | - * FIFO 10 connects Port 1 D using HFC channel 11 | ||
152 | - * FIFO 11 connects Port 1 D using HFC channel 15 | ||
153 | + * FIFO 9 connects Port 2 D using HFC channel 7 | ||
154 | + * FIFO 10 connects Port 3 D using HFC channel 11 | ||
155 | + * FIFO 11 connects Port 4 D using HFC channel 15 | ||
156 | + * | ||
157 | + * D channel FIFOs are operated in HDLC mode and interrupt on end of frame. | ||
158 | + * | ||
159 | + * B channel map: (8 ports cards without Hardware Echo Cancel) | ||
160 | + * FIFO 0 connects Port 1 B0 using HFC channel 0 | ||
161 | + * FIFO 1 connects Port 1 B1 using HFC channel 1 | ||
162 | + * FIFO 2 connects Port 2 B0 using HFC channel 4 | ||
163 | + * FIFO 3 connects Port 2 B1 using HFC channel 5 | ||
164 | + * ......................... | ||
165 | + * FIFO 14 connects Port 8 B0 using HFC channel 28 | ||
166 | + * FIFO 15 connects Port 8 B1 using HFC channel 29 | ||
167 | + * | ||
168 | + * All B channel FIFOs have their HDLC controller in transparent mode, | ||
169 | + * and only the FIFO for B0 on each port has its interrupt operational. | ||
170 | * | ||
171 | + * D channels are handled by FIFOs 16-23. | ||
172 | + * FIFO 16 connects Port 1 D using HFC channel 3 | ||
173 | + * FIFO 17 connects Port 2 D using HFC channel 7 | ||
174 | + * FIFO 18 connects Port 3 D using HFC channel 11 | ||
175 | + * FIFO 19 connects Port 4 D using HFC channel 15 | ||
176 | + * ................ | ||
177 | + * FIFO 23 connects Port 8 D using HFC channel 31 | ||
178 | * D channel FIFOs are operated in HDLC mode and interrupt on end of frame. | ||
179 | */ | ||
180 | for (span=0; span < b4->numspans; span++) { | ||
181 | - if (vpmsupport) { | ||
182 | + if ((vpmsupport) && (b4->has_ec)) { | ||
183 | hfc_assign_bchan_fifo_ec(b4, span, 0); | ||
184 | hfc_assign_bchan_fifo_ec(b4, span, 1); | ||
185 | } else { | ||
186 | @@ -1854,6 +1920,145 @@ | ||
187 | ec_write(b4, 0, 0x1a8 + 3, val); | ||
188 | } | ||
189 | |||
190 | +static void b4xxp_update_leds_hfc_8s(struct b4xxp *b4) | ||
191 | +{ | ||
192 | + unsigned long lled; | ||
193 | + unsigned long leddw; | ||
194 | + int i,j; | ||
195 | + struct b4xxp_span *bspan; | ||
196 | + lled = 0; | ||
197 | + j=8; | ||
198 | + | ||
199 | + b4->blinktimer++; | ||
200 | + for (i=0; i < 8; i++) { | ||
201 | + bspan = &b4->spans[i]; | ||
202 | + j = j -1 ; /* Leds are in reverse order - Led 7 => Port 0 */ | ||
203 | + if (bspan->span.flags & DAHDI_FLAG_RUNNING) { | ||
204 | + if (bspan->span.alarms) { | ||
205 | + lled |= 1 << j; /* Led OFF in alarm state */ | ||
206 | + } else if (bspan->span.mainttimer || bspan->span.maintstat) { | ||
207 | + if (b4->blinktimer >= 0x7f) /* Led Blinking in maint state */ | ||
208 | + { | ||
209 | + lled |= 1 << j; | ||
210 | + } | ||
211 | + else | ||
212 | + { | ||
213 | + lled |= 0 << j; | ||
214 | + } | ||
215 | + } else { | ||
216 | + | ||
217 | + lled |= 0 << j; /* Led ON - No alarms */ | ||
218 | + } | ||
219 | + } | ||
220 | + else | ||
221 | + lled |= 1 << j; /* Led OFF - Not running */ | ||
222 | + } | ||
223 | + /* Write Leds...*/ | ||
224 | + leddw = lled << 24 | lled << 16 | lled << 8 | lled; | ||
225 | + b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x21); | ||
226 | + iowrite16(0x4000, b4->ioaddr + 4); | ||
227 | + iowrite32(leddw, b4->ioaddr); | ||
228 | + b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x20); | ||
229 | + | ||
230 | + if (b4->blinktimer == 0xff) { | ||
231 | + b4->blinktimer = -1; | ||
232 | + } | ||
233 | +} | ||
234 | + | ||
235 | +static void b4xxp_update_leds_hfc(struct b4xxp *b4) | ||
236 | +{ | ||
237 | + int i, leds; | ||
238 | + int led[4]; | ||
239 | + struct b4xxp_span *bspan; | ||
240 | + | ||
241 | + b4->blinktimer++; | ||
242 | + for (i=0; i < b4->numspans; i++) { | ||
243 | + bspan = &b4->spans[i]; | ||
244 | + | ||
245 | + if (bspan->span.flags & DAHDI_FLAG_RUNNING) { | ||
246 | + if (bspan->span.alarms) { | ||
247 | + if (b4->blinktimer >= 0x7f) /* Red blinking -> Alarm */ | ||
248 | + { | ||
249 | + led[i] = 2; | ||
250 | + } | ||
251 | + else | ||
252 | + { | ||
253 | + led[i] = 0; | ||
254 | + } | ||
255 | + } else if (bspan->span.mainttimer || bspan->span.maintstat) { | ||
256 | + if (b4->blinktimer >= 0x7f) /* Green blinking -> Maint status */ | ||
257 | + { | ||
258 | + led[i] = 1; | ||
259 | + } | ||
260 | + else | ||
261 | + { | ||
262 | + led[i] = 0; | ||
263 | + } | ||
264 | + } else { | ||
265 | + /* No Alarm - Green */ | ||
266 | + led[i] = 1; | ||
267 | + } | ||
268 | + } | ||
269 | + else | ||
270 | + led[i] = 0; /* OFF - Not running */ | ||
271 | + } | ||
272 | + | ||
273 | + /* Each card manage leds in a different way. So one section per card type */ | ||
274 | + | ||
275 | + if (b4->card_type == B400P_OV) { | ||
276 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
277 | + ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | | ||
278 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | | ||
279 | + ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* Tested OK */ | ||
280 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
281 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); | ||
282 | + } | ||
283 | + | ||
284 | + else if (b4->card_type == QUADBRI) { | ||
285 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
286 | + ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | | ||
287 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | | ||
288 | + ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* UNTESTED */ | ||
289 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
290 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); | ||
291 | + } | ||
292 | + | ||
293 | + else if (b4->card_type == BN4S0) { | ||
294 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
295 | + ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | | ||
296 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | | ||
297 | + ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* UNTESTED */ | ||
298 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
299 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); | ||
300 | + } | ||
301 | + | ||
302 | + else if (b4->card_type == B200P_OV) { | ||
303 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
304 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5); | ||
305 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
306 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* Tested OK */ | ||
307 | + } | ||
308 | + | ||
309 | + else if (b4->card_type == DUOBRI) { | ||
310 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
311 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5); | ||
312 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
313 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* UNTESTED */ | ||
314 | + } | ||
315 | + | ||
316 | + else if (b4->card_type == BN2S0) { | ||
317 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
318 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5); | ||
319 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
320 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* UNTESTED */ | ||
321 | + } | ||
322 | + | ||
323 | + if (b4->blinktimer == 0xff) { | ||
324 | + b4->blinktimer = -1; | ||
325 | + } | ||
326 | + | ||
327 | +} | ||
328 | + | ||
329 | static void b4xxp_set_span_led(struct b4xxp *b4, int span, unsigned char val) | ||
330 | { | ||
331 | int shift, spanmask; | ||
332 | @@ -1871,6 +2076,18 @@ | ||
333 | int i; | ||
334 | struct b4xxp_span *bspan; | ||
335 | |||
336 | + if (b4->numspans == 8) { | ||
337 | + /* Use the alternative function for non-Digium HFC-8S cards */ | ||
338 | + b4xxp_update_leds_hfc_8s(b4); | ||
339 | + return; | ||
340 | + } | ||
341 | + | ||
342 | + if (b4->card_type != B410P) { | ||
343 | + /* Use the alternative function for non-Digium HFC-4S cards */ | ||
344 | + b4xxp_update_leds_hfc(b4); | ||
345 | + return; | ||
346 | + } | ||
347 | + | ||
348 | b4->blinktimer++; | ||
349 | for (i=0; i < b4->numspans; i++) { | ||
350 | bspan = &b4->spans[i]; | ||
351 | @@ -2174,7 +2391,7 @@ | ||
352 | bspan->span.close = b4xxp_close; | ||
353 | bspan->span.ioctl = b4xxp_ioctl; | ||
354 | bspan->span.hdlc_hard_xmit = b4xxp_hdlc_hard_xmit; | ||
355 | - if (vpmsupport) | ||
356 | + if (vpmsupport && b4->has_ec) | ||
357 | bspan->span.echocan_create = echocan_create; | ||
358 | |||
359 | /* HDLC stuff */ | ||
360 | @@ -2281,13 +2498,24 @@ | ||
361 | static void b4xxp_bottom_half(unsigned long data) | ||
362 | { | ||
363 | struct b4xxp *b4 = (struct b4xxp *)data; | ||
364 | - int i, j, k, gotrxfifo, fifo; | ||
365 | + int i, j, k, gotrxfifo, fifo, fifo_low, fifo_high; | ||
366 | unsigned char b, b2; | ||
367 | |||
368 | if (b4->shutdown) | ||
369 | return; | ||
370 | |||
371 | gotrxfifo = 0; | ||
372 | + if ( b4->numspans == 8 ) /* HFC-4S d-chan fifos 8-11 *** HFC-8S d-chan fifos 16-23 */ | ||
373 | + { | ||
374 | + fifo_low = 16; | ||
375 | + fifo_high = 23; | ||
376 | + } | ||
377 | + else | ||
378 | + { | ||
379 | + fifo_low = 8; | ||
380 | + fifo_high = 11; | ||
381 | + } | ||
382 | + | ||
383 | |||
384 | for (i=0; i < 8; i++) { | ||
385 | b = b2 = b4->fifo_irqstatus[i]; | ||
386 | @@ -2296,7 +2524,7 @@ | ||
387 | fifo = i*4 + j; | ||
388 | |||
389 | if (b & V_IRQ_FIFOx_TX) { | ||
390 | - if (fifo >=8 && fifo <= 11) { /* d-chan fifo */ | ||
391 | + if (fifo >= fifo_low && fifo <= fifo_high) { /* d-chan fifos */ | ||
392 | /* | ||
393 | * WOW I don't like this. | ||
394 | * It's bad enough that I have to send a fake frame to get an HDLC TX FIFO interrupt, | ||
395 | @@ -2305,7 +2533,7 @@ | ||
396 | * Yuck. It works well, but yuck. | ||
397 | */ | ||
398 | do { | ||
399 | - k = hdlc_tx_frame(&b4->spans[fifo - 8]); | ||
400 | + k = hdlc_tx_frame(&b4->spans[fifo - fifo_low]); | ||
401 | } while (k); | ||
402 | } else { | ||
403 | if (printk_ratelimit()) | ||
404 | @@ -2314,7 +2542,7 @@ | ||
405 | } | ||
406 | |||
407 | if (b & V_IRQ_FIFOx_RX) { | ||
408 | - if (fifo >=8 && fifo <= 11) { | ||
409 | + if (fifo >= fifo_low && fifo <= fifo_high) { /* dchan fifos */ | ||
410 | /* | ||
411 | * I have to loop here until hdlc_rx_frame says there are no more frames waiting. | ||
412 | * for whatever reason, the HFC will not generate another interrupt if there are | ||
413 | @@ -2322,7 +2550,7 @@ | ||
414 | * i.e. I get an int when F1 changes, not when F1 != F2. | ||
415 | */ | ||
416 | do { | ||
417 | - k = hdlc_rx_frame(&b4->spans[fifo - 8]); | ||
418 | + k = hdlc_rx_frame(&b4->spans[fifo - fifo_low]); | ||
419 | } while (k); | ||
420 | } else { | ||
421 | if (printk_ratelimit()) | ||
422 | @@ -2404,8 +2632,8 @@ | ||
423 | sprintf(sBuf, "Card %d, PCI identifier %s, IRQ %d\n", b4->cardno + 1, b4->dev->bus_id, b4->irq); | ||
424 | |||
425 | strcat(sBuf,"Tx:\n"); | ||
426 | - for (j=0; j<8; j++) { | ||
427 | - for (i=0; i<12; i++) { | ||
428 | + for (j=0; j<(b4->numspans * 2) ; j++) { /* B Channels */ | ||
429 | + for (i=0; i<(b4->numspans * 3) ; i++) { /* All Channels */ | ||
430 | chan = b4->spans[i/3].chans[i%3]; | ||
431 | sprintf(str, "%02x ", chan->writechunk[j]); | ||
432 | strcat(sBuf, str); | ||
433 | @@ -2415,8 +2643,8 @@ | ||
434 | } | ||
435 | |||
436 | strcat(sBuf, "\nRx:\n"); | ||
437 | - for (j=0; j < 8; j++) { | ||
438 | - for (i=0; i < 12; i++) { | ||
439 | + for (j=0; j < (b4->numspans * 2); j++) { /* B Channels */ | ||
440 | + for (i=0; i < (b4->numspans * 3); i++) { /* All Channels */ | ||
441 | chan = b4->spans[i / 3].chans[i % 3]; | ||
442 | sprintf(str, "%02x%c", chan->readchunk[j], (i == 11) ? '\n' : ' '); | ||
443 | strcat(sBuf, str); | ||
444 | @@ -2424,7 +2652,7 @@ | ||
445 | } | ||
446 | |||
447 | strcat(sBuf, "\nPort states:\n"); | ||
448 | - for (i=0; i < 4; i++) { | ||
449 | + for (i=0; i < b4->numspans; i++) { | ||
450 | int state; | ||
451 | char *x; | ||
452 | struct b4xxp_span *s = &b4->spans[i]; | ||
453 | @@ -2519,7 +2747,8 @@ | ||
454 | /* card found, enabled and main struct allocated. Fill it out. */ | ||
455 | b4->magic = WCB4XXP_MAGIC; | ||
456 | b4->variety = dt->desc; | ||
457 | - | ||
458 | + b4->has_ec = dt->has_ec; | ||
459 | + b4->card_type = dt->card_type; | ||
460 | b4->pdev = pdev; | ||
461 | b4->dev = &pdev->dev; | ||
462 | pci_set_drvdata(pdev, b4); | ||
463 | @@ -2533,7 +2762,7 @@ | ||
464 | spin_lock_init(&b4->fifolock); | ||
465 | |||
466 | x = b4xxp_getreg8(b4, R_CHIP_ID); | ||
467 | - if (x != 0xc0) { /* wrong chip? */ | ||
468 | + if ((x != 0xc0) && ( x != 0x80)) { /* wrong chip? */ | ||
469 | dev_err(&pdev->dev, "Unknown/unsupported controller detected (R_CHIP_ID = 0x%02x)\n", x); | ||
470 | goto err_out_free_mem; | ||
471 | } | ||
472 | @@ -2548,7 +2777,7 @@ | ||
473 | */ | ||
474 | |||
475 | /* TODO: determine whether this is a 2, 4 or 8 port card */ | ||
476 | - b4->numspans = 4; | ||
477 | + b4->numspans = dt->ports; | ||
478 | b4->syncspan = -1; /* sync span is unknown */ | ||
479 | if (b4->numspans > MAX_SPANS_PER_CARD) { | ||
480 | dev_err(b4->dev, "Driver does not know how to handle a %d span card!\n", b4->numspans); | ||
481 | @@ -2696,7 +2925,17 @@ | ||
482 | static struct pci_device_id b4xx_ids[] __devinitdata = | ||
483 | { | ||
484 | { 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp }, | ||
485 | - { 0, } | ||
486 | + { 0x1397, 0x16b8, 0x1397, 0xe552, 0, 0, (unsigned long)&hfc8s }, | ||
487 | + { 0x1397, 0x08b4, 0x1397, 0xb520, 0, 0, (unsigned long)&hfc4s }, | ||
488 | + { 0x1397, 0x08b4, 0x1397, 0xb556, 0, 0, (unsigned long)&hfc2s }, | ||
489 | + { 0x1397, 0x08b4, 0x1397, 0xe884, 0, 0, (unsigned long)&hfc2s_OV }, | ||
490 | + { 0x1397, 0x08b4, 0x1397, 0xe888, 0, 0, (unsigned long)&hfc4s_OV }, | ||
491 | + { 0x1397, 0x16b8, 0x1397, 0xe998, 0, 0, (unsigned long)&hfc8s_OV }, | ||
492 | + { 0x1397, 0x08b4, 0x1397, 0xb566, 0, 0, (unsigned long)&hfc2s_BN }, | ||
493 | + { 0x1397, 0x08b4, 0x1397, 0xb560, 0, 0, (unsigned long)&hfc4s_BN }, | ||
494 | + { 0x1397, 0x16b8, 0x1397, 0xb562, 0, 0, (unsigned long)&hfc8s_BN }, | ||
495 | + {0, } | ||
496 | + | ||
497 | }; | ||
498 | |||
499 | static struct pci_driver b4xx_driver = { | ||
500 | @@ -2756,7 +2995,7 @@ | ||
501 | MODULE_PARM_DESC(timer_3_ms, "TE: msec to wait for link activation, NT: unused."); | ||
502 | |||
503 | MODULE_AUTHOR("Digium Incorporated <support@digium.com>"); | ||
504 | -MODULE_DESCRIPTION("B410P quad-port BRI module driver."); | ||
505 | +MODULE_DESCRIPTION("B410P & Similars multi-port BRI module driver."); | ||
506 | MODULE_LICENSE("GPL"); | ||
507 | |||
508 | MODULE_DEVICE_TABLE(pci, b4xx_ids); | ||
509 | --- a/drivers/dahdi/wcb4xxp/wcb4xxp.h 2009-06-24 13:17:03.000000000 +0000 | ||
510 | +++ b/drivers/dahdi/wcb4xxp/wcb4xxp.h 2009-06-24 13:18:07.000000000 +0000 | ||
511 | @@ -378,7 +378,7 @@ | ||
512 | #define HFC_T3 2 | ||
513 | |||
514 | #define WCB4XXP_MAGIC 0xb410c0de | ||
515 | -#define MAX_SPANS_PER_CARD 4 | ||
516 | +#define MAX_SPANS_PER_CARD 8 | ||
517 | |||
518 | #define WCB4XXP_CHANNELS_PER_SPAN 3 /* 2 B-channels and 1 D-Channel for each BRI span */ | ||
519 | #define WCB4XXP_HDLC_BUF_LEN 32 /* arbitrary, just the max # of byts we will send to DAHDI per call */ | ||
520 | @@ -415,6 +415,19 @@ | ||
521 | struct dahdi_chan _chans[WCB4XXP_CHANNELS_PER_SPAN]; /* Backing memory */ | ||
522 | }; | ||
523 | |||
524 | +enum cards_ids { /* Cards ==> Brand & Model */ | ||
525 | + B410P = 0, /* Digium B410P */ | ||
526 | + B200P_OV, /* OpenVox B200P */ | ||
527 | + B400P_OV, /* OpenVox B400P */ | ||
528 | + B800P_OV, /* OpenVox B800P */ | ||
529 | + DUOBRI, /* HFC-2S Junghanns.NET duoBRI PCI */ | ||
530 | + QUADBRI, /* HFC-4S Junghanns.NET quadBRI PCI */ | ||
531 | + OCTOBRI, /* HFC-8S Junghanns.NET octoBRI PCI */ | ||
532 | + BN2S0, /* BeroNet BN2S0 */ | ||
533 | + BN4S0, /* Beronet BN4S0 */ | ||
534 | + BN8S0 /* BeroNet BN8S0 */ | ||
535 | + }; | ||
536 | + | ||
537 | /* This structure exists one per card */ | ||
538 | struct b4xxp { | ||
539 | unsigned magic; /* magic value to make sure we're looking at our struct */ | ||
540 | @@ -449,10 +462,12 @@ | ||
541 | int globalconfig; /* Whether global setup has been done */ | ||
542 | int syncspan; /* span that HFC uses for sync on this card */ | ||
543 | int running; /* interrupts are enabled */ | ||
544 | - | ||
545 | + | ||
546 | struct b4xxp_span spans[MAX_SPANS_PER_CARD]; /* Individual spans */ | ||
547 | int order; /* Order */ | ||
548 | int flags; /* Device flags */ | ||
549 | + int has_ec; /* Has ECHO Cancel */ | ||
550 | + enum cards_ids card_type; /* Card Identifier (using ids_cards enum)*/ | ||
551 | int master; /* Are we master */ | ||
552 | int ledreg; /* copy of the LED Register */ | ||
553 | unsigned int gpio; | ||
diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD index 41cd096582..cfc07ef314 100644 --- a/main/dahdi-linux-vserver/APKBUILD +++ b/main/dahdi-linux-vserver/APKBUILD | |||
@@ -15,8 +15,9 @@ _realname=dahdi-linux | |||
15 | 15 | ||
16 | pkgname=${_realname}-${_flavor} | 16 | pkgname=${_realname}-${_flavor} |
17 | pkgver=$pkgver | 17 | pkgver=$pkgver |
18 | _dahdiver=2.2.0.2 | 18 | # when bumping _dahdiver we *must* bump _mypkgrel |
19 | _mypkgrel=2 | 19 | _dahdiver=2.3.0.1 |
20 | _mypkgrel=3 | ||
20 | pkgrel=$(( $_kpkgrel + $_mypkgrel )) | 21 | pkgrel=$(( $_kpkgrel + $_mypkgrel )) |
21 | pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" | 22 | pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" |
22 | url="http://www.asterisk.org" | 23 | url="http://www.asterisk.org" |
@@ -32,10 +33,6 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna | |||
32 | dahdi-bri_dchan.patch | 33 | dahdi-bri_dchan.patch |
33 | dahdi-zaphfc.patch | 34 | dahdi-zaphfc.patch |
34 | zaphfc-dahdi-flortz.diff | 35 | zaphfc-dahdi-flortz.diff |
35 | dahdi-linux-2.2.0-hfc-4s.patch | ||
36 | dahdi-2.6.31.patch | ||
37 | dahdi-2.2.0.2-driver_data-2.6.32.patch | ||
38 | dahdi-2.2.0.2-includes.patch | ||
39 | dahdi-2.2.0.2-gcc44-hack.patch | 36 | dahdi-2.2.0.2-gcc44-hack.patch |
40 | " | 37 | " |
41 | 38 | ||
@@ -67,18 +64,14 @@ depends_dev="dahdi-linux-dev" | |||
67 | dev() { | 64 | dev() { |
68 | default_dev | 65 | default_dev |
69 | local dir="$subpkgdir"/usr/src/dahdi-headers-${_abi_release} | 66 | local dir="$subpkgdir"/usr/src/dahdi-headers-${_abi_release} |
70 | install -D "$srcdir"/$_realname-$pkgver/drivers/dahdi/Module.symvers \ | 67 | install -D "$srcdir"/$_realname-$_dahdiver/drivers/dahdi/Module.symvers \ |
71 | "$dir"/drivers/dahdi/Module.symvers | 68 | "$dir"/drivers/dahdi/Module.symvers |
72 | ln -s /usr/include "$dir"/include | 69 | ln -s /usr/include "$dir"/include |
73 | } | 70 | } |
74 | 71 | ||
75 | md5sums="1f932729ad28f2f028afcf2cc5ccf7ba dahdi-linux-2.2.0.2.tar.gz | 72 | md5sums="ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz |
76 | c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch | 73 | c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch |
77 | 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch | 74 | 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch |
78 | 3be420539f5e2e2b94a1bf3d711ec630 dahdi-zaphfc.patch | 75 | 3be420539f5e2e2b94a1bf3d711ec630 dahdi-zaphfc.patch |
79 | 291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff | 76 | 291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff |
80 | 68dfe17a49cca15ae439fd83f4ccfbc5 dahdi-linux-2.2.0-hfc-4s.patch | ||
81 | bd5e7457ee8f37c10ed7ec383995e4fa dahdi-2.6.31.patch | ||
82 | 7f9452ef37385e03e05147081d6951a1 dahdi-2.2.0.2-driver_data-2.6.32.patch | ||
83 | 6c208d6346a3668cea900baa45298f6a dahdi-2.2.0.2-includes.patch | ||
84 | eeb4b2870d23d7c020cd99b5b1a633e9 dahdi-2.2.0.2-gcc44-hack.patch" | 77 | eeb4b2870d23d7c020cd99b5b1a633e9 dahdi-2.2.0.2-gcc44-hack.patch" |
diff --git a/main/dahdi-linux-vserver/dahdi-2.2.0.2-driver_data-2.6.32.patch b/main/dahdi-linux-vserver/dahdi-2.2.0.2-driver_data-2.6.32.patch deleted file mode 100644 index 3085218c09..0000000000 --- a/main/dahdi-linux-vserver/dahdi-2.2.0.2-driver_data-2.6.32.patch +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | diff -uNr dahdi-linux-2.2.0.2.ORIg/drivers/dahdi/xpp/xbus-sysfs.c dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-sysfs.c | ||
2 | --- dahdi-linux-2.2.0.2.ORIg/drivers/dahdi/xpp/xbus-sysfs.c 2009-10-22 18:04:47.000000000 +0100 | ||
3 | +++ dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-sysfs.c 2009-10-22 18:05:54.000000000 +0100 | ||
4 | @@ -707,7 +707,11 @@ | ||
5 | dev->parent = &xbus->astribank; | ||
6 | dev_set_name(dev, "%02d:%1x:%1x", xbus->num, xpd->addr.unit, | ||
7 | xpd->addr.subunit); | ||
8 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
9 | + dev_set_drvdata(dev, xpd); | ||
10 | +#else | ||
11 | dev->driver_data = xpd; | ||
12 | +#endif | ||
13 | dev->release = xpd_release; | ||
14 | ret = device_register(dev); | ||
15 | if(ret) { | ||
16 | @@ -728,11 +732,21 @@ | ||
17 | BUG_ON(!xbus); | ||
18 | XPD_DBG(DEVICES, xpd, "SYSFS\n"); | ||
19 | dev = &xpd->xpd_dev; | ||
20 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
21 | + if(!dev_get_drvdata(dev)) | ||
22 | + return; | ||
23 | + BUG_ON(dev_get_drvdata(dev) != xpd); | ||
24 | +#else | ||
25 | if(!dev->driver_data) | ||
26 | return; | ||
27 | BUG_ON(dev->driver_data != xpd); | ||
28 | +#endif | ||
29 | device_unregister(dev); | ||
30 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
31 | + dev_set_drvdata(dev, NULL); | ||
32 | +#else | ||
33 | dev->driver_data = NULL; | ||
34 | +#endif | ||
35 | } | ||
36 | |||
37 | /*--------- Sysfs Device handling ----*/ | ||
38 | @@ -746,9 +760,15 @@ | ||
39 | astribank = &xbus->astribank; | ||
40 | BUG_ON(!astribank); | ||
41 | sysfs_remove_link(&astribank->kobj, "transport"); | ||
42 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
43 | + if(!dev_get_drvdata(astribank)) | ||
44 | + return; | ||
45 | + BUG_ON(dev_get_drvdata(astribank) != xbus); | ||
46 | +#else | ||
47 | if(!astribank->driver_data) | ||
48 | return; | ||
49 | BUG_ON(astribank->driver_data != xbus); | ||
50 | +#endif | ||
51 | device_unregister(&xbus->astribank); | ||
52 | } | ||
53 | |||
54 | @@ -764,18 +784,30 @@ | ||
55 | astribank->bus = &toplevel_bus_type; | ||
56 | astribank->parent = xbus->transport.transport_device; | ||
57 | dev_set_name(astribank, "xbus-%02d", xbus->num); | ||
58 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
59 | + dev_set_drvdata(astribank, xbus); | ||
60 | +#else | ||
61 | astribank->driver_data = xbus; | ||
62 | +#endif | ||
63 | astribank->release = astribank_release; | ||
64 | ret = device_register(astribank); | ||
65 | if(ret) { | ||
66 | XBUS_ERR(xbus, "%s: device_register failed: %d\n", __FUNCTION__, ret); | ||
67 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
68 | + dev_set_drvdata(astribank, NULL); | ||
69 | +#else | ||
70 | astribank->driver_data = NULL; | ||
71 | +#endif | ||
72 | goto out; | ||
73 | } | ||
74 | ret = sysfs_create_link(&astribank->kobj, &astribank->parent->kobj, "transport"); | ||
75 | if(ret < 0) { | ||
76 | XBUS_ERR(xbus, "%s: sysfs_create_link failed: %d\n", __FUNCTION__, ret); | ||
77 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) | ||
78 | + dev_set_drvdata(astribank, NULL); | ||
79 | +#else | ||
80 | astribank->driver_data = NULL; | ||
81 | +#endif | ||
82 | goto out; | ||
83 | } | ||
84 | out: | ||
diff --git a/main/dahdi-linux-vserver/dahdi-2.6.31.patch b/main/dahdi-linux-vserver/dahdi-2.6.31.patch deleted file mode 100644 index 35fe4383e2..0000000000 --- a/main/dahdi-linux-vserver/dahdi-2.6.31.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | Index: drivers/dahdi/wctc4xxp/base.c | ||
2 | =================================================================== | ||
3 | --- a/drivers/dahdi/wctc4xxp/base.c (revision 6716) | ||
4 | +++ b/drivers/dahdi/wctc4xxp/base.c (revision 6717) | ||
5 | @@ -742,6 +742,17 @@ | ||
6 | return 0; | ||
7 | } | ||
8 | |||
9 | +#ifdef HAVE_NET_DEVICE_OPS | ||
10 | +const struct net_device_ops wctc4xxp_netdev_ops = { | ||
11 | + .ndo_set_multicast_list = &wctc4xxp_net_set_multi, | ||
12 | + .ndo_open = &wctc4xxp_net_up, | ||
13 | + .ndo_stop = &wctc4xxp_net_down, | ||
14 | + .ndo_start_xmit = &wctc4xxp_net_hard_start_xmit, | ||
15 | + .ndo_get_stats = &wctc4xxp_net_get_stats, | ||
16 | + .ndo_do_ioctl = &wctc4xxp_net_ioctl, | ||
17 | +}; | ||
18 | +#endif | ||
19 | + | ||
20 | /** | ||
21 | * wctc4xxp_net_register - Register a new network interface. | ||
22 | * @wc: transcoder card to register the interface for. | ||
23 | @@ -773,14 +784,21 @@ | ||
24 | netdev->priv = wc; | ||
25 | # endif | ||
26 | memcpy(netdev->dev_addr, our_mac, sizeof(our_mac)); | ||
27 | + | ||
28 | +# ifdef HAVE_NET_DEVICE_OPS | ||
29 | + netdev->netdev_ops = &wctc4xxp_netdev_ops; | ||
30 | +# else | ||
31 | netdev->set_multicast_list = &wctc4xxp_net_set_multi; | ||
32 | netdev->open = &wctc4xxp_net_up; | ||
33 | netdev->stop = &wctc4xxp_net_down; | ||
34 | netdev->hard_start_xmit = &wctc4xxp_net_hard_start_xmit; | ||
35 | netdev->get_stats = &wctc4xxp_net_get_stats; | ||
36 | netdev->do_ioctl = &wctc4xxp_net_ioctl; | ||
37 | +# endif | ||
38 | + | ||
39 | netdev->promiscuity = 0; | ||
40 | netdev->flags |= IFF_NOARP; | ||
41 | + | ||
42 | # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) | ||
43 | netdev->poll = &wctc4xxp_poll; | ||
44 | netdev->weight = 64; | ||
diff --git a/main/dahdi-linux-vserver/dahdi-linux-2.2.0-hfc-4s.patch b/main/dahdi-linux-vserver/dahdi-linux-2.2.0-hfc-4s.patch deleted file mode 100644 index 67857e2f7d..0000000000 --- a/main/dahdi-linux-vserver/dahdi-linux-2.2.0-hfc-4s.patch +++ /dev/null | |||
@@ -1,553 +0,0 @@ | |||
1 | --- a/drivers/dahdi/wcb4xxp/base.c 2009-06-24 13:17:03.000000000 +0000 | ||
2 | +++ b/drivers/dahdi/wcb4xxp/base.c 2009-06-24 13:40:15.000000000 +0000 | ||
3 | @@ -75,7 +75,7 @@ | ||
4 | #define DBG_SPANFILTER ((1 << bspan->port) & spanfilter) | ||
5 | |||
6 | static int debug = 0; | ||
7 | -static int spanfilter = 15; | ||
8 | +static int spanfilter = 255; /* Bitmap .. 1, 2, 4, 8, 16, 32, 64, 128 for ports 1-8 */ | ||
9 | #ifdef LOOPBACK_SUPPORTED | ||
10 | static int loopback = 0; | ||
11 | #endif | ||
12 | @@ -114,9 +114,21 @@ | ||
13 | struct devtype { | ||
14 | char *desc; | ||
15 | unsigned int flags; | ||
16 | + int ports; /* Number of ports the card has */ | ||
17 | + int has_ec; /* Does the card have an Echo Canceller */ | ||
18 | + enum cards_ids card_type; /* Card type - Digium B410P, ... */ | ||
19 | }; | ||
20 | |||
21 | -static struct devtype wcb4xxp = { "Wildcard B410P", 0 }; | ||
22 | +static struct devtype wcb4xxp = { "Wildcard B410P", .ports = 4, .has_ec = 1, .card_type = B410P }; | ||
23 | +static struct devtype hfc2s = { "HFC-2S Junghanns.NET duoBRI PCI", .ports = 2, .has_ec = 0, .card_type = DUOBRI }; | ||
24 | +static struct devtype hfc4s = { "HFC-4S Junghanns.NET quadBRI PCI", .ports = 4, .has_ec = 0, .card_type = QUADBRI }; | ||
25 | +static struct devtype hfc8s = { "HFC-4S Junghanns.NET octoBRI PCI", .ports = 8, .has_ec = 0, .card_type = OCTOBRI }; | ||
26 | +static struct devtype hfc2s_OV ={ "OpenVox B200P", .ports = 2, .has_ec = 0, .card_type = B200P_OV }; | ||
27 | +static struct devtype hfc4s_OV ={ "OpenVox B400P", .ports = 4, .has_ec = 0, .card_type = B400P_OV }; | ||
28 | +static struct devtype hfc8s_OV ={ "OpenVox B800P", .ports = 8, .has_ec = 0, .card_type = B800P_OV }; | ||
29 | +static struct devtype hfc2s_BN ={ "BeroNet BN2S0", .ports = 2, .has_ec = 0, .card_type = BN2S0 }; | ||
30 | +static struct devtype hfc4s_BN ={ "BeroNet BN4S0", .ports = 4, .has_ec = 0, .card_type = BN4S0 }; | ||
31 | +static struct devtype hfc8s_BN ={ "BeroNet BN8S0", .ports = 8, .has_ec = 0, .card_type = BN8S0 }; | ||
32 | |||
33 | static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp, | ||
34 | struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec); | ||
35 | @@ -403,7 +415,14 @@ | ||
36 | |||
37 | mb(); | ||
38 | |||
39 | - b4xxp_setreg8(b4, R_GPIO_SEL, 0xf0); /* GPIO0..7 S/T, 8..15 GPIO */ | ||
40 | + if ((b4->card_type == OCTOBRI) || (b4->card_type == B800P_OV) || (b4->card_type == BN8S0)) | ||
41 | + { | ||
42 | + b4xxp_setreg8(b4, R_GPIO_SEL, 0x00); /* GPIO0..15 S/T - HFC-8S uses GPIO8-15 for S/T ports 5-8 */ | ||
43 | + } | ||
44 | + else | ||
45 | + { | ||
46 | + b4xxp_setreg8(b4, R_GPIO_SEL, 0xf0); /* GPIO0..7 S/T, 8..15 GPIO */ | ||
47 | + } | ||
48 | |||
49 | mb(); | ||
50 | |||
51 | @@ -618,13 +637,16 @@ | ||
52 | unsigned char b; | ||
53 | unsigned int i, j, mask; | ||
54 | |||
55 | + if (! b4->has_ec) /* Avoid Echo Cancelling for non hardware echo canceller cards */ | ||
56 | + return; | ||
57 | + | ||
58 | /* Setup GPIO */ | ||
59 | for (i=0; i < NUM_EC; i++) { | ||
60 | b = ec_read(b4, i, 0x1a0); | ||
61 | |||
62 | dev_info(b4->dev, "VPM %d/%d init: chip ver %02x\n", i, NUM_EC - 1, b); | ||
63 | |||
64 | - for (j=0; j < 4; j++) { | ||
65 | + for (j=0; j < b4->numspans; j++) { | ||
66 | ec_write(b4, i, 0x1a8 + j, 0x00); /* GPIO out */ | ||
67 | ec_write(b4, i, 0x1ac + j, 0x00); /* GPIO dir */ | ||
68 | ec_write(b4, i, 0x1b0 + j, 0x00); /* GPIO sel */ | ||
69 | @@ -1008,7 +1030,15 @@ | ||
70 | int fifo, hfc_chan; | ||
71 | unsigned long irq_flags; | ||
72 | |||
73 | - fifo = port + 8; | ||
74 | + if ((b4->card_type == B800P_OV) || (b4->card_type == OCTOBRI) || (b4->card_type == BN8S0)) | ||
75 | + { | ||
76 | + fifo = port + 16; /* In HFC-8S cards we can't use ports 8-11 for dchan FIFOs */ | ||
77 | + } | ||
78 | + else | ||
79 | + { | ||
80 | + fifo = port + 8; | ||
81 | + } | ||
82 | + | ||
83 | hfc_chan = (port * 4) + 2; | ||
84 | |||
85 | /* record the host's FIFO # in the span fifo array */ | ||
86 | @@ -1210,7 +1240,7 @@ | ||
87 | int i, j; | ||
88 | struct b4xxp_span *s; | ||
89 | |||
90 | - for (i=0; i < 4; i++) { | ||
91 | + for (i=0; i < b4->numspans; i++) { | ||
92 | s = &b4->spans[i]; | ||
93 | |||
94 | for (j=HFC_T1; j <= HFC_T3; j++) { | ||
95 | @@ -1413,12 +1443,21 @@ | ||
96 | |||
97 | gpio = b4xxp_getreg8(b4, R_GPI_IN3); | ||
98 | |||
99 | - for (i=0; i < 4; i++) { | ||
100 | + for (i=0; i < b4->numspans; i++) { | ||
101 | s = &b4->spans[i]; | ||
102 | s->parent = b4; | ||
103 | s->port = i; | ||
104 | |||
105 | - nt = ((gpio & (1 << (i + 4))) == 0); /* GPIO=0 = NT mode */ | ||
106 | + /* The way the Digium B410P card reads the NT/TE mode | ||
107 | + * jumper is the oposite of how other HFC-4S cards do: | ||
108 | + * - In B410P: GPIO=0: NT | ||
109 | + * - In Junghanns: GPIO=0: TE | ||
110 | + */ | ||
111 | + if (b4->card_type == B410P) | ||
112 | + nt = ((gpio & (1 << (i + 4))) == 0); | ||
113 | + else | ||
114 | + nt = ((gpio & (1 << (i + 4))) != 0); | ||
115 | + | ||
116 | s->te_mode = !nt; | ||
117 | |||
118 | dev_info(b4->dev, "Port %d: %s mode\n", i + 1, (nt ? "NT" : "TE")); | ||
119 | @@ -1774,9 +1813,15 @@ | ||
120 | |||
121 | /* | ||
122 | * set up the clock controller | ||
123 | - * we have a 24.576MHz crystal, so the PCM clock is 2x the incoming clock. | ||
124 | + * B410P has a 24.576MHz crystal, so the PCM clock is 2x the incoming clock. | ||
125 | + * Other cards have a 49.152Mhz crystal, so the PCM clock equals incoming clock. | ||
126 | */ | ||
127 | - b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x02); | ||
128 | + | ||
129 | + if (b4->card_type == B410P) | ||
130 | + b4xxp_setreg8(b4, R_BRG_PCM_CFG,0x02); | ||
131 | + else | ||
132 | + b4xxp_setreg8(b4, R_BRG_PCM_CFG, V_PCM_CLK); | ||
133 | + | ||
134 | flush_pci(); | ||
135 | |||
136 | udelay(100); /* wait a bit for clock to settle */ | ||
137 | @@ -1807,7 +1852,7 @@ | ||
138 | |||
139 | /* | ||
140 | * set up the flow controller. | ||
141 | - * B channel map: | ||
142 | + * B channel map: (4 ports cards with Hardware Echo Cancel present & active) | ||
143 | * FIFO 0 connects Port 1 B0 using HFC channel 16 and PCM timeslots 0/1. | ||
144 | * FIFO 1 connects Port 1 B1 using HFC channel 17 and PCM timeslots 4/5. | ||
145 | * FIFO 2 connects Port 2 B0 using HFC channel 20 and PCM timeslots 8/9. | ||
146 | @@ -1822,14 +1867,35 @@ | ||
147 | * | ||
148 | * D channels are handled by FIFOs 8-11. | ||
149 | * FIFO 8 connects Port 1 D using HFC channel 3 | ||
150 | - * FIFO 9 connects Port 1 D using HFC channel 7 | ||
151 | - * FIFO 10 connects Port 1 D using HFC channel 11 | ||
152 | - * FIFO 11 connects Port 1 D using HFC channel 15 | ||
153 | + * FIFO 9 connects Port 2 D using HFC channel 7 | ||
154 | + * FIFO 10 connects Port 3 D using HFC channel 11 | ||
155 | + * FIFO 11 connects Port 4 D using HFC channel 15 | ||
156 | + * | ||
157 | + * D channel FIFOs are operated in HDLC mode and interrupt on end of frame. | ||
158 | + * | ||
159 | + * B channel map: (8 ports cards without Hardware Echo Cancel) | ||
160 | + * FIFO 0 connects Port 1 B0 using HFC channel 0 | ||
161 | + * FIFO 1 connects Port 1 B1 using HFC channel 1 | ||
162 | + * FIFO 2 connects Port 2 B0 using HFC channel 4 | ||
163 | + * FIFO 3 connects Port 2 B1 using HFC channel 5 | ||
164 | + * ......................... | ||
165 | + * FIFO 14 connects Port 8 B0 using HFC channel 28 | ||
166 | + * FIFO 15 connects Port 8 B1 using HFC channel 29 | ||
167 | + * | ||
168 | + * All B channel FIFOs have their HDLC controller in transparent mode, | ||
169 | + * and only the FIFO for B0 on each port has its interrupt operational. | ||
170 | * | ||
171 | + * D channels are handled by FIFOs 16-23. | ||
172 | + * FIFO 16 connects Port 1 D using HFC channel 3 | ||
173 | + * FIFO 17 connects Port 2 D using HFC channel 7 | ||
174 | + * FIFO 18 connects Port 3 D using HFC channel 11 | ||
175 | + * FIFO 19 connects Port 4 D using HFC channel 15 | ||
176 | + * ................ | ||
177 | + * FIFO 23 connects Port 8 D using HFC channel 31 | ||
178 | * D channel FIFOs are operated in HDLC mode and interrupt on end of frame. | ||
179 | */ | ||
180 | for (span=0; span < b4->numspans; span++) { | ||
181 | - if (vpmsupport) { | ||
182 | + if ((vpmsupport) && (b4->has_ec)) { | ||
183 | hfc_assign_bchan_fifo_ec(b4, span, 0); | ||
184 | hfc_assign_bchan_fifo_ec(b4, span, 1); | ||
185 | } else { | ||
186 | @@ -1854,6 +1920,145 @@ | ||
187 | ec_write(b4, 0, 0x1a8 + 3, val); | ||
188 | } | ||
189 | |||
190 | +static void b4xxp_update_leds_hfc_8s(struct b4xxp *b4) | ||
191 | +{ | ||
192 | + unsigned long lled; | ||
193 | + unsigned long leddw; | ||
194 | + int i,j; | ||
195 | + struct b4xxp_span *bspan; | ||
196 | + lled = 0; | ||
197 | + j=8; | ||
198 | + | ||
199 | + b4->blinktimer++; | ||
200 | + for (i=0; i < 8; i++) { | ||
201 | + bspan = &b4->spans[i]; | ||
202 | + j = j -1 ; /* Leds are in reverse order - Led 7 => Port 0 */ | ||
203 | + if (bspan->span.flags & DAHDI_FLAG_RUNNING) { | ||
204 | + if (bspan->span.alarms) { | ||
205 | + lled |= 1 << j; /* Led OFF in alarm state */ | ||
206 | + } else if (bspan->span.mainttimer || bspan->span.maintstat) { | ||
207 | + if (b4->blinktimer >= 0x7f) /* Led Blinking in maint state */ | ||
208 | + { | ||
209 | + lled |= 1 << j; | ||
210 | + } | ||
211 | + else | ||
212 | + { | ||
213 | + lled |= 0 << j; | ||
214 | + } | ||
215 | + } else { | ||
216 | + | ||
217 | + lled |= 0 << j; /* Led ON - No alarms */ | ||
218 | + } | ||
219 | + } | ||
220 | + else | ||
221 | + lled |= 1 << j; /* Led OFF - Not running */ | ||
222 | + } | ||
223 | + /* Write Leds...*/ | ||
224 | + leddw = lled << 24 | lled << 16 | lled << 8 | lled; | ||
225 | + b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x21); | ||
226 | + iowrite16(0x4000, b4->ioaddr + 4); | ||
227 | + iowrite32(leddw, b4->ioaddr); | ||
228 | + b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x20); | ||
229 | + | ||
230 | + if (b4->blinktimer == 0xff) { | ||
231 | + b4->blinktimer = -1; | ||
232 | + } | ||
233 | +} | ||
234 | + | ||
235 | +static void b4xxp_update_leds_hfc(struct b4xxp *b4) | ||
236 | +{ | ||
237 | + int i, leds; | ||
238 | + int led[4]; | ||
239 | + struct b4xxp_span *bspan; | ||
240 | + | ||
241 | + b4->blinktimer++; | ||
242 | + for (i=0; i < b4->numspans; i++) { | ||
243 | + bspan = &b4->spans[i]; | ||
244 | + | ||
245 | + if (bspan->span.flags & DAHDI_FLAG_RUNNING) { | ||
246 | + if (bspan->span.alarms) { | ||
247 | + if (b4->blinktimer >= 0x7f) /* Red blinking -> Alarm */ | ||
248 | + { | ||
249 | + led[i] = 2; | ||
250 | + } | ||
251 | + else | ||
252 | + { | ||
253 | + led[i] = 0; | ||
254 | + } | ||
255 | + } else if (bspan->span.mainttimer || bspan->span.maintstat) { | ||
256 | + if (b4->blinktimer >= 0x7f) /* Green blinking -> Maint status */ | ||
257 | + { | ||
258 | + led[i] = 1; | ||
259 | + } | ||
260 | + else | ||
261 | + { | ||
262 | + led[i] = 0; | ||
263 | + } | ||
264 | + } else { | ||
265 | + /* No Alarm - Green */ | ||
266 | + led[i] = 1; | ||
267 | + } | ||
268 | + } | ||
269 | + else | ||
270 | + led[i] = 0; /* OFF - Not running */ | ||
271 | + } | ||
272 | + | ||
273 | + /* Each card manage leds in a different way. So one section per card type */ | ||
274 | + | ||
275 | + if (b4->card_type == B400P_OV) { | ||
276 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
277 | + ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | | ||
278 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | | ||
279 | + ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* Tested OK */ | ||
280 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
281 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); | ||
282 | + } | ||
283 | + | ||
284 | + else if (b4->card_type == QUADBRI) { | ||
285 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
286 | + ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | | ||
287 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | | ||
288 | + ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* UNTESTED */ | ||
289 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
290 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); | ||
291 | + } | ||
292 | + | ||
293 | + else if (b4->card_type == BN4S0) { | ||
294 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
295 | + ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | | ||
296 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | | ||
297 | + ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* UNTESTED */ | ||
298 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
299 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); | ||
300 | + } | ||
301 | + | ||
302 | + else if (b4->card_type == B200P_OV) { | ||
303 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
304 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5); | ||
305 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
306 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* Tested OK */ | ||
307 | + } | ||
308 | + | ||
309 | + else if (b4->card_type == DUOBRI) { | ||
310 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
311 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5); | ||
312 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
313 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* UNTESTED */ | ||
314 | + } | ||
315 | + | ||
316 | + else if (b4->card_type == BN2S0) { | ||
317 | + leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | | ||
318 | + ((led[0] & 1) << 4) | ((led[1] & 1) << 5); | ||
319 | + b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); | ||
320 | + b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* UNTESTED */ | ||
321 | + } | ||
322 | + | ||
323 | + if (b4->blinktimer == 0xff) { | ||
324 | + b4->blinktimer = -1; | ||
325 | + } | ||
326 | + | ||
327 | +} | ||
328 | + | ||
329 | static void b4xxp_set_span_led(struct b4xxp *b4, int span, unsigned char val) | ||
330 | { | ||
331 | int shift, spanmask; | ||
332 | @@ -1871,6 +2076,18 @@ | ||
333 | int i; | ||
334 | struct b4xxp_span *bspan; | ||
335 | |||
336 | + if (b4->numspans == 8) { | ||
337 | + /* Use the alternative function for non-Digium HFC-8S cards */ | ||
338 | + b4xxp_update_leds_hfc_8s(b4); | ||
339 | + return; | ||
340 | + } | ||
341 | + | ||
342 | + if (b4->card_type != B410P) { | ||
343 | + /* Use the alternative function for non-Digium HFC-4S cards */ | ||
344 | + b4xxp_update_leds_hfc(b4); | ||
345 | + return; | ||
346 | + } | ||
347 | + | ||
348 | b4->blinktimer++; | ||
349 | for (i=0; i < b4->numspans; i++) { | ||
350 | bspan = &b4->spans[i]; | ||
351 | @@ -2174,7 +2391,7 @@ | ||
352 | bspan->span.close = b4xxp_close; | ||
353 | bspan->span.ioctl = b4xxp_ioctl; | ||
354 | bspan->span.hdlc_hard_xmit = b4xxp_hdlc_hard_xmit; | ||
355 | - if (vpmsupport) | ||
356 | + if (vpmsupport && b4->has_ec) | ||
357 | bspan->span.echocan_create = echocan_create; | ||
358 | |||
359 | /* HDLC stuff */ | ||
360 | @@ -2281,13 +2498,24 @@ | ||
361 | static void b4xxp_bottom_half(unsigned long data) | ||
362 | { | ||
363 | struct b4xxp *b4 = (struct b4xxp *)data; | ||
364 | - int i, j, k, gotrxfifo, fifo; | ||
365 | + int i, j, k, gotrxfifo, fifo, fifo_low, fifo_high; | ||
366 | unsigned char b, b2; | ||
367 | |||
368 | if (b4->shutdown) | ||
369 | return; | ||
370 | |||
371 | gotrxfifo = 0; | ||
372 | + if ( b4->numspans == 8 ) /* HFC-4S d-chan fifos 8-11 *** HFC-8S d-chan fifos 16-23 */ | ||
373 | + { | ||
374 | + fifo_low = 16; | ||
375 | + fifo_high = 23; | ||
376 | + } | ||
377 | + else | ||
378 | + { | ||
379 | + fifo_low = 8; | ||
380 | + fifo_high = 11; | ||
381 | + } | ||
382 | + | ||
383 | |||
384 | for (i=0; i < 8; i++) { | ||
385 | b = b2 = b4->fifo_irqstatus[i]; | ||
386 | @@ -2296,7 +2524,7 @@ | ||
387 | fifo = i*4 + j; | ||
388 | |||
389 | if (b & V_IRQ_FIFOx_TX) { | ||
390 | - if (fifo >=8 && fifo <= 11) { /* d-chan fifo */ | ||
391 | + if (fifo >= fifo_low && fifo <= fifo_high) { /* d-chan fifos */ | ||
392 | /* | ||
393 | * WOW I don't like this. | ||
394 | * It's bad enough that I have to send a fake frame to get an HDLC TX FIFO interrupt, | ||
395 | @@ -2305,7 +2533,7 @@ | ||
396 | * Yuck. It works well, but yuck. | ||
397 | */ | ||
398 | do { | ||
399 | - k = hdlc_tx_frame(&b4->spans[fifo - 8]); | ||
400 | + k = hdlc_tx_frame(&b4->spans[fifo - fifo_low]); | ||
401 | } while (k); | ||
402 | } else { | ||
403 | if (printk_ratelimit()) | ||
404 | @@ -2314,7 +2542,7 @@ | ||
405 | } | ||
406 | |||
407 | if (b & V_IRQ_FIFOx_RX) { | ||
408 | - if (fifo >=8 && fifo <= 11) { | ||
409 | + if (fifo >= fifo_low && fifo <= fifo_high) { /* dchan fifos */ | ||
410 | /* | ||
411 | * I have to loop here until hdlc_rx_frame says there are no more frames waiting. | ||
412 | * for whatever reason, the HFC will not generate another interrupt if there are | ||
413 | @@ -2322,7 +2550,7 @@ | ||
414 | * i.e. I get an int when F1 changes, not when F1 != F2. | ||
415 | */ | ||
416 | do { | ||
417 | - k = hdlc_rx_frame(&b4->spans[fifo - 8]); | ||
418 | + k = hdlc_rx_frame(&b4->spans[fifo - fifo_low]); | ||
419 | } while (k); | ||
420 | } else { | ||
421 | if (printk_ratelimit()) | ||
422 | @@ -2404,8 +2632,8 @@ | ||
423 | sprintf(sBuf, "Card %d, PCI identifier %s, IRQ %d\n", b4->cardno + 1, b4->dev->bus_id, b4->irq); | ||
424 | |||
425 | strcat(sBuf,"Tx:\n"); | ||
426 | - for (j=0; j<8; j++) { | ||
427 | - for (i=0; i<12; i++) { | ||
428 | + for (j=0; j<(b4->numspans * 2) ; j++) { /* B Channels */ | ||
429 | + for (i=0; i<(b4->numspans * 3) ; i++) { /* All Channels */ | ||
430 | chan = b4->spans[i/3].chans[i%3]; | ||
431 | sprintf(str, "%02x ", chan->writechunk[j]); | ||
432 | strcat(sBuf, str); | ||
433 | @@ -2415,8 +2643,8 @@ | ||
434 | } | ||
435 | |||
436 | strcat(sBuf, "\nRx:\n"); | ||
437 | - for (j=0; j < 8; j++) { | ||
438 | - for (i=0; i < 12; i++) { | ||
439 | + for (j=0; j < (b4->numspans * 2); j++) { /* B Channels */ | ||
440 | + for (i=0; i < (b4->numspans * 3); i++) { /* All Channels */ | ||
441 | chan = b4->spans[i / 3].chans[i % 3]; | ||
442 | sprintf(str, "%02x%c", chan->readchunk[j], (i == 11) ? '\n' : ' '); | ||
443 | strcat(sBuf, str); | ||
444 | @@ -2424,7 +2652,7 @@ | ||
445 | } | ||
446 | |||
447 | strcat(sBuf, "\nPort states:\n"); | ||
448 | - for (i=0; i < 4; i++) { | ||
449 | + for (i=0; i < b4->numspans; i++) { | ||
450 | int state; | ||
451 | char *x; | ||
452 | struct b4xxp_span *s = &b4->spans[i]; | ||
453 | @@ -2519,7 +2747,8 @@ | ||
454 | /* card found, enabled and main struct allocated. Fill it out. */ | ||
455 | b4->magic = WCB4XXP_MAGIC; | ||
456 | b4->variety = dt->desc; | ||
457 | - | ||
458 | + b4->has_ec = dt->has_ec; | ||
459 | + b4->card_type = dt->card_type; | ||
460 | b4->pdev = pdev; | ||
461 | b4->dev = &pdev->dev; | ||
462 | pci_set_drvdata(pdev, b4); | ||
463 | @@ -2533,7 +2762,7 @@ | ||
464 | spin_lock_init(&b4->fifolock); | ||
465 | |||
466 | x = b4xxp_getreg8(b4, R_CHIP_ID); | ||
467 | - if (x != 0xc0) { /* wrong chip? */ | ||
468 | + if ((x != 0xc0) && ( x != 0x80)) { /* wrong chip? */ | ||
469 | dev_err(&pdev->dev, "Unknown/unsupported controller detected (R_CHIP_ID = 0x%02x)\n", x); | ||
470 | goto err_out_free_mem; | ||
471 | } | ||
472 | @@ -2548,7 +2777,7 @@ | ||
473 | */ | ||
474 | |||
475 | /* TODO: determine whether this is a 2, 4 or 8 port card */ | ||
476 | - b4->numspans = 4; | ||
477 | + b4->numspans = dt->ports; | ||
478 | b4->syncspan = -1; /* sync span is unknown */ | ||
479 | if (b4->numspans > MAX_SPANS_PER_CARD) { | ||
480 | dev_err(b4->dev, "Driver does not know how to handle a %d span card!\n", b4->numspans); | ||
481 | @@ -2696,7 +2925,17 @@ | ||
482 | static struct pci_device_id b4xx_ids[] __devinitdata = | ||
483 | { | ||
484 | { 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp }, | ||
485 | - { 0, } | ||
486 | + { 0x1397, 0x16b8, 0x1397, 0xe552, 0, 0, (unsigned long)&hfc8s }, | ||
487 | + { 0x1397, 0x08b4, 0x1397, 0xb520, 0, 0, (unsigned long)&hfc4s }, | ||
488 | + { 0x1397, 0x08b4, 0x1397, 0xb556, 0, 0, (unsigned long)&hfc2s }, | ||
489 | + { 0x1397, 0x08b4, 0x1397, 0xe884, 0, 0, (unsigned long)&hfc2s_OV }, | ||
490 | + { 0x1397, 0x08b4, 0x1397, 0xe888, 0, 0, (unsigned long)&hfc4s_OV }, | ||
491 | + { 0x1397, 0x16b8, 0x1397, 0xe998, 0, 0, (unsigned long)&hfc8s_OV }, | ||
492 | + { 0x1397, 0x08b4, 0x1397, 0xb566, 0, 0, (unsigned long)&hfc2s_BN }, | ||
493 | + { 0x1397, 0x08b4, 0x1397, 0xb560, 0, 0, (unsigned long)&hfc4s_BN }, | ||
494 | + { 0x1397, 0x16b8, 0x1397, 0xb562, 0, 0, (unsigned long)&hfc8s_BN }, | ||
495 | + {0, } | ||
496 | + | ||
497 | }; | ||
498 | |||
499 | static struct pci_driver b4xx_driver = { | ||
500 | @@ -2756,7 +2995,7 @@ | ||
501 | MODULE_PARM_DESC(timer_3_ms, "TE: msec to wait for link activation, NT: unused."); | ||
502 | |||
503 | MODULE_AUTHOR("Digium Incorporated <support@digium.com>"); | ||
504 | -MODULE_DESCRIPTION("B410P quad-port BRI module driver."); | ||
505 | +MODULE_DESCRIPTION("B410P & Similars multi-port BRI module driver."); | ||
506 | MODULE_LICENSE("GPL"); | ||
507 | |||
508 | MODULE_DEVICE_TABLE(pci, b4xx_ids); | ||
509 | --- a/drivers/dahdi/wcb4xxp/wcb4xxp.h 2009-06-24 13:17:03.000000000 +0000 | ||
510 | +++ b/drivers/dahdi/wcb4xxp/wcb4xxp.h 2009-06-24 13:18:07.000000000 +0000 | ||
511 | @@ -378,7 +378,7 @@ | ||
512 | #define HFC_T3 2 | ||
513 | |||
514 | #define WCB4XXP_MAGIC 0xb410c0de | ||
515 | -#define MAX_SPANS_PER_CARD 4 | ||
516 | +#define MAX_SPANS_PER_CARD 8 | ||
517 | |||
518 | #define WCB4XXP_CHANNELS_PER_SPAN 3 /* 2 B-channels and 1 D-Channel for each BRI span */ | ||
519 | #define WCB4XXP_HDLC_BUF_LEN 32 /* arbitrary, just the max # of byts we will send to DAHDI per call */ | ||
520 | @@ -415,6 +415,19 @@ | ||
521 | struct dahdi_chan _chans[WCB4XXP_CHANNELS_PER_SPAN]; /* Backing memory */ | ||
522 | }; | ||
523 | |||
524 | +enum cards_ids { /* Cards ==> Brand & Model */ | ||
525 | + B410P = 0, /* Digium B410P */ | ||
526 | + B200P_OV, /* OpenVox B200P */ | ||
527 | + B400P_OV, /* OpenVox B400P */ | ||
528 | + B800P_OV, /* OpenVox B800P */ | ||
529 | + DUOBRI, /* HFC-2S Junghanns.NET duoBRI PCI */ | ||
530 | + QUADBRI, /* HFC-4S Junghanns.NET quadBRI PCI */ | ||
531 | + OCTOBRI, /* HFC-8S Junghanns.NET octoBRI PCI */ | ||
532 | + BN2S0, /* BeroNet BN2S0 */ | ||
533 | + BN4S0, /* Beronet BN4S0 */ | ||
534 | + BN8S0 /* BeroNet BN8S0 */ | ||
535 | + }; | ||
536 | + | ||
537 | /* This structure exists one per card */ | ||
538 | struct b4xxp { | ||
539 | unsigned magic; /* magic value to make sure we're looking at our struct */ | ||
540 | @@ -449,10 +462,12 @@ | ||
541 | int globalconfig; /* Whether global setup has been done */ | ||
542 | int syncspan; /* span that HFC uses for sync on this card */ | ||
543 | int running; /* interrupts are enabled */ | ||
544 | - | ||
545 | + | ||
546 | struct b4xxp_span spans[MAX_SPANS_PER_CARD]; /* Individual spans */ | ||
547 | int order; /* Order */ | ||
548 | int flags; /* Device flags */ | ||
549 | + int has_ec; /* Has ECHO Cancel */ | ||
550 | + enum cards_ids card_type; /* Card Identifier (using ids_cards enum)*/ | ||
551 | int master; /* Are we master */ | ||
552 | int ledreg; /* copy of the LED Register */ | ||
553 | unsigned int gpio; | ||
diff --git a/main/dahdi-linux/APKBUILD b/main/dahdi-linux/APKBUILD index cb467746b0..923a79304e 100644 --- a/main/dahdi-linux/APKBUILD +++ b/main/dahdi-linux/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Timo Teras <timo.teras@iki.fi> | 2 | # Maintainer: Timo Teras <timo.teras@iki.fi> |
3 | 3 | ||
4 | pkgname=dahdi-linux | 4 | pkgname=dahdi-linux |
5 | pkgver=2.2.0.2 | 5 | pkgver=2.3.0.1 |
6 | pkgrel=0 | 6 | pkgrel=0 |
7 | pkgdesc="Firmware for Digium Asterisk Hardware Device Interface drivers" | 7 | pkgdesc="Firmware for Digium Asterisk Hardware Device Interface drivers" |
8 | url="http://www.asterisk.org" | 8 | url="http://www.asterisk.org" |
@@ -19,17 +19,23 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/$pkgname- | |||
19 | # kernel flavors. We also install the headers for the -dev package. | 19 | # kernel flavors. We also install the headers for the -dev package. |
20 | # | 20 | # |
21 | # The kernel drivers themselves are built from separate build recipe. | 21 | # The kernel drivers themselves are built from separate build recipe. |
22 | 22 | prepare() { | |
23 | build() { | ||
24 | cd "$srcdir"/$pkgname-$pkgver | 23 | cd "$srcdir"/$pkgname-$pkgver |
25 | for i in ../*.patch ../*.diff; do | 24 | for i in ../*.patch ../*.diff; do |
26 | [ -f "$i" ] || continue | 25 | [ -f "$i" ] || continue |
27 | msg "Applying $i" | 26 | msg "Applying $i" |
28 | patch -p1 < $i || return 1; | 27 | patch -p1 < $i || return 1; |
29 | done | 28 | done |
29 | } | ||
30 | 30 | ||
31 | build() { | ||
32 | return 0 | ||
33 | } | ||
34 | |||
35 | package() { | ||
36 | cd "$srcdir"/$pkgname-$pkgver | ||
31 | make DESTDIR="$pkgdir" HOTPLUG_FIRMWARE=yes \ | 37 | make DESTDIR="$pkgdir" HOTPLUG_FIRMWARE=yes \ |
32 | install-include install-firmware | 38 | install-include install-firmware |
33 | } | 39 | } |
34 | 40 | ||
35 | md5sums="1f932729ad28f2f028afcf2cc5ccf7ba dahdi-linux-2.2.0.2.tar.gz" | 41 | md5sums="ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz" |
diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD index dbb82aab67..4d561678e9 100644 --- a/main/dahdi-tools/APKBUILD +++ b/main/dahdi-tools/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Timo Teras <timo.teras@iki.fi> | 1 | # Contributor: Timo Teras <timo.teras@iki.fi> |
2 | # Maintainer: Timo Teras <timo.teras@iki.fi> | 2 | # Maintainer: Timo Teras <timo.teras@iki.fi> |
3 | pkgname=dahdi-tools | 3 | pkgname=dahdi-tools |
4 | pkgver=2.2.0 | 4 | pkgver=2.3.0 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="Digium Asterisk Hardware Device Interface management utilities" | 6 | pkgdesc="Digium Asterisk Hardware Device Interface management utilities" |
7 | url="http://www.asterisk.org" | 7 | url="http://www.asterisk.org" |
8 | license="GPL" | 8 | license="GPL" |
@@ -14,19 +14,25 @@ subpackages="$pkgname-doc $pkgname-dev" | |||
14 | source="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/$pkgname-$pkgver.tar.gz | 14 | source="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/$pkgname-$pkgver.tar.gz |
15 | $pkgname.initd" | 15 | $pkgname.initd" |
16 | 16 | ||
17 | _builddir="$srcdir"/$pkgname-$pkgver | ||
17 | build() { | 18 | build() { |
18 | cd "$srcdir/$pkgname-$pkgver" | 19 | cd "$_builddir" |
19 | 20 | ||
20 | ./configure --prefix=/usr \ | 21 | ./configure --prefix=/usr \ |
21 | --sysconfdir=/etc \ | 22 | --sysconfdir=/etc \ |
22 | --mandir=/usr/share/man \ | 23 | --mandir=/usr/share/man \ |
23 | --infodir=/usr/share/info | 24 | --infodir=/usr/share/info \ |
24 | sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $^/$(CC) $^ $(LDFLAGS) -o $@/' Makefile | 25 | || return 1 |
26 | sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $^/$(CC) $^ $(LDFLAGS) -o $@/' \ | ||
27 | Makefile | ||
25 | make || return 1 | 28 | make || return 1 |
26 | make -j1 DESTDIR="$pkgdir" install | 29 | } |
27 | 30 | ||
31 | package() { | ||
32 | cd "$_builddir" | ||
33 | make -j1 DESTDIR="$pkgdir" install | ||
28 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/dahdi | 34 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/dahdi |
29 | } | 35 | } |
30 | 36 | ||
31 | md5sums="a018f452f3851a312ff51705ac44de37 dahdi-tools-2.2.0.tar.gz | 37 | md5sums="6c9e2da70e4503e4d93f1ad0c83e61af dahdi-tools-2.3.0.tar.gz |
32 | d9702271dba6ff250f4d9a252f4dbf4c dahdi-tools.initd" | 38 | d9702271dba6ff250f4d9a252f4dbf4c dahdi-tools.initd" |
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index c72d0bc396..1250503b59 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | 1 | # Contributor: Michael Mason <ms13sp@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=dovecot | 3 | pkgname=dovecot |
4 | pkgver=1.2.11 | 4 | pkgver=1.2.12 |
5 | pkgrel=5 | 5 | pkgrel=0 |
6 | pkgdesc="IMAP and POP3 server" | 6 | pkgdesc="IMAP and POP3 server" |
7 | url="http://www.dovecot.org/" | 7 | url="http://www.dovecot.org/" |
8 | license="LGPL-2.1" | 8 | license="LGPL-2.1" |
@@ -90,6 +90,6 @@ sqlite() { | |||
90 | _mv $(cd "$pkgdir" && find usr -name '*sqlite.so') | 90 | _mv $(cd "$pkgdir" && find usr -name '*sqlite.so') |
91 | } | 91 | } |
92 | 92 | ||
93 | md5sums="bdac013fd57aa616ea4bdd9ac34557c6 dovecot-1.2.11.tar.gz | 93 | md5sums="cc8e5c53cd0943ce0b5e1087356ad4ea dovecot-1.2.12.tar.gz |
94 | aec5cc797ab2acf72ce3b6bb1030345f dovecot.logrotate | 94 | aec5cc797ab2acf72ce3b6bb1030345f dovecot.logrotate |
95 | c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd" | 95 | c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd" |
diff --git a/main/feh/APKBUILD b/main/feh/APKBUILD index af55607849..44fca8ada3 100644 --- a/main/feh/APKBUILD +++ b/main/feh/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=feh | 2 | pkgname=feh |
3 | pkgver=1.5 | 3 | pkgver=1.7 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" | 5 | pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" |
6 | url="http://www.linuxbrit.co.uk/feh/" | 6 | url="http://www.linuxbrit.co.uk/feh/" |
@@ -23,4 +23,4 @@ package() { | |||
23 | make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1 | 23 | make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1 |
24 | install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE | 24 | install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE |
25 | } | 25 | } |
26 | md5sums="aee156f0a82582108c5a56fbe85319ae feh-1.5.tar.bz2" | 26 | md5sums="59181976384d1f5bddae016b39334e2e feh-1.7.tar.bz2" |
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index 1f9407ecd0..56aed8ea76 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD | |||
@@ -1,23 +1,26 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | 1 | # Contributor: Michael Mason <ms13sp@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=freeswitch | 3 | pkgname=freeswitch |
3 | pkgver=1.0.6 | 4 | pkgver=1.0.6 |
4 | pkgrel=8 | 5 | pkgrel=9 |
5 | pkgdesc="A communications platform written in C from the ground up" | 6 | pkgdesc="A communications platform written in C from the ground up" |
6 | url="http://www.freeswitch.org" | 7 | url="http://www.freeswitch.org" |
7 | license="GPL" | 8 | license="GPL" |
8 | depends="" | 9 | depends="" |
9 | makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev | 10 | makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev ncurses-dev |
10 | autoconf automake libtool" | 11 | autoconf automake libtool" |
11 | install="$pkgname.pre-install $pkgname.post-install" | 12 | install="$pkgname.pre-install $pkgname.post-install" |
12 | subpackages="$pkgname-dev" | 13 | subpackages="$pkgname-dev $pkgname-flite" |
13 | source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz | 14 | source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz |
14 | modules.conf | 15 | modules.conf |
15 | freeswitch.confd | 16 | freeswitch.confd |
16 | freeswitch.initd | 17 | freeswitch.initd |
17 | " | 18 | " |
18 | 19 | ||
20 | _builddir="$srcdir/$pkgname-$pkgver" | ||
21 | |||
19 | build() { | 22 | build() { |
20 | cd "$srcdir/$pkgname-$pkgver" | 23 | cd "$_builddir" |
21 | cp -f "$srcdir/modules.conf" modules.conf || return 1 | 24 | cp -f "$srcdir/modules.conf" modules.conf || return 1 |
22 | 25 | ||
23 | # i think our max cmd len is 32768 | 26 | # i think our max cmd len is 32768 |
@@ -33,11 +36,17 @@ build() { | |||
33 | --with-devrandom=/dev/urandom \ | 36 | --with-devrandom=/dev/urandom \ |
34 | || return 1 | 37 | || return 1 |
35 | 38 | ||
39 | # flite does not work with parallel builds | ||
40 | # first build libfreeswitch (in parallel) | ||
41 | make libfreeswitch.la || return 1 | ||
42 | # then we build mod_flite, disabling parallel builds | ||
43 | ( cd src/mod/asr_tts/mod_flite && make -j1 ) || return 1 | ||
44 | # finally we build the rest | ||
36 | make all || return 1 | 45 | make all || return 1 |
37 | } | 46 | } |
38 | package(){ | 47 | package(){ |
39 | cd "$srcdir/$pkgname-$pkgver" | 48 | cd "$srcdir/$pkgname-$pkgver" |
40 | make -j1 DESTDIR="$pkgdir" install | 49 | make -j1 DESTDIR="$pkgdir" install || return 1 |
41 | # we need to do some moving/cleanup to allow some... kind of FHS | 50 | # we need to do some moving/cleanup to allow some... kind of FHS |
42 | mkdir -p "$pkgdir"/var/run/freeswitch | 51 | mkdir -p "$pkgdir"/var/run/freeswitch |
43 | mkdir -p "$pkgdir"/var/lib/freeswitch | 52 | mkdir -p "$pkgdir"/var/lib/freeswitch |
@@ -53,7 +62,26 @@ package(){ | |||
53 | install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | 62 | install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname |
54 | } | 63 | } |
55 | 64 | ||
65 | |||
66 | _mv_mod() { | ||
67 | local moddir=usr/lib/freeswitch i= | ||
68 | mkdir -p "$subpkgdir"/$moddir | ||
69 | for i in $@; do | ||
70 | mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/ || return 1 | ||
71 | done | ||
72 | } | ||
73 | |||
74 | |||
75 | flite() { | ||
76 | pkgdesc="Freeswitch Text To Speech Module" | ||
77 | depends="freeswitch" | ||
78 | install= | ||
79 | _mv_mod mod_flite mod_say_de mod_say_en mod_say_es mod_say_fr \ | ||
80 | mod_say_it mod_say_nl mod_say_zh | ||
81 | } | ||
82 | |||
83 | |||
56 | md5sums="388effee587887a81fe7f411b7350590 freeswitch-1.0.6.tar.gz | 84 | md5sums="388effee587887a81fe7f411b7350590 freeswitch-1.0.6.tar.gz |
57 | c05f2356be159e99b3845f5260a33599 modules.conf | 85 | 55e62842ad037e5e550ad097df09f6d2 modules.conf |
58 | c608cca8ad773acebf201f581438c7e7 freeswitch.confd | 86 | c608cca8ad773acebf201f581438c7e7 freeswitch.confd |
59 | 6973e15d72e5876152b160bd9e8d282b freeswitch.initd" | 87 | 6973e15d72e5876152b160bd9e8d282b freeswitch.initd" |
diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf index c6f5a05de8..9968d68d9a 100644 --- a/main/freeswitch/modules.conf +++ b/main/freeswitch/modules.conf | |||
@@ -18,7 +18,7 @@ applications/mod_fsv | |||
18 | #applications/mod_rss | 18 | #applications/mod_rss |
19 | #applications/mod_snom | 19 | #applications/mod_snom |
20 | #applications/mod_vmd | 20 | #applications/mod_vmd |
21 | #asr_tts/mod_flite | 21 | asr_tts/mod_flite |
22 | #asr_tts/mod_pocketsphinx | 22 | #asr_tts/mod_pocketsphinx |
23 | #asr_tts/mod_cepstral | 23 | #asr_tts/mod_cepstral |
24 | codecs/mod_g723_1 | 24 | codecs/mod_g723_1 |
@@ -67,9 +67,9 @@ languages/mod_lua | |||
67 | #xml_int/mod_xml_cdr | 67 | #xml_int/mod_xml_cdr |
68 | #xml_int/mod_xml_ldap | 68 | #xml_int/mod_xml_ldap |
69 | say/mod_say_en | 69 | say/mod_say_en |
70 | #say/mod_say_de | 70 | say/mod_say_de |
71 | #say/mod_say_es | 71 | say/mod_say_es |
72 | #say/mod_say_fr | 72 | say/mod_say_fr |
73 | #say/mod_say_it | 73 | say/mod_say_it |
74 | #say/mod_say_nl | 74 | say/mod_say_nl |
75 | #say/mod_say_zh | 75 | say/mod_say_zh |
diff --git a/testing/gc/APKBUILD b/main/gc/APKBUILD index 065fba140b..065fba140b 100644 --- a/testing/gc/APKBUILD +++ b/main/gc/APKBUILD | |||
diff --git a/testing/gc/uclibc-getcontext.patch b/main/gc/uclibc-getcontext.patch index de48fc0183..de48fc0183 100644 --- a/testing/gc/uclibc-getcontext.patch +++ b/main/gc/uclibc-getcontext.patch | |||
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 3beecf2377..a5fb49a921 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD | |||
@@ -6,7 +6,7 @@ _specsver=0.1.7 | |||
6 | _espfver=0.3.6 | 6 | _espfver=0.3.6 |
7 | _uclibc_abiver=0.9.32 | 7 | _uclibc_abiver=0.9.32 |
8 | 8 | ||
9 | pkgrel=1 | 9 | pkgrel=2 |
10 | pkgdesc="The GNU Compiler Collection" | 10 | pkgdesc="The GNU Compiler Collection" |
11 | url="http://gcc.gnu.org" | 11 | url="http://gcc.gnu.org" |
12 | license="GPL LGPL" | 12 | license="GPL LGPL" |
diff --git a/main/gimp/APKBUILD b/main/gimp/APKBUILD index 171766f5a5..ca145889ac 100644 --- a/main/gimp/APKBUILD +++ b/main/gimp/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gimp | 2 | pkgname=gimp |
3 | pkgver=2.6.8 | 3 | pkgver=2.6.9 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="GNU Image Manipulation Program" | 5 | pkgdesc="GNU Image Manipulation Program" |
6 | url="http://www.gimp.org/" | 6 | url="http://www.gimp.org/" |
@@ -10,14 +10,10 @@ makedepends="gtk+-dev libxpm-dev libxmu-dev librsvg-dev dbus-glib-dev | |||
10 | jpeg-dev libpng-dev curl-dev" | 10 | jpeg-dev libpng-dev curl-dev" |
11 | install= | 11 | install= |
12 | subpackages="$pkgname-dev $pkgname-doc" | 12 | subpackages="$pkgname-dev $pkgname-doc" |
13 | source="ftp://ftp.$pkgname.org/pub/$pkgname/v2.6/$pkgname-$pkgver.tar.bz2 | 13 | source="ftp://ftp.$pkgname.org/pub/$pkgname/v2.6/$pkgname-$pkgver.tar.bz2" |
14 | libpng-1.4.patch | ||
15 | gtk-2.19-statusbar.patch" | ||
16 | 14 | ||
17 | prepare() { | 15 | prepare() { |
18 | cd "$srcdir"/$pkgname-$pkgver | 16 | cd "$srcdir"/$pkgname-$pkgver |
19 | patch -Np1 -i "../libpng-1.4.patch" || return 1 | ||
20 | patch -Np1 -i "$srcdir"/gtk-2.19-statusbar.patch || return 1 | ||
21 | } | 17 | } |
22 | 18 | ||
23 | build() { | 19 | build() { |
@@ -41,6 +37,4 @@ package() { | |||
41 | make DESTDIR="$pkgdir" install || return 1 | 37 | make DESTDIR="$pkgdir" install || return 1 |
42 | ln -s gimptool-2.0 "$pkgdir/usr/bin/gimptool" || return 1 | 38 | ln -s gimptool-2.0 "$pkgdir/usr/bin/gimptool" || return 1 |
43 | } | 39 | } |
44 | md5sums="a4d9462c9420954824a80c9b1963f9d9 gimp-2.6.8.tar.bz2 | 40 | md5sums="e5d0cc6f3ce127e51d7f3d3124b16a99 gimp-2.6.9.tar.bz2" |
45 | 211eccab51593526e852816e647f7da4 libpng-1.4.patch | ||
46 | 8be7d21231e3032e4723cf86588375c0 gtk-2.19-statusbar.patch" | ||
diff --git a/main/gimp/gtk-2.19-statusbar.patch b/main/gimp/gtk-2.19-statusbar.patch deleted file mode 100644 index 8bc278b4c2..0000000000 --- a/main/gimp/gtk-2.19-statusbar.patch +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | From 501c4f65f08c111df0654cb887d95c2c06e82710 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nils Philippsen <nils@redhat.com> | ||
3 | Date: Wed, 24 Mar 2010 17:08:01 +0000 | ||
4 | Subject: backport statusbar code needed for GTK+ >= 2.19.1 | ||
5 | |||
6 | Use the hbox that is provided via gtk_statusbar_get_message_area() | ||
7 | since GTK+ 2.19.1. | ||
8 | --- | ||
9 | diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c | ||
10 | index 5e89427..36651cd 100644 | ||
11 | --- a/app/display/gimpstatusbar.c | ||
12 | +++ b/app/display/gimpstatusbar.c | ||
13 | @@ -49,6 +49,9 @@ | ||
14 | /* maximal width of the string holding the cursor-coordinates */ | ||
15 | #define CURSOR_LEN 256 | ||
16 | |||
17 | +/* the spacing of the hbox */ | ||
18 | +#define HBOX_SPACING 1 | ||
19 | + | ||
20 | /* spacing between the icon and the statusbar label */ | ||
21 | #define ICON_SPACING 2 | ||
22 | |||
23 | @@ -152,6 +155,7 @@ static void | ||
24 | gimp_statusbar_init (GimpStatusbar *statusbar) | ||
25 | { | ||
26 | GtkWidget *hbox; | ||
27 | + GtkWidget *label; | ||
28 | GtkWidget *image; | ||
29 | GimpUnitStore *store; | ||
30 | |||
31 | @@ -171,13 +175,27 @@ gimp_statusbar_init (GimpStatusbar *statusbar) | ||
32 | statusbar->progress_active = FALSE; | ||
33 | statusbar->progress_shown = FALSE; | ||
34 | |||
35 | - /* remove the label and insert a hbox */ | ||
36 | - gtk_container_remove (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), | ||
37 | - g_object_ref (GTK_STATUSBAR (statusbar)->label)); | ||
38 | - | ||
39 | - hbox = gtk_hbox_new (FALSE, 1); | ||
40 | - gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), hbox); | ||
41 | - gtk_widget_show (hbox); | ||
42 | + label = g_object_ref (GTK_STATUSBAR (statusbar)->label); | ||
43 | + | ||
44 | + /* remove the message area or label and insert a hbox */ | ||
45 | +#if GTK_CHECK_VERSION (2, 19, 1) | ||
46 | + { | ||
47 | + hbox = gtk_statusbar_get_message_area (GTK_STATUSBAR (statusbar)); | ||
48 | + gtk_box_set_spacing (GTK_BOX (hbox), HBOX_SPACING); | ||
49 | + gtk_container_remove (GTK_CONTAINER (hbox), label); | ||
50 | + } | ||
51 | +#else | ||
52 | + { | ||
53 | + GtkWidget *label_parent; | ||
54 | + | ||
55 | + label_parent = gtk_widget_get_parent (label); | ||
56 | + gtk_container_remove (GTK_CONTAINER (label_parent), label); | ||
57 | + | ||
58 | + hbox = gtk_hbox_new (FALSE, HBOX_SPACING); | ||
59 | + gtk_container_add (GTK_CONTAINER (label_parent), hbox); | ||
60 | + gtk_widget_show (hbox); | ||
61 | + } | ||
62 | +#endif | ||
63 | |||
64 | statusbar->cursor_label = gtk_label_new ("8888, 8888"); | ||
65 | gtk_misc_set_alignment (GTK_MISC (statusbar->cursor_label), 0.5, 0.5); | ||
66 | -- | ||
67 | cgit v0.8.3.1 | ||
diff --git a/main/gimp/libpng-1.4.patch b/main/gimp/libpng-1.4.patch deleted file mode 100644 index 8f7963d232..0000000000 --- a/main/gimp/libpng-1.4.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | diff -Naur gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c gimp-2.7.0/plug-ins/file-ico/ico-load.c | ||
2 | --- gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c 2010-01-18 19:01:46.000000000 -0500 | ||
3 | +++ gimp-2.7.0/plug-ins/file-ico/ico-load.c 2010-01-18 19:14:43.000000000 -0500 | ||
4 | @@ -286,14 +286,22 @@ | ||
5 | switch (color_type) | ||
6 | { | ||
7 | case PNG_COLOR_TYPE_GRAY: | ||
8 | +#if PNG_LIBPNG_VER < 10400 | ||
9 | png_set_gray_1_2_4_to_8 (png_ptr); | ||
10 | +#else | ||
11 | + png_set_expand_gray_1_2_4_to_8(png_ptr); | ||
12 | +#endif | ||
13 | if ( bit_depth == 16 ) | ||
14 | png_set_strip_16 (png_ptr); | ||
15 | png_set_gray_to_rgb (png_ptr); | ||
16 | png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); | ||
17 | break; | ||
18 | case PNG_COLOR_TYPE_GRAY_ALPHA: | ||
19 | +#if PNG_LIBPNG_VER < 10400 | ||
20 | png_set_gray_1_2_4_to_8 (png_ptr); | ||
21 | +#else | ||
22 | + png_set_expand_gray_1_2_4_to_8(png_ptr); | ||
23 | +#endif | ||
24 | if ( bit_depth == 16 ) | ||
25 | png_set_strip_16 (png_ptr); | ||
26 | png_set_gray_to_rgb (png_ptr); | ||
diff --git a/testing/glibmm/APKBUILD b/main/glibmm/APKBUILD index e87bffa31b..e87bffa31b 100644 --- a/testing/glibmm/APKBUILD +++ b/main/glibmm/APKBUILD | |||
diff --git a/main/gnumeric/APKBUILD b/main/gnumeric/APKBUILD index 8fbcb018d6..622cdd64bc 100644 --- a/main/gnumeric/APKBUILD +++ b/main/gnumeric/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gnumeric | 2 | pkgname=gnumeric |
3 | pkgver=1.10.5 | 3 | pkgver=1.10.6 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="A GNOME Spreadsheet Program" | 5 | pkgdesc="A GNOME Spreadsheet Program" |
6 | url="http://www.gnome.org/projects/gnumeric/" | 6 | url="http://www.gnome.org/projects/gnumeric/" |
@@ -27,4 +27,4 @@ package() { | |||
27 | cd "$_builddir" | 27 | cd "$_builddir" |
28 | make -j1 DESTDIR="$pkgdir" install || return 1 | 28 | make -j1 DESTDIR="$pkgdir" install || return 1 |
29 | } | 29 | } |
30 | md5sums="157b0bde46435566122327696a44d4cb gnumeric-1.10.5.tar.bz2" | 30 | md5sums="2c83cafd6e2b69d10122d9e4343bf4ba gnumeric-1.10.6.tar.bz2" |
diff --git a/main/goffice/APKBUILD b/main/goffice/APKBUILD index 513f25f040..5172c3e471 100644 --- a/main/goffice/APKBUILD +++ b/main/goffice/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=goffice | 2 | pkgname=goffice |
3 | pkgver=0.8.5 | 3 | pkgver=0.8.6 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" | 5 | pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" |
6 | url="http://www.gnome.org" | 6 | url="http://www.gnome.org" |
@@ -26,4 +26,4 @@ package() { | |||
26 | cd "$srcdir"/$pkgname-$pkgver | 26 | cd "$srcdir"/$pkgname-$pkgver |
27 | make DESTDIR="$pkgdir" install || return 1 | 27 | make DESTDIR="$pkgdir" install || return 1 |
28 | } | 28 | } |
29 | md5sums="3dda09fa540c947d45384b53713e49d5 goffice-0.8.5.tar.bz2" | 29 | md5sums="78b749f9b6913c2995171396f5deb525 goffice-0.8.6.tar.bz2" |
diff --git a/testing/gsl/APKBUILD b/main/gsl/APKBUILD index fd4ba6ff8c..fd4ba6ff8c 100644 --- a/testing/gsl/APKBUILD +++ b/main/gsl/APKBUILD | |||
diff --git a/testing/gtkmm/APKBUILD b/main/gtkmm/APKBUILD index 6268ca0a3d..6268ca0a3d 100644 --- a/testing/gtkmm/APKBUILD +++ b/main/gtkmm/APKBUILD | |||
diff --git a/testing/inkscape/50-poppler-API.patch b/main/inkscape/50-poppler-API.patch index b97969de1d..b97969de1d 100644 --- a/testing/inkscape/50-poppler-API.patch +++ b/main/inkscape/50-poppler-API.patch | |||
diff --git a/testing/inkscape/APKBUILD b/main/inkscape/APKBUILD index d8c5f2452f..d8c5f2452f 100644 --- a/testing/inkscape/APKBUILD +++ b/main/inkscape/APKBUILD | |||
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index 6ca2999109..1e9a11ca4c 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=iproute2 | 2 | pkgname=iproute2 |
3 | pkgver=2.6.33 | 3 | pkgver=2.6.34 |
4 | _realver=2.6.33 | 4 | _realver=2.6.33 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="IP Routing Utilities" | 6 | pkgdesc="IP Routing Utilities" |
7 | url="http://www.linux-foundation.org/en/Net:Iproute2" | 7 | url="http://www.linux-foundation.org/en/Net:Iproute2" |
8 | license="GPL2" | 8 | license="GPL2" |
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD index 836131ddb3..ef9488d977 100644 --- a/main/iptables/APKBUILD +++ b/main/iptables/APKBUILD | |||
@@ -2,8 +2,8 @@ | |||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | 3 | ||
4 | pkgname=iptables | 4 | pkgname=iptables |
5 | pkgver=1.4.7 | 5 | pkgver=1.4.8 |
6 | pkgrel=1 | 6 | pkgrel=0 |
7 | pkgdesc="Linux kernel firewall, NAT and packet mangling tools" | 7 | pkgdesc="Linux kernel firewall, NAT and packet mangling tools" |
8 | url="http://www.iptables.org/" | 8 | url="http://www.iptables.org/" |
9 | license=GPL-2 | 9 | license=GPL-2 |
@@ -64,7 +64,7 @@ ip6tables() { | |||
64 | "$subpkgdir"/etc/init.d/ip6tables | 64 | "$subpkgdir"/etc/init.d/ip6tables |
65 | } | 65 | } |
66 | 66 | ||
67 | md5sums="645941dd1f9e0ec1f74c61918d70d52f iptables-1.4.7.tar.bz2 | 67 | md5sums="697ed89f37af4473a5f6349ba2700f2d iptables-1.4.8.tar.bz2 |
68 | ec3e80a1b0ea3e13e4e60824b7ebd1b9 iptables-1.4.2-include-in.patch | 68 | ec3e80a1b0ea3e13e4e60824b7ebd1b9 iptables-1.4.2-include-in.patch |
69 | 2202ac150a5dfe32a8363b0ad565ee1d iptables.initd | 69 | 2202ac150a5dfe32a8363b0ad565ee1d iptables.initd |
70 | 956ebf5ab69e5a1e1d3983541eab643b iptables.confd" | 70 | 956ebf5ab69e5a1e1d3983541eab643b iptables.confd" |
diff --git a/testing/lcms/APKBUILD b/main/lcms/APKBUILD index 7d3d4ca994..7d3d4ca994 100644 --- a/testing/lcms/APKBUILD +++ b/main/lcms/APKBUILD | |||
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD index 714b7cf2dd..a148048832 100644 --- a/main/lftp/APKBUILD +++ b/main/lftp/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> | 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> |
2 | # Maintainer: Carlo Landmeter <clandmeter@gmail.com> | 2 | # Maintainer: Carlo Landmeter <clandmeter@gmail.com> |
3 | pkgname=lftp | 3 | pkgname=lftp |
4 | pkgver=4.0.7 | 4 | pkgver=4.0.9 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="LFTP is sophisticated ftp/http client" | 6 | pkgdesc="LFTP is sophisticated ftp/http client" |
7 | url="http://lftp.yar.ru/" | 7 | url="http://lftp.yar.ru/" |
8 | license="GPL" | 8 | license="GPL" |
@@ -31,4 +31,4 @@ package() { | |||
31 | make -j1 DESTDIR="$pkgdir" install | 31 | make -j1 DESTDIR="$pkgdir" install |
32 | } | 32 | } |
33 | 33 | ||
34 | md5sums="a40e4518fc477c82ffcc5b04d9ff64ff lftp-4.0.7.tar.bz2" | 34 | md5sums="d3f0cd7569e31e50370208dd77a7c41b lftp-4.0.9.tar.bz2" |
diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD index 9138bbf45c..3ac9e06472 100644 --- a/main/libdrm/APKBUILD +++ b/main/libdrm/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libdrm | 2 | pkgname=libdrm |
3 | pkgver=2.4.20 | 3 | pkgver=2.4.21 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Userspace interface to kernel DRM services" | 5 | pkgdesc="Userspace interface to kernel DRM services" |
6 | url="http://dri.freedesktop.org/" | 6 | url="http://dri.freedesktop.org/" |
7 | license="custom" | 7 | license="custom" |
@@ -20,4 +20,4 @@ package() { | |||
20 | cd "$srcdir"/$pkgname-$pkgver | 20 | cd "$srcdir"/$pkgname-$pkgver |
21 | make DESTDIR="$pkgdir" install || return 1 | 21 | make DESTDIR="$pkgdir" install || return 1 |
22 | } | 22 | } |
23 | md5sums="3c56e03172b236e14905ef9a68ba2f97 libdrm-2.4.20.tar.bz2" | 23 | md5sums="273ed9dad986e3a931649f3d8762ff74 libdrm-2.4.21.tar.bz2" |
diff --git a/main/libresample/APKBUILD b/main/libresample/APKBUILD new file mode 100644 index 0000000000..f45036781c --- /dev/null +++ b/main/libresample/APKBUILD | |||
@@ -0,0 +1,43 @@ | |||
1 | # Contributor: | ||
2 | # Maintainer: | ||
3 | pkgname=libresample | ||
4 | pkgver=0.1.3 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="real-time library for sampling rate conversion" | ||
7 | url="https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html" | ||
8 | license="GPL" | ||
9 | depends= | ||
10 | makedepends="wget" | ||
11 | install= | ||
12 | subpackages= | ||
13 | source="https://ccrma.stanford.edu/~jos/gz/libresample-$pkgver.tgz" | ||
14 | |||
15 | # append extra dependencies to -dev subpackage | ||
16 | # remove if not used. | ||
17 | # depends_dev="somepackage-dev" | ||
18 | |||
19 | _builddir="$srcdir"/$pkgname-$pkgver | ||
20 | |||
21 | prepare() { | ||
22 | cd "$_builddir" | ||
23 | # apply patches here | ||
24 | } | ||
25 | |||
26 | build() { | ||
27 | cd "$_builddir" | ||
28 | ./configure --prefix=/usr \ | ||
29 | --sysconfdir=/etc \ | ||
30 | --mandir=/usr/share/man \ | ||
31 | --infodir=/usr/share/info | ||
32 | make || return 1 | ||
33 | } | ||
34 | |||
35 | package() { | ||
36 | cd "$_builddir" | ||
37 | install -d "$pkgdir"/usr/include "$pkgdir"/usr/lib | ||
38 | install -m644 include/libresample.h "$pkgdir"/usr/include/ | ||
39 | install -m644 libresample.a "$pkgdir"/usr/lib/ | ||
40 | |||
41 | } | ||
42 | |||
43 | md5sums="99bc5ea15ef76b83e5655a10968f674b libresample-0.1.3.tgz" | ||
diff --git a/testing/libsigc++/APKBUILD b/main/libsigc++/APKBUILD index 0329b63ae2..0329b63ae2 100644 --- a/testing/libsigc++/APKBUILD +++ b/main/libsigc++/APKBUILD | |||
diff --git a/main/libsoup/APKBUILD b/main/libsoup/APKBUILD index 66a25b5af6..1728569a1e 100644 --- a/main/libsoup/APKBUILD +++ b/main/libsoup/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libsoup | 2 | pkgname=libsoup |
3 | pkgver=2.30.1 | 3 | pkgver=2.30.2 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Gnome HTTP Library" | 5 | pkgdesc="Gnome HTTP Library" |
6 | url="http://www.gnome.org" | 6 | url="http://www.gnome.org" |
@@ -27,4 +27,4 @@ package() { | |||
27 | cd "$srcdir"/$pkgname-$pkgver | 27 | cd "$srcdir"/$pkgname-$pkgver |
28 | make DESTDIR="$pkgdir" install || return 1 | 28 | make DESTDIR="$pkgdir" install || return 1 |
29 | } | 29 | } |
30 | md5sums="d80fb560a72370fba347785b00a750fb libsoup-2.30.1.tar.bz2" | 30 | md5sums="f33b62063e76a9b1d5503363a3ed6a84 libsoup-2.30.2.tar.bz2" |
diff --git a/main/libtool/APKBUILD b/main/libtool/APKBUILD index 6741c58dfd..8511a60c1f 100644 --- a/main/libtool/APKBUILD +++ b/main/libtool/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: judd <jvinet@zeroflux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libtool | 2 | pkgname=libtool |
3 | pkgver=2.2.6b | 3 | pkgver=2.2.10 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="A generic library support script" | 5 | pkgdesc="A generic library support script" |
6 | license='GPL' | 6 | license='GPL' |
7 | url="http://www.gnu.org/software/libtool" | 7 | url="http://www.gnu.org/software/libtool" |
@@ -26,4 +26,4 @@ libltdl() { | |||
26 | mv "$pkgdir/usr/lib/libltdl.so"* "$subpkgdir/usr/lib/" | 26 | mv "$pkgdir/usr/lib/libltdl.so"* "$subpkgdir/usr/lib/" |
27 | } | 27 | } |
28 | 28 | ||
29 | md5sums="07da460450490148c6d2df0f21481a25 libtool-2.2.6b.tar.gz" | 29 | md5sums="b745d220e88163fcd9eea0a90ccf21b0 libtool-2.2.10.tar.gz" |
diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD index a9146298d1..e578bf5ed8 100644 --- a/main/libusb/APKBUILD +++ b/main/libusb/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libusb | 2 | pkgname=libusb |
3 | pkgver=1.0.1 | 3 | pkgver=1.0.8 |
4 | pkgrel=1 | 4 | pkgrel=1 |
5 | pkgdesc="Library to enable user space application programs to communicate with USB devices" | 5 | pkgdesc="Library to enable user space application programs to communicate with USB devices" |
6 | url="http://libusb.sourceforge.net/" | 6 | url="http://libusb.sourceforge.net/" |
@@ -17,4 +17,4 @@ build () | |||
17 | make || return 1 | 17 | make || return 1 |
18 | make DESTDIR="$pkgdir" install | 18 | make DESTDIR="$pkgdir" install |
19 | } | 19 | } |
20 | md5sums="8fb0e066678a0d294894b5b2969cb4b3 libusb-1.0.1.tar.bz2" | 20 | md5sums="37d34e6eaa69a4b645a19ff4ca63ceef libusb-1.0.8.tar.bz2" |
diff --git a/main/libwnck/APKBUILD b/main/libwnck/APKBUILD index b6977f82eb..9a9629e06e 100644 --- a/main/libwnck/APKBUILD +++ b/main/libwnck/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libwnck | 2 | pkgname=libwnck |
3 | pkgver=2.30.0 | 3 | pkgver=2.30.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Window Navigator Construction Kit" | 5 | pkgdesc="Window Navigator Construction Kit" |
6 | url="http://www.gnome.org/" | 6 | url="http://www.gnome.org/" |
7 | license="LGPL" | 7 | license="LGPL" |
@@ -28,4 +28,4 @@ package() { | |||
28 | cd "$_builddir" | 28 | cd "$_builddir" |
29 | make DESTDIR="$pkgdir" install || return 1 | 29 | make DESTDIR="$pkgdir" install || return 1 |
30 | } | 30 | } |
31 | md5sums="ed79955dabb606ee0e6d112a291005ad libwnck-2.30.0.tar.bz2" | 31 | md5sums="f58a82c97cc1dd95d9c56bbef3649a92 libwnck-2.30.2.tar.bz2" |
diff --git a/main/libxcomposite/APKBUILD b/main/libxcomposite/APKBUILD index cad8427388..b858bc4d32 100644 --- a/main/libxcomposite/APKBUILD +++ b/main/libxcomposite/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libxcomposite | 2 | pkgname=libxcomposite |
3 | pkgver=0.4.1 | 3 | pkgver=0.4.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="X11 Composite extension library" | 5 | pkgdesc="X11 Composite extension library" |
6 | url="http://xorg.freedesktop.org/" | 6 | url="http://xorg.freedesktop.org/" |
7 | license="custom" | 7 | license="custom" |
@@ -11,14 +11,18 @@ makedepends="pkgconfig libxfixes-dev libxext-dev compositeproto" | |||
11 | source="http://xorg.freedesktop.org//releases/individual/lib/libXcomposite-$pkgver.tar.bz2" | 11 | source="http://xorg.freedesktop.org//releases/individual/lib/libXcomposite-$pkgver.tar.bz2" |
12 | 12 | ||
13 | depends_dev="xproto compositeproto libxfixes-dev libx11-dev libxext-dev" | 13 | depends_dev="xproto compositeproto libxfixes-dev libx11-dev libxext-dev" |
14 | build () | 14 | _builddir="$srcdir"/libXcomposite-$pkgver |
15 | { | 15 | build() { |
16 | cd "$srcdir"/libXcomposite-$pkgver | 16 | cd "$_builddir" |
17 | ./configure --prefix=/usr \ | 17 | ./configure --prefix=/usr \ |
18 | --sysconfdir=/etc | 18 | --sysconfdir=/etc |
19 | make || return 1 | 19 | make || return 1 |
20 | } | ||
21 | |||
22 | package() { | ||
23 | cd "$_builddir" | ||
20 | make DESTDIR="$pkgdir" install || return 1 | 24 | make DESTDIR="$pkgdir" install || return 1 |
21 | install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE | 25 | install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE |
22 | } | 26 | } |
23 | 27 | ||
24 | md5sums="0f1367f57fdf5df17a8dd71d0fa68248 libXcomposite-0.4.1.tar.bz2" | 28 | md5sums="e38dc98509149083f6c31b49b484e63c libXcomposite-0.4.2.tar.bz2" |
diff --git a/main/libxdamage/APKBUILD b/main/libxdamage/APKBUILD index 338e425c73..80e759ddf6 100644 --- a/main/libxdamage/APKBUILD +++ b/main/libxdamage/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libxdamage | 2 | pkgname=libxdamage |
3 | pkgver=1.1.2 | 3 | pkgver=1.1.3 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="X11 damaged region extension library" | 5 | pkgdesc="X11 damaged region extension library" |
6 | url="http://xorg.freedesktop.org/" | 6 | url="http://xorg.freedesktop.org/" |
7 | license="custom" | 7 | license="custom" |
@@ -21,4 +21,4 @@ package() { | |||
21 | cd "$srcdir"/libXdamage-$pkgver | 21 | cd "$srcdir"/libXdamage-$pkgver |
22 | make DESTDIR="$pkgdir" install || return 1 | 22 | make DESTDIR="$pkgdir" install || return 1 |
23 | } | 23 | } |
24 | md5sums="b42780bce703ec202a33e5693991c09d libXdamage-1.1.2.tar.bz2" | 24 | md5sums="44774e1a065158b52f1a0da5100cebec libXdamage-1.1.3.tar.bz2" |
diff --git a/main/libxfixes/APKBUILD b/main/libxfixes/APKBUILD index 6e15f2c154..aa11ca86f8 100644 --- a/main/libxfixes/APKBUILD +++ b/main/libxfixes/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libxfixes | 2 | pkgname=libxfixes |
3 | pkgver=4.0.4 | 3 | pkgver=4.0.5 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="X11 miscellaneous 'fixes' extension library" | 5 | pkgdesc="X11 miscellaneous 'fixes' extension library" |
6 | url="http://xorg.freedesktop.org/" | 6 | url="http://xorg.freedesktop.org/" |
7 | license="custom" | 7 | license="custom" |
@@ -11,10 +11,15 @@ subpackages="$pkgname-dev $pkgname-doc" | |||
11 | source="http://xorg.freedesktop.org/releases/individual/lib/libXfixes-$pkgver.tar.bz2" | 11 | source="http://xorg.freedesktop.org/releases/individual/lib/libXfixes-$pkgver.tar.bz2" |
12 | 12 | ||
13 | depends_dev="xproto fixesproto libx11-dev" | 13 | depends_dev="xproto fixesproto libx11-dev" |
14 | _builddir="$srcdir"/libXfixes-$pkgver | ||
14 | build() { | 15 | build() { |
15 | cd "$srcdir"/libXfixes-$pkgver | 16 | cd "$_builddir" |
16 | ./configure --prefix=/usr --sysconfdir=/etc --build=${CHOST} --host=${CHOST} | 17 | ./configure --prefix=/usr --sysconfdir=/etc --build=${CHOST} --host=${CHOST} |
17 | make || return 1 | 18 | make || return 1 |
19 | } | ||
20 | |||
21 | package() { | ||
22 | cd "$_builddir" | ||
18 | make DESTDIR="$pkgdir" install || return 1 | 23 | make DESTDIR="$pkgdir" install || return 1 |
19 | } | 24 | } |
20 | md5sums="7f2c40852eb337b237ad944ca5c30d49 libXfixes-4.0.4.tar.bz2" | 25 | md5sums="1b4b8386bd5d1751b2c7177223ad4629 libXfixes-4.0.5.tar.bz2" |
diff --git a/main/libxfont/APKBUILD b/main/libxfont/APKBUILD index 3ce3622ef8..5dd3992765 100644 --- a/main/libxfont/APKBUILD +++ b/main/libxfont/APKBUILD | |||
@@ -1,12 +1,12 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libxfont | 2 | pkgname=libxfont |
3 | pkgver=1.4.1 | 3 | pkgver=1.4.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="X11 font rasterisation library" | 5 | pkgdesc="X11 font rasterisation library" |
6 | url="http://xorg.freedesktop.org/" | 6 | url="http://xorg.freedesktop.org/" |
7 | license="custom" | 7 | license="custom" |
8 | subpackages="$pkgname-dev $pkgname-doc" | 8 | subpackages="$pkgname-dev $pkgname-doc" |
9 | depends="libfontenc freetype zlib" | 9 | depends= |
10 | makedepends="pkgconfig libfontenc-dev freetype-dev fontsproto xproto xtrans | 10 | makedepends="pkgconfig libfontenc-dev freetype-dev fontsproto xproto xtrans |
11 | zlib-dev" | 11 | zlib-dev" |
12 | source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.bz2" | 12 | source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.bz2" |
@@ -17,7 +17,11 @@ build() { | |||
17 | cd "$srcdir"/libXfont-$pkgver | 17 | cd "$srcdir"/libXfont-$pkgver |
18 | ./configure --prefix=/usr --sysconfdir=/etc || return 1 | 18 | ./configure --prefix=/usr --sysconfdir=/etc || return 1 |
19 | make || return 1 | 19 | make || return 1 |
20 | } | ||
21 | |||
22 | package() { | ||
23 | cd "$srcdir"/libXfont-$pkgver | ||
20 | make DESTDIR="$pkgdir" install || return 1 | 24 | make DESTDIR="$pkgdir" install || return 1 |
21 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING | 25 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING |
22 | } | 26 | } |
23 | md5sums="4f2bed2a2be82e90a51a24bb3a22cdf0 libXfont-1.4.1.tar.bz2" | 27 | md5sums="503911759734998f9235b926eed82eb8 libXfont-1.4.2.tar.bz2" |
diff --git a/main/libxrender/APKBUILD b/main/libxrender/APKBUILD index 293610e2a4..42944d431e 100644 --- a/main/libxrender/APKBUILD +++ b/main/libxrender/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=libxrender | 2 | pkgname=libxrender |
3 | pkgver=0.9.5 | 3 | pkgver=0.9.6 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="X Rendering Extension client library" | 5 | pkgdesc="X Rendering Extension client library" |
6 | url="http://xorg.freedesktop.org/" | 6 | url="http://xorg.freedesktop.org/" |
7 | license="custom" | 7 | license="custom" |
@@ -21,4 +21,4 @@ package() { | |||
21 | cd "$srcdir"/libXrender-$pkgver | 21 | cd "$srcdir"/libXrender-$pkgver |
22 | make DESTDIR="$pkgdir" install || return 1 | 22 | make DESTDIR="$pkgdir" install || return 1 |
23 | } | 23 | } |
24 | md5sums="276dd9e85daf0680616cd9f132b354c9 libXrender-0.9.5.tar.bz2" | 24 | md5sums="3b3b7d076c2384b6c600c0b5f4ba971f libXrender-0.9.6.tar.bz2" |
diff --git a/main/linux-grsec/0020-xfrm-check-bundle-policy-existance-before-dereferencing-it.patch b/main/linux-grsec/0020-xfrm-check-bundle-policy-existance-before-dereferencing-it.patch new file mode 100644 index 0000000000..1a962e1610 --- /dev/null +++ b/main/linux-grsec/0020-xfrm-check-bundle-policy-existance-before-dereferencing-it.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From patchwork Thu Jun 24 05:45:19 2010 | ||
2 | Content-Type: text/plain; charset="utf-8" | ||
3 | MIME-Version: 1.0 | ||
4 | Content-Transfer-Encoding: 8bit | ||
5 | Subject: xfrm: check bundle policy existance before dereferencing it | ||
6 | Date: Wed, 23 Jun 2010 19:45:19 -0000 | ||
7 | From: =?utf-8?b?VGltbyBUZXLDpHMgPHRpbW8udGVyYXNAaWtpLmZpPg==?= | ||
8 | X-Patchwork-Id: 56759 | ||
9 | Message-Id: <1277358319-9868-1-git-send-email-timo.teras@iki.fi> | ||
10 | To: netdev@vger.kernel.org, "Justin P. Mattock" <justinmattock@gmail.com>, | ||
11 | Eric Dumazet <eric.dumazet@gmail.com>, | ||
12 | "John W.Linville" <linville@tuxdriver.com>, | ||
13 | Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, | ||
14 | davem@davemloft.net | ||
15 | Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
16 | |||
17 | Fix the bundle validation code to not assume having a valid policy. | ||
18 | When we have multiple transformations for a xfrm policy, the bundle | ||
19 | instance will be a chain of bundles with only the first one having | ||
20 | the policy reference. When policy_genid is bumped it will expire the | ||
21 | first bundle in the chain which is equivalent of expiring the whole | ||
22 | chain. | ||
23 | |||
24 | Reported-bisected-and-tested-by: Justin P. Mattock <justinmattock@gmail.com> | ||
25 | Signed-off-by: Timo Teräs <timo.teras@iki.fi> | ||
26 | |||
27 | --- | ||
28 | net/xfrm/xfrm_policy.c | 3 ++- | ||
29 | 1 files changed, 2 insertions(+), 1 deletions(-) | ||
30 | |||
31 | diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c | ||
32 | index 4bf27d9..af1c173 100644 | ||
33 | --- a/net/xfrm/xfrm_policy.c | ||
34 | +++ b/net/xfrm/xfrm_policy.c | ||
35 | @@ -2300,7 +2300,8 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first, | ||
36 | return 0; | ||
37 | if (xdst->xfrm_genid != dst->xfrm->genid) | ||
38 | return 0; | ||
39 | - if (xdst->policy_genid != atomic_read(&xdst->pols[0]->genid)) | ||
40 | + if (xdst->num_pols > 0 && | ||
41 | + xdst->policy_genid != atomic_read(&xdst->pols[0]->genid)) | ||
42 | return 0; | ||
43 | |||
44 | if (strict && fl && | ||
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 955e28e42d..cb94b01364 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -4,7 +4,7 @@ _flavor=grsec | |||
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.32.15 | 5 | pkgver=2.6.32.15 |
6 | _kernver=2.6.32 | 6 | _kernver=2.6.32 |
7 | pkgrel=7 | 7 | pkgrel=8 |
8 | pkgdesc="Linux kernel with grsecurity" | 8 | pkgdesc="Linux kernel with grsecurity" |
9 | url=http://grsecurity.net | 9 | url=http://grsecurity.net |
10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
@@ -31,6 +31,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | |||
31 | 0017-flow-delayed-deletion-of-flow-cache-entries.patch | 31 | 0017-flow-delayed-deletion-of-flow-cache-entries.patch |
32 | 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | 32 | 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch |
33 | 0019-ipv4-check-rt_genid-in-dst_check.patch | 33 | 0019-ipv4-check-rt_genid-in-dst_check.patch |
34 | 0020-xfrm-check-bundle-policy-existance-before-dereferencing-it.patch | ||
34 | xfrm-fix-policy-unreferencing-on-larval-drop.patch | 35 | xfrm-fix-policy-unreferencing-on-larval-drop.patch |
35 | r8169-fix-random-mdio_write-failures.patch | 36 | r8169-fix-random-mdio_write-failures.patch |
36 | r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | 37 | r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch |
@@ -164,6 +165,7 @@ c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-fo | |||
164 | 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch | 165 | 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch |
165 | 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | 166 | 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch |
166 | 74e511f12854972db08d3fddc4df0f52 0019-ipv4-check-rt_genid-in-dst_check.patch | 167 | 74e511f12854972db08d3fddc4df0f52 0019-ipv4-check-rt_genid-in-dst_check.patch |
168 | edfac5844f91721d49a00a09b6ef258b 0020-xfrm-check-bundle-policy-existance-before-dereferencing-it.patch | ||
167 | c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch | 169 | c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch |
168 | ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch | 170 | ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch |
169 | b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | 171 | b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch |
diff --git a/testing/lua-lgob/APKBUILD b/main/lua-lgob/APKBUILD index 17a38eaa3e..17a38eaa3e 100644 --- a/testing/lua-lgob/APKBUILD +++ b/main/lua-lgob/APKBUILD | |||
diff --git a/main/mpfr/APKBUILD b/main/mpfr3/APKBUILD index e2d92d1299..54e07b2832 100644 --- a/main/mpfr/APKBUILD +++ b/main/mpfr3/APKBUILD | |||
@@ -1,24 +1,25 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=mpfr | 2 | pkgname=mpfr3 |
3 | pkgver=2.4.2 | 3 | pkgver=3.0.0 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="multiple-precision floating-point library" | 5 | pkgdesc="multiple-precision floating-point library" |
6 | url="http://www.mpfr.org/" | 6 | url="http://www.mpfr.org/" |
7 | license="GPL LGPL" | 7 | license="GPL LGPL" |
8 | depends= | 8 | depends= |
9 | makedepends="gmp5-dev texinfo" | 9 | makedepends="gmp5-dev texinfo" |
10 | source="http://www.mpfr.org/mpfr-current/mpfr-$pkgver.tar.bz2" | 10 | source="http://www.mpfr.org/mpfr-current/mpfr-$pkgver.tar.bz2" |
11 | subpackages="$pkgname-doc $pkgname-dev" | 11 | subpackages="$pkgname-doc mpfr-dev:dev" |
12 | 12 | ||
13 | _builddir="$srcdir"/mpfr-$pkgver | ||
13 | build() { | 14 | build() { |
14 | cd "$srcdir"/$pkgname-$pkgver | 15 | cd "$_builddir" |
15 | ./configure --prefix=/usr \ | 16 | ./configure --prefix=/usr \ |
16 | --enable-shared || return 1; | 17 | --enable-shared || return 1; |
17 | make || return 1; | 18 | make || return 1; |
18 | } | 19 | } |
19 | 20 | ||
20 | package() { | 21 | package() { |
21 | cd "$srcdir"/$pkgname-$pkgver | 22 | cd "$_builddir" |
22 | make DESTDIR="${pkgdir}" install || return 1; | 23 | make DESTDIR="${pkgdir}" install || return 1; |
23 | } | 24 | } |
24 | 25 | ||
@@ -26,4 +27,4 @@ dev() { | |||
26 | replaces=mpfr | 27 | replaces=mpfr |
27 | default_dev | 28 | default_dev |
28 | } | 29 | } |
29 | md5sums="89e59fe665e2b3ad44a6789f40b059a0 mpfr-2.4.2.tar.bz2" | 30 | md5sums="f45bac3584922c8004a10060ab1a8f9f mpfr-3.0.0.tar.bz2" |
diff --git a/main/nrpe/APKBUILD b/main/nrpe/APKBUILD index 6b50416780..d78e894fb1 100644 --- a/main/nrpe/APKBUILD +++ b/main/nrpe/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: | 2 | # Maintainer: |
3 | pkgname=nrpe | 3 | pkgname=nrpe |
4 | pkgver=2.12 | 4 | pkgver=2.12 |
5 | pkgrel=4 | 5 | pkgrel=5 |
6 | pkgusers="nagios" | 6 | pkgusers="nagios" |
7 | pkggroups="nagios" | 7 | pkggroups="nagios" |
8 | pkgdesc="NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines." | 8 | pkgdesc="NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines." |
@@ -13,7 +13,8 @@ makedepends="openssl-dev perl" | |||
13 | install="nrpe.pre-install" | 13 | install="nrpe.pre-install" |
14 | subpackages= | 14 | subpackages= |
15 | source="http://downloads.sourceforge.net/nagios/$pkgname-$pkgver.tar.gz | 15 | source="http://downloads.sourceforge.net/nagios/$pkgname-$pkgver.tar.gz |
16 | nrpe.initd" | 16 | nrpe.initd |
17 | nrpe.confd" | ||
17 | 18 | ||
18 | build() { | 19 | build() { |
19 | cd "$srcdir"/$pkgname-$pkgver | 20 | cd "$srcdir"/$pkgname-$pkgver |
@@ -29,8 +30,10 @@ build() { | |||
29 | package() { | 30 | package() { |
30 | cd "$srcdir"/$pkgname-$pkgver | 31 | cd "$srcdir"/$pkgname-$pkgver |
31 | make DESTDIR="$pkgdir" install install-daemon-config | 32 | make DESTDIR="$pkgdir" install install-daemon-config |
32 | install -Dm755 ../nrpe.initd "$pkgdir"/etc/init.d/nrpe | 33 | install -Dm755 "$srcdir"/nrpe.initd "$pkgdir"/etc/init.d/nrpe |
34 | install -Dm644 "$srcdir"/nrpe.confd "$pkgdir"/etc/conf.d/nrpe | ||
33 | } | 35 | } |
34 | 36 | ||
35 | md5sums="b2d75e2962f1e3151ef58794d60c9e97 nrpe-2.12.tar.gz | 37 | md5sums="b2d75e2962f1e3151ef58794d60c9e97 nrpe-2.12.tar.gz |
36 | a1e3fbbfdd46437f7385742d49d5eb85 nrpe.initd" | 38 | 3263044303bbfdfbbc8127cfa991ab51 nrpe.initd |
39 | 6bd25a1ace9e108c5014a83adcad15b3 nrpe.confd" | ||
diff --git a/main/nrpe/nrpe.confd b/main/nrpe/nrpe.confd new file mode 100644 index 0000000000..18cd229511 --- /dev/null +++ b/main/nrpe/nrpe.confd | |||
@@ -0,0 +1,2 @@ | |||
1 | # override the default options. | ||
2 | # nrpe_options="-c /etc/nrpe.cfg" | ||
diff --git a/main/nrpe/nrpe.initd b/main/nrpe/nrpe.initd index 0bff759cee..92fe3837ee 100644 --- a/main/nrpe/nrpe.initd +++ b/main/nrpe/nrpe.initd | |||
@@ -22,7 +22,7 @@ start() { | |||
22 | ebegin "Starting NRPE" | 22 | ebegin "Starting NRPE" |
23 | start-stop-daemon --start --quiet \ | 23 | start-stop-daemon --start --quiet \ |
24 | --pidfile $pidfile \ | 24 | --pidfile $pidfile \ |
25 | --exec $daemon -- ${nrpe_options:- -c $conf -d} | 25 | --exec $daemon -- -d ${nrpe_options:- -c $conf} |
26 | eend $? | 26 | eend $? |
27 | } | 27 | } |
28 | 28 | ||
diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD index 9a2e0006ec..ac65b9a8ab 100644 --- a/main/ntfs-3g/APKBUILD +++ b/main/ntfs-3g/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> | 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=ntfs-3g | 3 | pkgname=ntfs-3g |
4 | pkgver=2010.5.16 | 4 | pkgver=2010.5.22 |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="A userspace ntfs driver with write support" | 6 | pkgdesc="A userspace ntfs driver with write support" |
7 | url="http://www.tuxera.com/community/ntfs-3g-download/" | 7 | url="http://www.tuxera.com/community/ntfs-3g-download/" |
@@ -27,4 +27,4 @@ package() { | |||
27 | 27 | ||
28 | } | 28 | } |
29 | 29 | ||
30 | md5sums="aeff7659a4943c9223d79116f051a863 ntfs-3g-2010.5.16.tgz" | 30 | md5sums="caa08c73220a7106c76f697b7a7915ec ntfs-3g-2010.5.22.tgz" |
diff --git a/main/pango/APKBUILD b/main/pango/APKBUILD index c941679c00..af0acb401a 100644 --- a/main/pango/APKBUILD +++ b/main/pango/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=pango | 2 | pkgname=pango |
3 | pkgver=1.28.0 | 3 | pkgver=1.28.1 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="A library for layout and rendering of text" | 5 | pkgdesc="A library for layout and rendering of text" |
6 | url="http://www.pango.org/" | 6 | url="http://www.pango.org/" |
7 | license="LGPL" | 7 | license="LGPL" |
@@ -33,4 +33,4 @@ dev() { | |||
33 | mv "$pkgdir"/usr/share/gir* "$subpkgdir"/usr/share/ | 33 | mv "$pkgdir"/usr/share/gir* "$subpkgdir"/usr/share/ |
34 | } | 34 | } |
35 | 35 | ||
36 | md5sums="545ae8becf7ed74008120f96f4b095f4 pango-1.28.0.tar.bz2" | 36 | md5sums="bab5b4eb3fde6b0a5bfe98d25e668741 pango-1.28.1.tar.bz2" |
diff --git a/testing/pangomm/APKBUILD b/main/pangomm/APKBUILD index e4ff082e49..e4ff082e49 100644 --- a/testing/pangomm/APKBUILD +++ b/main/pangomm/APKBUILD | |||
diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD index 2bf6e95f8a..ab0b3d0c9d 100644 --- a/main/parted/APKBUILD +++ b/main/parted/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=parted | 2 | pkgname=parted |
3 | pkgver=2.2 | 3 | pkgver=2.3 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Utility to create, destroy, resize, check and copy partitions" | 5 | pkgdesc="Utility to create, destroy, resize, check and copy partitions" |
6 | url="http://www.gnu.org/software/parted/parted.html" | 6 | url="http://www.gnu.org/software/parted/parted.html" |
7 | license="GPL3" | 7 | license="GPL3" |
@@ -24,4 +24,4 @@ package() { | |||
24 | cd "$_builddir" | 24 | cd "$_builddir" |
25 | make DESTDIR="$pkgdir" install | 25 | make DESTDIR="$pkgdir" install |
26 | } | 26 | } |
27 | md5sums="9c262afd6673d7724a60b7c632ce80fa parted-2.2.tar.gz" | 27 | md5sums="30ceb6df7e8681891e865e2fe5a7903d parted-2.3.tar.gz" |
diff --git a/main/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD index a5afa81ea5..f6db904d4c 100644 --- a/main/pcmciautils/APKBUILD +++ b/main/pcmciautils/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=pcmciautils | 2 | pkgname=pcmciautils |
3 | pkgver=016 | 3 | pkgver=017 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Utilities for inserting and removing PCMCIA cards" | 5 | pkgdesc="Utilities for inserting and removing PCMCIA cards" |
6 | url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" | 6 | url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" |
7 | license="GPL" | 7 | license="GPL" |
@@ -21,4 +21,4 @@ package() { | |||
21 | make DESTDIR="$pkgdir"/ install | 21 | make DESTDIR="$pkgdir"/ install |
22 | ln -sf pccardctl "$pkgdir"/sbin/lspcmcia | 22 | ln -sf pccardctl "$pkgdir"/sbin/lspcmcia |
23 | } | 23 | } |
24 | md5sums="93828a89c22a1d45a46c6dede63632cd pcmciautils-016.tar.bz2" | 24 | md5sums="5245af28eeba57ec0606a874d44d10f7 pcmciautils-017.tar.bz2" |
diff --git a/main/poppler-gtk/APKBUILD b/main/poppler-gtk/APKBUILD index 81e9c6f967..208054fa24 100644 --- a/main/poppler-gtk/APKBUILD +++ b/main/poppler-gtk/APKBUILD | |||
@@ -2,10 +2,16 @@ | |||
2 | 2 | ||
3 | # this aport only includes glib/gtk support in order to break the | 3 | # this aport only includes glib/gtk support in order to break the |
4 | # circular make dependency: gtk <- cups <- poppler <- gtk | 4 | # circular make dependency: gtk <- cups <- poppler <- gtk |
5 | |||
6 | # get the pkgver from poppler | ||
7 | if [ -r ../poppler/APKBUILD ]; then | ||
8 | . ../poppler/APKBUILD | ||
9 | fi | ||
10 | |||
5 | pkgname=poppler-gtk | 11 | pkgname=poppler-gtk |
6 | _realname=poppler | 12 | _realname=poppler |
7 | pkgver=0.12.4 | 13 | pkgver=$pkgver |
8 | pkgrel=1 | 14 | pkgrel=0 |
9 | pkgdesc="PDF rendering library based on xpdf 3.0" | 15 | pkgdesc="PDF rendering library based on xpdf 3.0" |
10 | url="http://poppler.freedesktop.org/" | 16 | url="http://poppler.freedesktop.org/" |
11 | license="GPL" | 17 | license="GPL" |
@@ -17,6 +23,10 @@ replaces="poppler-glib" | |||
17 | depends_dev="cairo-dev glib-dev gtk+-dev poppler-dev" | 23 | depends_dev="cairo-dev glib-dev gtk+-dev poppler-dev" |
18 | source="http://poppler.freedesktop.org/poppler-$pkgver.tar.gz" | 24 | source="http://poppler.freedesktop.org/poppler-$pkgver.tar.gz" |
19 | 25 | ||
26 | prepare() { | ||
27 | return 0 | ||
28 | } | ||
29 | |||
20 | build() { | 30 | build() { |
21 | cd "$srcdir"/$_realname-$pkgver | 31 | cd "$srcdir"/$_realname-$pkgver |
22 | ./configure --prefix=/usr \ | 32 | ./configure --prefix=/usr \ |
@@ -34,9 +44,13 @@ build() { | |||
34 | --disable-utils \ | 44 | --disable-utils \ |
35 | || return 1 | 45 | || return 1 |
36 | make || return 1 | 46 | make || return 1 |
47 | } | ||
48 | |||
49 | package() { | ||
50 | cd "$srcdir"/$_realname-$pkgver | ||
37 | install -D -m644 poppler-glib.pc "$pkgdir"/usr/lib/pkgconfig/poppler-glib.pc | 51 | install -D -m644 poppler-glib.pc "$pkgdir"/usr/lib/pkgconfig/poppler-glib.pc |
38 | cd glib | 52 | cd glib |
39 | make DESTDIR="$pkgdir" install || return 1 | 53 | make DESTDIR="$pkgdir" install || return 1 |
40 | } | 54 | } |
41 | 55 | ||
42 | md5sums="4155346f9369b192569ce9184ff73e43 poppler-0.12.4.tar.gz" | 56 | md5sums="76f003b8fa2b905674088c306aa857c5 poppler-0.14.0.tar.gz" |
diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD index 56cce5a09a..7b9c8935de 100644 --- a/main/poppler/APKBUILD +++ b/main/poppler/APKBUILD | |||
@@ -4,8 +4,8 @@ | |||
4 | # circular make dependency: gtk <- cups <- poppler <- gtk | 4 | # circular make dependency: gtk <- cups <- poppler <- gtk |
5 | # So we build gtk support in poppler-gtk | 5 | # So we build gtk support in poppler-gtk |
6 | pkgname=poppler | 6 | pkgname=poppler |
7 | pkgver=0.12.4 | 7 | pkgver=0.14.0 |
8 | pkgrel=1 | 8 | pkgrel=0 |
9 | pkgdesc="PDF rendering library based on xpdf 3.0" | 9 | pkgdesc="PDF rendering library based on xpdf 3.0" |
10 | url="http://poppler.freedesktop.org/" | 10 | url="http://poppler.freedesktop.org/" |
11 | license="GPL" | 11 | license="GPL" |
@@ -44,4 +44,4 @@ utils() { | |||
44 | mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ | 44 | mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ |
45 | } | 45 | } |
46 | 46 | ||
47 | md5sums="4155346f9369b192569ce9184ff73e43 poppler-0.12.4.tar.gz" | 47 | md5sums="76f003b8fa2b905674088c306aa857c5 poppler-0.14.0.tar.gz" |
diff --git a/testing/py-xml/APKBUILD b/main/py-xml/APKBUILD index 1dd549da07..1dd549da07 100644 --- a/testing/py-xml/APKBUILD +++ b/main/py-xml/APKBUILD | |||
diff --git a/testing/py-xml/fix-python2.6.patch b/main/py-xml/fix-python2.6.patch index 7bf1c46fc9..7bf1c46fc9 100644 --- a/testing/py-xml/fix-python2.6.patch +++ b/main/py-xml/fix-python2.6.patch | |||
diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD index e91e0af400..ce1f2c6c63 100644 --- a/main/rrdtool/APKBUILD +++ b/main/rrdtool/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=rrdtool | 2 | pkgname=rrdtool |
3 | pkgver=1.2.30 | 3 | pkgver=1.2.30 |
4 | pkgrel=3 | 4 | pkgrel=4 |
5 | pkgdesc="Data logging and graphing application" | 5 | pkgdesc="Data logging and graphing application" |
6 | url="http://www.rrdtool.org" | 6 | url="http://www.rrdtool.org" |
7 | license="GPL" | 7 | license="GPL" |
@@ -17,7 +17,7 @@ build() { | |||
17 | --disable-tcl \ | 17 | --disable-tcl \ |
18 | --disable-python \ | 18 | --disable-python \ |
19 | --disable-ruby \ | 19 | --disable-ruby \ |
20 | --disable-rrdcgi | 20 | --enable-rrdcgi |
21 | 21 | ||
22 | make || return 1 | 22 | make || return 1 |
23 | } | 23 | } |
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index 580fd54108..baf0e434f9 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=samba | 2 | pkgname=samba |
3 | pkgver=3.5.3 | 3 | pkgver=3.5.4 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Tools to access a server's filespace and printers via SMB" | 5 | pkgdesc="Tools to access a server's filespace and printers via SMB" |
6 | url="http://www.samba.org" | 6 | url="http://www.samba.org" |
@@ -117,7 +117,7 @@ tdb() { | |||
117 | usr/bin/tdb* | 117 | usr/bin/tdb* |
118 | } | 118 | } |
119 | 119 | ||
120 | md5sums="7c8d2a34b649380d5df838c3e030dbec samba-3.5.3.tar.gz | 120 | md5sums="22c8c977eaa18be50f3878c6d0e0c2f0 samba-3.5.4.tar.gz |
121 | c8a7f6ac5df2f73dbf023e25ea39927b samba.initd | 121 | c8a7f6ac5df2f73dbf023e25ea39927b samba.initd |
122 | c150433426e18261e6e3eed3930e1a76 samba.confd | 122 | c150433426e18261e6e3eed3930e1a76 samba.confd |
123 | b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate | 123 | b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate |
diff --git a/main/vte/APKBUILD b/main/vte/APKBUILD index 9de94bbd4a..a3bb81ae63 100644 --- a/main/vte/APKBUILD +++ b/main/vte/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=vte | 2 | pkgname=vte |
3 | pkgver=0.24.1 | 3 | pkgver=0.24.2 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Virtual Terminal Emulator library" | 5 | pkgdesc="Virtual Terminal Emulator library" |
6 | url="http://www.gnome.org" | 6 | url="http://www.gnome.org" |
@@ -26,4 +26,4 @@ package() { | |||
26 | cd "$srcdir"/$pkgname-$pkgver | 26 | cd "$srcdir"/$pkgname-$pkgver |
27 | make DESTDIR="$pkgdir" install || return 1 | 27 | make DESTDIR="$pkgdir" install || return 1 |
28 | } | 28 | } |
29 | md5sums="3b66116e930dde00e1ddbf8277066ea7 vte-0.24.1.tar.bz2" | 29 | md5sums="76d5bca203245fedf7eac6d434a16bd9 vte-0.24.2.tar.bz2" |
diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD index 7aeb2803ea..f1ab530878 100644 --- a/main/wireshark/APKBUILD +++ b/main/wireshark/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> | 1 | # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> |
2 | # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=wireshark | 3 | pkgname=wireshark |
4 | pkgver=1.2.8 | 4 | pkgver=1.2.9 |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="network protocol analyzer - GTK version" | 6 | pkgdesc="network protocol analyzer - GTK version" |
7 | url="http://www.wireshark.org" | 7 | url="http://www.wireshark.org" |
@@ -13,7 +13,6 @@ install="" | |||
13 | subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark" | 13 | subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark" |
14 | source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2 | 14 | source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2 |
15 | wireshark-1.1.2--as-needed.patch | 15 | wireshark-1.1.2--as-needed.patch |
16 | wireshark-1.2.8-zlib-1.2.5-capture.patch | ||
17 | wireshark.desktop | 16 | wireshark.desktop |
18 | wireshark.png" | 17 | wireshark.png" |
19 | 18 | ||
@@ -73,8 +72,7 @@ tshark() { | |||
73 | mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark | 72 | mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark |
74 | } | 73 | } |
75 | 74 | ||
76 | md5sums="3a75d4f62317e52b8b39a1e9e37f1553 wireshark-1.2.8.tar.bz2 | 75 | md5sums="a4240c36f1e668d85b703eacb7c0a95e wireshark-1.2.9.tar.bz2 |
77 | cc87d7eb31f256df751b3371b1c426e9 wireshark-1.1.2--as-needed.patch | 76 | cc87d7eb31f256df751b3371b1c426e9 wireshark-1.1.2--as-needed.patch |
78 | cc4fbe2db149f2ee42dd0593944a69fe wireshark-1.2.8-zlib-1.2.5-capture.patch | ||
79 | 504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop | 77 | 504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop |
80 | e771800a8c977fe223583a453bc27397 wireshark.png" | 78 | e771800a8c977fe223583a453bc27397 wireshark.png" |
diff --git a/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch b/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch deleted file mode 100644 index 3120027400..0000000000 --- a/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | http://anonsvn.wireshark.org/viewvc?view=rev&revision=32715 | ||
2 | |||
3 | --- trunk/wiretap/wtap.c 2010/05/07 19:24:32 32714 | ||
4 | +++ trunk/wiretap/wtap.c 2010/05/07 19:45:47 32715 | ||
5 | @@ -35,6 +35,10 @@ | ||
6 | #include <unistd.h> | ||
7 | #endif | ||
8 | |||
9 | +#ifdef HAVE_LIBZ | ||
10 | +#include <zlib.h> | ||
11 | +#endif | ||
12 | + | ||
13 | #include "wtap-int.h" | ||
14 | #include "wtap.h" | ||
15 | |||
16 | @@ -646,6 +650,14 @@ | ||
17 | */ | ||
18 | wth->phdr.pkt_encap = wth->file_encap; | ||
19 | |||
20 | +#if defined(ZLIB_VERNUM) && ZLIB_VERNUM == 0x1250 | ||
21 | + /* Reset EOF */ | ||
22 | + /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof before seek: %d", gzeof(wth->fh)); */ | ||
23 | + if (gzeof(wth->fh)) | ||
24 | + gzseek(wth->fh, 0, SEEK_CUR); | ||
25 | + /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof after seek: %d", gzeof(wth->fh)); */ | ||
26 | +#endif | ||
27 | + | ||
28 | if (!wth->subtype_read(wth, err, err_info, data_offset)) | ||
29 | return FALSE; /* failure */ | ||
30 | |||
diff --git a/main/xfce4-taskmanager/APKBUILD b/main/xfce4-taskmanager/APKBUILD index 946e59ad96..8a07dd8d83 100644 --- a/main/xfce4-taskmanager/APKBUILD +++ b/main/xfce4-taskmanager/APKBUILD | |||
@@ -1,13 +1,13 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfce4-taskmanager | 2 | pkgname=xfce4-taskmanager |
3 | pkgver=0.4.1 | 3 | pkgver=1.0.0 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="a simple taskmanager for the Xfce Desktop Environment" | 5 | pkgdesc="a simple taskmanager for the Xfce Desktop Environment" |
6 | url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager" | 6 | url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager" |
7 | license="GPL-2" | 7 | license="GPL-2" |
8 | depends= | 8 | depends= |
9 | makedepends="pkgconfig intltool libxfcegui4-dev" | 9 | makedepends="pkgconfig intltool libxfcegui4-dev" |
10 | source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2" | 10 | source="http://archive.xfce.org/src/apps/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2" |
11 | 11 | ||
12 | build () | 12 | build () |
13 | { | 13 | { |
@@ -18,7 +18,11 @@ build () | |||
18 | --localstatedir=/var \ | 18 | --localstatedir=/var \ |
19 | --disable-static | 19 | --disable-static |
20 | make || return 1 | 20 | make || return 1 |
21 | } | ||
22 | |||
23 | package() { | ||
24 | cd "$srcdir"/$pkgname-$pkgver | ||
21 | make DESTDIR="$pkgdir" install | 25 | make DESTDIR="$pkgdir" install |
22 | } | 26 | } |
23 | 27 | ||
24 | md5sums="4ed599faf6b734b2d2e7be16adf0b2d9 xfce4-taskmanager-0.4.1.tar.bz2" | 28 | md5sums="cd205366ae771d2cbe72b5ca7b1257b0 xfce4-taskmanager-1.0.0.tar.bz2" |
diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD index 2fdc517086..59f381e62d 100644 --- a/main/xfwm4/APKBUILD +++ b/main/xfwm4/APKBUILD | |||
@@ -1,13 +1,14 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xfwm4 | 2 | pkgname=xfwm4 |
3 | pkgver=4.6.2 | 3 | pkgver=4.6.2 |
4 | pkgrel=1 | 4 | pkgrel=2 |
5 | pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3" | 5 | pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3" |
6 | url="http://www.xfce.org/" | 6 | url="http://www.xfce.org/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
8 | depends="hicolor-icon-theme" | 8 | depends="hicolor-icon-theme" |
9 | makedepends="pkgconfig libxfcegui4-dev libwnck-dev intltool gettext-dev | 9 | makedepends="pkgconfig libxfcegui4-dev libwnck-dev intltool gettext-dev |
10 | libiconv-dev libglade-dev expat-dev libsm-dev e2fsprogs" | 10 | libxcomposite-dev libxfixes-dev libxdamage-dev libxrender-dev |
11 | libxrandr-dev libiconv-dev libglade-dev expat-dev libsm-dev e2fsprogs" | ||
11 | install= | 12 | install= |
12 | source="http://archive.xfce.org/src/xfce/xfwm4/4.6/xfwm4-$pkgver.tar.bz2" | 13 | source="http://archive.xfce.org/src/xfce/xfwm4/4.6/xfwm4-$pkgver.tar.bz2" |
13 | 14 | ||
diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD index 2f8007ee22..db7af6dac5 100644 --- a/testing/kamailio/APKBUILD +++ b/testing/kamailio/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=kamailio | 3 | pkgname=kamailio |
4 | pkgver=3.0.2 | 4 | pkgver=3.0.2 |
5 | pkgrel=1 | 5 | pkgrel=3 |
6 | pkgdesc="Open Source SIP Server" | 6 | pkgdesc="Open Source SIP Server" |
7 | url="http://www.kamailio.org/" | 7 | url="http://www.kamailio.org/" |
8 | pkgusers="kamailio" | 8 | pkgusers="kamailio" |
@@ -12,7 +12,7 @@ depends= | |||
12 | makedepends="bison flex expat-dev postgresql-dev pcre-dev | 12 | makedepends="bison flex expat-dev postgresql-dev pcre-dev |
13 | libxml2-dev curl-dev unixodbc-dev confuse-dev" | 13 | libxml2-dev curl-dev unixodbc-dev confuse-dev" |
14 | install= | 14 | install= |
15 | subpackages="$pkgname-doc $pkgname-postgres | 15 | subpackages="$pkgname-doc $pkgname-postgres $pkgname-presence |
16 | $pkgname-mediaproxy $pkgname-unixodbc" | 16 | $pkgname-mediaproxy $pkgname-unixodbc" |
17 | source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz | 17 | source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz |
18 | kamailio.cfg | 18 | kamailio.cfg |
@@ -23,7 +23,12 @@ source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src. | |||
23 | " | 23 | " |
24 | 24 | ||
25 | _builddir="$srcdir"/$pkgname-$pkgver | 25 | _builddir="$srcdir"/$pkgname-$pkgver |
26 | _modules="db_postgres mediaproxy db_unixodbc carrierroute xmlrpc" | 26 | # Makefile does not handle newline |
27 | _presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo" | ||
28 | |||
29 | _modules="db_postgres mediaproxy db_unixodbc carrierroute xmlrpc tm $_presence" | ||
30 | |||
31 | |||
27 | prepare() { | 32 | prepare() { |
28 | cd "$_builddir" | 33 | cd "$_builddir" |
29 | patch -p1 -i "$srcdir"/kamailio-3-backslash.patch || return 1 | 34 | patch -p1 -i "$srcdir"/kamailio-3-backslash.patch || return 1 |
@@ -55,7 +60,6 @@ build() { | |||
55 | cfg_target=/etc/kamailio/ \ | 60 | cfg_target=/etc/kamailio/ \ |
56 | MODS_MYSQL=yes \ | 61 | MODS_MYSQL=yes \ |
57 | MODS_PCRE=yes \ | 62 | MODS_PCRE=yes \ |
58 | MODS_PRESENCE=yes \ | ||
59 | MODS_RADIUS= \ | 63 | MODS_RADIUS= \ |
60 | TLS= \ | 64 | TLS= \ |
61 | include_modules="$_modules" \ | 65 | include_modules="$_modules" \ |
@@ -68,7 +72,6 @@ package() { | |||
68 | cfg_target=/etc/kamailio/ \ | 72 | cfg_target=/etc/kamailio/ \ |
69 | MODS_MYSQL=yes \ | 73 | MODS_MYSQL=yes \ |
70 | MODS_PCRE=yes \ | 74 | MODS_PCRE=yes \ |
71 | MODS_PRESENCE=yes \ | ||
72 | MODS_RADIUS= \ | 75 | MODS_RADIUS= \ |
73 | TLS= \ | 76 | TLS= \ |
74 | include_modules="$_modules" \ | 77 | include_modules="$_modules" \ |
@@ -128,10 +131,8 @@ pcre() { | |||
128 | } | 131 | } |
129 | 132 | ||
130 | presence() { | 133 | presence() { |
131 | pkgdesc="Precense support for kamailio" | 134 | pkgdesc="Presence support for kamailio" |
132 | _mv_mod presence presence_xml presence_mwi pua pua_bla pua_mi \ | 135 | _mv_mod_k $_presence |
133 | pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo \ | ||
134 | pua_dialoginfo | ||
135 | } | 136 | } |
136 | 137 | ||
137 | mediaproxy() { | 138 | mediaproxy() { |
@@ -147,7 +148,7 @@ unixodbc() { | |||
147 | } | 148 | } |
148 | 149 | ||
149 | md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz | 150 | md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz |
150 | 865979ca14a727e99e0de5ca2426603f kamailio.cfg | 151 | a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg |
151 | 81100c479890a2a8c2628db22fdd1a0c kamailio.initd | 152 | 81100c479890a2a8c2628db22fdd1a0c kamailio.initd |
152 | c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install | 153 | c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install |
153 | 3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install | 154 | 3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install |
diff --git a/testing/kamailio/kamailio.cfg b/testing/kamailio/kamailio.cfg index 5a45cfdbbf..1558cce9ca 100644 --- a/testing/kamailio/kamailio.cfg +++ b/testing/kamailio/kamailio.cfg | |||
@@ -1,13 +1,14 @@ | |||
1 | # Demonstration Kamailio Configuration for AlpineLinux | 1 | # Sample Kamailio Configuration |
2 | 2 | # 23 June 2010 - For Alpine Linux | |
3 | # Accepts all registrations; routes calls to any registered AOR | ||
3 | 4 | ||
4 | #-------------------------------------------------------- | 5 | #-------------------------------------------------------- |
5 | # Section 1: Global Definitions | 6 | # Section 1: Global Definitions |
6 | #-------------------------------------------------------- | 7 | #-------------------------------------------------------- |
7 | debug = 3 | 8 | debug = 2 |
8 | fork = yes | 9 | fork = yes |
9 | log_stderror = no | 10 | log_stderror = no |
10 | listen = 0.0.0.0 | 11 | # listen = 0.0.0.0 |
11 | port = 5060 | 12 | port = 5060 |
12 | children = 4 | 13 | children = 4 |
13 | 14 | ||
@@ -15,20 +16,24 @@ dns = no | |||
15 | rev_dns = no | 16 | rev_dns = no |
16 | 17 | ||
17 | mpath = "/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/" | 18 | mpath = "/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/" |
19 | |||
18 | #-------------------------------------------------------- | 20 | #-------------------------------------------------------- |
19 | # Section 2: Modules | 21 | # Section 2: Modules |
20 | #-------------------------------------------------------- | 22 | #-------------------------------------------------------- |
21 | 23 | ||
22 | loadmodule "sl.so" | ||
23 | loadmodule "tm.so" | 24 | loadmodule "tm.so" |
25 | loadmodule "sl.so" | ||
26 | loadmodule "tmx.so" | ||
24 | loadmodule "rr.so" | 27 | loadmodule "rr.so" |
25 | loadmodule "maxfwd.so" | 28 | loadmodule "maxfwd.so" |
26 | loadmodule "usrloc.so" | 29 | loadmodule "usrloc.so" |
27 | loadmodule "registrar.so" | 30 | loadmodule "registrar.so" |
28 | loadmodule "mi_fifo.so" | 31 | loadmodule "mi_fifo.so" |
32 | loadmodule "pv.so" | ||
33 | loadmodule "xlog.so" | ||
29 | 34 | ||
30 | #-------------------------------------------------------- | 35 | #-------------------------------------------------------- |
31 | # Section 1: Module Configuration | 36 | # Section 3: Module Configuration |
32 | #-------------------------------------------------------- | 37 | #-------------------------------------------------------- |
33 | 38 | ||
34 | modparam ( "usrloc", "db_mode", 0 ) | 39 | modparam ( "usrloc", "db_mode", 0 ) |
@@ -36,26 +41,30 @@ modparam ( "rr", "enable_full_lr", 1 ) | |||
36 | modparam ( "mi_fifo", "fifo_name", "/tmp/kamailio_fifo") | 41 | modparam ( "mi_fifo", "fifo_name", "/tmp/kamailio_fifo") |
37 | 42 | ||
38 | #-------------------------------------------------------- | 43 | #-------------------------------------------------------- |
39 | # Section 1: Main Route Block | 44 | # Section 4: Main Route Block |
40 | #-------------------------------------------------------- | 45 | #-------------------------------------------------------- |
41 | 46 | ||
42 | route | 47 | route |
43 | { | 48 | { |
49 | # Uncomment next line if you want to see | ||
50 | # each incoming message | ||
51 | xlog( "L_INFO", "$rm: $fu -> $ru" ); | ||
52 | |||
44 | if (!mf_process_maxfwd_header("10")) | 53 | if (!mf_process_maxfwd_header("10")) |
45 | { | 54 | { |
46 | sl_send_reply("483", "Too Many Hops"); | 55 | sl_send_reply("483", "Too Many Hops"); |
47 | return; | 56 | return; |
48 | } | 57 | } |
49 | 58 | ||
50 | if (msg:len > max_len) | 59 | if (msg:len > 4096) |
51 | { | 60 | { |
52 | sl_send_reply("513", "Message Overflow"); | 61 | sl_send_reply("513", "Message too big" ); |
53 | return; | 62 | return; |
54 | } | 63 | } |
55 | 64 | ||
56 | if (method == "REGISTER" ) | 65 | if (method == "REGISTER" ) |
57 | { | 66 | { |
58 | route(2); | 67 | route(REGISTER); |
59 | return; | 68 | return; |
60 | } | 69 | } |
61 | 70 | ||
@@ -66,42 +75,33 @@ route | |||
66 | return; | 75 | return; |
67 | } | 76 | } |
68 | 77 | ||
69 | route(1); | 78 | route(RELAY); |
70 | 79 | ||
71 | } | 80 | } |
72 | #-------------------------------------------------------- | 81 | #-------------------------------------------------------- |
73 | # Section 1: Secondary Route Blocks | 82 | # Section 5: Secondary Route Blocks |
74 | #-------------------------------------------------------- | 83 | #-------------------------------------------------------- |
75 | 84 | ||
76 | # - Default message handler | 85 | # - Default message handler |
77 | route[1] { | 86 | route[RELAY] { |
78 | if (!t_relay()) { | 87 | if (!t_relay()) { |
79 | sl_reply_error(); | 88 | sl_reply_error(); |
80 | } | 89 | } |
81 | } | 90 | } |
82 | 91 | ||
83 | #- Registration Request | 92 | #- Registration Request |
84 | route[2] { | 93 | route[REGISTER] { |
85 | if (!save("location")) { | 94 | if (!save("location")) { |
86 | sl_reply_error(); | 95 | sl_reply_error(); |
87 | } | 96 | } |
88 | } | 97 | } |
89 | 98 | ||
90 | #-------------------------------------------------------- | 99 | #-------------------------------------------------------- |
91 | # Section 1: Reply Route Block | 100 | # Section 6: Reply Route Block |
92 | #-------------------------------------------------------- | 101 | #-------------------------------------------------------- |
93 | 102 | ||
94 | 103 | ||
95 | #-------------------------------------------------------- | 104 | #-------------------------------------------------------- |
96 | # Section 1: Failure Route Block | 105 | # Section 7: Failure Route Block |
97 | #-------------------------------------------------------- | 106 | #-------------------------------------------------------- |
98 | 107 | ||
99 | |||
100 | |||
101 | |||
102 | |||
103 | |||
104 | |||
105 | |||
106 | |||
107 | |||
diff --git a/testing/libowfat/APKBUILD b/testing/libowfat/APKBUILD new file mode 100644 index 0000000000..8e3ee0eca0 --- /dev/null +++ b/testing/libowfat/APKBUILD | |||
@@ -0,0 +1,33 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=libowfat | ||
3 | pkgver=0.28 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="reimplementation of libdjb" | ||
6 | url="http://www.fefe.de/libowfat/" | ||
7 | license="GPL" | ||
8 | depends= | ||
9 | makedepends= | ||
10 | install= | ||
11 | subpackages="$pkgname-dev $pkgname-doc" | ||
12 | source="http://dl.fefe.de/libowfat-$pkgver.tar.bz2" | ||
13 | |||
14 | _builddir="$srcdir"/$pkgname-$pkgver | ||
15 | |||
16 | prepare() { | ||
17 | cd "$_builddir" | ||
18 | } | ||
19 | |||
20 | build() { | ||
21 | cd "$_builddir" | ||
22 | make || return 1 | ||
23 | } | ||
24 | |||
25 | package() { | ||
26 | cd "$_builddir" | ||
27 | make prefix="$pkgdir"/usr MAN3DIR="$pkgdir"/usr/share/man/man3 install | ||
28 | # buffer manpage conflicts with openssl | ||
29 | mv "$pkgdir"/usr/share/man/man3/buffer.3 \ | ||
30 | "$pkgdir"/usr/share/man/man3/owfatbuffer.3 | ||
31 | } | ||
32 | |||
33 | md5sums="6bbee9a86506419657d87123b7a6f2c1 libowfat-0.28.tar.bz2" | ||
diff --git a/testing/libusb-compat/APKBUILD b/testing/libusb-compat/APKBUILD new file mode 100644 index 0000000000..d36933b66b --- /dev/null +++ b/testing/libusb-compat/APKBUILD | |||
@@ -0,0 +1,34 @@ | |||
1 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> | ||
2 | pkgname=libusb-compat | ||
3 | pkgver=0.1.3 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="Compatibility library for use by user level applications to access USB devices regardless of OS" | ||
6 | url="http://www.libusb.org/" | ||
7 | license="LGPL v2.1" | ||
8 | depends= | ||
9 | makedepends="libusb-dev" | ||
10 | install= | ||
11 | subpackages="$pkgname-dev" | ||
12 | source="http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" | ||
13 | |||
14 | _builddir="$srcdir"/$pkgname-$pkgver | ||
15 | |||
16 | prepare() { | ||
17 | cd "$_builddir" | ||
18 | } | ||
19 | |||
20 | build() { | ||
21 | cd "$_builddir" | ||
22 | ./configure --prefix=/usr \ | ||
23 | --sysconfdir=/etc \ | ||
24 | --mandir=/usr/share/man \ | ||
25 | --infodir=/usr/share/info | ||
26 | make || return 1 | ||
27 | } | ||
28 | |||
29 | package() { | ||
30 | cd "$_builddir" | ||
31 | make DESTDIR="$pkgdir" install | ||
32 | } | ||
33 | |||
34 | md5sums="570ac2ea085b80d1f74ddc7c6a93c0eb libusb-compat-0.1.3.tar.bz2" | ||
diff --git a/testing/opentracker/APKBUILD b/testing/opentracker/APKBUILD new file mode 100644 index 0000000000..642b0d0b54 --- /dev/null +++ b/testing/opentracker/APKBUILD | |||
@@ -0,0 +1,36 @@ | |||
1 | # Contributor: | ||
2 | # Maintainer: | ||
3 | pkgname=opentracker | ||
4 | pkgver=0_cvs20100625 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="an open and free bittorrent tracker" | ||
7 | url="http://erdgeist.org/arts/software/opentracker/" | ||
8 | license="GPL" | ||
9 | depends= | ||
10 | makedepends="libowfat-dev" | ||
11 | install="$pkgname.pre-install" | ||
12 | subpackages= | ||
13 | source="http://dev.alpinelinux.org/opentracker/opentracker-$pkgver.tar.gz | ||
14 | opentracker.initd" | ||
15 | |||
16 | _builddir="$srcdir"/$pkgname | ||
17 | prepare() { | ||
18 | cd "$_builddir" | ||
19 | } | ||
20 | |||
21 | build() { | ||
22 | cd "$_builddir" | ||
23 | make || return 1 | ||
24 | } | ||
25 | |||
26 | package() { | ||
27 | cd "$_builddir" | ||
28 | install -d "$pkgdir"/usr/bin | ||
29 | make BINDIR="$pkgdir"/usr/bin install || return 1 | ||
30 | install -m644 -D opentracker.conf.sample \ | ||
31 | "$pkgdir"/etc/opentracker/opentracker.conf | ||
32 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | ||
33 | } | ||
34 | |||
35 | md5sums="8d02a6f7a241c6b8c98e2dbde086cfcf opentracker-0_cvs20100625.tar.gz | ||
36 | 1e1e687e78959833463ceb55101a3173 opentracker.initd" | ||
diff --git a/testing/opentracker/opentracker.initd b/testing/opentracker/opentracker.initd new file mode 100644 index 0000000000..33d2817787 --- /dev/null +++ b/testing/opentracker/opentracker.initd | |||
@@ -0,0 +1,38 @@ | |||
1 | #!/sbin/runscript | ||
2 | |||
3 | # Sample init.d file for alpine linux. | ||
4 | |||
5 | name=opentracker | ||
6 | daemon=/usr/bin/$name | ||
7 | conf=${opentracker_conf:-/etc/opentracker/opentracker.conf} | ||
8 | pidfile=/var/run/opentracker.pid | ||
9 | |||
10 | depend() { | ||
11 | need net | ||
12 | after firewall | ||
13 | } | ||
14 | |||
15 | start() { | ||
16 | ebegin "Starting ${name}" | ||
17 | start-stop-daemon --start --quiet \ | ||
18 | --make-pidfile \ | ||
19 | --pidfile ${pidfile} \ | ||
20 | --background \ | ||
21 | --stdout /dev/null \ | ||
22 | --stderr /dev/null \ | ||
23 | --exec ${daemon} \ | ||
24 | -- \ | ||
25 | -d /var/empty \ | ||
26 | -f $conf \ | ||
27 | -u ${opentracker_user:-opentracker} \ | ||
28 | ${opentracker_opts} | ||
29 | eend $? | ||
30 | } | ||
31 | |||
32 | stop() { | ||
33 | ebegin "Stopping ${name}" | ||
34 | start-stop-daemon --stop --quiet --pidfile ${pidfile} \ | ||
35 | --exec ${daemon} | ||
36 | eend $? | ||
37 | } | ||
38 | |||
diff --git a/testing/opentracker/opentracker.pre-install b/testing/opentracker/opentracker.pre-install new file mode 100644 index 0000000000..942fcd6706 --- /dev/null +++ b/testing/opentracker/opentracker.pre-install | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | adduser -D -S -h /var/empty -s /sbin/false opentracker 2>/dev/null | ||
4 | exit 0 | ||
5 | |||
diff --git a/testing/sems/APKBUILD b/testing/sems/APKBUILD index 2f1e6ee055..9d16fc8336 100644 --- a/testing/sems/APKBUILD +++ b/testing/sems/APKBUILD | |||
@@ -6,12 +6,12 @@ pkgrel=0 | |||
6 | pkgdesc="High performance, extensible media server for SIP (RFC3261) based VoIP services" | 6 | pkgdesc="High performance, extensible media server for SIP (RFC3261) based VoIP services" |
7 | url="http://iptel.org/sems/" | 7 | url="http://iptel.org/sems/" |
8 | license="GPL-2" | 8 | license="GPL-2" |
9 | depends="kamailio" | 9 | install="$pkgname.pre-install $pkgname.post-install" |
10 | makedepends="python-dev openssl-dev lame-dev" | 10 | makedepends="python-dev openssl-dev cmake bash" |
11 | install= | ||
12 | subpackages= | ||
13 | source="http://ftp.iptel.org/pub/sems/sems-$pkgver.tar.gz | 11 | source="http://ftp.iptel.org/pub/sems/sems-$pkgver.tar.gz |
14 | 0003-cc-and-cflags.patch | 12 | 0003-cc-and-cflags.patch |
13 | sems.conf | ||
14 | sems.initd | ||
15 | " | 15 | " |
16 | 16 | ||
17 | prepare() { | 17 | prepare() { |
@@ -22,37 +22,50 @@ prepare() { | |||
22 | patch -p1 -i $i || return 1 | 22 | patch -p1 -i $i || return 1 |
23 | done | 23 | done |
24 | 24 | ||
25 | sed -i -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ | 25 | sed -i -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' \ |
26 | -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' \ | 26 | -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ |
27 | Makefile.defs \ | 27 | Makefile.defs \ |
28 | || return 1 | 28 | || return 1 |
29 | |||
30 | # Patch for fixin unistd.h | ||
31 | sed -i -e 's:\*\/:\n*\/\n#include <unistd.h>:' core/AmArg.cpp | ||
32 | sed -i -e 's:\*\/:\n*\/\n#include <unistd.h>:' core/AmMediaProcessor.cpp | ||
33 | sed -i -e 's:\*\/:\n*\/\n#include <unistd.h>:' core/AmRtpReceiver.cpp | ||
34 | sed -i -e 's:\*\/:\n*\/\n#include <unistd.h>:' core/plug-in/sipctrl/udp_trsp.cpp | ||
35 | sed -i -e 's:\*\/:\n*\/\n#include <unistd.h>:' core/plug-in/stats/query_stats.cxx | ||
36 | sed -i -e 's:\*\/:\n*\/\n#include <unistd.h>:' apps/annrecorder/AnnRecorder.cpp | ||
37 | sed -i -e 's:\*\/:\n*\/\n#include <unistd.h>:' apps/callback/CallBack.cpp | ||
38 | sed -i -e 's:\*\/:\n*\/\n#include <unistd.h>:' apps/diameter_client/ServerConnection.cpp | ||
39 | sed -i -e 's:\*\/:\n*\/\n#include <unistd.h>:' apps/dsm/mods/mod_sys/ModSys.cpp | ||
29 | } | 40 | } |
30 | 41 | ||
31 | 42 | ||
32 | build() { | 43 | build() { |
33 | cd "$srcdir"/$pkgname-$pkgver | 44 | cd "$srcdir"/$pkgname-$pkgver |
34 | 45 | ||
35 | make PREFIX=/usr \ | 46 | make PREFIX=/usr \ |
36 | cfg-dir=/etc/sems/ \ | 47 | cfg-target=/etc/sems/ \ |
37 | CC="$CC" CXX="$CXX" \ | 48 | exclude_modules+="ivr examples py_sems speex gateway mp3 echo g722" \ |
38 | exclude_modules+="ivr examples py_sems speex gateway echo g722" \ | ||
39 | WITH_MPG123DECODER=no \ | 49 | WITH_MPG123DECODER=no \ |
40 | || return 1 | 50 | all || return 1 |
41 | } | 51 | } |
42 | 52 | ||
43 | package() { | 53 | package() { |
44 | cd "$srcdir"/$pkgname-$pkgver | 54 | cd "$srcdir"/$pkgname-$pkgver |
45 | make PREFIX=/usr \ | 55 | |
46 | cfg-dir=/etc/sems/ \ | 56 | make PREFIX=/usr \ |
47 | exclude_modules+="ivr examples py_sems speex gateway echo g722" \ | ||
48 | DESTDIR="$pkgdir" \ | 57 | DESTDIR="$pkgdir" \ |
58 | cfg-target=/etc/sems/ \ | ||
59 | cfg-prefix="$pkgdir" \ | ||
60 | exclude_modules+="ivr examples py_sems speex gateway mp3 echo g722" \ | ||
49 | WITH_MPG123DECODER=no \ | 61 | WITH_MPG123DECODER=no \ |
50 | install || return 1 | 62 | install || return 1 |
51 | 63 | ||
52 | # remove the 2 lines below (and this) if there is no init.d script | 64 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname |
53 | # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | 65 | install -m644 -D "$srcdir"/$pkgname.conf "$pkgdir"/etc/sems/$pkgname.conf |
54 | # install -m644 -D "$srcdir"//$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | ||
55 | } | 66 | } |
56 | 67 | ||
57 | md5sums="f0545c0708849e1a723d453244c2a79e sems-1.2.1.tar.gz | 68 | md5sums="f0545c0708849e1a723d453244c2a79e sems-1.2.1.tar.gz |
58 | 0054e6ed7e11393e71204876179d3199 0003-cc-and-cflags.patch" | 69 | 0054e6ed7e11393e71204876179d3199 0003-cc-and-cflags.patch |
70 | 8b74528c8605b7adb01a0133fcd0c247 sems.conf | ||
71 | 2e738c6402eb1fbceb279cf050a9090f sems.initd" | ||
diff --git a/testing/sems/sems.conf b/testing/sems/sems.conf new file mode 100644 index 0000000000..5e0ba4935e --- /dev/null +++ b/testing/sems/sems.conf | |||
@@ -0,0 +1,352 @@ | |||
1 | # $Id: sems.conf.sample 1541 2009-10-14 12:00:58Z sayer $ | ||
2 | # | ||
3 | # sems.conf.sample | ||
4 | # | ||
5 | # Sip Express Media Server (sems) | ||
6 | # | ||
7 | # sample configuration file | ||
8 | # | ||
9 | # | ||
10 | # whitespaces (spaces and tabs) are ignored | ||
11 | # comments start with a "#" and may be used inline | ||
12 | # | ||
13 | # example: option=value # i like this option | ||
14 | # | ||
15 | # @filename includes mod_config_path/filename | ||
16 | # @/absolute/path/to/file includes file | ||
17 | |||
18 | ############################################################ | ||
19 | # Network configuration | ||
20 | |||
21 | # optional parameter: media_ip=<ip_address>|<device> | ||
22 | # | ||
23 | # - this informs SEMS about the IP address or interface that | ||
24 | # SEMS uses to send and receive media. If not set, defaults | ||
25 | # to first non-loopback interface. | ||
26 | # | ||
27 | # Examples: | ||
28 | # media_ip=10.0.0.34 | ||
29 | # media_ip=eth0 | ||
30 | |||
31 | # optional parameter: sip_ip=<ip_address> | ||
32 | # | ||
33 | # - this informs SEMS about the SIP IP where its SIP stack is | ||
34 | # bound to or should be bound to. If 'sipctrl' SIP stack is used, | ||
35 | # the SIP stack will bind to this address. This also sets | ||
36 | # the value used for contact header in outgoing calls and | ||
37 | # registrations. If not set, defaults to first non-loopback | ||
38 | # interface. | ||
39 | # | ||
40 | # Example: | ||
41 | # sip_ip=10.0.0.34 | ||
42 | # | ||
43 | |||
44 | # optional parameter: public_ip=<ip_address> | ||
45 | # | ||
46 | # - when running SEMS behind certain simple NAT configurations, | ||
47 | # you can use this parameter to inform SEMS of its public IP | ||
48 | # address. If this parameter is set, SEMS will write this value | ||
49 | # into SDP bodies. | ||
50 | # If this parameter is not set, the local IP address is used. | ||
51 | # N.B., there is no support for port translation; the local | ||
52 | # RTP port is advertised in SDP in either case. | ||
53 | # | ||
54 | # Example: | ||
55 | # public_ip=75.101.219.48 | ||
56 | # | ||
57 | |||
58 | # optional parameter: sip_port=<port_number> | ||
59 | # | ||
60 | # - this informs SEMS about the port where its SIP stack is | ||
61 | # bound to or should be bound to. SEMS needs this information | ||
62 | # to correctly set the contact header in outgoing calls | ||
63 | # and registrations. Should be set to equal the 'port' | ||
64 | # configuration option in ser_sems.cfg. | ||
65 | # This does not need to be set if sipctrl SIP stack, outgoing | ||
66 | # calls and registrations from SEMS are not used. | ||
67 | # | ||
68 | # default: 5060 | ||
69 | # | ||
70 | sip_port=5080 | ||
71 | |||
72 | # optional parameter: outbound_proxy=uri | ||
73 | # | ||
74 | # - this sets a next hop for calls and registrations outgoing | ||
75 | # from SEMS. This does not apply to requests in a dialog that | ||
76 | # is initiated by someone else and incoming to SEMS, as in | ||
77 | # this case the next_hop is taken by SEMS from the incoming | ||
78 | # request that established the dialog. | ||
79 | # If this is not set (default setting), then for dialogs | ||
80 | # initiated by SEMS the r-uri is resolved and the request | ||
81 | # is sent there directly. | ||
82 | # This is resolved by the SIP stack with DNS if a name is given. | ||
83 | # Warning: If the value set here can not be resolved, no | ||
84 | # requests will be sent out at all! | ||
85 | # | ||
86 | # default: empty | ||
87 | # | ||
88 | # Example: | ||
89 | # outbound_proxy=sip:proxy.mydomain.net | ||
90 | |||
91 | # optional parameter: rtp_low_port=<port> | ||
92 | # | ||
93 | # - sets lowest for RTP used port | ||
94 | rtp_low_port=10000 | ||
95 | |||
96 | # optional parameter: rtp_high_port=<port> | ||
97 | # | ||
98 | # - sets highest for RTP used port | ||
99 | rtp_high_port=60000 | ||
100 | |||
101 | ############################################################ | ||
102 | # modules and application configuration | ||
103 | # | ||
104 | # Configuration of plugin (module) loading: | ||
105 | # - if load_plugins is set, only those are loaded. | ||
106 | # - if load_plugins is not set, all modules in the plugin_path | ||
107 | # directory are loaded, except those which are listed | ||
108 | # in exclude_plugins. | ||
109 | # | ||
110 | |||
111 | # optional parameter: plugin_path=<path> | ||
112 | # | ||
113 | # - sets the path to the plug-ins' binaries | ||
114 | # - may be absolute or relative to CWD | ||
115 | plugin_path=/usr/lib/sems/plug-in/ | ||
116 | |||
117 | # optional parameter: load_plugins=<modules list> | ||
118 | # | ||
119 | # semicolon-separated list of modules to load. | ||
120 | # If empty, all modules in plugin_path are loaded. | ||
121 | # One of [sipctrl,unixsockctrl,binrpcctrl] must be loaded. | ||
122 | # | ||
123 | # example for announcement with only g711 and ilbc codecs | ||
124 | # load_plugins=wav;ilbc;announcement;sipctrl | ||
125 | |||
126 | # optional parameter: exclude_plugins=<modules list> | ||
127 | # | ||
128 | # semicolon-separated list of modules to exclude from loading | ||
129 | # ('blacklist'). If empty, all modules in plugin_path are loaded. | ||
130 | # This has only effect it load_plugins is not set. | ||
131 | # | ||
132 | # o binrpcctrl and unixsockctrl: excluded as sipctrl is default ctrl | ||
133 | # o precoded_announce: no precoded sample files present | ||
134 | exclude_plugins=binrpcctrl;unixsockctrl;precoded_announce | ||
135 | |||
136 | # optional parameter: application | ||
137 | # | ||
138 | # This controls which application is to be executed if there | ||
139 | # is no explicit application requested from the SIP stack | ||
140 | # (i.e. unixsockctrl and second parameter of t_write_unix). | ||
141 | # | ||
142 | # This can be one of | ||
143 | # $(ruri.user) - user part of ruri is taken as application, | ||
144 | # e.g. sip:announcement@host | ||
145 | # $(ruri.param) - uri parameter "app", e.g. | ||
146 | # sip:joe@host.net;app=announcement | ||
147 | # $(apphdr) - the value of the P-App-Name header is used | ||
148 | # | ||
149 | # $(mapping) - regex=>application mapping is read from | ||
150 | # app_mapping.conf (see app_mapping.conf) | ||
151 | # <application name> - application name configured here, e.g. | ||
152 | # application=announcement | ||
153 | # | ||
154 | # examples: | ||
155 | # application = conference | ||
156 | # application = $(mapping) | ||
157 | # application = $(ruri.user) | ||
158 | # application = $(ruri.param) | ||
159 | application = $(apphdr) | ||
160 | |||
161 | # parameter: plugin_config_path=<path> | ||
162 | # | ||
163 | # - in this path configuration files of the applications | ||
164 | # (e.g. announcement.conf) are searched | ||
165 | plugin_config_path=/etc/sems/etc/ | ||
166 | |||
167 | # optional parameter: exclude_payloads=<payload list> | ||
168 | # | ||
169 | # semicolon-separated list of payloads to exclude from loading | ||
170 | # ('blacklist'). | ||
171 | # | ||
172 | # For example, to only use low bandwidth codecs: | ||
173 | # exclude_payloads=PCMU;PCMA;G726-40;G726-32;G721;L16 | ||
174 | # or, to use only codecs which are not CPU-intensive: | ||
175 | # exclude_payloads=iLBC;speex; | ||
176 | # only use G711 (exclude everything else): | ||
177 | # exclude_payloads=iLBC;speex;G726-40;G726-32;G721;G726-24;G726-16;GSM;L16 | ||
178 | |||
179 | ############################################################ | ||
180 | # logging and running | ||
181 | |||
182 | # optional parameter: fork={yes|no} | ||
183 | # | ||
184 | # - specifies if sems should run in daemon mode (background) | ||
185 | # (fork=no is the same as -E) | ||
186 | fork=yes | ||
187 | |||
188 | # optional parameter: stderr={yes|no} | ||
189 | # | ||
190 | # - debug mode: do not fork and log to stderr | ||
191 | # (stderr=yes is the same as -E) | ||
192 | stderr=no | ||
193 | |||
194 | # optional parameter: loglevel={0|1|2|3} | ||
195 | # | ||
196 | # - sets log level (error=0, warning=1, info=2, debug=3) | ||
197 | # (same as -D) | ||
198 | loglevel=2 | ||
199 | |||
200 | # optional parameter: syslog_facility={DAEMON|USER|LOCAL[0-7]} | ||
201 | # | ||
202 | # - sets the log facility that is used for syslog. Using this, | ||
203 | # the log can for example be filtered into a special file | ||
204 | # by the syslog daemon. | ||
205 | # | ||
206 | # Default: DAEMON | ||
207 | # | ||
208 | # Example: | ||
209 | # syslog_facility=LOCAL0 | ||
210 | |||
211 | # optional parameter: log_sessions=[yes|no] | ||
212 | # | ||
213 | # Default: no | ||
214 | # | ||
215 | # If log_sessions=yes is set, INFO level log messages are generated | ||
216 | # for each session when it is started and stopped. | ||
217 | # | ||
218 | # log_sessions=yes | ||
219 | |||
220 | # optional parameter: log_events=[yes|no] | ||
221 | # | ||
222 | # Default: no | ||
223 | # | ||
224 | # If log_eventy=yes is set, generic DBG level log messages are | ||
225 | # generated for each event that is posted into an event queue. | ||
226 | # | ||
227 | # log_events=yes | ||
228 | |||
229 | |||
230 | ############################################################ | ||
231 | # tuning | ||
232 | |||
233 | # optional parameter: media_processor_threads=<num_value> | ||
234 | # | ||
235 | # - controls how many threads should be created that | ||
236 | # process media - on single-processor systems set this | ||
237 | # parameter to 1 (default), on MP systems to a higher | ||
238 | # value | ||
239 | # | ||
240 | # media_processor_threads=1 | ||
241 | |||
242 | |||
243 | # optional parameter: session_limit=<limit>;<err code>;<err reason> | ||
244 | # | ||
245 | # - this sets a maximum active session limit. If that limit is | ||
246 | # reached, no further calls are accepted, but the error reply | ||
247 | # with err code/err reason is sent out. | ||
248 | # | ||
249 | # Default: 0 (None) | ||
250 | # | ||
251 | # Example: | ||
252 | # session_limit="1000;503;Server overload" | ||
253 | |||
254 | # optional parameter: options_session_limit=<limit>;<err code>;<err reason> | ||
255 | # | ||
256 | # - this sets a custom response to OPTIONS, if the session count reaches | ||
257 | # a certain limit. This way health monitor could raise an alarm to syste | ||
258 | # administrator. | ||
259 | # | ||
260 | # Default: 0 (None) | ||
261 | # | ||
262 | # Example: | ||
263 | # options_session_limit="900;503;Warning, server soon overloaded" | ||
264 | |||
265 | |||
266 | # optional parameter: dead_rtp_time=<unsigned int> | ||
267 | # | ||
268 | # - if != 0, after this time (in seconds) of no RTP | ||
269 | # a session is considered dead and stopped. If set | ||
270 | # to 0 no check is done for rtp timeout. | ||
271 | # | ||
272 | # default=300 (5 minutes) | ||
273 | # | ||
274 | # Examples: | ||
275 | # # disable RTP timeout | ||
276 | # dead_rtp_time=0 | ||
277 | # # RTP timeout after 10 seconds | ||
278 | # dead_rtp_time=10 | ||
279 | |||
280 | # optional parameter: use_default_signature={yes|no} | ||
281 | # | ||
282 | # - use a Server/User-Agent header with the SEMS server | ||
283 | # signature and version. | ||
284 | # Set server_signature=0 in ser_sems.cfg if you use SER | ||
285 | # as SIP stack. | ||
286 | # | ||
287 | # default=no | ||
288 | # | ||
289 | use_default_signature=yes | ||
290 | |||
291 | # optional parameter: signature=<signature string> | ||
292 | # | ||
293 | # - use a Server/User-Agent header with a custom user agent | ||
294 | # signature. | ||
295 | # Overridden by default signature if | ||
296 | # use_default_signature is set. | ||
297 | # Set server_signature=0 in ser_sems.cfg if you use it. | ||
298 | # | ||
299 | # | ||
300 | # signature="SEMS media server 1.0" | ||
301 | |||
302 | # optional parameter: single_codec_in_ok={yes|no} | ||
303 | # | ||
304 | # - use single codec in 200 OK response | ||
305 | # | ||
306 | # default=no | ||
307 | # | ||
308 | # single_codec_in_ok=no | ||
309 | |||
310 | # optional parameter: codec_order=codec_name_1,codec_name2,... | ||
311 | # | ||
312 | # - Codec order used when sending INVITE requests. Codecs in codec_order | ||
313 | # will be on the top of the list followed by other supported codecs | ||
314 | # (if any). | ||
315 | # | ||
316 | # default=empty | ||
317 | # | ||
318 | # codec_order=iLBC,GSM | ||
319 | |||
320 | # optional parameter: ignore_rtpxheaders={yes|no} | ||
321 | # | ||
322 | # - if this is set to yes, RTP extension headers (e.g. when using ZRTP) | ||
323 | # are ignored. If set to no, the whole RTP packets with extension | ||
324 | # headers will be ignored and a debug message is printed on every | ||
325 | # received packet. | ||
326 | # | ||
327 | # default=no | ||
328 | # | ||
329 | # ignore_rtpxheaders=yes | ||
330 | |||
331 | # optional parameter: dtmf_detector={spandsp|internal} | ||
332 | # | ||
333 | # sets inband DTMF detector to use. spandsp support must be compiled in | ||
334 | # for this to have effect if dtmf_detector=spandsp. | ||
335 | # | ||
336 | # default: internal | ||
337 | # | ||
338 | # dtmf_detector=spandsp | ||
339 | |||
340 | # optional parameter: unhandled_reply_loglevel={error|warn|info|debug|no} | ||
341 | # | ||
342 | # the default application logic implemented in the applications is to stop | ||
343 | # the session right after sending BYE, without waiting for a reply. this | ||
344 | # leads to many log entries of the form | ||
345 | # ERROR: [b6fa6bb0] handleSipMsg (AmSipDispatcher.cpp:48): unhandled | ||
346 | # reply: [code:200;phrase:[OK];... ] | ||
347 | # | ||
348 | # This parameter sets the log lovel of unhandled positive (200 class) replies. | ||
349 | # | ||
350 | # default: error | ||
351 | # | ||
352 | # unhandled_reply_loglevel=info | ||
diff --git a/testing/sems/sems.initd b/testing/sems/sems.initd new file mode 100644 index 0000000000..9cf98a185e --- /dev/null +++ b/testing/sems/sems.initd | |||
@@ -0,0 +1,27 @@ | |||
1 | #!/sbin/runscript | ||
2 | |||
3 | daemon=/usr/sbin/sems | ||
4 | pidfile=/var/run/sems/sems.pid | ||
5 | conffile=/etc/sems/sems.conf | ||
6 | |||
7 | depend() { | ||
8 | need net | ||
9 | after firewall | ||
10 | } | ||
11 | |||
12 | start() { | ||
13 | ebegin "Starting sems" | ||
14 | start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \ | ||
15 | -- \ | ||
16 | -u sems \ | ||
17 | -g sems \ | ||
18 | -P $pidfile \ | ||
19 | -f $conffile | ||
20 | eend $? | ||
21 | } | ||
22 | |||
23 | stop() { | ||
24 | ebegin "Stopping sems" | ||
25 | start-stop-daemon --stop --quiet --pidfile $pidfile | ||
26 | eend $? | ||
27 | } | ||
diff --git a/testing/sems/sems.post-install b/testing/sems/sems.post-install new file mode 100644 index 0000000000..cd800bdcd6 --- /dev/null +++ b/testing/sems/sems.post-install | |||
@@ -0,0 +1,6 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | mkdir -p /var/run/sems 2>/dev/null | ||
4 | chown -R sems:sems /var/run/sems 2>/dev/null | ||
5 | chgrp sems /etc/sems/sems.cfg 2>/dev/null | ||
6 | exit 0 | ||
diff --git a/testing/sems/sems.pre-install b/testing/sems/sems.pre-install new file mode 100644 index 0000000000..3e82578a3e --- /dev/null +++ b/testing/sems/sems.pre-install | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | adduser -H -h /var/empty -s /bin/false -D sems 2>/dev/null | ||
4 | |||
5 | exit 0 | ||
diff --git a/testing/usb-modeswitch/APKBUILD b/testing/usb-modeswitch/APKBUILD new file mode 100644 index 0000000000..55f87034ba --- /dev/null +++ b/testing/usb-modeswitch/APKBUILD | |||
@@ -0,0 +1,53 @@ | |||
1 | # Maintainer: Leonardo Arena <rnalrd@gmail.com> | ||
2 | pkgname=usb-modeswitch | ||
3 | pkgver=1.1.2 | ||
4 | pkgrel=0 | ||
5 | _pkgdata=20100418 | ||
6 | pkgdesc="A mode switching tool for controlling flip flop (multiple device) USB gear" | ||
7 | url="http://www.draisberghof.de/usb_modeswitch/" | ||
8 | license="GPL" | ||
9 | depends="tcl" | ||
10 | makedepends="libusb-compat-dev" | ||
11 | install= | ||
12 | subpackages="$pkgname-doc" | ||
13 | source="http://www.draisberghof.de/usb_modeswitch/${pkgname}-${pkgver}.tar.bz2 | ||
14 | http://www.draisberghof.de/usb_modeswitch/${pkgname}-data-${_pkgdata}.tar.bz2 | ||
15 | http://www.draisberghof.de/usb_modeswitch/usb_modeswitch.setup" | ||
16 | |||
17 | _builddir="$srcdir"/$pkgname-$pkgver | ||
18 | |||
19 | prepare() { | ||
20 | cd "$_builddir" | ||
21 | mkdir -p $pkgdir/lib/udev/usb_modeswitch || return 1 | ||
22 | mkdir -p $pkgdir/etc || return 1 | ||
23 | mkdir -p $pkgdir/usr/share/man/man1 || return 1 | ||
24 | make clean || return 1 | ||
25 | sed -i -e 's/--mode=/-m/' Makefile | ||
26 | cd ../${pkgname}-data-${_pkgdata} | ||
27 | sed -i -e 's%install --mode=644 -t $(ETCDIR)/usb_modeswitch.d \./usb_modeswitch.d/\*%cp -R ./usb_modeswitch.d/\* $(ETCDIR)/usb_modeswitch.d%' Makefile | ||
28 | sed -i -e 's/--mode=/-m/' Makefile | ||
29 | } | ||
30 | |||
31 | build() { | ||
32 | cd "$_builddir" | ||
33 | make || return 1 | ||
34 | } | ||
35 | |||
36 | package() { | ||
37 | cd "$_builddir" | ||
38 | make DESTDIR="$pkgdir" install | ||
39 | # adjusting the tcl script location | ||
40 | mv ${pkgdir}/lib/udev/usb_modeswitch/usb_modeswitch.tcl ${pkgdir}/lib/udev/usb_modeswitch.tcl || return 1 | ||
41 | rmdir ${pkgdir}/lib/udev/usb_modeswitch || return 1 | ||
42 | mv ${pkgdir}/lib/udev/usb_modeswitch.tcl ${pkgdir}/lib/udev/usb_modeswitch || return 1 | ||
43 | |||
44 | # installing data | ||
45 | cd $srcdir/usb-modeswitch-data-${_pkgdata} || return 1 | ||
46 | make DESTDIR=$pkgdir install || return 1 | ||
47 | # installing config | ||
48 | cp $srcdir/usb_modeswitch.setup $pkgdir/etc/ || return 1 | ||
49 | } | ||
50 | |||
51 | md5sums="071cb300d00938bfe20025c654303d92 usb-modeswitch-1.1.2.tar.bz2 | ||
52 | 659c9633513fa2f84465244a50c351b3 usb-modeswitch-data-20100418.tar.bz2 | ||
53 | 9a25756669937ac86774bb55733f09cd usb_modeswitch.setup" | ||