diff options
46 files changed, 628 insertions, 338 deletions
diff --git a/community-staging/darktable/PKGBUILD b/community-staging/darktable/PKGBUILD new file mode 100644 index 000000000..404ccda05 --- /dev/null +++ b/community-staging/darktable/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 74554 2012-07-30 14:07:01Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Christian Himpel <chressie at gmail dot com> +# Contributor: Johannes Hanika <hanatos at gmail dot com> + +pkgname=darktable +pkgver=1.0.5 +_pkgver=1.0 +pkgrel=2 +pkgdesc="Utility to organize and develop raw images" +arch=('i686' 'x86_64') +url=http://darktable.sf.net/ +license=('GPL3') +depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' + 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite') +makedepends=('intltool>=0.40' 'cmake' 'librsvg') +# 'gnome-doc-utils' 'libxslt' 'fop') +optdepends=('librsvg') +install=darktable.install +options=(!libtool) +source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) +md5sums=('9ad88a1a6b9761fce28c8073d8f47941') + +build() { + cd $srcdir/$pkgname-$pkgver +# mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt + mkdir -p build + cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DDONT_INSTALL_GCONF_SCHEMAS=True \ + -DBINARY_PACKAGE_BUILD=1 \ + -DUSE_GCONF_BACKEND=Off \ + -DBUILD_USERMANUAL=False \ + .. + make +} + +package() { + cd $srcdir/$pkgname-$pkgver/build + make DESTDIR=$pkgdir install + mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" +# mkdir -p "${pkgdir}/usr/share/gconf/schemas/" +# mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" +} diff --git a/community-staging/darktable/darktable.install b/community-staging/darktable/darktable.install new file mode 100644 index 000000000..9fd6af293 --- /dev/null +++ b/community-staging/darktable/darktable.install @@ -0,0 +1,23 @@ +pkgname=darktable + +post_install() { +# usr/sbin/gconfpkg --install ${pkgname} + [ -x `which update-desktop-database` ] && update-desktop-database -q +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { +# usr/sbin/gconfpkg --uninstall ${pkgname} + true +} + +post_remove() { + [ -x `which update-desktop-database` ] && update-desktop-database -q +} diff --git a/community-staging/libextractor/PKGBUILD b/community-staging/libextractor/PKGBUILD new file mode 100644 index 000000000..a47a2eac0 --- /dev/null +++ b/community-staging/libextractor/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 74556 2012-07-30 14:07:44Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s@gmail.com> +# Contributor: damir <damir@archlinux.org> + +pkgname=libextractor +pkgver=0.6.3 +pkgrel=6 +pkgdesc="A library used to extract meta-data from files of arbitrary type" +arch=("i686" "x86_64") +license=('GPL') +url="http://gnunet.org/libextractor/" +depends=('libltdl') +makedepends=('flac' 'poppler' 'exiv2' 'qt' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2') +optdepends=('flac: flac support' + 'poppler: pdf support' + 'exiv2: metadata support' + 'qt: the Qt GUI interface/thumbnails' + 'gtk2: gtk2 GUI interface/thumbnails' + 'libgsf: (optional) for ODF support' + 'libmpeg2: mpeg support' + 'libvorbis: ogg/vorbis support') +options=('!libtool' '!makeflags') +install=libextractor.install +source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) +md5sums=('7004ff6be06e400050f0ad7016140981' + '81f95c31831dde62428a98ae32464c51') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/share/info/dir +} diff --git a/community-staging/libextractor/libextractor.install b/community-staging/libextractor/libextractor.install new file mode 100644 index 000000000..1cf51e095 --- /dev/null +++ b/community-staging/libextractor/libextractor.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(extractor.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD new file mode 100644 index 000000000..504d2be6f --- /dev/null +++ b/community-staging/luminancehdr/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 74576 2012-07-30 19:16:15Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dmitry N. Shilov <stormblast@land.ru> + +pkgname=luminancehdr +pkgver=2.3.0 +pkgrel=2 +pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' +arch=('i686' 'x86_64') +url='http://qtpfsgui.sourceforge.net/' +license=('GPL') +depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt' 'qtwebkit') +makedepends=('cmake') +optdepends=('hugin: align image stack functionality') +install=$pkgname.install +changelog=$pkgname.changelog +options=('!emptydirs') +source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2) +sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676') + +build() { + cd ${srcdir}/luminance-hdr-${pkgver} + + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/luminance-hdr-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog new file mode 100644 index 000000000..c3c1f1197 --- /dev/null +++ b/community-staging/luminancehdr/luminancehdr.changelog @@ -0,0 +1,45 @@ +2012-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.3.0-2 exiv2-0.23 rebuild + +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.3.0-1 + +2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.2.1-1 + +2012-01-27 Eric Belanger <eric@archlinux.org> + * Rebuild against libpng 1.5 and libtiff 4.0 + +2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.1.0-1 + +2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.0.2-1 + +2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * exiv2 0.20 rebuild + +2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 2.0.1 + +2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package renamed to LuminanceHDR + * Update to major release 2.0.0 + +2010-03-09 Andrea Scarpino <andrea@archlinux.org> + * exiv2 0.19 rebuild + +2009-11-02 Biru Ionut <ionut@archlinux.ro> + * add translation and fix segfault on old i686 procesors + +2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v1.9.3 + +2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Minor version (v1.9.2-3) update caused by exiv2 upgrade. + +2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Minor version (v1.9.2-2) update caused by openexr upgrade. + +2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package moved to [community] diff --git a/community-staging/luminancehdr/luminancehdr.install b/community-staging/luminancehdr/luminancehdr.install new file mode 100644 index 000000000..279762804 --- /dev/null +++ b/community-staging/luminancehdr/luminancehdr.install @@ -0,0 +1,12 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-staging/rawstudio/PKGBUILD b/community-staging/rawstudio/PKGBUILD new file mode 100644 index 000000000..9825fa732 --- /dev/null +++ b/community-staging/rawstudio/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 74558 2012-07-30 14:08:38Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Roman Kyrylych <roman@archlinux.org> +# Contributor: cdhotfire <cdhotfire@gmail.com> + +pkgname=rawstudio +pkgver=2.0 +pkgrel=7 +pkgdesc="An open source raw-image converter written in GTK+" +arch=('i686' 'x86_64') +license=('GPL') +url="http://rawstudio.org/" +depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' + 'raptor1' 'lcms' 'gtk2') +install=${pkgname}.install +options=('!libtool') +source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz + libpng15.patch) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' + '2f8b7acbe10d8096ce613cbea7986fd3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/libpng15.patch + export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install + mkdir $pkgdir/usr/lib/rawstudio + mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio + ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins +} diff --git a/community-staging/rawstudio/libpng15.patch b/community-staging/rawstudio/libpng15.patch new file mode 100644 index 000000000..6d3b85968 --- /dev/null +++ b/community-staging/rawstudio/libpng15.patch @@ -0,0 +1,40 @@ +diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp +--- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp 2011-02-24 01:35:18.000000000 +0300 ++++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp 2012-01-23 15:03:22.000000000 +0400 +@@ -102,8 +102,8 @@ + { + *linear_guess = FALSE; + RSColorSpace* profile = NULL; +- const gchar *icc_profile_title; +- const gchar *icc_profile; ++ png_charp icc_profile_title; ++ png_bytep icc_profile; + guint icc_profile_size; + png_structp png_ptr = png_create_read_struct( + PNG_LIBPNG_VER_STRING, +@@ -125,11 +125,11 @@ + + int compression_type; + /* Extract embedded ICC profile */ +- if (info_ptr->valid & PNG_INFO_iCCP) ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) + { + png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, +- (png_charpp) &icc_profile_title, &compression_type, +- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); ++ &icc_profile_title, &compression_type, ++ &icc_profile, (png_uint_32*) &icc_profile_size); + if (retval != 0) + { + RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); +diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c +--- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c 2011-03-26 04:52:29.000000000 +0300 ++++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c 2012-01-23 15:04:59.000000000 +0400 +@@ -23,6 +23,7 @@ + #include <gettext.h> + #include "config.h" + #include <png.h> ++#include <zlib.h> + + #define RS_TYPE_PNGFILE (rs_pngfile_type) + #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) diff --git a/community-staging/rawstudio/rawstudio.install b/community-staging/rawstudio/rawstudio.install new file mode 100644 index 000000000..261adb7b4 --- /dev/null +++ b/community-staging/rawstudio/rawstudio.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q || true +} + +post_upgrade() { + update-desktop-database -q || true +} + +post_remove() { + update-desktop-database -q || true +} diff --git a/community-testing/cdfs/PKGBUILD b/community-testing/cdfs/PKGBUILD index 7f4d6d8ba..519ab7394 100644 --- a/community-testing/cdfs/PKGBUILD +++ b/community-testing/cdfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74279 2012-07-23 12:36:00Z tpowa $ +# $Id: PKGBUILD 74544 2012-07-30 13:38:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> pkgname=cdfs pkgver=2.6.27 -pkgrel=25 +pkgrel=26 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/community-testing/vhba-module/PKGBUILD b/community-testing/vhba-module/PKGBUILD index cc8d2ef4d..fbe5b31a7 100644 --- a/community-testing/vhba-module/PKGBUILD +++ b/community-testing/vhba-module/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74284 2012-07-23 12:36:47Z tpowa $ +# $Id: PKGBUILD 74539 2012-07-30 09:22:20Z heftig $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -6,7 +6,7 @@ pkgname=vhba-module pkgver=20120422 _extramodules=extramodules-3.5-ARCH -pkgrel=5 +pkgrel=6 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" diff --git a/community-testing/vhba-module/vhba-module.install b/community-testing/vhba-module/vhba-module.install index 86ad03a5e..3704282a7 100644 --- a/community-testing/vhba-module/vhba-module.install +++ b/community-testing/vhba-module/vhba-module.install @@ -1,21 +1,20 @@ -post_upgrade() { - ! grep -q 'cdemu' /etc/group && groupadd cdemu +_updatemod() { echo " > Updating module dependencies..." EXTRAMODULES='extramodules-3.5-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } - post_install() { - echo " > Adding 'cdemu' group" - ! grep -q 'cdemu' /etc/group && groupadd cdemu - echo " > Add 'vhba' to your modules array to autoload it" post_upgrade } +post_upgrade() { + getent group cdemu &>/dev/null || groupadd cdemu + _updatemod +} + post_remove() { - post_upgrade - echo "Removing 'cdemu' group" + _updatemod groupdel cdemu } diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index 0e50f3466..6a2070b14 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55548 2011-09-14 08:57:52Z spupykin $ +# $Id: PKGBUILD 74550 2012-07-30 13:54:14Z mtorromeo $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Todd Musall <tmusall@comcast.net> pkgname=apcupsd pkgver=3.14.10 -pkgrel=1 +pkgrel=2 pkgdesc="power mangement and controlling most of APC's UPS models" arch=(i686 x86_64) url="http://www.apcupsd.org" @@ -17,21 +17,24 @@ makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2') backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf etc/apcupsd/multimon.conf) source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz - apcupsd) + apcupsd + apcupsd.service) md5sums=('5928822d855c5cf7ac29655e3e0b8c23' - '8bc674da24188c69b0ad5d7fe7510f73') + '8bc674da24188c69b0ad5d7fe7510f73' + '3baf366b2cfabf83a206a1cb0c8f4c26') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ --enable-cgi --enable-usb --enable-net \ --with-upstype=usb --with-upscable=usb \ --with-serial-dev=/dev/usb/hid/hiddev[0-9] \ --enable-pthreads --enable-gapcmon make - make DESTDIR=$pkgdir install - install -D -m755 ../apcupsd $pkgdir/etc/rc.d/apcupsd - chmod 755 $pkgdir/sbin/* - mkdir -p $pkgdir/usr/lib/$pkgname/cgi-bin - mv $pkgdir/etc/apcupsd/*.cgi $pkgdir/usr/lib/$pkgname/cgi-bin + make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/apcupsd" "$pkgdir/etc/rc.d/apcupsd" + install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service" + chmod 755 "$pkgdir"/sbin/* + install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin" + mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin" } diff --git a/community/apcupsd/apcupsd.service b/community/apcupsd/apcupsd.service new file mode 100644 index 000000000..9cec6e441 --- /dev/null +++ b/community/apcupsd/apcupsd.service @@ -0,0 +1,8 @@ +[Unit] +Description=APC UPS Monitor + +[Service] +ExecStart=/sbin/apcupsd -b + +[Install] +WantedBy=multi-user.target diff --git a/community/aspell-ca/PKGBUILD b/community/aspell-ca/PKGBUILD index 472388eb7..4b3d2ebe1 100644 --- a/community/aspell-ca/PKGBUILD +++ b/community/aspell-ca/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 67433 2012-03-11 19:08:53Z lcarlier $ -#Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 74578 2012-07-30 19:39:10Z jlichtblau $ +#Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +#Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> pkgname=aspell-ca -pkgver=2.1.5 -pkgrel=4 -arch=('i686' 'x86_64') +pkgver=2.3.0 +pkgrel=1 pkgdesc="Catalan dictionary for aspell" -depends=('aspell') +arch=('i686' 'x86_64') url="http://aspell.net/" license=('GPL2') -source=("ftp://ftp.gnu.org/gnu/aspell/dict/ca/aspell6-ca-$pkgver-1.tar.bz2") -md5sums=('153d26f724866909c6faf49eecefe8b3') +depends=('aspell') +source=(http://www.softcatala.org/pub/softcatala/aspell/$pkgver/aspell6-ca-$pkgver.tar.bz2) +sha256sums=('61db978261c9edabadf9d247fdbecac284ee92980b1aea478f72facaae950c52') build() { - cd aspell6-ca-${pkgver}-1 + cd aspell6-ca-${pkgver} ./configure - make } package() { - cd aspell6-ca-${pkgver}-1 + cd aspell6-ca-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index 91d738d59..4a1a22871 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68379 2012-03-23 14:35:57Z mtorromeo $ +# $Id: PKGBUILD 74552 2012-07-30 13:59:54Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit pkgver=2.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' url=http://people.redhat.com/sgrubb/$pkgname arch=(i686 x86_64) @@ -28,10 +28,12 @@ backup=( source=( $url/$pkgname-$pkgver.tar.gz auditd.rc + auditd.service python2.patch ) md5sums=('dc099fcb2f9242d47ecc35b46d71dfd1' '5f86e87354d0c3b9b408a26daed7a906' + '67f6c51891120da038cb790693d8eba1' '45a33c6bef84f8e1701cb0b5e187336b') build() { @@ -51,6 +53,8 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/auditd.service" "$pkgdir/usr/lib/systemd/system/auditd.service" + cd "$pkgdir" install -m755 "$srcdir/auditd.rc" etc/rc.d/auditd install -d var/log/audit diff --git a/community/audit/auditd.service b/community/audit/auditd.service new file mode 100644 index 000000000..199b0dcbe --- /dev/null +++ b/community/audit/auditd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Audit Daemon + +[Service] +ExecStartPre=/sbin/auditctl -R /etc/audit/audit.rules +ExecStart=/sbin/auditd -n +ExecStop=/bin/kill -15 $MAINPID +ExecReload=/bin/kill -HUP $MAINPID +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index 081942518..f5b795f13 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74496 2012-07-29 17:53:21Z lcarlier $ +# $Id: PKGBUILD 74537 2012-07-30 05:08:23Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=4 +pkgrel=5 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" @@ -432,7 +432,7 @@ package_gambas2-gb-desktop() { } package_gambas2-gb-form() { - depends=('gambas2-gb-runtime') + depends=('gambas2-runtime') pkgdesc="Gambas2 form component" ## workaround for splitting diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index 80c0e2552..31647d1de 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70590 2012-05-12 10:14:49Z jlichtblau $ +# $Id: PKGBUILD 74570 2012-07-30 18:54:46Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator -pkgver=2.91.4 +pkgver=2.91.5 pkgrel=1 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz) -sha256sums=('0e398cf7909d1fbaf9db66e20913553b38d1af7cad097f5bc8cc229d9ffbc594') +sha256sums=('7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -32,4 +32,3 @@ package() { make DESTDIR=${pkgdir} install } -sha256sums=('af4ede1495c0c52ecc1e7bd36c8ee6ce0bb35525144d687d1ce7cb4bf6630826') diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog index 712c1cb22..49dbfa714 100644 --- a/community/gtranslator/gtranslator.changelog +++ b/community/gtranslator/gtranslator.changelog @@ -1,4 +1,7 @@ -2011-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> +2012-07-30 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> + * gtranslator 2.91.5-1 + +2012-05-12 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> * gtranslator 2.91.4-1 2012-04-23 Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index 046113a27..95ab5aaf2 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69436 2012-04-16 10:50:17Z spupykin $ +# $Id: PKGBUILD 74562 2012-07-30 14:14:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: scj <scj(at)archlinux(dot)us> pkgname=incron pkgver=0.5.10 -pkgrel=1 +pkgrel=2 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64') url="http://incron.aiken.cz/" diff --git a/community/incron/incron.install b/community/incron/incron.install index de4de3742..fa42d9cdc 100644 --- a/community/incron/incron.install +++ b/community/incron/incron.install @@ -1,7 +1,7 @@ post_install () { # Check user/group incron exists - getent group incron > /dev/null || groupadd incron - getent passwd incron > /dev/null || useradd -c "Incron system" -g incron -s /bin/false -d /var/spool/incron incron + getent group incron > /dev/null || groupadd -r incron + getent passwd incron > /dev/null || useradd -r -c "Incron system" -g incron -s /bin/false -d /var/spool/incron incron # Fix permissions chown incron.incron -R /var/spool/incron } diff --git a/community/libhx/PKGBUILD b/community/libhx/PKGBUILD index 284cd0901..348046f9b 100644 --- a/community/libhx/PKGBUILD +++ b/community/libhx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 74564 2012-07-30 14:15:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Max Roder <maxroder@web.de> # Contributor: Nathan Owe <ndowens.aur at gmail dot com> pkgname='libhx' -pkgver='3.12.1' -pkgrel='1' +pkgver=3.13 +pkgrel=1 pkgdesc='A library providing queue, tree, I/O and utility functions' arch=('i686' 'x86_64') url=('http://libhx.sourceforge.net/') @@ -13,7 +13,7 @@ license=('GPL') depends=() options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/libHX-${pkgver}.tar.xz") -md5sums=('de66ebb98e73ffd4831090257a7b9533') +md5sums=('3cfb6983e2e7eea20f295c5f2c2c9b03') build() { cd ${srcdir}/libHX-${pkgver} diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index a2a0fb0e1..3eddfd0e3 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 73485 2012-07-08 09:31:35Z ibiru $ +#$Id: PKGBUILD 74573 2012-07-30 19:10:22Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.6.0 -pkgrel=2 +pkgver=0.6.2 +pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') url="http://qmmp.ylsoftware.com/" @@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe') +sha256sums=('c7638521e2ffb91beda11010a3f27958fc446b7e582e3d5e92c7dc5a751aa096') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index bfd002e57..ca63f9574 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2012-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.2-1 + 2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.6.0-2 ffmpeg 0.11 rebuild diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index abb7dbe6b..ca5c3f465 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70821 2012-05-17 08:59:42Z spupykin $ +# $Id: PKGBUILD 74566 2012-07-30 14:16:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.0.5 +pkgver=10.1.1 pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat) -md5sums=('208dd236d726d20591d53d3a20124dd4' +md5sums=('8250cdcbc4a959c8a05e4186fbd13d84' '3ce41ebf7330aba01e70b38658afed1f') build() { diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index d677cfcda..82ac3b88f 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=187 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -16,25 +16,27 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - 'locale.sh') + 'locale.sh' + 'use-split-usr-path.patch') md5sums=('26606e3c84448800ef0b3ffd57e6e8b6' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - 'f15956945052bb911e5df81cf5e7e5dc') + 'f15956945052bb911e5df81cf5e7e5dc' + '482dba45a783f06c2239f1355f4ce72f') build() { cd "$pkgname-$pkgver" # still waiting on ipw2x00 to get fixed... patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" + patch -Np1 < "$srcdir/use-split-usr-path.patch" ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ - --enable-split-usr \ --enable-introspection \ --enable-gtk-doc \ --disable-audit \ diff --git a/core/systemd/use-split-usr-path.patch b/core/systemd/use-split-usr-path.patch new file mode 100644 index 000000000..057045bf1 --- /dev/null +++ b/core/systemd/use-split-usr-path.patch @@ -0,0 +1,14 @@ +--- a/src/core/main.c 2012-07-17 19:46:24.000000000 -0400 ++++ b/src/core/main.c 2012-07-27 10:04:13.000000000 -0400 +@@ -1379,11 +1379,7 @@ + + /* Set up PATH unless it is already set */ + setenv("PATH", +-#ifdef HAVE_SPLIT_USR + "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", +-#else +- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", +-#endif + arg_running_as == MANAGER_SYSTEM); + + if (arg_running_as == MANAGER_SYSTEM) { diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index f220fa4d7..f6e7f9fc1 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 161430 2012-06-11 13:06:12Z tpowa $ +# $Id: PKGBUILD 164327 2012-07-30 12:57:18Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils -pkgver=5.5 +pkgver=5.6 pkgrel=1 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64) @@ -22,4 +22,4 @@ package() { # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/usr/bin/mount.cifs } -md5sums=('4de6c660ccdb9506d0e2cff4f37b8707') +md5sums=('89c94ff512e375b92899b79622604c39') diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 9d5563efa..a1f8b2b04 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,52 +1,37 @@ -# $Id: PKGBUILD 164175 2012-07-26 17:37:45Z andyrtr $ +# $Id: PKGBUILD 164328 2012-07-30 14:40:47Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.5.4 +pkgver=1.6.1 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' - 'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') + 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 - cups-avahi-1-config.patch - cups-avahi-2-backend.patch - cups-avahi-3-timeouts.patch - cups-avahi-4-poll.patch - cups-avahi-5-services.patch cups-no-export-ssllibs.patch cups-no-gcrypt.patch cups-no-gzip-man.patch cups-systemd-socket.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('de3006e5cf1ee78a9c6145ce62c4e982' - '12c8af5bcd3b8f84240280b3dfaf9e89' - 'cdc1322c8014297ae349e2db78a03c5a' - '1a5112f63958643f2888abc9418dbcac' - 'c37d1bf1bb76acc3fe93362c80d91b7c' - '5d302860559960042f3b47a91b97c5fe' +md5sums=('87ade07e3d1efd03c9c3add949cf9c00' '9b8467a1e51d360096b70e2c3c081e6c' '3733c23e77eb503bd94cc368e02830dc' - 'c9159ba1233902ba6ddbbe6885a46b72' - '4505b8b2c57a7c28ea79e08388bbbbb9' + '90c30380d4c8cd48a908cfdadae1ea24' + 'a81573a429b98e16670d7fea47e528c4' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') build() { cd ${srcdir}/${pkgbase}-${pkgver} - # http://www.cups.org/str.php?L3066 - # Avahi support in the dnssd backend. patches from upstream/FC RawHide - patch -Np1 -i ${srcdir}/cups-avahi-1-config.patch - patch -Np1 -i ${srcdir}/cups-avahi-2-backend.patch - patch -Np1 -i ${srcdir}/cups-avahi-3-timeouts.patch - patch -Np1 -i ${srcdir}/cups-avahi-4-poll.patch - patch -Np1 -i ${srcdir}/cups-avahi-5-services.patch # add systemd socket support - Fedora patch, also used in Gentoo + # modified now to the changes done by Gentoo in their svn ebuild + # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1 patch -Np1 -i ${srcdir}/cups-systemd-socket.patch # Do not export SSL libs in cups-config @@ -56,7 +41,7 @@ build() { # don't zip man pages in make install, let makepkg do that / Fedora patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch - # Rebuild configure script for --enable-avahi. + # Rebuild configure script for not zipping man-pages. aclocal -I config-scripts autoconf -I config-scripts @@ -68,14 +53,12 @@ build() { --with-cups-user=daemon \ --with-cups-group=lp \ --enable-pam=yes \ - --disable-ldap \ --enable-raw-printing \ --enable-dbus --with-dbusdir=/etc/dbus-1 \ --enable-ssl=yes --enable-gnutls \ --enable-threads \ --enable-avahi\ --with-php=/usr/bin/php-cgi \ - --with-pdftops=pdftops \ --with-optim="$CFLAGS" make } @@ -122,9 +105,8 @@ backup=(etc/cups/cupsd.conf etc/logrotate.d/cups etc/pam.d/cups etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme') -optdepends=('php: for included phpcups.so module' - 'xdg-utils: xdg .desktop file support') +depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme') +optdepends=('xdg-utils: xdg .desktop file support') cd ${srcdir}/${pkgbase}-${pkgver} make BUILDROOT=${pkgdir} install-data install-exec @@ -142,7 +124,7 @@ optdepends=('php: for included phpcups.so module' # fix perms on /var/spool and /etc chmod 755 ${pkgdir}/var/spool chmod 755 ${pkgdir}/etc - + # install ssl directory where to store the certs, solves some samba issues install -dm700 -g lp ${pkgdir}/etc/cups/ssl # remove directory from package, we create it in cups rc.d file @@ -163,12 +145,9 @@ optdepends=('php: for included phpcups.so module' # remove client.conf man page rm -f ${pkgdir}/usr/share/man/man5/client.conf.5 - # remove files now part of cups-filters - check cups-filters INSTALL for packagers instructions - rm -v ${pkgdir}/usr/lib/cups/backend/{parallel,serial} - rm -v ${pkgdir}/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops} + # remove files now part of cups-filters rm -v ${pkgdir}/usr/share/cups/banners/* - rm -v ${pkgdir}/usr/share/cups/data/{testprint,psglyphs} - rm -v ${pkgdir}/usr/share/cups/fonts/* + rm -v ${pkgdir}/usr/share/cups/data/testprint # comment out all conversion rules which use any of the removed filters - perl -p -i -e 's:^(.*\s+(pdftops|texttops|imagetops|bannertops|imagetoraster)\s*)$:#\1:' ${pkgdir}/usr/share/cups/mime/mime.convs + perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs } diff --git a/extra/cups/cups-no-gzip-man.patch b/extra/cups/cups-no-gzip-man.patch index 6786c4430..69899b9cb 100644 --- a/extra/cups/cups-no-gzip-man.patch +++ b/extra/cups/cups-no-gzip-man.patch @@ -4,7 +4,7 @@ diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/confi @@ -69,10 +69,10 @@ case "$uname" in ;; Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and Mac OS X + # Linux, GNU Hurd, and OS X - MAN1EXT=1.gz - MAN5EXT=5.gz - MAN7EXT=7.gz diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch index 09d17d415..f699b9eda 100644 --- a/extra/cups/cups-systemd-socket.patch +++ b/extra/cups/cups-systemd-socket.patch @@ -1,6 +1,6 @@ -diff -up cups-1.5.2/config.h.in.systemd-socket cups-1.5.2/config.h.in ---- cups-1.5.2/config.h.in.systemd-socket 2012-03-16 14:50:57.089449755 +0000 -+++ cups-1.5.2/config.h.in 2012-03-16 14:50:57.146449787 +0000 +diff -up cups-1.5.0/config.h.in.systemd-socket cups-1.5.0/config.h.in +--- cups-1.5.0/config.h.in.systemd-socket 2011-10-18 15:32:40.741672460 +0100 ++++ cups-1.5.0/config.h.in 2011-10-18 15:32:40.843670530 +0100 @@ -503,6 +503,13 @@ @@ -15,9 +15,9 @@ diff -up cups-1.5.2/config.h.in.systemd-socket cups-1.5.2/config.h.in * Various scripting languages... */ -diff -up cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.2/config-scripts/cups-systemd.m4 ---- cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket 2012-03-16 14:50:57.146449787 +0000 -+++ cups-1.5.2/config-scripts/cups-systemd.m4 2012-03-16 14:50:57.146449787 +0000 +diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/config-scripts/cups-systemd.m4 +--- cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket 2011-10-18 15:32:40.844670511 +0100 ++++ cups-1.5.0/config-scripts/cups-systemd.m4 2011-10-18 15:33:16.861989058 +0100 @@ -0,0 +1,36 @@ +dnl +dnl "$Id$" @@ -55,9 +55,9 @@ diff -up cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.2/con +dnl +dnl "$Id$" +dnl -diff -up cups-1.5.2/configure.in.systemd-socket cups-1.5.2/configure.in ---- cups-1.5.2/configure.in.systemd-socket 2011-08-31 02:36:33.000000000 +0100 -+++ cups-1.5.2/configure.in 2012-03-16 14:50:57.146449787 +0000 +diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in +--- cups-1.5.0/configure.in.systemd-socket 2010-11-20 01:03:46.000000000 +0000 ++++ cups-1.5.0/configure.in 2011-10-18 15:32:40.844670511 +0100 @@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4) sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-dnssd.m4) @@ -76,10 +76,10 @@ diff -up cups-1.5.2/configure.in.systemd-socket cups-1.5.2/configure.in desktop/cups.desktop doc/help/ref-cupsd-conf.html doc/help/standard.html -diff -up cups-1.5.2/cups/usersys.c.systemd-socket cups-1.5.2/cups/usersys.c ---- cups-1.5.2/cups/usersys.c.systemd-socket 2012-03-16 14:50:57.054449734 +0000 -+++ cups-1.5.2/cups/usersys.c 2012-03-16 14:50:57.148449788 +0000 -@@ -778,7 +778,7 @@ cups_read_client_conf( +diff -up cups-1.5.0/cups/usersys.c.systemd-socket cups-1.5.0/cups/usersys.c +--- cups-1.5.0/cups/usersys.c.systemd-socket 2011-10-18 15:32:40.645674277 +0100 ++++ cups-1.5.0/cups/usersys.c 2011-10-18 15:32:40.845670492 +0100 +@@ -770,7 +770,7 @@ cups_read_client_conf( struct stat sockinfo; /* Domain socket information */ if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && @@ -88,9 +88,9 @@ diff -up cups-1.5.2/cups/usersys.c.systemd-socket cups-1.5.2/cups/usersys.c cups_server = CUPS_DEFAULT_DOMAINSOCKET; else #endif /* CUPS_DEFAULT_DOMAINSOCKET */ -diff -up cups-1.5.2/data/cups.path.in.systemd-socket cups-1.5.2/data/cups.path.in ---- cups-1.5.2/data/cups.path.in.systemd-socket 2012-03-16 14:50:57.148449788 +0000 -+++ cups-1.5.2/data/cups.path.in 2012-03-16 14:50:57.148449788 +0000 +diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.in +--- cups-1.5.0/data/cups.path.in.systemd-socket 2011-10-18 15:32:40.846670473 +0100 ++++ cups-1.5.0/data/cups.path.in 2011-10-18 15:32:40.846670473 +0100 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printer Service Spool @@ -100,10 +100,10 @@ diff -up cups-1.5.2/data/cups.path.in.systemd-socket cups-1.5.2/data/cups.path.i + +[Install] +WantedBy=multi-user.target -diff -up cups-1.5.2/data/cups.service.in.systemd-socket cups-1.5.2/data/cups.service.in ---- cups-1.5.2/data/cups.service.in.systemd-socket 2012-03-16 14:50:57.149449788 +0000 -+++ cups-1.5.2/data/cups.service.in 2012-03-16 14:50:57.149449788 +0000 -@@ -0,0 +1,10 @@ +diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in +--- cups-1.5.0/data/cups.service.in.systemd-socket 2011-10-18 15:32:40.846670473 +0100 ++++ cups-1.5.0/data/cups.service.in 2011-10-18 15:32:40.846670473 +0100 +@@ -0,0 +1,9 @@ +[Unit] +Description=CUPS Printing Service + @@ -114,10 +114,10 @@ diff -up cups-1.5.2/data/cups.service.in.systemd-socket cups-1.5.2/data/cups.ser +[Install] +Also=cups.socket cups.path +WantedBy=printer.target -diff -up cups-1.5.2/data/cups.socket.in.systemd-socket cups-1.5.2/data/cups.socket.in ---- cups-1.5.2/data/cups.socket.in.systemd-socket 2012-03-16 14:50:57.150449788 +0000 -+++ cups-1.5.2/data/cups.socket.in 2012-03-16 14:50:57.150449788 +0000 -@@ -0,0 +1,11 @@ +diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in +--- cups-1.5.0/data/cups.socket.in.systemd-socket 2011-10-18 15:32:40.847670454 +0100 ++++ cups-1.5.0/data/cups.socket.in 2011-10-18 15:32:40.847670454 +0100 +@@ -0,0 +1,10 @@ +[Unit] +Description=CUPS Printing Service Sockets + @@ -129,9 +129,9 @@ diff -up cups-1.5.2/data/cups.socket.in.systemd-socket cups-1.5.2/data/cups.sock + +[Install] +WantedBy=sockets.target -diff -up cups-1.5.2/data/Makefile.systemd-socket cups-1.5.2/data/Makefile ---- cups-1.5.2/data/Makefile.systemd-socket 2011-05-12 06:21:56.000000000 +0100 -+++ cups-1.5.2/data/Makefile 2012-03-16 14:50:57.151449789 +0000 +diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile +--- cups-1.5.0/data/Makefile.systemd-socket 2011-05-12 06:21:56.000000000 +0100 ++++ cups-1.5.0/data/Makefile 2011-10-18 15:32:40.847670454 +0100 @@ -112,6 +112,12 @@ install-data: $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ done @@ -155,9 +155,9 @@ diff -up cups-1.5.2/data/Makefile.systemd-socket cups-1.5.2/data/Makefile # -diff -up cups-1.5.2/Makedefs.in.systemd-socket cups-1.5.2/Makedefs.in ---- cups-1.5.2/Makedefs.in.systemd-socket 2012-03-16 14:50:57.081449751 +0000 -+++ cups-1.5.2/Makedefs.in 2012-03-16 14:50:57.152449790 +0000 +diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in +--- cups-1.5.0/Makedefs.in.systemd-socket 2011-10-18 15:32:40.719672876 +0100 ++++ cups-1.5.0/Makedefs.in 2011-10-18 15:32:40.848670435 +0100 @@ -143,6 +143,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ CXXLIBS = @CXXLIBS@ DBUS_NOTIFIER = @DBUS_NOTIFIER@ @@ -182,9 +182,9 @@ diff -up cups-1.5.2/Makedefs.in.systemd-socket cups-1.5.2/Makedefs.in # -diff -up cups-1.5.2/scheduler/client.h.systemd-socket cups-1.5.2/scheduler/client.h ---- cups-1.5.2/scheduler/client.h.systemd-socket 2011-03-25 21:25:38.000000000 +0000 -+++ cups-1.5.2/scheduler/client.h 2012-03-16 14:50:57.153449791 +0000 +diff -up cups-1.5.0/scheduler/client.h.systemd-socket cups-1.5.0/scheduler/client.h +--- cups-1.5.0/scheduler/client.h.systemd-socket 2011-03-25 21:25:38.000000000 +0000 ++++ cups-1.5.0/scheduler/client.h 2011-10-18 15:32:40.848670435 +0100 @@ -75,6 +75,9 @@ typedef struct int fd; /* File descriptor for this server */ http_addr_t address; /* Bind address of socket */ @@ -195,99 +195,9 @@ diff -up cups-1.5.2/scheduler/client.h.systemd-socket cups-1.5.2/scheduler/clien } cupsd_listener_t; -diff -up cups-1.5.2/scheduler/dirsvc.c.systemd-socket cups-1.5.2/scheduler/dirsvc.c ---- cups-1.5.2/scheduler/dirsvc.c.systemd-socket 2012-03-16 14:50:57.112449768 +0000 -+++ cups-1.5.2/scheduler/dirsvc.c 2012-03-16 14:50:57.155449792 +0000 -@@ -1512,7 +1512,7 @@ cupsdStartBrowsing(void) - } - } - -- if (BrowseSocket >= 0) -+ if (BrowseSocket >= 0 && !BrowseSocketIsSystemd) - { - /* - * Bind the socket to browse port... -@@ -1556,13 +1556,17 @@ cupsdStartBrowsing(void) - cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.", - strerror(errno)); - -+ if (!BrowseSocketIsSystemd) -+ { - #ifdef WIN32 -- closesocket(BrowseSocket); -+ closesocket(BrowseSocket); - #else -- close(BrowseSocket); -+ close(BrowseSocket); - #endif /* WIN32 */ - -- BrowseSocket = -1; -+ BrowseSocket = -1; -+ } -+ - BrowseLocalProtocols &= ~BROWSE_CUPS; - BrowseRemoteProtocols &= ~BROWSE_CUPS; - -@@ -1885,15 +1889,22 @@ cupsdStopBrowsing(void) - if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS) && - BrowseSocket >= 0) - { -- /* -- * Close the socket and remove it from the input selection set. -- */ -+ if (!BrowseSocketIsSystemd) -+ { -+ /* -+ * Close the socket. -+ */ - - #ifdef WIN32 -- closesocket(BrowseSocket); -+ closesocket(BrowseSocket); - #else -- close(BrowseSocket); -+ close(BrowseSocket); - #endif /* WIN32 */ -+ } -+ -+ /* -+ * Remove it from the input selection set. -+ */ - - cupsdRemoveSelect(BrowseSocket); - BrowseSocket = -1; -@@ -5693,11 +5704,14 @@ update_cups_browse(void) - strerror(errno)); - cupsdLogMessage(CUPSD_LOG_ERROR, "CUPS browsing turned off."); - -+ if (!BrowseSocketIsSystemd) -+ { - #ifdef WIN32 -- closesocket(BrowseSocket); -+ closesocket(BrowseSocket); - #else -- close(BrowseSocket); -+ close(BrowseSocket); - #endif /* WIN32 */ -+ } - - cupsdRemoveSelect(BrowseSocket); - BrowseSocket = -1; -diff -up cups-1.5.2/scheduler/dirsvc.h.systemd-socket cups-1.5.2/scheduler/dirsvc.h ---- cups-1.5.2/scheduler/dirsvc.h.systemd-socket 2012-03-16 14:50:57.113449769 +0000 -+++ cups-1.5.2/scheduler/dirsvc.h 2012-03-16 14:50:57.157449792 +0000 -@@ -100,6 +100,8 @@ VAR int Browsing VALUE(TRUE), - /* Short names for remote printers? */ - BrowseSocket VALUE(-1), - /* Socket for browsing */ -+ BrowseSocketIsSystemd VALUE(0), -+ /* BrowseSocket is systemd-provided? */ - BrowsePort VALUE(IPP_PORT), - /* Port number for broadcasts */ - BrowseInterval VALUE(DEFAULT_INTERVAL), -diff -up cups-1.5.2/scheduler/listen.c.systemd-socket cups-1.5.2/scheduler/listen.c ---- cups-1.5.2/scheduler/listen.c.systemd-socket 2011-04-16 00:38:13.000000000 +0100 -+++ cups-1.5.2/scheduler/listen.c 2012-03-16 14:50:57.158449792 +0000 +diff -up cups-1.5.0/scheduler/listen.c.systemd-socket cups-1.5.0/scheduler/listen.c +--- cups-1.5.0/scheduler/listen.c.systemd-socket 2011-04-16 00:38:13.000000000 +0100 ++++ cups-1.5.0/scheduler/listen.c 2011-10-18 15:32:40.849670416 +0100 @@ -401,7 +401,11 @@ cupsdStopListening(void) lis; lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) @@ -301,9 +211,9 @@ diff -up cups-1.5.2/scheduler/listen.c.systemd-socket cups-1.5.2/scheduler/liste { #ifdef WIN32 closesocket(lis->fd); -diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c ---- cups-1.5.2/scheduler/main.c.systemd-socket 2012-03-16 14:50:57.121449773 +0000 -+++ cups-1.5.2/scheduler/main.c 2012-03-16 14:51:55.409483636 +0000 +diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c +--- cups-1.5.0/scheduler/main.c.systemd-socket 2011-10-18 15:32:40.802671306 +0100 ++++ cups-1.5.0/scheduler/main.c 2011-10-18 15:32:40.851670379 +0100 @@ -26,6 +26,8 @@ * launchd_checkin() - Check-in with launchd and collect the listening * fds. @@ -364,7 +274,7 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c /* * Startup the server... */ -@@ -1584,6 +1609,139 @@ launchd_checkout(void) +@@ -1584,6 +1609,100 @@ launchd_checkout(void) } #endif /* HAVE_LAUNCHD */ @@ -396,53 +306,14 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c + char s[256]; + + r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1); -+ if (r < 0) -+ { ++ if (r < 0) { + cupsdLogMessage(CUPSD_LOG_ERROR, + "systemd_checkin: Unable to verify socket type - %s", + strerror(-r)); + continue; + } + -+ if (!r) -+ { -+ if (Browsing && -+ ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS)) -+ { -+ r = sd_is_socket(fd, AF_UNSPEC, SOCK_DGRAM, 0); -+ if (r < 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "systemd_checkin: Unable to verify socket type - %s", -+ strerror(-r)); -+ continue; -+ } -+ -+ if (r) -+ { -+ /* -+ * This is the browse socket. -+ */ -+ -+ char addrstr[256]; -+ if (getsockname(fd, (struct sockaddr*) &addr, &addrlen)) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "systemd_checkin: Unable to get local address - %s", -+ strerror(errno)); -+ continue; -+ } -+ -+ httpAddrString (&addr, addrstr, sizeof (addrstr)); -+ BrowseSocket = fd; -+ BrowseSocketIsSystemd = 1; -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "systemd_checkin: Matched browse (port %d) with fd %d:%s...", -+ BrowsePort, fd, addrstr); -+ continue; -+ } -+ -+ } ++ if (!r) { + cupsdLogMessage(CUPSD_LOG_ERROR, + "systemd_checkin: Socket not of the right type"); + continue; @@ -456,7 +327,7 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c + continue; + } + -+ /* ++ /* + * Try to match the systemd socket address to one of the listeners... + */ + @@ -464,7 +335,7 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c + lis; + lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) + if (httpAddrEqual(&lis->address, &addr)) -+ break; ++ break; + + if (lis) + { @@ -504,9 +375,9 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c /* * 'parent_handler()' - Catch USR1/CHLD signals... -diff -up cups-1.5.2/scheduler/Makefile.systemd-socket cups-1.5.2/scheduler/Makefile ---- cups-1.5.2/scheduler/Makefile.systemd-socket 2012-03-16 14:50:57.130449778 +0000 -+++ cups-1.5.2/scheduler/Makefile 2012-03-16 14:50:57.160449794 +0000 +diff -up cups-1.5.0/scheduler/Makefile.systemd-socket cups-1.5.0/scheduler/Makefile +--- cups-1.5.0/scheduler/Makefile.systemd-socket 2011-10-18 15:32:40.817671022 +0100 ++++ cups-1.5.0/scheduler/Makefile 2011-10-18 15:32:40.852670360 +0100 @@ -382,7 +382,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ diff --git a/extra/cups/cups.install b/extra/cups/cups.install index 47c3d9b82..cea52282e 100644 --- a/extra/cups/cups.install +++ b/extra/cups/cups.install @@ -17,6 +17,13 @@ post_upgrade() { echo "daemon script has been renamed to /etc/rc.d/cupsd" echo "change your entry in /etc/rc.conf" fi + if [ "`vercmp $2 1.6.0`" -lt 0 ]; then + # important upgrade notice + echo "* avahi-daemon should now run before you start cupsd for" + echo " printer Browsing support" + echo "* check your config with cupsd -t" + echo " and fix all Browsing related settings" + fi } post_remove() { diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index 4233cd589..d60da1621 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 146655 2012-01-15 12:58:26Z daniel $ +# $Id: PKGBUILD 164333 2012-07-30 21:34:04Z eric $ # Maintainer: Daniel Isenmann <daniel @archlinux.org> pkgbase=dhcp pkgname=('dhcp' 'dhclient') # separate patch levels with a period to maintain proper versioning. -pkgver=4.2.3.2 -_pkgver=4.2.3-P2 +pkgver=4.2.4.1 +_pkgver=4.2.4-P1 -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" -source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz +makedepends=('bash' 'iproute2' 'net-tools') +source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc} dhcp4 dhcp6 dhcp dhcp-4.1.1-missing-ipv6-not-fatal.patch dhclient-script-pathFixes.patch) -md5sums=('14f57fd580d01633d0fad4809007a801' +md5sums=('0ca7181024651f6323951d5498c8020b' + '0dfe000dd88555ea06b282ae5e574d5f' 'c49b1497837ba56c54e401a66e1bab9b' '12c2f3ae47ed23eb698eb7f1bfd80f20' '8f357e46e1efcbb746f38737a3f977a2' @@ -24,13 +26,13 @@ md5sums=('14f57fd580d01633d0fad4809007a801' '541b415a25a169eaf64b681405f79a80') build() { - cd ${srcdir}/${pkgbase}-${_pkgver} + cd "${srcdir}/${pkgbase}-${_pkgver}" # Define _GNU_SOURCE to fix IPV6. sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure # Make not having ipv6 non-fatal. - patch -Np0 -i ${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch + patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ @@ -40,7 +42,7 @@ build() { make - patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux || return 1 + patch -i "${srcdir}/dhclient-script-pathFixes.patch" client/scripts/linux } package_dhcp(){ @@ -49,36 +51,36 @@ package_dhcp(){ backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp') install=dhcp.install - cd ${srcdir}/${pkgbase}-${_pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgbase}-${_pkgver}" + make DESTDIR="${pkgdir}" install - install -D -m755 ${srcdir}/dhcp4 ${pkgdir}/etc/rc.d/dhcp4 - install -D -m755 ${srcdir}/dhcp6 ${pkgdir}/etc/rc.d/dhcp6 - install -D -m644 ${srcdir}/dhcp ${pkgdir}/etc/conf.d/${pkgbase} - mkdir -p ${pkgdir}/var/state/dhcp + install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4" + install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6" + install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}" + install -d "${pkgdir}/var/state/dhcp" # Remove dhclient - make -C client DESTDIR=${pkgdir} uninstall + make -C client DESTDIR="${pkgdir}" uninstall # install license - install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhcp/LICENSE + install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE" } package_dhclient(){ - pkgdesc="dhclient is standalone client from the dhcp package" + pkgdesc="A standalone DHCP client from the dhcp package" depends=('bash' 'iproute2' 'net-tools') - cd ${srcdir}/${pkgbase}-${_pkgver} - make -C client DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgbase}-${_pkgver}" + make -C client DESTDIR="${pkgdir}" install # move dhclient.conf to dhclient.conf.example - mv ${pkgdir}/etc/dhclient.conf{,.example} + mv "${pkgdir}"/etc/dhclient.conf{,.example} - mkdir -p ${pkgdir}/var/state/dhclient + install -d "${pkgdir}/var/state/dhclient" # install dhclient linux script - install -m755 -D client/scripts/linux ${pkgdir}/sbin/dhclient-script + install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script" # install license - install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhclient/LICENSE + install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE" } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 8ac267e07..8da1f01b1 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163990 2012-07-23 13:53:11Z dan $ +# $Id: PKGBUILD 164342 2012-07-31 00:52:22Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.11.3 +pkgver=1.7.11.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -100,7 +100,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('23caacd9f3f421b6c05b40796df3505d' - 'f07bfe5a0f7e4165cab0091e710062dc' +md5sums=('21c7100cddee8579233a924111e829ab' + '397af842126a5099968238ab946580a5' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 1d3459618..a43032011 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148542 2012-02-03 16:00:11Z dan $ +# $Id: PKGBUILD 164340 2012-07-31 00:50:49Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.13 +pkgver=1.4.14 pkgrel=1 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64) @@ -16,7 +16,7 @@ source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz memcached.conf memcached.sh) changelog=ChangeLog -sha256sums=('cb0b8b87aa57890d2327906a11f2f1b61b8d870c0885b54c61ca46f954f27e29' +sha256sums=('f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef' '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a' '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb') diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index 5a1b3a8b4..01465195c 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159998 2012-05-27 13:45:16Z bisson $ +# $Id: PKGBUILD 164344 2012-07-31 02:24:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' @@ -17,7 +17,7 @@ optdepends=('qt: immodule and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('99267908095e6e36ce78cf0316a17a7d5f2fcc68') +sha1sums=('705c785a626ac0b498547aef5b8ff9b57f08259e') install=install diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 35529f458..706b2d0d7 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 161863 2012-06-15 23:14:52Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.6 +pkgver=1.8.7 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz remove-non-free-suggestions.patch) -sha1sums=('c469d87da4b0512270376aa360c7a955d02153c3' +sha1sums=('3cdadae3b3bcec2da048257b72a5d7c11a9621f1' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index b3cabb285..b571d605b 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-modules-lts' 'virtualbox-libre-parabola-modules-lts') pkgver=4.1.18 -pkgrel=3 +pkgrel=3.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -107,7 +107,7 @@ package_virtualbox-libre-parabola-modules-lts(){ depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-archlinux-modules-lts') conflicts=('virtualbox-archlinux-modules-lts') - provides=("virtualbox-archlinux-modules=$pkgver" "virtualbox-archlinux-modules-lts=$pkgver" "virtualbox-libre-parabola-modules=$pkgver" ) + provides=("virtualbox-archlinux-modules-lts=$pkgver" "virtualbox-archlinux-modules=$pkgver") source "$srcdir/VirtualBox-${pkgver}/env.sh" @@ -131,7 +131,7 @@ package_virtualbox-libre-modules-lts(){ depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-modules-lts') conflicts=('virtualbox-modules-lts') - provides=("virtualbox-modules=$pkgver" "virtualbox-modules-lts=$pkgver") + provides=("virtualbox-modules-lts=$pkgver" "virtualbox-modules=$pkgver") source "$srcdir/VirtualBox-${pkgver}/env.sh" diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 84761ac24..c3aa1a69c 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -11,7 +11,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-source' 'virtualbox-libre-parabola-source') pkgver=4.1.18 -pkgrel=4.1 +pkgrel=4.2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -158,9 +158,9 @@ package_virtualbox-libre() { package_virtualbox-libre-source() { pkgdesc="VirtualBox kernel modules source" depends=(dkms gcc make) - replaces=('virtualbox-source' 'virtualbox-libre-modules') + replaces=('virtualbox-source') conflicts=('virtualbox-source') - provides=("virtualbox-source=$pkgver" "virtualbox-libre-modules=$pkgver") + provides=("virtualbox-source=$pkgver" "virtualbox-modules=$pkgver") optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-source.install @@ -195,8 +195,8 @@ package_virtualbox-libre-sdk() { package_virtualbox-libre-parabola-additions(){ pkgdesc="Additions only for Parabola guests (userspace tools)" depends=('virtualbox-libre-parabola-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions') - conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions') + replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') + conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') provides=("virtualbox-archlinux-additions=${pkgver}") backup=('etc/conf.d/vboxservice') install=virtualbox-libre-parabola-additions.install @@ -234,9 +234,9 @@ package_virtualbox-libre-parabola-additions(){ package_virtualbox-libre-parabola-source() { pkgdesc='VirtualBox Additions kernel modules source' depends=(dkms gcc make) - replaces=('virtualbox-archlinux-source' 'virtualbox-libre-parabola-modules') + replaces=('virtualbox-archlinux-source') conflicts=('virtualbox-archlinux-source') - provides=("virtualbox-archlinux-source=${pkgver}" "virtualbox-archlinux-modules=${pkgver}" "virtualbox-libre-parabola-modules=${pkgver}") + provides=("virtualbox-archlinux-source=${pkgver}" "virtualbox-archlinux-modules=${pkgver}") optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-parabola-source.install @@ -249,7 +249,7 @@ package_virtualbox-libre-parabola-source() { md5sums=('38db0a87cba659b484af868b0c2bd3ac' '5f85710e0b8606de967716ded7b2d351' - '755ab0dd9bcacf2c00d2275b1ca69547' + '2d599c6cf8bbbf183a7c07a9bcb926c7' 'a1ff1d1b4423556887e48a32978226a6' '4ff559f2bea335d59c4012048983ca91' '97e193f050574dd272a38e5ee5ebe62b' diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch index 682175798..c2c673386 100644 --- a/libre/virtualbox-libre/vboxdrv-reference.patch +++ b/libre/virtualbox-libre/vboxdrv-reference.patch @@ -9,9 +9,9 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V - "as root. If it is available in your distribution, you should install the " - "DKMS package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." -+ " <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>" -+ "as root. If you don't use our stock kernel, install virtualbox-source and" -+ "execute /usr/bin/vboxbuild ." ++ " <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>" ++ "as root. If you don't use our stock kernel, install virtualbox-libre-source and " ++ "execute dkms install vboxhost/4.1.18 ." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -25,7 +25,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." + "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " -+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" ++ " <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>" ); QString g_QStrHintOtherNoDriver = QApplication::tr( @@ -37,11 +37,11 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by -+ load. Please reinstall the kernel module virtualbox-modules or ++ load. Please reinstall the kernel module virtualbox-libre-modules or + if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup -+ sudo /usr/bin/vboxbuild ++ sudo dkms install vboxhost/4.1.18 You will not be able to start VMs until this problem is fixed. EOF diff --git a/staging/calligra/PKGBUILD b/staging/calligra/PKGBUILD index eeb19e7e9..7896dd997 100644 --- a/staging/calligra/PKGBUILD +++ b/staging/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164251 2012-07-28 10:50:36Z andrea $ +# $Id: PKGBUILD 164315 2012-07-30 08:10:34Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -23,7 +23,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.4.3 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/staging/strigi/PKGBUILD b/staging/strigi/PKGBUILD new file mode 100644 index 000000000..4ae50fa57 --- /dev/null +++ b/staging/strigi/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 164313 2012-07-30 07:25:13Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=strigi +pkgver=0.7.7 +pkgrel=2 +pkgdesc="Fast crawling desktop search engine with Qt4 GUI" +arch=('i686' 'x86_64') +url='http://strigi.sourceforge.net/' +license=('GPL2') +depends=('exiv2' 'libxml2' 'boost-libs') +makedepends=('qt' 'cmake' 'pkg-config' 'boost') +optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' + 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') +#source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc47.patch') +md5sums=('ca0a0fd5c2b99879f6330837aeede996' + '1acb9b31a4859dc427fc4d387fd8aa2f') + +build() { + pushd ${pkgname}-${pkgver}/strigidaemon + patch -p1 -i "${srcdir}"/gcc47.patch + popd + + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_INOTIFY=ON \ + -DENABLE_LOG4CXX=OFF \ + -DENABLE_FAM=OFF \ + -DENABLE_CLUCENE=OFF \ + -DENABLE_CLUCENE_NG=OFF \ + -DENABLE_FFMPEG=OFF + make +} + +package() { + pushd build/libstreams + make DESTDIR="${pkgdir}" install + popd + + pushd build/libstreamanalyzer + make DESTDIR="${pkgdir}" install + popd + + pushd build/strigiclient/lib/searchclient/qtdbus + make DESTDIR="${pkgdir}" install + popd + + pushd build/strigiutils + make DESTDIR="${pkgdir}" install + popd +} diff --git a/staging/strigi/gcc47.patch b/staging/strigi/gcc47.patch new file mode 100644 index 000000000..d99582563 --- /dev/null +++ b/staging/strigi/gcc47.patch @@ -0,0 +1,22 @@ +From: Rex Dieter <rdieter@fedoraproject.org> +Date: Mon, 09 Jan 2012 17:13:25 +0000 +Subject: gcc47 fix, unistd.h header required unconditionally for 'sleep' +X-Git-Url: http://quickgit.kde.org/?p=strigidaemon.git&a=commitdiff&h=a8e97f672325557b3fbc84b987299350ec5ac10b +--- +gcc47 fix, unistd.h header required unconditionally for 'sleep' +--- + + +--- a/bin/daemon/eventlistener/eventlistenerqueue.cpp ++++ b/bin/daemon/eventlistener/eventlistenerqueue.cpp +@@ -27,9 +27,7 @@ + #include <iostream> + #include <stdio.h> + +-#if defined(__SUNPRO_CC) + #include <unistd.h> +-#endif + + using namespace std; + + diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD index cf442650b..e2f861d0b 100644 --- a/testing/bison/PKGBUILD +++ b/testing/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163784 2012-07-20 03:30:35Z allan $ +# $Id: PKGBUILD 164337 2012-07-31 00:34:31Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('f96a16e79daaef71c797ed88f52e59d1' - 'd67a1a075ab0cccfb53ab23692be1a02') +md5sums=('1fc1b9bc689e7fc5622d32c93cce746f' + '44d571e9b271fbcf283c1795c28f70aa') build() { cd ${srcdir}/${pkgname}-${pkgver} |