diff options
Diffstat (limited to 'main')
92 files changed, 1000 insertions, 342 deletions
diff --git a/main/alpine-mirrors/APKBUILD b/main/alpine-mirrors/APKBUILD index 52055c0880..7ac33776b7 100644 --- a/main/alpine-mirrors/APKBUILD +++ b/main/alpine-mirrors/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matt Smith <mcs@darkregion.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-mirrors -pkgver=2.1.0_git20110122 +pkgver=2.1.0_git20111203 pkgrel=0 pkgdesc="List of Alpine Linux Mirrors" url="http://alpinelinux.org/" @@ -11,7 +11,7 @@ depends= makedepends= install= subpackages= -source="http://www.alpinelinux.org/alpine/MIRRORS.txt +source="MIRRORS.txt RELEASES.txt " @@ -26,5 +26,5 @@ package() { "$pkgdir"/usr/share/alpine-mirrors/RELEASES.txt } -md5sums="14a00f625a76ebe8e957d21abdf8b6c2 MIRRORS.txt -4f1406540f5debe6805c14ebe8da8ca5 RELEASES.txt" +md5sums="052304b2ce9186a89d6de05a41a0e274 MIRRORS.txt +2d261c2947ccf35000ae3128d33da04a RELEASES.txt" diff --git a/main/alpine-mirrors/MIRRORS.txt b/main/alpine-mirrors/MIRRORS.txt new file mode 100644 index 0000000000..9f821dd12a --- /dev/null +++ b/main/alpine-mirrors/MIRRORS.txt @@ -0,0 +1,6 @@ +http://dl-2.alpinelinux.org/alpine/ +http://dl-3.alpinelinux.org/alpine/ +http://dl-4.alpinelinux.org/alpine/ +http://mirrors.gigenet.com/alpinelinux/ +http://distrib-coffee.ipsl.jussieu.fr/pub/linux/alpine/alpine/ +http://nl.alpinelinux.org/alpine/ diff --git a/main/alpine-mirrors/RELEASES.txt b/main/alpine-mirrors/RELEASES.txt index 903fa336e7..af59c903c7 100644 --- a/main/alpine-mirrors/RELEASES.txt +++ b/main/alpine-mirrors/RELEASES.txt @@ -1,2 +1,2 @@ edge -v2.2 +v2.3 diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD index 57e8bfa59e..169d514926 100644 --- a/main/arpon/APKBUILD +++ b/main/arpon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=arpon -pkgver=2.1 +pkgver=2.7 pkgrel=0 pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects" url="http://arpon.sourceforge.net/" @@ -37,6 +37,6 @@ package() { install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -md5sums="c5e958af0d7068a12cb1fea656a759bd ArpON-2.1.tar.gz +md5sums="3c3230f6852b9ffd5618a35c2f25221c ArpON-2.7.tar.gz 4bf2cb423936b1ca84773fe6b7baaa73 arpon.initd 26986bed19b28cec66ed08447d22efaf arpon.confd" diff --git a/main/backuppc/backuppc.initd b/main/backuppc/backuppc.initd index eefdc92c7c..850e6aeaa8 100644 --- a/main/backuppc/backuppc.initd +++ b/main/backuppc/backuppc.initd @@ -14,7 +14,7 @@ configure () { start() { ebegin "Starting $DAEMON" start-stop-daemon --start --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \ - -c $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d + --user $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d eend $? } @@ -29,7 +29,7 @@ restart () { start-stop-daemon --stop --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \ --retry 30 -x /usr/bin/perl start-stop-daemon --start --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \ - -c $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d + --user $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d } reload () { diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD index 9e74d229da..e26b386408 100644 --- a/main/bash/APKBUILD +++ b/main/bash/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bash -pkgver=4.2.010 +pkgver=4.2.020 _patchlevel=${pkgver##*.} _myver=${pkgver%.*} _patchbase=${_myver%.*}${_myver#*.} @@ -77,4 +77,14 @@ ce4e5c484993705b27daa151eca242c2 bash42-006 88d1f96db29461767602e2546803bda7 bash42-007 24c574bf6d6a581e300823d9c1276af6 bash42-008 4c5835f2fbab36c4292bb334977e5b6d bash42-009 -0a51602b535ef661ee707be6c8bdb373 bash42-010" +0a51602b535ef661ee707be6c8bdb373 bash42-010 +58deacf3d57cbd75575444ff6a3b0806 bash42-011 +72d5059820015231483bb7415d09e9db bash42-012 +608336ebe215984ef126e3c29d2d3409 bash42-013 +ed19da878e3f630834c62b9d9dcc6fce bash42-014 +2d07daba0b8ca8f876d2aa052ff594b4 bash42-015 +53d246537e1fffd1aaa02ba5c056211c bash42-016 +304fd129a58fee2d8a34f8b4704db0aa bash42-017 +6921a0b4228fe89b6537a5c29f027c89 bash42-018 +1195d85447f3d048d2c9bcd075fa765c bash42-019 +b09000bba08da6ac753124593850cdf7 bash42-020" diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD index e0b35bafdd..b60ad5fa9c 100644 --- a/main/bitlbee/APKBUILD +++ b/main/bitlbee/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com> pkgname=bitlbee -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=0 pkgdesc="An IRC to other chat networks gateway" url="http://www.bitlbee.org/" @@ -52,7 +52,7 @@ otr() { mv "$pkgdir"/usr/lib/bitlbee "$subpkgdir"/usr/lib } -md5sums="4fe688e3a80efe011743f4c9265c0310 bitlbee-3.0.3.tar.gz -6b3c70649ececec230d145b62778ad61 bitlbee.initd +md5sums="3eb1e3e30c015885c641503eec4b05cb bitlbee-3.0.4.tar.gz +7c3f5a9c5b25b425e87ff38abc44282d bitlbee.initd bf07d39a4b652c63415b411229c5e281 bitlbee.confd 2d91f7ae46d69560d7f156f282dceaef bitlbee.post-install" diff --git a/main/bitlbee/bitlbee.initd b/main/bitlbee/bitlbee.initd index 92bab34abd..c6e7ce7646 100644 --- a/main/bitlbee/bitlbee.initd +++ b/main/bitlbee/bitlbee.initd @@ -14,7 +14,7 @@ start() { ebegin "Starting ${name}" start-stop-daemon --start --quiet \ --pidfile /var/run/${name}.pid \ - --chuid nobody:nobody \ + --user nobody:nobody \ --exec ${daemon} -- ${PORT} ${OPTS} eend $? } diff --git a/main/cegui06/APKBUILD b/main/cegui06/APKBUILD new file mode 100644 index 0000000000..709b1b4b7d --- /dev/null +++ b/main/cegui06/APKBUILD @@ -0,0 +1,52 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=cegui06 +pkgver=0.6.2b +pkgrel=1 +pkgdesc="CEGUI library 0.6 for apps which need this specific version" +url="http://www.cegui.org.uk" +arch="all" +license="MIT and LGPLv2+" +depends="" +makedepends="freetype-dev pcre-dev expat-dev libice-dev libsm-dev glew-dev + mesa-dev lua-dev" +install="" +subpackages="$pkgname-dev" +source="http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz + cegui-0.6.2-gcc46.patch + cegui-0.6.0-userverso.patch" + +_builddir="$srcdir"/CEGUI-0.6.2 +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --disable-samples \ + --with-pic \ + --with-default-xml-parser=ExpatParser \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="4fbd95e5a2ac1c7acf2a8f5df3ac6b93 CEGUI-0.6.2b.tar.gz +c313bbb6fea733ff904f7f3b48f6a3d0 cegui-0.6.2-gcc46.patch +dd5a5d6be594960cd53934271514e351 cegui-0.6.0-userverso.patch" diff --git a/main/cegui06/cegui-0.6.0-userverso.patch b/main/cegui06/cegui-0.6.0-userverso.patch new file mode 100644 index 0000000000..ea5a99cbed --- /dev/null +++ b/main/cegui06/cegui-0.6.0-userverso.patch @@ -0,0 +1,21 @@ +--- CEGUI-0.6.0/src/CEGUIDynamicModule.cpp~ 2008-05-21 22:11:55.000000000 +0200 ++++ CEGUI-0.6.0/src/CEGUIDynamicModule.cpp 2008-05-21 22:11:55.000000000 +0200 +@@ -65,6 +65,18 @@ DynamicModule::DynamicModule(const Strin + } // if(name.empty()) + + #if defined(__linux__) ++ // check if we are being asked to open a CEGUI .so, if so postfix the name ++ // with our package version ++ if (d_moduleName.substr(0, 5) == "CEGUI" || ++ d_moduleName.substr(0, 8) == "libCEGUI") ++ { ++ // strip .so extension before postfixing, will get added again below ++ if (d_moduleName.substr(d_moduleName.length() - 3, 3) == ".so") ++ d_moduleName = d_moduleName.substr(0, d_moduleName.length() - 3); ++ d_moduleName += "-"; ++ d_moduleName += PACKAGE_VERSION; ++ } ++ + // dlopen() does not add .so to the filename, like windows does for .dll + if (d_moduleName.substr(d_moduleName.length() - 3, 3) != ".so") + d_moduleName += ".so"; diff --git a/main/cegui06/cegui-0.6.2-gcc46.patch b/main/cegui06/cegui-0.6.2-gcc46.patch new file mode 100644 index 0000000000..27c817cff4 --- /dev/null +++ b/main/cegui06/cegui-0.6.2-gcc46.patch @@ -0,0 +1,11 @@ +diff -up CEGUI-0.6.2/include/CEGUIBase.h~ CEGUI-0.6.2/include/CEGUIBase.h +--- CEGUI-0.6.2/include/CEGUIBase.h~ 2008-02-11 15:38:27.000000000 +0100 ++++ CEGUI-0.6.2/include/CEGUIBase.h 2011-02-13 20:06:29.477851548 +0100 +@@ -33,6 +33,7 @@ + #ifndef _CEGUIBase_h_ + #define _CEGUIBase_h_ + ++#include <cstddef> + #include <cassert> + + // bring in configuration options diff --git a/main/celt051/APKBUILD b/main/celt051/APKBUILD new file mode 100644 index 0000000000..86e05c8f0d --- /dev/null +++ b/main/celt051/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=celt051 +pkgver=0.5.1.3 +pkgrel=0 +pkgdesc="An audio codec for use in low-delay speech and audio communication" +url="http://www.celt-codec.org/" +arch="all" +license="BSD" +depends="" +makedepends="libogg-dev" +install="" +subpackages="$pkgname-dev" +source="http://downloads.us.xiph.org/releases/celt/celt-$pkgver.tar.gz" + +_builddir="$srcdir"/celt-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="67e7b5e45db57a6f1f0a6962f5ecb190 celt-0.5.1.3.tar.gz" diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD index 5d9c445e5c..0d6d3d8b4e 100644 --- a/main/conntrack-tools/APKBUILD +++ b/main/conntrack-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=conntrack-tools -pkgver=0.9.13 -pkgrel=3 +pkgver=1.0.0 +pkgrel=0 pkgdesc="Connection tracking userspace tools" url="http://conntrack-tools.netfilter.org" arch="all" @@ -14,16 +14,21 @@ source="http://www.netfilter.org/projects/conntrack-tools/files/$pkgname-$pkgver conntrackd.confd " +_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 install -Dm755 ../conntrackd.initd "$pkgdir"/etc/init.d/conntrackd install -Dm644 ../conntrackd.confd "$pkgdir"/etc/conf.d/conntrackd install -Dm644 doc/stats/conntrackd.conf "$pkgdir"/etc/conntrackd } -md5sums="bd0e2149a1626071db83c4f9714e0556 conntrack-tools-0.9.13.tar.bz2 +md5sums="5add24d4761baf17af630d5627a71752 conntrack-tools-1.0.0.tar.bz2 a97e0b7f1339d93caf929fb4767141e1 conntrackd.initd 8ebf3838b69d20e6bb4a173844502039 conntrackd.confd" diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 79d5f78306..fe6ac49da7 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -3,7 +3,7 @@ _flavor=grsec _kver=3.0.12 -_kpkgrel=0 +_kpkgrel=1 _mypkgrel=0 # verify the kernel version before entering chroot diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD index a4691a081c..c26cd6cf6b 100644 --- a/main/dahdi-linux-vserver/APKBUILD +++ b/main/dahdi-linux-vserver/APKBUILD @@ -5,7 +5,7 @@ _flavor=${FLAVOR:-vserver} _realname=dahdi-linux _name=$_realname-$_flavor _kver=3.0.10 -_kpkgrel=0 +_kpkgrel=1 _myvsver=vs2.3.2.1 # verify the kernel version before entering chroot diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD index 4c2eada096..a2c6609bb0 100644 --- a/main/dosfstools/APKBUILD +++ b/main/dosfstools/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dosfstools -pkgver=3.0.11 +pkgver=3.0.12 pkgrel=0 pkgdesc="DOS filesystem utilities" url="http://www.daniel-baumann.ch/software/dosfstools/" @@ -9,7 +9,7 @@ license="GPL-2" depends= makedepends="" subpackages="$pkgname-doc" -source="http://www.daniel-baumann.ch/software/$pkgname/$pkgname-$pkgver.tar.bz2" +source="http://www.daniel-baumann.ch/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { cd "$srcdir"/$pkgname-$pkgver @@ -23,4 +23,4 @@ package() { DOCDIR="$pkgdir"/usr/share/doc \ install } -md5sums="8d2211d5bd813164e20740e7c852aa06 dosfstools-3.0.11.tar.bz2" +md5sums="4c1f1e72b82371704f93ebdd3c7b6259 dosfstools-3.0.12.tar.gz" diff --git a/main/ebtables/0001-link-with-gcc.patch b/main/ebtables/0001-link-with-gcc.patch deleted file mode 100644 index 88aba09f3f..0000000000 --- a/main/ebtables/0001-link-with-gcc.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/Makefile Sun Jun 21 13:13:25 2009 -+++ b/Makefile Wed Oct 28 02:42:43 2009 -@@ -85,7 +85,7 @@ - - .PHONY: libebtc - libebtc: $(OBJECTS2) -- $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2) -+ $(CC) -shared -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2) - - ebtables: $(OBJECTS) ebtables-standalone.o libebtc - $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ -@@ -153,10 +153,13 @@ - tmp3:=$(shell printf $(PIPE) | sed 's/\//\\\//g') - .PHONY: scripts - scripts: ebtables-save ebtables.sysv ebtables-config -+ mkdir -p $(DESTDIR)$(BINDIR) - cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ - install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save -+ mkdir -p $(DESTDIR)$(INITDIR) - cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_ - install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables -+ mkdir -p $(DESTDIR)$(SYSCONFIGDIR) - cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ - install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config - rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ diff --git a/main/ebtables/APKBUILD b/main/ebtables/APKBUILD index c7ae555f26..184081cc7b 100644 --- a/main/ebtables/APKBUILD +++ b/main/ebtables/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Andrew Manison <amanison@anselsystems.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ebtables -pkgver=2.0.9.1 -_realver=v2.0.9-1 -pkgrel=3 +pkgver=2.0.10.2 +_realver=v${pkgver%.[0-9]}-${pkgver##*.} +pkgrel=0 pkgdesc="Ethernet bridge tables - Linux Ethernet filter for the Linux bridge." url="http://ebtables.sourceforge.net/" arch="all" @@ -13,27 +13,23 @@ makedepends= install= subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_realver.tar.gz - 0001-link-with-gcc.patch ebtables.initd ebtables.confd" prepare() { cd "$srcdir"/$pkgname-$_realver # patches - for i in ../*.patch; do - msg "Applying $i" - if ! patch --verbose -p1 -i $i; then - error "$i failed" - return 1 - fi + for i in $source; do + case "$i" in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac done - sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \ -e "s,^BINDIR:=.*,BINDIR:=/sbin," \ -e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/ebtables," \ -e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/ebtables,"\ -e "s,^LIBDIR:=.*,LIBDIR:=/usr/lib/\$(PROGNAME)," \ - -e "s/^CFLAGS:=/CFLAGS+=/" \ + -e "s/^CFLAGS:=/CFLAGS?=/" \ -e "s,^CC:=,CC?=," Makefile } @@ -43,7 +39,7 @@ build() { # This package uses _init functions to initialise extensions. With # --as-needed this will not work. export LDFLAGS="$LDFLAGS -Wl,--no-as-needed" - make || return 1 + make CFLAGS="$CFLAGS" || return 1 } package() { @@ -53,7 +49,6 @@ package() { install -D -m644 ../ebtables.confd "$pkgdir"/etc/conf.d/ebtables } -md5sums="0e0c20adf2bba6d91dbd0b74a1a38c33 ebtables-v2.0.9-1.tar.gz -91a565a5906dc1fd4103f03c6a88e0e1 0001-link-with-gcc.patch +md5sums="c5ae7fb75810fd936a5445239e853fd8 ebtables-v2.0.10-2.tar.gz 92e13b3bc1d47d7c00636ebb78c905d5 ebtables.initd 285089ba2d846e72e321a12e3da3cc96 ebtables.confd" diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD index 3529150396..2e81bc0f1f 100644 --- a/main/ez-ipupdate/APKBUILD +++ b/main/ez-ipupdate/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> pkgname=ez-ipupdate pkgver=3.0.10 -pkgrel=2 +pkgrel=3 pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)" url="http://ez-ipupdate.com/" arch="all" @@ -45,5 +45,5 @@ package() { md5sums="6505c9d18ef6b5ce13fe2a668eb5724b ez-ipupdate-3.0.10.tar.gz e6e06780b1896f2250132cc16cd10710 ez-ipupdate.confd -6b9ce71b7b6b739794f003b2ebbf66ed ez-ipupdate.initd +6a8250dd9c7810c1968f80c90715b747 ez-ipupdate.initd 1fede0dcb5d9ca108855df0a9d213413 errno.patch" diff --git a/main/ez-ipupdate/ez-ipupdate.initd b/main/ez-ipupdate/ez-ipupdate.initd index 4ec662694a..89faa9e72f 100644 --- a/main/ez-ipupdate/ez-ipupdate.initd +++ b/main/ez-ipupdate/ez-ipupdate.initd @@ -26,7 +26,7 @@ start() { ebegin "Starting ${NAME}" start-stop-daemon --start --quiet \ --pidfile /var/run/${NAME}/${NAME}.pid \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ + --user ${DAEMON_USER}:${DAEMON_GROUP} \ --exec ${DAEMON} -- ${OPTS} eend $? } diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD index c784f2816f..abf340c916 100644 --- a/main/fetchmail/APKBUILD +++ b/main/fetchmail/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Michael Mason <ms13sp@gmail.com> +# Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fetchmail pkgver=6.3.21 -pkgrel=0 +pkgrel=1 pkgdesc="A remote-mail retrieval and forwarding utility" url="http://fetchmail.berlios.de/" arch="all" @@ -37,10 +37,10 @@ fetchmailconf() { pkgdesc="A GUI for generating fetchmail configuration files" install= mkdir -p "$subpkgdir"/usr/bin - cd "$pkgdir" + cd "$pkgdir" mv usr/bin/fetchmailconf "$subpkgdir"/usr/bin/ mv usr/lib "$subpkgdir"/usr/ } md5sums="0ad8eac47e85bd0ae63870daa09992af fetchmail-6.3.21.tar.bz2 -b27fe01a7c25534d62d175c8ba22fc48 fetchmail.initd" +20ad22948fd77cf24e2bb288af6fd266 fetchmail.initd" diff --git a/main/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd index 73286c4e70..0857d652fa 100755 --- a/main/fetchmail/fetchmail.initd +++ b/main/fetchmail/fetchmail.initd @@ -20,7 +20,7 @@ start() { ebegin "Starting fetchmail" start-stop-daemon --start --quiet \ - --chuid fetchmail --exec /usr/bin/fetchmail \ + --user fetchmail --exec /usr/bin/fetchmail \ -- -d ${polling_period:-300} -f /etc/fetchmailrc \ --pidfile ${pidfile} -i /var/lib/fetchmail/.fetchids eend ${?} diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index ae6af04ba7..70ae9ea6db 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -7,7 +7,7 @@ _specs_gcc_ver=4.4.3 _uclibc_abiver=0.9.32 -pkgrel=1 +pkgrel=3 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" arch="all" @@ -15,33 +15,40 @@ license="GPL LGPL" depends="binutils libgcc libgomp libobjc" makedepends="bison flex gmp-dev mpfr-dev texinfo libmpc-dev gawk zlib-dev zip cloog-dev" -subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp $pkgname-go - libgo" +subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp" replaces="libstdc++" if [ -n "$BOOTSTRAP" ]; then LANG_OBJC=off LANG_JAVA=off + LANG_FORTRAN=off fi +_languages=c,c++ if [ "$LANG_OBJC" != "off" ]; then subpackages="$subpackages libobjc" + _languages="$_languages,objc" fi if [ "$LANG_JAVA" != "off" ]; then subpackages="$subpackages $pkgname-java libgcj" makedepends="$makedepends paxctl" + _languages="$_languages,java" fi if [ "$LANG_GO" != "off" ]; then + subpackages="$subpackages $pkgname-go libgo" _languages="$_languages,go" - fi - - +fi +if [ "$LANG_FORTRAN" != "off" ]; then + subpackages="$subpackages gfortran libgfortran libquadmath" + _languages="$_languages,fortran" +fi source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-java-$pkgver.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-go-$pkgver.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-fortran-$pkgver.tar.bz2 http://distfiles.gentoo.org/distfiles/gcc-4.6.1-piepatches-v${_piepatchver}.tar.bz2 http://distfiles.gentoo.org/distfiles/gcc-$_specs_gcc_ver-specs-$_specs_ver.tar.bz2 ftp://sourceware.org/pub/java/ecj-latest.jar @@ -124,7 +131,7 @@ prepare() { } build() { - local _languages= _dynamic_linker= + local _dynamic_linker= cd "$_gccdir" export CFLAGS="-fno-stack-protector" [ -z "$CBUILD" ] && CBUILD="$CHOST" @@ -141,21 +148,6 @@ build() { ;; esac - _languages=c,c++ - # we can disable OBJC with LANG_OBJC=off - if [ "$LANG_OBJC" != "off" ]; then - _languages=$_languages,objc - fi - - # and disable java with LANG_JAVA=off - if [ "$LANG_JAVA" != "off" ]; then - _languages="$_languages,java" - fi - - if [ "$LANG_GO" != "off" ]; then - _languages="$_languages,go" - fi - # --enable-target-optspace is broken on powerpc if [ "$CARCH" != "powerpc" ]; then _target_optspace="--enable-target-optspace" @@ -356,11 +348,47 @@ go() { "$subpkgdir"/usr/lib/ || return 1 } +libgfortran() { + pkgdesc="Fortran runtime library for GCC" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/ +} + +libquadmath() { + replaces="gcc" + pkgdesc="128-bit math library for GCC" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/ +} + +gfortran() { + pkgdesc="GNU Fortran Compiler" + depends="$depends libgfortran libquadmath" + replaces="gcc" + local libexec=usr/libexec/gcc/${CHOST:-$_chost}/$pkgver + local gcclibs=usr/lib/gcc/${CHOST:-$_chost}/$pkgver + mkdir -p "$subpkgdir"/$libexec \ + "$subpkgdir"/$gcclibs \ + "$subpkgdir"/usr/lib \ + "$subpkgdir"/usr/bin || return 1 + mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/ || return 1 + mv "$pkgdir"/usr/lib/libgfortran.a \ + "$pkgdir"/usr/lib/libgfortran.so \ + "$pkgdir"/usr/lib/libquadmath.a \ + "$pkgdir"/usr/lib/libquadmath.so \ + "$subpkgdir"/usr/lib/ || return 1 + mv "$pkgdir"/$libexec/f951 \ + "$subpkgdir"/$libexec + mv "$pkgdir"/$gcclibs/libgfortranbegin.a \ + "$subpkgdir"/$gcclibs +} + md5sums="780f614ab18c7a9066dec6387d7490b2 gcc-core-4.6.2.tar.bz2 87ecd60431e41096419dd8a10f76e46b gcc-g++-4.6.2.tar.bz2 94043cc0d08394eddebed73f30ecad89 gcc-objc-4.6.2.tar.bz2 52de580642d7092b7b2790d9a81ab7a6 gcc-java-4.6.2.tar.bz2 0b7bdd9bd3096075f035fa9def33c314 gcc-go-4.6.2.tar.bz2 +216ecc8dbf99a562e837c48b5c4e7979 gcc-fortran-4.6.2.tar.bz2 5dc7efd84b526801b94fed21462aea62 gcc-4.6.1-piepatches-v0.4.5.tar.bz2 441c76504e1d97170117c294e65c7a72 gcc-4.4.3-specs-0.2.0.tar.bz2 d7cd6a27c8801e66cbaa964a039ecfdb ecj-latest.jar diff --git a/main/git/APKBUILD b/main/git/APKBUILD index c81f4e8b60..2a3213b0ab 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.7.7.4 +pkgver=1.7.8 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -52,7 +52,7 @@ perl() { } -md5sums="2f3277475b8da2eb92cef54c4c641a2c git-1.7.7.4.tar.gz +md5sums="4a3c03a04dbb857ecc875dae1278b76e git-1.7.8.tar.gz e63a201556c4f089de790805c09a2e5b bb-tar.patch 3f0bdf6ca73bf4f015bc8565ab787969 git-daemon.initd 2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd" diff --git a/main/glibmm/APKBUILD b/main/glibmm/APKBUILD index e8456a02e4..b3f26b9641 100644 --- a/main/glibmm/APKBUILD +++ b/main/glibmm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glibmm -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=0 pkgdesc="C++ wrapper for the GLib toolkit" url="http://gtkmm.sourceforge.net/" @@ -36,4 +36,4 @@ doc() { mv "$pkgdir"/usr/share/devhelp "$subpkgdir"/usr/share/ } -md5sums="7d9740098cd46f058a351df3bc3670ce glibmm-2.30.0.tar.bz2" +md5sums="9b333de989287c563334faa88a11fc21 glibmm-2.30.1.tar.bz2" diff --git a/main/inkscape/APKBUILD b/main/inkscape/APKBUILD index f20dd42989..23ac796be2 100644 --- a/main/inkscape/APKBUILD +++ b/main/inkscape/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=inkscape pkgver=0.48.2 -pkgrel=3 +pkgrel=4 pkgdesc="A vector-based drawing program - svg compliant" url="http://inkscape.sourceforge.net/" arch="all" diff --git a/main/ircservices/APKBUILD b/main/ircservices/APKBUILD index dce26a4f92..2e37382494 100644 --- a/main/ircservices/APKBUILD +++ b/main/ircservices/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ircservices pkgver=5.1.24 -pkgrel=0 +pkgrel=1 pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)" url="http://www.ircservices.za.net/" arch="all" @@ -55,7 +55,7 @@ package() { # try conform to FHS cd "$pkgdir" install -d etc/ircservices usr/share/ircservices var/log/ircservices - + mv var/lib/ircservices/convert-db usr/bin/ircservices-convert-db mv var/lib/ircservices/example-ircservices.conf \ @@ -78,10 +78,10 @@ package() { chown ircservices:ircservices var/lib/ircservices \ var/log/ircservices - + chown root:ircservices etc/ircservices/ircservices.conf \ etc/ircservices/modules.conf } md5sums="d4f531537aeed230026cf5560f221ecb ircservices-5.1.24.tar.gz -279ea42c5d97b47787b5959c9981fbaa ircservices.initd" +6168b69dbce72d5f09f2c7437f1a540d ircservices.initd" diff --git a/main/ircservices/ircservices.initd b/main/ircservices/ircservices.initd index 8c2a11e8ba..2b0e9ff81e 100644 --- a/main/ircservices/ircservices.initd +++ b/main/ircservices/ircservices.initd @@ -12,7 +12,7 @@ depend() { start() { ebegin "Starting IRC Services" start-stop-daemon --start --quiet --exec /usr/bin/ircservices \ - --chuid ircservices \ + --user ircservices \ -- \ -dir=/var/lib/ircservices \ -log=/var/log/ircservices/ircservices.log \ diff --git a/main/java-gcj-compat/APKBUILD b/main/java-gcj-compat/APKBUILD index e9a421c69d..48d663da5f 100644 --- a/main/java-gcj-compat/APKBUILD +++ b/main/java-gcj-compat/APKBUILD @@ -25,7 +25,7 @@ build() { cd $_builddir gcj -Wl,-Bsymbolic -findirect-dispatch -o ecj \ --main=org.eclipse.jdt.internal.compiler.batch.Main \ - /usr/share/java/ecj.jar + /usr/share/java/ecj.jar -lgcj } package() { diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD index 9bd8e55a9a..538e0d7f5b 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Nathan Angelacos <nangel@alpinelinux.org> pkgname=kamailio -pkgver=3.2.0 -pkgrel=3 +pkgver=3.2.1 +pkgrel=0 pkgdesc="Open Source SIP Proxy" url="http://www.kamailio.org/" pkgusers="kamailio" @@ -29,7 +29,7 @@ _builddir="$srcdir"/$pkgname-$pkgver _default="carrierroute xmlrpc tm" -_presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo presence_reginfo" +_presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_server xcap_client presence_dialoginfo pua_dialoginfo presence_reginfo" _pcre="dialplan lcr regex" _postgres="db_postgres" _mysql="db_mysql" @@ -200,7 +200,7 @@ ldap() { _mv_mod_s ldap } -md5sums="d2b452e5ec4927b2ec8decdda5966bd9 kamailio-3.2.0_src.tar.gz +md5sums="54747dc1cd84992619f61d23a40ad829 kamailio-3.2.1_src.tar.gz 53cca39c47399eb2df20a1044d1e29eb fix-sql-module-loading-order.patch 3822db06b5226b5e2adc7ae7077dfaf2 kamailio-3.2-backslash.patch a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD index ec874b11fb..5a718e7423 100644 --- a/main/lame/APKBUILD +++ b/main/lame/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lame -pkgver=3.99.2 +pkgver=3.99.3 _ver=${pkgver%.*} pkgrel=0 pkgdesc="An MP3 encoder and graphical frame analyzer" @@ -53,4 +53,4 @@ package() { fi } -md5sums="d049cc1c6b2be16805d5765cc0b23737 lame-3.99.2.tar.gz" +md5sums="5ad31e33e70455eb3a7b79a5dd934fce lame-3.99.3.tar.gz" diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 9d09101f54..398f6a3bde 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -4,7 +4,7 @@ pkgname=libc$_abiver _gitver= pkgver=0.9.32 _ver=${pkgver/_/-} -pkgrel=9 +pkgrel=12 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -36,7 +36,6 @@ source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2 libm-cabsf.patch libm-cexp.patch uclibc-ubacktrace-asneeded-fix.patch - uclibc-librt-asneeded-fix.patch uclibc-epoll_pwait-hack.patch uclibcconfig.x86 uclibcconfig.x86_64 @@ -149,7 +148,6 @@ e814d39ab0adab58d69396ac0b9acdea 0001-libc-x86-fix-stack-unwinding-and-backtrac 40e9c7f017cc81ee5b19ead000b9b6b7 libm-cabsf.patch 42416385763f7cd50775ed9bfaf2d59e libm-cexp.patch 7c47e9cb284b0da8df6ed2096b2c9c66 uclibc-ubacktrace-asneeded-fix.patch -e5caf13c43ee8d48f22eded21b857d81 uclibc-librt-asneeded-fix.patch 0ed588014227935fbb83b207282f3c15 uclibc-epoll_pwait-hack.patch b313290b2d700e82b7292c1dcd7d559e uclibcconfig.x86 8e49d9b5bb7b77a27beb53d5580367d5 uclibcconfig.x86_64 diff --git a/main/libc0.9.32/uclibc-librt-asneeded-fix.patch b/main/libc0.9.32/uclibc-librt-asneeded-fix.patch deleted file mode 100644 index d85af19f2a..0000000000 --- a/main/libc0.9.32/uclibc-librt-asneeded-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- uClibc-0.9.32-rc3.orig/Makefile.in -+++ uClibc-0.9.32-rc3/Makefile.in -@@ -340,6 +340,12 @@ - echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ - fi - endif -+ifeq ($(UCLIBC_HAS_REALTIME),y) -+# Add the AS_NEEDED entry for librt.so -+ if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so ] ; then \ -+ echo "GROUP ( $(LIBRT_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ -+ fi -+endif - ifeq ($(UCLIBC_HAS_THREADS),y) - ifneq ($(LINUXTHREADS_OLD),y) - ifeq ($(HARDWIRED_ABSPATH),y) ---- uClibc-0.9.32-rc3.orig/Rules.mak -+++ uClibc-0.9.32-rc3/Rules.mak -@@ -119,6 +119,7 @@ - LIBC := libc - SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) - UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) -+LIBRT_DSO := librt.so.$(ABI_VERSION) - ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) - UCLIBC_LDSO_NAME := ld64-uClibc - ARCH_NATIVE_BIT := 64 -@@ -542,6 +543,13 @@ - export UBACKTRACE_ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UBACKTRACE_FULL_NAME) )" || echo "$(UBACKTRACE_FULL_NAME)") - else - export UBACKTRACE_ASNEEDED:="" -+endif -+ifeq ($(UCLIBC_HAS_REALTIME),y) -+# Only used in installed libc.so linker script -+LIBRT_FULL_NAME := $(RUNTIME_PREFIX)lib/$(LIBRT_DSO) -+export LIBRT_ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(LIBRT_FULL_NAME) )" || echo "$(LIBRT_FULL_NAME)") -+else -+export LIBRT_ASNEEDED:="" - endif - endif - diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD index f665469866..5260417bdf 100644 --- a/main/libevent/APKBUILD +++ b/main/libevent/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libevent -pkgver=2.0.15 +pkgver=2.0.16 pkgrel=0 pkgdesc="An event notification library" url="http://www.monkey.org/~provos/libevent/" @@ -24,4 +24,4 @@ package() { make -j1 DESTDIR=$pkgdir install || return 1 rm "$pkgdir"/usr/lib/*.la } -md5sums="2643abe7ba242df15c08b2cc14ec8759 libevent-2.0.15-stable.tar.gz" +md5sums="899efcffccdb3d5111419df76e7dc8df libevent-2.0.16-stable.tar.gz" diff --git a/main/libmicrohttpd/APKBUILD b/main/libmicrohttpd/APKBUILD index 13ff29b1bd..c12f705808 100644 --- a/main/libmicrohttpd/APKBUILD +++ b/main/libmicrohttpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libmicrohttpd -pkgver=0.9.16 +pkgver=0.9.17 pkgrel=0 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." url="http://www.gnu.org/software/libmicrohttpd/" @@ -43,4 +43,4 @@ package() { "$pkgdir"/usr/include/plibc.h } -md5sums="e1240c6ae383b5be89431932f181898a libmicrohttpd-0.9.16.tar.gz" +md5sums="d6802049c806e903ef1fa9c5b847e555 libmicrohttpd-0.9.17.tar.gz" diff --git a/main/librsvg/APKBUILD b/main/librsvg/APKBUILD index c642a0a5b7..1ccc52ec04 100644 --- a/main/librsvg/APKBUILD +++ b/main/librsvg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=librsvg -pkgver=2.34.1 +pkgver=2.34.2 pkgrel=0 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" url="http://librsvg.sourceforge.net/" @@ -33,4 +33,4 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="e2eeca43fb725d028561834888071106 librsvg-2.34.1.tar.bz2" +md5sums="4a7eda78019cb89d4e7ae7c841480399 librsvg-2.34.2.tar.bz2" diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index c29fac6b62..715cf00bed 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=3.0.12 _kernver=3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -144,5 +144,5 @@ a129184102c16a4ee39afe50cae43efd grsecurity-2.2.2-3.0.12-unofficial.patch c41cf0ee9794f393423c6b2093072260 grsec-timblogiw-noconst.patch ebb99ef6ad8cd2d9fd8f49d5c5849057 0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch -57c444f3e8bb60a7f5782330bc450efa kernelconfig.x86 -f00f1c26ef7ddcdc4467bb883a71522b kernelconfig.x86_64" +587b1fb2f6a5c9ba714900b856f57f09 kernelconfig.x86 +0b7758a8c0fc63cdaa53330ace7d8402 kernelconfig.x86_64" diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 9ce50ffb95..526d956762 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -80,7 +80,10 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index bb9066f94f..ef55302273 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.9 Kernel Configuration +# Linux/x86_64 3.0.12 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -81,7 +81,10 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index c2b0e0bbf4..e8ca6fb1da 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -3,7 +3,7 @@ _flavor=vserver pkgname=linux-${_flavor} pkgver=3.0.10 -pkgrel=0 +pkgrel=1 _vsver=vs2.3.2.1 if [ "${pkgver##*.*.*}" = "$pkgver" ]; then @@ -134,5 +134,5 @@ dev() { md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 8e0391dd935d838ee3023ab9daa6b447 patch-3.0.10.bz2 6d2fd60b055272429dde5e4043280fcb patch-3.0.10-vs2.3.2.1-unofficial.diff -fdf2737ad7b77bcfe4290ef2b0112138 kernelconfig.x86 -f82d261dc117ced42e2a3dcd4b6850a5 kernelconfig.x86_64" +4baec73eeb0ddc1148d580a6d1e29b1f kernelconfig.x86 +148b84ad28167290f2f7f0420945cb92 kernelconfig.x86_64" diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86 index eb1d4bc289..849e86c412 100644 --- a/main/linux-vserver/kernelconfig.x86 +++ b/main/linux-vserver/kernelconfig.x86 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.9-vs2.3.2.1 Kernel Configuration +# Linux/i386 3.0.10-vs2.3.2.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -81,7 +81,10 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y @@ -116,7 +119,9 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y # CONFIG_CPUSETS is not set CONFIG_CGROUP_CPUACCT=y -# CONFIG_RESOURCE_COUNTERS is not set +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -129,6 +134,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y @@ -4915,7 +4921,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y @@ -4988,7 +4994,7 @@ CONFIG_VSERVER_PROC_SECURE=y CONFIG_TAGGING_ID24=y # CONFIG_TAGGING_INTERN is not set # CONFIG_TAG_NFSD is not set -# CONFIG_VSERVER_PRIVACY is not set +CONFIG_VSERVER_PRIVACY=y CONFIG_VSERVER_CONTEXTS=256 CONFIG_VSERVER_WARN=y CONFIG_VSERVER_WARN_DEVPTS=y diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64 index 3c6941e4c2..eb4f6368a1 100644 --- a/main/linux-vserver/kernelconfig.x86_64 +++ b/main/linux-vserver/kernelconfig.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.4-vs2.3.1-pre10.1 Kernel Configuration +# Linux/x86_64 3.0.10-vs2.3.2.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -81,7 +81,10 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y @@ -118,7 +121,8 @@ CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -# CONFIG_CGROUP_MEM_RES_CTLR is not set +CONFIG_CGROUP_MEM_RES_CTLR=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -131,6 +135,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y @@ -226,7 +231,7 @@ CONFIG_BLOCK_COMPAT=y CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_CFQ=y -# CONFIG_CFQ_GROUP_IOSCHED is not set +CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" @@ -4883,7 +4888,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y @@ -4955,7 +4960,7 @@ CONFIG_VSERVER_PROC_SECURE=y CONFIG_TAGGING_ID24=y # CONFIG_TAGGING_INTERN is not set # CONFIG_TAG_NFSD is not set -# CONFIG_VSERVER_PRIVACY is not set +CONFIG_VSERVER_PRIVACY=y CONFIG_VSERVER_CONTEXTS=768 CONFIG_VSERVER_WARN=y CONFIG_VSERVER_WARN_DEVPTS=y diff --git a/main/lua-penlight/APKBUILD b/main/lua-penlight/APKBUILD index d1cc12efb8..f08fb6f1bf 100644 --- a/main/lua-penlight/APKBUILD +++ b/main/lua-penlight/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua-penlight -pkgver=0.9.6 +pkgver=0.9.8 pkgrel=0 pkgdesc="Lua libraries for extended operations on tables, lists and strings" url="http://penlight.luaforge.net/" @@ -10,7 +10,7 @@ depends="lua-filesystem" makedepends="wget" install= subpackages="$pkgname-doc" -source="http://stevedonovan.github.com/files/penlight-$pkgver.zip" +source="http://stevedonovan.github.com/files/penlight-$pkgver-src.zip" _builddir="$srcdir"/penlight-$pkgver @@ -27,4 +27,4 @@ package() { cp -r examples "$pkgdir"/usr/share/doc/$pkgname/ } -md5sums="cfb747e425cd49603288a933fe2559ef penlight-0.9.6.zip" +md5sums="c9c8143787c9a32b6cd20369b41b3e9f penlight-0.9.8-src.zip" diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD index e14332e9f2..645d374042 100644 --- a/main/mercurial/APKBUILD +++ b/main/mercurial/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mercurial -pkgver=2.0 +pkgver=2.0.1 pkgrel=0 pkgdesc="A scalable distributed SCM tool" url="http://www.selenic.com/mercurial" @@ -30,4 +30,4 @@ package() { install -Dm644 contrib/vim/HGAnnotate.vim \ "${vimpath}/syntax/HGAnnotate.vim" || return 1 } -md5sums="38f439a63bae1687d385758c8ad3d53e mercurial-2.0.tar.gz" +md5sums="16576b3089a88a84a35edc30e17a03a9 mercurial-2.0.1.tar.gz" diff --git a/main/mr/APKBUILD b/main/mr/APKBUILD index 347ae58f3b..56b608f30d 100644 --- a/main/mr/APKBUILD +++ b/main/mr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=mr -pkgver=1.04 +pkgver=1.06 pkgrel=0 pkgdesc="A multiple repository management tool" url="http://kitenet.net/~joey/code/mr/" @@ -13,7 +13,6 @@ makedepends="" install="" subpackages="$pkgname-doc" source="http://ftp.de.debian.org/debian/pool/main/m/mr/"$pkgname"_"$pkgver".tar.gz" - _builddir="$srcdir"/$pkgname build() { @@ -42,4 +41,4 @@ doc() { done } -md5sums="9ddd9e5b3a90bcb08ac773ddb1cea512 mr_1.04.tar.gz" +md5sums="5dcadb4c100076b5332a76863e7128aa mr_1.06.tar.gz" diff --git a/main/msmtp/APKBUILD b/main/msmtp/APKBUILD index 51acf6db23..671b4bbbdb 100644 --- a/main/msmtp/APKBUILD +++ b/main/msmtp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=msmtp -pkgver=1.4.25 +pkgver=1.4.26 pkgrel=0 pkgdesc="SMTP client with a sendmail compatible interface" url="http://msmtp.sourceforge.net/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="2d9603a7b5c1ebd83ea289ac2aa3a634 msmtp-1.4.25.tar.bz2" +md5sums="35734268c883aa06388742f902d95676 msmtp-1.4.26.tar.bz2" diff --git a/main/nload/APKBUILD b/main/nload/APKBUILD index 08642cb6db..d969b6830d 100644 --- a/main/nload/APKBUILD +++ b/main/nload/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jeff Bilyk <jbilyk at gmail.com> -# Maintainer: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nload -pkgver=0.7.2 -pkgrel=1 +pkgver=0.7.3 +pkgrel=0 pkgdesc="Console network traffic and bandwidth monitor" url="http://www.roland-riegel.de/nload" arch="all" @@ -11,7 +11,7 @@ depends= makedepends="ncurses-dev" install= subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +source="http://www.roland-riegel.de/nload/nload-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="5b851ecf898edcd1f465946745e95eb6 nload-0.7.2.tar.gz" +md5sums="9b97c37fe1474f1da42f265fead24081 nload-0.7.3.tar.gz" diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD index f4b0d31a9d..752d3a6d08 100644 --- a/main/open-iscsi-grsec/APKBUILD +++ b/main/open-iscsi-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec _realname=open-iscsi _realver=2.0-872 _kver=3.0.12 -_kpkgrel=0 +_kpkgrel=1 # verify the kernel version before entering chroot if [ -f ../linux-${_flavor}/APKBUILD ]; then diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index d5d85c939e..f946dba427 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -7,7 +7,7 @@ _realver=2011.09.23 _realsubver=491607 _kver=3.0.12 -_kpkgrel=0 +_kpkgrel=1 # source open-vm-tools version if [ -f ../main/$_realname/APKBUILD ]; then diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD index c5f3b56679..1644eaf9d1 100644 --- a/main/open-vm-tools-vserver/APKBUILD +++ b/main/open-vm-tools-vserver/APKBUILD @@ -4,7 +4,7 @@ _flavor=vserver _realname=open-vm-tools _name=$_realname-$_flavor _kver=3.0.10 -_kpkgrel=0 +_kpkgrel=1 _myvsver=vs2.3.2.1 _mypkgrel=0 diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD index 6e31f2d0a8..866c3d5d68 100644 --- a/main/open-vm-tools/APKBUILD +++ b/main/open-vm-tools/APKBUILD @@ -2,7 +2,7 @@ pkgname=open-vm-tools pkgver=2011.09.23 _pkgsubver=491607 -pkgrel=1 +pkgrel=2 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." url="http://open-vm-tools.sourceforge.net/" arch="all" @@ -38,7 +38,7 @@ prepare() { -e 's/__unused3/st_ctim.tv_nsec/g' \ lib/file/filePosix.c lib/hgfsServer/hgfsServerLinux.c \ || return 1 - + # workaround automake-1.10 issue # http://ramblingfoo.blogspot.com/2007/07/required-file-configrpath-not-found.html touch config/config.rpath @@ -87,5 +87,5 @@ md5sums="599342eee8d531b35ca1cc948b61868f open-vm-tools-2011.09.23-491607.tar.g 840e4d6ff3f53fc22bdedf4d64aabc91 ecvt.patch 89c7449323ddac4666b73a8467baf95a iconv-uclibc.patch 7d02fc25aba5c248f3d98dac238f175b libm.patch -c96644aa42d611fae853a3a2095efc47 open-vm-tools.initd +905ef6a3bac87c9ba2e5d3897ca230e7 open-vm-tools.initd 7b833102a56009bdfc2fef2fb9ffa297 procmgrposix.patch" diff --git a/main/open-vm-tools/open-vm-tools.initd b/main/open-vm-tools/open-vm-tools.initd index e54b84aaff..45a94a37ea 100644 --- a/main/open-vm-tools/open-vm-tools.initd +++ b/main/open-vm-tools/open-vm-tools.initd @@ -39,15 +39,15 @@ start() { mount -t vmblock none ${MOUNTPOINT} eend $? fi - + ebegin "Starting vmtoolsd" - start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN} + start-stop-daemon --user "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN} eend $? } stop() { local ret - + if [ "${VM_DRAG_AND_DROP}" == "yes" ]; then ebegin "Cleaning the contents of ${DND_TMPDIR}" diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD index cb50dd92e6..6a1ac2f8c8 100644 --- a/main/openldap/APKBUILD +++ b/main/openldap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openldap pkgver=2.4.26 -pkgrel=3 +pkgrel=4 pkgdesc="LDAP Server" url="http://www.openldap.org/" arch="all" @@ -59,6 +59,7 @@ build () { --enable-shell=mod \ --enable-sock=mod \ --enable-sql=mod \ + --enable-overlays=mod \ --with-tls=openssl \ --with-cyrus-sasl \ || return 1 diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 40796f7fe9..6485b99680 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -1,18 +1,19 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu -pkgver=0.15.1 -pkgrel=0 +pkgver=1.0 +pkgrel=1 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://www.nongnu.org/qemu/" arch="all" license="GPL-2 LGPL-2" makedepends="zlib-dev sdl-dev alsa-lib-dev gnutls-dev ncurses-dev glib-dev - jpeg-dev libpng-dev vde2-dev" + jpeg-dev libpng-dev vde2-dev spice-dev" depends= install="qemu.pre-install" subpackages=" $pkgname-arm $pkgname-cris +$pkgname-i386 $pkgname-lm32 $pkgname-m68k $pkgname-microblaze @@ -34,7 +35,7 @@ $pkgname-img " source="http://wiki.qemu.org/download/qemu-$pkgver.tar.gz 80-kvm.rules - qemu-libm.patch + configure-libm.patch " prepare() { @@ -62,11 +63,13 @@ build() { --audio-drv-list=oss,alsa,sdl \ --audio-card-list=ac97,sb16,es1370,adlib \ --enable-vde \ + --enable-spice \ --disable-darwin-user \ --disable-bsd-user \ --disable-linux-user \ --disable-werror \ - --cc="${CC:-gcc}" + --cc="${CC:-gcc}" \ + || return 1 make V=1 || return 1 } @@ -87,6 +90,7 @@ _subsys() { arm() { _subsys arm; } cris() { _subsys cris; } +i386() { _subsys i386; } lm32() { _subsys lm32; } m68k() { _subsys m68k; } microblaze() { _subsys microblaze; } @@ -114,6 +118,6 @@ img() { "$subpkgdir"/usr/bin/ } -md5sums="34f17737baaf1b3495c89cd6d4a607ed qemu-0.15.1.tar.gz +md5sums="a64b36067a191451323b0d34ebb44954 qemu-1.0.tar.gz 66660f143235201249dc0648b39b86ee 80-kvm.rules -70a4336c31600ce00838b056f0d08452 qemu-libm.patch" +a69fe6ff552b61606c5550cac4294abc configure-libm.patch" diff --git a/main/qemu/configure-libm.patch b/main/qemu/configure-libm.patch new file mode 100644 index 0000000000..e57216e53a --- /dev/null +++ b/main/qemu/configure-libm.patch @@ -0,0 +1,60 @@ +--- ./configure.orig ++++ ./configure +@@ -1287,6 +1287,25 @@ + fi + + ########################################## ++# libm check ++cat > $TMPC << EOF ++#include <math.h> ++int main(void) { return isnan(0.0); } ++EOF ++ if compile_prog "" "" ; then ++ LIBM= ++ elif compile_prog "" "-lm" ; then ++ LIBM="-lm" ++ else ++ echo ++ echo "Error: libm check failed" ++ echo ++ exit 1 ++ fi ++ ++ ++ ++########################################## + # zlib check + + if test "$zlib" != "no" ; then +--- ./configure.orig ++++ ./configure +@@ -3283,6 +3283,7 @@ + echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak + echo "EXESUF=$EXESUF" >> $config_host_mak + echo "LIBS_QGA+=$libs_qga" >> $config_host_mak ++echo "LIBM=$LIBM" >> $config_host_mak + + # generate list of library paths for linker script + +--- ./Makefile.orig ++++ ./Makefile +@@ -170,7 +170,7 @@ + $(qapi-obj-y): $(GENERATED_HEADERS) + qapi-dir := $(BUILD_DIR)/qapi-generated + test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir) +-qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) ++qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) $(LIBM) + + $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\ + $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py +--- ./Makefile.orig ++++ ./Makefile +@@ -34,7 +34,7 @@ + + $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw) + +-LIBS+=-lz $(LIBS_TOOLS) ++LIBS+=-lz $(LIBS_TOOLS) $(LIBM) + + ifdef BUILD_DOCS + DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt diff --git a/main/qemu/qemu-libm.patch b/main/qemu/qemu-libm.patch deleted file mode 100644 index c7f0db707b..0000000000 --- a/main/qemu/qemu-libm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.orig -+++ ./Makefile -@@ -29,7 +29,7 @@ - - $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw) - --LIBS+=-lz $(LIBS_TOOLS) -+LIBS+=-lm -lz $(LIBS_TOOLS) - - ifdef BUILD_DOCS - DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt diff --git a/main/rdiff-backup/APKBUILD b/main/rdiff-backup/APKBUILD index 13d6dfd939..78d2ce8537 100644 --- a/main/rdiff-backup/APKBUILD +++ b/main/rdiff-backup/APKBUILD @@ -1,17 +1,16 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> pkgname=rdiff-backup -pkgver=1.2.8 +pkgver=1.3.3 pkgrel=1 pkgdesc="A backup utility that maintains extra reverse diffs so that files can be restored from previous backups." url="http://www.gnu.org/savannah-checkouts/non-gnu/rdiff-backup/" arch="all" -license="GPL" -depends="python" +license="GPL2+" +depends="" makedepends="librsync-dev python-dev" subpackages="$pkgname-doc" source="http://savannah.nongnu.org/download/rdiff-backup/$pkgname-$pkgver.tar.gz" - _builddir="$srcdir"/$pkgname-$pkgver build() { @@ -24,4 +23,4 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="1a94dc537fcf74d6a3a80bd27808e77b rdiff-backup-1.2.8.tar.gz" +md5sums="e3ec506c01e12b693adb79751daa7c63 rdiff-backup-1.3.3.tar.gz" diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD index 7061eecc12..5954f4f5f1 100644 --- a/main/readline/APKBUILD +++ b/main/readline/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=readline -pkgver=6.2.001 +pkgver=6.2.002 _myver=${pkgver%.*} _patchver=${pkgver##*.} _suff=${_myver%.*}${_myver#*.} @@ -48,4 +48,5 @@ package() { } md5sums="67948acb2ca081f23359d0256e9a271c readline-6.2.tar.gz -83287d52a482f790dfb30ec0a8746669 readline62-001" +83287d52a482f790dfb30ec0a8746669 readline62-001 +0665020ea118e8434bd145fb71f452cc readline62-002" diff --git a/main/shotwell/APKBUILD b/main/shotwell/APKBUILD index 0ff40dd099..2e53b34c1e 100644 --- a/main/shotwell/APKBUILD +++ b/main/shotwell/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=shotwell pkgver=0.11.6 -pkgrel=0 +pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" url="http://yorba.org/shotwell/" arch="all" @@ -14,7 +14,8 @@ makedepends="intltool vala libgee-dev libunique-dev webkit-dev libexif-dev libgexiv2-dev libraw-dev librsvg-dev gconf-dev json-glib-dev gnome-vfs-dev m4 gst-plugins-base-dev bash" install= -source="http://yorba.org/download/shotwell/${pkgver%.*}/shotwell-$pkgver.tar.bz2" +source="http://yorba.org/download/shotwell/${pkgver%.*}/shotwell-$pkgver.tar.bz2 + shotwell-libraw.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -43,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="bbbf2843eb98b6f0ef1dfcfb934e15cf shotwell-0.11.6.tar.bz2" +md5sums="bbbf2843eb98b6f0ef1dfcfb934e15cf shotwell-0.11.6.tar.bz2 +0dc92b9a74e6515c14ae35434ee3c568 shotwell-libraw.patch" diff --git a/main/shotwell/shotwell-libraw.patch b/main/shotwell/shotwell-libraw.patch new file mode 100644 index 0000000000..5c2f9af752 --- /dev/null +++ b/main/shotwell/shotwell-libraw.patch @@ -0,0 +1,150 @@ +diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala +index cb32289..c2463a2 100644 +--- a/src/photos/GRaw.vala ++++ b/src/photos/GRaw.vala +@@ -34,11 +34,11 @@ public errordomain Exception { + OUT_OF_ORDER_CALL, + NO_THUMBNAIL, + UNSUPPORTED_THUMBNAIL, +- CANNOT_ADDMASK, + OUT_OF_MEMORY, + DATA_ERROR, + IO_ERROR, + CANCELLED_BY_CALLBACK, ++ BAD_CROP, + SYSTEM_ERROR + } + +@@ -163,10 +163,6 @@ public class Processor { + proc = new LibRaw.Processor(options); + } + +- public void add_masked_borders_to_bitmap() { +- proc.add_masked_borders_to_bitmap(); +- } +- + public void adjust_sizes_info_only() throws Exception { + throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only()); + } +@@ -215,10 +211,6 @@ public class Processor { + throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename)); + } + +- public void rotate_fuji_raw() throws Exception { +- throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw()); +- } +- + public void thumb_writer(string filename) throws Exception { + throw_exception("thumb_writer", proc.thumb_writer(filename)); + } +@@ -262,7 +254,6 @@ public class Processor { + // camera_profile + // bad_pixels + // dark_frame +- output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC; + output_params->output_bps = 8; + // output_tiff + output_params->user_flip = GRaw.Flip.FROM_SOURCE; +@@ -303,9 +294,6 @@ private void throw_exception(string caller, LibRaw.Result result) throws Excepti + case LibRaw.Result.UNSUPPORTED_THUMBNAIL: + throw new Exception.UNSUPPORTED_THUMBNAIL(msg); + +- case LibRaw.Result.CANNOT_ADDMASK: +- throw new Exception.CANNOT_ADDMASK(msg); +- + case LibRaw.Result.UNSUFFICIENT_MEMORY: + throw new Exception.OUT_OF_MEMORY(msg); + +@@ -318,6 +306,9 @@ private void throw_exception(string caller, LibRaw.Result result) throws Excepti + case LibRaw.Result.CANCELLED_BY_CALLBACK: + throw new Exception.CANCELLED_BY_CALLBACK(msg); + ++ case LibRaw.Result.BAD_CROP: ++ throw new Exception.BAD_CROP(msg); ++ + default: + return; + } +diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi +index 55f35cf..a7af4af 100644 +--- a/vapi/libraw.vapi ++++ b/vapi/libraw.vapi +@@ -14,17 +14,6 @@ public unowned string version(); + + public unowned string versionNumber(); + +-[CCode (cname="enum libraw_Filtering", cprefix="LIBRAW_FILTERING_")] +-public enum Filtering { +- DEFAULT, +- NOZEROES, +- NOBLACK, +- NORAWCURVE, +- NONE, +- LIBRAWOWN, +- AUTOMATIC +-} +- + [SimpleType] + [CCode (cname="libraw_imgother_t")] + public struct ImageOther { +@@ -121,7 +110,6 @@ public struct OutputParams { + public bool use_camera_wb; + public bool use_camera_matrix; + public int output_color; +- public Filtering filtering_mode; + public int output_bps; + public bool output_tiff; + public int user_flip; +@@ -132,6 +120,30 @@ public struct OutputParams { + public bool no_auto_bright; + public float auto_bright_thr; + public int use_fuji_rotate; ++ public int green_matching; ++ ++ /* DCB parameters */ ++ public int dcb_iterations; ++ public int dcb_enhance_fl; ++ public int fbdd_noiserd; ++ ++ /* VCD parameters */ ++ public int eeci_refine; ++ public int es_med_passes; ++ /* AMaZE*/ ++ public int ca_correc; ++ public float cared; ++ public float cablue; ++ public int cfaline; ++ public float linenoise; ++ public int cfa_clean; ++ public float lclean; ++ public float cclean; ++ public int cfa_green; ++ public float green_thresh; ++ public int exp_correc; ++ public float exp_shift; ++ public float exp_preser; + + public void set_chromatic_aberrations(double red_multiplier, double green_multiplier) { + aber[0] = red_multiplier; +@@ -171,7 +183,6 @@ public class Processor { + [CCode (cname="libraw_init")] + public Processor(Options flags = Options.NONE); + +- public void add_masked_borders_to_bitmap(); + public Result adjust_sizes_info_only(); + [CCode (cname="libraw_dcraw_document_mode_processing")] + public Result document_mode_processing(); +@@ -216,11 +227,11 @@ public enum Result { + OUT_OF_ORDER_CALL, + NO_THUMBNAIL, + UNSUPPORTED_THUMBNAIL, +- CANNOT_ADDMASK, + UNSUFFICIENT_MEMORY, + DATA_ERROR, + IO_ERROR, +- CANCELLED_BY_CALLBACK; ++ CANCELLED_BY_CALLBACK, ++ BAD_CROP; + + [CCode (cname="LIBRAW_FATAL_ERROR")] + public bool is_fatal_error(); diff --git a/main/smokeping/APKBUILD b/main/smokeping/APKBUILD index 6190e305e1..163b72fc51 100644 --- a/main/smokeping/APKBUILD +++ b/main/smokeping/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=smokeping pkgver=2.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="Smokeping network latency monitoring" pkgusers="smokeping" pkggroups="smokeping" @@ -129,7 +129,7 @@ package() { } md5sums="f4a5437b71e02f982f08bf318bb9857d smokeping-2.6.1.tar.gz -550979e008f49299bf404aceeb81fe61 smokeping.initd +38fe448bd14ebfb2a22dbd9fc98a59e7 smokeping.initd b3f3c968c582adb9e4e0fdcc9c7163e9 0001-fix-sysconfdir-in-etc.patch 2bdafaade171bfb2241d1e6450fb094a 0002-fix-sysconfdir-in-doc.patch 1942e4eceecb80b4bbe4cfc95e3e642f 0003-fix-sysconfdir-in-lib.patch diff --git a/main/smokeping/smokeping.initd b/main/smokeping/smokeping.initd index 068f33ff25..5a21fecd6e 100644 --- a/main/smokeping/smokeping.initd +++ b/main/smokeping/smokeping.initd @@ -29,7 +29,7 @@ start() { start-stop-daemon --start --name smokeping \ --pidfile /var/run/smokeping/smokeping.pid \ --exec /usr/bin/smokeping \ - --chuid smokeping:smokeping + --user smokeping:smokeping eend $? } diff --git a/main/spice-protocol/APKBUILD b/main/spice-protocol/APKBUILD new file mode 100644 index 0000000000..fa6f70233e --- /dev/null +++ b/main/spice-protocol/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=spice-protocol +pkgver=0.10.0 +pkgrel=0 +pkgdesc="Spice protocol header files" +url="http://www.spice-space.org/" +arch="noarch" +license="BSD and LGPLv2+" +depends="" +depends_dev="" +makedepends="$depends_dev" +install="" +subpackages="" +source="http://www.spice-space.org/download/releases/spice-protocol-$pkgver.tar.bz2" + +_builddir="$srcdir"/spice-protocol-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="888d8a50d36a09a1c479cadddce244ae spice-protocol-0.10.0.tar.bz2" diff --git a/main/spice/APKBUILD b/main/spice/APKBUILD new file mode 100644 index 0000000000..82c5787aac --- /dev/null +++ b/main/spice/APKBUILD @@ -0,0 +1,63 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=spice +pkgver=0.10.0 +pkgrel=1 +pkgdesc="Implements the SPICE protocol" +url="http://www.spice-space.org/" +arch="all" +license="LGPLv2+" +depends="" +depends_dev="spice-protocol pixman-dev celt051-dev openssl-dev" +makedepends="$depends_dev alsa-lib-dev jpeg-dev libxrandr-dev cyrus-sasl-dev + libxfixes-dev python-dev bash cegui06-dev" +install="" +subpackages="$pkgname-dev $pkgname-server $pkgname-client" +source="http://www.spice-space.org/download/releases/spice-$pkgver.tar.bz2 + cstdarg.patch" + +_builddir="$srcdir"/spice-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --enable-gui \ + || return 1 + make -C common WARN_CFLAGS='' || return 1 + make -C client WARN_CFLAGS='' || return 1 + make WARN_CFLAGS='' || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +server() { + pkgdesc="Server library for SPICE" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/*server.so.* "$subpkgdir"/usr/lib/ +} + +client() { + pkgdesc="SPICE client" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/spicec "$subpkgdir"/usr/bin/ +} + +md5sums="d9f0b0280c9e2291623c9560e156be26 spice-0.10.0.tar.bz2 +3e61fdc18bf201a2b54b332fdbe2912e cstdarg.patch" diff --git a/main/spice/cstdarg.patch b/main/spice/cstdarg.patch new file mode 100644 index 0000000000..7a16dc579c --- /dev/null +++ b/main/spice/cstdarg.patch @@ -0,0 +1,10 @@ +--- ./client/common.h.orig ++++ ./client/common.h +@@ -39,6 +39,7 @@ + #include <exception> + #include <list> + #include <string.h> ++#include <cstdarg> + + #ifdef WIN32 + #ifdef __GNUC__ diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD index fa72022b90..7ec326f9f1 100644 --- a/main/squid/APKBUILD +++ b/main/squid/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=squid -pkgver=3.2.0.12 -pkgrel=2 +pkgver=3.2.0.13 +pkgrel=0 pkgdesc="A full-featured Web proxy cache server." url="http://www.squid-cache.org" install="squid.pre-install squid.pre-upgrade squid.post-install" @@ -20,6 +20,7 @@ langdir="/usr/share/squid/errors" source="http://www.squid-cache.org/Versions/v3/3.2/squid-$pkgver.tar.bz2 squid-3.2.0.12-loggable-urlgroup.patch + cf_gen-pthread.patch squid.initd squid.confd $pkgname.logrotate @@ -47,6 +48,7 @@ build() { --sysconfdir=/etc/squid \ --libexecdir=/usr/lib/squid \ --localstatedir=/var \ + --with-logdir=/var/log/squid \ --disable-strict-error-checking \ --enable-removal-policies="lru,heap" \ --enable-digest-auth-helpers="password" \ @@ -73,6 +75,7 @@ build() { --enable-poll --with-maxfd=4096 \ --enable-follow-x-forwarded-for \ --with-large-files \ + --with-default-user=squid \ || return 1 make || return 1 @@ -100,8 +103,9 @@ squid_kerb_auth() { mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/ } -md5sums="f11b71b7c58a2a20e87707d4ba441743 squid-3.2.0.12.tar.bz2 +md5sums="cef6d63729b34404a3e463f0bd81b1e3 squid-3.2.0.13.tar.bz2 084f7b1af1ac0cb8fea35c7a0905a80e squid-3.2.0.12-loggable-urlgroup.patch -db05ed77b174271f26c41e7493a0d104 squid.initd +c60237de253c02937f272d3b189d7679 cf_gen-pthread.patch +905e57c6d41414f54a75a5c0f9f7fac7 squid.initd 2897c725c201be53d3c9a7db0101bdf0 squid.confd 58823e0b86bc2dc71d270208b7b284b4 squid.logrotate" diff --git a/main/squid/cf_gen-pthread.patch b/main/squid/cf_gen-pthread.patch new file mode 100644 index 0000000000..67387a1a91 --- /dev/null +++ b/main/squid/cf_gen-pthread.patch @@ -0,0 +1,20 @@ +--- ./src/Makefile.in.orig ++++ ./src/Makefile.in +@@ -1963,7 +1963,7 @@ + noinst_LTLIBRARIES = libsquid.la + cf_gen_SOURCES = cf_gen.cc + nodist_cf_gen_HEADER = cf_gen_defines.cci +-cf_gen_LDADD = ++cf_gen_LDADD = -lpthread + ACL_REGISTRATION_SOURCES = AclRegs.cc AuthReg.cc + DISKIO_SOURCE = \ + DiskIO/DiskIOModule.cc \ +@@ -5796,7 +5796,7 @@ + + # cf_gen builds the configuration files. + cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) +- $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src ++ $(HOSTCXX) $(cf_gen_LDADD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src + + # squid.conf.default is built by cf_gen when making cf_parser.cci + squid.conf.default squid.conf.documented: cf_parser.cci diff --git a/main/squid/squid.initd b/main/squid/squid.initd index e243ddd50c..488a45b527 100644 --- a/main/squid/squid.initd +++ b/main/squid/squid.initd @@ -1,115 +1,130 @@ #!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.10 2008/11/30 19:20:44 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.14 2011/10/23 18:45:39 polynomial-c Exp $ -opts="${opts} reload rotate" - -conf=/etc/squid/squid.conf +extra_started_commands="reload rotate" depend() { + use dns need net after firewall } +upprocval() { + [ -f $1 ] || return 0 + if [ `cat $1` -lt $2 ]; then + echo $2 > $1 + fi +} + # Try to increase the # of filedescriptors we can open. maxfds() { [ -n "$SQUID_MAXFD" ] || return - [ -f /proc/sys/fs/file-max ] || return 0 [ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192 - local global_file_max=`cat /proc/sys/fs/file-max` local minimal_file_max=$(($SQUID_MAXFD + 4096)) - if [ "$global_file_max" -lt $minimal_file_max ]; then - echo $minimal_file_max > /proc/sys/fs/file-max + upprocval /proc/sys/fs/file-max $minimal_file_max + if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then + upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max fi ulimit -n $SQUID_MAXFD } checkconfig() { + if [ ! -f /etc/squid/${SVCNAME}.conf ]; then + eerror "You need to create /etc/squid/${SVCNAME}.conf first." + eerror "An example can be found in /etc/squid/squid.conf.default" + return 1 + fi + + local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf) + [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid + if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then + eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to" + eerror " /var/run/${SVCNAME}.pid" + eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than" + eerror " in any other instance of squid." + return 1 + fi + maxfds - - local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < $conf) + + local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf) [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" local x for x in $CACHE_SWAP ; do if [ ! -e $x ] ; then - ebegin "Initializing cache directories" + ebegin "Initializing cache directory ${x%/*}" local ORIG_UMASK=$(umask) umask 027 - local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N 2>&1)" + + if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then + eend 1 + return 1 + fi + + local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)" if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then umask $ORIG_UMASK eend 1 echo "$INIT_CACHE_RESPONSE" return 1 fi + umask $ORIG_UMASK eend 0 break fi done - squid -k parse -} - -get_pidfile() { - PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ {print $2}' $conf) - [ -z "$PIDFILE" ] && PIDFILE=/var/run/squid/squid.pid + return 0 } start() { - get_pidfile checkconfig || return 1 - ebegin "Starting squid" - start-stop-daemon --start --pidfile "$PIDFILE" \ - --env KRB5_KTNAME="${SQUID_KEYTAB}" \ - --exec /usr/sbin/squid -- ${SQUID_OPTS} + ebegin "Starting ${SVCNAME}" + KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf eend $? && sleep 1 } stop() { - local rc=0 pid - ebegin "Stopping squid" - get_pidfile - /usr/sbin/squid -k shutdown - - # Now we have to wait until squid has _really_ stopped. - if [ -f "$PIDFILE" ] ; then - pid=$(cat "$PIDFILE") - if [ -d /proc/$pid ]; then + ebegin "Stopping ${SVCNAME}" + if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then + # Now we have to wait until squid has _really_ stopped. + sleep 1 + if [ -f /var/run/${SVCNAME}.pid ] ; then einfon "Waiting for squid to shutdown ." - else - rm -f "$PIDFILE" + cnt=0 + while [ -f /var/run/${SVCNAME}.pid ] ; do + cnt=$(expr $cnt + 1) + if [ $cnt -gt 60 ] ; then + # Waited 120 seconds now. Fail. + echo + eend 1 "Failed." + break + fi + sleep 2 + echo -n "." + done + echo fi - cnt=0 - while [ -f "$PIDFILE" ] ; do - cnt=$(expr $cnt + 1) - if [ $cnt -gt 60 ] ; then - # Waited 120 seconds now. Fail. - echo - rc=1 - break - fi - sleep 2 - echo -n "." - done - echo + else + eerror "Squid shutdown failed, probably service is already down." fi - eend $rc + eend 0 } reload() { checkconfig || return 1 - ebegin "Reloading squid" - /usr/sbin/squid -k reconfigure + ebegin "Reloading ${SVCNAME}" + /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf eend $? } rotate() { - service_started squid || return 1 - ebegin "Rotating logs" - /usr/sbin/squid -k rotate + service_started ${SVCNAME} || return 1 + ebegin "Rotating ${SVCNAME} logs" + /usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf eend $? } - diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index 7e31aa125e..ae9942962e 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion pkgver=1.7.1 -pkgrel=0 +pkgrel=1 pkgdesc="Replacement for CVS, another versioning system (svn)" url="http://subversion.tigris.org/" arch="all" @@ -38,7 +38,7 @@ build() { --with-swig \ --disable-javahl \ --disable-static \ - --without-jdk + --without-jdk make external-all || return 1 make local-all || return 1 @@ -79,4 +79,4 @@ pl() { md5sums="8a4fa74385df85a9702141b6b68b8307 subversion-1.7.1.tar.bz2 e1127cb722daecb3c89adbaf9eed7adf subversion-1.7.0-deplibs.patch d084a7558053784886bc858b94fa9186 svnserve.confd -22c274fafb4817e31126f60f9d84039f svnserve.initd" +c0327ac3f55c335db799a2269078f986 svnserve.initd" diff --git a/main/subversion/svnserve.initd b/main/subversion/svnserve.initd index f539a4e2c7..d76f6f3740 100644 --- a/main/subversion/svnserve.initd +++ b/main/subversion/svnserve.initd @@ -17,7 +17,7 @@ start() { cd / start-stop-daemon --start --quiet --background --make-pidfile \ --pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \ - --chuid ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \ + --user ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \ --foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn} eend $? } @@ -35,7 +35,7 @@ setup() { eend 1 "$root/repos already exist" return 1 fi - + svnadmin create "$root"/repos chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "$root/repos" mkdir -p "$root/conf" diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD index e8a6113167..76a29811e8 100644 --- a/main/sysstat/APKBUILD +++ b/main/sysstat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sysstat -pkgver=10.0.1 +pkgver=10.0.3 pkgrel=0 pkgdesc="Performance monitoring tools for Linux" url="http://pagesperso-orange.fr/sebastien.godard/" @@ -28,4 +28,4 @@ package() { } -md5sums="a8b12230452dc0e0b6cae5fd5ec3c579 sysstat-10.0.1.tar.gz" +md5sums="0e1ed5200f31f69a3b90ff1e81c07745 sysstat-10.0.3.tar.gz" diff --git a/main/trac/APKBUILD b/main/trac/APKBUILD index c6cf392e40..b5ce2c6cea 100644 --- a/main/trac/APKBUILD +++ b/main/trac/APKBUILD @@ -3,7 +3,7 @@ pkgname=trac _realname=Trac pkgver=0.12.2 -pkgrel=1 +pkgrel=2 pkgusers="tracd" pkggroups="tracd" pkgdesc="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system." @@ -33,4 +33,4 @@ package() { md5sums="f70c7676601f2592bcb7871319e62dd7 Trac-0.12.2.tar.gz 95b1311ca65e1ffcd51a191542f45ba4 tracd.confd -e53761b1e84c5d68c8e6c4b837e57008 tracd.initd" +fd3f1cd33a2819c43de82b92a839660d tracd.initd" diff --git a/main/trac/tracd.initd b/main/trac/tracd.initd index 83f84052d3..fc365e161d 100755 --- a/main/trac/tracd.initd +++ b/main/trac/tracd.initd @@ -12,7 +12,7 @@ start() { # tracd fails to create pidfile if started as non-root user, thus we are asking # s-s-d to do that. To have correct pid we avoid -d option of tracd and use # --background option of s-s-d. - start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \ + start-stop-daemon --start --user ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \ --pidfile /var/run/tracd.pid --make-pidfile --background \ --env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \ --exec /usr/bin/python -- /usr/bin/tracd \ diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD index e71729f6a5..47e1c0184f 100644 --- a/main/transmission/APKBUILD +++ b/main/transmission/APKBUILD @@ -1,7 +1,7 @@ # Maintainer:Carlo Landmeter pkgname=transmission pkgver=2.41 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight GTK BitTorrent client" url="http://www.tansmissionbt.com" install="$pkgname.pre-install" @@ -67,5 +67,5 @@ cli() { } md5sums="799b7bb24e236dbbdc86275f89ea9e67 transmission-2.41.tar.bz2 -f65b8ae46f8ac89b35844109b3aa0c18 transmission-daemon.initd +1ca57137d38c3429295a4699f535a240 transmission-daemon.initd 89478a70fcd93463e1dd8d751da994da transmission-daemon.confd" diff --git a/main/transmission/transmission-daemon.initd b/main/transmission/transmission-daemon.initd index ecf3bdafef..4f0acd24f0 100644 --- a/main/transmission/transmission-daemon.initd +++ b/main/transmission/transmission-daemon.initd @@ -8,7 +8,7 @@ depend() { start() { ebegin "Starting transmission-daemon" start-stop-daemon --start --quiet --background --make-pidfile \ - --chuid transmission:transmission \ + --user transmission:transmission \ --pidfile /var/run/transmission-daemon.pid \ --exec /usr/bin/transmission-daemon -- ${TD_OPTS} eend $? diff --git a/main/tumbler/APKBUILD b/main/tumbler/APKBUILD index e9f82bc8b9..2a5c14026f 100644 --- a/main/tumbler/APKBUILD +++ b/main/tumbler/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tumbler pkgver=0.1.22 -pkgrel=1 +pkgrel=2 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/apps/tumbler/" arch="all" diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD index a539f83a26..26af1d8c0a 100644 --- a/main/unbound/APKBUILD +++ b/main/unbound/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=unbound pkgver=1.4.13 -pkgrel=2 +pkgrel=3 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver" pkgusers="unbound" pkggroups="unbound" @@ -15,7 +15,9 @@ makedepends="$depends_dev python-dev swig" install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs py-unbound:py" source="http://unbound.net/downloads/unbound-$pkgver.tar.gz - unbound-1.4.12-gentoo.patch + conf.patch + update-unbound-root-hints + root.hints unbound.initd" _builddir="$srcdir"/unbound-$pkgver @@ -61,7 +63,11 @@ package() { || return 1 install -m755 -D "$srcdir"/unbound.initd \ "$pkgdir"/etc/init.d/unbound || return 1 - install -d -o unbound -g unbound "$pkgdir"/var/run/unbound + install -d -o unbound -g unbound "$pkgdir"/var/run/unbound || return 1 + install -m644 "$srcdir"/root.hints "$pkgdir"/etc/unbound/ || return 1 + install -Dm755 "$srcdir"/update-unbound-root-hints \ + "$pkgdir"/etc/periodic/monthly/update-unbound-root-hints \ + || return 1 } libs() { @@ -77,5 +83,7 @@ py() { } md5sums="7e3b27dee2b97640dd2e1783253317ab unbound-1.4.13.tar.gz -a6d84d596e40da79fcd52529b7fb5046 unbound-1.4.12-gentoo.patch +32fe2914a2723142d3eae9ea556872d3 conf.patch +c1c71cd0e7f9630536a2abf2513c675d update-unbound-root-hints +d7a1cb305b7b5b72df4e574777f76723 root.hints ebf2b5f8e1be2c4dbec9c5fad1e0e0de unbound.initd" diff --git a/main/unbound/unbound-1.4.12-gentoo.patch b/main/unbound/conf.patch index 5792068978..69e5be7e02 100644 --- a/main/unbound/unbound-1.4.12-gentoo.patch +++ b/main/unbound/conf.patch @@ -1,7 +1,14 @@ -diff -Naur unbound-1.4.12.orig/doc/example.conf.in unbound-1.4.12/doc/example.conf.in ---- unbound-1.4.12.orig/doc/example.conf.in 2011-07-14 17:33:37.000000000 +0900 -+++ unbound-1.4.12/doc/example.conf.in 2011-07-16 10:01:06.644402341 +0900 -@@ -334,7 +334,7 @@ +--- ./doc/example.conf.in.orig ++++ ./doc/example.conf.in +@@ -226,6 +226,7 @@ + # file to read root hints from. + # get one from ftp://FTP.INTERNIC.NET/domain/named.cache + # root-hints: "" ++ root-hints: /etc/unbound/root.hints + + # enable to not answer id.server and hostname.bind queries. + # hide-identity: no +@@ -338,7 +339,7 @@ # with several entries, one file per entry. # Zone file format, with DS and DNSKEY entries. # Note this gets out of date, use auto-trust-anchor-file please. diff --git a/main/unbound/root.hints b/main/unbound/root.hints new file mode 100644 index 0000000000..8fbbb656b2 --- /dev/null +++ b/main/unbound/root.hints @@ -0,0 +1,88 @@ +; This file holds the information on root name servers needed to +; initialize cache of Internet domain name servers +; (e.g. reference this file in the "cache . <file>" +; configuration file of BIND domain name servers). +; +; This file is made available by InterNIC +; under anonymous FTP as +; file /domain/named.cache +; on server FTP.INTERNIC.NET +; -OR- RS.INTERNIC.NET +; +; last update: Jun 8, 2011 +; related version of root zone: 2011060800 +; +; formerly NS.INTERNIC.NET +; +. 3600000 IN NS A.ROOT-SERVERS.NET. +A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 +A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30 +; +; FORMERLY NS1.ISI.EDU +; +. 3600000 NS B.ROOT-SERVERS.NET. +B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 +; +; FORMERLY C.PSI.NET +; +. 3600000 NS C.ROOT-SERVERS.NET. +C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 +; +; FORMERLY TERP.UMD.EDU +; +. 3600000 NS D.ROOT-SERVERS.NET. +D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90 +D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2D::D +; +; FORMERLY NS.NASA.GOV +; +. 3600000 NS E.ROOT-SERVERS.NET. +E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 +; +; FORMERLY NS.ISC.ORG +; +. 3600000 NS F.ROOT-SERVERS.NET. +F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F +; +; FORMERLY NS.NIC.DDN.MIL +; +. 3600000 NS G.ROOT-SERVERS.NET. +G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 +; +; FORMERLY AOS.ARL.ARMY.MIL +; +. 3600000 NS H.ROOT-SERVERS.NET. +H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53 +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235 +; +; FORMERLY NIC.NORDU.NET +; +. 3600000 NS I.ROOT-SERVERS.NET. +I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53 +; +; OPERATED BY VERISIGN, INC. +; +. 3600000 NS J.ROOT-SERVERS.NET. +J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 +J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30 +; +; OPERATED BY RIPE NCC +; +. 3600000 NS K.ROOT-SERVERS.NET. +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1 +; +; OPERATED BY ICANN +; +. 3600000 NS L.ROOT-SERVERS.NET. +L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42 +; +; OPERATED BY WIDE +; +. 3600000 NS M.ROOT-SERVERS.NET. +M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35 +; End of File diff --git a/main/unbound/update-unbound-root-hints b/main/unbound/update-unbound-root-hints new file mode 100644 index 0000000000..ee127ded37 --- /dev/null +++ b/main/unbound/update-unbound-root-hints @@ -0,0 +1,30 @@ +#!/bin/sh + +check_format() { + # check that we have some ipv4 addresses and some '.' hints + egrep -q '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]' "$1" \ + && egrep -q '^\.[[:space:]]+' "$1" +} + +ftphosts="FTP.INTERNIC.NET RS.INTERNIC.NET" +roothints=domain/named.cache +unbound_dir=/etc/unbound +outfile=$unbound_dir/root.hints + +if [ "$1" = "--verify" ]; then + if check_format $outfile; then + echo "$outfile: ok" + exit 0 + else + echo "$outfile: failed" + exit 1 + fi +fi + +for host in $ftphosts; do + url=ftp://$host/$roothints + if wget -q -O ${outfile}.new $url && check_format ${outfile}.new; then + mv ${outfile}.new $outfile && exit 0 + fi +done +exit 1 diff --git a/main/unrar/APKBUILD b/main/unrar/APKBUILD index d3bf22049e..9a2b388510 100644 --- a/main/unrar/APKBUILD +++ b/main/unrar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=unrar -pkgver=4.1.2 +pkgver=4.1.3 pkgrel=0 pkgdesc="The RAR uncompression program" url="http://www.rarlab.com" @@ -24,4 +24,4 @@ package() { } -md5sums="bd6761e8be6281b945db8e15564e412c unrarsrc-4.1.2.tar.gz" +md5sums="0cc7562737e7440f4fe611bdd5b56628 unrarsrc-4.1.3.tar.gz" diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD index e4cfe43674..e1dbeec168 100644 --- a/main/util-vserver/APKBUILD +++ b/main/util-vserver/APKBUILD @@ -2,7 +2,7 @@ pkgname=util-vserver pkgver=0.30.216_pre2994 _realver=${pkgver%_*}-${pkgver#*_} -pkgrel=0 +pkgrel=1 pkgdesc="Linux-VServer admin utilities" url="http://www.nongnu.org/util-vserver/" arch="all" @@ -18,6 +18,7 @@ source="http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-$_real validate.patch alpine.patch bb-grep.patch + init-script.patch setup-vs-template setup-vs-guest " @@ -75,5 +76,6 @@ ff8f561f672524eb46fe633f584ef60e ensc_pathprog.patch da8b70c4fd40e68894b3903ffd121397 validate.patch 04000261fd990a3963b0e98260b481bd alpine.patch 3fc52e20d998f02995f21912738f5d36 bb-grep.patch +6e574535409b3ab0361023f1a7f082eb init-script.patch fae6626b724dec90a19924d68d355cd2 setup-vs-template ef35e154d1a221631a53f9c2cfbe9834 setup-vs-guest" diff --git a/main/util-vserver/init-script.patch b/main/util-vserver/init-script.patch new file mode 100644 index 0000000000..2bfd40a9a4 --- /dev/null +++ b/main/util-vserver/init-script.patch @@ -0,0 +1,11 @@ +--- util-vserver-0.30.216-pre2994.orig/gentoo/util-vserver ++++ util-vserver-0.30.216-pre2994/gentoo/util-vserver +@@ -58,7 +58,7 @@ + $__PKGLIBDIR/bash-wrapper 'hasCgroup' + if [ $? -eq 0 ]; then + ebegin "Mounting cgroup-hierarchy" +- $__PKGLIBDIR/bash-wrapper '_generateCgroupOptions; test -n "$CGROUP_MNT" || exit 0; $_MKDIR -p "$CGROUP_MNT"; $_MOUNT -t cgroup -o "$CGROUP_SUBSYS" vserver "$CGROUP_MNT"' ++ $__PKGLIBDIR/bash-wrapper '_generateCgroupOptions; test -n "$CGROUP_MNT" || exit 0; $_MKDIR -p "$CGROUP_MNT"; IFS=","; $_MOUNT -t cgroup -o "${CGROUP_SUBSYS[*]}" vserver "$CGROUP_MNT"' + eend $? + fi + } diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index 733c160c56..011ec8899b 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vim -pkgver=7.3.333 +pkgver=7.3.364 _srcver=${pkgver%.*} _patchver=${pkgver##*.} pkgrel=0 @@ -396,4 +396,35 @@ ed256a9ad43fc919ec816c8f79f28f5c 7.3.328 b4c9c95eee16d19d2b9713bc1b60f696 7.3.330 bb075b263860ed1b80b5bcbe5a57d423 7.3.331 d7832ef5a54508dacc105e287874a00b 7.3.332 -accb06d73f1463893da2afb501f466fa 7.3.333" +accb06d73f1463893da2afb501f466fa 7.3.333 +bdf932190d677b98362dae52cf6eadb1 7.3.334 +26766ba9ea0ab84233e2b29332f796fa 7.3.335 +1b57987b24935017dfdf6b2bb5b68373 7.3.336 +24691aeaec5277d0afb4106b40ae267e 7.3.337 +54ff1e2fea2a16965959a9f42b8b5fc9 7.3.338 +620d15666807ab219620954ea6fdca1f 7.3.339 +c3ab5f6227530ab9ca6af494cbf77fea 7.3.340 +8326d6b339724dfe5fc99fadc7c57bf0 7.3.341 +362087e621fe59f13f2ef1ef1cb74e50 7.3.342 +869bd67eb3f1e62fd9f5097fea9472d4 7.3.343 +e3d9a945f29f7ceba3e0330e2e510344 7.3.344 +22ed2d9938820b2c99129d8724849304 7.3.345 +ba18fbdc38d774c05ac02bb413f0bb3d 7.3.346 +07e51c946abcdf904cf6856548fa7145 7.3.347 +3b75c5e11e5ef2a62fd0b02e35b71ad8 7.3.348 +fd58c8ce31e087d9a81301addf816767 7.3.349 +8c8025ab73b595e112f8d32d9ac5ef3d 7.3.350 +4d1587f7394e609c5cfb3d3e506b4abe 7.3.351 +fb4251e16f07b76c2bc51b62aaa58735 7.3.352 +f7c88e37014346eeeaeb952b15100b2e 7.3.353 +5208450dac9cd0de8778a236fa72eb08 7.3.354 +d3f5578199874f3234395c33a1eb5461 7.3.355 +6050fae12e337fea78d14e54b4ba3370 7.3.356 +67c7d610d9d58f4c2105eb05dc1522cb 7.3.357 +455fbdbc0a1fefbf94614c829b544511 7.3.358 +1de4c717ec20d7ecded0f84c57cae132 7.3.359 +350dec5064be57bf8928d667a4d40fad 7.3.360 +6f13d2d8f231de47e7ba61072ccea891 7.3.361 +a471ecbbf370fc02b66fc1584c471691 7.3.362 +33fd36b5070c8b35f6cd9e7f22ea23a7 7.3.363 +14f3ec8d4b379eaf47ed1db484d978f7 7.3.364" diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index 4590bf0cdc..823900a9cf 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine -pkgver=1.3.32 +pkgver=1.3.34 pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -46,4 +46,4 @@ package() { "$pkgdir"/usr/bin/wine } -md5sums="2f8655434711b0ef11247f1bf7c28d13 wine-1.3.32.tar.bz2" +md5sums="ae7be1767e95e27360fc86f573649c19 wine-1.3.34.tar.bz2" diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD index a839df8e10..484b1a903b 100644 --- a/main/xf86-video-intel/APKBUILD +++ b/main/xf86-video-intel/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-intel -pkgver=2.16.0 -pkgrel=2 +pkgver=2.17.0 +pkgrel=0 pkgdesc="X.Org driver for Intel cards" url="http://xorg.freedesktop.org/" arch="all" @@ -29,4 +29,4 @@ package() { find "$pkgdir" -name '*.la' -delete install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="e0406c50a747c358654b93cb23bf7375 xf86-video-intel-2.16.0.tar.bz2" +md5sums="6d7b1f199dba5820f250888b136186ff xf86-video-intel-2.17.0.tar.bz2" diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index eec3eeff5f..2f5dbc558f 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -4,7 +4,7 @@ _realname=xtables-addons _name=$_realname-$_flavor _kver=3.0.12 -_kpkgrel=0 +_kpkgrel=1 # source the kernel version if [ -f ../linux-$_flavor/APKBUILD ]; then diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD index 53cb4fff7f..75f886552e 100644 --- a/main/zabbix/APKBUILD +++ b/main/zabbix/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Jeff Bilyk <jbilyk at gmail> +# Contributor: Jeff Bilyk <jbilyk at gmail> # Maintainer: Natanael Copa <natanael.copa@gmail.com> pkgname=zabbix -pkgver=1.8.8 +pkgver=1.8.9 pkgrel=0 pkgdesc="Enterprise-class open source distributed monitoring" url="www.zabbix.com" @@ -151,13 +151,13 @@ agent() { } -md5sums="8e38079640cf50c215f36dfd3125a6d3 zabbix-1.8.8.tar.gz +md5sums="fc8c7fad2943dea73d4f2338cd216715 zabbix-1.8.9.tar.gz 26b0401a83bdb1dce29338e5b2786620 zabbix_server.conf 9832a81e134c8e2c11e2a06b7adbf88f zabbix_trapper.conf 0310b92afb3f35c1075fff53db737212 zabbix_proxy.conf 721c18077fa739f956340afca9f067f4 zabbix_agentd.conf a55a4d0b2e13c97c280006ba4bee0afa zabbix-dn_skipname.patch 8d1d2e53479173aac0df0c38a4d6afda zabbix-getloadavg.patch -e42394e798ab98a8ff4babe68e04633a zabbix-server.initd -88374bba8a8fdfabfcfe9be6dd12095f zabbix-agentd.initd -32abde1cc00c2eeccddb7e038117d0ab zabbix-proxy.initd" +d823c2ab6c2bbdd0ebd3511fac4a83b4 zabbix-server.initd +1a5c718bcf815fcf659e14fb0b576a1a zabbix-agentd.initd +a99978139481e69434f78fc3e8c53441 zabbix-proxy.initd" diff --git a/main/zabbix/zabbix-agentd.initd b/main/zabbix/zabbix-agentd.initd index b14b5fe74b..745b35e06b 100644 --- a/main/zabbix/zabbix-agentd.initd +++ b/main/zabbix/zabbix-agentd.initd @@ -11,12 +11,12 @@ depend() { start() { ebegin "Starting Zabbix agent" - start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd + start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_agentd eend $? } stop() { ebegin "Stopping Zabbix agent" - start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid + start-stop-daemon --stop --user zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid eend $? } diff --git a/main/zabbix/zabbix-proxy.initd b/main/zabbix/zabbix-proxy.initd index 8ac246eccd..a8b418a204 100644 --- a/main/zabbix/zabbix-proxy.initd +++ b/main/zabbix/zabbix-proxy.initd @@ -10,12 +10,12 @@ depend() { start() { ebegin "Starting Zabbix proxy" - start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_proxy + start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_proxy eend $? } stop() { ebegin "Stopping Zabbix proxy" - start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid + start-stop-daemon --stop --user zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid eend $? } diff --git a/main/zabbix/zabbix-server.initd b/main/zabbix/zabbix-server.initd index a661cd233d..5ccd019430 100644 --- a/main/zabbix/zabbix-server.initd +++ b/main/zabbix/zabbix-server.initd @@ -10,12 +10,12 @@ depend() { start() { ebegin "Starting Zabbix server" - start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server + start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_server eend $? } stop() { ebegin "Stopping Zabbix server" - start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid + start-stop-daemon --stop --user zabbix --pidfile /var/run/zabbix/zabbix_server.pid eend $? } diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD index 6715f0af97..910ede50f9 100644 --- a/main/zeromq/APKBUILD +++ b/main/zeromq/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zeromq -pkgver=2.1.7 -pkgrel=2 +pkgver=2.1.10 +pkgrel=0 pkgdesc="The ZeroMQ messaging library and tools" url="http://www.zeromq.org/" arch="all" @@ -41,4 +41,4 @@ libzmq() { mv "$pkgdir"/usr/lib/libzmq.so.* "$subpkgdir"/usr/lib/ } -md5sums="7d3120f8a8fb913a7e55c57c6eb024f3 zeromq-2.1.7.tar.gz" +md5sums="f034096095fa76041166a8861e9d71b7 zeromq-2.1.10.tar.gz" |