diff options
29 files changed, 647 insertions, 276 deletions
diff --git a/community-staging/wt/PKGBUILD b/community-staging/wt/PKGBUILD index 4b4d862d4..c47450bf7 100644 --- a/community-staging/wt/PKGBUILD +++ b/community-staging/wt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74232 2012-07-23 03:11:12Z spupykin $ +# $Id: PKGBUILD 74391 2012-07-26 10:14:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt -pkgver=3.2.2rc2 -_pkgver=3.2.2-rc2 +pkgver=3.2.2 +_pkgver=3.2.2 pkgrel=2 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') @@ -26,7 +26,7 @@ optdepends=('openssl: for SSL support in built-in webserver' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('015ab2b8c6bada0f801057e3f126e365') +md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa') build() { cd ${srcdir}/${pkgname}-${_pkgver} diff --git a/community-testing/fish/PKGBUILD b/community-testing/fish/PKGBUILD new file mode 100644 index 000000000..b79fe66e6 --- /dev/null +++ b/community-testing/fish/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 74385 2012-07-26 06:57:15Z bpiotrowski $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Abhishek Dasgupta <abhidg@gmail.com> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Jan Fader <jan.fader@web.de> + +pkgname=fish +pkgver=2.0b2 +pkgrel=1 +pkgdesc='Smart and user friendly shell intended mostly for interactive use' +arch=('i686' 'x86_64') +url='http://ridiculousfish.com/shell/' +license=('GPL2') +depends=('python') +makedepends=('doxygen') +install=fish.install +source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz) +md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1') + +build() { + cd "$srcdir"/fishfish + autoconf + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --without-xsel + make +} + +package() { + cd "$srcdir"/fishfish + make DESTDIR="$pkgdir" install + + # compress man pages + find "$pkgdir"/usr/share/fish/man/ -type f | xargs gzip -9 +} diff --git a/community-testing/fish/fish.install b/community-testing/fish/fish.install new file mode 100644 index 000000000..765006f95 --- /dev/null +++ b/community-testing/fish/fish.install @@ -0,0 +1,11 @@ +post_install() { + grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells +} + +post_upgrade() { + post_install +} + +pre_remove() { + sed -i '/^\/usr\/bin\/fish/d' /etc/shells +} diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD index b265f2361..10b6c63fc 100644 --- a/community/atop/PKGBUILD +++ b/community/atop/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 57413 2011-10-27 08:43:14Z spupykin $ +# $Id: PKGBUILD 74387 2012-07-26 08:51:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: John Gerritse <john.gerritse@gmail.com> pkgname=atop -pkgver=1.26 -pkgrel=2 +pkgver=1.27_3 +pkgrel=1 pkgdesc="A system and process level monitor." arch=(i686 x86_64) url="http://www.atoptool.nl/" license=('GPL') depends=('ncurses' 'sh' 'zlib') -source=(http://www.atoptool.nl/download/atop-$pkgver.tar.gz) -md5sums=('9a72baf4c8f330973f1e2703f5a6c041') +source=(http://www.atoptool.nl/download/atop-${pkgver/_/-}.tar.gz) +md5sums=('4a4e896ed6ec6979f80898d37938b8d9') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${pkgver/_/-} sed -i 's#root ##' atop.cron make } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${pkgver/_/-} make DESTDIR=$pkgdir INIPATH=/etc/rc.d install } diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD index 0a8bbf17f..cab8f4779 100644 --- a/community/dos2unix/PKGBUILD +++ b/community/dos2unix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70487 2012-05-09 15:02:28Z bpiotrowski $ +# $Id: PKGBUILD 74381 2012-07-26 05:04:12Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Renato Garcia <fgar.renatoATgmailDOTcom> # Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com> pkgname=dos2unix -pkgver=6.0 +pkgver=6.0.1 pkgrel=1 pkgdesc='Text file format converter' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('glibc') makedepends=('perl') conflicts=('hd2u') source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('2fc8d6ebe9f1a519b15ebe0850e9aabd') +md5sums=('1070432514a0f2ee8abe6ebe502a4bf7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/hdapsd/PKGBUILD b/community/hdapsd/PKGBUILD new file mode 100644 index 000000000..74aa528f0 --- /dev/null +++ b/community/hdapsd/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Emil Renner Berthing <esmil@mailme.dk> +# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> + +pkgname=hdapsd +pkgver=20090401 +pkgrel=5 +pkgdesc='HDAPS userspace hard drive protection daemon' +arch=('i686' 'x86_64') +url='http://sourceforge.net/projects/hdaps/' +license=('GPL') +depends=('glibc') +backup=('etc/conf.d/hdapsd') +source=("http://downloads.sourceforge.net/hdaps/hdapsd-${pkgver}.tar.gz" + 'hdapsd.conf.d' + 'hdapsd.rc.d' + 'hdapsd.systemd' + 'hdapsd.wrapper') +md5sums=('897cee8b0192febd127470f3e9506aeb' + '07fc036c8717bf5a38bbc269ed38ad19' + '9ab70348da9751810a2bbac51e18ac75' + '4b1378d43dc9431982f6605265c24f3b' + '11270661f3a543268786a68bbe74a6bb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc + make ${MAKEFLAGS} +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + # install rc script and its configuration file + install -Dm0644 "${srcdir}/hdapsd.conf.d" "${pkgdir}/etc/conf.d/hdapsd" + install -Dm0755 "${srcdir}/hdapsd.rc.d" "${pkgdir}/etc/rc.d/hdapsd" + install -Dm0644 "${srcdir}/hdapsd.systemd" "${pkgdir}/usr/lib/systemd/system/hdapsd.service" + install -Dm0755 "${srcdir}/hdapsd.wrapper" "${pkgdir}/usr/sbin/hdapsd-wrapper" +} diff --git a/community/hdapsd/hdapsd.conf.d b/community/hdapsd/hdapsd.conf.d new file mode 100644 index 000000000..eb99fdc2c --- /dev/null +++ b/community/hdapsd/hdapsd.conf.d @@ -0,0 +1,22 @@ +# DEVICE specifies the device to monitor, defaults to "sda". +#DEVICE='sda' + +# If an ultrabay hard drive is inserted, the following can be used: +#DEVICE=('sda' 'sdb') + +# SENSITIVITY is self explanatory, defaults to "15". +#SENSITIVITY='15' + +# Set ADAPTIVE to "yes" to enable adaptive threshold (automatically increase +# when the built-in keyboard/mouse is used). +#ADAPTIVE='yes' + +# Set SYSLOG to "yes" to have the daemon report errors to syslog (instead of +# stderr/stdout). +SYSLOG='yes' + +# Set FORCE to "yes" to force the kernel to use the unload heads feature on +# some old hard drives for which support cannot be autodetected (don't use this +# unless you're absolutely sure your hard drive really supports unloading +# heads). +#FORCE='yes' diff --git a/community/hdapsd/hdapsd.rc.d b/community/hdapsd/hdapsd.rc.d new file mode 100644 index 000000000..f4e8a6b99 --- /dev/null +++ b/community/hdapsd/hdapsd.rc.d @@ -0,0 +1,60 @@ +#!/bin/bash + +[ -f /etc/conf.d/hdapsd ] && . /etc/conf.d/hdapsd + +. /etc/rc.conf +. /etc/rc.d/functions + +PIDFILE=/var/run/hdapsd.pid +PID=`cat ${PIDFILE} 2> /dev/null` + +case "$1" in + start) + stat_busy "Starting hdapsd" + + ## The daemon will try to autoload the kernel module + #if [ ! -d /sys/devices/platform/hdaps ]; then + # stat_fail + # echo "You need to load the hdaps kernel module." + # exit 1 + #fi + + ## Set up options to the hdapsd daemon + HDAPSD_OPTS="-bp" + if [ -z "${DEVICE}" ]; then + HDAPSD_OPTS="${HDAPSD_OPTS} -d sda" + else + for i in ${DEVICE[@]}; do + HDAPSD_OPTS="${HDAPSD_OPTS} -d ${i}" + done + fi + [ ! -z "${SENSITIVITY}" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -s ${SENSITIVITY}" + [ "${ADAPTIVE}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -a" + [ "${SYSLOG}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -l" + [ "${FORCE}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -f" + [ -z "${PID}" ] && /usr/sbin/hdapsd ${HDAPSD_OPTS} + if [ ${?} -gt 0 ]; then + stat_fail + else + add_daemon hdapsd + stat_done + fi + ;; + stop) + stat_busy "Stopping hdapsd" + [ ! -z "${PID}" ] && kill $PID &> /dev/null + if [ ${?} -gt 0 ]; then + stat_fail + else + rm_daemon hdapsd + stat_done + fi + ;; + restart) + ${0} stop + sleep 1 + ${0} start + ;; + *) + echo "usage: ${0} {start|stop|restart}" +esac diff --git a/community/hdapsd/hdapsd.systemd b/community/hdapsd/hdapsd.systemd new file mode 100644 index 000000000..328699bc7 --- /dev/null +++ b/community/hdapsd/hdapsd.systemd @@ -0,0 +1,12 @@ +[Unit] +Description=HDAPS userspace hard drive protection daemon +After=syslog.target + +[Service] +Type=forking +PIDFile=/var/run/hdapsd.pid +ExecStart=/usr/sbin/hdapsd-wrapper +ExecReload=/bin/kill -HUP ${MAINPID} + +[Install] +WantedBy=multi-user.target diff --git a/community/hdapsd/hdapsd.wrapper b/community/hdapsd/hdapsd.wrapper new file mode 100644 index 000000000..d74fd272d --- /dev/null +++ b/community/hdapsd/hdapsd.wrapper @@ -0,0 +1,20 @@ +#!/bin/bash + +[ -f /etc/conf.d/hdapsd ] && source /etc/conf.d/hdapsd + +OPTS="-bp" + +if [ -z "${DEVICE}" ]; then + OPTS="${OPTS} -d sda" +else + for i in ${DEVICE[@]}; do + OPTS="${OPTS} -d ${i}" + done +fi + +[ ! -z "${SENSITIVITY}" ] && OPTS="${OPTS} -s ${SENSITIVITY}" +[ "${ADAPTIVE}" == "yes" ] && OPTS="${OPTS} -a" +[ "${SYSLOG}" == "yes" ] && OPTS="${OPTS} -l" +[ "${FORCE}" == "yes" ] && OPTS="${OPTS} -f" + +/usr/sbin/hdapsd ${OPTS} diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD index 707023724..e60cbfdfb 100644 --- a/community/ocaml-findlib/PKGBUILD +++ b/community/ocaml-findlib/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: scj <scj archlinux us> pkgname=ocaml-findlib -pkgver=1.2.8 +pkgver=1.3.3 pkgrel=1 license=('MIT') arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ pkgdesc='Objective Caml (OCaml) package manager' url='http://projects.camlcity.org/projects/findlib.html' depends=('ocaml') source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz") -md5sums=('a1da0fddf589ae62fa9b50799cd04c17') options=('!strip' 'zipman') # otherwise the bytecode gets broken +md5sums=('a4c22ad5e0d38367a73cf58a25fcbebd') build() { cd "$srcdir/findlib-$pkgver" diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD new file mode 100644 index 000000000..18449382a --- /dev/null +++ b/community/pd/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 74397 2012-07-26 14:58:32Z speps $ +# Maintainer : speps <speps at aur dot archlinux dot org> +# Contributor: TDY <tdy@gmx.com> +# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> +# Contributor: Andrea Scarpino <bash.lnx@gmail.com> + +pkgname=pd +pkgver=0.43.3 +_ver=${pkgver%.*}-${pkgver##*.} +pkgrel=1 +pkgdesc="The Pure Data real-time music and multimedia environment" +arch=('i686' 'x86_64') +url="http://crca.ucsd.edu/~msp/software.html" +license=('custom:BSD') +depends=('jack' 'fftw' 'tk') +provides=('puredata') +source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz") +md5sums=('c0a565d3be92844780a86524598a5137') + +build() { + cd "$srcdir/pd-$_ver/src" + ./configure --prefix=/usr \ + --enable-alsa \ + --enable-jack \ + --enable-fftw + make +} + +package() { + cd "$srcdir/pd-$_ver/src" + make DESTDIR="$pkgdir" install + + # license + install -Dm644 ../LICENSE.txt \ + "$pkgdir/usr/share/licenses/pd/LICENSE" +} diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 5941996e8..6b24a683a 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73668 2012-07-13 06:40:20Z spupykin $ +# $Id: PKGBUILD 74393 2012-07-26 13:12:10Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.24_rel26.0 -pkgrel=3 +pkgver=5.5.25a_rel27.1 +pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') @@ -106,7 +106,7 @@ package() { install -Dm755 "$srcdir/mysqld-post" "$pkgdir/usr/bin/mysqld-post" } -md5sums=('76f835e98ad3c71fcaa33794ee187630' +md5sums=('c6d08224a37f545d55af7657f24bd2c8' '243864805611764a7e5883c1dba7afd8' '1c949c0dbea5206af0db14942d9927b6' '5143dadeaac15f1ff88ea16716588554' diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index f52714348..cffd856ec 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64182 2012-02-09 20:42:45Z lfleischer $ +# $Id: PKGBUILD 74395 2012-07-26 13:54:21Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=tinyproxy pkgver=1.8.3 -pkgrel=4 +pkgrel=5 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64') url='https://banu.com/tinyproxy/' @@ -14,10 +14,12 @@ install="${pkgname}.install" backup=('etc/tinyproxy/tinyproxy.conf') source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2" 'tinyproxy' - 'tinyproxy.tmpfiles.conf') + 'tinyproxy.tmpfiles.conf' + 'tinyproxy.service') md5sums=('292ac51da8ad6ae883d4ebf56908400d' '90eb2b3371e56d5a784fd826d4a6e5f8' - '3c2764578f26581346fe312da0519a3e') + '3c2764578f26581346fe312da0519a3e' + '8e97b05cc8c87f7efefbf957e77c7f18') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -37,4 +39,7 @@ package() { # Provide sane defaults sed -i '/^#Listen/a\Listen 127.0.0.1' "${pkgdir}/etc/tinyproxy/tinyproxy.conf" + + install -Dm0644 "${srcdir}/tinyproxy.service" \ + "${pkgdir}/usr/lib/systemd/system/tinyproxy.service" } diff --git a/community/tinyproxy/tinyproxy.service b/community/tinyproxy/tinyproxy.service new file mode 100644 index 000000000..aea1d32fe --- /dev/null +++ b/community/tinyproxy/tinyproxy.service @@ -0,0 +1,10 @@ +[Unit] +Description=Tinyproxy Web Proxy Server +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 819a161ba..f1df3ac0a 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74015 2012-07-18 01:09:31Z ibiru $ +# $Id: PKGBUILD 74389 2012-07-26 08:51:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt -pkgver=3.2.2rc2 -_pkgver=3.2.2-rc2 +pkgver=3.2.2 +_pkgver=3.2.2 pkgrel=1 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') @@ -26,7 +26,7 @@ optdepends=('openssl: for SSL support in built-in webserver' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('015ab2b8c6bada0f801057e3f126e365') +md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa') build() { cd ${srcdir}/${pkgname}-${_pkgver} diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index 9fc510129..50549af98 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161356 2012-06-10 08:42:42Z bisson $ +# $Id: PKGBUILD 164066 2012-07-26 15:21:23Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> @@ -6,8 +6,8 @@ pkgname=dnsutils # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1.P1 -_pkgver=9.9.1-P1 +pkgver=9.9.1.P2 +_pkgver=9.9.1-P2 pkgrel=1 pkgdesc='DNS utilities: dig host nslookup' @@ -18,7 +18,7 @@ options=('!makeflags') depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') -sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' +sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7' 'b465ef6160b004838f04de9978fe1be8422af777') replaces=('bind-tools' 'host') diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 338fd8f94..d677cfcda 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') -pkgver=186 +pkgver=187 pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -17,7 +17,7 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' 'locale.sh') -md5sums=('17eff1d31e6e49bf82e129fe57efd59b' +md5sums=('26606e3c84448800ef0b3ffd57e6e8b6' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' @@ -52,10 +52,10 @@ package_systemd() { pkgdesc="system and service manager" depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' "systemd-tools=$pkgver" 'util-linux' 'xz') - optdepends=('python-dbus: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' + optdepends=('initscripts: legacy support for hostname and vconsole setup' 'initscripts-systemd: legacy generator for initialization scripts' - 'python-cairo: systemd-analyze' + 'python2-cairo: systemd-analyze' + 'python2-dbus: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf @@ -87,6 +87,10 @@ package_systemd() { rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + # fix systemd-analyze for python2. the 'plot' verb does not work + # with py3k due to a bug in python-cairo + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + ### split off libsystemd (libs, includes, pkgconfig, man3) rm -rf "$srcdir/_libsystemd" install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} @@ -137,7 +141,7 @@ package_systemd() { mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8 mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 - mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5 + mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5 mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd } diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 238dea344..836f6d8cf 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162785 2012-06-30 13:48:37Z bisson $ +# $Id: PKGBUILD 164181 2012-07-27 00:15:23Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.2.4 +pkgver=3.3 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') optdepends=('unzip: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('24aa75e0a15d2327641c81c6ec7ea153a8df1ae0') +sha1sums=('3c006676f1dbc2376c098855b93606da0f58f7ea') provides=('audacious-player') replaces=('audacious-player') @@ -22,7 +22,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --with-buildstamp='Arch Linux' make } diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index 30803aa5f..0eba01797 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162157 2012-06-22 12:58:04Z dreisner $ +# $Id: PKGBUILD 164067 2012-07-26 15:21:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -6,9 +6,9 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1.P1 -_pkgver=9.9.1-P1 -pkgrel=2 +pkgver=9.9.1.P2 +_pkgver=9.9.1-P2 +pkgrel=1 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' url='http://www.isc.org/software/bind/' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' +sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7' 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' '18f477f510df31e6c6f547ee2d5fc46e973479bf' '46232e9db243c6c05e170a1781d7a7f413be5d03' diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index eee7f5e80..9d5563efa 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163972 2012-07-23 03:04:02Z allan $ +# $Id: PKGBUILD 164175 2012-07-26 17:37:45Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.5.3 -pkgrel=6 +pkgver=1.5.4 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" @@ -22,7 +22,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-systemd-socket.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('e1ad15257aa6f162414ea3beae0c5df8' +md5sums=('de3006e5cf1ee78a9c6145ce62c4e982' '12c8af5bcd3b8f84240280b3dfaf9e89' 'cdc1322c8014297ae349e2db78a03c5a' '1a5112f63958643f2888abc9418dbcac' diff --git a/extra/cups/PKGBUILD.16 b/extra/cups/PKGBUILD.16 index 01faba047..eb8e26473 100644 --- a/extra/cups/PKGBUILD.16 +++ b/extra/cups/PKGBUILD.16 @@ -3,23 +3,23 @@ pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.6b1 +pkgver=1.6.0 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' 'colord' - 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') +makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' + 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-no-export-ssllibs.patch cups-no-gcrypt.patch cups-no-gzip-man.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('468a40755a872d84be89111ce97a69d1' +md5sums=('07157b243dd11e90e3f654c4d62e7c8a' '9b8467a1e51d360096b70e2c3c081e6c' '3733c23e77eb503bd94cc368e02830dc' - '90c30380d4c8cd48a908cfdadae1ea24' + 'c9159ba1233902ba6ddbbe6885a46b72' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') @@ -40,6 +40,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir=/usr/lib \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-logdir=/var/log/cups \ --with-docdir=/usr/share/cups/doc \ --with-cups-user=daemon \ diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index bf8d65e97..ad9b7dc46 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163013 2012-07-05 13:49:57Z allan $ +# $Id: PKGBUILD 164063 2012-07-26 04:17:07Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=valgrind pkgver=3.7.0 -pkgrel=3 +pkgrel=4 pkgdesc="A tool to help find memory-management problems in programs" arch=('i686' 'x86_64') license=('GPL') @@ -13,14 +13,17 @@ depends=('glibc>=2.16' 'glibc<2.17' 'perl') makedepends=('gdb') options=('!emptydirs') source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 - valgrind-3.7.0-glibc-2.16.patch) + valgrind-3.7.0-glibc-2.16.patch + valgrind-3.7.0-supp.patch) md5sums=('a855fda56edf05614f099dca316d1775' - '8362c9c10b8d7d08d1be628a717cfba7') + '8362c9c10b8d7d08d1be628a717cfba7' + '6cf8d3ace0cdc4c7fd69d61ca0692577') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch + patch -Np1 -i ${srcdir}/valgrind-3.7.0-supp.patch if [ "${CARCH}" = "x86_64" ]; then ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit diff --git a/extra/valgrind/valgrind-3.7.0-supp.patch b/extra/valgrind/valgrind-3.7.0-supp.patch new file mode 100644 index 000000000..63a71de0e --- /dev/null +++ b/extra/valgrind/valgrind-3.7.0-supp.patch @@ -0,0 +1,253 @@ +--- valgrind-orig/exp-sgcheck.supp 2011-10-27 07:24:45.000000000 +1000 ++++ valgrind-new/exp-sgcheck.supp 2012-07-12 21:49:58.290123661 +1000 +@@ -1,8 +1,8 @@ + { + ld-2.X possibly applying relocations + exp-sgcheck:SorG +- obj:/*lib*/ld-2.*so* +- obj:/*lib*/ld-2.*so* ++ obj:*/*lib*/ld-2.*so* ++ obj:*/*lib*/ld-2.*so* + } + + # I'm pretty sure this is a false positive caused by the sg_ stuff +--- valgrind-orig/glibc-2.34567-NPTL-helgrind.supp 2011-10-27 07:24:45.000000000 +1000 ++++ valgrind-new/glibc-2.34567-NPTL-helgrind.supp 2012-07-12 21:50:03.663270525 +1000 +@@ -27,7 +27,7 @@ + #{ + # helgrind-glibc2X-001 + # Helgrind:Race +-# obj:/lib*/ld-2.*so* ++# obj:*/lib*/ld-2.*so* + #} + + # helgrind-glibc2X-002 was merged into helgrind-glibc2X-001 +@@ -37,13 +37,13 @@ + { + helgrind-glibc2X-004 + Helgrind:Race +- obj:/lib*/libc-2.*so* ++ obj:*/lib*/libc-2.*so* + } + + { + helgrind-glibc2X-005 + Helgrind:Race +- obj:/lib*/libpthread-2.*so* ++ obj:*/lib*/libpthread-2.*so* + } + + # helgrind-glibc2X-006 was merged into helgrind-glibc2X-005 +@@ -78,14 +78,14 @@ + { + helgrind-glibc2X-101 + Helgrind:Race +- obj:/lib*/libpthread-2.*so* ++ obj:*/lib*/libpthread-2.*so* + fun:pthread_* + } + { + helgrind-glibc2X-102 + Helgrind:Race + fun:mythread_wrapper +- obj:/lib*/libpthread-2.*so* ++ obj:*/lib*/libpthread-2.*so* + } + { + helgrind-glibc2X-103 +@@ -110,7 +110,7 @@ + { + helgrind-glibc2X-107 + Helgrind:Race +- obj:/lib*/libpthread-2.*so* ++ obj:*/lib*/libpthread-2.*so* + fun:sem_* + } + { +@@ -126,7 +126,7 @@ + { + helgrind-glibc2X-110 + Helgrind:Race +- obj:/lib*/libc-2.*so* ++ obj:*/lib*/libc-2.*so* + fun:pthread_* + } + { +--- valgrind-orig/glibc-2.X.supp.in 2011-10-27 07:24:45.000000000 +1000 ++++ valgrind-new/glibc-2.X.supp.in 2012-07-12 21:49:57.323490407 +1000 +@@ -39,74 +39,74 @@ + { + dl-hack3-cond-1 + Memcheck:Cond +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* + } + { + dl-hack3-cond-2 + Memcheck:Cond +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libc-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libc-@GLIBC_VERSION@*.so* + } + { + dl-hack3-cond-3 + Memcheck:Cond +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libc-@GLIBC_VERSION@*.so* +- obj:/lib*/libc-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libc-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libc-@GLIBC_VERSION@*.so* + } + { + dl-hack3-cond-4 + Memcheck:Cond +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libdl-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* + } + + { + dl-hack4-64bit-addr-1 + Memcheck:Addr8 +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* + } + { + dl-hack4-64bit-addr-2 + Memcheck:Addr8 +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libc-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libc-@GLIBC_VERSION@*.so* + } + { + dl-hack4-64bit-addr-3 + Memcheck:Addr8 +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libdl-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* + } + + { + dl-hack5-32bit-addr-1 + Memcheck:Addr4 +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so + } + { + dl-hack5-32bit-addr-3 + Memcheck:Addr4 +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/libdl-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* + } + { + dl-hack5-32bit-addr-4 + Memcheck:Addr4 +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/libdl-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so + } + + +@@ -149,9 +149,9 @@ + { + glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86) + Memcheck:Addr4 +- obj:/lib/ld-@GLIBC_VERSION@*.so +- obj:/lib/ld-@GLIBC_VERSION@*.so +- obj:/lib/ld-@GLIBC_VERSION@*.so ++ obj:*/lib/ld-@GLIBC_VERSION@*.so ++ obj:*/lib/ld-@GLIBC_VERSION@*.so ++ obj:*/lib/ld-@GLIBC_VERSION@*.so + } + + { +@@ -225,7 +225,7 @@ + MVL-401-linuxthreads-pthread_create + Memcheck:Param + write(buf) +- obj:/lib/libpthread-0.10.so ++ obj:*/lib/libpthread-0.10.so + fun:pthread_create + } + +--- valgrind-orig/glibc-2.X-drd.supp 2011-10-27 07:24:45.000000000 +1000 ++++ valgrind-new/glibc-2.X-drd.supp 2012-07-12 21:49:57.323490407 +1000 +@@ -6,7 +6,7 @@ + { + drd-ld + drd:ConflictingAccess +- obj:/lib*/ld-*.so ++ obj:*/lib*/ld-*.so + } + + # +@@ -22,13 +22,19 @@ + { + drd-libc-stdio + drd:ConflictingAccess +- obj:/lib*/libc-* ++ obj:*/lib*/libc-* + } + { + drd-libc-thread-cancellation-test + drd:ConflictingAccess + fun:write + } ++{ ++ drd-libc-random ++ drd:ConflictingAccess ++ fun:random_r ++ fun:random ++} + + # + # Suppression patterns for libstdc++, the implementation of the standard C++ +@@ -128,7 +134,7 @@ + { + drd-libpthread-? + drd:ConflictingAccess +- obj:/lib/libgcc_s.so.1 ++ obj:*/lib/libgcc_s.so.1 + } + { + drd-libpthread-nanosleep +@@ -171,6 +177,7 @@ + { + drd-libxcb-xcb_wait_for_reply + drd:CondErr ++ ... + fun:pthread_cond_destroy* + fun:xcb_wait_for_reply + } diff --git a/testing/cups/PKGBUILD b/testing/cups/PKGBUILD index 2cd366016..97427af37 100644 --- a/testing/cups/PKGBUILD +++ b/testing/cups/PKGBUILD @@ -1,52 +1,37 @@ -# $Id: PKGBUILD 161631 2012-06-12 16:40:20Z andyrtr $ +# $Id: PKGBUILD 164177 2012-07-26 18:42:41Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.5.3 -pkgrel=5 +pkgver=1.6.0 +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=('e1ad15257aa6f162414ea3beae0c5df8' - '12c8af5bcd3b8f84240280b3dfaf9e89' - 'cdc1322c8014297ae349e2db78a03c5a' - '1a5112f63958643f2888abc9418dbcac' - 'c37d1bf1bb76acc3fe93362c80d91b7c' - '5d302860559960042f3b47a91b97c5fe' +md5sums=('07157b243dd11e90e3f654c4d62e7c8a' '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/testing/cups/cups-no-gzip-man.patch b/testing/cups/cups-no-gzip-man.patch index 6786c4430..69899b9cb 100644 --- a/testing/cups/cups-no-gzip-man.patch +++ b/testing/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/testing/cups/cups-systemd-socket.patch b/testing/cups/cups-systemd-socket.patch index 09d17d415..f699b9eda 100644 --- a/testing/cups/cups-systemd-socket.patch +++ b/testing/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/testing/cups/cups.install b/testing/cups/cups.install index 47c3d9b82..cea52282e 100644 --- a/testing/cups/cups.install +++ b/testing/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/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index d677cfcda..e8f6573ff 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=187 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -34,7 +34,6 @@ build() { --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ - --enable-split-usr \ --enable-introspection \ --enable-gtk-doc \ --disable-audit \ |