diff options
Diffstat (limited to 'main')
72 files changed, 895 insertions, 1648 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 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=amavisd-new pkgver=2.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="High-performance interface between mailer (MTA) and content checkers" url="http://www.ijs.si/software/amavisd" 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 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk -pkgver=1.6.2.8 +pkgver=1.6.2.9 pkgrel=0 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" @@ -9,10 +9,11 @@ license="GPL" depends= makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar - freetds-dev openssl-dev lua-dev alsa-lib-dev spandsp-dev tiff-dev" + freetds-dev openssl-dev lua-dev alsa-lib-dev spandsp-dev tiff-dev + libresample sqlite-dev" install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-install" subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc - $pkgname-tds $pkgname-fax $pkgname-sample-config:sample" + $pkgname-tds $pkgname-fax $pkgname-sample-config:sample $pkgname-sqlite" source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz 100-uclibc-daemon.patch 101-caps-uclibc.patch @@ -48,6 +49,8 @@ build() { --without-iconv --with-popt --with-z --with-newt \ --with-odbc --with-postgres --with-tds \ --with-dahdi --with-pri --with-tonezone \ + --with-resample \ + --with-sqlite3 \ --with-asound \ --without-x11 \ --with-spandsp \ @@ -86,6 +89,12 @@ pgsql() { _find_and_move '*_pgsql*' } +sqlite() { + depends= + install= + _find_and_move '*_sqlite*' +} + odbc() { depends= install= @@ -110,7 +119,7 @@ sample() { make samples DESTDIR="$subpkgdir" } -md5sums="2ee5bbb91771c7c9b131da473971bc2f asterisk-1.6.2.8.tar.gz +md5sums="1f947d951c419b8039d53a6e6168fd69 asterisk-1.6.2.9.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch diff --git a/main/cairomm/APKBUILD b/main/cairomm/APKBUILD new file mode 100644 index 0000000000..9942749e0a --- /dev/null +++ b/main/cairomm/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=cairomm +pkgver=1.8.4 +pkgrel=0 +pkgdesc="C++ bindings to Cairo vector graphics library" +url="http://www.cairographics.org" +license="LGPL MPL" +depends="" +makedepends="cairo-dev libsigc++-dev perl" +depends_dev="$makedepends" +subpackages="$pkgname-dev $pkgname-doc" +source="http://www.cairographics.org/releases/cairomm-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="559afbc47484ba3fad265e38a3dafe90 cairomm-1.8.4.tar.gz" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ccache -pkgver=2.4 -pkgrel=1 +pkgver=3.0 +pkgrel=0 pkgdesc="ccache is a compiler cache" url="http://ccache.samba.org/" license="GPL" @@ -15,6 +15,10 @@ build () cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver install -Dm 755 ccache "$pkgdir"/usr/bin/ccache install -Dm 644 ccache.1 "$pkgdir"/usr/share/man/man1/ccache.1 mkdir -p "$pkgdir"/usr/lib/ccache/bin @@ -29,4 +33,4 @@ build () ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/${CHOST}-cpp ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/${CHOST}-c++ } -md5sums="73c1ed1e767c1752dd0f548ec1e66ce7 ccache-2.4.tar.gz" +md5sums="98145b8ad69a96bf1abf9a52d550e507 ccache-3.0.tar.gz" diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD new file mode 100644 index 0000000000..617accbd9d --- /dev/null +++ b/main/collectd/APKBUILD @@ -0,0 +1,83 @@ +# Contributor: +# Maintainer: +pkgname=collectd +pkgver=4.9.1 +pkgrel=3 +pkgdesc="The system statistics collection daemon" +url="http://collectd.org" +license="GPL" +depends= +makedepends="pkgconfig curl-dev net-snmp-dev postgresql-dev perl-dev + libgcrypt-dev mysql-dev zlib-dev openssl-dev" +install= +subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp $pkgname-curl + $pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql + $pkgname-mysql $pkgname-network" + +source="http://collectd.org/files/collectd-$pkgver.tar.bz2 + collectd.initd" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + + # we need -lm + sed -i -e 's/^collectd_LDADD = \(.*\)/collectd_LDADD = -lm \1/' \ + -e 's/^collectd_nagios_LDADD = \(.*\)/collectd_nagios_LDADD = -lm \1/' src/Makefile.in + + # disable -Werror + sed -i -e 's/-Werror//' src/owniptc/Makefile.in + +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc/collectd \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstate=/var \ + || return 1 + make || return 1 + # disable network plugin by default since its in a subpackage + sed -i -e 's/^LoadPlugin network/#LoadPlugin network/' \ + src/collectd.conf +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + + find "$pkgdir" -name perllocal.pod -delete + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname +} + +perl() { + pkgdesc="perl bindings to collectd" + depends="perl" + install -d "$subpkgdir"/usr/lib/ "$subpkgdir"/usr/share + mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/ +} + +_plugin() { + local mod=$1 + local desc=${2:-$mod} + pkgdesc="$desc pluin for collectd" + depends="collectd" + install -d "$subpkgdir"/usr/lib/collectd + mv "$pkgdir"/usr/lib/collectd/$mod.so "$subpkgdir"/usr/lib/collectd/ +} + +snmp() { _plugin snmp; } +curl() { _plugin curl; } +write_http() { _plugin write_http; } +nginx() { _plugin nginx; } +apache() { _plugin apache; } +postgresql() { _plugin postgresql; } +mysql() { _plugin mysql; } +network() { _plugin network; } + +md5sums="5753496651c8c84afaea1fe290876bfc collectd-4.9.1.tar.bz2 +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 @@ +#!/sbin/runscript + +DAEMON=/usr/sbin/collectd + +depend() { + need net +} + +start() { + ebegin "Starting collectd" + start-stop-daemon --start --exec $DAEMON -- $collectd_options + eend $? +} + +stop () { + ebegin "Stopping collectd" + start-stop-daemon --stop --exec $DAEMON + eend $? +} + 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 pkgname=${_realname}-${_flavor} pkgver=$pkgver -_dahdiver=2.2.0.2 -_mypkgrel=2 +# when chaning _dahdiver we *must* bump _mypkgrel +_dahdiver=2.3.0.1 +_mypkgrel=3 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" url="http://www.asterisk.org" @@ -32,9 +33,6 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna dahdi-bri_dchan.patch dahdi-zaphfc.patch zaphfc-dahdi-flortz.diff - dahdi-linux-2.2.0-hfc-4s.patch - dahdi-2.6.31.patch - dahdi-2.2.0.2-driver_data-2.6.32.patch " prepare() { @@ -65,16 +63,13 @@ depends_dev="dahdi-linux-dev" dev() { default_dev local dir="$subpkgdir"/usr/src/dahdi-headers-${_abi_release} - install -D "$srcdir"/$_realname-$pkgver/drivers/dahdi/Module.symvers \ + install -D "$srcdir"/$_realname-$_dahdiver/drivers/dahdi/Module.symvers \ "$dir"/drivers/dahdi/Module.symvers ln -s /usr/include "$dir"/include } -md5sums="1f932729ad28f2f028afcf2cc5ccf7ba dahdi-linux-2.2.0.2.tar.gz +md5sums="ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch a822c092f0548cd13f5e8d8cba053af6 dahdi-zaphfc.patch -291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff -68dfe17a49cca15ae439fd83f4ccfbc5 dahdi-linux-2.2.0-hfc-4s.patch -bd5e7457ee8f37c10ed7ec383995e4fa dahdi-2.6.31.patch -7f9452ef37385e03e05147081d6951a1 dahdi-2.2.0.2-driver_data-2.6.32.patch" +291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff" 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 @@ -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 ---- dahdi-linux-2.2.0.2.ORIg/drivers/dahdi/xpp/xbus-sysfs.c 2009-10-22 18:04:47.000000000 +0100 -+++ dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-sysfs.c 2009-10-22 18:05:54.000000000 +0100 -@@ -707,7 +707,11 @@ - dev->parent = &xbus->astribank; - dev_set_name(dev, "%02d:%1x:%1x", xbus->num, xpd->addr.unit, - xpd->addr.subunit); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(dev, xpd); -+#else - dev->driver_data = xpd; -+#endif - dev->release = xpd_release; - ret = device_register(dev); - if(ret) { -@@ -728,11 +732,21 @@ - BUG_ON(!xbus); - XPD_DBG(DEVICES, xpd, "SYSFS\n"); - dev = &xpd->xpd_dev; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ if(!dev_get_drvdata(dev)) -+ return; -+ BUG_ON(dev_get_drvdata(dev) != xpd); -+#else - if(!dev->driver_data) - return; - BUG_ON(dev->driver_data != xpd); -+#endif - device_unregister(dev); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(dev, NULL); -+#else - dev->driver_data = NULL; -+#endif - } - - /*--------- Sysfs Device handling ----*/ -@@ -746,9 +760,15 @@ - astribank = &xbus->astribank; - BUG_ON(!astribank); - sysfs_remove_link(&astribank->kobj, "transport"); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ if(!dev_get_drvdata(astribank)) -+ return; -+ BUG_ON(dev_get_drvdata(astribank) != xbus); -+#else - if(!astribank->driver_data) - return; - BUG_ON(astribank->driver_data != xbus); -+#endif - device_unregister(&xbus->astribank); - } - -@@ -764,18 +784,30 @@ - astribank->bus = &toplevel_bus_type; - astribank->parent = xbus->transport.transport_device; - dev_set_name(astribank, "xbus-%02d", xbus->num); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(astribank, xbus); -+#else - astribank->driver_data = xbus; -+#endif - astribank->release = astribank_release; - ret = device_register(astribank); - if(ret) { - XBUS_ERR(xbus, "%s: device_register failed: %d\n", __FUNCTION__, ret); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(astribank, NULL); -+#else - astribank->driver_data = NULL; -+#endif - goto out; - } - ret = sysfs_create_link(&astribank->kobj, &astribank->parent->kobj, "transport"); - if(ret < 0) { - XBUS_ERR(xbus, "%s: sysfs_create_link failed: %d\n", __FUNCTION__, ret); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(astribank, NULL); -+#else - astribank->driver_data = NULL; -+#endif - goto out; - } - 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 @@ -Index: drivers/dahdi/wctc4xxp/base.c -=================================================================== ---- a/drivers/dahdi/wctc4xxp/base.c (revision 6716) -+++ b/drivers/dahdi/wctc4xxp/base.c (revision 6717) -@@ -742,6 +742,17 @@ - return 0; - } - -+#ifdef HAVE_NET_DEVICE_OPS -+const struct net_device_ops wctc4xxp_netdev_ops = { -+ .ndo_set_multicast_list = &wctc4xxp_net_set_multi, -+ .ndo_open = &wctc4xxp_net_up, -+ .ndo_stop = &wctc4xxp_net_down, -+ .ndo_start_xmit = &wctc4xxp_net_hard_start_xmit, -+ .ndo_get_stats = &wctc4xxp_net_get_stats, -+ .ndo_do_ioctl = &wctc4xxp_net_ioctl, -+}; -+#endif -+ - /** - * wctc4xxp_net_register - Register a new network interface. - * @wc: transcoder card to register the interface for. -@@ -773,14 +784,21 @@ - netdev->priv = wc; - # endif - memcpy(netdev->dev_addr, our_mac, sizeof(our_mac)); -+ -+# ifdef HAVE_NET_DEVICE_OPS -+ netdev->netdev_ops = &wctc4xxp_netdev_ops; -+# else - netdev->set_multicast_list = &wctc4xxp_net_set_multi; - netdev->open = &wctc4xxp_net_up; - netdev->stop = &wctc4xxp_net_down; - netdev->hard_start_xmit = &wctc4xxp_net_hard_start_xmit; - netdev->get_stats = &wctc4xxp_net_get_stats; - netdev->do_ioctl = &wctc4xxp_net_ioctl; -+# endif -+ - netdev->promiscuity = 0; - netdev->flags |= IFF_NOARP; -+ - # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) - netdev->poll = &wctc4xxp_poll; - 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 @@ ---- a/drivers/dahdi/wcb4xxp/base.c 2009-06-24 13:17:03.000000000 +0000 -+++ b/drivers/dahdi/wcb4xxp/base.c 2009-06-24 13:40:15.000000000 +0000 -@@ -75,7 +75,7 @@ - #define DBG_SPANFILTER ((1 << bspan->port) & spanfilter) - - static int debug = 0; --static int spanfilter = 15; -+static int spanfilter = 255; /* Bitmap .. 1, 2, 4, 8, 16, 32, 64, 128 for ports 1-8 */ - #ifdef LOOPBACK_SUPPORTED - static int loopback = 0; - #endif -@@ -114,9 +114,21 @@ - struct devtype { - char *desc; - unsigned int flags; -+ int ports; /* Number of ports the card has */ -+ int has_ec; /* Does the card have an Echo Canceller */ -+ enum cards_ids card_type; /* Card type - Digium B410P, ... */ - }; - --static struct devtype wcb4xxp = { "Wildcard B410P", 0 }; -+static struct devtype wcb4xxp = { "Wildcard B410P", .ports = 4, .has_ec = 1, .card_type = B410P }; -+static struct devtype hfc2s = { "HFC-2S Junghanns.NET duoBRI PCI", .ports = 2, .has_ec = 0, .card_type = DUOBRI }; -+static struct devtype hfc4s = { "HFC-4S Junghanns.NET quadBRI PCI", .ports = 4, .has_ec = 0, .card_type = QUADBRI }; -+static struct devtype hfc8s = { "HFC-4S Junghanns.NET octoBRI PCI", .ports = 8, .has_ec = 0, .card_type = OCTOBRI }; -+static struct devtype hfc2s_OV ={ "OpenVox B200P", .ports = 2, .has_ec = 0, .card_type = B200P_OV }; -+static struct devtype hfc4s_OV ={ "OpenVox B400P", .ports = 4, .has_ec = 0, .card_type = B400P_OV }; -+static struct devtype hfc8s_OV ={ "OpenVox B800P", .ports = 8, .has_ec = 0, .card_type = B800P_OV }; -+static struct devtype hfc2s_BN ={ "BeroNet BN2S0", .ports = 2, .has_ec = 0, .card_type = BN2S0 }; -+static struct devtype hfc4s_BN ={ "BeroNet BN4S0", .ports = 4, .has_ec = 0, .card_type = BN4S0 }; -+static struct devtype hfc8s_BN ={ "BeroNet BN8S0", .ports = 8, .has_ec = 0, .card_type = BN8S0 }; - - static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp, - struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec); -@@ -403,7 +415,14 @@ - - mb(); - -- b4xxp_setreg8(b4, R_GPIO_SEL, 0xf0); /* GPIO0..7 S/T, 8..15 GPIO */ -+ if ((b4->card_type == OCTOBRI) || (b4->card_type == B800P_OV) || (b4->card_type == BN8S0)) -+ { -+ b4xxp_setreg8(b4, R_GPIO_SEL, 0x00); /* GPIO0..15 S/T - HFC-8S uses GPIO8-15 for S/T ports 5-8 */ -+ } -+ else -+ { -+ b4xxp_setreg8(b4, R_GPIO_SEL, 0xf0); /* GPIO0..7 S/T, 8..15 GPIO */ -+ } - - mb(); - -@@ -618,13 +637,16 @@ - unsigned char b; - unsigned int i, j, mask; - -+ if (! b4->has_ec) /* Avoid Echo Cancelling for non hardware echo canceller cards */ -+ return; -+ - /* Setup GPIO */ - for (i=0; i < NUM_EC; i++) { - b = ec_read(b4, i, 0x1a0); - - dev_info(b4->dev, "VPM %d/%d init: chip ver %02x\n", i, NUM_EC - 1, b); - -- for (j=0; j < 4; j++) { -+ for (j=0; j < b4->numspans; j++) { - ec_write(b4, i, 0x1a8 + j, 0x00); /* GPIO out */ - ec_write(b4, i, 0x1ac + j, 0x00); /* GPIO dir */ - ec_write(b4, i, 0x1b0 + j, 0x00); /* GPIO sel */ -@@ -1008,7 +1030,15 @@ - int fifo, hfc_chan; - unsigned long irq_flags; - -- fifo = port + 8; -+ if ((b4->card_type == B800P_OV) || (b4->card_type == OCTOBRI) || (b4->card_type == BN8S0)) -+ { -+ fifo = port + 16; /* In HFC-8S cards we can't use ports 8-11 for dchan FIFOs */ -+ } -+ else -+ { -+ fifo = port + 8; -+ } -+ - hfc_chan = (port * 4) + 2; - - /* record the host's FIFO # in the span fifo array */ -@@ -1210,7 +1240,7 @@ - int i, j; - struct b4xxp_span *s; - -- for (i=0; i < 4; i++) { -+ for (i=0; i < b4->numspans; i++) { - s = &b4->spans[i]; - - for (j=HFC_T1; j <= HFC_T3; j++) { -@@ -1413,12 +1443,21 @@ - - gpio = b4xxp_getreg8(b4, R_GPI_IN3); - -- for (i=0; i < 4; i++) { -+ for (i=0; i < b4->numspans; i++) { - s = &b4->spans[i]; - s->parent = b4; - s->port = i; - -- nt = ((gpio & (1 << (i + 4))) == 0); /* GPIO=0 = NT mode */ -+ /* The way the Digium B410P card reads the NT/TE mode -+ * jumper is the oposite of how other HFC-4S cards do: -+ * - In B410P: GPIO=0: NT -+ * - In Junghanns: GPIO=0: TE -+ */ -+ if (b4->card_type == B410P) -+ nt = ((gpio & (1 << (i + 4))) == 0); -+ else -+ nt = ((gpio & (1 << (i + 4))) != 0); -+ - s->te_mode = !nt; - - dev_info(b4->dev, "Port %d: %s mode\n", i + 1, (nt ? "NT" : "TE")); -@@ -1774,9 +1813,15 @@ - - /* - * set up the clock controller -- * we have a 24.576MHz crystal, so the PCM clock is 2x the incoming clock. -+ * B410P has a 24.576MHz crystal, so the PCM clock is 2x the incoming clock. -+ * Other cards have a 49.152Mhz crystal, so the PCM clock equals incoming clock. - */ -- b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x02); -+ -+ if (b4->card_type == B410P) -+ b4xxp_setreg8(b4, R_BRG_PCM_CFG,0x02); -+ else -+ b4xxp_setreg8(b4, R_BRG_PCM_CFG, V_PCM_CLK); -+ - flush_pci(); - - udelay(100); /* wait a bit for clock to settle */ -@@ -1807,7 +1852,7 @@ - - /* - * set up the flow controller. -- * B channel map: -+ * B channel map: (4 ports cards with Hardware Echo Cancel present & active) - * FIFO 0 connects Port 1 B0 using HFC channel 16 and PCM timeslots 0/1. - * FIFO 1 connects Port 1 B1 using HFC channel 17 and PCM timeslots 4/5. - * FIFO 2 connects Port 2 B0 using HFC channel 20 and PCM timeslots 8/9. -@@ -1822,14 +1867,35 @@ - * - * D channels are handled by FIFOs 8-11. - * FIFO 8 connects Port 1 D using HFC channel 3 -- * FIFO 9 connects Port 1 D using HFC channel 7 -- * FIFO 10 connects Port 1 D using HFC channel 11 -- * FIFO 11 connects Port 1 D using HFC channel 15 -+ * FIFO 9 connects Port 2 D using HFC channel 7 -+ * FIFO 10 connects Port 3 D using HFC channel 11 -+ * FIFO 11 connects Port 4 D using HFC channel 15 -+ * -+ * D channel FIFOs are operated in HDLC mode and interrupt on end of frame. -+ * -+ * B channel map: (8 ports cards without Hardware Echo Cancel) -+ * FIFO 0 connects Port 1 B0 using HFC channel 0 -+ * FIFO 1 connects Port 1 B1 using HFC channel 1 -+ * FIFO 2 connects Port 2 B0 using HFC channel 4 -+ * FIFO 3 connects Port 2 B1 using HFC channel 5 -+ * ......................... -+ * FIFO 14 connects Port 8 B0 using HFC channel 28 -+ * FIFO 15 connects Port 8 B1 using HFC channel 29 -+ * -+ * All B channel FIFOs have their HDLC controller in transparent mode, -+ * and only the FIFO for B0 on each port has its interrupt operational. - * -+ * D channels are handled by FIFOs 16-23. -+ * FIFO 16 connects Port 1 D using HFC channel 3 -+ * FIFO 17 connects Port 2 D using HFC channel 7 -+ * FIFO 18 connects Port 3 D using HFC channel 11 -+ * FIFO 19 connects Port 4 D using HFC channel 15 -+ * ................ -+ * FIFO 23 connects Port 8 D using HFC channel 31 - * D channel FIFOs are operated in HDLC mode and interrupt on end of frame. - */ - for (span=0; span < b4->numspans; span++) { -- if (vpmsupport) { -+ if ((vpmsupport) && (b4->has_ec)) { - hfc_assign_bchan_fifo_ec(b4, span, 0); - hfc_assign_bchan_fifo_ec(b4, span, 1); - } else { -@@ -1854,6 +1920,145 @@ - ec_write(b4, 0, 0x1a8 + 3, val); - } - -+static void b4xxp_update_leds_hfc_8s(struct b4xxp *b4) -+{ -+ unsigned long lled; -+ unsigned long leddw; -+ int i,j; -+ struct b4xxp_span *bspan; -+ lled = 0; -+ j=8; -+ -+ b4->blinktimer++; -+ for (i=0; i < 8; i++) { -+ bspan = &b4->spans[i]; -+ j = j -1 ; /* Leds are in reverse order - Led 7 => Port 0 */ -+ if (bspan->span.flags & DAHDI_FLAG_RUNNING) { -+ if (bspan->span.alarms) { -+ lled |= 1 << j; /* Led OFF in alarm state */ -+ } else if (bspan->span.mainttimer || bspan->span.maintstat) { -+ if (b4->blinktimer >= 0x7f) /* Led Blinking in maint state */ -+ { -+ lled |= 1 << j; -+ } -+ else -+ { -+ lled |= 0 << j; -+ } -+ } else { -+ -+ lled |= 0 << j; /* Led ON - No alarms */ -+ } -+ } -+ else -+ lled |= 1 << j; /* Led OFF - Not running */ -+ } -+ /* Write Leds...*/ -+ leddw = lled << 24 | lled << 16 | lled << 8 | lled; -+ b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x21); -+ iowrite16(0x4000, b4->ioaddr + 4); -+ iowrite32(leddw, b4->ioaddr); -+ b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x20); -+ -+ if (b4->blinktimer == 0xff) { -+ b4->blinktimer = -1; -+ } -+} -+ -+static void b4xxp_update_leds_hfc(struct b4xxp *b4) -+{ -+ int i, leds; -+ int led[4]; -+ struct b4xxp_span *bspan; -+ -+ b4->blinktimer++; -+ for (i=0; i < b4->numspans; i++) { -+ bspan = &b4->spans[i]; -+ -+ if (bspan->span.flags & DAHDI_FLAG_RUNNING) { -+ if (bspan->span.alarms) { -+ if (b4->blinktimer >= 0x7f) /* Red blinking -> Alarm */ -+ { -+ led[i] = 2; -+ } -+ else -+ { -+ led[i] = 0; -+ } -+ } else if (bspan->span.mainttimer || bspan->span.maintstat) { -+ if (b4->blinktimer >= 0x7f) /* Green blinking -> Maint status */ -+ { -+ led[i] = 1; -+ } -+ else -+ { -+ led[i] = 0; -+ } -+ } else { -+ /* No Alarm - Green */ -+ led[i] = 1; -+ } -+ } -+ else -+ led[i] = 0; /* OFF - Not running */ -+ } -+ -+ /* Each card manage leds in a different way. So one section per card type */ -+ -+ if (b4->card_type == B400P_OV) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | -+ ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* Tested OK */ -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); -+ } -+ -+ else if (b4->card_type == QUADBRI) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | -+ ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* UNTESTED */ -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); -+ } -+ -+ else if (b4->card_type == BN4S0) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | -+ ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* UNTESTED */ -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); -+ } -+ -+ else if (b4->card_type == B200P_OV) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5); -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* Tested OK */ -+ } -+ -+ else if (b4->card_type == DUOBRI) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5); -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* UNTESTED */ -+ } -+ -+ else if (b4->card_type == BN2S0) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5); -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* UNTESTED */ -+ } -+ -+ if (b4->blinktimer == 0xff) { -+ b4->blinktimer = -1; -+ } -+ -+} -+ - static void b4xxp_set_span_led(struct b4xxp *b4, int span, unsigned char val) - { - int shift, spanmask; -@@ -1871,6 +2076,18 @@ - int i; - struct b4xxp_span *bspan; - -+ if (b4->numspans == 8) { -+ /* Use the alternative function for non-Digium HFC-8S cards */ -+ b4xxp_update_leds_hfc_8s(b4); -+ return; -+ } -+ -+ if (b4->card_type != B410P) { -+ /* Use the alternative function for non-Digium HFC-4S cards */ -+ b4xxp_update_leds_hfc(b4); -+ return; -+ } -+ - b4->blinktimer++; - for (i=0; i < b4->numspans; i++) { - bspan = &b4->spans[i]; -@@ -2174,7 +2391,7 @@ - bspan->span.close = b4xxp_close; - bspan->span.ioctl = b4xxp_ioctl; - bspan->span.hdlc_hard_xmit = b4xxp_hdlc_hard_xmit; -- if (vpmsupport) -+ if (vpmsupport && b4->has_ec) - bspan->span.echocan_create = echocan_create; - - /* HDLC stuff */ -@@ -2281,13 +2498,24 @@ - static void b4xxp_bottom_half(unsigned long data) - { - struct b4xxp *b4 = (struct b4xxp *)data; -- int i, j, k, gotrxfifo, fifo; -+ int i, j, k, gotrxfifo, fifo, fifo_low, fifo_high; - unsigned char b, b2; - - if (b4->shutdown) - return; - - gotrxfifo = 0; -+ if ( b4->numspans == 8 ) /* HFC-4S d-chan fifos 8-11 *** HFC-8S d-chan fifos 16-23 */ -+ { -+ fifo_low = 16; -+ fifo_high = 23; -+ } -+ else -+ { -+ fifo_low = 8; -+ fifo_high = 11; -+ } -+ - - for (i=0; i < 8; i++) { - b = b2 = b4->fifo_irqstatus[i]; -@@ -2296,7 +2524,7 @@ - fifo = i*4 + j; - - if (b & V_IRQ_FIFOx_TX) { -- if (fifo >=8 && fifo <= 11) { /* d-chan fifo */ -+ if (fifo >= fifo_low && fifo <= fifo_high) { /* d-chan fifos */ - /* - * WOW I don't like this. - * It's bad enough that I have to send a fake frame to get an HDLC TX FIFO interrupt, -@@ -2305,7 +2533,7 @@ - * Yuck. It works well, but yuck. - */ - do { -- k = hdlc_tx_frame(&b4->spans[fifo - 8]); -+ k = hdlc_tx_frame(&b4->spans[fifo - fifo_low]); - } while (k); - } else { - if (printk_ratelimit()) -@@ -2314,7 +2542,7 @@ - } - - if (b & V_IRQ_FIFOx_RX) { -- if (fifo >=8 && fifo <= 11) { -+ if (fifo >= fifo_low && fifo <= fifo_high) { /* dchan fifos */ - /* - * I have to loop here until hdlc_rx_frame says there are no more frames waiting. - * for whatever reason, the HFC will not generate another interrupt if there are -@@ -2322,7 +2550,7 @@ - * i.e. I get an int when F1 changes, not when F1 != F2. - */ - do { -- k = hdlc_rx_frame(&b4->spans[fifo - 8]); -+ k = hdlc_rx_frame(&b4->spans[fifo - fifo_low]); - } while (k); - } else { - if (printk_ratelimit()) -@@ -2404,8 +2632,8 @@ - sprintf(sBuf, "Card %d, PCI identifier %s, IRQ %d\n", b4->cardno + 1, b4->dev->bus_id, b4->irq); - - strcat(sBuf,"Tx:\n"); -- for (j=0; j<8; j++) { -- for (i=0; i<12; i++) { -+ for (j=0; j<(b4->numspans * 2) ; j++) { /* B Channels */ -+ for (i=0; i<(b4->numspans * 3) ; i++) { /* All Channels */ - chan = b4->spans[i/3].chans[i%3]; - sprintf(str, "%02x ", chan->writechunk[j]); - strcat(sBuf, str); -@@ -2415,8 +2643,8 @@ - } - - strcat(sBuf, "\nRx:\n"); -- for (j=0; j < 8; j++) { -- for (i=0; i < 12; i++) { -+ for (j=0; j < (b4->numspans * 2); j++) { /* B Channels */ -+ for (i=0; i < (b4->numspans * 3); i++) { /* All Channels */ - chan = b4->spans[i / 3].chans[i % 3]; - sprintf(str, "%02x%c", chan->readchunk[j], (i == 11) ? '\n' : ' '); - strcat(sBuf, str); -@@ -2424,7 +2652,7 @@ - } - - strcat(sBuf, "\nPort states:\n"); -- for (i=0; i < 4; i++) { -+ for (i=0; i < b4->numspans; i++) { - int state; - char *x; - struct b4xxp_span *s = &b4->spans[i]; -@@ -2519,7 +2747,8 @@ - /* card found, enabled and main struct allocated. Fill it out. */ - b4->magic = WCB4XXP_MAGIC; - b4->variety = dt->desc; -- -+ b4->has_ec = dt->has_ec; -+ b4->card_type = dt->card_type; - b4->pdev = pdev; - b4->dev = &pdev->dev; - pci_set_drvdata(pdev, b4); -@@ -2533,7 +2762,7 @@ - spin_lock_init(&b4->fifolock); - - x = b4xxp_getreg8(b4, R_CHIP_ID); -- if (x != 0xc0) { /* wrong chip? */ -+ if ((x != 0xc0) && ( x != 0x80)) { /* wrong chip? */ - dev_err(&pdev->dev, "Unknown/unsupported controller detected (R_CHIP_ID = 0x%02x)\n", x); - goto err_out_free_mem; - } -@@ -2548,7 +2777,7 @@ - */ - - /* TODO: determine whether this is a 2, 4 or 8 port card */ -- b4->numspans = 4; -+ b4->numspans = dt->ports; - b4->syncspan = -1; /* sync span is unknown */ - if (b4->numspans > MAX_SPANS_PER_CARD) { - dev_err(b4->dev, "Driver does not know how to handle a %d span card!\n", b4->numspans); -@@ -2696,7 +2925,17 @@ - static struct pci_device_id b4xx_ids[] __devinitdata = - { - { 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp }, -- { 0, } -+ { 0x1397, 0x16b8, 0x1397, 0xe552, 0, 0, (unsigned long)&hfc8s }, -+ { 0x1397, 0x08b4, 0x1397, 0xb520, 0, 0, (unsigned long)&hfc4s }, -+ { 0x1397, 0x08b4, 0x1397, 0xb556, 0, 0, (unsigned long)&hfc2s }, -+ { 0x1397, 0x08b4, 0x1397, 0xe884, 0, 0, (unsigned long)&hfc2s_OV }, -+ { 0x1397, 0x08b4, 0x1397, 0xe888, 0, 0, (unsigned long)&hfc4s_OV }, -+ { 0x1397, 0x16b8, 0x1397, 0xe998, 0, 0, (unsigned long)&hfc8s_OV }, -+ { 0x1397, 0x08b4, 0x1397, 0xb566, 0, 0, (unsigned long)&hfc2s_BN }, -+ { 0x1397, 0x08b4, 0x1397, 0xb560, 0, 0, (unsigned long)&hfc4s_BN }, -+ { 0x1397, 0x16b8, 0x1397, 0xb562, 0, 0, (unsigned long)&hfc8s_BN }, -+ {0, } -+ - }; - - static struct pci_driver b4xx_driver = { -@@ -2756,7 +2995,7 @@ - MODULE_PARM_DESC(timer_3_ms, "TE: msec to wait for link activation, NT: unused."); - - MODULE_AUTHOR("Digium Incorporated <support@digium.com>"); --MODULE_DESCRIPTION("B410P quad-port BRI module driver."); -+MODULE_DESCRIPTION("B410P & Similars multi-port BRI module driver."); - MODULE_LICENSE("GPL"); - - MODULE_DEVICE_TABLE(pci, b4xx_ids); ---- a/drivers/dahdi/wcb4xxp/wcb4xxp.h 2009-06-24 13:17:03.000000000 +0000 -+++ b/drivers/dahdi/wcb4xxp/wcb4xxp.h 2009-06-24 13:18:07.000000000 +0000 -@@ -378,7 +378,7 @@ - #define HFC_T3 2 - - #define WCB4XXP_MAGIC 0xb410c0de --#define MAX_SPANS_PER_CARD 4 -+#define MAX_SPANS_PER_CARD 8 - - #define WCB4XXP_CHANNELS_PER_SPAN 3 /* 2 B-channels and 1 D-Channel for each BRI span */ - #define WCB4XXP_HDLC_BUF_LEN 32 /* arbitrary, just the max # of byts we will send to DAHDI per call */ -@@ -415,6 +415,19 @@ - struct dahdi_chan _chans[WCB4XXP_CHANNELS_PER_SPAN]; /* Backing memory */ - }; - -+enum cards_ids { /* Cards ==> Brand & Model */ -+ B410P = 0, /* Digium B410P */ -+ B200P_OV, /* OpenVox B200P */ -+ B400P_OV, /* OpenVox B400P */ -+ B800P_OV, /* OpenVox B800P */ -+ DUOBRI, /* HFC-2S Junghanns.NET duoBRI PCI */ -+ QUADBRI, /* HFC-4S Junghanns.NET quadBRI PCI */ -+ OCTOBRI, /* HFC-8S Junghanns.NET octoBRI PCI */ -+ BN2S0, /* BeroNet BN2S0 */ -+ BN4S0, /* Beronet BN4S0 */ -+ BN8S0 /* BeroNet BN8S0 */ -+ }; -+ - /* This structure exists one per card */ - struct b4xxp { - unsigned magic; /* magic value to make sure we're looking at our struct */ -@@ -449,10 +462,12 @@ - int globalconfig; /* Whether global setup has been done */ - int syncspan; /* span that HFC uses for sync on this card */ - int running; /* interrupts are enabled */ -- -+ - struct b4xxp_span spans[MAX_SPANS_PER_CARD]; /* Individual spans */ - int order; /* Order */ - int flags; /* Device flags */ -+ int has_ec; /* Has ECHO Cancel */ -+ enum cards_ids card_type; /* Card Identifier (using ids_cards enum)*/ - int master; /* Are we master */ - int ledreg; /* copy of the LED Register */ - 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 pkgname=${_realname}-${_flavor} pkgver=$pkgver -_dahdiver=2.2.0.2 -_mypkgrel=2 +# when bumping _dahdiver we *must* bump _mypkgrel +_dahdiver=2.3.0.1 +_mypkgrel=3 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" url="http://www.asterisk.org" @@ -32,10 +33,6 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna dahdi-bri_dchan.patch dahdi-zaphfc.patch zaphfc-dahdi-flortz.diff - dahdi-linux-2.2.0-hfc-4s.patch - dahdi-2.6.31.patch - dahdi-2.2.0.2-driver_data-2.6.32.patch - dahdi-2.2.0.2-includes.patch dahdi-2.2.0.2-gcc44-hack.patch " @@ -67,18 +64,14 @@ depends_dev="dahdi-linux-dev" dev() { default_dev local dir="$subpkgdir"/usr/src/dahdi-headers-${_abi_release} - install -D "$srcdir"/$_realname-$pkgver/drivers/dahdi/Module.symvers \ + install -D "$srcdir"/$_realname-$_dahdiver/drivers/dahdi/Module.symvers \ "$dir"/drivers/dahdi/Module.symvers ln -s /usr/include "$dir"/include } -md5sums="1f932729ad28f2f028afcf2cc5ccf7ba dahdi-linux-2.2.0.2.tar.gz +md5sums="ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 4b41a82ff390ac64c08092c5a3eab6a8 dahdi-bri_dchan.patch 3be420539f5e2e2b94a1bf3d711ec630 dahdi-zaphfc.patch 291c5c44c86ab02443a742415461ddca zaphfc-dahdi-flortz.diff -68dfe17a49cca15ae439fd83f4ccfbc5 dahdi-linux-2.2.0-hfc-4s.patch -bd5e7457ee8f37c10ed7ec383995e4fa dahdi-2.6.31.patch -7f9452ef37385e03e05147081d6951a1 dahdi-2.2.0.2-driver_data-2.6.32.patch -6c208d6346a3668cea900baa45298f6a dahdi-2.2.0.2-includes.patch 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 @@ -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 ---- dahdi-linux-2.2.0.2.ORIg/drivers/dahdi/xpp/xbus-sysfs.c 2009-10-22 18:04:47.000000000 +0100 -+++ dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-sysfs.c 2009-10-22 18:05:54.000000000 +0100 -@@ -707,7 +707,11 @@ - dev->parent = &xbus->astribank; - dev_set_name(dev, "%02d:%1x:%1x", xbus->num, xpd->addr.unit, - xpd->addr.subunit); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(dev, xpd); -+#else - dev->driver_data = xpd; -+#endif - dev->release = xpd_release; - ret = device_register(dev); - if(ret) { -@@ -728,11 +732,21 @@ - BUG_ON(!xbus); - XPD_DBG(DEVICES, xpd, "SYSFS\n"); - dev = &xpd->xpd_dev; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ if(!dev_get_drvdata(dev)) -+ return; -+ BUG_ON(dev_get_drvdata(dev) != xpd); -+#else - if(!dev->driver_data) - return; - BUG_ON(dev->driver_data != xpd); -+#endif - device_unregister(dev); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(dev, NULL); -+#else - dev->driver_data = NULL; -+#endif - } - - /*--------- Sysfs Device handling ----*/ -@@ -746,9 +760,15 @@ - astribank = &xbus->astribank; - BUG_ON(!astribank); - sysfs_remove_link(&astribank->kobj, "transport"); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ if(!dev_get_drvdata(astribank)) -+ return; -+ BUG_ON(dev_get_drvdata(astribank) != xbus); -+#else - if(!astribank->driver_data) - return; - BUG_ON(astribank->driver_data != xbus); -+#endif - device_unregister(&xbus->astribank); - } - -@@ -764,18 +784,30 @@ - astribank->bus = &toplevel_bus_type; - astribank->parent = xbus->transport.transport_device; - dev_set_name(astribank, "xbus-%02d", xbus->num); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(astribank, xbus); -+#else - astribank->driver_data = xbus; -+#endif - astribank->release = astribank_release; - ret = device_register(astribank); - if(ret) { - XBUS_ERR(xbus, "%s: device_register failed: %d\n", __FUNCTION__, ret); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(astribank, NULL); -+#else - astribank->driver_data = NULL; -+#endif - goto out; - } - ret = sysfs_create_link(&astribank->kobj, &astribank->parent->kobj, "transport"); - if(ret < 0) { - XBUS_ERR(xbus, "%s: sysfs_create_link failed: %d\n", __FUNCTION__, ret); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ dev_set_drvdata(astribank, NULL); -+#else - astribank->driver_data = NULL; -+#endif - goto out; - } - 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 @@ -Index: drivers/dahdi/wctc4xxp/base.c -=================================================================== ---- a/drivers/dahdi/wctc4xxp/base.c (revision 6716) -+++ b/drivers/dahdi/wctc4xxp/base.c (revision 6717) -@@ -742,6 +742,17 @@ - return 0; - } - -+#ifdef HAVE_NET_DEVICE_OPS -+const struct net_device_ops wctc4xxp_netdev_ops = { -+ .ndo_set_multicast_list = &wctc4xxp_net_set_multi, -+ .ndo_open = &wctc4xxp_net_up, -+ .ndo_stop = &wctc4xxp_net_down, -+ .ndo_start_xmit = &wctc4xxp_net_hard_start_xmit, -+ .ndo_get_stats = &wctc4xxp_net_get_stats, -+ .ndo_do_ioctl = &wctc4xxp_net_ioctl, -+}; -+#endif -+ - /** - * wctc4xxp_net_register - Register a new network interface. - * @wc: transcoder card to register the interface for. -@@ -773,14 +784,21 @@ - netdev->priv = wc; - # endif - memcpy(netdev->dev_addr, our_mac, sizeof(our_mac)); -+ -+# ifdef HAVE_NET_DEVICE_OPS -+ netdev->netdev_ops = &wctc4xxp_netdev_ops; -+# else - netdev->set_multicast_list = &wctc4xxp_net_set_multi; - netdev->open = &wctc4xxp_net_up; - netdev->stop = &wctc4xxp_net_down; - netdev->hard_start_xmit = &wctc4xxp_net_hard_start_xmit; - netdev->get_stats = &wctc4xxp_net_get_stats; - netdev->do_ioctl = &wctc4xxp_net_ioctl; -+# endif -+ - netdev->promiscuity = 0; - netdev->flags |= IFF_NOARP; -+ - # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) - netdev->poll = &wctc4xxp_poll; - 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 @@ ---- a/drivers/dahdi/wcb4xxp/base.c 2009-06-24 13:17:03.000000000 +0000 -+++ b/drivers/dahdi/wcb4xxp/base.c 2009-06-24 13:40:15.000000000 +0000 -@@ -75,7 +75,7 @@ - #define DBG_SPANFILTER ((1 << bspan->port) & spanfilter) - - static int debug = 0; --static int spanfilter = 15; -+static int spanfilter = 255; /* Bitmap .. 1, 2, 4, 8, 16, 32, 64, 128 for ports 1-8 */ - #ifdef LOOPBACK_SUPPORTED - static int loopback = 0; - #endif -@@ -114,9 +114,21 @@ - struct devtype { - char *desc; - unsigned int flags; -+ int ports; /* Number of ports the card has */ -+ int has_ec; /* Does the card have an Echo Canceller */ -+ enum cards_ids card_type; /* Card type - Digium B410P, ... */ - }; - --static struct devtype wcb4xxp = { "Wildcard B410P", 0 }; -+static struct devtype wcb4xxp = { "Wildcard B410P", .ports = 4, .has_ec = 1, .card_type = B410P }; -+static struct devtype hfc2s = { "HFC-2S Junghanns.NET duoBRI PCI", .ports = 2, .has_ec = 0, .card_type = DUOBRI }; -+static struct devtype hfc4s = { "HFC-4S Junghanns.NET quadBRI PCI", .ports = 4, .has_ec = 0, .card_type = QUADBRI }; -+static struct devtype hfc8s = { "HFC-4S Junghanns.NET octoBRI PCI", .ports = 8, .has_ec = 0, .card_type = OCTOBRI }; -+static struct devtype hfc2s_OV ={ "OpenVox B200P", .ports = 2, .has_ec = 0, .card_type = B200P_OV }; -+static struct devtype hfc4s_OV ={ "OpenVox B400P", .ports = 4, .has_ec = 0, .card_type = B400P_OV }; -+static struct devtype hfc8s_OV ={ "OpenVox B800P", .ports = 8, .has_ec = 0, .card_type = B800P_OV }; -+static struct devtype hfc2s_BN ={ "BeroNet BN2S0", .ports = 2, .has_ec = 0, .card_type = BN2S0 }; -+static struct devtype hfc4s_BN ={ "BeroNet BN4S0", .ports = 4, .has_ec = 0, .card_type = BN4S0 }; -+static struct devtype hfc8s_BN ={ "BeroNet BN8S0", .ports = 8, .has_ec = 0, .card_type = BN8S0 }; - - static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp, - struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec); -@@ -403,7 +415,14 @@ - - mb(); - -- b4xxp_setreg8(b4, R_GPIO_SEL, 0xf0); /* GPIO0..7 S/T, 8..15 GPIO */ -+ if ((b4->card_type == OCTOBRI) || (b4->card_type == B800P_OV) || (b4->card_type == BN8S0)) -+ { -+ b4xxp_setreg8(b4, R_GPIO_SEL, 0x00); /* GPIO0..15 S/T - HFC-8S uses GPIO8-15 for S/T ports 5-8 */ -+ } -+ else -+ { -+ b4xxp_setreg8(b4, R_GPIO_SEL, 0xf0); /* GPIO0..7 S/T, 8..15 GPIO */ -+ } - - mb(); - -@@ -618,13 +637,16 @@ - unsigned char b; - unsigned int i, j, mask; - -+ if (! b4->has_ec) /* Avoid Echo Cancelling for non hardware echo canceller cards */ -+ return; -+ - /* Setup GPIO */ - for (i=0; i < NUM_EC; i++) { - b = ec_read(b4, i, 0x1a0); - - dev_info(b4->dev, "VPM %d/%d init: chip ver %02x\n", i, NUM_EC - 1, b); - -- for (j=0; j < 4; j++) { -+ for (j=0; j < b4->numspans; j++) { - ec_write(b4, i, 0x1a8 + j, 0x00); /* GPIO out */ - ec_write(b4, i, 0x1ac + j, 0x00); /* GPIO dir */ - ec_write(b4, i, 0x1b0 + j, 0x00); /* GPIO sel */ -@@ -1008,7 +1030,15 @@ - int fifo, hfc_chan; - unsigned long irq_flags; - -- fifo = port + 8; -+ if ((b4->card_type == B800P_OV) || (b4->card_type == OCTOBRI) || (b4->card_type == BN8S0)) -+ { -+ fifo = port + 16; /* In HFC-8S cards we can't use ports 8-11 for dchan FIFOs */ -+ } -+ else -+ { -+ fifo = port + 8; -+ } -+ - hfc_chan = (port * 4) + 2; - - /* record the host's FIFO # in the span fifo array */ -@@ -1210,7 +1240,7 @@ - int i, j; - struct b4xxp_span *s; - -- for (i=0; i < 4; i++) { -+ for (i=0; i < b4->numspans; i++) { - s = &b4->spans[i]; - - for (j=HFC_T1; j <= HFC_T3; j++) { -@@ -1413,12 +1443,21 @@ - - gpio = b4xxp_getreg8(b4, R_GPI_IN3); - -- for (i=0; i < 4; i++) { -+ for (i=0; i < b4->numspans; i++) { - s = &b4->spans[i]; - s->parent = b4; - s->port = i; - -- nt = ((gpio & (1 << (i + 4))) == 0); /* GPIO=0 = NT mode */ -+ /* The way the Digium B410P card reads the NT/TE mode -+ * jumper is the oposite of how other HFC-4S cards do: -+ * - In B410P: GPIO=0: NT -+ * - In Junghanns: GPIO=0: TE -+ */ -+ if (b4->card_type == B410P) -+ nt = ((gpio & (1 << (i + 4))) == 0); -+ else -+ nt = ((gpio & (1 << (i + 4))) != 0); -+ - s->te_mode = !nt; - - dev_info(b4->dev, "Port %d: %s mode\n", i + 1, (nt ? "NT" : "TE")); -@@ -1774,9 +1813,15 @@ - - /* - * set up the clock controller -- * we have a 24.576MHz crystal, so the PCM clock is 2x the incoming clock. -+ * B410P has a 24.576MHz crystal, so the PCM clock is 2x the incoming clock. -+ * Other cards have a 49.152Mhz crystal, so the PCM clock equals incoming clock. - */ -- b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x02); -+ -+ if (b4->card_type == B410P) -+ b4xxp_setreg8(b4, R_BRG_PCM_CFG,0x02); -+ else -+ b4xxp_setreg8(b4, R_BRG_PCM_CFG, V_PCM_CLK); -+ - flush_pci(); - - udelay(100); /* wait a bit for clock to settle */ -@@ -1807,7 +1852,7 @@ - - /* - * set up the flow controller. -- * B channel map: -+ * B channel map: (4 ports cards with Hardware Echo Cancel present & active) - * FIFO 0 connects Port 1 B0 using HFC channel 16 and PCM timeslots 0/1. - * FIFO 1 connects Port 1 B1 using HFC channel 17 and PCM timeslots 4/5. - * FIFO 2 connects Port 2 B0 using HFC channel 20 and PCM timeslots 8/9. -@@ -1822,14 +1867,35 @@ - * - * D channels are handled by FIFOs 8-11. - * FIFO 8 connects Port 1 D using HFC channel 3 -- * FIFO 9 connects Port 1 D using HFC channel 7 -- * FIFO 10 connects Port 1 D using HFC channel 11 -- * FIFO 11 connects Port 1 D using HFC channel 15 -+ * FIFO 9 connects Port 2 D using HFC channel 7 -+ * FIFO 10 connects Port 3 D using HFC channel 11 -+ * FIFO 11 connects Port 4 D using HFC channel 15 -+ * -+ * D channel FIFOs are operated in HDLC mode and interrupt on end of frame. -+ * -+ * B channel map: (8 ports cards without Hardware Echo Cancel) -+ * FIFO 0 connects Port 1 B0 using HFC channel 0 -+ * FIFO 1 connects Port 1 B1 using HFC channel 1 -+ * FIFO 2 connects Port 2 B0 using HFC channel 4 -+ * FIFO 3 connects Port 2 B1 using HFC channel 5 -+ * ......................... -+ * FIFO 14 connects Port 8 B0 using HFC channel 28 -+ * FIFO 15 connects Port 8 B1 using HFC channel 29 -+ * -+ * All B channel FIFOs have their HDLC controller in transparent mode, -+ * and only the FIFO for B0 on each port has its interrupt operational. - * -+ * D channels are handled by FIFOs 16-23. -+ * FIFO 16 connects Port 1 D using HFC channel 3 -+ * FIFO 17 connects Port 2 D using HFC channel 7 -+ * FIFO 18 connects Port 3 D using HFC channel 11 -+ * FIFO 19 connects Port 4 D using HFC channel 15 -+ * ................ -+ * FIFO 23 connects Port 8 D using HFC channel 31 - * D channel FIFOs are operated in HDLC mode and interrupt on end of frame. - */ - for (span=0; span < b4->numspans; span++) { -- if (vpmsupport) { -+ if ((vpmsupport) && (b4->has_ec)) { - hfc_assign_bchan_fifo_ec(b4, span, 0); - hfc_assign_bchan_fifo_ec(b4, span, 1); - } else { -@@ -1854,6 +1920,145 @@ - ec_write(b4, 0, 0x1a8 + 3, val); - } - -+static void b4xxp_update_leds_hfc_8s(struct b4xxp *b4) -+{ -+ unsigned long lled; -+ unsigned long leddw; -+ int i,j; -+ struct b4xxp_span *bspan; -+ lled = 0; -+ j=8; -+ -+ b4->blinktimer++; -+ for (i=0; i < 8; i++) { -+ bspan = &b4->spans[i]; -+ j = j -1 ; /* Leds are in reverse order - Led 7 => Port 0 */ -+ if (bspan->span.flags & DAHDI_FLAG_RUNNING) { -+ if (bspan->span.alarms) { -+ lled |= 1 << j; /* Led OFF in alarm state */ -+ } else if (bspan->span.mainttimer || bspan->span.maintstat) { -+ if (b4->blinktimer >= 0x7f) /* Led Blinking in maint state */ -+ { -+ lled |= 1 << j; -+ } -+ else -+ { -+ lled |= 0 << j; -+ } -+ } else { -+ -+ lled |= 0 << j; /* Led ON - No alarms */ -+ } -+ } -+ else -+ lled |= 1 << j; /* Led OFF - Not running */ -+ } -+ /* Write Leds...*/ -+ leddw = lled << 24 | lled << 16 | lled << 8 | lled; -+ b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x21); -+ iowrite16(0x4000, b4->ioaddr + 4); -+ iowrite32(leddw, b4->ioaddr); -+ b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x20); -+ -+ if (b4->blinktimer == 0xff) { -+ b4->blinktimer = -1; -+ } -+} -+ -+static void b4xxp_update_leds_hfc(struct b4xxp *b4) -+{ -+ int i, leds; -+ int led[4]; -+ struct b4xxp_span *bspan; -+ -+ b4->blinktimer++; -+ for (i=0; i < b4->numspans; i++) { -+ bspan = &b4->spans[i]; -+ -+ if (bspan->span.flags & DAHDI_FLAG_RUNNING) { -+ if (bspan->span.alarms) { -+ if (b4->blinktimer >= 0x7f) /* Red blinking -> Alarm */ -+ { -+ led[i] = 2; -+ } -+ else -+ { -+ led[i] = 0; -+ } -+ } else if (bspan->span.mainttimer || bspan->span.maintstat) { -+ if (b4->blinktimer >= 0x7f) /* Green blinking -> Maint status */ -+ { -+ led[i] = 1; -+ } -+ else -+ { -+ led[i] = 0; -+ } -+ } else { -+ /* No Alarm - Green */ -+ led[i] = 1; -+ } -+ } -+ else -+ led[i] = 0; /* OFF - Not running */ -+ } -+ -+ /* Each card manage leds in a different way. So one section per card type */ -+ -+ if (b4->card_type == B400P_OV) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | -+ ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* Tested OK */ -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); -+ } -+ -+ else if (b4->card_type == QUADBRI) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | -+ ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* UNTESTED */ -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); -+ } -+ -+ else if (b4->card_type == BN4S0) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[2] > 0) << 2) | ((led[3] > 0) << 3) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5) | -+ ((led[2] & 1) << 6) | ((led[3] & 1) << 7); /* UNTESTED */ -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); -+ } -+ -+ else if (b4->card_type == B200P_OV) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5); -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* Tested OK */ -+ } -+ -+ else if (b4->card_type == DUOBRI) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5); -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* UNTESTED */ -+ } -+ -+ else if (b4->card_type == BN2S0) { -+ leds = ((led[0] > 0) << 0) | ((led[1] > 0) << 1) | -+ ((led[0] & 1) << 4) | ((led[1] & 1) << 5); -+ b4xxp_setreg8(b4, R_GPIO_EN1, leds & 0x0f); -+ b4xxp_setreg8(b4, R_GPIO_OUT1, leds >> 4); /* UNTESTED */ -+ } -+ -+ if (b4->blinktimer == 0xff) { -+ b4->blinktimer = -1; -+ } -+ -+} -+ - static void b4xxp_set_span_led(struct b4xxp *b4, int span, unsigned char val) - { - int shift, spanmask; -@@ -1871,6 +2076,18 @@ - int i; - struct b4xxp_span *bspan; - -+ if (b4->numspans == 8) { -+ /* Use the alternative function for non-Digium HFC-8S cards */ -+ b4xxp_update_leds_hfc_8s(b4); -+ return; -+ } -+ -+ if (b4->card_type != B410P) { -+ /* Use the alternative function for non-Digium HFC-4S cards */ -+ b4xxp_update_leds_hfc(b4); -+ return; -+ } -+ - b4->blinktimer++; - for (i=0; i < b4->numspans; i++) { - bspan = &b4->spans[i]; -@@ -2174,7 +2391,7 @@ - bspan->span.close = b4xxp_close; - bspan->span.ioctl = b4xxp_ioctl; - bspan->span.hdlc_hard_xmit = b4xxp_hdlc_hard_xmit; -- if (vpmsupport) -+ if (vpmsupport && b4->has_ec) - bspan->span.echocan_create = echocan_create; - - /* HDLC stuff */ -@@ -2281,13 +2498,24 @@ - static void b4xxp_bottom_half(unsigned long data) - { - struct b4xxp *b4 = (struct b4xxp *)data; -- int i, j, k, gotrxfifo, fifo; -+ int i, j, k, gotrxfifo, fifo, fifo_low, fifo_high; - unsigned char b, b2; - - if (b4->shutdown) - return; - - gotrxfifo = 0; -+ if ( b4->numspans == 8 ) /* HFC-4S d-chan fifos 8-11 *** HFC-8S d-chan fifos 16-23 */ -+ { -+ fifo_low = 16; -+ fifo_high = 23; -+ } -+ else -+ { -+ fifo_low = 8; -+ fifo_high = 11; -+ } -+ - - for (i=0; i < 8; i++) { - b = b2 = b4->fifo_irqstatus[i]; -@@ -2296,7 +2524,7 @@ - fifo = i*4 + j; - - if (b & V_IRQ_FIFOx_TX) { -- if (fifo >=8 && fifo <= 11) { /* d-chan fifo */ -+ if (fifo >= fifo_low && fifo <= fifo_high) { /* d-chan fifos */ - /* - * WOW I don't like this. - * It's bad enough that I have to send a fake frame to get an HDLC TX FIFO interrupt, -@@ -2305,7 +2533,7 @@ - * Yuck. It works well, but yuck. - */ - do { -- k = hdlc_tx_frame(&b4->spans[fifo - 8]); -+ k = hdlc_tx_frame(&b4->spans[fifo - fifo_low]); - } while (k); - } else { - if (printk_ratelimit()) -@@ -2314,7 +2542,7 @@ - } - - if (b & V_IRQ_FIFOx_RX) { -- if (fifo >=8 && fifo <= 11) { -+ if (fifo >= fifo_low && fifo <= fifo_high) { /* dchan fifos */ - /* - * I have to loop here until hdlc_rx_frame says there are no more frames waiting. - * for whatever reason, the HFC will not generate another interrupt if there are -@@ -2322,7 +2550,7 @@ - * i.e. I get an int when F1 changes, not when F1 != F2. - */ - do { -- k = hdlc_rx_frame(&b4->spans[fifo - 8]); -+ k = hdlc_rx_frame(&b4->spans[fifo - fifo_low]); - } while (k); - } else { - if (printk_ratelimit()) -@@ -2404,8 +2632,8 @@ - sprintf(sBuf, "Card %d, PCI identifier %s, IRQ %d\n", b4->cardno + 1, b4->dev->bus_id, b4->irq); - - strcat(sBuf,"Tx:\n"); -- for (j=0; j<8; j++) { -- for (i=0; i<12; i++) { -+ for (j=0; j<(b4->numspans * 2) ; j++) { /* B Channels */ -+ for (i=0; i<(b4->numspans * 3) ; i++) { /* All Channels */ - chan = b4->spans[i/3].chans[i%3]; - sprintf(str, "%02x ", chan->writechunk[j]); - strcat(sBuf, str); -@@ -2415,8 +2643,8 @@ - } - - strcat(sBuf, "\nRx:\n"); -- for (j=0; j < 8; j++) { -- for (i=0; i < 12; i++) { -+ for (j=0; j < (b4->numspans * 2); j++) { /* B Channels */ -+ for (i=0; i < (b4->numspans * 3); i++) { /* All Channels */ - chan = b4->spans[i / 3].chans[i % 3]; - sprintf(str, "%02x%c", chan->readchunk[j], (i == 11) ? '\n' : ' '); - strcat(sBuf, str); -@@ -2424,7 +2652,7 @@ - } - - strcat(sBuf, "\nPort states:\n"); -- for (i=0; i < 4; i++) { -+ for (i=0; i < b4->numspans; i++) { - int state; - char *x; - struct b4xxp_span *s = &b4->spans[i]; -@@ -2519,7 +2747,8 @@ - /* card found, enabled and main struct allocated. Fill it out. */ - b4->magic = WCB4XXP_MAGIC; - b4->variety = dt->desc; -- -+ b4->has_ec = dt->has_ec; -+ b4->card_type = dt->card_type; - b4->pdev = pdev; - b4->dev = &pdev->dev; - pci_set_drvdata(pdev, b4); -@@ -2533,7 +2762,7 @@ - spin_lock_init(&b4->fifolock); - - x = b4xxp_getreg8(b4, R_CHIP_ID); -- if (x != 0xc0) { /* wrong chip? */ -+ if ((x != 0xc0) && ( x != 0x80)) { /* wrong chip? */ - dev_err(&pdev->dev, "Unknown/unsupported controller detected (R_CHIP_ID = 0x%02x)\n", x); - goto err_out_free_mem; - } -@@ -2548,7 +2777,7 @@ - */ - - /* TODO: determine whether this is a 2, 4 or 8 port card */ -- b4->numspans = 4; -+ b4->numspans = dt->ports; - b4->syncspan = -1; /* sync span is unknown */ - if (b4->numspans > MAX_SPANS_PER_CARD) { - dev_err(b4->dev, "Driver does not know how to handle a %d span card!\n", b4->numspans); -@@ -2696,7 +2925,17 @@ - static struct pci_device_id b4xx_ids[] __devinitdata = - { - { 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp }, -- { 0, } -+ { 0x1397, 0x16b8, 0x1397, 0xe552, 0, 0, (unsigned long)&hfc8s }, -+ { 0x1397, 0x08b4, 0x1397, 0xb520, 0, 0, (unsigned long)&hfc4s }, -+ { 0x1397, 0x08b4, 0x1397, 0xb556, 0, 0, (unsigned long)&hfc2s }, -+ { 0x1397, 0x08b4, 0x1397, 0xe884, 0, 0, (unsigned long)&hfc2s_OV }, -+ { 0x1397, 0x08b4, 0x1397, 0xe888, 0, 0, (unsigned long)&hfc4s_OV }, -+ { 0x1397, 0x16b8, 0x1397, 0xe998, 0, 0, (unsigned long)&hfc8s_OV }, -+ { 0x1397, 0x08b4, 0x1397, 0xb566, 0, 0, (unsigned long)&hfc2s_BN }, -+ { 0x1397, 0x08b4, 0x1397, 0xb560, 0, 0, (unsigned long)&hfc4s_BN }, -+ { 0x1397, 0x16b8, 0x1397, 0xb562, 0, 0, (unsigned long)&hfc8s_BN }, -+ {0, } -+ - }; - - static struct pci_driver b4xx_driver = { -@@ -2756,7 +2995,7 @@ - MODULE_PARM_DESC(timer_3_ms, "TE: msec to wait for link activation, NT: unused."); - - MODULE_AUTHOR("Digium Incorporated <support@digium.com>"); --MODULE_DESCRIPTION("B410P quad-port BRI module driver."); -+MODULE_DESCRIPTION("B410P & Similars multi-port BRI module driver."); - MODULE_LICENSE("GPL"); - - MODULE_DEVICE_TABLE(pci, b4xx_ids); ---- a/drivers/dahdi/wcb4xxp/wcb4xxp.h 2009-06-24 13:17:03.000000000 +0000 -+++ b/drivers/dahdi/wcb4xxp/wcb4xxp.h 2009-06-24 13:18:07.000000000 +0000 -@@ -378,7 +378,7 @@ - #define HFC_T3 2 - - #define WCB4XXP_MAGIC 0xb410c0de --#define MAX_SPANS_PER_CARD 4 -+#define MAX_SPANS_PER_CARD 8 - - #define WCB4XXP_CHANNELS_PER_SPAN 3 /* 2 B-channels and 1 D-Channel for each BRI span */ - #define WCB4XXP_HDLC_BUF_LEN 32 /* arbitrary, just the max # of byts we will send to DAHDI per call */ -@@ -415,6 +415,19 @@ - struct dahdi_chan _chans[WCB4XXP_CHANNELS_PER_SPAN]; /* Backing memory */ - }; - -+enum cards_ids { /* Cards ==> Brand & Model */ -+ B410P = 0, /* Digium B410P */ -+ B200P_OV, /* OpenVox B200P */ -+ B400P_OV, /* OpenVox B400P */ -+ B800P_OV, /* OpenVox B800P */ -+ DUOBRI, /* HFC-2S Junghanns.NET duoBRI PCI */ -+ QUADBRI, /* HFC-4S Junghanns.NET quadBRI PCI */ -+ OCTOBRI, /* HFC-8S Junghanns.NET octoBRI PCI */ -+ BN2S0, /* BeroNet BN2S0 */ -+ BN4S0, /* Beronet BN4S0 */ -+ BN8S0 /* BeroNet BN8S0 */ -+ }; -+ - /* This structure exists one per card */ - struct b4xxp { - unsigned magic; /* magic value to make sure we're looking at our struct */ -@@ -449,10 +462,12 @@ - int globalconfig; /* Whether global setup has been done */ - int syncspan; /* span that HFC uses for sync on this card */ - int running; /* interrupts are enabled */ -- -+ - struct b4xxp_span spans[MAX_SPANS_PER_CARD]; /* Individual spans */ - int order; /* Order */ - int flags; /* Device flags */ -+ int has_ec; /* Has ECHO Cancel */ -+ enum cards_ids card_type; /* Card Identifier (using ids_cards enum)*/ - int master; /* Are we master */ - int ledreg; /* copy of the LED Register */ - 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 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=dahdi-linux -pkgver=2.2.0.2 +pkgver=2.3.0.1 pkgrel=0 pkgdesc="Firmware for Digium Asterisk Hardware Device Interface drivers" url="http://www.asterisk.org" @@ -19,17 +19,23 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/$pkgname- # kernel flavors. We also install the headers for the -dev package. # # The kernel drivers themselves are built from separate build recipe. - -build() { +prepare() { cd "$srcdir"/$pkgname-$pkgver for i in ../*.patch ../*.diff; do [ -f "$i" ] || continue msg "Applying $i" patch -p1 < $i || return 1; done +} +build() { + return 0 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" HOTPLUG_FIRMWARE=yes \ install-include install-firmware } -md5sums="1f932729ad28f2f028afcf2cc5ccf7ba dahdi-linux-2.2.0.2.tar.gz" +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 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=dahdi-tools -pkgver=2.2.0 -pkgrel=1 +pkgver=2.3.0 +pkgrel=0 pkgdesc="Digium Asterisk Hardware Device Interface management utilities" url="http://www.asterisk.org" license="GPL" @@ -14,19 +14,25 @@ subpackages="$pkgname-doc $pkgname-dev" source="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/$pkgname-$pkgver.tar.gz $pkgname.initd" +_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info - sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $^/$(CC) $^ $(LDFLAGS) -o $@/' Makefile + --infodir=/usr/share/info \ + || return 1 + sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $^/$(CC) $^ $(LDFLAGS) -o $@/' \ + Makefile make || return 1 - make -j1 DESTDIR="$pkgdir" install +} +package() { + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/dahdi } -md5sums="a018f452f3851a312ff51705ac44de37 dahdi-tools-2.2.0.tar.gz +md5sums="6c9e2da70e4503e4d93f1ad0c83e61af dahdi-tools-2.3.0.tar.gz 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 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot -pkgver=1.2.11 -pkgrel=5 +pkgver=1.2.12 +pkgrel=0 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" license="LGPL-2.1" @@ -90,6 +90,6 @@ sqlite() { _mv $(cd "$pkgdir" && find usr -name '*sqlite.so') } -md5sums="bdac013fd57aa616ea4bdd9ac34557c6 dovecot-1.2.11.tar.gz +md5sums="cc8e5c53cd0943ce0b5e1087356ad4ea dovecot-1.2.12.tar.gz aec5cc797ab2acf72ce3b6bb1030345f dovecot.logrotate 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=feh -pkgver=1.5 +pkgver=1.7 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="http://www.linuxbrit.co.uk/feh/" @@ -23,4 +23,4 @@ package() { make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1 install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="aee156f0a82582108c5a56fbe85319ae feh-1.5.tar.bz2" +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 @@ # Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=freeswitch pkgver=1.0.6 -pkgrel=8 +pkgrel=9 pkgdesc="A communications platform written in C from the ground up" url="http://www.freeswitch.org" license="GPL" depends="" -makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev +makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev ncurses-dev autoconf automake libtool" install="$pkgname.pre-install $pkgname.post-install" -subpackages="$pkgname-dev" +subpackages="$pkgname-dev $pkgname-flite" source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz modules.conf freeswitch.confd freeswitch.initd " +_builddir="$srcdir/$pkgname-$pkgver" + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" cp -f "$srcdir/modules.conf" modules.conf || return 1 # i think our max cmd len is 32768 @@ -33,11 +36,17 @@ build() { --with-devrandom=/dev/urandom \ || return 1 + # flite does not work with parallel builds + # first build libfreeswitch (in parallel) + make libfreeswitch.la || return 1 + # then we build mod_flite, disabling parallel builds + ( cd src/mod/asr_tts/mod_flite && make -j1 ) || return 1 + # finally we build the rest make all || return 1 } package(){ cd "$srcdir/$pkgname-$pkgver" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install || return 1 # we need to do some moving/cleanup to allow some... kind of FHS mkdir -p "$pkgdir"/var/run/freeswitch mkdir -p "$pkgdir"/var/lib/freeswitch @@ -53,7 +62,26 @@ package(){ install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } + +_mv_mod() { + local moddir=usr/lib/freeswitch i= + mkdir -p "$subpkgdir"/$moddir + for i in $@; do + mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/ || return 1 + done +} + + +flite() { + pkgdesc="Freeswitch Text To Speech Module" + depends="freeswitch" + install= + _mv_mod mod_flite mod_say_de mod_say_en mod_say_es mod_say_fr \ + mod_say_it mod_say_nl mod_say_zh +} + + md5sums="388effee587887a81fe7f411b7350590 freeswitch-1.0.6.tar.gz -c05f2356be159e99b3845f5260a33599 modules.conf +55e62842ad037e5e550ad097df09f6d2 modules.conf c608cca8ad773acebf201f581438c7e7 freeswitch.confd 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 #applications/mod_rss #applications/mod_snom #applications/mod_vmd -#asr_tts/mod_flite +asr_tts/mod_flite #asr_tts/mod_pocketsphinx #asr_tts/mod_cepstral codecs/mod_g723_1 @@ -67,9 +67,9 @@ languages/mod_lua #xml_int/mod_xml_cdr #xml_int/mod_xml_ldap say/mod_say_en -#say/mod_say_de -#say/mod_say_es -#say/mod_say_fr -#say/mod_say_it -#say/mod_say_nl -#say/mod_say_zh +say/mod_say_de +say/mod_say_es +say/mod_say_fr +say/mod_say_it +say/mod_say_nl +say/mod_say_zh diff --git a/main/gc/APKBUILD b/main/gc/APKBUILD new file mode 100644 index 0000000000..065fba140b --- /dev/null +++ b/main/gc/APKBUILD @@ -0,0 +1,38 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=gc +pkgver=7.1 +pkgrel=0 +pkgdesc="A garbage collector for C and C++" +url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" +license="GPL" +depends= +makedepends= +subpackages="$pkgname-dev $pkgname-doc libgc++:libgccpp" +source="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-$pkgver.tar.gz + uclibc-getcontext.patch" + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 -i "$srcdir"/uclibc-getcontext.patch || return 1 +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --datadir=/usr/share/doc/gc \ + --enable-cplusplus || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 +} + +libgccpp() { + install -d "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/ +} + +md5sums="2ff9924c7249ef7f736ecfe6f08f3f9b gc-7.1.tar.gz +bce75c75bf0cdb295ac0bf7ba0f6e267 uclibc-getcontext.patch" diff --git a/main/gc/uclibc-getcontext.patch b/main/gc/uclibc-getcontext.patch new file mode 100644 index 0000000000..de48fc0183 --- /dev/null +++ b/main/gc/uclibc-getcontext.patch @@ -0,0 +1,11 @@ +--- ./mach_dep.c.orig ++++ ./mach_dep.c +@@ -175,7 +175,7 @@ + # if defined(HAVE_PUSH_REGS) + GC_push_regs(); + # elif defined(UNIX_LIKE) && !defined(DARWIN) && !defined(ARM32) && \ +- !defined(HURD) ++ !defined(HURD) && !defined(__UCLIBC__) + /* Older versions of Darwin seem to lack getcontext(). */ + /* ARM Linux often doesn't support a real getcontext(). */ + ucontext_t ctxt; 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 _espfver=0.3.6 _uclibc_abiver=0.9.32 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gimp -pkgver=2.6.8 +pkgver=2.6.9 pkgrel=0 pkgdesc="GNU Image Manipulation Program" url="http://www.gimp.org/" @@ -10,14 +10,10 @@ makedepends="gtk+-dev libxpm-dev libxmu-dev librsvg-dev dbus-glib-dev jpeg-dev libpng-dev curl-dev" install= subpackages="$pkgname-dev $pkgname-doc" -source="ftp://ftp.$pkgname.org/pub/$pkgname/v2.6/$pkgname-$pkgver.tar.bz2 - libpng-1.4.patch - gtk-2.19-statusbar.patch" +source="ftp://ftp.$pkgname.org/pub/$pkgname/v2.6/$pkgname-$pkgver.tar.bz2" prepare() { cd "$srcdir"/$pkgname-$pkgver - patch -Np1 -i "../libpng-1.4.patch" || return 1 - patch -Np1 -i "$srcdir"/gtk-2.19-statusbar.patch || return 1 } build() { @@ -41,6 +37,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 ln -s gimptool-2.0 "$pkgdir/usr/bin/gimptool" || return 1 } -md5sums="a4d9462c9420954824a80c9b1963f9d9 gimp-2.6.8.tar.bz2 -211eccab51593526e852816e647f7da4 libpng-1.4.patch -8be7d21231e3032e4723cf86588375c0 gtk-2.19-statusbar.patch" +md5sums="e5d0cc6f3ce127e51d7f3d3124b16a99 gimp-2.6.9.tar.bz2" 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 @@ -From 501c4f65f08c111df0654cb887d95c2c06e82710 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Wed, 24 Mar 2010 17:08:01 +0000 -Subject: backport statusbar code needed for GTK+ >= 2.19.1 - -Use the hbox that is provided via gtk_statusbar_get_message_area() -since GTK+ 2.19.1. ---- -diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c -index 5e89427..36651cd 100644 ---- a/app/display/gimpstatusbar.c -+++ b/app/display/gimpstatusbar.c -@@ -49,6 +49,9 @@ - /* maximal width of the string holding the cursor-coordinates */ - #define CURSOR_LEN 256 - -+/* the spacing of the hbox */ -+#define HBOX_SPACING 1 -+ - /* spacing between the icon and the statusbar label */ - #define ICON_SPACING 2 - -@@ -152,6 +155,7 @@ static void - gimp_statusbar_init (GimpStatusbar *statusbar) - { - GtkWidget *hbox; -+ GtkWidget *label; - GtkWidget *image; - GimpUnitStore *store; - -@@ -171,13 +175,27 @@ gimp_statusbar_init (GimpStatusbar *statusbar) - statusbar->progress_active = FALSE; - statusbar->progress_shown = FALSE; - -- /* remove the label and insert a hbox */ -- gtk_container_remove (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), -- g_object_ref (GTK_STATUSBAR (statusbar)->label)); -- -- hbox = gtk_hbox_new (FALSE, 1); -- gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), hbox); -- gtk_widget_show (hbox); -+ label = g_object_ref (GTK_STATUSBAR (statusbar)->label); -+ -+ /* remove the message area or label and insert a hbox */ -+#if GTK_CHECK_VERSION (2, 19, 1) -+ { -+ hbox = gtk_statusbar_get_message_area (GTK_STATUSBAR (statusbar)); -+ gtk_box_set_spacing (GTK_BOX (hbox), HBOX_SPACING); -+ gtk_container_remove (GTK_CONTAINER (hbox), label); -+ } -+#else -+ { -+ GtkWidget *label_parent; -+ -+ label_parent = gtk_widget_get_parent (label); -+ gtk_container_remove (GTK_CONTAINER (label_parent), label); -+ -+ hbox = gtk_hbox_new (FALSE, HBOX_SPACING); -+ gtk_container_add (GTK_CONTAINER (label_parent), hbox); -+ gtk_widget_show (hbox); -+ } -+#endif - - statusbar->cursor_label = gtk_label_new ("8888, 8888"); - gtk_misc_set_alignment (GTK_MISC (statusbar->cursor_label), 0.5, 0.5); --- -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 @@ -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 ---- gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c 2010-01-18 19:01:46.000000000 -0500 -+++ gimp-2.7.0/plug-ins/file-ico/ico-load.c 2010-01-18 19:14:43.000000000 -0500 -@@ -286,14 +286,22 @@ - switch (color_type) - { - case PNG_COLOR_TYPE_GRAY: -+#if PNG_LIBPNG_VER < 10400 - png_set_gray_1_2_4_to_8 (png_ptr); -+#else -+ png_set_expand_gray_1_2_4_to_8(png_ptr); -+#endif - if ( bit_depth == 16 ) - png_set_strip_16 (png_ptr); - png_set_gray_to_rgb (png_ptr); - png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); - break; - case PNG_COLOR_TYPE_GRAY_ALPHA: -+#if PNG_LIBPNG_VER < 10400 - png_set_gray_1_2_4_to_8 (png_ptr); -+#else -+ png_set_expand_gray_1_2_4_to_8(png_ptr); -+#endif - if ( bit_depth == 16 ) - png_set_strip_16 (png_ptr); - png_set_gray_to_rgb (png_ptr); diff --git a/main/glibmm/APKBUILD b/main/glibmm/APKBUILD new file mode 100644 index 0000000000..e87bffa31b --- /dev/null +++ b/main/glibmm/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=glibmm +pkgver=2.24.2 +pkgrel=0 +pkgdesc="C++ wrapper for the GLib toolkit" +url="http://gtkmm.sourceforge.net/" +license="LGPL" +depends= +makedepends="glib-dev libsigc++-dev" +subpackages="$pkgname-dev $pkgname-doc" +depends_dev="libsigc++-dev" +source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +md5sums="48861fec006c2bd8e301d8e44cd12d3c glibmm-2.24.2.tar.bz2" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnumeric -pkgver=1.10.5 +pkgver=1.10.6 pkgrel=0 pkgdesc="A GNOME Spreadsheet Program" url="http://www.gnome.org/projects/gnumeric/" @@ -27,4 +27,4 @@ package() { cd "$_builddir" make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="157b0bde46435566122327696a44d4cb gnumeric-1.10.5.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=goffice -pkgver=0.8.5 +pkgver=0.8.6 pkgrel=0 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" url="http://www.gnome.org" @@ -26,4 +26,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="3dda09fa540c947d45384b53713e49d5 goffice-0.8.5.tar.bz2" +md5sums="78b749f9b6913c2995171396f5deb525 goffice-0.8.6.tar.bz2" diff --git a/main/gsl/APKBUILD b/main/gsl/APKBUILD new file mode 100644 index 0000000000..fd4ba6ff8c --- /dev/null +++ b/main/gsl/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=gsl +pkgver=1.14 +pkgrel=0 +pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers" +url="http://www.gnu.org/software/gsl/gsl.html" +license="GPL" +depends= +makedepends= +install= +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="d55e7b141815412a072a3f0e12442042 gsl-1.14.tar.gz" diff --git a/main/gtkmm/APKBUILD b/main/gtkmm/APKBUILD new file mode 100644 index 0000000000..6268ca0a3d --- /dev/null +++ b/main/gtkmm/APKBUILD @@ -0,0 +1,24 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=gtkmm +pkgver=2.20.3 +pkgrel=0 +pkgdesc="C++ wrappers for GTK+" +url="http://gtkmm.sourceforge.net/" +license="LGPL" +depends="" +makedepends="gtk+-dev intltool glibmm-dev pangomm-dev" +depends_dev="atk-dev gtk+-dev glibmm-dev pangomm-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.20/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir"/gtkmm-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/gtkmm-$pkgver + make install DESTDIR="$pkgdir" +} +md5sums="c35f236091b4f96fe45c53b4107400a9 gtkmm-2.20.3.tar.bz2" diff --git a/main/inkscape/50-poppler-API.patch b/main/inkscape/50-poppler-API.patch new file mode 100644 index 0000000000..b97969de1d --- /dev/null +++ b/main/inkscape/50-poppler-API.patch @@ -0,0 +1,97 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50-poppler-API.patch.dpatch by Kees Cook <kees@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: https://bugs.launchpad.net/inkscape/+bug/487038 + +@DPATCH@ +diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp +--- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp 2009-10-10 12:17:47.000000000 -0700 ++++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp 2009-12-23 22:34:13.000000000 -0800 +@@ -809,7 +809,7 @@ + blendingColorSpace = NULL; + isolated = knockout = gFalse; + if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { +- blendingColorSpace = GfxColorSpace::parse(&obj5); ++ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); + } + obj5.free(); + if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { +@@ -1009,9 +1009,9 @@ + state->setFillPattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); + if (obj.isNull()) { +- colorSpace = GfxColorSpace::parse(&args[0]); ++ colorSpace = GfxColorSpace::parse(&args[0], NULL); + } else { +- colorSpace = GfxColorSpace::parse(&obj); ++ colorSpace = GfxColorSpace::parse(&obj, NULL); + } + obj.free(); + if (colorSpace) { +@@ -1032,9 +1032,9 @@ + state->setStrokePattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); + if (obj.isNull()) { +- colorSpace = GfxColorSpace::parse(&args[0]); ++ colorSpace = GfxColorSpace::parse(&args[0], NULL); + } else { +- colorSpace = GfxColorSpace::parse(&obj); ++ colorSpace = GfxColorSpace::parse(&obj, NULL); + } + obj.free(); + if (colorSpace) { +@@ -1101,7 +1101,7 @@ + builder->updateStyle(state); + } + if (args[numArgs-1].isName() && +- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { ++ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { + state->setFillPattern(pattern); + builder->updateStyle(state); + } +@@ -1145,7 +1145,7 @@ + builder->updateStyle(state); + } + if (args[numArgs-1].isName() && +- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { ++ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { + state->setStrokePattern(pattern); + builder->updateStyle(state); + } +@@ -1543,7 +1543,7 @@ + double *matrix = NULL; + GBool savedState = gFalse; + +- if (!(shading = res->lookupShading(args[0].getName()))) { ++ if (!(shading = res->lookupShading(args[0].getName(), NULL))) { + return; + } + +@@ -2507,7 +2507,7 @@ + } + } + if (!obj1.isNull()) { +- colorSpace = GfxColorSpace::parse(&obj1); ++ colorSpace = GfxColorSpace::parse(&obj1, NULL); + } else if (csMode == streamCSDeviceGray) { + colorSpace = new GfxDeviceGrayColorSpace(); + } else if (csMode == streamCSDeviceRGB) { +@@ -2592,7 +2592,7 @@ + obj2.free(); + } + } +- maskColorSpace = GfxColorSpace::parse(&obj1); ++ maskColorSpace = GfxColorSpace::parse(&obj1, NULL); + obj1.free(); + if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { + goto err1; +@@ -2767,7 +2767,7 @@ + if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { + transpGroup = gTrue; + if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { +- blendingColorSpace = GfxColorSpace::parse(&obj3); ++ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); + } + obj3.free(); + if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { diff --git a/main/inkscape/APKBUILD b/main/inkscape/APKBUILD new file mode 100644 index 0000000000..d8c5f2452f --- /dev/null +++ b/main/inkscape/APKBUILD @@ -0,0 +1,53 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=inkscape +pkgver=0.47 +pkgrel=1 +pkgdesc="A vector-based drawing program - svg compliant" +url="http://inkscape.sourceforge.net/" +license="GPL LGPL" +makedepends=" +poppler-gtk-dev +imagemagick-dev +gtkspell-dev +gc-dev +gtkmm-dev +libxslt-dev +gsl-dev +py-xml +popt-dev +lcms-dev +libxml2-dev +boost-dev +" +depends="desktop-file-utils" +install= +source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + 50-poppler-API.patch" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/50-poppler-API.patch || return 1 +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --with-python \ + --with-perl \ + --without-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="916c85b501bcfb0ae61fcf7318f36348 inkscape-0.47.tar.gz +b447272c9b282b49e86dca24c2581065 50-poppler-API.patch" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iproute2 -pkgver=2.6.33 +pkgver=2.6.34 _realver=2.6.33 -pkgrel=1 +pkgrel=0 pkgdesc="IP Routing Utilities" url="http://www.linux-foundation.org/en/Net:Iproute2" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iptables -pkgver=1.4.7 -pkgrel=1 +pkgver=1.4.8 +pkgrel=0 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="http://www.iptables.org/" license=GPL-2 @@ -64,7 +64,7 @@ ip6tables() { "$subpkgdir"/etc/init.d/ip6tables } -md5sums="645941dd1f9e0ec1f74c61918d70d52f iptables-1.4.7.tar.bz2 +md5sums="697ed89f37af4473a5f6349ba2700f2d iptables-1.4.8.tar.bz2 ec3e80a1b0ea3e13e4e60824b7ebd1b9 iptables-1.4.2-include-in.patch 2202ac150a5dfe32a8363b0ad565ee1d iptables.initd 956ebf5ab69e5a1e1d3983541eab643b iptables.confd" diff --git a/main/lcms/APKBUILD b/main/lcms/APKBUILD new file mode 100644 index 0000000000..7d3d4ca994 --- /dev/null +++ b/main/lcms/APKBUILD @@ -0,0 +1,31 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=lcms +pkgver=1.19 +pkgrel=0 +pkgdesc="Lightweight color management development library/engine" +url="http://www.littlecms.com" +license="custom" +depends= +makedepends="tiff-dev jpeg-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc liblcms" +source="http://downloads.sourceforge.net/project/lcms/lcms/$pkgver/lcms-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + install -Dm 644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +liblcms() { + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/liblcms.so.* "$subpkgdir"/usr/lib/ +} + +md5sums="8af94611baf20d9646c7c2c285859818 lcms-1.19.tar.gz" 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 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=lftp -pkgver=4.0.7 -pkgrel=1 +pkgver=4.0.9 +pkgrel=0 pkgdesc="LFTP is sophisticated ftp/http client" url="http://lftp.yar.ru/" license="GPL" @@ -31,4 +31,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -md5sums="a40e4518fc477c82ffcc5b04d9ff64ff lftp-4.0.7.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libdrm -pkgver=2.4.20 -pkgrel=1 +pkgver=2.4.21 +pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="http://dri.freedesktop.org/" license="custom" @@ -20,4 +20,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="3c56e03172b236e14905ef9a68ba2f97 libdrm-2.4.20.tar.bz2" +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 @@ +# Contributor: +# Maintainer: +pkgname=libresample +pkgver=0.1.3 +pkgrel=0 +pkgdesc="real-time library for sampling rate conversion" +url="https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html" +license="GPL" +depends= +makedepends="wget" +install= +subpackages= +source="https://ccrma.stanford.edu/~jos/gz/libresample-$pkgver.tgz" + +# append extra dependencies to -dev subpackage +# remove if not used. +# depends_dev="somepackage-dev" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + install -d "$pkgdir"/usr/include "$pkgdir"/usr/lib + install -m644 include/libresample.h "$pkgdir"/usr/include/ + install -m644 libresample.a "$pkgdir"/usr/lib/ + +} + +md5sums="99bc5ea15ef76b83e5655a10968f674b libresample-0.1.3.tgz" diff --git a/main/libsigc++/APKBUILD b/main/libsigc++/APKBUILD new file mode 100644 index 0000000000..0329b63ae2 --- /dev/null +++ b/main/libsigc++/APKBUILD @@ -0,0 +1,24 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libsigc++ +pkgver=2.2.8 +pkgrel=0 +pkgdesc="type-safe Signal Framework for C++" +url="http://libsigc.sourceforge.net/" +license="LGPL" +depends= +makedepends="m4 perl" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.2/$pkgname-$pkgver.tar.bz2" + +build() { + cd ""$srcdir"/$pkgname-$pkgver" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +md5sums="1198425eab9fd605721a278c651b8dd8 libsigc++-2.2.8.tar.bz2" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsoup -pkgver=2.30.1 +pkgver=2.30.2 pkgrel=0 pkgdesc="Gnome HTTP Library" url="http://www.gnome.org" @@ -27,4 +27,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="d80fb560a72370fba347785b00a750fb libsoup-2.30.1.tar.bz2" +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 @@ -# Maintainer: judd <jvinet@zeroflux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libtool -pkgver=2.2.6b -pkgrel=1 +pkgver=2.2.10 +pkgrel=0 pkgdesc="A generic library support script" license='GPL' url="http://www.gnu.org/software/libtool" @@ -26,4 +26,4 @@ libltdl() { mv "$pkgdir/usr/lib/libltdl.so"* "$subpkgdir/usr/lib/" } -md5sums="07da460450490148c6d2df0f21481a25 libtool-2.2.6b.tar.gz" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libusb -pkgver=1.0.1 +pkgver=1.0.8 pkgrel=1 pkgdesc="Library to enable user space application programs to communicate with USB devices" url="http://libusb.sourceforge.net/" @@ -17,4 +17,4 @@ build () make || return 1 make DESTDIR="$pkgdir" install } -md5sums="8fb0e066678a0d294894b5b2969cb4b3 libusb-1.0.1.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libwnck -pkgver=2.30.0 -pkgrel=1 +pkgver=2.30.2 +pkgrel=0 pkgdesc="Window Navigator Construction Kit" url="http://www.gnome.org/" license="LGPL" @@ -28,4 +28,4 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="ed79955dabb606ee0e6d112a291005ad libwnck-2.30.0.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxcomposite -pkgver=0.4.1 -pkgrel=1 +pkgver=0.4.2 +pkgrel=0 pkgdesc="X11 Composite extension library" url="http://xorg.freedesktop.org/" license="custom" @@ -11,14 +11,18 @@ makedepends="pkgconfig libxfixes-dev libxext-dev compositeproto" source="http://xorg.freedesktop.org//releases/individual/lib/libXcomposite-$pkgver.tar.bz2" depends_dev="xproto compositeproto libxfixes-dev libx11-dev libxext-dev" -build () -{ - cd "$srcdir"/libXcomposite-$pkgver +_builddir="$srcdir"/libXcomposite-$pkgver +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="0f1367f57fdf5df17a8dd71d0fa68248 libXcomposite-0.4.1.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxdamage -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=0 pkgdesc="X11 damaged region extension library" url="http://xorg.freedesktop.org/" license="custom" @@ -21,4 +21,4 @@ package() { cd "$srcdir"/libXdamage-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="b42780bce703ec202a33e5693991c09d libXdamage-1.1.2.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfixes -pkgver=4.0.4 -pkgrel=1 +pkgver=4.0.5 +pkgrel=0 pkgdesc="X11 miscellaneous 'fixes' extension library" url="http://xorg.freedesktop.org/" license="custom" @@ -11,10 +11,15 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://xorg.freedesktop.org/releases/individual/lib/libXfixes-$pkgver.tar.bz2" depends_dev="xproto fixesproto libx11-dev" +_builddir="$srcdir"/libXfixes-$pkgver build() { - cd "$srcdir"/libXfixes-$pkgver + cd "$_builddir" ./configure --prefix=/usr --sysconfdir=/etc --build=${CHOST} --host=${CHOST} make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="7f2c40852eb337b237ad944ca5c30d49 libXfixes-4.0.4.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfont -pkgver=1.4.1 -pkgrel=1 +pkgver=1.4.2 +pkgrel=0 pkgdesc="X11 font rasterisation library" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="libfontenc freetype zlib" +depends= makedepends="pkgconfig libfontenc-dev freetype-dev fontsproto xproto xtrans zlib-dev" source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.bz2" @@ -17,7 +17,11 @@ build() { cd "$srcdir"/libXfont-$pkgver ./configure --prefix=/usr --sysconfdir=/etc || return 1 make || return 1 +} + +package() { + cd "$srcdir"/libXfont-$pkgver make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="4f2bed2a2be82e90a51a24bb3a22cdf0 libXfont-1.4.1.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxrender -pkgver=0.9.5 -pkgrel=2 +pkgver=0.9.6 +pkgrel=0 pkgdesc="X Rendering Extension client library" url="http://xorg.freedesktop.org/" license="custom" @@ -21,4 +21,4 @@ package() { cd "$srcdir"/libXrender-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="276dd9e85daf0680616cd9f132b354c9 libXrender-0.9.5.tar.bz2" +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 @@ +From patchwork Thu Jun 24 05:45:19 2010 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: xfrm: check bundle policy existance before dereferencing it +Date: Wed, 23 Jun 2010 19:45:19 -0000 +From: =?utf-8?b?VGltbyBUZXLDpHMgPHRpbW8udGVyYXNAaWtpLmZpPg==?= +X-Patchwork-Id: 56759 +Message-Id: <1277358319-9868-1-git-send-email-timo.teras@iki.fi> +To: netdev@vger.kernel.org, "Justin P. Mattock" <justinmattock@gmail.com>, + Eric Dumazet <eric.dumazet@gmail.com>, + "John W.Linville" <linville@tuxdriver.com>, + Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, + davem@davemloft.net +Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> + +Fix the bundle validation code to not assume having a valid policy. +When we have multiple transformations for a xfrm policy, the bundle +instance will be a chain of bundles with only the first one having +the policy reference. When policy_genid is bumped it will expire the +first bundle in the chain which is equivalent of expiring the whole +chain. + +Reported-bisected-and-tested-by: Justin P. Mattock <justinmattock@gmail.com> +Signed-off-by: Timo Teräs <timo.teras@iki.fi> + +--- +net/xfrm/xfrm_policy.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 4bf27d9..af1c173 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -2300,7 +2300,8 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first, + return 0; + if (xdst->xfrm_genid != dst->xfrm->genid) + return 0; +- if (xdst->policy_genid != atomic_read(&xdst->pols[0]->genid)) ++ if (xdst->num_pols > 0 && ++ xdst->policy_genid != atomic_read(&xdst->pols[0]->genid)) + return 0; + + 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 pkgname=linux-${_flavor} pkgver=2.6.32.15 _kernver=2.6.32 -pkgrel=7 +pkgrel=8 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -31,6 +31,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 0017-flow-delayed-deletion-of-flow-cache-entries.patch 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch 0019-ipv4-check-rt_genid-in-dst_check.patch + 0020-xfrm-check-bundle-policy-existance-before-dereferencing-it.patch xfrm-fix-policy-unreferencing-on-larval-drop.patch r8169-fix-random-mdio_write-failures.patch 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 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch 74e511f12854972db08d3fddc4df0f52 0019-ipv4-check-rt_genid-in-dst_check.patch +edfac5844f91721d49a00a09b6ef258b 0020-xfrm-check-bundle-policy-existance-before-dereferencing-it.patch c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch diff --git a/main/lua-lgob/APKBUILD b/main/lua-lgob/APKBUILD new file mode 100644 index 0000000000..17a38eaa3e --- /dev/null +++ b/main/lua-lgob/APKBUILD @@ -0,0 +1,34 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=lua-lgob +pkgver=10.05 +pkgrel=0 +pkgdesc="Set of Lua bindings that uses gobject-instrospection" +url="http://oproj.tuxfamily.org" +license="LGPL" +depends="lua" +makedepends="lua-dev cairo-dev gtk+-dev pango-dev vte-dev gtkspell-dev + webkit-dev atk-dev gstreamer-dev gst-plugins-base-dev poppler-gtk-dev + gtksourceview-dev" +subpackages="$pkgname-dev" +source="http://downloads.tuxfamily.org/oproj/lgob/lgob-$pkgver.tar.bz2" + +# 'codegen', 'common', 'gobject', 'loader', 'cairo', 'gdk', 'gtk', +# 'pango', 'pangocairo', 'vte', 'webkit', 'atk', 'gstreamer', 'gtkspell', +# 'gtksourceview', 'goocanvas', 'poppler', 'clutter', 'cluttergtk' +_mods="codegen common gobject loader cairo gdk gtk pango pangocairo vte webkit + atk gstreamer gtkspell gtksourceview poppler" +build() { + cd "$srcdir"/lgob-$pkgver +} + +package() { + cd "$srcdir"/lgob-$pkgver + for i in $_mods; do + cd $i + make DESTDIR="$pkgdir"/usr \ + && make DESTDIR="$pkgdir"/usr install|| return 1 + cd .. + done +} + +md5sums="ac3eb632d53c8c3d181b317482bacff7 lgob-10.05.tar.bz2" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=mpfr -pkgver=2.4.2 -pkgrel=2 +pkgname=mpfr3 +pkgver=3.0.0 +pkgrel=0 pkgdesc="multiple-precision floating-point library" url="http://www.mpfr.org/" license="GPL LGPL" depends= makedepends="gmp5-dev texinfo" source="http://www.mpfr.org/mpfr-current/mpfr-$pkgver.tar.bz2" -subpackages="$pkgname-doc $pkgname-dev" +subpackages="$pkgname-doc mpfr-dev:dev" +_builddir="$srcdir"/mpfr-$pkgver build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure --prefix=/usr \ --enable-shared || return 1; make || return 1; } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="${pkgdir}" install || return 1; } @@ -26,4 +27,4 @@ dev() { replaces=mpfr default_dev } -md5sums="89e59fe665e2b3ad44a6789f40b059a0 mpfr-2.4.2.tar.bz2" +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 @@ # Maintainer: pkgname=nrpe pkgver=2.12 -pkgrel=4 +pkgrel=5 pkgusers="nagios" pkggroups="nagios" pkgdesc="NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines." @@ -13,7 +13,8 @@ makedepends="openssl-dev perl" install="nrpe.pre-install" subpackages= source="http://downloads.sourceforge.net/nagios/$pkgname-$pkgver.tar.gz - nrpe.initd" + nrpe.initd + nrpe.confd" build() { cd "$srcdir"/$pkgname-$pkgver @@ -29,8 +30,10 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install install-daemon-config - install -Dm755 ../nrpe.initd "$pkgdir"/etc/init.d/nrpe + install -Dm755 "$srcdir"/nrpe.initd "$pkgdir"/etc/init.d/nrpe + install -Dm644 "$srcdir"/nrpe.confd "$pkgdir"/etc/conf.d/nrpe } md5sums="b2d75e2962f1e3151ef58794d60c9e97 nrpe-2.12.tar.gz -a1e3fbbfdd46437f7385742d49d5eb85 nrpe.initd" +3263044303bbfdfbbc8127cfa991ab51 nrpe.initd +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 @@ +# override the default options. +# 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() { ebegin "Starting NRPE" start-stop-daemon --start --quiet \ --pidfile $pidfile \ - --exec $daemon -- ${nrpe_options:- -c $conf -d} + --exec $daemon -- -d ${nrpe_options:- -c $conf} eend $? } 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 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ntfs-3g -pkgver=2010.5.16 +pkgver=2010.5.22 pkgrel=0 pkgdesc="A userspace ntfs driver with write support" url="http://www.tuxera.com/community/ntfs-3g-download/" @@ -27,4 +27,4 @@ package() { } -md5sums="aeff7659a4943c9223d79116f051a863 ntfs-3g-2010.5.16.tgz" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pango -pkgver=1.28.0 -pkgrel=1 +pkgver=1.28.1 +pkgrel=0 pkgdesc="A library for layout and rendering of text" url="http://www.pango.org/" license="LGPL" @@ -33,4 +33,4 @@ dev() { mv "$pkgdir"/usr/share/gir* "$subpkgdir"/usr/share/ } -md5sums="545ae8becf7ed74008120f96f4b095f4 pango-1.28.0.tar.bz2" +md5sums="bab5b4eb3fde6b0a5bfe98d25e668741 pango-1.28.1.tar.bz2" diff --git a/main/pangomm/APKBUILD b/main/pangomm/APKBUILD new file mode 100644 index 0000000000..e4ff082e49 --- /dev/null +++ b/main/pangomm/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=pangomm +pkgver=2.26.2 +pkgrel=0 +pkgdesc="C++ bindings for pango" +url="http://gtkmm.sourceforge.net/" +license="LGPL" +depends="" +makedepends="pango-dev glibmm-dev cairomm-dev" +depends_dev="$makedepends" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.26/pangomm-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="b363b09faf884db8bf8d1458d719ff00 pangomm-2.26.2.tar.bz2" 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=parted -pkgver=2.2 -pkgrel=1 +pkgver=2.3 +pkgrel=0 pkgdesc="Utility to create, destroy, resize, check and copy partitions" url="http://www.gnu.org/software/parted/parted.html" license="GPL3" @@ -24,4 +24,4 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" install } -md5sums="9c262afd6673d7724a60b7c632ce80fa parted-2.2.tar.gz" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcmciautils -pkgver=016 -pkgrel=1 +pkgver=017 +pkgrel=0 pkgdesc="Utilities for inserting and removing PCMCIA cards" url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" license="GPL" @@ -21,4 +21,4 @@ package() { make DESTDIR="$pkgdir"/ install ln -sf pccardctl "$pkgdir"/sbin/lspcmcia } -md5sums="93828a89c22a1d45a46c6dede63632cd pcmciautils-016.tar.bz2" +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 @@ # this aport only includes glib/gtk support in order to break the # circular make dependency: gtk <- cups <- poppler <- gtk + +# get the pkgver from poppler +if [ -r ../poppler/APKBUILD ]; then + . ../poppler/APKBUILD +fi + pkgname=poppler-gtk _realname=poppler -pkgver=0.12.4 -pkgrel=1 +pkgver=$pkgver +pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0" url="http://poppler.freedesktop.org/" license="GPL" @@ -17,6 +23,10 @@ replaces="poppler-glib" depends_dev="cairo-dev glib-dev gtk+-dev poppler-dev" source="http://poppler.freedesktop.org/poppler-$pkgver.tar.gz" +prepare() { + return 0 +} + build() { cd "$srcdir"/$_realname-$pkgver ./configure --prefix=/usr \ @@ -34,9 +44,13 @@ build() { --disable-utils \ || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$_realname-$pkgver install -D -m644 poppler-glib.pc "$pkgdir"/usr/lib/pkgconfig/poppler-glib.pc cd glib make DESTDIR="$pkgdir" install || return 1 } -md5sums="4155346f9369b192569ce9184ff73e43 poppler-0.12.4.tar.gz" +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 @@ # circular make dependency: gtk <- cups <- poppler <- gtk # So we build gtk support in poppler-gtk pkgname=poppler -pkgver=0.12.4 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0" url="http://poppler.freedesktop.org/" license="GPL" @@ -44,4 +44,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="4155346f9369b192569ce9184ff73e43 poppler-0.12.4.tar.gz" +md5sums="76f003b8fa2b905674088c306aa857c5 poppler-0.14.0.tar.gz" diff --git a/main/py-xml/APKBUILD b/main/py-xml/APKBUILD new file mode 100644 index 0000000000..1dd549da07 --- /dev/null +++ b/main/py-xml/APKBUILD @@ -0,0 +1,27 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=py-xml +pkgver=0.8.4 +pkgrel=0 +pkgdesc="Python XML parsing library." +url="http://pyxml.sourceforge.net/" +license="custom" +depends= +makedepends="python-dev" +source="http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-$pkgver.tar.gz + fix-python2.6.patch" + +_builddir="$srcdir"/PyXML-$pkgver +build() { + cd "$_builddir" + patch -Np1 -i "$srcdir/fix-python2.6.patch" || return 1 + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 + install -D -m644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1 +} + +md5sums="1f7655050cebbb664db976405fdba209 PyXML-0.8.4.tar.gz +4b652e0c866e3cca7e2386e8e383d5ba fix-python2.6.patch" diff --git a/main/py-xml/fix-python2.6.patch b/main/py-xml/fix-python2.6.patch new file mode 100644 index 0000000000..7bf1c46fc9 --- /dev/null +++ b/main/py-xml/fix-python2.6.patch @@ -0,0 +1,28 @@ +diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 +@@ -24,8 +24,8 @@ + self._rel = rel + nt = ParsedNodeTest.ParsedNodeTest('node', '') + ppl = ParsedPredicateList.ParsedPredicateList([]) +- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') +- self._step = ParsedStep.ParsedStep(as, nt, ppl) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._step = ParsedStep.ParsedStep(asp, nt, ppl) + return + + def evaluate(self, context): +diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 +@@ -28,8 +28,8 @@ + self._right = right + nt = ParsedNodeTest.ParsedNodeTest('node','') + ppl = ParsedPredicateList.ParsedPredicateList([]) +- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') +- self._middle = ParsedStep.ParsedStep(as, nt, ppl) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._middle = ParsedStep.ParsedStep(asp, nt, ppl) + + def evaluate(self, context): + res = [] 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rrdtool pkgver=1.2.30 -pkgrel=3 +pkgrel=4 pkgdesc="Data logging and graphing application" url="http://www.rrdtool.org" license="GPL" @@ -17,7 +17,7 @@ build() { --disable-tcl \ --disable-python \ --disable-ruby \ - --disable-rrdcgi + --enable-rrdcgi make || return 1 } 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba -pkgver=3.5.3 +pkgver=3.5.4 pkgrel=0 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" @@ -117,7 +117,7 @@ tdb() { usr/bin/tdb* } -md5sums="7c8d2a34b649380d5df838c3e030dbec samba-3.5.3.tar.gz +md5sums="22c8c977eaa18be50f3878c6d0e0c2f0 samba-3.5.4.tar.gz c8a7f6ac5df2f73dbf023e25ea39927b samba.initd c150433426e18261e6e3eed3930e1a76 samba.confd 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vte -pkgver=0.24.1 +pkgver=0.24.2 pkgrel=0 pkgdesc="Virtual Terminal Emulator library" url="http://www.gnome.org" @@ -26,4 +26,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="3b66116e930dde00e1ddbf8277066ea7 vte-0.24.1.tar.bz2" +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 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> -# Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wireshark -pkgver=1.2.8 +pkgver=1.2.9 pkgrel=0 pkgdesc="network protocol analyzer - GTK version" url="http://www.wireshark.org" @@ -13,7 +13,6 @@ install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark" source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2 wireshark-1.1.2--as-needed.patch - wireshark-1.2.8-zlib-1.2.5-capture.patch wireshark.desktop wireshark.png" @@ -73,8 +72,7 @@ tshark() { mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark } -md5sums="3a75d4f62317e52b8b39a1e9e37f1553 wireshark-1.2.8.tar.bz2 +md5sums="a4240c36f1e668d85b703eacb7c0a95e wireshark-1.2.9.tar.bz2 cc87d7eb31f256df751b3371b1c426e9 wireshark-1.1.2--as-needed.patch -cc4fbe2db149f2ee42dd0593944a69fe wireshark-1.2.8-zlib-1.2.5-capture.patch 504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop 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 @@ -http://anonsvn.wireshark.org/viewvc?view=rev&revision=32715 - ---- trunk/wiretap/wtap.c 2010/05/07 19:24:32 32714 -+++ trunk/wiretap/wtap.c 2010/05/07 19:45:47 32715 -@@ -35,6 +35,10 @@ - #include <unistd.h> - #endif - -+#ifdef HAVE_LIBZ -+#include <zlib.h> -+#endif -+ - #include "wtap-int.h" - #include "wtap.h" - -@@ -646,6 +650,14 @@ - */ - wth->phdr.pkt_encap = wth->file_encap; - -+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM == 0x1250 -+ /* Reset EOF */ -+ /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof before seek: %d", gzeof(wth->fh)); */ -+ if (gzeof(wth->fh)) -+ gzseek(wth->fh, 0, SEEK_CUR); -+ /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof after seek: %d", gzeof(wth->fh)); */ -+#endif -+ - if (!wth->subtype_read(wth, err, err_info, data_offset)) - return FALSE; /* failure */ - 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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-taskmanager -pkgver=0.4.1 -pkgrel=1 +pkgver=1.0.0 +pkgrel=0 pkgdesc="a simple taskmanager for the Xfce Desktop Environment" url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager" license="GPL-2" depends= makedepends="pkgconfig intltool libxfcegui4-dev" -source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2" +source="http://archive.xfce.org/src/apps/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2" build () { @@ -18,7 +18,11 @@ build () --localstatedir=/var \ --disable-static make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums="4ed599faf6b734b2d2e7be16adf0b2d9 xfce4-taskmanager-0.4.1.tar.bz2" +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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfwm4 pkgver=4.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3" url="http://www.xfce.org/" license="GPL-2" depends="hicolor-icon-theme" makedepends="pkgconfig libxfcegui4-dev libwnck-dev intltool gettext-dev - libiconv-dev libglade-dev expat-dev libsm-dev e2fsprogs" + libxcomposite-dev libxfixes-dev libxdamage-dev libxrender-dev + libxrandr-dev libiconv-dev libglade-dev expat-dev libsm-dev e2fsprogs" install= source="http://archive.xfce.org/src/xfce/xfwm4/4.6/xfwm4-$pkgver.tar.bz2" |