diff options
Diffstat (limited to 'community')
30 files changed, 392 insertions, 86 deletions
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD index 27db062b5..fc03070bb 100644 --- a/community/awesome/PKGBUILD +++ b/community/awesome/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72334 2012-06-12 00:36:49Z seblu $ +# $Id: PKGBUILD 73742 2012-07-15 11:16:56Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Vesa Kaihlavirta pkgname=awesome -pkgver=3.4.12 +pkgver=3.4.13 pkgrel=1 pkgdesc='Highly configurable framework window manager' arch=('i686' 'x86_64') @@ -42,12 +42,12 @@ optdepends=( provides=('notification-daemon') source=("$url/download/$pkgname-$pkgver.tar.xz" "$pkgname.desktop") -md5sums=('2c3490b820a19c044290027e6f2eb6c8' +md5sums=('8449fde51c08ca69fe4c5bb831b3c618' '0fdbeec43d211c6750041d7e37611a6a') build() { cd $pkgname-$pkgver - make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE' + make CMAKE_ARGS=' -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE' } package() { diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD index 68e93182f..470e8a2f0 100644 --- a/community/bsd-games/PKGBUILD +++ b/community/bsd-games/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72260 2012-06-11 12:32:05Z cbrannon $ +# $Id: PKGBUILD 73816 2012-07-15 23:02:25Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> pkgname=bsd-games pkgver=2.17 -pkgrel=12 +pkgrel=13 pkgdesc="A linux port for a collection of BSD command line games." url="ftp://ftp.ibiblio.org/pub/Linux/games/" arch=('i686' 'x86_64') @@ -13,9 +13,10 @@ install=$pkgname.install license=('BSD') depends=(gcc-libs words sh) makedepends=('flex' 'bison' 'm4') -source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz \ - config.params stdio.h.diff gamescreen.h.diff getline.diff - number.c.diff bsd-games-2.17-64bit.patch) +source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz + config.params stdio.h.diff gamescreen.h.diff getline.diff + number.c.diff bsd-games-2.17-64bit.patch + bad-ntohl-cast.diff null-check.diff) build() { cd "${srcdir}/$pkgname-$pkgver" @@ -36,6 +37,10 @@ build() { # Incorporated some fixes from Debian patch -p1 -i "${srcdir}/number.c.diff" +# ntohl returns uint32_t, not unsigned long: + patch -p1 -i "${srcdir}/bad-ntohl-cast.diff" +# And add a NULL pointer check to the "hunt" program, fixing a segfault. + patch -p1 -i "${srcdir}/null-check.diff" sed -i "s/FISH/GO-FISH/g; s/\.Nm fish/\.Nm go-fish/g" fish/fish.6 sed -i "s/tenths/tenth/g" tests/number.-0.1 @@ -92,4 +97,6 @@ md5sums=('238a38a3a017ca9b216fc42bde405639' '9c0fa6e2345bd0a7945c9a41d5ba68aa' '5356bd6999ae53dd27cb2a0f837a3e70' '47249a90f38ccb4dd07625b245bbc728' - '257813b76a41c8b2c02701571c804227') + '257813b76a41c8b2c02701571c804227' + '3d21a9dad2e603ddf3842972e4ff85a1' + 'a43ca0b4b9ebc4eec26372c52014ac0a') diff --git a/community/bsd-games/bad-ntohl-cast.diff b/community/bsd-games/bad-ntohl-cast.diff new file mode 100644 index 000000000..f783813e9 --- /dev/null +++ b/community/bsd-games/bad-ntohl-cast.diff @@ -0,0 +1,22 @@ +diff --git a/hunt/hunt/playit.c b/hunt/hunt/playit.c +index 9acf86e..881a4e7 100644 +--- a/hunt/hunt/playit.c ++++ b/hunt/hunt/playit.c +@@ -114,7 +114,7 @@ playit() + bad_con(); + /* NOTREACHED */ + } +- if (ntohl(version) != (unsigned long)HUNT_VERSION) { ++ if (ntohl(version) != (uint32_t)HUNT_VERSION) { + bad_ver(); + /* NOTREACHED */ + } +@@ -649,7 +649,7 @@ do_message() + bad_con(); + /* NOTREACHED */ + } +- if (ntohl(version) != (unsigned long)HUNT_VERSION) { ++ if (ntohl(version) != (uint32_t)HUNT_VERSION) { + bad_ver(); + /* NOTREACHED */ + } diff --git a/community/bsd-games/null-check.diff b/community/bsd-games/null-check.diff new file mode 100644 index 000000000..048ed93f4 --- /dev/null +++ b/community/bsd-games/null-check.diff @@ -0,0 +1,24 @@ +diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c +index 11f4c44..28321bc 100644 +--- a/hunt/hunt/hunt.c ++++ b/hunt/hunt/hunt.c +@@ -394,7 +394,8 @@ broadcast_vec(s, vector) + + vec_cnt = 0; + for (ip = ifp; ip; ip = ip->ifa_next) +- if ((ip->ifa_addr->sa_family == AF_INET) && ++ if (ip->ifa_addr && ++ (ip->ifa_addr->sa_family == AF_INET) && + (ip->ifa_flags & IFF_BROADCAST)) + vec_cnt++; + +@@ -405,7 +406,8 @@ broadcast_vec(s, vector) + + vec_cnt = 0; + for (ip = ifp; ip; ip = ip->ifa_next) +- if ((ip->ifa_addr->sa_family == AF_INET) && ++ if (ip->ifa_addr && ++ (ip->ifa_addr->sa_family == AF_INET) && + (ip->ifa_flags & IFF_BROADCAST)) + memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr, + sizeof(struct sockaddr_in)); diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 51ed71635..c466f8b8f 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 71906 2012-06-03 07:35:53Z giovanni $ +# $Id: PKGBUILD 73736 2012-07-15 04:46:33Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.9 +pkgver=2.0.10 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('62d596cda98a7d82b3ea21cb1ce7b546') +md5sums=('6a2ba8c42356fa82e60d75410ebe6c54') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD index 970a0d180..20b88b329 100644 --- a/community/drbd/PKGBUILD +++ b/community/drbd/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 69076 2012-04-08 23:26:43Z seblu $ +# $Id: PKGBUILD 73826 2012-07-16 02:13:49Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=drbd pkgver=8.3.11 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') pkgdesc='Userland tools for drbd block devices' url='http://www.drbd.org' license=('GPL2') source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz" "$pkgname.rc" + "$pkgname.service" '01-remove-old-sanity-check.diff') backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') md5sums=('e47a35a80143b72e9708844efbe2e608' - '6a91609fcd69b435a2a96599f07ad856' + '8902a2f7aca6245c27e9566a1509312c' + 'afbb345094db49b0a474c0b4e51c0acd' '24144d23b31f9ce66929fe989247c779') build() { cd $pkgname-$pkgver # patch bad sanity check in makefile - patch -p1 -i ../01-remove-old-sanity-check.diff + patch -p1 -i "$srcdir/01-remove-old-sanity-check.diff" ./configure \ --prefix=/usr \ --localstatedir=/var \ @@ -41,21 +43,28 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - # move forced /sbin binaries and fix harcoded path - mv "$pkgdir/sbin"/* "$pkgdir/usr/sbin" - rmdir "$pkgdir/sbin" - sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' \ - "$pkgdir/etc/udev/rules.d/65-drbd.rules" + # move forced /sbin binaries + cd "$pkgdir" + mv sbin/* usr/sbin + rmdir sbin + # fix hardcoded path in udev rules + sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules # move udev files - mv "$pkgdir/etc/udev" "$pkgdir/usr/lib" + mv etc/udev usr/lib # move bash completion - install -d -m 755 "$pkgdir/usr/share/bash-completion" - mv "$pkgdir/etc/bash_completion.d" \ - "$pkgdir/usr/share/bash-completion/completions" + install -dm 755 usr/share/bash-completion + mv etc/bash_completion.d usr/share/bash-completion/completions # remove /var/lock - rmdir "$pkgdir/var/lock" + rmdir var/lock + # autoload module + install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf + echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf # setup initscript (replace) - install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + cd "$srcdir" + install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + # install systemd stuff + install -Dm 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/drbd/drbd.rc b/community/drbd/drbd.rc index 893ce3e20..b8b196e4b 100644 --- a/community/drbd/drbd.rc +++ b/community/drbd/drbd.rc @@ -29,9 +29,9 @@ case "$1" in check_config # load config $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; } - # User interruptible version of wait-connect all + # user interruptible version of wait-connect all $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; } - # Become primary if configured + # become primary if configured $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; } add_daemon drbd stat_done diff --git a/community/drbd/drbd.service b/community/drbd/drbd.service new file mode 100644 index 000000000..ddd6c62b7 --- /dev/null +++ b/community/drbd/drbd.service @@ -0,0 +1,19 @@ +[Unit] +Description=Distributed Replicated Block Device +After=systemd-modules-load.service network.target + +[Service] +Type=oneshot +RemainAfterExit=yes + +# load config +ExecStart=/usr/sbin/drbdadm adjust all +# user interruptible version of wait-connect all +ExecStart=/usr/sbin/drbdadm wait-con-int +# become primary if configured +ExecStart=/usr/sbin/drbdadm sh-b-pri all +# disconnect and detach all resources +ExecStop=/usr/sbin/drbdadm down all + +[Install] +WantedBy=multi-user.target diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 46ce5a7fe..0a06068c9 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73136 2012-07-02 10:22:36Z spupykin $ +# $Id: PKGBUILD 73804 2012-07-15 20:16:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.13 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -36,7 +36,8 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.conf.d libvirt.tmpfiles.d openbsd-netcat-default.patch - libvirt-libnl3.patch) + libvirt-libnl3.patch + xdg.patch) md5sums=('86cbe53ee662e3b9e8bb0c63c737ba27' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' @@ -44,7 +45,8 @@ md5sums=('86cbe53ee662e3b9e8bb0c63c737ba27' 'bc2971dacdbac967fc3474e50affc345' '8d98e62915785686b0b6c8c070628392' 'b0be50eb9dfe4d133decf23b60880f7d' - 'ba27fbcd989de8d84cfff98326f10c54') + 'ba27fbcd989de8d84cfff98326f10c54' + '9b9fcdbd64d37d84ae73d9da0a7efed7') build() { cd "$srcdir/$pkgname-$pkgver" @@ -59,6 +61,7 @@ build() { [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch patch -Np1 -i ${srcdir}/libvirt-libnl3.patch + patch -Np1 -i ${srcdir}/xdg.patch aclocal automake --add-missing || true autoreconf diff --git a/community/libvirt/xdg.patch b/community/libvirt/xdg.patch new file mode 100644 index 000000000..0a12c83b5 --- /dev/null +++ b/community/libvirt/xdg.patch @@ -0,0 +1,14 @@ +diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c +index 0b32ffe..08dfbb0 100644 +--- a/src/rpc/virnetsocket.c ++++ b/src/rpc/virnetsocket.c +@@ -97,6 +97,9 @@ static int virNetSocketForkDaemon(const char *binary) + NULL); + + virCommandAddEnvPassCommon(cmd); ++ virCommandAddEnvPass(cmd, "XDG_CACHE_HOME"); ++ virCommandAddEnvPass(cmd, "XDG_CONFIG_HOME"); ++ virCommandAddEnvPass(cmd, "XDG_RUNTIME_DIR"); + virCommandClearCaps(cmd); + virCommandDaemonize(cmd); + ret = virCommandRun(cmd, NULL); diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD index 1b0f3cb5b..f3d56e6fb 100644 --- a/community/lrzip/PKGBUILD +++ b/community/lrzip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73561 2012-07-09 21:11:49Z arodseth $ +# $Id: PKGBUILD 73744 2012-07-15 12:25:29Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: graysky <graysky AT archlinux DOT us> # Contributor: kastor@fobos.org.ar pkgname=lrzip -pkgver=0.613 +pkgver=0.614 pkgrel=1 pkgdesc="Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms" url="http://lrzip.kolivas.org/" @@ -18,7 +18,7 @@ then fi options=('!libtool') source=("http://ck.kolivas.org/apps/$pkgname/$pkgname-$pkgver.tar.bz2") -sha256sums=('70dc55fbc4fe3d029c8edfc20f47f02d78c9c4c473201e6ec616febe9ce6b7eb') +sha256sums=('65024d69d1773f3ccf84508a481d7de128c03d1cf9750b5803aead4a24522763') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 7bc761974..c512a6908 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73571 2012-07-10 08:51:06Z stativ $ +# $Id: PKGBUILD 73806 2012-07-15 20:17:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Kamil Kaminski <kyle@kkaminsk.com> pkgname=minidlna -pkgver=1.0.24 -pkgrel=6 +pkgver=1.0.25 +pkgrel=1 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/minidlna/" @@ -20,17 +20,14 @@ changelog=changelog source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.rc minidlna.conf - minidlna.service - ffmpeg_0.11.diff) -md5sums=('be9b4c91e3fcde592dc3f9828098ca0f' + minidlna.service) +md5sums=('d966256baf2f9b068b9de871ab5dade5' 'c9863d5703e0a8469cc200f2739567e7' 'af1b8c0fef9902f797b0324c255da5a1' - '1903ed9ceee43b8bb86146b9ad8eb50c' - '1346e1d3d7d71db70ac46dcad96391b1') + '1903ed9ceee43b8bb86146b9ad8eb50c') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 <$srcdir/ffmpeg_0.11.diff || true sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh make } diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index 839f4bf6d..1d8672a8e 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 63668 2012-02-05 12:04:57Z ibiru $ +# $Id: PKGBUILD 73778 2012-07-15 13:21:04Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> + pkgname=mtpaint pkgver=3.40 -pkgrel=2 +pkgrel=4 pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork" arch=('x86_64' 'i686') url="http://mtpaint.sourceforge.net/" @@ -19,8 +20,8 @@ sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890' build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/libpng15.patch" - ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff + patch -Np1 -i ../libpng15.patch + ./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff sed -i 's:-lpng:-lpng -lgif:' _conf.txt make } diff --git a/community/mtpaint/mtpaint.install b/community/mtpaint/mtpaint.install index 99a538dea..ad97d7bab 100644 --- a/community/mtpaint/mtpaint.install +++ b/community/mtpaint/mtpaint.install @@ -1,13 +1,13 @@ post_upgrade() { - update-desktop-database -q + update-desktop-database -q } post_install() { - post_upgrade + post_upgrade } post_remove() { - post_upgrade + post_upgrade } # vim:set ts=2 sw=2 et: diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 7594993ed..156a7a655 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73678 2012-07-13 18:50:20Z bpiotrowski $ +# $Id: PKGBUILD 73801 2012-07-15 18:02:53Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -9,7 +9,7 @@ pkgname=nodejs pkgver=0.8.2 -pkgrel=1 +pkgrel=3 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' @@ -35,7 +35,8 @@ build() { export PYTHON=python2 ./configure \ - --prefix=/usr + --prefix=/usr \ + --shared-openssl make } @@ -58,6 +59,9 @@ package() { cp -r doc/api/*.html \ ${pkgdir}/usr/share/doc/nodejs + # compress man pages + find $pkgdir/usr/lib/node_modules/npm/man -type f | xargs gzip -9 + install -D -m644 LICENSE \ ${pkgdir}/usr/share/licenses/nodejs/LICENSE } diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index 99255fa97..34eb54b98 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72633 2012-06-18 09:23:25Z spupykin $ +# $Id: PKGBUILD 73808 2012-07-15 20:18:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.6.0 +pkgver=2.6.5 pkgrel=1 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) @@ -17,7 +17,7 @@ install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz opendkim.conf opendkim.rc) -md5sums=('ad4eb5131642cadd778dc26ed7daacf0' +md5sums=('fde50b442af3fa2ecaee53f4eb9c9c15' '3e2bb1058ac0662f01e675aa6ac7ee8f' '093f5c098a45cc68753f97e45a5b374c') diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 4f2209b66..41ff541a6 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68148 2012-03-18 18:26:06Z cbrannon $ +# $Id: PKGBUILD 73814 2012-07-15 22:19:23Z cbrannon $ # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar # Contributor: Chris Brannon <cmbrannon79@gmail.com> pkgname=plan9port -pkgver=20120307 +pkgver=20120715 pkgrel=1 pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems" arch=('i686' 'x86_64') @@ -11,6 +11,7 @@ url="http://swtch.com/plan9port/" license=('custom') depends=(xorg-server libxt libxext sh fuse) optdepends=('python2: for the codereview script') +provides=('plan9') install=plan9.install source=(http://swtch.com/$pkgname/$pkgname-$pkgver.tgz plan9.sh) @@ -48,5 +49,5 @@ build() rm -f $i done } -md5sums=('c806d048788b6beb65efd9f5179f1192' +md5sums=('1e0698aa5f652a1a47227be2b25fa8fd' '9695eb15a247e23140e8a35ff52a5c20') diff --git a/community/quagga/0002-CVE-2012-1820.patch b/community/quagga/0002-CVE-2012-1820.patch new file mode 100644 index 000000000..aae2d7b18 --- /dev/null +++ b/community/quagga/0002-CVE-2012-1820.patch @@ -0,0 +1,74 @@ +@@ -, +, @@ + bgpd: CVE-2012-1820, DoS in bgp_capability_orf() + + An ORF (code 3) capability TLV is defined to contain exactly one + AFI/SAFI block. Function bgp_capability_orf(), which parses ORF + capability TLV, uses do-while cycle to call its helper function + bgp_capability_orf_entry(), which actually processes the AFI/SAFI data + block. The call is made at least once and repeated as long as the input + buffer has enough data for the next call. + + The helper function, bgp_capability_orf_entry(), uses "Number of ORFs" + field of the provided AFI/SAFI block to verify, if it fits the input + buffer. However, the check is made based on the total length of the ORF + TLV regardless of the data already consumed by the previous helper + function call(s). This way, the check condition is only valid for the + first AFI/SAFI block inside an ORF capability TLV. + + For the subsequent calls of the helper function, if any are made, the + check condition may erroneously tell, that the current "Number of ORFs" + field fits the buffer boundary, where in fact it does not. This makes it + possible to trigger an assertion by feeding an OPEN message with a + specially-crafted malformed ORF capability TLV. + + This commit fixes the vulnerability by making the implementation follow + the spec. +--- a/bgpd/bgp_open.c ++++ a/bgpd/bgp_open.c +@@ -231,7 +231,7 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr) + } + + /* validate number field */ +- if (sizeof (struct capability_orf_entry) + (entry.num * 2) > hdr->length) ++ if (sizeof (struct capability_orf_entry) + (entry.num * 2) != hdr->length) + { + zlog_info ("%s ORF Capability entry length error," + " Cap length %u, num %u", +@@ -335,28 +335,6 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr) + } + + static int +-bgp_capability_orf (struct peer *peer, struct capability_header *hdr) +-{ +- struct stream *s = BGP_INPUT (peer); +- size_t end = stream_get_getp (s) + hdr->length; +- +- assert (stream_get_getp(s) + sizeof(struct capability_orf_entry) <= end); +- +- /* We must have at least one ORF entry, as the caller has already done +- * minimum length validation for the capability code - for ORF there must +- * at least one ORF entry (header and unknown number of pairs of bytes). +- */ +- do +- { +- if (bgp_capability_orf_entry (peer, hdr) == -1) +- return -1; +- } +- while (stream_get_getp(s) + sizeof(struct capability_orf_entry) < end); +- +- return 0; +-} +- +-static int + bgp_capability_restart (struct peer *peer, struct capability_header *caphdr) + { + struct stream *s = BGP_INPUT (peer); +@@ -573,7 +551,7 @@ bgp_capability_parse (struct peer *peer, size_t length, int *mp_capability, + break; + case CAPABILITY_CODE_ORF: + case CAPABILITY_CODE_ORF_OLD: +- if (bgp_capability_orf (peer, &caphdr)) ++ if (bgp_capability_orf_entry (peer, &caphdr)) + return -1; + break; + case CAPABILITY_CODE_RESTART: diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 68590da61..d24c91df3 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72737 2012-06-21 19:55:00Z seblu $ +# $Id: PKGBUILD 73818 2012-07-15 23:51:42Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=quagga pkgver=0.99.21 -pkgrel=1 +pkgrel=2 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' @@ -15,16 +15,41 @@ install=quagga.install source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" 'quagga.rc' 'quagga.conf' - '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch') + 'babeld.service' + 'bgpd.service' + 'isisd.service' + 'ospf6d.service' + 'ospfd.service' + 'ripd.service' + 'ripngd.service' + 'zebra.service' + '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch' + '0002-CVE-2012-1820.patch') md5sums=('99840adbe57047c90dfba6b6ed9aec7f' '71d474228a1e02d698cd24e9fd55ca38' '0c4f2dd13c7dac1b73de923d1d5e4e17' - 'c80174f7bdd32cd84550d52451e8f495') + '45d8bf56a426b0e7ebe429547be8a27a' + 'ab31ed8dafd7a92137f4f00ad0937b4f' + '4c05d0105cd0db23a2583bd75a1bde4d' + 'd087dce5eeba78ac64541157c7e04dfd' + 'c5f8a729685cebf8fc5b1a1552d37b6d' + 'e721b334bb0b31983642b307033c63d0' + 'effeb26ff78ffcafe7808596ddc5d3fc' + 'a4bf0a090747bd7dc4094a1e6e96e6ad' + 'c80174f7bdd32cd84550d52451e8f495' + '44f39016d81f3b13b2744f7dcd93289d') build() { cd $pkgname-$pkgver - patch -p 1 -i "$srcdir/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch" - ./configure --prefix=/usr --sysconfdir=/etc/quagga --localstatedir=/run/quagga \ + shopt -s nullglob + for _p in "$srcdir"/*.patch; do + msg2 "Applying ${_p##*/}" + patch -p 1 -i "$_p" + done + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/quagga \ + --localstatedir=/run/quagga \ --enable-exampledir=/usr/share/doc/quagga/examples \ --enable-vtysh \ --enable-isisd \ @@ -35,28 +60,37 @@ build() { --enable-irdp \ --enable-pcreposix \ --enable-multipath=64 \ - --enable-user=nobody \ - --enable-group=nobody \ + --enable-user=quagga \ + --enable-group=quagga \ --enable-configfile-mask=0640 \ --enable-logfile-mask=0640 make } package() { + # upstream install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # logrotate stuff + install -D -m 644 redhat/$pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname" + sed -ri 's,/var/run/quagga,/run/quagga,g' "$pkgdir/etc/logrotate.d/$pkgname" + # initscripts files - for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do + cd "$srcdir" + for d in zebra ripd ripngd bgpd ospfd ospf6d isisd babeld; do install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$d" install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$d" backup+=("etc/conf.d/$d") done - # create /run/quagga directory at startup + # systemd stuff + for d in zebra ripd ripngd bgpd ospfd ospf6d isisd babeld; do + install -D -m 644 $d.service "$pkgdir/usr/lib/systemd/system/$d.service" + done install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" - # soft - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/quagga/babeld.service b/community/quagga/babeld.service new file mode 100644 index 000000000..5b2848042 --- /dev/null +++ b/community/quagga/babeld.service @@ -0,0 +1,12 @@ +[Unit] +Description=Babel routing daemon +BindTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/babeld.conf + +[Service] +ExecStart=/usr/sbin/babeld +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/quagga/bgpd.service b/community/quagga/bgpd.service new file mode 100644 index 000000000..21ac18c8a --- /dev/null +++ b/community/quagga/bgpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=BGP routing daemon +BindTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/bgpd.conf + +[Service] +ExecStart=/usr/sbin/bgpd +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/quagga/isisd.service b/community/quagga/isisd.service new file mode 100644 index 000000000..298946998 --- /dev/null +++ b/community/quagga/isisd.service @@ -0,0 +1,12 @@ +[Unit] +Description=IS-IS routing daemon +BindTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/isisd.conf + +[Service] +ExecStart=/usr/sbin/isisd +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/quagga/ospf6d.service b/community/quagga/ospf6d.service new file mode 100644 index 000000000..31194fc6e --- /dev/null +++ b/community/quagga/ospf6d.service @@ -0,0 +1,12 @@ +[Unit] +Description=OSPF routing daemon for IPv6 +BindTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/ospf6d.conf + +[Service] +ExecStart=/usr/sbin/ospf6d +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/quagga/ospfd.service b/community/quagga/ospfd.service new file mode 100644 index 000000000..f864aa258 --- /dev/null +++ b/community/quagga/ospfd.service @@ -0,0 +1,12 @@ +[Unit] +Description=OSPF routing daemon +BindTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/ospfd.conf + +[Service] +ExecStart=/usr/sbin/ospfd +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/quagga/ripd.service b/community/quagga/ripd.service new file mode 100644 index 000000000..22716e2c9 --- /dev/null +++ b/community/quagga/ripd.service @@ -0,0 +1,12 @@ +[Unit] +Description=RIP routing daemon +BindTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/ripd.conf + +[Service] +ExecStart=/usr/sbin/ripd +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/quagga/ripngd.service b/community/quagga/ripngd.service new file mode 100644 index 000000000..9ac51bd1c --- /dev/null +++ b/community/quagga/ripngd.service @@ -0,0 +1,12 @@ +[Unit] +Description=RIP routing daemon for IPv6 +BindTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/ripngd.conf + +[Service] +ExecStart=/usr/sbin/ripngd +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/quagga/zebra.service b/community/quagga/zebra.service new file mode 100644 index 000000000..e0f87f9bc --- /dev/null +++ b/community/quagga/zebra.service @@ -0,0 +1,12 @@ +[Unit] +Description=GNU Zebra routing manager +After=network.target +ConditionPathExists=/etc/quagga/zebra.conf + +[Service] +ExecStartPre=/sbin/ip route flush proto zebra +ExecStart=/usr/sbin/zebra +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index eabd7858c..f096ce5cf 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63726 2012-02-05 12:09:34Z ibiru $ +# $Id: PKGBUILD 73812 2012-07-15 20:23:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=rawstudio pkgver=2.0 -pkgrel=5 +pkgrel=6 pkgdesc="An open source raw-image converter written in GTK+" arch=('i686' 'x86_64') license=('GPL') @@ -23,6 +23,7 @@ md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 <$srcdir/libpng15.patch + export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" ./configure --prefix=/usr make } diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD index d4b132fd5..3595a47dc 100644 --- a/community/tellico/PKGBUILD +++ b/community/tellico/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 71282 2012-05-26 07:55:16Z pschmitz $ +# $Id: PKGBUILD 73797 2012-07-15 16:49:25Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Maintainer: Ray Rashif <schiv@archlinux.org # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=tellico -pkgver=2.3.5 -pkgrel=2 +pkgver=2.3.6 +pkgrel=1 pkgdesc="A collection manager for KDE" arch=('i686' 'x86_64') url="http://tellico-project.org/" @@ -15,7 +15,7 @@ depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-k makedepends=('automoc4' 'cmake') install=$pkgname.install source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c') +sha256sums=('62bafaea733ce3b108322623e866b8659ab2644cc80ee06f0fc7fe974ec5d1c3') build() { cd ${srcdir} diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 0320e78e6..1a64e03a6 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69169 2012-04-09 22:13:15Z spupykin $ +# $Id: PKGBUILD 73810 2012-07-15 20:19:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch pkgver=1.2.3 -pkgrel=1 -_pkgdata=20120120 +pkgrel=2 +_pkgdata=20120531 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64') url="http://www.draisberghof.de/usb_modeswitch/" @@ -16,8 +16,8 @@ source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar. "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") md5sums=('9b29e8b0d93d7604a9e5efc4696d37a3' - 'c899cc9c71bb35f3ec600b7cd1455c65' - 'c12e19e3992b5beac9b6c48555cff660') + '4a948331d5b9fccba4a89d3e62040cc3' + 'dffc247648ed7359820c9caae413704a') build() { cd $srcdir/usb-modeswitch-$pkgver/ |