summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community-staging/c++-gtk-utils/PKGBUILD29
-rw-r--r--community-staging/passenger/PKGBUILD32
-rw-r--r--community-staging/passenger/build-fix.patch12
-rw-r--r--community-staging/passenger/passenger.install32
-rw-r--r--community-staging/sigil/PKGBUILD48
-rw-r--r--community-staging/sigil/sigil.install12
-rw-r--r--community-staging/tmw/PKGBUILD28
-rw-r--r--community-staging/vdrift/PKGBUILD61
-rw-r--r--community-staging/vdrift/vdrift.install11
-rw-r--r--community-testing/privoxy/PKGBUILD72
-rw-r--r--community-testing/privoxy/privoxy53
-rw-r--r--community-testing/privoxy/privoxy.conf.d10
-rw-r--r--community-testing/privoxy/privoxy.install19
-rw-r--r--community-testing/privoxy/privoxy.logrotate.d8
-rw-r--r--community-testing/privoxy/privoxy.service12
-rw-r--r--community/cantata/PKGBUILD31
-rw-r--r--community/cantata/cantata.install12
-rw-r--r--community/catdoc/PKGBUILD31
-rw-r--r--community/fortune-mod/01_all_fortune_all-fix.patch21
-rw-r--r--community/fortune-mod/LICENSE35
-rw-r--r--community/fortune-mod/PKGBUILD36
-rw-r--r--community/ibus-chewing/PKGBUILD9
-rw-r--r--community/keepalived/PKGBUILD8
-rw-r--r--community/keepalived/keepalived.service3
-rw-r--r--community/libvirt/PKGBUILD23
-rw-r--r--community/libvirt/openbsd-netcat-default.patch48
-rw-r--r--community/multitail/PKGBUILD28
-rw-r--r--community/python-imaging/PKGBUILD48
-rw-r--r--community/rekonq/PKGBUILD6
-rw-r--r--community/skrooge/PKGBUILD8
-rw-r--r--community/skrooge/skrooge.changelog3
-rw-r--r--community/spring/PKGBUILD15
-rw-r--r--community/tea/PKGBUILD6
-rw-r--r--community/vym/PKGBUILD6
-rw-r--r--community/vym/vym.changelog3
-rw-r--r--community/wesnoth/PKGBUILD19
-rw-r--r--core/glibc/PKGBUILD26
-rw-r--r--core/glibc/glibc-2.16-strncasecmp-segfault.patch65
-rw-r--r--core/glibc/glibc-2.16-strtod-overflow.patch389
-rw-r--r--core/pkg-config/PKGBUILD6
-rw-r--r--extra/bftpd/PKGBUILD25
-rwxr-xr-xextra/bftpd/bftpd.rc6
-rw-r--r--extra/bftpd/bftpd.service10
-rw-r--r--extra/bftpd/bftpd.socket10
-rw-r--r--extra/bftpd/bftpd.xinetd2
-rw-r--r--extra/bftpd/bftpd_AT.service8
-rw-r--r--extra/davfs2/PKGBUILD8
-rw-r--r--extra/emacs/PKGBUILD12
-rw-r--r--extra/gdk-pixbuf2/PKGBUILD6
-rw-r--r--extra/ifplugd/PKGBUILD50
-rw-r--r--extra/ifplugd/ifplugd15
-rwxr-xr-xextra/ifplugd/ifplugd-daemon7
-rw-r--r--extra/ifplugd/ifplugd-fix-return-value.patch12
-rw-r--r--extra/ifplugd/ifplugd.install13
-rw-r--r--extra/ifplugd/ifplugd.systemd11
-rw-r--r--extra/lilv/PKGBUILD7
-rw-r--r--extra/serd/PKGBUILD7
-rw-r--r--extra/sord/PKGBUILD9
-rw-r--r--extra/sratom/PKGBUILD7
-rw-r--r--extra/telepathy-kde-accounts-kcm/PKGBUILD6
-rw-r--r--extra/telepathy-kde-approver/PKGBUILD6
-rw-r--r--extra/telepathy-kde-auth-handler/PKGBUILD6
-rw-r--r--extra/telepathy-kde-call-ui/PKGBUILD6
-rw-r--r--extra/telepathy-kde-common-internals/PKGBUILD6
-rw-r--r--extra/telepathy-kde-contact-applet/PKGBUILD6
-rw-r--r--extra/telepathy-kde-contact-list/PKGBUILD6
-rw-r--r--extra/telepathy-kde-contact-runner/PKGBUILD6
-rw-r--r--extra/telepathy-kde-filetransfer-handler/PKGBUILD6
-rw-r--r--extra/telepathy-kde-integration-module/PKGBUILD6
-rw-r--r--extra/telepathy-kde-presence-applet/PKGBUILD6
-rw-r--r--extra/telepathy-kde-send-file/PKGBUILD6
-rw-r--r--extra/telepathy-kde-text-ui/PKGBUILD6
-rw-r--r--extra/telepathy-logger-qt/PKGBUILD10
-rw-r--r--gnome-unstable/at-spi2-atk/PKGBUILD34
-rw-r--r--gnome-unstable/at-spi2-atk/at-spi2-atk.install11
-rw-r--r--gnome-unstable/at-spi2-core/PKGBUILD33
-rw-r--r--gnome-unstable/atk/PKGBUILD26
-rw-r--r--gnome-unstable/glib-networking/PKGBUILD31
-rw-r--r--gnome-unstable/glib-networking/glib-networking.install11
-rw-r--r--gnome-unstable/glib2/PKGBUILD46
-rw-r--r--gnome-unstable/glib2/glib2.csh1
-rw-r--r--gnome-unstable/glib2/glib2.sh1
-rw-r--r--gnome-unstable/glib2/revert-warn-glib-compile-schemas.patch33
-rw-r--r--gnome-unstable/glibmm/PKGBUILD35
-rw-r--r--gnome-unstable/gobject-introspection/PKGBUILD29
-rw-r--r--multilib-testing/lib32-glibc/PKGBUILD28
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch65
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.16-strtod-overflow.patch389
-rw-r--r--testing/iw/PKGBUILD24
-rw-r--r--testing/libedit/PKGBUILD30
-rw-r--r--testing/openssh/PKGBUILD23
-rwxr-xr-xtesting/openssh/sshd1
-rw-r--r--testing/openssh/sshd.service7
-rw-r--r--testing/openssh/sshd@.service8
-rw-r--r--testing/spamassassin/PKGBUILD9
-rw-r--r--testing/spamassassin/spamassassin.install2
-rw-r--r--testing/upower/PKGBUILD19
97 files changed, 2297 insertions, 236 deletions
diff --git a/community-staging/c++-gtk-utils/PKGBUILD b/community-staging/c++-gtk-utils/PKGBUILD
new file mode 100644
index 000000000..3e4af82fb
--- /dev/null
+++ b/community-staging/c++-gtk-utils/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 75681 2012-08-29 07:32:00Z spupykin $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=c++-gtk-utils
+pkgver=2.0.11
+pkgrel=2
+pkgdesc="Classes and functions for programming in GTK+"
+arch=('i686' 'x86_64')
+url="http://cxx-gtk-utils.sourceforge.net/"
+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=('30e0299d677fb857bb0291e467408279')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --disable-rpath \
+ --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/community-staging/passenger/PKGBUILD b/community-staging/passenger/PKGBUILD
new file mode 100644
index 000000000..0464836d8
--- /dev/null
+++ b/community-staging/passenger/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 75683 2012-08-29 07:32:45Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=passenger
+pkgver=3.0.15
+pkgrel=1
+_pkgdlnr=76337
+pkgdesc="mod_rails passenger"
+arch=('i686' 'x86_64')
+url="http://www.modrails.com"
+license=('GPL')
+depends=('ruby' 'ruby-rack' 'curl')
+makedepends=('apache')
+install=passenger.install
+options=('!emptydirs')
+source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz
+ build-fix.patch)
+md5sums=('532d977eabb4acd5a831b3526ddd8ac4'
+ 'ee4699596dffb5357fdac4e3b2c98ee1')
+
+build(){
+ cd $srcdir/passenger-$pkgver
+ patch -p1 <$srcdir/build-fix.patch
+ ./bin/passenger-install-apache2-module -a
+ rake nginx
+
+ mkdir -p $pkgdir/usr/lib/passenger/
+ cp -R * $pkgdir/usr/lib/passenger/
+
+ mkdir -p $pkgdir/usr/lib/httpd/modules
+ ln -sf /usr/lib/passenger/ext/apache2/mod_passenger.so $pkgdir/usr/lib/httpd/modules/mod_passenger.so
+}
diff --git a/community-staging/passenger/build-fix.patch b/community-staging/passenger/build-fix.patch
new file mode 100644
index 000000000..cdbb78e68
--- /dev/null
+++ b/community-staging/passenger/build-fix.patch
@@ -0,0 +1,12 @@
+diff -wbBur passenger-3.0.15/ext/boost/thread/xtime.hpp passenger-3.0.15.my/ext/boost/thread/xtime.hpp
+--- passenger-3.0.15/ext/boost/thread/xtime.hpp 2012-04-16 11:43:52.000000000 +0400
++++ passenger-3.0.15.my/ext/boost/thread/xtime.hpp 2012-08-29 11:06:02.000000000 +0400
+@@ -18,6 +18,8 @@
+
+ namespace boost {
+
++#undef TIME_UTC
++
+ enum xtime_clock_types
+ {
+ TIME_UTC=1
diff --git a/community-staging/passenger/passenger.install b/community-staging/passenger/passenger.install
new file mode 100644
index 000000000..6faaab1b6
--- /dev/null
+++ b/community-staging/passenger/passenger.install
@@ -0,0 +1,32 @@
+post_install() {
+ echo "Please edit your Apache configuration file, and add these lines:"
+ echo ""
+ echo "LoadModule passenger_module /usr/lib/httpd/modules/mod_passenger.so"
+ echo "PassengerRoot /usr/lib/passenger"
+ echo "PassengerRuby /usr/bin/ruby"
+ echo ""
+ echo "After you restart Apache, you are ready to deploy any number of Ruby on Rails"
+ echo "applications on Apache, without any further Ruby on Rails-specific"
+ echo "configuration!"
+ echo ""
+ echo ""
+ echo "Deploying a Ruby on Rails application: an example"
+ echo ""
+ echo "Suppose you have a Ruby on Rails application in /somewhere. Add a virtual host"
+ echo "to your Apache configuration file, and set its DocumentRoot to"
+ echo "/somewhere/public, like this:"
+ echo ""
+ echo "<VirtualHost *:80>"
+ echo " ServerName www.yourhost.com"
+ echo " DocumentRoot /somewhere/public # <-- be sure to point to 'public'!"
+ echo " <Directory /somewhere/public>"
+ echo " AllowOverride all # <-- relax Apache security settings"
+ echo " Options -MultiViews # <-- MultiViews must be turned off"
+ echo " </Directory>"
+ echo "</VirtualHost>"
+ echo ""
+ echo "And that's it! You may also want to check the Users Guide for security and"
+ echo "optimization tips, troubleshooting and other useful information:"
+ echo ""
+ echo "/usr/lib/passenger/doc/Users guide Apache.html"
+}
diff --git a/community-staging/sigil/PKGBUILD b/community-staging/sigil/PKGBUILD
new file mode 100644
index 000000000..339aee5f3
--- /dev/null
+++ b/community-staging/sigil/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 75700 2012-08-29 08:34:34Z spupykin $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
+
+pkgname=sigil
+pkgver=0.5.3
+pkgrel=1
+pkgdesc="WYSIWYG ebook editor"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/sigil/"
+license=('GPL3')
+depends=('qtwebkit' 'boost-libs')
+makedepends=('cmake' 'gendesk' 'boost')
+install=sigil.install
+source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip")
+md5sums=('83c1a5608a2ec59a83c86ccc1429b5cc')
+
+build() {
+ cd "${srcdir}"
+ gendesk -n
+
+ mkdir build
+ cd build
+ cmake -G "Unix Makefiles" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
+ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON ..
+
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make install DESTDIR="${pkgdir}"
+
+ install -d -m 0755 "${pkgdir}"/usr/share/applications
+ install -m 0644 "${srcdir}"/${pkgname}.desktop \
+ "${pkgdir}"/usr/share/applications
+
+ for _pic in 16 32 48 128 256; do
+ install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
+ "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png
+ done
+ install -Dm644 ../src/Sigil/Resource_Files/icon/app_icon_128.png \
+ "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
diff --git a/community-staging/sigil/sigil.install b/community-staging/sigil/sigil.install
new file mode 100644
index 000000000..ec506fa93
--- /dev/null
+++ b/community-staging/sigil/sigil.install
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/community-staging/tmw/PKGBUILD b/community-staging/tmw/PKGBUILD
new file mode 100644
index 000000000..b37a2a9f1
--- /dev/null
+++ b/community-staging/tmw/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 75685 2012-08-29 07:42:44Z spupykin $
+# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
+
+pkgname=tmw
+pkgver=0.6.1
+pkgrel=1
+pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG."
+arch=('i686' 'x86_64')
+url="http://themanaworld.org"
+license=('GPL')
+depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs'
+ 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf')
+makedepends=('cmake' 'mesa')
+#source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2)
+source=($pkgname-$pkgver.tar.gz::https://github.com/mana/mana/tarball/v$pkgver)
+md5sums=('b021e368c813fb95bea00bbf02e6d607')
+
+build() {
+ cd $srcdir/mana-mana-*
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd $srcdir/mana-mana-*
+ make DESTDIR="$pkgdir" install
+}
diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD
new file mode 100644
index 000000000..2970f7aee
--- /dev/null
+++ b/community-staging/vdrift/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 75708 2012-08-29 09:52:39Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
+# Contributor: Lone_Wolf lonewolf@xs4all.nl
+
+pkgname=vdrift
+pkgver=2012.07.22
+pkgrel=1
+pkgdesc="Open source driving simulation made with drift racing in mind"
+arch=('i686' 'x86_64')
+url="http://vdrift.net/"
+license=('GPL')
+depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data'
+ 'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive')
+makedepends=('scons' 'boost' 'asio')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2
+ http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}c_patch.diff)
+md5sums=('fcfd6b65724d32dfe383df216d7afb74'
+ '981cd26709f97cdf85100b720290177f')
+
+build() {
+ cd VDrift
+
+ # select arch
+ if [ `uname -m` = "x86_64" ]; then
+ _sconsarch="a64"
+ else
+ _sconsarch="686"
+ fi
+
+ patch -Np0 < $srcdir/$pkgname-${pkgver//./-}c_patch.diff
+
+ # build and install
+ scons $MAKEFLAGS \
+ "destdir"="$pkgdir" \
+ "arch"=$_sconsarch \
+ "release"=1 \
+ "force_feedback"=1 \
+ "prefix"=/usr \
+ "datadir"=share/$pkgname/ \
+ "extbullet"=1
+}
+
+package() {
+ cd VDrift
+
+ scons install
+
+ # install .desktop file
+ install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+ sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?)
+
+ # install icons
+ install -Dm644 data/textures/icons/vdrift-16x16.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png
+ install -Dm644 data/textures/icons/vdrift-32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png
+ install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png
+ install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+
+ rm -r "$pkgdir"/usr/share/vdrift
+}
+# vim: sw=2:ts=2 et:
diff --git a/community-staging/vdrift/vdrift.install b/community-staging/vdrift/vdrift.install
new file mode 100644
index 000000000..868f6717b
--- /dev/null
+++ b/community-staging/vdrift/vdrift.install
@@ -0,0 +1,11 @@
+post_upgrade() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/community-testing/privoxy/PKGBUILD b/community-testing/privoxy/PKGBUILD
new file mode 100644
index 000000000..8afa9261f
--- /dev/null
+++ b/community-testing/privoxy/PKGBUILD
@@ -0,0 +1,72 @@
+# $Id: PKGBUILD 75713 2012-08-29 10:09:26Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Juergen Hoetzel <juergen@hoetzel.info>
+# Contributor: basilburn (basilburn), Paul Bredbury (brebs)
+
+pkgname=privoxy
+pkgver=3.0.19
+pkgrel=6
+pkgdesc='A web proxy with advanced filtering capabilities.'
+arch=('i686' 'x86_64')
+url='http://www.privoxy.org'
+license=('GPL')
+depends=('pcre' 'zlib')
+makedepends=('autoconf')
+backup=('etc/conf.d/privoxy'
+ 'etc/privoxy/'{config,trust,default.action,user.filter,default.filter}
+ 'etc/privoxy/'{match-all,user}.action
+ 'etc/logrotate.d/privoxy')
+install='privoxy.install'
+source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
+ 'privoxy'
+ 'privoxy.logrotate.d'
+ 'privoxy.conf.d'
+ 'privoxy.service')
+md5sums=('57acc79059565cc42eda67982842785d'
+ '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
+ 'fc3046377137003726a151ee27b142a2'
+ '27830ef79418e277b90c1c1fa933f876'
+ '4c154a126ec17b02c623e3d451e062d9')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}-stable"
+
+ autoheader
+ autoconf
+ ./configure --prefix=/usr --sysconfdir=/etc/privoxy
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}-stable"
+
+ make prefix="${pkgdir}/usr" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
+ CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install
+
+ # Don't overwrite existing log files!
+ rm "${pkgdir}/var/log/privoxy/"*
+
+ install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy"
+ install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
+ install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy"
+
+ # Fix config paths.
+ sed -i -e 's#^confdir.*$#confdir /etc/privoxy#' -e 's#^logdir.*$#logdir /var/log/privoxy#' \
+ -e '/^user-manual/s#.*#\#user-manual /usr/share/doc/privoxy/user-manual/#' \
+ "${pkgdir}/etc/privoxy/config"
+
+ # Fix group ownership and permissions.
+ chgrp -R 42 "${pkgdir}/etc/privoxy/"
+ chgrp -R 42 "${pkgdir}/var/log/privoxy/"
+
+ find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770
+ find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660
+ chmod 0700 "${pkgdir}/var/log/privoxy"
+
+ # avoid conflict with filesystem>=2012.06
+ rmdir "$pkgdir/var/run"
+
+ # systemd unit file
+ install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service"
+}
diff --git a/community-testing/privoxy/privoxy b/community-testing/privoxy/privoxy
new file mode 100644
index 000000000..754453de5
--- /dev/null
+++ b/community-testing/privoxy/privoxy
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+# source application-specific settings
+[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
+
+# read logdir and logfile from privoxy config
+prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
+[ -n "$prld" ] || prld=/var/log/privoxy
+prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
+[ -n "$prlf" ] || prlf=logfile
+
+PID=`pidof -o %PPID /usr/sbin/privoxy`
+
+case "$1" in
+ start)
+ stat_busy "Starting Privoxy"
+ # create missing logdir and logfile
+ [ -d "$prld" ] || mkdir -p "$prld"
+ if [ ! -f "$prlf" ]; then
+ touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \
+ chmod 0660 "$prld/$prlf"
+ fi
+ [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \
+ ${PRIVOXY_ARGS} ${PRIVOXY_CONF}
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon privoxy
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Privoxy"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon privoxy
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community-testing/privoxy/privoxy.conf.d b/community-testing/privoxy/privoxy.conf.d
new file mode 100644
index 000000000..9aa11cd67
--- /dev/null
+++ b/community-testing/privoxy/privoxy.conf.d
@@ -0,0 +1,10 @@
+# Location of the config file.
+PRIVOXY_CONF='/etc/privoxy/config'
+
+# User and group that privoxy will be run as.
+PRIVOXY_USER='privoxy'
+PRIVOXY_GROUP='privoxy'
+
+# Additional arguments.
+PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid"
+
diff --git a/community-testing/privoxy/privoxy.install b/community-testing/privoxy/privoxy.install
new file mode 100644
index 000000000..c3ed75111
--- /dev/null
+++ b/community-testing/privoxy/privoxy.install
@@ -0,0 +1,19 @@
+post_install() {
+ groupadd -g 42 privoxy &>/dev/null
+ useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null
+ chown -R privoxy:privoxy /etc/privoxy /var/log/privoxy
+
+ if [ ! -d /var/spool/privoxy ]; then
+ install -dm0770 -o privoxy -g privoxy /var/spool/privoxy
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ userdel privoxy &>/dev/null
+ groupdel privoxy &>/dev/null
+ rm -rf var/spool/privoxy
+}
diff --git a/community-testing/privoxy/privoxy.logrotate.d b/community-testing/privoxy/privoxy.logrotate.d
new file mode 100644
index 000000000..8c3129024
--- /dev/null
+++ b/community-testing/privoxy/privoxy.logrotate.d
@@ -0,0 +1,8 @@
+/var/log/privoxy/logfile {
+ create 660 root privoxy
+ notifempty
+ compress
+ postrotate
+ /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true
+ endscript
+}
diff --git a/community-testing/privoxy/privoxy.service b/community-testing/privoxy/privoxy.service
new file mode 100644
index 000000000..59a8884f9
--- /dev/null
+++ b/community-testing/privoxy/privoxy.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Privoxy Web Proxy With Advanced Filtering Capabilities
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/privoxy.pid
+ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
+SuccessExitStatus=15
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD
new file mode 100644
index 000000000..74532f8f1
--- /dev/null
+++ b/community/cantata/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 75701 2012-08-29 08:36:07Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Mcder3 <mcder3[at]gmail[dot]com>
+# Contributor: MisterFred <mister.fred[at]free[dot]fr>
+
+pkgname=cantata
+pkgver=0.8.2
+pkgdesc="A KDE client for the music player daemon (MPD)"
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://kde-apps.org/content/show.php/Cantata?content=147733"
+license=('GPL')
+depends=('kdebase-runtime' 'taglib-extras' 'ffmpeg' 'libmtp' 'mpg123' 'speex')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://cantata.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('9bda49f1083820582723353f566268f3')
+
+build(){
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/community/cantata/cantata.install b/community/cantata/cantata.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/community/cantata/cantata.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/community/catdoc/PKGBUILD b/community/catdoc/PKGBUILD
new file mode 100644
index 000000000..bad621899
--- /dev/null
+++ b/community/catdoc/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 75719 2012-08-29 11:08:22Z bisson $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Paulius Palevicius <paulius@birzai.com>
+
+pkgname=catdoc
+pkgver=0.94.3
+pkgrel=1
+pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text"
+arch=('i686' 'x86_64')
+url="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+license=('GPL')
+depends=('glibc')
+optdepends=('tk: for using wordview')
+options=('!makeflags')
+source=(http://ftp.de.debian.org/debian/pool/main/c/catdoc/${pkgname}_$pkgver.orig.tar.gz)
+md5sums=('61212b9fd06b0a31aa7bc9a671130f57')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i 's/$(prefix)/$(installroot)$(prefix)/' desktop/Makefile.in
+ sed -i 's/0.94.2/0.94.3/' configure* doc/*.1 src/makefile.tc
+ ./configure --prefix=/usr --with-wish=/usr/bin/wish
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make installroot="$pkgdir" mandir=/usr/share/man/man1 install
+ install -d "$pkgdir"/usr/share/man/man1
+ install -m644 doc/*.1 "$pkgdir"/usr/share/man/man1
+}
diff --git a/community/fortune-mod/01_all_fortune_all-fix.patch b/community/fortune-mod/01_all_fortune_all-fix.patch
new file mode 100644
index 000000000..b4175ac81
--- /dev/null
+++ b/community/fortune-mod/01_all_fortune_all-fix.patch
@@ -0,0 +1,21 @@
+--- fortune/fortune.c.old 2006-03-11 15:33:14.000000000 +0100
++++ fortune/fortune.c 2006-03-11 15:43:16.000000000 +0100
+@@ -974,7 +974,7 @@
+ if (!ret)
+ ret=add_file(percent, fullpathname, NULL, &File_list,
+ &File_tail, NULL);
+- if ( (!ret && fullpathname != locpathname) || strcmp(sp, "all") == 0 )
++ if (!ret && strncmp(fullpathname, locpathname, sizeof(fullpathname)))
+ ret=add_file(percent, locpathname, NULL, &File_list,
+ &File_tail, NULL);
+
+@@ -985,7 +985,8 @@
+ }
+ if (!ret)
+ return FALSE;
+-
++ if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) && strcmp(sp, "all") == 0)
++ add_file(percent, locpathname, NULL, &File_list, &File_tail, NULL);
+ }
+ else
+ if (!add_file(percent, fullpathname, NULL, &File_list,
diff --git a/community/fortune-mod/LICENSE b/community/fortune-mod/LICENSE
new file mode 100644
index 000000000..d0ad75977
--- /dev/null
+++ b/community/fortune-mod/LICENSE
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 1986, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ken Arnold.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
diff --git a/community/fortune-mod/PKGBUILD b/community/fortune-mod/PKGBUILD
new file mode 100644
index 000000000..427bdb8de
--- /dev/null
+++ b/community/fortune-mod/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 75721 2012-08-29 11:10:03Z bisson $
+# Maintainer: Kevin Piche <kevin@archlinux.org>
+# Contributor: Dale Blount <archlinux@dale.us>
+
+pkgname=fortune-mod
+pkgver=1.99.1
+pkgrel=5
+pkgdesc="The Fortune Cookie Program from BSD games"
+arch=('i686' 'x86_64')
+url="http://www.redellipse.net/code/fortune"
+license=('BSD')
+depends=('recode')
+source=(ftp://ftp.archlinux.org/other/fortune-mod/$pkgname-$pkgver.tar.gz LICENSE 01_all_fortune_all-fix.patch)
+md5sums=('f208805b3b712e32997d7667e0ec52d8'
+ '0217481ae93971296cfb7872157cabb7'
+ 'e85b073f16dc6f0e8f0ed90044797aa3')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -p0 < ../01_all_fortune_all-fix.patch
+ make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL' \
+ COOKIEDIR=/usr/share/fortune \
+ LOCALDIR=/usr/local/share/fortune all fortune/fortune.man
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make FORTDIR="$pkgdir"/usr/bin \
+ COOKIEDIR="$pkgdir"/usr/share/fortune \
+ BINDIR="$pkgdir"/usr/sbin \
+ BINMANDIR="$pkgdir"/usr/share/man/man1 \
+ FORTMANDIR="$pkgdir"/usr/share/man/man6 install
+ rm "$pkgdir"/usr/share/fortune/*.u8
+ rm "$pkgdir"/usr/share/fortune/off/*.u8
+ install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD
index bc8180647..ce7f6b9ab 100644
--- a/community/ibus-chewing/PKGBUILD
+++ b/community/ibus-chewing/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 75463 2012-08-24 22:28:16Z ebelanger $
+# $Id: PKGBUILD 75677 2012-08-29 04:37:22Z ebelanger $
# Maintainer: Thomas Dziedzic < gostrc at gmail >
# Contributor: Rainy <rainylau(at)gmail(dot)com>
# Contributor: Lee.MaRS <leemars@gmail.com>
# Contributor: Hiroshi Yui <hiroshiyui@gmail.com>
pkgname=ibus-chewing
-pkgver=1.4.0
+pkgver=1.4.2
pkgrel=1
pkgdesc='Chinese Chewing Engine for IBus Framework'
arch=('i686' 'x86_64')
@@ -15,13 +15,10 @@ depends=('ibus' 'libchewing' 'libxtst')
makedepends=('swig' 'cmake' 'gob2')
install=ibus-chewing.install
source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz)
-md5sums=('dcbb3b2b6f4d57f4964c8b5cf3421bd3')
+md5sums=('67d944ddfb7dd4eb325967ce43390092')
build() {
cd "${srcdir}/${pkgname}-${pkgver}-Source"
-
- sed -i '0,/COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CACHE_TXT}/! s/COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CACHE_TXT}//' Modules/ManageVersion.cmake
-
cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONF_INSTALL_DIR=/usr/share \
-DLIBEXEC_DIR=/usr/lib/ibus
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index 1d2778c8d..ab1e13a7f 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75353 2012-08-21 06:05:32Z seblu $
+# $Id: PKGBUILD 75723 2012-08-29 14:02:05Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Andrea Zucchelli <zukka77@gmail.com>
pkgname=keepalived
-pkgver=1.2.6
+pkgver=1.2.7
pkgrel=1
pkgdesc='Failover and monitoring daemon for LVS clusters'
arch=('i686' 'x86_64')
@@ -15,9 +15,9 @@ source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
'keepalived.rc'
'keepalived.service'
'keepalived.conf')
-md5sums=('299f8c7eae521753c3e1f2689974982a'
+md5sums=('8551a34ee048895dbe5350a031ff29c1'
'0d7ea6296bce403a5d24be305a0a9d73'
- '7a327df915700dcd45a049d099c9c42b'
+ 'dd0a003a24057eba1e4dc09f372aaa52'
'9c8142da8730ad27a345587dea83ced7')
build() {
diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service
index c20f18695..e29deeebd 100644
--- a/community/keepalived/keepalived.service
+++ b/community/keepalived/keepalived.service
@@ -2,8 +2,7 @@
Description=Keepalive Daemon
[Service]
-EnvironmentFile=/etc/conf.d/keepalived
-ExecStart=/usr/sbin/keepalived --dont-fork $DAEMON_OPTS
+ExecStart=/usr/sbin/keepalived --dont-fork
[Install]
WantedBy=multi-user.target
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 0a06068c9..b62150e24 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73804 2012-07-15 20:16:33Z spupykin $
+# $Id: PKGBUILD 75710 2012-08-29 09:58:55Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
pkgname=libvirt
-pkgver=0.9.13
-pkgrel=2
+pkgver=0.10.0
+pkgrel=1
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('i686' 'x86_64')
url="http://libvirt.org/"
@@ -38,13 +38,13 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
openbsd-netcat-default.patch
libvirt-libnl3.patch
xdg.patch)
-md5sums=('86cbe53ee662e3b9e8bb0c63c737ba27'
+md5sums=('63ceb65bba07fc7690499d9eb6d2c844'
'c43244c40a0437038c82089618e7beaa'
'3ed0e24f5b5e25bf553f5427d64915e6'
'8297b1be794a24cc77f66af9380ace59'
'bc2971dacdbac967fc3474e50affc345'
'8d98e62915785686b0b6c8c070628392'
- 'b0be50eb9dfe4d133decf23b60880f7d'
+ '456723b41903d3aaa7ec948c1feea265'
'ba27fbcd989de8d84cfff98326f10c54'
'9b9fcdbd64d37d84ae73d9da0a7efed7')
@@ -58,13 +58,12 @@ build() {
sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
done
- [ $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
+ 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
export LDFLAGS=-lX11
export RADVD=/usr/sbin/radvd
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
index a01b4f14e..5538c892d 100644
--- a/community/libvirt/openbsd-netcat-default.patch
+++ b/community/libvirt/openbsd-netcat-default.patch
@@ -1,7 +1,7 @@
-diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c
---- libvirt-0.9.7/src/qemu/qemu_migration.c 2011-10-31 07:46:04.000000000 +0400
-+++ libvirt-0.9.7.my/src/qemu/qemu_migration.c 2011-11-08 15:46:10.000000000 +0400
-@@ -1589,7 +1589,7 @@
+diff -wbBur libvirt-0.10.0.org/src/qemu/qemu_migration.c libvirt-0.10.0/src/qemu/qemu_migration.c
+--- libvirt-0.10.0.org/src/qemu/qemu_migration.c 2012-08-27 06:12:21.000000000 +0400
++++ libvirt-0.10.0/src/qemu/qemu_migration.c 2012-08-29 13:36:23.000000000 +0400
+@@ -1910,7 +1910,7 @@
spec->dest.unix_socket.file);
} else {
const char *args[] = {
@@ -10,10 +10,10 @@ diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qe
};
ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
}
-diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c
---- libvirt-0.9.7/src/remote/remote_driver.c 2011-11-08 07:53:30.000000000 +0400
-+++ libvirt-0.9.7.my/src/remote/remote_driver.c 2011-11-08 15:46:10.000000000 +0400
-@@ -614,7 +614,7 @@
+diff -wbBur libvirt-0.10.0.org/src/remote/remote_driver.c libvirt-0.10.0/src/remote/remote_driver.c
+--- libvirt-0.10.0.org/src/remote/remote_driver.c 2012-08-27 06:12:21.000000000 +0400
++++ libvirt-0.10.0/src/remote/remote_driver.c 2012-08-29 13:36:32.000000000 +0400
+@@ -693,7 +693,7 @@
username,
!tty,
!verify,
@@ -22,10 +22,22 @@ diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote
keyfile,
sockname)))
goto failed;
-diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c
---- libvirt-0.9.7/src/rpc/virnetsocket.c 2011-11-08 07:53:30.000000000 +0400
-+++ libvirt-0.9.7.my/src/rpc/virnetsocket.c 2011-11-08 15:46:31.000000000 +0400
-@@ -642,7 +642,7 @@
+diff -wbBur libvirt-0.10.0.org/src/rpc/virnetclient.c libvirt-0.10.0/src/rpc/virnetclient.c
+--- libvirt-0.10.0.org/src/rpc/virnetclient.c 2012-08-28 07:44:50.000000000 +0400
++++ libvirt-0.10.0/src/rpc/virnetclient.c 2012-08-29 13:36:38.000000000 +0400
+@@ -469,7 +469,7 @@
+ DEFAULT_VALUE(host, "localhost");
+ DEFAULT_VALUE(port, "22");
+ DEFAULT_VALUE(username, "root");
+- DEFAULT_VALUE(netcatPath, "nc");
++ DEFAULT_VALUE(netcatPath, "nc.openbsd");
+ DEFAULT_VALUE(knownHostsVerify, "normal");
+
+ virBufferEscapeShell(&buf, netcatPath);
+diff -wbBur libvirt-0.10.0.org/src/rpc/virnetsocket.c libvirt-0.10.0/src/rpc/virnetsocket.c
+--- libvirt-0.10.0.org/src/rpc/virnetsocket.c 2012-08-22 14:00:59.000000000 +0400
++++ libvirt-0.10.0/src/rpc/virnetsocket.c 2012-08-29 13:36:44.000000000 +0400
+@@ -698,7 +698,7 @@
virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
if (!netcat)
@@ -34,3 +46,15 @@ diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnet
virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
+diff -wbBur libvirt-0.10.0.org/tests/virnetsockettest.c libvirt-0.10.0/tests/virnetsockettest.c
+--- libvirt-0.10.0.org/tests/virnetsockettest.c 2012-08-10 06:26:04.000000000 +0400
++++ libvirt-0.10.0/tests/virnetsockettest.c 2012-08-29 13:36:53.000000000 +0400
+@@ -593,7 +593,7 @@
+
+ struct testSSHData sshData7 = {
+ .nodename = "somehost",
+- .netcat = "nc -4",
++ .netcat = "nc.openbsd -4",
+ .path = "/tmp/socket",
+ .expectOut = "somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
+ "ARG=-q0;"
diff --git a/community/multitail/PKGBUILD b/community/multitail/PKGBUILD
new file mode 100644
index 000000000..9a19820bf
--- /dev/null
+++ b/community/multitail/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 75717 2012-08-29 11:07:06Z bisson $
+# Maintainer: Kevin Piche <kevin@archlinux.org>
+# Contributor: Roberto Carvajal <roberto@archlinux.org>
+
+pkgname=multitail
+pkgver=5.2.9
+pkgrel=1
+pkgdesc="Lets you view one or multiple files like the original tail program"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.vanheusden.com/multitail"
+depends=('ncurses')
+backup=('etc/multitail.conf')
+source=("${url}/${pkgname}-${pkgver}.tgz")
+md5sums=('871cb6a9a0d4f599b9cbd9f603da4c51')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ install -D -m 755 multitail ${pkgdir}/usr/bin/multitail
+ install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1
+ install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf
+}
+# vim: ts=2 sw=2 et ft=sh
diff --git a/community/python-imaging/PKGBUILD b/community/python-imaging/PKGBUILD
new file mode 100644
index 000000000..a664a1a98
--- /dev/null
+++ b/community/python-imaging/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 75715 2012-08-29 11:05:01Z bisson $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: simo <simo@archlinux.org>
+
+pkgname=python-imaging
+pkgver=1.1.7
+pkgrel=4
+pkgdesc="PIL. Provides image processing capabilities for python"
+arch=('i686' 'x86_64')
+url="http://www.pythonware.com/products/pil/index.htm"
+license=('custom:"pil"')
+depends=('python2' 'libjpeg' 'freetype2' 'lcms')
+makedepends=('tk' 'sane')
+optdepends=('tk' 'sane')
+provides=("pil=${pkgver}")
+conflicts=('pil')
+replaces=('pil')
+source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz)
+md5sums=('fc14a54e1ce02a0225be8854bfba478e')
+
+build() {
+ cd "${srcdir}"/Imaging-${pkgver}
+ python2 setup.py build_ext
+ cd Sane
+ python2 setup.py build_ext
+}
+
+package() {
+ cd "${srcdir}"/Imaging-${pkgver}
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+
+ pushd Sane
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+ popd
+
+ install -dm755 "${pkgdir}"/usr/include/python2.7/
+ install -m644 -t "${pkgdir}"/usr/include/python2.7/ libImaging/*.h
+
+ # do not have files ending in .py in /usr/bin
+ for f in pildriver pilprint pilconvert pilfile pilfont; do
+ mv "${pkgdir}"/usr/bin/${f}{.py,}
+ done
+
+ # Install license
+ install -Dm644 "${srcdir}"/Imaging-${pkgver}/README \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/README
+}
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index 1c9976037..f64c8482e 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74109 2012-07-21 11:42:11Z andrea $
+# $Id: PKGBUILD 75695 2012-08-29 08:23:51Z andrea $
# Maintainer: Peter Lewis <plewis@aur.archlinux.org>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
pkgname=rekonq
-pkgver=1.0
+pkgver=1.1
pkgrel=1
pkgdesc='A WebKit based web browser for KDE'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('kdebase-keditbookmarks' 'qoauth')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('ca7b86ad4a778cbba52a14192865c7b0')
+md5sums=('3ee3f965b47d790ceacac444fc83f4e4')
build(){
cd "${srcdir}"
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index 8588b9dbc..15c721641 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 75015 2012-08-11 18:51:57Z ebelanger $
+# $Id: PKGBUILD 75731 2012-08-29 20:24:22Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
pkgname=skrooge
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
pkgdesc="A personal finances manager for KDE"
arch=('i686' 'x86_64')
url="http://skrooge.org/"
@@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'docbook-xsl')
install=$pkgname.install
changelog=$pkgname.changelog
source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7f8ec247084a005b743bb080ded5724f6c1ee3644c135e12002c80df93fddfe9')
+sha256sums=('d96cd0ac7d503e22ae809f4646ad6008818485804c4569adbddcfd5e953743a2')
build() {
cd "${srcdir}/$pkgname-$pkgver"
diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog
index ffc491ba5..f866264c2 100644
--- a/community/skrooge/skrooge.changelog
+++ b/community/skrooge/skrooge.changelog
@@ -1,3 +1,6 @@
+2012-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * skrooge 1.3.2-1
+
2012-08-09 Eric Belanger <eric@archlinux.org>
* skrooge 1.3.0-2 Rebuild against libofx 0.9.5
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index f9010836e..8954c55c1 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 74626 2012-07-31 19:56:56Z ebelanger $
+# $Id: PKGBUILD 75703 2012-08-29 09:21:55Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=spring
-pkgver=0.89.0
-_pkgver=89.0
-pkgrel=2
+pkgver=0.90.0
+_pkgver=90.0
+pkgrel=1
pkgdesc='A free 3D real-time-strategy (RTS) game engine'
arch=('i686' 'x86_64')
url="http://springrts.com/"
@@ -17,10 +17,8 @@ makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment')
optdepends=('python2: python-based bots'
'java-runtime: java-based bots')
install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma
- boost-1.50.patch)
-md5sums=('36fc266e925bc3790a68bf1bc7ebb315'
- 'a3c3b4a53eeb499090b027fd6b3cf848')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
+md5sums=('d09dbffa444385f17cfa6f1729bfd654')
build() {
bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
@@ -28,7 +26,6 @@ build() {
cd spring_${_pkgver}
sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h
- patch -Np1 < "$srcdir/boost-1.50.patch"
cmake . \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index cdc516d7d..74de24601 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74236 2012-07-23 05:26:38Z spupykin $
+# $Id: PKGBUILD 75679 2012-08-29 05:52:39Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
# Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
pkgname=tea
-pkgver=33.2.0
+pkgver=33.3.0
pkgrel=1
pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell')
install=tea.install
source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2
tea.desktop)
-md5sums=('2d612e48ef014477f86db4323c513b74'
+md5sums=('5830f177056d65f74ac52c97f5637815'
'377ace3363124f4c086de0babb820761')
build() {
diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD
index 49e690a1a..5be932d1c 100644
--- a/community/vym/PKGBUILD
+++ b/community/vym/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72708 2012-06-20 18:18:28Z jlichtblau $
+# $Id: PKGBUILD 75733 2012-08-29 20:40:57Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: S�ren Holm <sgh@sgh.dk>
pkgname=vym
-pkgver=2.2.0
+pkgver=2.2.4
pkgrel=1
pkgdesc="A mindmapping tool"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ changelog=$pkgname.changelog
install=$pkgname.install
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \
$pkgname.desktop)
-sha256sums=('98ebf4f134a8e3ea0de8ce5853177edcdbef76a11a1156268fc167d2da40c6d1'
+sha256sums=('fa6d088327feae80c4c6760454fba64fe253a7de6e7e46f45a4c7f7db9b998f4'
'e299c69c213e7aac3f5b5d0ab088132b4ec7cb63a391f272e75ed64f049d541b')
build() {
diff --git a/community/vym/vym.changelog b/community/vym/vym.changelog
index dcf26d8f4..6344bbecd 100644
--- a/community/vym/vym.changelog
+++ b/community/vym/vym.changelog
@@ -1,3 +1,6 @@
+2012-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * vym 2.2.4-1
+
2012-06-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* vym 2.2.0-1
diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD
index fa7d64890..cf9a95311 100644
--- a/community/wesnoth/PKGBUILD
+++ b/community/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75447 2012-08-24 12:33:04Z svenstaro $
+# $Id: PKGBUILD 75697 2012-08-29 08:31:11Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,8 +6,8 @@
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=wesnoth
-pkgver=1.10.3
-pkgrel=3
+pkgver=1.10.4
+pkgrel=1
pkgdesc="A turn-based strategy game on a fantasy world"
arch=('i686' 'x86_64')
license=('GPL')
@@ -19,26 +19,21 @@ options=(!emptydirs)
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
wesnothd.tmpfiles.conf
wesnothd.rc.d
- wesnothd.service
- boost_foreach.patch)
-md5sums=('b25354c71d58f82c2c60cc12c6f09c36'
+ wesnothd.service)
+md5sums=('1a673f12e4521fc66e60ec584fa7c98f'
'2d2fea6b3d86dfd589f5ad35a3be1f97'
'85659b47d22dfdf4e4d046556973fc3e'
- 'd1b6bf1d3dc05086ee6a370adff0ae4a'
- '07e78c6ece06ed10119fc57ebc16ea9d')
+ 'd1b6bf1d3dc05086ee6a370adff0ae4a')
build() {
cd "$srcdir/$pkgname-$pkgver"
- patch -Np0 < $srcdir/boost_foreach.patch
-
mkdir build && cd build
cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_OMP=ON \
-DENABLE_TOOLS=ON \
- -DMANDIR=share/man \
- -DFIFO_DIR=/run/wesnothd
+ -DMANDIR=share/man
make
}
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index b96b4a1a9..6039cbccb 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165343 2012-08-16 01:57:59Z allan $
+# $Id: PKGBUILD 165786 2012-08-29 23:16:00Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
pkgname=glibc
pkgver=2.16.0
-pkgrel=3
+pkgrel=4
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
@@ -23,6 +23,8 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
glibc-2.15-fix-res_query-assert.patch
glibc-2.15-revert-c5a0802a.patch
glibc-2.16-rpcgen-cpp-path.patch
+ glibc-2.16-strncasecmp-segfault.patch
+ glibc-2.16-strtod-overflow.patch
nscd.rcd
nscd.service
nscd.tmpfiles
@@ -33,6 +35,8 @@ md5sums=('80b181b02ab249524ec92822c0174cf7'
'31f415b41197d85d3bbee3d1eecd06a3'
'0a0383d50d63f1c02919fe9943b82014'
'ea6a43915474e8276e9361eed6a01280'
+ 'f042d37cc8ca3459023431809039bc88'
+ '61d322f7681a85d3293ada5c3ccc2c7e'
'589d79041aa767a5179eaa4e2737dd3f'
'ad8a9af15ab7eeaa23dc7ee85024af9f'
'bccbe5619e75cf1d97312ec3681c605c'
@@ -54,6 +58,17 @@ build() {
# http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
+ # strncasecmp segfault on i686
+ # http://sourceware.org/git/?p=glibc.git;a=commit;h=6db8f737
+ patch -p1 -i ${srcdir}/glibc-2.16-strncasecmp-segfault.patch
+
+ # strtod integer/buffer overflow
+ # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319
+ patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch
+
+ # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
+ sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h
+
cd ${srcdir}
mkdir glibc-build
cd glibc-build
@@ -64,7 +79,7 @@ build() {
export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
fi
- echo "slibdir=/lib" >> configparms
+ echo "slibdir=/usr/lib" >> configparms
# remove hardening options from CFLAGS for building libraries
CFLAGS=${CFLAGS/-fstack-protector/}
@@ -102,8 +117,6 @@ check() {
package() {
cd ${srcdir}/glibc-build
- ln -s usr/lib ${pkgdir}/lib
-
install -dm755 ${pkgdir}/etc
touch ${pkgdir}/etc/ld.so.conf
@@ -111,6 +124,9 @@ package() {
rm -f ${pkgdir}/etc/ld.so.{cache,conf}
+ # eventually this will move to the filesystem package
+ ln -s usr/lib ${pkgdir}/lib
+
install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
diff --git a/core/glibc/glibc-2.16-strncasecmp-segfault.patch b/core/glibc/glibc-2.16-strncasecmp-segfault.patch
new file mode 100644
index 000000000..ce91bbe82
--- /dev/null
+++ b/core/glibc/glibc-2.16-strncasecmp-segfault.patch
@@ -0,0 +1,65 @@
+diff --git a/string/test-strncasecmp.c b/string/test-strncasecmp.c
+index 6c17530..acfe668 100644
+--- a/string/test-strncasecmp.c
++++ b/string/test-strncasecmp.c
+@@ -1,5 +1,5 @@
+ /* Test and measure strncasecmp functions.
+- Copyright (C) 1999, 2002, 2003, 2005, 2010 Free Software Foundation, Inc.
++ Copyright (C) 1999-2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Written by Jakub Jelinek <jakub@redhat.com>, 1999.
+
+@@ -251,9 +251,9 @@ do_random_tests (void)
+ }
+ }
+
+-
++/* Regression test for BZ #12205 */
+ static void
+-check1 (void)
++bz12205 (void)
+ {
+ static char cp [4096+16] __attribute__ ((aligned(4096)));
+ static char gotrel[4096] __attribute__ ((aligned(4096)));
+@@ -270,6 +270,15 @@ check1 (void)
+ check_result (impl, s1, s2, n, exp_result);
+ }
+
++/* Regression test for BZ #14195 */
++static void
++bz14195 (void)
++{
++ const char *empty_string = "";
++ FOR_EACH_IMPL (impl, 0)
++ check_result (impl, empty_string, "", 5, 0);
++}
++
+ int
+ test_main (void)
+ {
+@@ -277,7 +286,8 @@ test_main (void)
+
+ test_init ();
+
+- check1 ();
++ bz12205 ();
++ bz14195 ();
+
+ printf ("%23s", "");
+ FOR_EACH_IMPL (impl, 0)
+diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
+index 5e6321e..9735ad0 100644
+--- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
++++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
+@@ -2445,7 +2445,7 @@ L(less16bytes_sncmp):
+ # endif
+ jne L(neq_sncmp)
+ test %cl, %cl
+- je L(eq)
++ je L(eq_sncmp)
+
+ cmp $1, REM
+ je L(eq_sncmp)
+--
+1.7.3.4
+
diff --git a/core/glibc/glibc-2.16-strtod-overflow.patch b/core/glibc/glibc-2.16-strtod-overflow.patch
new file mode 100644
index 000000000..526296325
--- /dev/null
+++ b/core/glibc/glibc-2.16-strtod-overflow.patch
@@ -0,0 +1,389 @@
+diff --git a/stdlib/Makefile b/stdlib/Makefile
+index f7811c5..79c9acb 100644
+--- a/stdlib/Makefile
++++ b/stdlib/Makefile
+@@ -68,7 +68,8 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
+ tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
+ tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2 \
+ tst-makecontext2 tst-strtod6 tst-unsetenv1 \
+- tst-makecontext3 bug-getcontext bug-fmtmsg1
++ tst-makecontext3 bug-getcontext bug-fmtmsg1 \
++ tst-strtod-overflow
+
+ include ../Makeconfig
+
+diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
+index 2166a08..a8a7ea8 100644
+--- a/stdlib/strtod_l.c
++++ b/stdlib/strtod_l.c
+@@ -60,6 +60,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
+ #include <math.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdint.h>
+
+ /* The gmp headers need some configuration frobs. */
+ #define HAVE_ALLOCA 1
+@@ -72,7 +73,6 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
+ #include "longlong.h"
+ #include "fpioconst.h"
+
+-#define NDEBUG 1
+ #include <assert.h>
+
+
+@@ -174,19 +174,19 @@ extern const mp_limb_t _tens_in_limb[MAX_DIG_PER_LIMB + 1];
+ /* Return a floating point number of the needed type according to the given
+ multi-precision number after possible rounding. */
+ static FLOAT
+-round_and_return (mp_limb_t *retval, int exponent, int negative,
++round_and_return (mp_limb_t *retval, intmax_t exponent, int negative,
+ mp_limb_t round_limb, mp_size_t round_bit, int more_bits)
+ {
+ if (exponent < MIN_EXP - 1)
+ {
+- mp_size_t shift = MIN_EXP - 1 - exponent;
+-
+- if (shift > MANT_DIG)
++ if (exponent < MIN_EXP - 1 - MANT_DIG)
+ {
+ __set_errno (ERANGE);
+ return 0.0;
+ }
+
++ mp_size_t shift = MIN_EXP - 1 - exponent;
++
+ more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0;
+ if (shift == MANT_DIG)
+ /* This is a special case to handle the very seldom case where
+@@ -233,6 +233,9 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
+ __set_errno (ERANGE);
+ }
+
++ if (exponent > MAX_EXP)
++ goto overflow;
++
+ if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0
+ && (more_bits || (retval[0] & 1) != 0
+ || (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0))
+@@ -258,6 +261,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
+ }
+
+ if (exponent > MAX_EXP)
++ overflow:
+ return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
+
+ return MPN2FLOAT (retval, exponent, negative);
+@@ -271,7 +275,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
+ factor for the resulting number (see code) multiply by it. */
+ static const STRING_TYPE *
+ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
+- int *exponent
++ intmax_t *exponent
+ #ifndef USE_WIDE_CHAR
+ , const char *decimal, size_t decimal_len, const char *thousands
+ #endif
+@@ -301,6 +305,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
+ cy += __mpn_add_1 (n, n, *nsize, low);
+ if (cy != 0)
+ {
++ assert (*nsize < MPNSIZE);
+ n[*nsize] = cy;
+ ++(*nsize);
+ }
+@@ -335,7 +340,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
+ }
+ while (--digcnt > 0);
+
+- if (*exponent > 0 && cnt + *exponent <= MAX_DIG_PER_LIMB)
++ if (*exponent > 0 && *exponent <= MAX_DIG_PER_LIMB - cnt)
+ {
+ low *= _tens_in_limb[*exponent];
+ start = _tens_in_limb[cnt + *exponent];
+@@ -355,7 +360,10 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
+ cy = __mpn_mul_1 (n, n, *nsize, start);
+ cy += __mpn_add_1 (n, n, *nsize, low);
+ if (cy != 0)
+- n[(*nsize)++] = cy;
++ {
++ assert (*nsize < MPNSIZE);
++ n[(*nsize)++] = cy;
++ }
+ }
+
+ return str;
+@@ -413,7 +421,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ {
+ int negative; /* The sign of the number. */
+ MPN_VAR (num); /* MP representation of the number. */
+- int exponent; /* Exponent of the number. */
++ intmax_t exponent; /* Exponent of the number. */
+
+ /* Numbers starting `0X' or `0x' have to be processed with base 16. */
+ int base = 10;
+@@ -435,7 +443,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ /* Points at the character following the integer and fractional digits. */
+ const STRING_TYPE *expp;
+ /* Total number of digit and number of digits in integer part. */
+- int dig_no, int_no, lead_zero;
++ size_t dig_no, int_no, lead_zero;
+ /* Contains the last character read. */
+ CHAR_TYPE c;
+
+@@ -767,7 +775,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ are all or any is really a fractional digit will be decided
+ later. */
+ int_no = dig_no;
+- lead_zero = int_no == 0 ? -1 : 0;
++ lead_zero = int_no == 0 ? (size_t) -1 : 0;
+
+ /* Read the fractional digits. A special case are the 'american
+ style' numbers like `16.' i.e. with decimal point but without
+@@ -789,12 +797,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ (base == 16 && ({ CHAR_TYPE lo = TOLOWER (c);
+ lo >= L_('a') && lo <= L_('f'); })))
+ {
+- if (c != L_('0') && lead_zero == -1)
++ if (c != L_('0') && lead_zero == (size_t) -1)
+ lead_zero = dig_no - int_no;
+ ++dig_no;
+ c = *++cp;
+ }
+ }
++ assert (dig_no <= (uintmax_t) INTMAX_MAX);
+
+ /* Remember start of exponent (if any). */
+ expp = cp;
+@@ -817,24 +826,80 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+
+ if (c >= L_('0') && c <= L_('9'))
+ {
+- int exp_limit;
++ intmax_t exp_limit;
+
+ /* Get the exponent limit. */
+ if (base == 16)
+- exp_limit = (exp_negative ?
+- -MIN_EXP + MANT_DIG + 4 * int_no :
+- MAX_EXP - 4 * int_no + 4 * lead_zero + 3);
++ {
++ if (exp_negative)
++ {
++ assert (int_no <= (uintmax_t) (INTMAX_MAX
++ + MIN_EXP - MANT_DIG) / 4);
++ exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no;
++ }
++ else
++ {
++ if (int_no)
++ {
++ assert (lead_zero == 0
++ && int_no <= (uintmax_t) INTMAX_MAX / 4);
++ exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3;
++ }
++ else if (lead_zero == (size_t) -1)
++ {
++ /* The number is zero and this limit is
++ arbitrary. */
++ exp_limit = MAX_EXP + 3;
++ }
++ else
++ {
++ assert (lead_zero
++ <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4);
++ exp_limit = (MAX_EXP
++ + 4 * (intmax_t) lead_zero
++ + 3);
++ }
++ }
++ }
+ else
+- exp_limit = (exp_negative ?
+- -MIN_10_EXP + MANT_DIG + int_no :
+- MAX_10_EXP - int_no + lead_zero + 1);
++ {
++ if (exp_negative)
++ {
++ assert (int_no
++ <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG));
++ exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no;
++ }
++ else
++ {
++ if (int_no)
++ {
++ assert (lead_zero == 0
++ && int_no <= (uintmax_t) INTMAX_MAX);
++ exp_limit = MAX_10_EXP - (intmax_t) int_no + 1;
++ }
++ else if (lead_zero == (size_t) -1)
++ {
++ /* The number is zero and this limit is
++ arbitrary. */
++ exp_limit = MAX_10_EXP + 1;
++ }
++ else
++ {
++ assert (lead_zero
++ <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1));
++ exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1;
++ }
++ }
++ }
++
++ if (exp_limit < 0)
++ exp_limit = 0;
+
+ do
+ {
+- exponent *= 10;
+- exponent += c - L_('0');
+-
+- if (__builtin_expect (exponent > exp_limit, 0))
++ if (__builtin_expect ((exponent > exp_limit / 10
++ || (exponent == exp_limit / 10
++ && c - L_('0') > exp_limit % 10)), 0))
+ /* The exponent is too large/small to represent a valid
+ number. */
+ {
+@@ -843,7 +908,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ /* We have to take care for special situation: a joker
+ might have written "0.0e100000" which is in fact
+ zero. */
+- if (lead_zero == -1)
++ if (lead_zero == (size_t) -1)
+ result = negative ? -0.0 : 0.0;
+ else
+ {
+@@ -862,6 +927,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ /* NOTREACHED */
+ }
+
++ exponent *= 10;
++ exponent += c - L_('0');
++
+ c = *++cp;
+ }
+ while (c >= L_('0') && c <= L_('9'));
+@@ -930,7 +998,14 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ }
+ #endif
+ startp += lead_zero + decimal_len;
+- exponent -= base == 16 ? 4 * lead_zero : lead_zero;
++ assert (lead_zero <= (base == 16
++ ? (uintmax_t) INTMAX_MAX / 4
++ : (uintmax_t) INTMAX_MAX));
++ assert (lead_zero <= (base == 16
++ ? ((uintmax_t) exponent
++ - (uintmax_t) INTMAX_MIN) / 4
++ : ((uintmax_t) exponent - (uintmax_t) INTMAX_MIN)));
++ exponent -= base == 16 ? 4 * (intmax_t) lead_zero : (intmax_t) lead_zero;
+ dig_no -= lead_zero;
+ }
+
+@@ -972,7 +1047,10 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ }
+
+ /* Adjust the exponent for the bits we are shifting in. */
+- exponent += bits - 1 + (int_no - 1) * 4;
++ assert (int_no <= (uintmax_t) (exponent < 0
++ ? (INTMAX_MAX - bits + 1) / 4
++ : (INTMAX_MAX - exponent - bits + 1) / 4));
++ exponent += bits - 1 + ((intmax_t) int_no - 1) * 4;
+
+ while (--dig_no > 0 && idx >= 0)
+ {
+@@ -1024,13 +1102,15 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ really integer digits or belong to the fractional part; i.e. we normalize
+ 123e-2 to 1.23. */
+ {
+- register int incr = (exponent < 0 ? MAX (-int_no, exponent)
+- : MIN (dig_no - int_no, exponent));
++ register intmax_t incr = (exponent < 0
++ ? MAX (-(intmax_t) int_no, exponent)
++ : MIN ((intmax_t) dig_no - (intmax_t) int_no,
++ exponent));
+ int_no += incr;
+ exponent -= incr;
+ }
+
+- if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0))
++ if (__builtin_expect (exponent > MAX_10_EXP + 1 - (intmax_t) int_no, 0))
+ {
+ __set_errno (ERANGE);
+ return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
+@@ -1215,7 +1295,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ digits we should have enough bits for the result. The remaining
+ decimal digits give us the information that more bits are following.
+ This can be used while rounding. (Two added as a safety margin.) */
+- if (dig_no - int_no > (MANT_DIG - bits + 2) / 3 + 2)
++ if ((intmax_t) dig_no > (intmax_t) int_no + (MANT_DIG - bits + 2) / 3 + 2)
+ {
+ dig_no = int_no + (MANT_DIG - bits + 2) / 3 + 2;
+ more_bits = 1;
+@@ -1223,7 +1303,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ else
+ more_bits = 0;
+
+- neg_exp = dig_no - int_no - exponent;
++ neg_exp = (intmax_t) dig_no - (intmax_t) int_no - exponent;
+
+ /* Construct the denominator. */
+ densize = 0;
+diff --git a/stdlib/tst-strtod-overflow.c b/stdlib/tst-strtod-overflow.c
+new file mode 100644
+index 0000000..668d55b
+--- /dev/null
++++ b/stdlib/tst-strtod-overflow.c
+@@ -0,0 +1,48 @@
++/* Test for integer/buffer overflow in strtod.
++ Copyright (C) 2012 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#define EXPONENT "e-2147483649"
++#define SIZE 214748364
++
++static int
++do_test (void)
++{
++ char *p = malloc (1 + SIZE + sizeof (EXPONENT));
++ if (p == NULL)
++ {
++ puts ("malloc failed, cannot test for overflow");
++ return 0;
++ }
++ p[0] = '1';
++ memset (p + 1, '0', SIZE);
++ memcpy (p + 1 + SIZE, EXPONENT, sizeof (EXPONENT));
++ double d = strtod (p, NULL);
++ if (d != 0)
++ {
++ printf ("strtod returned wrong value: %a\n", d);
++ return 1;
++ }
++ return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+--
+1.7.3.4
+
diff --git a/core/pkg-config/PKGBUILD b/core/pkg-config/PKGBUILD
index a235d17d8..6e82ac673 100644
--- a/core/pkg-config/PKGBUILD
+++ b/core/pkg-config/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163491 2012-07-13 12:30:49Z allan $
+# $Id: PKGBUILD 165722 2012-08-29 10:30:07Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=pkg-config
-pkgver=0.27
+pkgver=0.27.1
pkgrel=1
pkgdesc="A system for managing library compile/link flags"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ provides=("pkgconfig=${pkgver}")
conflicts=('pkgconfig')
replaces=('pkgconfig')
source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3a4c9feab14b6719afd8904945d9b4e4')
+md5sums=('5392b4e3372879c5bf856173b418d6a2')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD
index 538708952..3d8c636ae 100644
--- a/extra/bftpd/PKGBUILD
+++ b/extra/bftpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162345 2012-06-25 18:19:31Z thomas $
+# $Id: PKGBUILD 165789 2012-08-29 23:52:16Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=bftpd
pkgver=3.8
-pkgrel=1
+pkgrel=2
pkgdesc="Small, easy-to-configure FTP server"
arch=(i686 x86_64)
url="http://bftpd.sourceforge.net/"
@@ -18,27 +18,34 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
bftpd.rc
bftpd.logrotate
bftpd.pam
- bftpd.xinetd)
+ bftpd.xinetd
+ bftpd.service
+ bftpd.socket
+ bftpd_AT.service)
md5sums=('880c1274e623ddd1e3e37f9f0cf09d70'
- '56a1bf7738a6db2b2cff89e611f4f11a'
+ '2419d7293000813f9d01bd357181445c'
'853680dad0df39d0b4d2fb43d4be430a'
'96f82c38f3f540b53f3e5144900acf17'
- 'ff70fd962666f4d74749a1c68167a966')
+ '23feb84e8ecbae5df320b49e01821d9a'
+ '94b483f7c7b65580a30ebc6a8fe80d1b'
+ '93509ee83148160f60c009a2192a6774'
+ 'cb6a3334a7c8b5b8b559a643a65928c4')
build() {
cd "${srcdir}"/$pkgname
# The bftpd author keeps screwing up the release tarballs
rm -f config.{cache,status}
+ sed 's|$(prefix)/sbin|$(prefix)/bin|g' -i Makefile.in
./configure --prefix=/usr \
--enable-pam \
--mandir=/usr/share/man \
- --sysconfdir=/etc
+ --sysconfdir=/etc \
make
}
package() {
cd "${srcdir}"/$pkgname
- install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8}
+ install -d -m755 "${pkgdir}"/usr/{bin,share/man/man8}
install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd
install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd
make DESTDIR="${pkgdir}" install
@@ -56,4 +63,8 @@ package() {
rmdir "${pkgdir}"/usr/etc
# Fix default in config file
sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf
+ # Install systemd files
+ install -D -m644 "${srcdir}"/bftpd.service "${pkgdir}"/usr/lib/systemd/system/bftpd.service
+ install -D -m644 "${srcdir}"/bftpd_AT.service "${pkgdir}"/usr/lib/systemd/system/bftpd@.service
+ install -D -m644 "${srcdir}"/bftpd.socket "${pkgdir}"/usr/lib/systemd/system/bftpd.socket
}
diff --git a/extra/bftpd/bftpd.rc b/extra/bftpd/bftpd.rc
index 2f31cf50c..4784ae28a 100755
--- a/extra/bftpd/bftpd.rc
+++ b/extra/bftpd/bftpd.rc
@@ -8,15 +8,15 @@ PIDFILE="/var/run/bftpd.pid"
case "$1" in
start)
stat_busy "Starting bftpd Server"
- PID="$(pidof -o %PPID /usr/sbin/bftpd)"
+ PID="$(pidof -o %PPID /usr/bin/bftpd)"
if [ -z "$PID" ]; then
- /usr/sbin/bftpd -d
+ /usr/bin/bftpd -d
if [ $? -gt 0 ]; then
stat_fail
else
# wait until it forks
sleep 2
- echo $(pidof -o %PPID /usr/sbin/bftpd) > $PIDFILE
+ echo $(pidof -o %PPID /usr/bin/bftpd) > $PIDFILE
add_daemon bftpd
stat_done
fi
diff --git a/extra/bftpd/bftpd.service b/extra/bftpd/bftpd.service
new file mode 100644
index 000000000..8f8209247
--- /dev/null
+++ b/extra/bftpd/bftpd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=bftpd daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/bftpd -d
+GuessMainPID=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/bftpd/bftpd.socket b/extra/bftpd/bftpd.socket
new file mode 100644
index 000000000..b16dfa278
--- /dev/null
+++ b/extra/bftpd/bftpd.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=bftpd incoming socket
+Conflicts=bftpd.service
+
+[Socket]
+ListenStream=21
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/extra/bftpd/bftpd.xinetd b/extra/bftpd/bftpd.xinetd
index 68c931243..0b42da8e1 100644
--- a/extra/bftpd/bftpd.xinetd
+++ b/extra/bftpd/bftpd.xinetd
@@ -3,7 +3,7 @@ service ftp
socket_type = stream
wait = no
user = root
- server = /usr/sbin/bftpd
+ server = /usr/bin/bftpd
server_args = -i
log_on_success += HOST DURATION
log_on_failure += HOST
diff --git a/extra/bftpd/bftpd_AT.service b/extra/bftpd/bftpd_AT.service
new file mode 100644
index 000000000..1e84dc8ad
--- /dev/null
+++ b/extra/bftpd/bftpd_AT.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=bftpd daemon
+
+[Service]
+ExecStart=/usr/bin/bftpd -i
+StandardInput=socket
+StandardOutput=socket
+StandardError=socket
diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD
index 45b949e89..a682bf185 100644
--- a/extra/davfs2/PKGBUILD
+++ b/extra/davfs2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149924 2012-02-11 22:48:34Z thomas $
+# $Id: PKGBUILD 165783 2012-08-29 23:04:18Z thomas $
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgname=davfs2
-pkgver=1.4.6
-pkgrel=2
+pkgver=1.4.7
+pkgrel=1
pkgdesc="File system driver that allows you to mount a WebDAV folder"
arch=(i686 x86_64)
url="http://savannah.nongnu.org/projects/davfs2"
@@ -10,7 +10,7 @@ license=('GPL')
depends=('neon')
backup=(etc/davfs2/davfs2.conf etc/davfs2/secrets)
source=(http://mirrors.zerg.biz/nongnu/davfs2/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('e07252ec6db38c8f691bf2dada639e8300e058594f47a7c3c45020631621c356')
+sha256sums=('50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index c0ac0572d..edf3e6e19 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 161436 2012-06-11 15:03:29Z juergen $
+# $Id: PKGBUILD 165687 2012-08-29 09:08:38Z juergen $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
pkgname=emacs
-pkgver=24.1
-pkgrel=2
+pkgver=24.2
+pkgrel=1
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/emacs/emacs.html"
license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
install=emacs.install
source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4')
+md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
build() {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
- --localstatedir=/var --with-x-toolkit=gtk --with-xft
+ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
make
}
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 2326056f7..0780a9075 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165244 2012-08-14 15:06:13Z ibiru $
+# $Id: PKGBUILD 165754 2012-08-29 12:15:27Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gdk-pixbuf2
-pkgver=2.26.2
+pkgver=2.26.3
pkgrel=1
pkgdesc="An image loading library"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'gobject-introspection')
options=('!libtool')
install=gdk-pixbuf2.install
source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('3555521050e30e2fa090bfe650910c14649b6ab0acb35a5a7eaf90fe694f1403')
+sha256sums=('a22373a72621c6f73e8c216410aeb46e3bb05b477e600b6ac481a47ecd4c09cc')
build() {
cd gdk-pixbuf-$pkgver
diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD
index 420bf90d5..6d30aefbd 100644
--- a/extra/ifplugd/PKGBUILD
+++ b/extra/ifplugd/PKGBUILD
@@ -1,31 +1,38 @@
-# $Id: PKGBUILD 158689 2012-05-07 09:54:25Z dreisner $
+# $Id: PKGBUILD 165779 2012-08-29 20:42:40Z thomas $
# Contributor: Manolis Tzanidakis
# Contributor: kevin <kevin@archlinux.org>
# Maintainer:
pkgname=ifplugd
pkgver=0.28
-pkgrel=11
+pkgrel=12
pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
arch=('i686' 'x86_64')
url="http://0pointer.de/lennart/projects/ifplugd"
+install=ifplugd.install
license=('GPL2')
-depends=('libdaemon' 'bash' 'net-tools')
-backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
+depends=('libdaemon' 'bash')
+backup=('etc/ifplugd/ifplugd.conf')
options=('!makeflags')
-source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
+source=($url/${pkgname}-${pkgver}.tar.gz
+ ifplugd-0.28-interface.patch
+ ifplugd-fix-return-value.patch
+ ifplugd
+ ifplugd-daemon
+ ifplugd.systemd)
md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
- '2281cd3eda9e3403857863e1a1bc00be'
- '6f98767c4ea2cf0580f73ced81efd21a'
'54eb22844b5aeed161c0b80aa9008570'
- 'd6ce6c7bd481a0b3944c944c5b277c0b'
- 'c35f0a637911b747f8dc3bd3c6156a1b'
- 'f8690ee18a5ca72555585ee96826c2cf')
+ 'f26dbd7597d9d637f0b2b104b11ab820'
+ '158bda9014eb35979af9b094feca5fe1'
+ 'f2e8a37af52b79ee0e3c5bcc2470ce10'
+ '3dc2ce45d0e12d155ecc7a5bc9e3ee04')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i $srcdir/ifplugd-0.28-interface.patch
- ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
+ patch -p0 -i ${srcdir}/ifplugd-0.28-interface.patch
+ patch -p1 -i ${srcdir}/ifplugd-fix-return-value.patch
+ sed 's|/var/run|/run|' -i src/ifplugd.c
+ ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --sysconfdir=/etc \
--with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx
make
}
@@ -34,20 +41,11 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
- # replace INTERFACES with NET_IFS since AL already uses it in /etc/rc.conf
- sed -i "s:INTERFACES:NET_IFS:g" \
- ${pkgdir}/etc/ifplugd/ifplugd.conf
-
# replace the default init script & action files with ours.
install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd
- install -D -m755 ${srcdir}/ifplugd.action \
- ${pkgdir}/etc/ifplugd/ifplugd.action
-
- install -Dm755 ${srcdir}/ifdown.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifdown.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.01-route.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/01-route.sh
- install -Dm755 ${srcdir}/ifup.02-ntpdate.sh \
- ${pkgdir}/etc/ifplugd/ifup.d/02-ntpdate.sh
+ install -D -m755 ${srcdir}/ifplugd-daemon ${pkgdir}/usr/bin/ifplugd-daemon
+ # remove default action script
+ rm -f ${pkgdir}/etc/ifplugd/ifplugd.action
+ # install systemd unit
+ install -D -m644 ${srcdir}/ifplugd.systemd ${pkgdir}/usr/lib/systemd/system/ifplugd@.service
}
-
diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd
index f7c34ade5..f6c8db938 100644
--- a/extra/ifplugd/ifplugd
+++ b/extra/ifplugd/ifplugd
@@ -16,14 +16,7 @@ PID=$(pidof -o %PPID ifplugd)
[[ -r $cfg ]] && . "$cfg"
# discover interfaces to monitor
-# (replacing INTERFACES with NET_IFS, since AL
-# already uses it in /etc/rc.conf)
-if [[ $NET_IFS ]]; then
- net_ifs=($NET_IFS)
-else
- net_ifs=(/sys/class/net/!(lo))
- net_ifs=("${net_ifs[@]##*/}")
-fi
+net_ifs=($INTERFACES)
case $1 in
start)
@@ -31,10 +24,8 @@ case $1 in
for nic in "${net_ifs[@]}"; do
# only start if a PID doesn't already exist
- if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then
- args=ARGS_$nic
- [[ -z ${!args} ]] && args=$ARGS || args=${!args}
- ifplugd -i "$nic" $args
+ if [[ ! -f /var/run/ifplugd.$nic.pid ]];
+ /usr/bin/ifplugd-daemon $nic
# use presence of PID file to check for start success
[[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err ))
diff --git a/extra/ifplugd/ifplugd-daemon b/extra/ifplugd/ifplugd-daemon
new file mode 100755
index 000000000..e21f4afbd
--- /dev/null
+++ b/extra/ifplugd/ifplugd-daemon
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. /etc/ifplugd/ifplugd.conf
+
+args=ARGS_$1
+[[ -z ${!args} ]] && args=$ARGS || args=${!args}
+/usr/bin/ifplugd -i "$1" $args
diff --git a/extra/ifplugd/ifplugd-fix-return-value.patch b/extra/ifplugd/ifplugd-fix-return-value.patch
new file mode 100644
index 000000000..1b7d04af6
--- /dev/null
+++ b/extra/ifplugd/ifplugd-fix-return-value.patch
@@ -0,0 +1,12 @@
+diff -Nur ifplugd-0.28.orig/src/ifplugd.c ifplugd-0.28/src/ifplugd.c
+--- ifplugd-0.28.orig/src/ifplugd.c 2005-06-04 21:21:51.000000000 +0200
++++ ifplugd-0.28/src/ifplugd.c 2012-08-29 21:51:53.137644163 +0200
+@@ -447,7 +447,7 @@
+ goto finish;
+
+ if (send_retval && daemonize && wait_on_fork) {
+- char c = status == IFSTATUS_UP ? 2 : (status == IFSTATUS_DOWN ? 3 : 1);
++ char c = status == IFSTATUS_UP ? 1 : (status == IFSTATUS_DOWN ? 2 : 3);
+ daemon_retval_send(c);
+ send_retval = 0;
+ }
diff --git a/extra/ifplugd/ifplugd.install b/extra/ifplugd/ifplugd.install
new file mode 100644
index 000000000..c061d8c31
--- /dev/null
+++ b/extra/ifplugd/ifplugd.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+ if [ $(vercmp $2 0.28-12) -lt 0 ]; then
+ cat << "EOF"
+* When used with initscripts, /etc/ifplugd/ifplugd.conf now uses
+ INTERFACES= again instead of NET_IFS=.
+* This package no longer provides a default ifplugd.action script.
+* To use ifplugd with systemd, run
+ systemctl enable ifplugd@eth0.service
+EOF
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/ifplugd/ifplugd.systemd b/extra/ifplugd/ifplugd.systemd
new file mode 100644
index 000000000..4d407be9e
--- /dev/null
+++ b/extra/ifplugd/ifplugd.systemd
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daemon which acts upon network cable insertion/removal
+
+[Service]
+Type=forking
+PIDFile=/run/ifplugd.%i.pid
+ExecStart=/usr/bin/ifplugd-daemon %i
+SuccessExitStatus=0 1 2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/lilv/PKGBUILD b/extra/lilv/PKGBUILD
index d9db5de53..bcc97d988 100644
--- a/extra/lilv/PKGBUILD
+++ b/extra/lilv/PKGBUILD
@@ -1,8 +1,9 @@
# $Id: PKGBUILD 72422 2012-06-14 07:51:14Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: speps <speps at aur dot archlinux dot org>
pkgname=lilv
-pkgver=0.14.2
+pkgver=0.14.4
pkgrel=1
pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications."
arch=(i686 x86_64)
@@ -12,7 +13,7 @@ depends=('python2' 'sratom' 'jack')
makedepends=('swig')
optdepends=('bash-completion: auto-complete words')
source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('1aea6761f3e44007c0fb4eb20630655d')
+md5sums=('891595410eeb68322cf875286f96fccf')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/serd/PKGBUILD b/extra/serd/PKGBUILD
index 70d658de4..581d2b891 100644
--- a/extra/serd/PKGBUILD
+++ b/extra/serd/PKGBUILD
@@ -1,8 +1,9 @@
# $Id: PKGBUILD 72422 2012-06-14 07:51:14Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: speps <speps at aur dot archlinux dot org>
pkgname=serd
-pkgver=0.14.0
+pkgver=0.18.0
pkgrel=1
pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples."
arch=(i686 x86_64)
@@ -11,7 +12,7 @@ license=('custom:ISC')
depends=('glibc')
makedepends=('python2')
source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('405b11ee92f3f19ce4a757ba34953886')
+md5sums=('96dbade2c81d6df8100a9ef605ce35f8')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/sord/PKGBUILD b/extra/sord/PKGBUILD
index ec9cdcad0..86f5d8fda 100644
--- a/extra/sord/PKGBUILD
+++ b/extra/sord/PKGBUILD
@@ -1,17 +1,18 @@
# $Id: PKGBUILD 72422 2012-06-14 07:51:14Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: speps <speps at aur dot archlinux dot org>
pkgname=sord
-pkgver=0.8.0
+pkgver=0.10.0
pkgrel=1
pkgdesc="A lightweight C library for storing RDF data in memory."
arch=(i686 x86_64)
url="http://drobilla.net/software/$pkgname/"
license=('custom:ISC')
-depends=('serd' 'pcre')
+depends=('serd>=0.18.0' 'pcre')
makedepends=('python2')
source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('62be6a2cd6e9bc2933d1297afeacda30')
+md5sums=('ad20105c0cefaed32d59c4665d682cab')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/sratom/PKGBUILD b/extra/sratom/PKGBUILD
index e384bdf1c..bc7881bba 100644
--- a/extra/sratom/PKGBUILD
+++ b/extra/sratom/PKGBUILD
@@ -1,8 +1,9 @@
# $Id: PKGBUILD 72422 2012-06-14 07:51:14Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: speps <speps at aur dot archlinux dot org>
pkgname=sratom
-pkgver=0.2.0
+pkgver=0.4.0
pkgrel=1
pkgdesc="An LV2 Atom RDF serialisation library"
arch=(i686 x86_64)
@@ -11,7 +12,7 @@ license=('custom:ISC')
depends=('lv2' 'sord')
makedepends=('python2')
source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('c03cf2849186818610ffe889be4f5b55')
+md5sums=('7279faa5879949de6593945c7f924595')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index 1db6ebb39..0303bff14 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164200 2012-07-27 14:43:53Z andrea $
+# $Id: PKGBUILD 165719 2012-08-29 10:19:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=telepathy-kde-accounts-kcm
_pkgname=ktp-accounts-kcm
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ groups=('kde-telepathy')
conflicts=('telepathy-kde-accounts-kcm-plugins')
replaces=('telepathy-kde-accounts-kcm-plugins')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e549047634dfd6366def2be143b06e01bee8c159')
+sha1sums=('6642b6c3ae266bba47a38e3022410afa4ca98dce')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index 1ec4095bd..5ce3c43a6 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164201 2012-07-27 14:44:27Z andrea $
+# $Id: PKGBUILD 165695 2012-08-29 10:05:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=telepathy-kde-approver
_pkgname=ktp-approver
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="KDE Channel Approver for Telepathy"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('04563bda017dacfb8a1e2c8f0e39adb47269fd47')
+sha1sums=('483a1d66caca8db7143087ab917f61cda4233a02')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index ca61be34c..065079002 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164202 2012-07-27 14:45:01Z andrea $
+# $Id: PKGBUILD 165697 2012-08-29 10:05:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-auth-handler
_pkgname=ktp-auth-handler
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('534ac05deacac0e9fb8a281813d6316b08ce8933')
+sha1sums=('3934aa0ba72ccedb4b283d8997e09e7633089d26')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-call-ui/PKGBUILD b/extra/telepathy-kde-call-ui/PKGBUILD
index c65e1dd7c..0027f4f14 100644
--- a/extra/telepathy-kde-call-ui/PKGBUILD
+++ b/extra/telepathy-kde-call-ui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164203 2012-07-27 14:45:34Z andrea $
+# $Id: PKGBUILD 165699 2012-08-29 10:06:19Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-call-ui
_pkgname=ktp-call-ui
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="Voice/Video Call UI for Telepathy"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qt-gstreamer')
makedepends=('cmake' 'automoc4' 'boost')
groups=('kde-telepathy')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e6cadf3bb6820ff015e49801a3b0196827dd9ab3')
+sha1sums=('22c556e21a914a5f68a829bf6354012887cfae57')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index 80aa72d4c..70a1c9ce0 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164213 2012-07-27 14:57:48Z andrea $
+# $Id: PKGBUILD 165714 2012-08-29 10:12:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-common-internals
_pkgname=ktp-common-internals
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="Common components for KDE-Telepathy"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
install=${pkgname}.install
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9acb65efa371ba4f23063bc83ea7a488ac73e4b7')
+sha1sums=('34bac58049ede6df4fce1215fbc3b4ffc9671cba')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-contact-applet/PKGBUILD
index fce1f193c..7da167f2d 100644
--- a/extra/telepathy-kde-contact-applet/PKGBUILD
+++ b/extra/telepathy-kde-contact-applet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164204 2012-07-27 14:46:08Z andrea $
+# $Id: PKGBUILD 165701 2012-08-29 10:07:02Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-contact-applet
_pkgname=ktp-contact-applet
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="The KDE-Telepathy contact plasmoid"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'kdebase-workspace')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('7cb95c4a9dd3a8b5ebe8775f3d846d4d4a31af60')
+sha1sums=('fadd97b3e9c7ebb9e0e8ea86f275c56d027584a9')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index e7c38626f..65c43bc8a 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164205 2012-07-27 14:46:38Z andrea $
+# $Id: PKGBUILD 165721 2012-08-29 10:20:00Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=telepathy-kde-contact-list
_pkgname=ktp-contact-list
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="Telepathy contact list application"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
install=${pkgname}.install
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d9d062316f9eaff49f2fcad1ba2bbdf59dc8cc07')
+sha1sums=('68bc915463285e0b14b46d618a63d949e1794ade')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index 44dba3e72..e30a31211 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164206 2012-07-27 14:47:49Z andrea $
+# $Id: PKGBUILD 165703 2012-08-29 10:07:39Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-contact-runner
_pkgname=ktp-contact-runner
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="KRunner plugin for KDE Telepathy"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('388ebb2933114b7e0844bf6a8e71e5b7fdab3680')
+sha1sums=('ebc529387dc061ef6eba73b203100298c6aa03ba')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index b5a7dc692..557d428f6 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164207 2012-07-27 14:49:01Z andrea $
+# $Id: PKGBUILD 165705 2012-08-29 10:08:16Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-filetransfer-handler
_pkgname=ktp-filetransfer-handler
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="Telepathy file transfer handler"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('bb618e3fc36b321bfe5aaa7a0f8531b4c7fe25c2')
+sha1sums=('fa4048f50c0a9c0ff138ef4ae8c5d47e0bdeac87')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index 62e802bef..8fb0e32e4 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164208 2012-07-27 14:50:11Z andrea $
+# $Id: PKGBUILD 165707 2012-08-29 10:08:53Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-integration-module
_pkgname=ktp-kded-integration-module
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a4bfe983db21ea7d56436d0426138215eb77b279')
+sha1sums=('6b20ba9f836a1c2d7ef19504ee31fedf10c400bc')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-presence-applet/PKGBUILD b/extra/telepathy-kde-presence-applet/PKGBUILD
index 966169d17..272229a96 100644
--- a/extra/telepathy-kde-presence-applet/PKGBUILD
+++ b/extra/telepathy-kde-presence-applet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164209 2012-07-27 14:52:00Z andrea $
+# $Id: PKGBUILD 165709 2012-08-29 10:09:30Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=telepathy-kde-presence-applet
_pkgname=ktp-presence-applet
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="Plasma applet for managing your Telepathy account presence"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('392758b5ced3eea0f315c9dabacc1f3e421a8171')
+sha1sums=('f4736784443ea37dc2490acb5be3a2036ca179f5')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index cd5bdb322..24ec13dbe 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164216 2012-07-27 15:10:20Z andrea $
+# $Id: PKGBUILD 165711 2012-08-29 10:10:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-send-file
_pkgname=ktp-send-file
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
install=${pkgname}.install
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('23aa731d15dff440da587dec359e7298ec0a0895')
+sha1sums=('127a5e77cbb1580d49f2c005f9849cd01d665fb8')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index 397bb8cfd..e00e772bf 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164212 2012-07-27 14:57:33Z andrea $
+# $Id: PKGBUILD 165713 2012-08-29 10:10:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=telepathy-kde-text-ui
_pkgname=ktp-text-ui
-pkgver=0.4.1
+pkgver=0.5.0
pkgrel=1
pkgdesc="Telepathy handler for Text Chats"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
makedepends=('cmake' 'automoc4' 'boost')
groups=('kde-telepathy')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('8e32e8708d7283714ad6e999caf07388472bba38')
+sha1sums=('a12e8b996a0cdb5db5a3cd34fb5bfa87dd4f5e41')
build() {
cd "${srcdir}"
diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD
index c73503021..b9a2014e7 100644
--- a/extra/telepathy-logger-qt/PKGBUILD
+++ b/extra/telepathy-logger-qt/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 161454 2012-06-11 18:05:29Z andrea $
+# $Id: PKGBUILD 165715 2012-08-29 10:12:42Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: George Brooke <george+arch.aur@george-brooke.co.uk>
pkgname=telepathy-logger-qt
-pkgver=0.4.0
+pkgver=0.5.0
pkgrel=1
pkgdesc="Qt bindings for telepathy logger"
arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kdereview/telepathy-logger-qt'
+url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt'
license=('GPL')
depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer' 'boost-libs')
-makedepends=('automoc4' 'cmake' 'python2' 'boost')
+makedepends=('automoc4' 'cmake' 'python2' 'boost' 'doxygen')
source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('459ab0db97d00d198d05859217cf0f4069e75d5e')
+sha1sums=('09d949e60c5b140b20c61ec1d52830e7b98cd50e')
build() {
cd "$srcdir"
diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD
new file mode 100644
index 000000000..064730448
--- /dev/null
+++ b/gnome-unstable/at-spi2-atk/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 165756 2012-08-29 12:54:52Z jgc $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=at-spi2-atk
+pkgver=2.5.90
+pkgrel=1
+pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org"
+license=('GPL2')
+depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
+makedepends=('intltool')
+install=at-spi2-atk.install
+options=('!libtool')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('373c46988fca380e36530c554bea470e05a2aa311292ee134746f856c5baf57e')
+
+build() {
+ cd $pkgname-$pkgver
+
+ sed -i -e '/AC_PATH_XTRA/d' configure.ac
+ autoreconf --force --install
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --disable-schemas-compile
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/at-spi2-atk/at-spi2-atk.install b/gnome-unstable/at-spi2-atk/at-spi2-atk.install
new file mode 100644
index 000000000..2ef26aaa9
--- /dev/null
+++ b/gnome-unstable/at-spi2-atk/at-spi2-atk.install
@@ -0,0 +1,11 @@
+post_install() {
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD
new file mode 100644
index 000000000..df54a00c9
--- /dev/null
+++ b/gnome-unstable/at-spi2-core/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 165752 2012-08-29 12:07:43Z jgc $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=at-spi2-core
+pkgver=2.5.5
+pkgrel=1
+pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org"
+license=('GPL2')
+depends=('dbus-core' 'glib2' 'libxtst')
+makedepends=('intltool' 'gobject-introspection')
+options=('!libtool')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9b4cd2d8abec1680c635c07e8b28144d2c3f07c5c3abad1a02a84015ea3dca25')
+
+build() {
+ cd $pkgname-$pkgver
+
+ sed -i -e '/AC_PATH_XTRA/d' configure.ac
+ autoreconf --force --install
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/at-spi2-core --disable-xevie
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/atk/PKGBUILD b/gnome-unstable/atk/PKGBUILD
new file mode 100644
index 000000000..0b6d74640
--- /dev/null
+++ b/gnome-unstable/atk/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 165747 2012-08-29 11:56:13Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=atk
+pkgver=2.5.4
+pkgrel=1
+pkgdesc="A library providing a set of interfaces for accessibility"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('glib2')
+makedepends=('gobject-introspection')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+url='http://www.gtk.org/'
+sha256sums=('af6d6d8ec4543f338bf2476974de69891b7419913dd1cf4a94d53696bcc14aab')
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/glib-networking/PKGBUILD b/gnome-unstable/glib-networking/PKGBUILD
new file mode 100644
index 000000000..68aed2d76
--- /dev/null
+++ b/gnome-unstable/glib-networking/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 165764 2012-08-29 13:14:23Z jgc $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=glib-networking
+pkgver=2.33.10
+pkgrel=1
+pkgdesc="Network-related giomodules for glib"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+license=('GPL2')
+depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
+makedepends=('intltool')
+options=('!libtool')
+install=glib-networking.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f86cb9022ba2f09e528e311016a6df8eb0ad004a37ed9932e231ee715968bf7c')
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure \
+ --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/glib-networking --disable-static
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/glib-networking/glib-networking.install b/gnome-unstable/glib-networking/glib-networking.install
new file mode 100644
index 000000000..8214e1968
--- /dev/null
+++ b/gnome-unstable/glib-networking/glib-networking.install
@@ -0,0 +1,11 @@
+post_install() {
+ gio-querymodules /usr/lib/gio/modules
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/gnome-unstable/glib2/PKGBUILD b/gnome-unstable/glib2/PKGBUILD
new file mode 100644
index 000000000..77d416a11
--- /dev/null
+++ b/gnome-unstable/glib2/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 165744 2012-08-29 11:46:05Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=glib2
+pkgver=2.33.10
+pkgrel=1
+pkgdesc="Common C routines used by GTK+ and other libs"
+url="http://www.gtk.org/"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('pcre' 'libffi')
+makedepends=('pkg-config' 'python2')
+optdepends=('python2: for gdbus-codegen')
+options=('!libtool' '!docs' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
+ glib2.sh
+ glib2.csh
+ revert-warn-glib-compile-schemas.patch)
+sha256sums=('6caf18eb963aa2c3c7c0dc63201021bc29e7972c60d191f566e8971af77e9505'
+ '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
+ '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
+ '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+
+build() {
+ cd glib-$pkgver
+ patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
+ --sysconfdir=/etc \
+ --with-pcre=system \
+ --disable-fam
+ make
+}
+
+package() {
+ cd glib-$pkgver
+ make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
+
+ install -d "$pkgdir/etc/profile.d"
+ install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/"
+ install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/"
+
+ for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
+ chmod -x "$_i"
+ done
+ sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
+}
diff --git a/gnome-unstable/glib2/glib2.csh b/gnome-unstable/glib2/glib2.csh
new file mode 100644
index 000000000..7aa3a2ffa
--- /dev/null
+++ b/gnome-unstable/glib2/glib2.csh
@@ -0,0 +1 @@
+setenv G_BROKEN_FILENAMES 1
diff --git a/gnome-unstable/glib2/glib2.sh b/gnome-unstable/glib2/glib2.sh
new file mode 100644
index 000000000..96a056e1e
--- /dev/null
+++ b/gnome-unstable/glib2/glib2.sh
@@ -0,0 +1 @@
+export G_BROKEN_FILENAMES=1
diff --git a/gnome-unstable/glib2/revert-warn-glib-compile-schemas.patch b/gnome-unstable/glib2/revert-warn-glib-compile-schemas.patch
new file mode 100644
index 000000000..75b05103c
--- /dev/null
+++ b/gnome-unstable/glib2/revert-warn-glib-compile-schemas.patch
@@ -0,0 +1,33 @@
+From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Thu, 12 Apr 2012 23:55:34 +0000
+Subject: glib-compile-schemas: warn about bad dconf paths
+
+For quite some time the recommended usage of GSettings and dconf has
+been to use paths like /org/gnome/example/. Use of /apps/ has spilled
+over from GConf and is continuing to make its way into a number of
+applications as they port.
+
+glib-compile-schemas will now warn about these types of paths being
+used. This generates a lot of noise, but hopefully it will reduce the
+number of ported applications making this mistake.
+---
+diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
+index cf02389..27d0181 100644
+--- a/gio/glib-compile-schemas.c
++++ b/gio/glib-compile-schemas.c
+@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state,
+ return;
+ }
+
++ if (path && (g_str_has_prefix (path, "/apps/") ||
++ g_str_has_prefix (path, "/desktop/") ||
++ g_str_has_prefix (path, "/system/")))
++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
++
+ state->schema_state = schema_state_new (path, gettext_domain,
+ extends, extends_name, list_of);
+
+--
+cgit v0.9.0.2
diff --git a/gnome-unstable/glibmm/PKGBUILD b/gnome-unstable/glibmm/PKGBUILD
new file mode 100644
index 000000000..e02b188e0
--- /dev/null
+++ b/gnome-unstable/glibmm/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 165758 2012-08-29 13:01:56Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgbase=glibmm
+pkgname=('glibmm' 'glibmm-docs')
+pkgver=2.33.3
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+options=('!libtool')
+url="http://www.gtkmm.org/"
+sha256sums=('8dea072b06f62a61a435845ad0cfb1f5856c7be90d3f5b4880fc21c194ff1d80')
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr
+ make
+}
+
+package_glibmm() {
+ pkgdesc="Glib-- (glibmm) is a C++ interface for glib"
+ depends=('glib2' 'libsigc++2.0')
+ cd "$pkgbase-$pkgver"
+ sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
+ make DESTDIR="$pkgdir" install
+}
+
+package_glibmm-docs() {
+ pkgdesc="Developer documentation for glibmm"
+ cd "$pkgbase-$pkgver/docs"
+ make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/gobject-introspection/PKGBUILD b/gnome-unstable/gobject-introspection/PKGBUILD
new file mode 100644
index 000000000..039beeb78
--- /dev/null
+++ b/gnome-unstable/gobject-introspection/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 165750 2012-08-29 12:01:00Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gobject-introspection
+pkgver=1.33.9
+pkgrel=1
+pkgdesc="Introspection system for GObject-based libraries"
+url="https://live.gnome.org/GObjectIntrospection"
+arch=('x86_64' 'i686')
+license=('LGPL' 'GPL')
+depends=('glib2' 'python2')
+makedepends=('cairo')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('4d8283bcbf30f78e13e2d085a8be9a41a8b197a22ad48dc913e6ea7bec3fe8b0')
+
+build() {
+ cd "$pkgname-$pkgver"
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ sed -i '1s|#!/usr/bin/env python$|&2|' \
+ "$pkgdir"/usr/lib/gobject-introspection/giscanner/*.py
+}
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index 1f71aade3..2f586aeb6 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75116 2012-08-14 08:29:36Z allan $
+# $Id: PKGBUILD 75727 2012-08-29 17:49:29Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
pkgver=2.16.0
-pkgrel=3
+pkgrel=4
pkgdesc="GNU C Library for multilib"
arch=('x86_64')
url="http://www.gnu.org/software/libc"
@@ -20,12 +20,16 @@ source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
glibc-2.15-fix-res_query-assert.patch
glibc-2.15-revert-c5a0802a.patch
glibc-2.16-rpcgen-cpp-path.patch
+ glibc-2.16-strncasecmp-segfault.patch
+ glibc-2.16-strtod-overflow.patch
lib32-glibc.conf)
md5sums=('80b181b02ab249524ec92822c0174cf7'
'2a1221a15575820751c325ef4d2fbb90'
'31f415b41197d85d3bbee3d1eecd06a3'
'0a0383d50d63f1c02919fe9943b82014'
'ea6a43915474e8276e9361eed6a01280'
+ 'f042d37cc8ca3459023431809039bc88'
+ '61d322f7681a85d3293ada5c3ccc2c7e'
'6e052f1cb693d5d3203f50f9d4e8c33b')
build() {
@@ -43,14 +47,26 @@ build() {
# http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
+ # strncasecmp segfault on i686
+ # http://sourceware.org/git/?p=glibc.git;a=commit;h=6db8f737
+ patch -p1 -i ${srcdir}/glibc-2.16-strncasecmp-segfault.patch
+
+ # strtod integer/buffer overflow
+ # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319
+ patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch
+
+ # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
+ sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h
+
cd ${srcdir}
mkdir glibc-build
cd glibc-build
-
- # Hack to fix NPTL issues with Xen, only required on 32bit platforms
- # TODO: make separate glibc-xen package for i686
- export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+ #if [[ ${CARCH} = "i686" ]]; then
+ # Hack to fix NPTL issues with Xen, only required on 32bit platforms
+ # TODO: make separate glibc-xen package for i686
+ export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+ #fi
export CC="gcc -m32"
export CXX="g++ -m32"
diff --git a/multilib-testing/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch b/multilib-testing/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch
new file mode 100644
index 000000000..ce91bbe82
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch
@@ -0,0 +1,65 @@
+diff --git a/string/test-strncasecmp.c b/string/test-strncasecmp.c
+index 6c17530..acfe668 100644
+--- a/string/test-strncasecmp.c
++++ b/string/test-strncasecmp.c
+@@ -1,5 +1,5 @@
+ /* Test and measure strncasecmp functions.
+- Copyright (C) 1999, 2002, 2003, 2005, 2010 Free Software Foundation, Inc.
++ Copyright (C) 1999-2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Written by Jakub Jelinek <jakub@redhat.com>, 1999.
+
+@@ -251,9 +251,9 @@ do_random_tests (void)
+ }
+ }
+
+-
++/* Regression test for BZ #12205 */
+ static void
+-check1 (void)
++bz12205 (void)
+ {
+ static char cp [4096+16] __attribute__ ((aligned(4096)));
+ static char gotrel[4096] __attribute__ ((aligned(4096)));
+@@ -270,6 +270,15 @@ check1 (void)
+ check_result (impl, s1, s2, n, exp_result);
+ }
+
++/* Regression test for BZ #14195 */
++static void
++bz14195 (void)
++{
++ const char *empty_string = "";
++ FOR_EACH_IMPL (impl, 0)
++ check_result (impl, empty_string, "", 5, 0);
++}
++
+ int
+ test_main (void)
+ {
+@@ -277,7 +286,8 @@ test_main (void)
+
+ test_init ();
+
+- check1 ();
++ bz12205 ();
++ bz14195 ();
+
+ printf ("%23s", "");
+ FOR_EACH_IMPL (impl, 0)
+diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
+index 5e6321e..9735ad0 100644
+--- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
++++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
+@@ -2445,7 +2445,7 @@ L(less16bytes_sncmp):
+ # endif
+ jne L(neq_sncmp)
+ test %cl, %cl
+- je L(eq)
++ je L(eq_sncmp)
+
+ cmp $1, REM
+ je L(eq_sncmp)
+--
+1.7.3.4
+
diff --git a/multilib-testing/lib32-glibc/glibc-2.16-strtod-overflow.patch b/multilib-testing/lib32-glibc/glibc-2.16-strtod-overflow.patch
new file mode 100644
index 000000000..526296325
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.16-strtod-overflow.patch
@@ -0,0 +1,389 @@
+diff --git a/stdlib/Makefile b/stdlib/Makefile
+index f7811c5..79c9acb 100644
+--- a/stdlib/Makefile
++++ b/stdlib/Makefile
+@@ -68,7 +68,8 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
+ tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
+ tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2 \
+ tst-makecontext2 tst-strtod6 tst-unsetenv1 \
+- tst-makecontext3 bug-getcontext bug-fmtmsg1
++ tst-makecontext3 bug-getcontext bug-fmtmsg1 \
++ tst-strtod-overflow
+
+ include ../Makeconfig
+
+diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
+index 2166a08..a8a7ea8 100644
+--- a/stdlib/strtod_l.c
++++ b/stdlib/strtod_l.c
+@@ -60,6 +60,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
+ #include <math.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdint.h>
+
+ /* The gmp headers need some configuration frobs. */
+ #define HAVE_ALLOCA 1
+@@ -72,7 +73,6 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
+ #include "longlong.h"
+ #include "fpioconst.h"
+
+-#define NDEBUG 1
+ #include <assert.h>
+
+
+@@ -174,19 +174,19 @@ extern const mp_limb_t _tens_in_limb[MAX_DIG_PER_LIMB + 1];
+ /* Return a floating point number of the needed type according to the given
+ multi-precision number after possible rounding. */
+ static FLOAT
+-round_and_return (mp_limb_t *retval, int exponent, int negative,
++round_and_return (mp_limb_t *retval, intmax_t exponent, int negative,
+ mp_limb_t round_limb, mp_size_t round_bit, int more_bits)
+ {
+ if (exponent < MIN_EXP - 1)
+ {
+- mp_size_t shift = MIN_EXP - 1 - exponent;
+-
+- if (shift > MANT_DIG)
++ if (exponent < MIN_EXP - 1 - MANT_DIG)
+ {
+ __set_errno (ERANGE);
+ return 0.0;
+ }
+
++ mp_size_t shift = MIN_EXP - 1 - exponent;
++
+ more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0;
+ if (shift == MANT_DIG)
+ /* This is a special case to handle the very seldom case where
+@@ -233,6 +233,9 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
+ __set_errno (ERANGE);
+ }
+
++ if (exponent > MAX_EXP)
++ goto overflow;
++
+ if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0
+ && (more_bits || (retval[0] & 1) != 0
+ || (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0))
+@@ -258,6 +261,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
+ }
+
+ if (exponent > MAX_EXP)
++ overflow:
+ return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
+
+ return MPN2FLOAT (retval, exponent, negative);
+@@ -271,7 +275,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
+ factor for the resulting number (see code) multiply by it. */
+ static const STRING_TYPE *
+ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
+- int *exponent
++ intmax_t *exponent
+ #ifndef USE_WIDE_CHAR
+ , const char *decimal, size_t decimal_len, const char *thousands
+ #endif
+@@ -301,6 +305,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
+ cy += __mpn_add_1 (n, n, *nsize, low);
+ if (cy != 0)
+ {
++ assert (*nsize < MPNSIZE);
+ n[*nsize] = cy;
+ ++(*nsize);
+ }
+@@ -335,7 +340,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
+ }
+ while (--digcnt > 0);
+
+- if (*exponent > 0 && cnt + *exponent <= MAX_DIG_PER_LIMB)
++ if (*exponent > 0 && *exponent <= MAX_DIG_PER_LIMB - cnt)
+ {
+ low *= _tens_in_limb[*exponent];
+ start = _tens_in_limb[cnt + *exponent];
+@@ -355,7 +360,10 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
+ cy = __mpn_mul_1 (n, n, *nsize, start);
+ cy += __mpn_add_1 (n, n, *nsize, low);
+ if (cy != 0)
+- n[(*nsize)++] = cy;
++ {
++ assert (*nsize < MPNSIZE);
++ n[(*nsize)++] = cy;
++ }
+ }
+
+ return str;
+@@ -413,7 +421,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ {
+ int negative; /* The sign of the number. */
+ MPN_VAR (num); /* MP representation of the number. */
+- int exponent; /* Exponent of the number. */
++ intmax_t exponent; /* Exponent of the number. */
+
+ /* Numbers starting `0X' or `0x' have to be processed with base 16. */
+ int base = 10;
+@@ -435,7 +443,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ /* Points at the character following the integer and fractional digits. */
+ const STRING_TYPE *expp;
+ /* Total number of digit and number of digits in integer part. */
+- int dig_no, int_no, lead_zero;
++ size_t dig_no, int_no, lead_zero;
+ /* Contains the last character read. */
+ CHAR_TYPE c;
+
+@@ -767,7 +775,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ are all or any is really a fractional digit will be decided
+ later. */
+ int_no = dig_no;
+- lead_zero = int_no == 0 ? -1 : 0;
++ lead_zero = int_no == 0 ? (size_t) -1 : 0;
+
+ /* Read the fractional digits. A special case are the 'american
+ style' numbers like `16.' i.e. with decimal point but without
+@@ -789,12 +797,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ (base == 16 && ({ CHAR_TYPE lo = TOLOWER (c);
+ lo >= L_('a') && lo <= L_('f'); })))
+ {
+- if (c != L_('0') && lead_zero == -1)
++ if (c != L_('0') && lead_zero == (size_t) -1)
+ lead_zero = dig_no - int_no;
+ ++dig_no;
+ c = *++cp;
+ }
+ }
++ assert (dig_no <= (uintmax_t) INTMAX_MAX);
+
+ /* Remember start of exponent (if any). */
+ expp = cp;
+@@ -817,24 +826,80 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+
+ if (c >= L_('0') && c <= L_('9'))
+ {
+- int exp_limit;
++ intmax_t exp_limit;
+
+ /* Get the exponent limit. */
+ if (base == 16)
+- exp_limit = (exp_negative ?
+- -MIN_EXP + MANT_DIG + 4 * int_no :
+- MAX_EXP - 4 * int_no + 4 * lead_zero + 3);
++ {
++ if (exp_negative)
++ {
++ assert (int_no <= (uintmax_t) (INTMAX_MAX
++ + MIN_EXP - MANT_DIG) / 4);
++ exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no;
++ }
++ else
++ {
++ if (int_no)
++ {
++ assert (lead_zero == 0
++ && int_no <= (uintmax_t) INTMAX_MAX / 4);
++ exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3;
++ }
++ else if (lead_zero == (size_t) -1)
++ {
++ /* The number is zero and this limit is
++ arbitrary. */
++ exp_limit = MAX_EXP + 3;
++ }
++ else
++ {
++ assert (lead_zero
++ <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4);
++ exp_limit = (MAX_EXP
++ + 4 * (intmax_t) lead_zero
++ + 3);
++ }
++ }
++ }
+ else
+- exp_limit = (exp_negative ?
+- -MIN_10_EXP + MANT_DIG + int_no :
+- MAX_10_EXP - int_no + lead_zero + 1);
++ {
++ if (exp_negative)
++ {
++ assert (int_no
++ <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG));
++ exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no;
++ }
++ else
++ {
++ if (int_no)
++ {
++ assert (lead_zero == 0
++ && int_no <= (uintmax_t) INTMAX_MAX);
++ exp_limit = MAX_10_EXP - (intmax_t) int_no + 1;
++ }
++ else if (lead_zero == (size_t) -1)
++ {
++ /* The number is zero and this limit is
++ arbitrary. */
++ exp_limit = MAX_10_EXP + 1;
++ }
++ else
++ {
++ assert (lead_zero
++ <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1));
++ exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1;
++ }
++ }
++ }
++
++ if (exp_limit < 0)
++ exp_limit = 0;
+
+ do
+ {
+- exponent *= 10;
+- exponent += c - L_('0');
+-
+- if (__builtin_expect (exponent > exp_limit, 0))
++ if (__builtin_expect ((exponent > exp_limit / 10
++ || (exponent == exp_limit / 10
++ && c - L_('0') > exp_limit % 10)), 0))
+ /* The exponent is too large/small to represent a valid
+ number. */
+ {
+@@ -843,7 +908,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ /* We have to take care for special situation: a joker
+ might have written "0.0e100000" which is in fact
+ zero. */
+- if (lead_zero == -1)
++ if (lead_zero == (size_t) -1)
+ result = negative ? -0.0 : 0.0;
+ else
+ {
+@@ -862,6 +927,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ /* NOTREACHED */
+ }
+
++ exponent *= 10;
++ exponent += c - L_('0');
++
+ c = *++cp;
+ }
+ while (c >= L_('0') && c <= L_('9'));
+@@ -930,7 +998,14 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ }
+ #endif
+ startp += lead_zero + decimal_len;
+- exponent -= base == 16 ? 4 * lead_zero : lead_zero;
++ assert (lead_zero <= (base == 16
++ ? (uintmax_t) INTMAX_MAX / 4
++ : (uintmax_t) INTMAX_MAX));
++ assert (lead_zero <= (base == 16
++ ? ((uintmax_t) exponent
++ - (uintmax_t) INTMAX_MIN) / 4
++ : ((uintmax_t) exponent - (uintmax_t) INTMAX_MIN)));
++ exponent -= base == 16 ? 4 * (intmax_t) lead_zero : (intmax_t) lead_zero;
+ dig_no -= lead_zero;
+ }
+
+@@ -972,7 +1047,10 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ }
+
+ /* Adjust the exponent for the bits we are shifting in. */
+- exponent += bits - 1 + (int_no - 1) * 4;
++ assert (int_no <= (uintmax_t) (exponent < 0
++ ? (INTMAX_MAX - bits + 1) / 4
++ : (INTMAX_MAX - exponent - bits + 1) / 4));
++ exponent += bits - 1 + ((intmax_t) int_no - 1) * 4;
+
+ while (--dig_no > 0 && idx >= 0)
+ {
+@@ -1024,13 +1102,15 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ really integer digits or belong to the fractional part; i.e. we normalize
+ 123e-2 to 1.23. */
+ {
+- register int incr = (exponent < 0 ? MAX (-int_no, exponent)
+- : MIN (dig_no - int_no, exponent));
++ register intmax_t incr = (exponent < 0
++ ? MAX (-(intmax_t) int_no, exponent)
++ : MIN ((intmax_t) dig_no - (intmax_t) int_no,
++ exponent));
+ int_no += incr;
+ exponent -= incr;
+ }
+
+- if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0))
++ if (__builtin_expect (exponent > MAX_10_EXP + 1 - (intmax_t) int_no, 0))
+ {
+ __set_errno (ERANGE);
+ return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
+@@ -1215,7 +1295,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ digits we should have enough bits for the result. The remaining
+ decimal digits give us the information that more bits are following.
+ This can be used while rounding. (Two added as a safety margin.) */
+- if (dig_no - int_no > (MANT_DIG - bits + 2) / 3 + 2)
++ if ((intmax_t) dig_no > (intmax_t) int_no + (MANT_DIG - bits + 2) / 3 + 2)
+ {
+ dig_no = int_no + (MANT_DIG - bits + 2) / 3 + 2;
+ more_bits = 1;
+@@ -1223,7 +1303,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+ else
+ more_bits = 0;
+
+- neg_exp = dig_no - int_no - exponent;
++ neg_exp = (intmax_t) dig_no - (intmax_t) int_no - exponent;
+
+ /* Construct the denominator. */
+ densize = 0;
+diff --git a/stdlib/tst-strtod-overflow.c b/stdlib/tst-strtod-overflow.c
+new file mode 100644
+index 0000000..668d55b
+--- /dev/null
++++ b/stdlib/tst-strtod-overflow.c
+@@ -0,0 +1,48 @@
++/* Test for integer/buffer overflow in strtod.
++ Copyright (C) 2012 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#define EXPONENT "e-2147483649"
++#define SIZE 214748364
++
++static int
++do_test (void)
++{
++ char *p = malloc (1 + SIZE + sizeof (EXPONENT));
++ if (p == NULL)
++ {
++ puts ("malloc failed, cannot test for overflow");
++ return 0;
++ }
++ p[0] = '1';
++ memset (p + 1, '0', SIZE);
++ memcpy (p + 1 + SIZE, EXPONENT, sizeof (EXPONENT));
++ double d = strtod (p, NULL);
++ if (d != 0)
++ {
++ printf ("strtod returned wrong value: %a\n", d);
++ return 1;
++ }
++ return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+--
+1.7.3.4
+
diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD
new file mode 100644
index 000000000..1e7cbe073
--- /dev/null
+++ b/testing/iw/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 165785 2012-08-29 23:06:26Z thomas $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgname=iw
+pkgver=3.6
+pkgrel=1
+pkgdesc="nl80211 based CLI configuration utility for wireless devices"
+arch=("i686" "x86_64")
+url="http://wireless.kernel.org/en/users/Documentation/iw"
+license=("GPL")
+depends=("libnl")
+makedepends=("linux-api-headers")
+source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857')
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD
new file mode 100644
index 000000000..c7a5b6ac9
--- /dev/null
+++ b/testing/libedit/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 165760 2012-08-29 13:07:56Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Roman Cheplyaka <roma@ro-che.info>
+
+pkgname=libedit
+pkgver=20120601_3.0
+pkgrel=1
+pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
+url='http://www.thrysoee.dk/editline/'
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('ncurses')
+options=('!libtool')
+source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
+sha1sums=('18ec27120f6abb222754e9f283d000fec0dcfc08')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver/_/-}"
+ ./configure --prefix=/usr --enable-widec --enable-static=no
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver/_/-}"
+ make prefix="${pkgdir}"/usr install
+
+ cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3
+ install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE
+}
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
index dd9ad59bf..1748d58cc 100644
--- a/testing/openssh/PKGBUILD
+++ b/testing/openssh/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 161935 2012-06-16 17:16:33Z dreisner $
+# $Id: PKGBUILD 165684 2012-08-29 05:14:58Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
-pkgver=6.0p1
-pkgrel=3
+pkgver=6.1p1
+pkgrel=1
pkgdesc='Free version of the SSH connectivity tools'
url='http://www.openssh.org/portable.html'
license=('custom:BSD')
arch=('i686' 'x86_64')
+makedepends=('linux-headers')
depends=('krb5' 'openssl' 'libedit' 'ldns')
optdepends=('xorg-xauth: X11 forwarding'
'x11-ssh-askpass: input passphrase in X')
@@ -19,20 +20,18 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
'sshd@.service'
'sshd.service'
'sshd.socket'
- 'tmpfiles.d'
'sshd.confd'
'sshd.pam'
'sshd')
-sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
+sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
'954bf1660aa32620c37034320877f4511b767ccb'
'6c71de2c2ca9622aa8e863acd94b135555e11125'
'bd6eae36c7ef9efb7147778baad7858b81f2d660'
- '83a257b8f6a62237383262cb0e2583e5609ddac0'
+ 'f27617eeb694f4edd474638adf16733d8a793d85'
'a30fb5fda6d0143345bae47684edaffb8d0a92a7'
- 'b5cf44205e8f4365c00bfbee110d7c0e563627aa'
'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
'659e3ee95c269014783ff8b318c6f50bf7496fbd'
- 'ed36e3a522f619ff6b13e253526596e4cca11e9f')
+ '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
@@ -60,13 +59,14 @@ build() {
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # The connect.sh test must be run by a user with a decent login shell;
- # chroot builds use nobody with /bin/false.
- make tests || true
+ make tests ||
+ grep $USER /etc/passwd | grep -q /bin/false
+ # connect.sh fails when run with stupid login shell
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
make DESTDIR="${pkgdir}" install
rm "${pkgdir}"/usr/share/man/man1/slogin.1
@@ -78,7 +78,6 @@ package() {
install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
- install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf
install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
index 4bf4780f5..d60804e84 100755
--- a/testing/openssh/sshd
+++ b/testing/openssh/sshd
@@ -15,7 +15,6 @@ case "$1" in
start)
stat_busy 'Starting Secure Shell Daemon'
/usr/bin/ssh-keygen -A
- [[ -d /var/empty ]] || mkdir -p /var/empty
[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
if [[ $? -gt 0 ]]; then
stat_fail
diff --git a/testing/openssh/sshd.service b/testing/openssh/sshd.service
index 7c8f88372..4a5910873 100644
--- a/testing/openssh/sshd.service
+++ b/testing/openssh/sshd.service
@@ -12,8 +12,5 @@ Restart=always
WantedBy=multi-user.target
Also=sshdgenkeys.service
-# Note that this is the service file for running a single SSH server for all
-# incoming connections, suitable only for systems with a large amount of SSH
-# traffic. In almost all other cases it is a better idea to use sshd.socket +
-# sshd@.service (i.e. the on-demand spawning version for one instance per
-# connection).
+# This service file runs an SSH daemon that forks for each incoming connection.
+# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service.
diff --git a/testing/openssh/sshd@.service b/testing/openssh/sshd@.service
new file mode 100644
index 000000000..2fd9b0814
--- /dev/null
+++ b/testing/openssh/sshd@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+StandardInput=socket
+StandardError=syslog
diff --git a/testing/spamassassin/PKGBUILD b/testing/spamassassin/PKGBUILD
index a6b0dbb0b..18a912f3a 100644
--- a/testing/spamassassin/PKGBUILD
+++ b/testing/spamassassin/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 165370 2012-08-16 16:16:07Z bluewind $
-# Maintainer: Dale Blount <dale@archlinux.org>
+# $Id: PKGBUILD 165766 2012-08-29 13:17:22Z bluewind $
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=spamassassin
pkgver=3.3.2
-pkgrel=4
+pkgrel=6
pkgdesc="A mail filter to identify spam."
arch=('i686' 'x86_64')
license=('APACHE')
@@ -56,5 +57,5 @@ package() {
install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd"
install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd"
- install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.serivce"
+ install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
}
diff --git a/testing/spamassassin/spamassassin.install b/testing/spamassassin/spamassassin.install
index fae0264b2..e43453e97 100644
--- a/testing/spamassassin/spamassassin.install
+++ b/testing/spamassassin/spamassassin.install
@@ -4,7 +4,7 @@ post_install() {
post_upgrade() {
# Compile rules, if rules have previously been compiled, and it's possible
- if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]
+ if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
echo "Detected compiled rules, running sa-compile..."
sa-compile > /dev/null 2>&1
fi
diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD
index b3642550e..962c304bc 100644
--- a/testing/upower/PKGBUILD
+++ b/testing/upower/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 164296 2012-07-29 23:15:56Z tomegun $
+# $Id: PKGBUILD 165781 2012-08-29 21:43:32Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=upower
-pkgver=0.9.17
-pkgrel=2
+pkgver=0.9.18
+pkgrel=1
pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
arch=('i686' 'x86_64')
url="http://upower.freedesktop.org"
license=('GPL')
-depends=('systemd-tools' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
+depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
options=('!libtool')
source=($url/releases/$pkgname-$pkgver.tar.xz)
+md5sums=('bfaaa1e7f8479fca5594406b3c36dff9')
build() {
cd "$pkgname-$pkgver"
@@ -20,10 +21,9 @@ build() {
sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/upower \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
- --disable-static
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname \
+ --disable-static
make
}
@@ -31,4 +31,3 @@ package() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-md5sums=('9ef7fc8ec438542f014f3a34552822aa')