From 6c114b503b2456476f22ff6bdb2b45cac8dac612 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 8 Aug 2012 00:02:17 +0000 Subject: Wed Aug 8 00:02:17 UTC 2012 --- extra/kdeadmin/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extra/kdeadmin') diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index ad81559e0..7e2109ba2 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161141 2012-06-08 06:35:57Z andrea $ +# $Id: PKGBUILD 164873 2012-08-06 23:16:11Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.8.4 +pkgver=4.9.0 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -16,7 +16,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('b825e40b29b4ae684265cb13b7935737d7ae6d68' +sha1sums=('d584265701d1fd17e98f756a21dd5a21a02df4a3' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { -- cgit v1.2.3-54-g00ecf From a28736b03b50ff37ce2cd0fb2fa1ef2e37508108 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 9 Aug 2012 00:02:24 +0000 Subject: Thu Aug 9 00:02:24 UTC 2012 --- community/aqbanking/PKGBUILD | 8 +- community/bird/PKGBUILD | 11 +- community/bird/bird.rc | 37 +- community/datemath/PKGBUILD | 11 +- community/datemath/y2k.patch | 29 + community/ecryptfs-utils/PKGBUILD | 9 +- community/freerdp/PKGBUILD | 11 +- community/gwenhywfar/PKGBUILD | 9 +- community/ktoblzcheck/PKGBUILD | 6 +- community/libcec/PKGBUILD | 8 +- community/linux-tools/PKGBUILD | 62 +- community/linux-tools/usbipd.conf | 3 + community/linux-tools/usbipd.rc | 34 + community/linux-tools/usbipd.service | 8 + community/php-memcached/PKGBUILD | 8 +- community/python2-basemap/PKGBUILD | 6 +- community/tomoyo-tools/PKGBUILD | 8 +- community/vidalia/PKGBUILD | 16 +- extra/audacity/PKGBUILD | 9 +- extra/cscope/PKGBUILD | 12 +- extra/kdeadmin/PKGBUILD | 8 +- extra/kdepim/PKGBUILD | 38 +- extra/kradio/PKGBUILD | 12 +- extra/libimobiledevice/HOME-segfault.patch | 14 + extra/libimobiledevice/PKGBUILD | 12 +- extra/pekwm/PKGBUILD | 25 +- extra/proftpd/PKGBUILD | 18 +- extra/samba/PKGBUILD | 8 +- libre/ghostscript-libre/PKGBUILD | 14 +- libre/syslinux/PKGBUILD | 29 +- libre/syslinux/avoid-using-ext2_fs.patch | 965 +++++++++++++++++++++ libre/syslinux/rePKGBUILD | 12 +- libre/virtualbox-libre-modules-lts/PKGBUILD | 6 +- libre/virtualbox-libre/.directory | 3 +- libre/virtualbox-libre/PKGBUILD | 54 +- libre/virtualbox-libre/vboxweb.conf | 12 +- testing/net-tools/Makefile.patch | 17 + testing/net-tools/PKGBUILD | 18 +- testing/network-manager-applet/PKGBUILD | 38 + .../network-manager-applet.install | 18 + testing/networkmanager-openconnect/PKGBUILD | 31 + .../networkmanager-openconnect.install | 16 + testing/networkmanager-openvpn/PKGBUILD | 31 + .../networkmanager-openvpn.install | 11 + testing/networkmanager-pptp/PKGBUILD | 31 + .../networkmanager-pptp.install | 11 + testing/networkmanager-vpnc/PKGBUILD | 31 + .../networkmanager-vpnc.install | 11 + testing/networkmanager/NetworkManager.conf | 2 + testing/networkmanager/PKGBUILD | 72 ++ testing/networkmanager/disable_set_hostname.patch | 19 + testing/networkmanager/dnsmasq-path.patch | 30 + testing/networkmanager/networkmanager.install | 9 + testing/networkmanager/systemd-fallback.patch | 470 ++++++++++ 54 files changed, 2193 insertions(+), 208 deletions(-) create mode 100644 community/datemath/y2k.patch create mode 100644 community/linux-tools/usbipd.conf create mode 100644 community/linux-tools/usbipd.rc create mode 100644 community/linux-tools/usbipd.service create mode 100644 extra/libimobiledevice/HOME-segfault.patch create mode 100644 libre/syslinux/avoid-using-ext2_fs.patch create mode 100644 testing/net-tools/Makefile.patch create mode 100644 testing/network-manager-applet/PKGBUILD create mode 100644 testing/network-manager-applet/network-manager-applet.install create mode 100644 testing/networkmanager-openconnect/PKGBUILD create mode 100644 testing/networkmanager-openconnect/networkmanager-openconnect.install create mode 100644 testing/networkmanager-openvpn/PKGBUILD create mode 100644 testing/networkmanager-openvpn/networkmanager-openvpn.install create mode 100644 testing/networkmanager-pptp/PKGBUILD create mode 100644 testing/networkmanager-pptp/networkmanager-pptp.install create mode 100644 testing/networkmanager-vpnc/PKGBUILD create mode 100644 testing/networkmanager-vpnc/networkmanager-vpnc.install create mode 100644 testing/networkmanager/NetworkManager.conf create mode 100644 testing/networkmanager/PKGBUILD create mode 100644 testing/networkmanager/disable_set_hostname.patch create mode 100644 testing/networkmanager/dnsmasq-path.patch create mode 100644 testing/networkmanager/networkmanager.install create mode 100644 testing/networkmanager/systemd-fallback.patch (limited to 'extra/kdeadmin') diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD index 34307fd4b..60dc5a9b5 100644 --- a/community/aqbanking/PKGBUILD +++ b/community/aqbanking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61641 2012-01-05 10:54:39Z spupykin $ +# $Id: PKGBUILD 74854 2012-08-07 14:17:14Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: David Moore pkgname=aqbanking -pkgver=5.0.21 -_dnrel=91 +pkgver=5.0.25 +_dnrel=95 pkgrel=1 pkgdesc="A library for online banking and financial applications" arch=(i686 x86_64) @@ -14,7 +14,7 @@ license=('GPL') depends=('gwenhywfar' 'ktoblzcheck' 'libofx') options=('!makeflags' '!libtool') source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz") -md5sums=('634dac2c82c583ed6643678bc214026e') +md5sums=('b238639962128ce25db81870f65173d9') build() { cd $srcdir/aqbanking-$pkgver diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index 084182dfa..ebc9f9ac1 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69079 2012-04-08 23:33:54Z seblu $ +# $Id: PKGBUILD 74872 2012-08-08 02:08:13Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=bird pkgname=('bird' 'bird6') -pkgver=1.3.7 -pkgrel=2 +pkgver=1.3.8 +pkgrel=1 arch=('i686' 'x86_64') url='http://bird.network.cz/' license=('GPL2') @@ -14,8 +14,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.conf' 'bird.service' 'bird6.service') -md5sums=('c400b008ef834d9e7288dcdbe41b7c15' - '1a4b98756d64f52333a83eff2e95d233' +md5sums=('965fee1be1d5cd45ceef3926e49c18ce' + '5e5346a057f187f56cce928b7e423636' '25241a4d7ef639506e0080431b2c1690' 'e82a0519dca0b289685fda44787f5911' 'c32e7f6cf1be6ed6f9aa98feea25176d') @@ -69,7 +69,6 @@ package_bird6 () { # iniscripts files install -D -m 755 "$srcdir/bird.rc" "$pkgdir/etc/rc.d/bird6" install -D -m 644 "$srcdir/bird.conf" "$pkgdir/etc/conf.d/bird6" - sed -i 's/bird/bird6/' "$pkgdir/etc/rc.d/bird6" # systemd config file install -D -m 644 "$srcdir/bird6.service" "$pkgdir/usr/lib/systemd/system/bird6.service" } diff --git a/community/bird/bird.rc b/community/bird/bird.rc index 95fe65217..a3aa5e4ad 100644 --- a/community/bird/bird.rc +++ b/community/bird/bird.rc @@ -4,31 +4,30 @@ . /etc/rc.d/functions . /etc/conf.d/${0##*/} -NAME=bird -DAEMON=/usr/sbin/bird +DAEMON=/usr/sbin/${0##*/} PID=$(pidof -o %PPID $DAEMON) case "$1" in - start) - stat_busy "Starting $NAME daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 - stat_fail - ;; + start) + stat_busy "Starting ${0##*/} daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; stop) - stat_busy "Stopping $NAME daemon" - [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 - stat_fail - ;; + stat_busy "Stopping ${0##*/} daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; restart) - $0 stop - $0 start - exit 0 - ;; - *) - echo "usage: ${0##*/} {start|stop|restart}" >&2 - ;; + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; esac exit 1 -# vim:set ts=2 sw=2 ft=sh noet: +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/datemath/PKGBUILD b/community/datemath/PKGBUILD index a79868529..23688f4d4 100644 --- a/community/datemath/PKGBUILD +++ b/community/datemath/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 65110 2012-02-20 04:48:43Z spupykin $ +# $Id: PKGBUILD 74846 2012-08-07 05:46:50Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Todd Musall # Contributor: Todd Musall pkgname=datemath pkgver=2.0.10 -pkgrel=3 +pkgrel=4 pkgdesc="Command line date and time math utility." arch=('i686' 'x86_64') url="http://www.unixwiz.net/tools/datemath.html" license=("GPL") depends=('glibc') -source=(http://www.unixwiz.net/tools/$pkgname.tar.gz) -md5sums=('2c369d70a43313b71dbe3c7cc50207de') +source=(http://www.unixwiz.net/tools/$pkgname.tar.gz + y2k.patch) +md5sums=('2c369d70a43313b71dbe3c7cc50207de' + '87758503414a967f06566b94523fc010') build() { cd $srcdir + patch -Np0 <$srcdir/y2k.patch make install -D -m755 $srcdir/datemath $pkgdir/usr/bin/datemath } diff --git a/community/datemath/y2k.patch b/community/datemath/y2k.patch new file mode 100644 index 000000000..4605ad505 --- /dev/null +++ b/community/datemath/y2k.patch @@ -0,0 +1,29 @@ +diff -Naur ../datemath/util.c ./util.c +--- ../datemath/util.c 2004-03-06 18:27:59.000000000 +0100 ++++ ./util.c 2012-08-01 09:37:30.767738221 +0200 +@@ -18,6 +18,7 @@ + #include "defs.h" + + int century19_year = 40; /* 0..39 = 2000 / 40..99 = 1999 */ ++static int century; /* may not be 1900... */ + + /* + * jultoyymm() +@@ -35,6 +36,8 @@ + + if (mdy[YY] < 1900) /* too early? */ + mdy[YY] = 1900; ++ ++ century = mdy[YY] / 100; + + mdy[YY] %= 100; /* strip off 19xx */ + +@@ -59,7 +62,7 @@ + mdy[YY] = yymm / 100; + mdy[DD] = eflag ? daysinmm(mdy[MM], mdy[YY]) : 1; + +- mdy[YY] += 1900; ++ mdy[YY] += century * 100; + + if (rv = rmdyjul(mdy, &jdate), rv < 0) + die("bad date conversion in yymmtojul-(%d)", rv); diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD index 3a892f8db..7bfc5c9d6 100644 --- a/community/ecryptfs-utils/PKGBUILD +++ b/community/ecryptfs-utils/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 74760 2012-08-03 12:32:39Z tredaelli $ +# $Id: PKGBUILD 74862 2012-08-07 15:20:01Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Richard Murri # Contributor: Michal Krenek pkgname=ecryptfs-utils pkgver=100 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" url="https://launchpad.net/ecryptfs" license=('GPL') -makedepends=('swig' 'intltool' 'gettext') -depends=('keyutils' 'nss' 'python2') +makedepends=('swig' 'intltool' 'gettext' 'python2') +depends=('keyutils' 'nss' 'openssl') +optdepends=('python2: for python module') source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz") options=(!libtool) md5sums=('efaa5eabbd368268874536036397f73b') diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index 112d1fc57..183d850d0 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74601 2012-07-31 12:43:27Z spupykin $ +# $Id: PKGBUILD 74850 2012-08-07 11:38:18Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Stijn Segers pkgname=freerdp pkgver=1.0.1 -pkgrel=7 +pkgrel=8 pkgdesc="Free RDP client" arch=('i686' 'x86_64') url="http://freerdp.sourceforge.net" @@ -15,11 +15,14 @@ makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl') conflicts=('freerdp-git') changelog=${pkgname}.changelog options=('!libtool') -source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz) -md5sums=('c843185e0ff22ce8409954651718f338') +source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz + https://github.com/FreeRDP/FreeRDP/commit/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch) +md5sums=('c843185e0ff22ce8409954651718f338' + '194fd599d0f706ecce772d5187e08385') build() { cd `find ${srcdir}/ -type d -name freerdp-\*` + patch -Np1 <$srcdir/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD index 505ac1309..925fe53ea 100644 --- a/community/gwenhywfar/PKGBUILD +++ b/community/gwenhywfar/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 61643 2012-01-05 10:55:35Z spupykin $ +# $Id: PKGBUILD 74856 2012-08-07 14:18:41Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea pkgname=gwenhywfar -pkgver=4.3.1 +pkgver=4.3.3 +_dnrel=67 pkgrel=1 pkgdesc="OS abstraction functions for various projects" arch=(i686 x86_64) @@ -13,8 +14,8 @@ license=("LGPL") depends=('openssl' 'gnutls' 'libgcrypt') makedepends=('gtk2' 'qt') optdepends=('gtk2' 'qt') -source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-$pkgver.tar.gz") -md5sums=('63370a89befee90436720458d0c81cc5') +source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=01&dummy=gwenhywfar-$pkgver.tar.gz") +md5sums=('c5b9d52a25960f84f9264a5a5dd484d1') build() { pacman -Q gwenhywfar && return 1 diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index ad3e93f04..2f92c0577 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61645 2012-01-05 10:56:22Z spupykin $ +# $Id: PKGBUILD 74858 2012-08-07 14:19:39Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Philipp Sandhaus pkgname=ktoblzcheck -pkgver=1.37 +pkgver=1.39 pkgrel=1 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz ktoblzcheck-python3.patch) -md5sums=('93b540b5478bfb1b078613cbf1cc2446' +md5sums=('ef5efd6e2c31aaf6405060ec477c200c' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index 7ad92a44d..8440defc4 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74756 2012-08-03 11:00:41Z idevolder $ +# $Id: PKGBUILD 74867 2012-08-07 16:06:46Z idevolder $ # Maintainer: BlackIkeEagle # Contributor: Philippe Cherel pkgname=libcec -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url="https://github.com/Pulse-Eight/libcec" license=('GPL') depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-b0a5e4f -sha256sums=('3725d19cabec4bbd4142fd735bda43d33aad2a4a62b20ef337f395b549e7adec') +_srcfolder=Pulse-Eight-libcec-34a9cec +sha256sums=('97cda7935404360b56e3c0698deabcc97548bc357a4e4fecbe89de3db12ca0bc') options=(!libtool) build() { diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index a0541720d..d5fd8ce8b 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,28 +1,41 @@ -# $Id: PKGBUILD 74810 2012-08-06 02:37:26Z seblu $ +# $Id: PKGBUILD 74870 2012-08-07 22:24:52Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools -pkgname=('perf' 'cpupower' 'x86_energy_perf_policy') +pkgname=('perf' 'cpupower' 'x86_energy_perf_policy' 'usbip') pkgver=3.5 -pkgrel=2 +pkgrel=3 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' options=('!strip') -makedepends=('asciidoc' 'xmlto') # split packages need all package dependencies set manually in makedepends -makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils') +# kernel source deps +makedepends=('asciidoc' 'xmlto') +# perf deps +makedepends+=('perl' 'python2' 'libnewt' 'elfutils') +# cpupower deps +makedepends+=('pciutils') +# usbip deps +makedepends+=('glib2' 'sysfsutils') +groups=("$pkgbase") source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" # "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.4.xz" - 'cpupower.rc' 'cpupower.conf' + 'cpupower.rc' 'cpupower.systemd' - 'cpupower.service') + 'cpupower.service' + 'usbipd.conf' + 'usbipd.rc' + 'usbipd.service') md5sums=('24153eaaa81dedc9481ada8cd9c3b83d' - '1d9214637968b91706b6e616a100d44b' '857ccdd0598511e3bf4b63522754dc48' + '1d9214637968b91706b6e616a100d44b' 'c0d17b5295fe964623c772a2dd981771' - '2450e8ff41b30eb58d43b5fffbfde1f4') + '2450e8ff41b30eb58d43b5fffbfde1f4' + 'e8fac9c45a628015644b4150b139278a' + '8a3831d962ff6a9968c0c20fd601cdec' + 'ba7c1c513314dd21fb2334fb8417738f') build() { # apply stable patching set @@ -54,11 +67,18 @@ build() { pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy make popd + + msg2 'Build usbip' + pushd linux-$pkgver/drivers/staging/usbip/userspace + ./autogen.sh + ./configure --prefix=/usr + make + popd } package_perf() { pkgdesc='Linux kernel performance auditing tool' - depends=('python2' 'libnewt' 'elfutils') + depends=('perl' 'python2' 'libnewt' 'elfutils') cd linux-$pkgver/tools/perf make \ @@ -74,7 +94,7 @@ package_perf() { package_cpupower() { pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor' backup=('etc/conf.d/cpupower') - depends=('pciutils') + depends=('bash' 'pciutils') conflicts=('cpufrequtils') pushd linux-$pkgver/tools/power/cpupower @@ -84,7 +104,7 @@ package_cpupower() { docdir='/usr/share/doc/cpupower' \ install install-man popd - # install rc.d script + # install daemon scripts install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" install -Dm 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service" @@ -93,10 +113,28 @@ package_cpupower() { package_x86_energy_perf_policy() { pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS' + depends=('glibc') cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy install -Dm 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy" install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8" } +package_usbip() { + pkgdesc='An USB device sharing system over IP network' + depends=('glib2' 'sysfsutils') + options=('!libtool') + + pushd linux-$pkgver/drivers/staging/usbip/userspace + make install DESTDIR="$pkgdir" + popd + # module loading + install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf" + printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf" + # install daemon scripts + install -Dm 755 usbipd.rc "$pkgdir/etc/rc.d/usbipd" + install -Dm 644 usbipd.conf "$pkgdir/etc/conf.d/usbipd" + install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service" +} + # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/linux-tools/usbipd.conf b/community/linux-tools/usbipd.conf new file mode 100644 index 000000000..5990b857a --- /dev/null +++ b/community/linux-tools/usbipd.conf @@ -0,0 +1,3 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +DAEMON_OPTS='' diff --git a/community/linux-tools/usbipd.rc b/community/linux-tools/usbipd.rc new file mode 100644 index 000000000..15a1bcf00 --- /dev/null +++ b/community/linux-tools/usbipd.rc @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${0##*/} + +DAEMON=/usr/sbin/usbipd +PID=$(pidof -o %PPID $DAEMON) +DAEMON_OPTS="--daemon $DAEMON_OPTS" + +case "$1" in + start) + stat_busy "Starting ${0##*/} daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping ${0##*/} daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/linux-tools/usbipd.service b/community/linux-tools/usbipd.service new file mode 100644 index 000000000..ac2f5f7c1 --- /dev/null +++ b/community/linux-tools/usbipd.service @@ -0,0 +1,8 @@ +[Unit] +Description=USB/IP server + +[Service] +ExecStart=/usr/sbin/usbipd + +[Install] +WantedBy=multi-user.target diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD index b50ef485b..b03ce8559 100644 --- a/community/php-memcached/PKGBUILD +++ b/community/php-memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73393 2012-07-07 05:47:10Z foutrelis $ +# $Id: PKGBUILD 74848 2012-08-07 11:05:47Z foutrelis $ # Maintainer: Evangelos Foutras pkgname=php-memcached -pkgver=2.0.1 -pkgrel=5 +pkgver=2.1.0 +pkgrel=1 pkgdesc="PHP extension for interfacing with memcached via libmemcached library" arch=('i686' 'x86_64') url="http://pecl.php.net/package/memcached" @@ -11,7 +11,7 @@ license=('PHP') depends=('php' 'libmemcached') backup=('etc/php/conf.d/memcached.ini') source=(http://pecl.php.net/get/memcached-$pkgver.tgz) -sha256sums=('250779594e846b7b31390c384697eb24a5096123b0d3e2f4a1a0b79d14fb1bff') +sha256sums=('bc4940015be74f47908d410d7b55e10a3d5bf65674036d944c73558227fcc4af') build() { cd "$srcdir/memcached-$pkgver" diff --git a/community/python2-basemap/PKGBUILD b/community/python2-basemap/PKGBUILD index 9e350af3c..07220bde9 100644 --- a/community/python2-basemap/PKGBUILD +++ b/community/python2-basemap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73031 2012-06-28 18:07:29Z stephane $ +# $Id: PKGBUILD 74860 2012-08-07 15:09:34Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: Julien Morin pkgname=python2-basemap -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="Toolkit for plotting data on map projections" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2') optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.') source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz") -sha1sums=('b6d312129d2ae7fb612490516cf87daaf18cb033') +sha1sums=('14b6f5f645febbc73b23e8aea8fdb9e4b4b9adb4') build() { cd "${srcdir}/basemap-${pkgver}" diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index 3d9a68a18..86d8a19a1 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62767 2012-01-26 14:20:03Z spupykin $ +# $Id: PKGBUILD 74852 2012-08-07 13:20:49Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jamie Nguyen pkgname=tomoyo-tools _basever=2.5.0 -_timestamp=20111025 +_timestamp=20120805 _file=53357 pkgver=${_basever}.${_timestamp} pkgrel=1 @@ -17,11 +17,11 @@ depends=('ncurses') conflicts=('ccs-tools') install=tomoyo-tools.install source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('99999779698ea5f44c74d49e8c640ec1') +md5sums=('cccc7cb7f9492dc53063065f7ccf7b21') build() { cd "${srcdir}/${pkgname}" - make -j1 + make } package() { diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index 29f509fcf..c8b89840e 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73256 2012-07-04 13:05:20Z tredaelli $ +# $Id: PKGBUILD 74865 2012-08-07 15:48:23Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Rorschach pkgname=vidalia -pkgver=0.2.19 -pkgrel=3 +pkgver=0.2.20 +pkgrel=1 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" arch=('i686' 'x86_64') @@ -12,17 +12,13 @@ license=('GPL') depends=('qt' 'tor') makedepends=('cmake') install=vidalia.install -source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc} - bug6178.patch) -md5sums=('caf92b44ad2932bbc1c40d6405951c39' - '1ba45d7c91797e880d79a3fc85818dee' - 'bdc0855fef6b230ab63a5b523e853d4e') +source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('f40a3a1c43f4a1f16322969c0cb6f5bf' + '703c872eb865f11027a6d6b02d2e5e72') build() { [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh - patch -d "$srcdir/$pkgname-$pkgver" -i "$srcdir"/bug6178.patch -p1 - cd "$srcdir" mkdir build cd build diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD index d51bb8a57..ef763c86a 100644 --- a/extra/audacity/PKGBUILD +++ b/extra/audacity/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 162721 2012-06-29 02:41:45Z eric $ +# $Id: PKGBUILD 164991 2012-08-08 01:06:53Z eric $ # Maintainer: Eric Bélanger pkgname=audacity pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=('i686' 'x86_64') url="http://audacity.sourceforge.net/" license=('GPL') depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme' - 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg') + 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg-compat') options=('!makeflags') install=audacity.install source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.bz2) @@ -17,7 +17,8 @@ sha1sums=('366a10f3bd71c4d84c29437fff1e27a8560f691b') build() { cd "${srcdir}/${pkgname}-src-${pkgver}" - WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \ + WX_CONFIG=/usr/bin/wx-config PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ + ./configure --prefix=/usr \ --with-portaudio --with-libsamplerate \ --without-libresample --with-libmad \ --with-ffmpeg --with-id3tag --with-libflac \ diff --git a/extra/cscope/PKGBUILD b/extra/cscope/PKGBUILD index 65f665d2e..a77200d2b 100644 --- a/extra/cscope/PKGBUILD +++ b/extra/cscope/PKGBUILD @@ -3,18 +3,19 @@ # Maintainer: Daniel J Griffiths pkgname=cscope -pkgver=15.8 +pkgver=15.8.a +_realver=15.8a pkgrel=1 pkgdesc="A developers tool for browsing program code" arch=('i686' 'x86_64') url="http://cscope.sourceforge.net/" license=('BSD') depends=('ncurses' 'sh') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7114b5838b3edcb3f5821efd444fff06') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_realver}.tar.gz) +md5sums=('b5c898ccedcfe2d4aa69537dad73b610') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${_realver}" sed -i 's|/usr/local/lib/cs|/usr/lib/cs|' contrib/ocs ./configure --prefix=/usr @@ -22,7 +23,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${_realver}" make DESTDIR="${pkgdir}" install install -d ${pkgdir}/usr/lib/cs @@ -32,3 +33,4 @@ package() { install -Dm644 xcscope.el "${pkgdir}"/usr/share/emacs/site-lisp/xcscope.el install -m755 cscope-indexer "${pkgdir}"/usr/bin } + diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 7e2109ba2..af83473b0 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164873 2012-08-06 23:16:11Z andrea $ +# $Id: PKGBUILD 164959 2012-08-07 15:57:09Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -8,9 +8,8 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') pkgver=4.9.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') -url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') @@ -37,6 +36,7 @@ build() { package_kdeadmin-kcron() { pkgdesc='Configure and schedule tasks' + url='http://userbase.kde.org/KCron' depends=('kdelibs') cd $srcdir/build/kcron make DESTDIR=$pkgdir install @@ -71,6 +71,8 @@ package_kdeadmin-system-config-printer-kde() { url="http://kde.org/applications/system/printerapplet/" cd $srcdir/build/system-config-printer-kde make DESTDIR=$pkgdir install + cd $srcdir/build/doc/system-config-printer-kde + make DESTDIR=$pkgdir install # Use the python2 executable sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 335a5de32..14b1a6b28 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164921 2012-08-06 23:20:54Z andrea $ +# $Id: PKGBUILD 164965 2012-08-07 16:32:21Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -18,9 +18,10 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-korganizer' 'kdepim-kresources' 'kdepim-ktimetracker' + 'kdepim-ktnef' 'kdepim-libkdepim') pkgver=4.9.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -89,6 +90,10 @@ package_kdepim-console() { install='kdepim.install' cd "${srcdir}"/build/console make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kabcclient + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/konsolekalendar + make DESTDIR="${pkgdir}" install } package_kdepim-kaddressbook() { @@ -137,6 +142,8 @@ package_kdepim-kleopatra() { make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/doc/kleopatra make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kwatchgnupg + make DESTDIR="${pkgdir}" install } package_kdepim-kmail() { @@ -148,8 +155,9 @@ package_kdepim-kmail() { 'kdepim-mimelib' 'kdepim-plugins') replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') - for i in kmail doc/kmail kmailcvt importwizard ksendemail libksieve \ - messagelist mailfilteragent mailimporter ontologies kontact/plugins/kmail; do + for i in kmail doc/kmail kmailcvt archivemailagent backupmail \ + importwizard ksendemail libksieve messagelist mailfilteragent \ + mailimporter ontologies kontact/plugins/kmail; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done @@ -164,6 +172,8 @@ package_kdepim-knode() { make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/doc/knode make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kioslave/news + make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/kontact/plugins/knode make DESTDIR="${pkgdir}" install } @@ -189,7 +199,7 @@ package_kdepim-kontact() { conflcits=('kdepim-kontactinterfaces') replaces=('kdepim-kontactinterfaces') for i in kontact/src doc/kontact kontact/plugins/summary \ - kontact/plugins/specialdates; do + kontact/plugins/specialdates doc/kontact-admin; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done @@ -228,6 +238,16 @@ package_kdepim-ktimetracker() { make DESTDIR="${pkgdir}" install } +package_kdepim-ktnef() { + pkgdesc='A viewer/extractor for TNEF files' + depends=('kdepim-libkdepim') + url="https://projects.kde.org/projects/kde/kdepim/ktnef" + cd "${srcdir}"/build/ktnef + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktnef + make DESTDIR="${pkgdir}" install +} + package_kdepim-libkdepim() { pkgdesc='Library for KDE PIM' groups=() @@ -238,10 +258,10 @@ package_kdepim-libkdepim() { replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') for i in akonadi_next calendarsupport incidenceeditor-ng \ - kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ - mailcommon messagecomposer messagecore messageviewer icons \ - strigi-analyzer templateparser plugins/messageviewer \ - plugins/ktexteditor; do + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + mailcommon messagecomposer messagecore messageviewer icons \ + strigi-analyzer templateparser plugins/messageviewer \ + plugins/ktexteditor; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD index f1bf4b731..2acd824e7 100644 --- a/extra/kradio/PKGBUILD +++ b/extra/kradio/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 163153 2012-07-08 09:31:40Z ibiru $ +# $Id: PKGBUILD 164981 2012-08-07 18:56:07Z eric $ # Maintainer: # Contributor: Tobias Powalowski pkgname=kradio -pkgver=4.0.4 -pkgrel=2 +pkgver=4.0.5 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') pkgdesc="A comfortable KDE internet and AM/FM radio application" url="http://kradio.sourceforge.net/" depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') -makedepends=('automoc4' 'cmake') +makedepends=('automoc4' 'cmake' 'boost') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc}) -md5sums=('4b5495a4f1dda21f7201bc8db0d4f95e' - '51c6d4ec0047d2df595b458bde285012') +md5sums=('d2ce6b9c12e66c8cdb300013aa0cb26a' + '3faef5c46547b14804839f367fd09d29') build() { cd "$srcdir" diff --git a/extra/libimobiledevice/HOME-segfault.patch b/extra/libimobiledevice/HOME-segfault.patch new file mode 100644 index 000000000..e48e6cb42 --- /dev/null +++ b/extra/libimobiledevice/HOME-segfault.patch @@ -0,0 +1,14 @@ +The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset +Signed-off-by: Maxim Mikityanskiy +--- src/userpref.c.orig 2012-06-04 17:04:57.387303630 +0300 ++++ src/userpref.c 2012-06-04 17:06:05.741301627 +0300 +@@ -125,6 +125,9 @@ + const char *cdir = getenv("XDG_CONFIG_HOME"); + if (!cdir) { + cdir = getenv("HOME"); ++ if (!cdir) { ++ cdir="/root"; ++ } + strcpy(__config_dir, cdir); + strcat(__config_dir, DIR_SEP_S); + strcat(__config_dir, ".config"); diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD index b17bff63f..bc921ac16 100644 --- a/extra/libimobiledevice/PKGBUILD +++ b/extra/libimobiledevice/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 164368 2012-07-31 19:43:16Z eric $ +# $Id: PKGBUILD 164989 2012-08-08 00:24:19Z tomegun $ # Maintainer : Ionut Biru # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice pkgver=1.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') depends=('usbmuxd' 'gnutls' 'libgcrypt') options=('!libtool') -source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) +source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2 + HOME-segfault.patch) build() { cd "$pkgname-$pkgver" + patch -p0 < "$srcdir/HOME-segfault.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } @@ -24,4 +27,5 @@ package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('3f28cbc6a2e30d34685049c0abde5183') +md5sums=('3f28cbc6a2e30d34685049c0abde5183' + '0de709dbf8e79d0b00cca06f5e61d57c') diff --git a/extra/pekwm/PKGBUILD b/extra/pekwm/PKGBUILD index 6b35cbf6f..5ee7323e9 100644 --- a/extra/pekwm/PKGBUILD +++ b/extra/pekwm/PKGBUILD @@ -1,26 +1,31 @@ -# $Id: PKGBUILD 151921 2012-03-04 10:39:20Z andrea $ +# $Id: PKGBUILD 164983 2012-08-07 19:26:08Z eric $ # Maintainer: # Contributor: Kevin Piche # Contributor: Eddie Lozon pkgname=pekwm -pkgver=0.1.14 +pkgver=0.1.15 pkgrel=1 pkgdesc="A small, fast, functional, and flexible window manager" arch=('i686' 'x86_64') license=('GPL') url='https://www.pekwm.org/projects/pekwm' depends=('gcc-libs' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'libxpm' 'libxrandr') -backup=(etc/pekwm/config - etc/pekwm/vars - etc/pekwm/autoproperties - etc/pekwm/start - etc/pekwm/keys - etc/pekwm/mouse - etc/pekwm/menu) +backup=(etc/pekwm/autoproperties + etc/pekwm/autoproperties_typerules + etc/pekwm/config + etc/pekwm/config_system + etc/pekwm/keys + etc/pekwm/menu + etc/pekwm/mouse + etc/pekwm/mouse_click + etc/pekwm/mouse_sloppy + etc/pekwm/mouse_system + etc/pekwm/start + etc/pekwm/vars) source=("http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2" 'pekwm.desktop') -md5sums=('bb9c01c81fe47620bcd9be0e2e4a10e6' +md5sums=('4db10ad191b77120429abd5a65c73cec' '5a78fc6653fbb0b7282ecf7f1f81e2c5') build() { diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD index fd4f5e4a7..78759e944 100644 --- a/extra/proftpd/PKGBUILD +++ b/extra/proftpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161293 2012-06-08 23:31:04Z tomegun $ +# $Id: PKGBUILD 164987 2012-08-07 20:14:43Z eric $ # Maintainer: # Contributor: Daniel J Griffiths pkgname=proftpd -pkgver=1.3.4a -pkgrel=5 +pkgver=1.3.4b +pkgrel=1 epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64') @@ -12,8 +12,13 @@ url="http://www.proftpd.org" license=('GPL') depends=('libldap' 'libmysqlclient' 'postgresql-libs') backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} +source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') +md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2' + 'e5b9bd78029a15f82994efcb7ed2e9fb' + '8177292919acb2f087ded0bb7b2dcc32' + 'ddb09eb13131becdf0e081eef413116b' + '71d5932b0461c318ed68c2c0c2660736') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -47,8 +52,3 @@ package() { # /var/run is a symlink to /run now rm -rf "${pkgdir}/var" } -md5sums=('4e3235dc1ef95d36e59721d70c5c489c' - '3b0f44496adb36640b7a6cc165556bcf' - '8177292919acb2f087ded0bb7b2dcc32' - 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736') diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index d8347d089..e03adefb6 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 162373 2012-06-26 05:39:58Z tpowa $ +# $Id: PKGBUILD 164956 2012-08-07 10:42:12Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.6 +pkgver=3.6.7 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.6.6 +_realver=3.6.7 pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" @@ -157,7 +157,7 @@ install='samba.install' install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf rm -rf ${pkgdir}/var/run } -md5sums=('0bea52842d172231c0c0e23ee570d7af' +md5sums=('b23be56c15dd52f64eb7ba54c0ea1ed5' 'a45a4283723be2b0ae32439dc4496a09' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index b89a3095b..05804529d 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149732 2012-02-09 20:34:33Z andyrtr $ +# $Id: PKGBUILD 165015 2012-08-08 19:40:10Z andyrtr $ # Maintainer: AndyRTR -# Maintainer (Parabola): xihh -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): Joshua Haase +# Maintainer (Parabola): André Silva _pkgname=ghostscript pkgname=ghostscript-libre -pkgver=9.05 +pkgver=9.06 pkgrel=1 pkgdesc="An interpreter for the PostScript language without non-free files" arch=('i686' 'x86_64' 'mips64el') @@ -15,12 +15,12 @@ makedepends=('gtk2' 'gnutls') optdepends=('texlive-core: needed for dvipdf' 'gtk2: needed for gsx') conflicts=('ghostscript') -replaces=('ghostscript-lrpng' 'ghostscript') -provides=('ghostscript-lprng' "ghostscript=$pkgver") +replaces=('ghostscript') +provides=("ghostscript=$pkgver") url="http://www.ghostscript.com/" source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) options=('!libtool' '!makeflags') -md5sums=('8bcef1f33ddf8a4d12b2cf8da385c191') +md5sums=('46f9ebe40dc52755287b30704270db11') build() { cd ${srcdir}/ghostscript-${pkgver} diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 1a76a6825..6269ae93c 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -1,11 +1,10 @@ -# $Id$ -# Maintainer: Thomas Bächler +# $Id: PKGBUILD 165001 2012-08-08 15:45:08Z tpowa $ # Maintainer: Tobias Powalowski -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva pkgname=syslinux pkgver=4.05 -pkgrel=4.3 +pkgrel=5 arch=('i686' 'x86_64') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -14,7 +13,7 @@ depends=('perl' 'glibc') optdepends=('perl-passwd-md5: For md5pass' 'perl-digest-sha1: For sha1pass' 'mtools: For mkdiskimage and syslinux support' - ) + 'gptfdisk: For GPT support') makedepends=('nasm') backup=('boot/syslinux/syslinux.cfg' 'boot/syslinux/splash.png') @@ -23,14 +22,8 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux-dont-build-dos-windows-targets.patch syslinux.cfg syslinux-install_update - splash.png - fix-undefined-type-umode_t.patch) -md5sums=('82299242418385da1274c9479a778cb2' - '1528c376e43f0eaccaa80d8ad1bc13b4' - '8dc2afca3739667e892faf04eb97e7b1' - '680750f73dc2e587ac567d057d485813' - '0035b6cac6756a384b861eda8d33e4f7' - '8674f8a0f480f26b705570d699c78a2c') + avoid-using-ext2_fs.patch + splash.png) build() { # Do not try to build syslinux with our default LDFLAGS, it will fail @@ -38,8 +31,8 @@ build() { cd "$srcdir"/$pkgname-${pkgver} # Do not try to build the Windows or DOS installers patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch - # Fix unknown type name 'umode_t' error - patch -p1 -i "$srcdir"/fix-undefined-type-umode_t.patch + # fix #30084 + patch -Np1 -i "$srcdir"/avoid-using-ext2_fs.patch # Fix FHS manpage path sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk make @@ -59,3 +52,9 @@ package() { # move extlinux binary to /usr/sbin mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux } +md5sums=('82299242418385da1274c9479a778cb2' + '1528c376e43f0eaccaa80d8ad1bc13b4' + '8dc2afca3739667e892faf04eb97e7b1' + '680750f73dc2e587ac567d057d485813' + '2e2c674a71c0c0bf265d96cfc19ce985' + '0035b6cac6756a384b861eda8d33e4f7') diff --git a/libre/syslinux/avoid-using-ext2_fs.patch b/libre/syslinux/avoid-using-ext2_fs.patch new file mode 100644 index 000000000..9a166eefc --- /dev/null +++ b/libre/syslinux/avoid-using-ext2_fs.patch @@ -0,0 +1,965 @@ +From a1006762fa6f98750bb77d76dd992cb8ea9f9c99 Mon Sep 17 00:00:00 2001 +From: "H. Peter Anvin" +Date: Mon, 26 Mar 2012 22:51:09 -0700 +Subject: [PATCH] libinstaller: Avoid using + +Don't use if we can avoid it. + +The ioctl constants have been globalized and moved to . +Use a private copy of ext2_fs.h from e2fsprogs with the ioctl +constants removed for the data structures. + +Do at least attempt backward compatibility for old kernel headers, but +no real hope of proper operation there... + +Signed-off-by: H. Peter Anvin +--- + libinstaller/ext2fs/ext2_fs.h | 856 ++++++++++++++++++++++++++++++++++++++++++ + libinstaller/linuxioctl.h | 29 +- + libinstaller/syslxcom.c | 12 +- + 3 files changed, 886 insertions(+), 11 deletions(-) + create mode 100644 libinstaller/ext2fs/ext2_fs.h + +diff -urpN syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 syslinux-4.05/libinstaller/ext2fs/ext2_fs.h +--- syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 2012-08-06 09:48:43.797645032 -0400 ++++ syslinux-4.05/libinstaller/ext2fs/ext2_fs.h 2012-08-06 09:48:43.797645032 -0400 +@@ -0,0 +1,856 @@ ++/* ++ * linux/include/linux/ext2_fs.h ++ * ++ * Copyright (C) 1992, 1993, 1994, 1995 ++ * Remy Card (card@masi.ibp.fr) ++ * Laboratoire MASI - Institut Blaise Pascal ++ * Universite Pierre et Marie Curie (Paris VI) ++ * ++ * from ++ * ++ * linux/include/linux/minix_fs.h ++ * ++ * Copyright (C) 1991, 1992 Linus Torvalds ++ */ ++ ++#ifndef _EXT2FS_EXT2_FS_H ++#define _EXT2FS_EXT2_FS_H ++ ++#include ++ ++/* ++ * The second extended filesystem constants/structures ++ */ ++ ++/* ++ * Define EXT2FS_DEBUG to produce debug messages ++ */ ++#undef EXT2FS_DEBUG ++ ++/* ++ * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files ++ */ ++#define EXT2_PREALLOCATE ++#define EXT2_DEFAULT_PREALLOC_BLOCKS 8 ++ ++/* ++ * The second extended file system version ++ */ ++#define EXT2FS_DATE "95/08/09" ++#define EXT2FS_VERSION "0.5b" ++ ++/* ++ * Special inode numbers ++ */ ++#define EXT2_BAD_INO 1 /* Bad blocks inode */ ++#define EXT2_ROOT_INO 2 /* Root inode */ ++#define EXT4_USR_QUOTA_INO 3 /* User quota inode */ ++#define EXT4_GRP_QUOTA_INO 4 /* Group quota inode */ ++#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */ ++#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */ ++#define EXT2_RESIZE_INO 7 /* Reserved group descriptors inode */ ++#define EXT2_JOURNAL_INO 8 /* Journal inode */ ++#define EXT2_EXCLUDE_INO 9 /* The "exclude" inode, for snapshots */ ++#define EXT4_REPLICA_INO 10 /* Used by non-upstream feature */ ++ ++/* First non-reserved inode for old ext2 filesystems */ ++#define EXT2_GOOD_OLD_FIRST_INO 11 ++ ++/* ++ * The second extended file system magic number ++ */ ++#define EXT2_SUPER_MAGIC 0xEF53 ++ ++#ifdef __KERNEL__ ++#define EXT2_SB(sb) (&((sb)->u.ext2_sb)) ++#else ++/* Assume that user mode programs are passing in an ext2fs superblock, not ++ * a kernel struct super_block. This will allow us to call the feature-test ++ * macros from user land. */ ++#define EXT2_SB(sb) (sb) ++#endif ++ ++/* ++ * Maximal count of links to a file ++ */ ++#define EXT2_LINK_MAX 65000 ++ ++/* ++ * Macro-instructions used to manage several block sizes ++ */ ++#define EXT2_MIN_BLOCK_LOG_SIZE 10 /* 1024 */ ++#define EXT2_MAX_BLOCK_LOG_SIZE 16 /* 65536 */ ++#define EXT2_MIN_BLOCK_SIZE (1 << EXT2_MIN_BLOCK_LOG_SIZE) ++#define EXT2_MAX_BLOCK_SIZE (1 << EXT2_MAX_BLOCK_LOG_SIZE) ++#ifdef __KERNEL__ ++#define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize) ++#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits) ++#define EXT2_ADDR_PER_BLOCK_BITS(s) (EXT2_SB(s)->addr_per_block_bits) ++#define EXT2_INODE_SIZE(s) (EXT2_SB(s)->s_inode_size) ++#define EXT2_FIRST_INO(s) (EXT2_SB(s)->s_first_ino) ++#else ++#define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) ++#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) ++#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ ++ EXT2_GOOD_OLD_INODE_SIZE : (s)->s_inode_size) ++#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ ++ EXT2_GOOD_OLD_FIRST_INO : (s)->s_first_ino) ++#endif ++#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof(__u32)) ++ ++/* ++ * Macro-instructions used to manage allocation clusters ++ */ ++#define EXT2_MIN_CLUSTER_LOG_SIZE EXT2_MIN_BLOCK_LOG_SIZE ++#define EXT2_MAX_CLUSTER_LOG_SIZE 29 /* 512MB */ ++#define EXT2_MIN_CLUSTER_SIZE EXT2_MIN_BLOCK_SIZE ++#define EXT2_MAX_CLUSTER_SIZE (1 << EXT2_MAX_CLUSTER_LOG_SIZE) ++#define EXT2_CLUSTER_SIZE(s) (EXT2_MIN_BLOCK_SIZE << \ ++ (s)->s_log_cluster_size) ++#define EXT2_CLUSTER_SIZE_BITS(s) ((s)->s_log_cluster_size + 10) ++ ++/* ++ * Macro-instructions used to manage fragments ++ * ++ * Note: for backwards compatibility only, for the dump program. ++ * Ext2/3/4 will never support fragments.... ++ */ ++#define EXT2_MIN_FRAG_SIZE EXT2_MIN_BLOCK_SIZE ++#define EXT2_MAX_FRAG_SIZE EXT2_MAX_BLOCK_SIZE ++#define EXT2_MIN_FRAG_LOG_SIZE EXT2_MIN_BLOCK_LOG_SIZE ++#define EXT2_FRAG_SIZE(s) EXT2_BLOCK_SIZE(s) ++#define EXT2_FRAGS_PER_BLOCK(s) 1 ++ ++/* ++ * ACL structures ++ */ ++struct ext2_acl_header /* Header of Access Control Lists */ ++{ ++ __u32 aclh_size; ++ __u32 aclh_file_count; ++ __u32 aclh_acle_count; ++ __u32 aclh_first_acle; ++}; ++ ++struct ext2_acl_entry /* Access Control List Entry */ ++{ ++ __u32 acle_size; ++ __u16 acle_perms; /* Access permissions */ ++ __u16 acle_type; /* Type of entry */ ++ __u16 acle_tag; /* User or group identity */ ++ __u16 acle_pad1; ++ __u32 acle_next; /* Pointer on next entry for the */ ++ /* same inode or on next free entry */ ++}; ++ ++/* ++ * Structure of a blocks group descriptor ++ */ ++struct ext2_group_desc ++{ ++ __u32 bg_block_bitmap; /* Blocks bitmap block */ ++ __u32 bg_inode_bitmap; /* Inodes bitmap block */ ++ __u32 bg_inode_table; /* Inodes table block */ ++ __u16 bg_free_blocks_count; /* Free blocks count */ ++ __u16 bg_free_inodes_count; /* Free inodes count */ ++ __u16 bg_used_dirs_count; /* Directories count */ ++ __u16 bg_flags; ++ __u32 bg_exclude_bitmap_lo; /* Exclude bitmap for snapshots */ ++ __u16 bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */ ++ __u16 bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */ ++ __u16 bg_itable_unused; /* Unused inodes count */ ++ __u16 bg_checksum; /* crc16(s_uuid+grouo_num+group_desc)*/ ++}; ++ ++/* ++ * Structure of a blocks group descriptor ++ */ ++struct ext4_group_desc ++{ ++ __u32 bg_block_bitmap; /* Blocks bitmap block */ ++ __u32 bg_inode_bitmap; /* Inodes bitmap block */ ++ __u32 bg_inode_table; /* Inodes table block */ ++ __u16 bg_free_blocks_count; /* Free blocks count */ ++ __u16 bg_free_inodes_count; /* Free inodes count */ ++ __u16 bg_used_dirs_count; /* Directories count */ ++ __u16 bg_flags; /* EXT4_BG_flags (INODE_UNINIT, etc) */ ++ __u32 bg_exclude_bitmap_lo; /* Exclude bitmap for snapshots */ ++ __u16 bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */ ++ __u16 bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */ ++ __u16 bg_itable_unused; /* Unused inodes count */ ++ __u16 bg_checksum; /* crc16(sb_uuid+group+desc) */ ++ __u32 bg_block_bitmap_hi; /* Blocks bitmap block MSB */ ++ __u32 bg_inode_bitmap_hi; /* Inodes bitmap block MSB */ ++ __u32 bg_inode_table_hi; /* Inodes table block MSB */ ++ __u16 bg_free_blocks_count_hi;/* Free blocks count MSB */ ++ __u16 bg_free_inodes_count_hi;/* Free inodes count MSB */ ++ __u16 bg_used_dirs_count_hi; /* Directories count MSB */ ++ __u16 bg_itable_unused_hi; /* Unused inodes count MSB */ ++ __u32 bg_exclude_bitmap_hi; /* Exclude bitmap block MSB */ ++ __u16 bg_block_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */ ++ __u16 bg_inode_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */ ++ __u32 bg_reserved; ++}; ++ ++#define EXT2_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not initialized */ ++#define EXT2_BG_BLOCK_UNINIT 0x0002 /* Block bitmap not initialized */ ++#define EXT2_BG_INODE_ZEROED 0x0004 /* On-disk itable initialized to zero */ ++ ++/* ++ * Data structures used by the directory indexing feature ++ * ++ * Note: all of the multibyte integer fields are little endian. ++ */ ++ ++/* ++ * Note: dx_root_info is laid out so that if it should somehow get ++ * overlaid by a dirent the two low bits of the hash version will be ++ * zero. Therefore, the hash version mod 4 should never be 0. ++ * Sincerely, the paranoia department. ++ */ ++struct ext2_dx_root_info { ++ __u32 reserved_zero; ++ __u8 hash_version; /* 0 now, 1 at release */ ++ __u8 info_length; /* 8 */ ++ __u8 indirect_levels; ++ __u8 unused_flags; ++}; ++ ++#define EXT2_HASH_LEGACY 0 ++#define EXT2_HASH_HALF_MD4 1 ++#define EXT2_HASH_TEA 2 ++#define EXT2_HASH_LEGACY_UNSIGNED 3 /* reserved for userspace lib */ ++#define EXT2_HASH_HALF_MD4_UNSIGNED 4 /* reserved for userspace lib */ ++#define EXT2_HASH_TEA_UNSIGNED 5 /* reserved for userspace lib */ ++ ++#define EXT2_HASH_FLAG_INCOMPAT 0x1 ++ ++struct ext2_dx_entry { ++ __u32 hash; ++ __u32 block; ++}; ++ ++struct ext2_dx_countlimit { ++ __u16 limit; ++ __u16 count; ++}; ++ ++ ++/* ++ * Macro-instructions used to manage group descriptors ++ */ ++#define EXT2_MIN_DESC_SIZE 32 ++#define EXT2_MIN_DESC_SIZE_64BIT 64 ++#define EXT2_MAX_DESC_SIZE EXT2_MIN_BLOCK_SIZE ++#define EXT2_DESC_SIZE(s) \ ++ ((EXT2_SB(s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) ? \ ++ (s)->s_desc_size : EXT2_MIN_DESC_SIZE) ++ ++#define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->s_blocks_per_group) ++#define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->s_inodes_per_group) ++#define EXT2_CLUSTERS_PER_GROUP(s) (EXT2_SB(s)->s_clusters_per_group) ++#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) ++/* limits imposed by 16-bit value gd_free_{blocks,inode}_count */ ++#define EXT2_MAX_BLOCKS_PER_GROUP(s) ((((unsigned) 1 << 16) - 8) * \ ++ (EXT2_CLUSTER_SIZE(s) / \ ++ EXT2_BLOCK_SIZE(s))) ++#define EXT2_MAX_CLUSTERS_PER_GROUP(s) (((unsigned) 1 << 16) - 8) ++#define EXT2_MAX_INODES_PER_GROUP(s) (((unsigned) 1 << 16) - \ ++ EXT2_INODES_PER_BLOCK(s)) ++#ifdef __KERNEL__ ++#define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->s_desc_per_block) ++#define EXT2_DESC_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_desc_per_block_bits) ++#else ++#define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_DESC_SIZE(s)) ++#endif ++ ++/* ++ * Constants relative to the data blocks ++ */ ++#define EXT2_NDIR_BLOCKS 12 ++#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS ++#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1) ++#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) ++#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) ++ ++/* ++ * Inode flags ++ */ ++#define EXT2_SECRM_FL 0x00000001 /* Secure deletion */ ++#define EXT2_UNRM_FL 0x00000002 /* Undelete */ ++#define EXT2_COMPR_FL 0x00000004 /* Compress file */ ++#define EXT2_SYNC_FL 0x00000008 /* Synchronous updates */ ++#define EXT2_IMMUTABLE_FL 0x00000010 /* Immutable file */ ++#define EXT2_APPEND_FL 0x00000020 /* writes to file may only append */ ++#define EXT2_NODUMP_FL 0x00000040 /* do not dump file */ ++#define EXT2_NOATIME_FL 0x00000080 /* do not update atime */ ++/* Reserved for compression usage... */ ++#define EXT2_DIRTY_FL 0x00000100 ++#define EXT2_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ ++#define EXT2_NOCOMPR_FL 0x00000400 /* Access raw compressed data */ ++#define EXT2_ECOMPR_FL 0x00000800 /* Compression error */ ++/* End compression flags --- maybe not all used */ ++#define EXT2_BTREE_FL 0x00001000 /* btree format dir */ ++#define EXT2_INDEX_FL 0x00001000 /* hash-indexed directory */ ++#define EXT2_IMAGIC_FL 0x00002000 ++#define EXT3_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */ ++#define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */ ++#define EXT2_DIRSYNC_FL 0x00010000 /* Synchronous directory modifications */ ++#define EXT2_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ ++#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */ ++#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ ++#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ ++/* EXT4_EOFBLOCKS_FL 0x00400000 was here */ ++#define EXT4_SNAPFILE_FL 0x01000000 /* Inode is a snapshot */ ++#define EXT4_SNAPFILE_DELETED_FL 0x04000000 /* Snapshot is being deleted */ ++#define EXT4_SNAPFILE_SHRUNK_FL 0x08000000 /* Snapshot shrink has completed */ ++#define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ ++ ++#define EXT2_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */ ++#define EXT2_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */ ++ ++/* ++ * ioctl commands ++ */ ++ ++/* Used for online resize */ ++struct ext2_new_group_input { ++ __u32 group; /* Group number for this data */ ++ __u32 block_bitmap; /* Absolute block number of block bitmap */ ++ __u32 inode_bitmap; /* Absolute block number of inode bitmap */ ++ __u32 inode_table; /* Absolute block number of inode table start */ ++ __u32 blocks_count; /* Total number of blocks in this group */ ++ __u16 reserved_blocks; /* Number of reserved blocks in this group */ ++ __u16 unused; /* Number of reserved GDT blocks in group */ ++}; ++ ++struct ext4_new_group_input { ++ __u32 group; /* Group number for this data */ ++ __u64 block_bitmap; /* Absolute block number of block bitmap */ ++ __u64 inode_bitmap; /* Absolute block number of inode bitmap */ ++ __u64 inode_table; /* Absolute block number of inode table start */ ++ __u32 blocks_count; /* Total number of blocks in this group */ ++ __u16 reserved_blocks; /* Number of reserved blocks in this group */ ++ __u16 unused; ++}; ++ ++#ifdef __GNU__ /* Needed for the Hurd */ ++#define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0) ++#endif ++ ++#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) ++#define EXT2_IOC_SETFLAGS _IOW('f', 2, long) ++#define EXT2_IOC_GETVERSION _IOR('v', 1, long) ++#define EXT2_IOC_SETVERSION _IOW('v', 2, long) ++#define EXT2_IOC_GETVERSION_NEW _IOR('f', 3, long) ++#define EXT2_IOC_SETVERSION_NEW _IOW('f', 4, long) ++#define EXT2_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long) ++#define EXT2_IOC_GROUP_ADD _IOW('f', 8,struct ext2_new_group_input) ++#define EXT4_IOC_GROUP_ADD _IOW('f', 8,struct ext4_new_group_input) ++#define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64) ++ ++/* ++ * Structure of an inode on the disk ++ */ ++struct ext2_inode { ++ __u16 i_mode; /* File mode */ ++ __u16 i_uid; /* Low 16 bits of Owner Uid */ ++ __u32 i_size; /* Size in bytes */ ++ __u32 i_atime; /* Access time */ ++ __u32 i_ctime; /* Inode change time */ ++ __u32 i_mtime; /* Modification time */ ++ __u32 i_dtime; /* Deletion Time */ ++ __u16 i_gid; /* Low 16 bits of Group Id */ ++ __u16 i_links_count; /* Links count */ ++ __u32 i_blocks; /* Blocks count */ ++ __u32 i_flags; /* File flags */ ++ union { ++ struct { ++ __u32 l_i_version; /* was l_i_reserved1 */ ++ } linux1; ++ struct { ++ __u32 h_i_translator; ++ } hurd1; ++ } osd1; /* OS dependent 1 */ ++ __u32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ ++ __u32 i_generation; /* File version (for NFS) */ ++ __u32 i_file_acl; /* File ACL */ ++ __u32 i_size_high; /* Formerly i_dir_acl, directory ACL */ ++ __u32 i_faddr; /* Fragment address */ ++ union { ++ struct { ++ __u16 l_i_blocks_hi; ++ __u16 l_i_file_acl_high; ++ __u16 l_i_uid_high; /* these 2 fields */ ++ __u16 l_i_gid_high; /* were reserved2[0] */ ++ __u16 l_i_checksum_lo; /* crc32c(uuid+inum+inode) */ ++ __u16 l_i_reserved; ++ } linux2; ++ struct { ++ __u8 h_i_frag; /* Fragment number */ ++ __u8 h_i_fsize; /* Fragment size */ ++ __u16 h_i_mode_high; ++ __u16 h_i_uid_high; ++ __u16 h_i_gid_high; ++ __u32 h_i_author; ++ } hurd2; ++ } osd2; /* OS dependent 2 */ ++}; ++ ++/* ++ * Permanent part of an large inode on the disk ++ */ ++struct ext2_inode_large { ++ __u16 i_mode; /* File mode */ ++ __u16 i_uid; /* Low 16 bits of Owner Uid */ ++ __u32 i_size; /* Size in bytes */ ++ __u32 i_atime; /* Access time */ ++ __u32 i_ctime; /* Inode Change time */ ++ __u32 i_mtime; /* Modification time */ ++ __u32 i_dtime; /* Deletion Time */ ++ __u16 i_gid; /* Low 16 bits of Group Id */ ++ __u16 i_links_count; /* Links count */ ++ __u32 i_blocks; /* Blocks count */ ++ __u32 i_flags; /* File flags */ ++ union { ++ struct { ++ __u32 l_i_version; /* was l_i_reserved1 */ ++ } linux1; ++ struct { ++ __u32 h_i_translator; ++ } hurd1; ++ } osd1; /* OS dependent 1 */ ++ __u32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ ++ __u32 i_generation; /* File version (for NFS) */ ++ __u32 i_file_acl; /* File ACL */ ++ __u32 i_size_high; /* Formerly i_dir_acl, directory ACL */ ++ __u32 i_faddr; /* Fragment address */ ++ union { ++ struct { ++ __u16 l_i_blocks_hi; ++ __u16 l_i_file_acl_high; ++ __u16 l_i_uid_high; /* these 2 fields */ ++ __u16 l_i_gid_high; /* were reserved2[0] */ ++ __u16 l_i_checksum_lo; /* crc32c(uuid+inum+inode) */ ++ __u16 l_i_reserved; ++ } linux2; ++ struct { ++ __u8 h_i_frag; /* Fragment number */ ++ __u8 h_i_fsize; /* Fragment size */ ++ __u16 h_i_mode_high; ++ __u16 h_i_uid_high; ++ __u16 h_i_gid_high; ++ __u32 h_i_author; ++ } hurd2; ++ } osd2; /* OS dependent 2 */ ++ __u16 i_extra_isize; ++ __u16 i_checksum_hi; /* crc32c(uuid+inum+inode) */ ++ __u32 i_ctime_extra; /* extra Change time (nsec << 2 | epoch) */ ++ __u32 i_mtime_extra; /* extra Modification time (nsec << 2 | epoch) */ ++ __u32 i_atime_extra; /* extra Access time (nsec << 2 | epoch) */ ++ __u32 i_crtime; /* File creation time */ ++ __u32 i_crtime_extra; /* extra File creation time (nsec << 2 | epoch)*/ ++ __u32 i_version_hi; /* high 32 bits for 64-bit version */ ++}; ++ ++#define i_dir_acl i_size_high ++ ++#if defined(__KERNEL__) || defined(__linux__) ++#define i_reserved1 osd1.linux1.l_i_reserved1 ++#define i_frag osd2.linux2.l_i_frag ++#define i_fsize osd2.linux2.l_i_fsize ++#define i_uid_low i_uid ++#define i_gid_low i_gid ++#define i_uid_high osd2.linux2.l_i_uid_high ++#define i_gid_high osd2.linux2.l_i_gid_high ++#else ++#if defined(__GNU__) ++ ++#define i_translator osd1.hurd1.h_i_translator ++#define i_frag osd2.hurd2.h_i_frag; ++#define i_fsize osd2.hurd2.h_i_fsize; ++#define i_uid_high osd2.hurd2.h_i_uid_high ++#define i_gid_high osd2.hurd2.h_i_gid_high ++#define i_author osd2.hurd2.h_i_author ++ ++#endif /* __GNU__ */ ++#endif /* defined(__KERNEL__) || defined(__linux__) */ ++ ++#define inode_uid(inode) ((inode).i_uid | (inode).osd2.linux2.l_i_uid_high << 16) ++#define inode_gid(inode) ((inode).i_gid | (inode).osd2.linux2.l_i_gid_high << 16) ++#define ext2fs_set_i_uid_high(inode,x) ((inode).osd2.linux2.l_i_uid_high = (x)) ++#define ext2fs_set_i_gid_high(inode,x) ((inode).osd2.linux2.l_i_gid_high = (x)) ++ ++/* ++ * File system states ++ */ ++#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */ ++#define EXT2_ERROR_FS 0x0002 /* Errors detected */ ++#define EXT3_ORPHAN_FS 0x0004 /* Orphans being recovered */ ++ ++/* ++ * Misc. filesystem flags ++ */ ++#define EXT2_FLAGS_SIGNED_HASH 0x0001 /* Signed dirhash in use */ ++#define EXT2_FLAGS_UNSIGNED_HASH 0x0002 /* Unsigned dirhash in use */ ++#define EXT2_FLAGS_TEST_FILESYS 0x0004 /* OK for use on development code */ ++#define EXT2_FLAGS_IS_SNAPSHOT 0x0010 /* This is a snapshot image */ ++#define EXT2_FLAGS_FIX_SNAPSHOT 0x0020 /* Snapshot inodes corrupted */ ++#define EXT2_FLAGS_FIX_EXCLUDE 0x0040 /* Exclude bitmaps corrupted */ ++ ++/* ++ * Mount flags ++ */ ++#define EXT2_MOUNT_CHECK 0x0001 /* Do mount-time checks */ ++#define EXT2_MOUNT_GRPID 0x0004 /* Create files with directory's group */ ++#define EXT2_MOUNT_DEBUG 0x0008 /* Some debugging messages */ ++#define EXT2_MOUNT_ERRORS_CONT 0x0010 /* Continue on errors */ ++#define EXT2_MOUNT_ERRORS_RO 0x0020 /* Remount fs ro on errors */ ++#define EXT2_MOUNT_ERRORS_PANIC 0x0040 /* Panic on errors */ ++#define EXT2_MOUNT_MINIX_DF 0x0080 /* Mimics the Minix statfs */ ++#define EXT2_MOUNT_NO_UID32 0x0200 /* Disable 32-bit UIDs */ ++ ++#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt ++#define set_opt(o, opt) o |= EXT2_MOUNT_##opt ++#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & \ ++ EXT2_MOUNT_##opt) ++/* ++ * Maximal mount counts between two filesystem checks ++ */ ++#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */ ++#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */ ++ ++/* ++ * Behaviour when detecting errors ++ */ ++#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */ ++#define EXT2_ERRORS_RO 2 /* Remount fs read-only */ ++#define EXT2_ERRORS_PANIC 3 /* Panic */ ++#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE ++ ++#if (__GNUC__ >= 4) ++#define ext4_offsetof(TYPE,MEMBER) __builtin_offsetof(TYPE,MEMBER) ++#else ++#define ext4_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) ++#endif ++ ++/* ++ * Structure of the super block ++ */ ++struct ext2_super_block { ++ __u32 s_inodes_count; /* Inodes count */ ++ __u32 s_blocks_count; /* Blocks count */ ++ __u32 s_r_blocks_count; /* Reserved blocks count */ ++ __u32 s_free_blocks_count; /* Free blocks count */ ++ __u32 s_free_inodes_count; /* Free inodes count */ ++ __u32 s_first_data_block; /* First Data Block */ ++ __u32 s_log_block_size; /* Block size */ ++ __u32 s_log_cluster_size; /* Allocation cluster size */ ++ __u32 s_blocks_per_group; /* # Blocks per group */ ++ __u32 s_clusters_per_group; /* # Fragments per group */ ++ __u32 s_inodes_per_group; /* # Inodes per group */ ++ __u32 s_mtime; /* Mount time */ ++ __u32 s_wtime; /* Write time */ ++ __u16 s_mnt_count; /* Mount count */ ++ __s16 s_max_mnt_count; /* Maximal mount count */ ++ __u16 s_magic; /* Magic signature */ ++ __u16 s_state; /* File system state */ ++ __u16 s_errors; /* Behaviour when detecting errors */ ++ __u16 s_minor_rev_level; /* minor revision level */ ++ __u32 s_lastcheck; /* time of last check */ ++ __u32 s_checkinterval; /* max. time between checks */ ++ __u32 s_creator_os; /* OS */ ++ __u32 s_rev_level; /* Revision level */ ++ __u16 s_def_resuid; /* Default uid for reserved blocks */ ++ __u16 s_def_resgid; /* Default gid for reserved blocks */ ++ /* ++ * These fields are for EXT2_DYNAMIC_REV superblocks only. ++ * ++ * Note: the difference between the compatible feature set and ++ * the incompatible feature set is that if there is a bit set ++ * in the incompatible feature set that the kernel doesn't ++ * know about, it should refuse to mount the filesystem. ++ * ++ * e2fsck's requirements are more strict; if it doesn't know ++ * about a feature in either the compatible or incompatible ++ * feature set, it must abort and not try to meddle with ++ * things it doesn't understand... ++ */ ++ __u32 s_first_ino; /* First non-reserved inode */ ++ __u16 s_inode_size; /* size of inode structure */ ++ __u16 s_block_group_nr; /* block group # of this superblock */ ++ __u32 s_feature_compat; /* compatible feature set */ ++ __u32 s_feature_incompat; /* incompatible feature set */ ++ __u32 s_feature_ro_compat; /* readonly-compatible feature set */ ++ __u8 s_uuid[16]; /* 128-bit uuid for volume */ ++ char s_volume_name[16]; /* volume name */ ++ char s_last_mounted[64]; /* directory where last mounted */ ++ __u32 s_algorithm_usage_bitmap; /* For compression */ ++ /* ++ * Performance hints. Directory preallocation should only ++ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on. ++ */ ++ __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ ++ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ ++ __u16 s_reserved_gdt_blocks; /* Per group table for online growth */ ++ /* ++ * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set. ++ */ ++ __u8 s_journal_uuid[16]; /* uuid of journal superblock */ ++ __u32 s_journal_inum; /* inode number of journal file */ ++ __u32 s_journal_dev; /* device number of journal file */ ++ __u32 s_last_orphan; /* start of list of inodes to delete */ ++ __u32 s_hash_seed[4]; /* HTREE hash seed */ ++ __u8 s_def_hash_version; /* Default hash version to use */ ++ __u8 s_jnl_backup_type; /* Default type of journal backup */ ++ __u16 s_desc_size; /* Group desc. size: INCOMPAT_64BIT */ ++ __u32 s_default_mount_opts; ++ __u32 s_first_meta_bg; /* First metablock group */ ++ __u32 s_mkfs_time; /* When the filesystem was created */ ++ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */ ++ __u32 s_blocks_count_hi; /* Blocks count high 32bits */ ++ __u32 s_r_blocks_count_hi; /* Reserved blocks count high 32 bits*/ ++ __u32 s_free_blocks_hi; /* Free blocks count */ ++ __u16 s_min_extra_isize; /* All inodes have at least # bytes */ ++ __u16 s_want_extra_isize; /* New inodes should reserve # bytes */ ++ __u32 s_flags; /* Miscellaneous flags */ ++ __u16 s_raid_stride; /* RAID stride */ ++ __u16 s_mmp_update_interval; /* # seconds to wait in MMP checking */ ++ __u64 s_mmp_block; /* Block for multi-mount protection */ ++ __u32 s_raid_stripe_width; /* blocks on all data disks (N*stride)*/ ++ __u8 s_log_groups_per_flex; /* FLEX_BG group size */ ++ __u8 s_reserved_char_pad; ++ __u16 s_reserved_pad; /* Padding to next 32bits */ ++ __u64 s_kbytes_written; /* nr of lifetime kilobytes written */ ++ __u32 s_snapshot_inum; /* Inode number of active snapshot */ ++ __u32 s_snapshot_id; /* sequential ID of active snapshot */ ++ __u64 s_snapshot_r_blocks_count; /* reserved blocks for active ++ snapshot's future use */ ++ __u32 s_snapshot_list; /* inode number of the head of the on-disk snapshot list */ ++#define EXT4_S_ERR_START ext4_offsetof(struct ext2_super_block, s_error_count) ++ __u32 s_error_count; /* number of fs errors */ ++ __u32 s_first_error_time; /* first time an error happened */ ++ __u32 s_first_error_ino; /* inode involved in first error */ ++ __u64 s_first_error_block; /* block involved of first error */ ++ __u8 s_first_error_func[32]; /* function where the error happened */ ++ __u32 s_first_error_line; /* line number where error happened */ ++ __u32 s_last_error_time; /* most recent time of an error */ ++ __u32 s_last_error_ino; /* inode involved in last error */ ++ __u32 s_last_error_line; /* line number where error happened */ ++ __u64 s_last_error_block; /* block involved of last error */ ++ __u8 s_last_error_func[32]; /* function where the error happened */ ++#define EXT4_S_ERR_END ext4_offsetof(struct ext2_super_block, s_mount_opts) ++ __u8 s_mount_opts[64]; ++ __u32 s_usr_quota_inum; /* inode number of user quota file */ ++ __u32 s_grp_quota_inum; /* inode number of group quota file */ ++ __u32 s_overhead_blocks; /* overhead blocks/clusters in fs */ ++ __u32 s_reserved[108]; /* Padding to the end of the block */ ++ __u32 s_checksum; /* crc32c(superblock) */ ++}; ++ ++#define EXT4_S_ERR_LEN (EXT4_S_ERR_END - EXT4_S_ERR_START) ++ ++/* ++ * Codes for operating systems ++ */ ++#define EXT2_OS_LINUX 0 ++#define EXT2_OS_HURD 1 ++#define EXT2_OBSO_OS_MASIX 2 ++#define EXT2_OS_FREEBSD 3 ++#define EXT2_OS_LITES 4 ++ ++/* ++ * Revision levels ++ */ ++#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ ++#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ ++ ++#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV ++#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV ++ ++#define EXT2_GOOD_OLD_INODE_SIZE 128 ++ ++/* ++ * Journal inode backup types ++ */ ++#define EXT3_JNL_BACKUP_BLOCKS 1 ++ ++/* ++ * Feature set definitions ++ */ ++ ++#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \ ++ ( EXT2_SB(sb)->s_feature_compat & (mask) ) ++#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \ ++ ( EXT2_SB(sb)->s_feature_ro_compat & (mask) ) ++#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \ ++ ( EXT2_SB(sb)->s_feature_incompat & (mask) ) ++ ++#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001 ++#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002 ++#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 ++#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008 ++#define EXT2_FEATURE_COMPAT_RESIZE_INODE 0x0010 ++#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020 ++#define EXT2_FEATURE_COMPAT_LAZY_BG 0x0040 ++/* #define EXT2_FEATURE_COMPAT_EXCLUDE_INODE 0x0080 not used, legacy */ ++#define EXT2_FEATURE_COMPAT_EXCLUDE_BITMAP 0x0100 ++ ++ ++#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 ++#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 ++/* #define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 not used */ ++#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE 0x0008 ++#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 ++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020 ++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040 ++#define EXT4_FEATURE_RO_COMPAT_HAS_SNAPSHOT 0x0080 ++#define EXT4_FEATURE_RO_COMPAT_QUOTA 0x0100 ++#define EXT4_FEATURE_RO_COMPAT_BIGALLOC 0x0200 ++#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM 0x0400 ++#define EXT4_FEATURE_RO_COMPAT_REPLICA 0x0800 ++ ++#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001 ++#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002 ++#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */ ++#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */ ++#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010 ++#define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040 ++#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 ++#define EXT4_FEATURE_INCOMPAT_MMP 0x0100 ++#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 ++#define EXT4_FEATURE_INCOMPAT_EA_INODE 0x0400 ++#define EXT4_FEATURE_INCOMPAT_DIRDATA 0x1000 ++ ++#define EXT2_FEATURE_COMPAT_SUPP 0 ++#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \ ++ EXT4_FEATURE_INCOMPAT_MMP) ++#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \ ++ EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \ ++ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \ ++ EXT2_FEATURE_RO_COMPAT_BTREE_DIR) ++ ++/* ++ * Default values for user and/or group using reserved blocks ++ */ ++#define EXT2_DEF_RESUID 0 ++#define EXT2_DEF_RESGID 0 ++ ++/* ++ * Default mount options ++ */ ++#define EXT2_DEFM_DEBUG 0x0001 ++#define EXT2_DEFM_BSDGROUPS 0x0002 ++#define EXT2_DEFM_XATTR_USER 0x0004 ++#define EXT2_DEFM_ACL 0x0008 ++#define EXT2_DEFM_UID16 0x0010 ++#define EXT3_DEFM_JMODE 0x0060 ++#define EXT3_DEFM_JMODE_DATA 0x0020 ++#define EXT3_DEFM_JMODE_ORDERED 0x0040 ++#define EXT3_DEFM_JMODE_WBACK 0x0060 ++#define EXT4_DEFM_NOBARRIER 0x0100 ++#define EXT4_DEFM_BLOCK_VALIDITY 0x0200 ++#define EXT4_DEFM_DISCARD 0x0400 ++#define EXT4_DEFM_NODELALLOC 0x0800 ++ ++/* ++ * Structure of a directory entry ++ */ ++#define EXT2_NAME_LEN 255 ++ ++struct ext2_dir_entry { ++ __u32 inode; /* Inode number */ ++ __u16 rec_len; /* Directory entry length */ ++ __u16 name_len; /* Name length */ ++ char name[EXT2_NAME_LEN]; /* File name */ ++}; ++ ++/* ++ * The new version of the directory entry. Since EXT2 structures are ++ * stored in intel byte order, and the name_len field could never be ++ * bigger than 255 chars, it's safe to reclaim the extra byte for the ++ * file_type field. ++ */ ++struct ext2_dir_entry_2 { ++ __u32 inode; /* Inode number */ ++ __u16 rec_len; /* Directory entry length */ ++ __u8 name_len; /* Name length */ ++ __u8 file_type; ++ char name[EXT2_NAME_LEN]; /* File name */ ++}; ++ ++/* ++ * Ext2 directory file types. Only the low 3 bits are used. The ++ * other bits are reserved for now. ++ */ ++#define EXT2_FT_UNKNOWN 0 ++#define EXT2_FT_REG_FILE 1 ++#define EXT2_FT_DIR 2 ++#define EXT2_FT_CHRDEV 3 ++#define EXT2_FT_BLKDEV 4 ++#define EXT2_FT_FIFO 5 ++#define EXT2_FT_SOCK 6 ++#define EXT2_FT_SYMLINK 7 ++ ++#define EXT2_FT_MAX 8 ++ ++/* ++ * EXT2_DIR_PAD defines the directory entries boundaries ++ * ++ * NOTE: It must be a multiple of 4 ++ */ ++#define EXT2_DIR_PAD 4 ++#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) ++#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ ++ ~EXT2_DIR_ROUND) ++ ++/* ++ * This structure is used for multiple mount protection. It is written ++ * into the block number saved in the s_mmp_block field in the superblock. ++ * Programs that check MMP should assume that if SEQ_FSCK (or any unknown ++ * code above SEQ_MAX) is present then it is NOT safe to use the filesystem, ++ * regardless of how old the timestamp is. ++ * ++ * The timestamp in the MMP structure will be updated by e2fsck at some ++ * arbitary intervals (start of passes, after every few groups of inodes ++ * in pass1 and pass1b). There is no guarantee that e2fsck is updating ++ * the MMP block in a timely manner, and the updates it does are purely ++ * for the convenience of the sysadmin and not for automatic validation. ++ * ++ * Note: Only the mmp_seq value is used to determine whether the MMP block ++ * is being updated. The mmp_time, mmp_nodename, and mmp_bdevname ++ * fields are only for informational purposes for the administrator, ++ * due to clock skew between nodes and hostname HA service takeover. ++ */ ++#define EXT4_MMP_MAGIC 0x004D4D50U /* ASCII for MMP */ ++#define EXT4_MMP_SEQ_CLEAN 0xFF4D4D50U /* mmp_seq value for clean unmount */ ++#define EXT4_MMP_SEQ_FSCK 0xE24D4D50U /* mmp_seq value when being fscked */ ++#define EXT4_MMP_SEQ_MAX 0xE24D4D4FU /* maximum valid mmp_seq value */ ++ ++struct mmp_struct { ++ __u32 mmp_magic; /* Magic number for MMP */ ++ __u32 mmp_seq; /* Sequence no. updated periodically */ ++ __u64 mmp_time; /* Time last updated */ ++ char mmp_nodename[64]; /* Node which last updated MMP block */ ++ char mmp_bdevname[32]; /* Bdev which last updated MMP block */ ++ __u16 mmp_check_interval; /* Changed mmp_check_interval */ ++ __u16 mmp_pad1; ++ __u32 mmp_pad2[227]; ++}; ++ ++/* ++ * Default interval for MMP update in seconds. ++ */ ++#define EXT4_MMP_UPDATE_INTERVAL 5 ++ ++/* ++ * Maximum interval for MMP update in seconds. ++ */ ++#define EXT4_MMP_MAX_UPDATE_INTERVAL 300 ++ ++/* ++ * Minimum interval for MMP checking in seconds. ++ */ ++#define EXT4_MMP_MIN_CHECK_INTERVAL 5 ++ ++#endif /* _EXT2FS_EXT2_FS_H */ +diff -urpN syslinux-4.05/libinstaller/linuxioctl.h.ext2 syslinux-4.05/libinstaller/linuxioctl.h +--- syslinux-4.05/libinstaller/linuxioctl.h.ext2 2011-12-09 13:28:17.000000000 -0500 ++++ syslinux-4.05/libinstaller/linuxioctl.h 2012-08-06 09:52:42.653335110 -0400 +@@ -9,17 +9,33 @@ + + #include + ++#ifdef __linux__ ++ + #define statfs _kernel_statfs /* HACK to deal with broken 2.4 distros */ + + #include /* Floppy geometry */ + #include /* Hard disk geometry */ + +-#include /* FIGETBSZ, FIBMAP, FS_IOC_FIEMAP */ ++#include /* FIGETBSZ, FIBMAP, FS_IOC_* */ + #include /* FAT_IOCTL_SET_ATTRIBUTES */ + + #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */ + #undef SECTOR_BITS +-#include /* EXT2_IOC_* */ ++ ++#ifndef FS_IOC_GETFLAGS ++/* Old kernel headers, these were once ext2-specific... */ ++# include /* EXT2_IOC_* */ ++ ++# define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS ++# define FS_IOC_SETFLAGS EXT2_IOC_SETFLAGS ++ ++# define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL ++ ++#else ++ ++# include ++ ++#endif + + #ifndef FAT_IOCTL_GET_ATTRIBUTES + # define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) +@@ -37,11 +53,13 @@ + + #undef statfs + +-#if defined(__linux__) && !defined(BLKGETSIZE64) ++#ifndef BLKGETSIZE64 + /* This takes a u64, but the size field says size_t. Someone screwed big. */ + # define BLKGETSIZE64 _IOR(0x12,114,size_t) + #endif + + #include + ++#endif /* __linux__ */ ++ + #endif /* LIBINSTALLER_LINUXIOCTL_H */ +diff -urpN syslinux-4.05/libinstaller/syslxcom.c.ext2 syslinux-4.05/libinstaller/syslxcom.c +--- syslinux-4.05/libinstaller/syslxcom.c.ext2 2011-12-09 13:28:17.000000000 -0500 ++++ syslinux-4.05/libinstaller/syslxcom.c 2012-08-06 09:48:43.797645032 -0400 +@@ -121,9 +121,9 @@ void clear_attributes(int fd) + { + int flags; + +- if (!ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) { +- flags &= ~EXT2_IMMUTABLE_FL; +- ioctl(fd, EXT2_IOC_SETFLAGS, &flags); ++ if (!ioctl(fd, FS_IOC_GETFLAGS, &flags)) { ++ flags &= ~FS_IMMUTABLE_FL; ++ ioctl(fd, FS_IOC_SETFLAGS, &flags); + } + break; + } +@@ -151,9 +151,9 @@ void set_attributes(int fd) + { + int flags; + +- if (st.st_uid == 0 && !ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) { +- flags |= EXT2_IMMUTABLE_FL; +- ioctl(fd, EXT2_IOC_SETFLAGS, &flags); ++ if (st.st_uid == 0 && !ioctl(fd, FS_IOC_GETFLAGS, &flags)) { ++ flags |= FS_IMMUTABLE_FL; ++ ioctl(fd, FS_IOC_SETFLAGS, &flags); + } + break; + } diff --git a/libre/syslinux/rePKGBUILD b/libre/syslinux/rePKGBUILD index a8eb152d5..85ab6074e 100644 --- a/libre/syslinux/rePKGBUILD +++ b/libre/syslinux/rePKGBUILD @@ -3,23 +3,23 @@ # NOTE: Please fill out the license field for your package! If it is unknown, # then please put 'unknown'. -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva source PKGBUILD unset build package md5sums source check _repo=core pkgname='syslinux' options=(!strip) source=(PKGBUILD -# http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} - http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-4-${CARCH}${PKGEXT} + http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} +# http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-4-${CARCH}${PKGEXT} # files for pkg modifications syslinux.cfg splash.png) build() { cd "${srcdir}/" -# rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-$pkgrel-$CARCH$PKGEXT || true - rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-4-$CARCH$PKGEXT || true + rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-$pkgrel-$CARCH$PKGEXT || true +# rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-4-$CARCH$PKGEXT || true # put actions for package modifications below this line rm -v boot/syslinux/syslinux.cfg @@ -33,7 +33,7 @@ package_syslinux() { optdepends=('perl-passwd-md5: For md5pass' 'perl-digest-sha1: For sha1pass' 'mtools: For mkdiskimage and syslinux support' - ) + 'gptfdisk: For GPT support') # Install the default configuration install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg # Install Parabola splash diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 3de090703..588f72271 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=4 +pkgrel=4.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-lts=$pkgver" "virtualbox-archlinux-modules=$pkgver") + provides=("virtualbox-archlinux-modules-lts=$pkgver" 'virtualbox-archlinux-modules') 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-lts=$pkgver" "virtualbox-modules=$pkgver") + provides=("virtualbox-modules-lts=$pkgver" 'virtualbox-modules') source "$srcdir/VirtualBox-${pkgver}/env.sh" diff --git a/libre/virtualbox-libre/.directory b/libre/virtualbox-libre/.directory index 0de6ba6b0..502696f2f 100644 --- a/libre/virtualbox-libre/.directory +++ b/libre/virtualbox-libre/.directory @@ -1,3 +1,4 @@ [Dolphin] -Timestamp=2012,7,26,5,49,47 +Timestamp=2012,8,8,14,52,43 +Version=3 ViewMode=2 diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index c3aa1a69c..80de2315f 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id$ +# Maintainer: Ionut Biru # Maintainer (Parabola): Nicolas Reynolds # Maintainer (Parabola): Jorge López # Maintainer (Parabola): André Silva -# Maintainer (Parabola): Márcio Silva -# Maintainer: Ionut Biru +# Maintainer (Parabola): Márcio Silva pkgbase=virtualbox-libre pkgname=('virtualbox-libre' 'virtualbox-libre-parabola-additions' @@ -11,7 +11,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-source' 'virtualbox-libre-parabola-source') pkgver=4.1.18 -pkgrel=4.2 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -33,7 +33,7 @@ _extramodules=extramodules-3.5-LIBRE _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true build() { - cd "$srcdir/VirtualBox-${pkgver}" + cd "VirtualBox-$pkgver" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/change_default_driver_dir.patch" @@ -72,6 +72,10 @@ build() { source ./env.sh kmk all sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" + # build rdesktop-vrdp (broken from LocalConfig.kmk) + cd src/VBox/RDP/client + cp "$srcdir/LocalConfig.kmk" . + kmk all } package_virtualbox-libre() { @@ -83,25 +87,26 @@ package_virtualbox-libre() { 'virtualbox-libre-source: host kernel source modules for non-stock kernels' 'net-tools: for host-only or bridged networking') - backup=('etc/vbox/vbox.cfg') + backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') replaces=('virtualbox' 'virtualbox-ose') conflicts=('virtualbox' 'virtualbox-ose') provides=("virtualbox=$pkgver") install=virtualbox-libre.install - source "$srcdir/VirtualBox-${pkgver}/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls} + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps} #Binaries and Wrapper with Launchers install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" - for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do + for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do ln -sf VBox "$pkgdir/usr/bin/$i" + ln -sf VBox "$pkgdir/usr/bin/${i,,}" done install -m 0755 VBoxTunctl "$pkgdir/usr/bin" + install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin" #components install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" @@ -118,6 +123,9 @@ package_virtualbox-libre() { #language install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" + #rdesktop keymaps + install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps" + #useless scripts install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" @@ -160,14 +168,14 @@ package_virtualbox-libre-source() { depends=(dkms gcc make) replaces=('virtualbox-source') conflicts=('virtualbox-source') - provides=("virtualbox-source=$pkgver" "virtualbox-modules=$pkgver") + provides=("virtualbox-source=$pkgver" 'virtualbox-modules') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-source.install install -dm755 "$pkgdir/var/lib/dkms/vboxhost/$pkgver" - source "$srcdir/VirtualBox-${pkgver}/env.sh" - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" cp -r src "$pkgdir/var/lib/dkms/vboxhost/$pkgver/source" } @@ -180,8 +188,8 @@ package_virtualbox-libre-sdk() { install -dm755 "$pkgdir/usr/lib/virtualbox" - source "$srcdir/VirtualBox-${pkgver}/env.sh" - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" #python sdk @@ -201,17 +209,17 @@ package_virtualbox-libre-parabola-additions(){ backup=('etc/conf.d/vboxservice') install=virtualbox-libre-parabola-additions.install - source "$srcdir/VirtualBox-${pkgver}/env.sh" + source "VirtualBox-$pkgver/env.sh" - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" install -d "$pkgdir"/{usr/bin,sbin} install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" install -m755 mount.vboxsf "$pkgdir/sbin" - install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ "$pkgdir"/usr/bin/VBoxClient-all - install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ + install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop install -D vboxvideo_drv_112.so \ "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" @@ -236,14 +244,14 @@ package_virtualbox-libre-parabola-source() { depends=(dkms gcc make) replaces=('virtualbox-archlinux-source') conflicts=('virtualbox-archlinux-source') - provides=("virtualbox-archlinux-source=${pkgver}" "virtualbox-archlinux-modules=${pkgver}") + provides=("virtualbox-archlinux-source=${pkgver}" 'virtualbox-archlinux-modules') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-parabola-source.install install -dm755 "$pkgdir/var/lib/dkms/vboxguest/$pkgver" - source "$srcdir/VirtualBox-${pkgver}/env.sh" - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source" } @@ -256,7 +264,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac' '3c08ad30b89add47d3f45121200a5360' '7d9823507206de9b8528a72af2f18d74' '07c5f6d86c4b7839d719c8ee0c53653b' - '3ac185709bfe688bb753c46e170d0546' + '7e9483b1069a54f181546083ac7e5469' 'c159d683ba1947290fc2ad2c64194150' 'bc9efed88e0469cd7fc460d5a5cd7b4b' '8538dba8686d7449cb481c9bae9d722a' diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf index 49d82d828..c36f6a143 100644 --- a/libre/virtualbox-libre/vboxweb.conf +++ b/libre/virtualbox-libre/vboxweb.conf @@ -3,9 +3,9 @@ # WebService Variables #VBOXWEB_LOGFILE= -#$VBOXWEB_HOST= -#$VBOXWEB_PORT= -#$VBOXWEB_TIMEOUT= -#$VBOXWEB_CHECK_INTERVAL= -#$VBOXWEB_THREADS= -#$VBOXWEB_KEEPALIVE= +#VBOXWEB_HOST= +#VBOXWEB_PORT= +#VBOXWEB_TIMEOUT= +#VBOXWEB_CHECK_INTERVAL= +#VBOXWEB_THREADS= +#VBOXWEB_KEEPALIVE= diff --git a/testing/net-tools/Makefile.patch b/testing/net-tools/Makefile.patch new file mode 100644 index 000000000..aaacd6b78 --- /dev/null +++ b/testing/net-tools/Makefile.patch @@ -0,0 +1,17 @@ +--- Makefile.old 2012-08-07 22:07:58.235437087 +0200 ++++ Makefile 2012-08-07 22:10:21.192104345 +0200 +@@ -239,12 +239,12 @@ + install -m 0755 -d ${BASEDIR}/bin + install -m 0755 arp ${BASEDIR}/sbin + install -m 0755 hostname ${BASEDIR}/bin +- install -m 0755 ifconfig ${BASEDIR}/bin ++ install -m 0755 ifconfig ${BASEDIR}/sbin + install -m 0755 nameif ${BASEDIR}/sbin + install -m 0755 netstat ${BASEDIR}/bin + install -m 0755 plipconfig $(BASEDIR)/sbin + install -m 0755 rarp ${BASEDIR}/sbin +- install -m 0755 route ${BASEDIR}/bin ++ install -m 0755 route ${BASEDIR}/sbin + install -m 0755 slattach $(BASEDIR)/sbin + ifeq ($(HAVE_IP_TOOLS),1) + install -m 0755 ipmaddr $(BASEDIR)/sbin diff --git a/testing/net-tools/PKGBUILD b/testing/net-tools/PKGBUILD index 9468ff936..fec4a9806 100644 --- a/testing/net-tools/PKGBUILD +++ b/testing/net-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164775 2012-08-04 20:55:03Z ronald $ +# $Id: PKGBUILD 164985 2012-08-07 20:09:18Z ronald $ # Maintainer: Ronald van Haren # Contributor: judd pkgname=net-tools pkgver=1.60.20120804git -pkgrel=1 +pkgrel=2 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) license=('GPL2') @@ -13,19 +13,21 @@ depends=('glibc') # http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 # use git checkout instead -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz + Makefile.patch) options=(!makeflags) install=net-tools.install -sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82') - +sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82' + '4191ca56dc01d6aebe26c36c7cc060c638d5ebca') build() { - cd $srcdir/$pkgname-$pkgver + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ${srcdir}/Makefile.patch yes "" | make } package() { - cd $srcdir/$pkgname-$pkgver - make BASEDIR=$pkgdir update + cd ${srcdir}/${pkgname}-${pkgver} + make BASEDIR=${pkgdir} update # the following is provided by yp-tools rm "${pkgdir}"/bin/{nis,yp}domainname diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD new file mode 100644 index 000000000..10b025755 --- /dev/null +++ b/testing/network-manager-applet/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 164979 2012-08-07 18:12:21Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Arjan Timmerman +# Contributor: Wael Nasreddine +# Contributor: Tor Krill +# Contributor: Will Rea + +pkgname=network-manager-applet +pkgver=0.9.6.0 +pkgrel=1 +pkgdesc="GNOME frontends to NetWorkmanager" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' + 'mobile-broadband-provider-info' 'iso-codes') +makedepends=('intltool' 'gnome-bluetooth') +optdepends=('gnome-bluetooth: for PAN/DUN support') +options=('!libtool' '!emptydirs') +install=network-manager-applet.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) +sha256sums=('7bdcf9d28f2823d9514974977df618c83e79c581db57df718885735ba10144d5') + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static \ + --disable-maintainer-mode \ + --disable-migration + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install new file mode 100644 index 000000000..255ea1f9a --- /dev/null +++ b/testing/network-manager-applet/network-manager-applet.install @@ -0,0 +1,18 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 0.9.6.0) < 0 )); then + gconfpkg --uninstall network-manager-applet + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/networkmanager-openconnect/PKGBUILD b/testing/networkmanager-openconnect/PKGBUILD new file mode 100644 index 000000000..0068a8f68 --- /dev/null +++ b/testing/networkmanager-openconnect/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 164975 2012-08-07 18:08:35Z heftig $ +# Maintainer: Ionut Biru + +pkgname=networkmanager-openconnect +pkgver=0.9.6.0 +pkgrel=1 +pkgdesc="NetworkManager VPN integration for openconnect" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'openconnect' 'gconf' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) +sha256sums=('b52412537f54a27b469eebca38477de0c9c0bc8cad68c169d018668e595eb495') + +build() { + cd NetworkManager-openconnect-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd NetworkManager-openconnect-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-openconnect/networkmanager-openconnect.install b/testing/networkmanager-openconnect/networkmanager-openconnect.install new file mode 100644 index 000000000..7bd4d44f9 --- /dev/null +++ b/testing/networkmanager-openconnect/networkmanager-openconnect.install @@ -0,0 +1,16 @@ +pkgname=networkmanager-openconnect + +post_install() { + getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect + getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect + passwd -l nm-openconnect > /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect + getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect +} diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD new file mode 100644 index 000000000..16f27e614 --- /dev/null +++ b/testing/networkmanager-openvpn/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 164976 2012-08-07 18:09:27Z heftig $ +# Maintainer: Ionut Biru + +pkgname=networkmanager-openvpn +pkgver=0.9.6.0 +pkgrel=1 +pkgdesc="NetworkManager VPN plugin for OpenVPN" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +install=networkmanager-openvpn.install +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) +sha256sums=('8fb88705793399574b3de2af93f87b63c0eae342d549a1c79bc59f6a1fad87a3') + +build() { + cd NetworkManager-openvpn-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd NetworkManager-openvpn-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install new file mode 100644 index 000000000..931c0517c --- /dev/null +++ b/testing/networkmanager-openvpn/networkmanager-openvpn.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD new file mode 100644 index 000000000..b4f975a2c --- /dev/null +++ b/testing/networkmanager-pptp/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 164977 2012-08-07 18:10:19Z heftig $ +# Maintainer: Ionut Biru + +pkgname=networkmanager-pptp +pkgver=0.9.6.0 +pkgrel=1 +pkgdesc="NetworkManager VPN plugin for pptp " +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +options=('!libtool') +install=networkmanager-pptp.install +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) +sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4') + +build() { + cd NetworkManager-pptp-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd NetworkManager-pptp-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install new file mode 100644 index 000000000..931c0517c --- /dev/null +++ b/testing/networkmanager-pptp/networkmanager-pptp.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD new file mode 100644 index 000000000..db34ef9c2 --- /dev/null +++ b/testing/networkmanager-vpnc/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 164978 2012-08-07 18:11:11Z heftig $ +# Maintainer: Ionut Biru + +pkgname=networkmanager-vpnc +pkgver=0.9.6.0 +pkgrel=1 +pkgdesc="NetworkManager VPN plugin for vpnc" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +options=('!libtool') +install=networkmanager-vpnc.install +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) +sha256sums=('6c8e35862330e17ee8f4dc44b1ac47470da703e436d339c7b3e2dac7d1b148a2') + +build() { + cd NetworkManager-vpnc-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd NetworkManager-vpnc-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install new file mode 100644 index 000000000..931c0517c --- /dev/null +++ b/testing/networkmanager-vpnc/networkmanager-vpnc.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf new file mode 100644 index 000000000..c37b59680 --- /dev/null +++ b/testing/networkmanager/NetworkManager.conf @@ -0,0 +1,2 @@ +[main] +plugins=keyfile diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD new file mode 100644 index 000000000..e4c927db3 --- /dev/null +++ b/testing/networkmanager/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 164974 2012-08-07 18:07:41Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Wael Nasreddine +# Contributor: Tor Krill +# Contributor: Will Rea +# Contributor: Valentine Sinitsyn + +pkgname=networkmanager +_pkgname=NetworkManager +pkgver=0.9.6.0 +pkgrel=1 +pkgdesc="Network Management daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/$_pkgname/" +depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd' + 'libsoup') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') +optdepends=('modemmanager: for modem management service' + 'dhclient: alternative DHCP/DHCPv6 client' + 'iptables: Connection sharing' + 'dnsmasq: Connection sharing' + 'bluez: Bluetooth support' + 'openresolv: openresolv support') +options=('!libtool') +backup=('etc/NetworkManager/NetworkManager.conf') +install=networkmanager.install +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) +sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07' + '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + +build() { + cd $_pkgname-$pkgver + + patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../dnsmasq-path.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-distro=arch \ + --with-dhclient=/usr/sbin/dhclient \ + --with-dhcpcd=/sbin/dhcpcd \ + --with-iptables=/usr/sbin/iptables \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-udev-dir=/usr/lib/udev \ + --with-resolvconf=/usr/sbin/resolvconf \ + --with-session-tracking=ck \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax + + make +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" + + rm -r "$pkgdir/var/run" + + # Provide native service for arch-daemons generator + ln -s NetworkManager.service "$pkgdir/usr/lib/systemd/system/networkmanager.service" +} diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch new file mode 100644 index 000000000..ee95dd0e1 --- /dev/null +++ b/testing/networkmanager/disable_set_hostname.patch @@ -0,0 +1,19 @@ +diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c +--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 ++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 +@@ -302,6 +302,7 @@ + return; + } + ++#if 0 + /* Try automatically determined hostname from the best device's IP config */ + if (!best4) + best4 = get_best_ip4_device (policy->manager, &best_req4); +@@ -356,6 +357,7 @@ + } + } + ++#endif + /* If no automatically-configured hostname, try using the hostname from + * when NM started up. + */ diff --git a/testing/networkmanager/dnsmasq-path.patch b/testing/networkmanager/dnsmasq-path.patch new file mode 100644 index 000000000..c0e713266 --- /dev/null +++ b/testing/networkmanager/dnsmasq-path.patch @@ -0,0 +1,30 @@ +diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c +--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 +@@ -52,8 +52,11 @@ + find_dnsmasq (void) + { + static const char *paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; +diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c +--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 +@@ -170,8 +170,11 @@ + nm_find_dnsmasq (void) + { + static const char *dnsmasq_binary_paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install new file mode 100644 index 000000000..de40c17ed --- /dev/null +++ b/testing/networkmanager/networkmanager.install @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp 0.8.3 $2) > 0 )) && cat < + #include + #include ++#include ++#include ++#include ++#include "nm-logging.h" + + #include "nm-session-utils.h" + #include "nm-session-monitor.h" +@@ -107,10 +111,20 @@ + return source; + } + ++/********************************************************************/ ++ ++#define CKDB_PATH "/var/run/ConsoleKit/database" ++ + struct _NMSessionMonitor { + GObject parent_instance; + + GSource *sd_source; ++ ++ GKeyFile *database; ++ GFileMonitor *database_monitor; ++ time_t database_mtime; ++ GHashTable *sessions_by_uid; ++ GHashTable *sessions_by_user; + }; + + struct _NMSessionMonitorClass { +@@ -130,6 +144,215 @@ + + /* ---------------------------------------------------------------------------------------------------- */ + ++typedef struct { ++ char *user; ++ uid_t uid; ++ gboolean local; ++ gboolean active; ++} Session; ++ ++static void ++session_free (Session *s) ++{ ++ g_free (s->user); ++ memset (s, 0, sizeof (Session)); ++ g_free (s); ++} ++ ++static gboolean ++check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error) ++{ ++ if (g_key_file_has_key (keyfile, group, key, error)) ++ return TRUE; ++ ++ if (!error) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, ++ "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key", ++ group, key); ++ } ++ return FALSE; ++} ++ ++static Session * ++session_new (GKeyFile *keyfile, const char *group, GError **error) ++{ ++ GError *local = NULL; ++ Session *s; ++ const char *uname = NULL; ++ ++ s = g_new0 (Session, 1); ++ g_assert (s); ++ ++ s->uid = G_MAXUINT; /* paranoia */ ++ if (!check_key (keyfile, group, "uid", &local)) ++ goto error; ++ s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local); ++ if (local) ++ goto error; ++ ++ if (!check_key (keyfile, group, "is_active", &local)) ++ goto error; ++ s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local); ++ if (local) ++ goto error; ++ ++ if (!check_key (keyfile, group, "is_local", &local)) ++ goto error; ++ s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local); ++ if (local) ++ goto error; ++ ++ if (!nm_session_uid_to_user (s->uid, &uname, error)) ++ return FALSE; ++ s->user = g_strdup (uname); ++ ++ return s; ++ ++error: ++ session_free (s); ++ g_propagate_error (error, local); ++ return NULL; ++} ++ ++static void ++session_merge (Session *src, Session *dest) ++{ ++ g_return_if_fail (src != NULL); ++ g_return_if_fail (dest != NULL); ++ ++ g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0); ++ g_warn_if_fail (src->uid == dest->uid); ++ ++ dest->local = (dest->local || src->local); ++ dest->active = (dest->active || src->active); ++} ++ ++/********************************************************************/ ++ ++static void ++free_database (NMSessionMonitor *self) ++{ ++ if (self->database != NULL) { ++ g_key_file_free (self->database); ++ self->database = NULL; ++ } ++ ++ g_hash_table_remove_all (self->sessions_by_uid); ++ g_hash_table_remove_all (self->sessions_by_user); ++} ++ ++static gboolean ++reload_database (NMSessionMonitor *self, GError **error) ++{ ++ struct stat statbuf; ++ char **groups = NULL; ++ gsize len = 0, i; ++ Session *s; ++ ++ free_database (self); ++ ++ errno = 0; ++ if (stat (CKDB_PATH, &statbuf) != 0) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Error statting file " CKDB_PATH ": %s", ++ strerror (errno)); ++ goto error; ++ } ++ self->database_mtime = statbuf.st_mtime; ++ ++ self->database = g_key_file_new (); ++ if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error)) ++ goto error; ++ ++ groups = g_key_file_get_groups (self->database, &len); ++ if (!groups) { ++ g_set_error_literal (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Could not load groups from " CKDB_PATH ""); ++ goto error; ++ } ++ ++ for (i = 0; i < len; i++) { ++ Session *found; ++ ++ if (!g_str_has_prefix (groups[i], "Session ")) ++ continue; ++ ++ s = session_new (self->database, groups[i], error); ++ if (!s) ++ goto error; ++ ++ found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user); ++ if (found) { ++ session_merge (s, found); ++ session_free (s); ++ } else { ++ /* Entirely new user */ ++ g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s); ++ g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s); ++ } ++ } ++ ++ g_strfreev (groups); ++ return TRUE; ++ ++error: ++ if (groups) ++ g_strfreev (groups); ++ free_database (self); ++ return FALSE; ++} ++ ++static gboolean ++ensure_database (NMSessionMonitor *self, GError **error) ++{ ++ gboolean ret = FALSE; ++ ++ if (self->database != NULL) { ++ struct stat statbuf; ++ ++ errno = 0; ++ if (stat (CKDB_PATH, &statbuf) != 0) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Error statting file " CKDB_PATH " to check timestamp: %s", ++ strerror (errno)); ++ goto out; ++ } ++ ++ if (statbuf.st_mtime == self->database_mtime) { ++ ret = TRUE; ++ goto out; ++ } ++ } ++ ++ ret = reload_database (self, error); ++ ++out: ++ return ret; ++} ++ ++static void ++on_file_monitor_changed (GFileMonitor * file_monitor, ++ GFile * file, ++ GFile * other_file, ++ GFileMonitorEvent event_type, ++ gpointer user_data) ++{ ++ NMSessionMonitor *self = NM_SESSION_MONITOR (user_data); ++ ++ /* throw away cache */ ++ free_database (self); ++ ++ g_signal_emit (self, signals[CHANGED_SIGNAL], 0); ++} ++ + static gboolean + sessions_changed (gpointer user_data) + { +@@ -143,9 +366,50 @@ + static void + nm_session_monitor_init (NMSessionMonitor *monitor) + { +- monitor->sd_source = sd_source_new (); +- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); +- g_source_attach (monitor->sd_source, NULL); ++ if (sd_booted () > 0) { ++ monitor->sd_source = sd_source_new (); ++ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); ++ g_source_attach (monitor->sd_source, NULL); ++ ++ monitor->database_monitor = NULL; ++ monitor->database = NULL; ++ } else { ++ monitor->sd_source = NULL; ++ ++ GError *error = NULL; ++ GFile *file; ++ ++ /* Sessions-by-user is responsible for destroying the Session objects */ ++ monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal, ++ NULL, (GDestroyNotify) session_free); ++ monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal); ++ ++ ++ error = NULL; ++ if (!ensure_database (monitor, &error)) { ++ /* Ignore the first error if the CK database isn't found yet */ ++ if (g_error_matches (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) { ++ nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message); ++ } ++ g_error_free (error); ++ } ++ ++ error = NULL; ++ file = g_file_new_for_path (CKDB_PATH); ++ monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error); ++ g_object_unref (file); ++ if (monitor->database_monitor == NULL) { ++ nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message); ++ g_error_free (error); ++ } else { ++ g_signal_connect (monitor->database_monitor, ++ "changed", ++ G_CALLBACK (on_file_monitor_changed), ++ monitor); ++ } ++ } + } + + static void +@@ -158,6 +422,12 @@ + g_source_unref (monitor->sd_source); + } + ++ if (monitor->database_monitor != NULL) ++ g_object_unref (monitor->database_monitor); ++ ++ if (monitor->database != NULL) ++ free_database (monitor); ++ + if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL) + G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object); + } +@@ -206,15 +476,36 @@ + uid_t *out_uid, + GError **error) + { +- uid_t uid; ++ if (monitor->sd_source != NULL) { ++ uid_t uid; + +- if (!nm_session_user_to_uid (username, &uid, error)) +- return FALSE; ++ if (!nm_session_user_to_uid (username, &uid, error)) ++ return FALSE; + +- if (out_uid) +- *out_uid = uid; ++ if (out_uid) ++ *out_uid = uid; + +- return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); ++ return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for user '%s'", ++ username); ++ return FALSE; ++ } ++ ++ if (out_uid) ++ *out_uid = s->uid; ++ return TRUE; ++ } + } + + gboolean +@@ -222,12 +513,31 @@ + const char *username, + GError **error) + { +- uid_t uid; ++ if (monitor->sd_source != NULL) { ++ uid_t uid; + +- if (!nm_session_user_to_uid (username, &uid, error)) +- return FALSE; ++ if (!nm_session_user_to_uid (username, &uid, error)) ++ return FALSE; ++ ++ return nm_session_monitor_uid_active (monitor, uid, error); ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for user '%s'", ++ username); ++ return FALSE; ++ } + +- return nm_session_monitor_uid_active (monitor, uid, error); ++ return s->active; ++ } + } + + gboolean +@@ -236,10 +546,31 @@ + const char **out_user, + GError **error) + { +- if (!nm_session_uid_to_user (uid, out_user, error)) +- return FALSE; ++ if (monitor->sd_source != NULL) { ++ if (!nm_session_uid_to_user (uid, out_user, error)) ++ return FALSE; + +- return sd_uid_get_sessions (uid, FALSE, NULL) > 0; ++ return sd_uid_get_sessions (uid, FALSE, NULL) > 0; ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for uid %d", ++ uid); ++ return FALSE; ++ } ++ ++ if (out_user) ++ *out_user = s->user; ++ return TRUE; ++ } + } + + gboolean +@@ -247,5 +578,24 @@ + uid_t uid, + GError **error) + { +- return sd_uid_get_sessions (uid, TRUE, NULL) > 0; ++ if (monitor->sd_source != NULL) ++ return sd_uid_get_sessions (uid, TRUE, NULL) > 0; ++ else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for uid '%d'", ++ uid); ++ return FALSE; ++ } ++ ++ return s->active; ++ } + } -- cgit v1.2.3-54-g00ecf From ed51a8c1611ffa602f5f9628c858f6edbc218fc8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 7 Sep 2012 00:03:53 +0000 Subject: Fri Sep 7 00:03:53 UTC 2012 --- community/atop/PKGBUILD | 6 +- community/chromaprint/PKGBUILD | 13 +- community/dee/PKGBUILD | 6 +- community/haskell-bytestring-show/PKGBUILD | 11 +- community/haskell-hslogger/PKGBUILD | 8 +- community/linux-tools/PKGBUILD | 8 +- community/luxrays/PKGBUILD | 8 +- community/luxrender/PKGBUILD | 8 +- community/onboard/PKGBUILD | 24 +- community/percona-server/PKGBUILD | 6 +- community/supercollider/PKGBUILD | 6 +- community/uget/PKGBUILD | 10 +- community/ulogd/PKGBUILD | 16 +- community/ulogd/ulogd.conf.min | 20 + community/ulogd/ulogd.service | 12 + core/sudo/PKGBUILD | 36 +- extra/cups/PKGBUILD | 6 +- extra/cups/cups-systemd-socket.patch | 133 +++-- extra/kactivities/PKGBUILD | 6 +- extra/kdeaccessibility-jovie/PKGBUILD | 6 +- extra/kdeaccessibility-kaccessible/PKGBUILD | 8 +- extra/kdeaccessibility-kmag/PKGBUILD | 6 +- extra/kdeaccessibility-kmousetool/PKGBUILD | 6 +- extra/kdeaccessibility-kmouth/PKGBUILD | 6 +- extra/kdeadmin/PKGBUILD | 8 +- extra/kdeartwork/PKGBUILD | 6 +- extra/kdebase-konsole/PKGBUILD | 6 +- extra/kdebase-workspace/PKGBUILD | 17 +- extra/kdebase-workspace/fix-freeze.patch | 56 ++ extra/kdebase/PKGBUILD | 6 +- extra/kdebindings-kimono/PKGBUILD | 6 +- extra/kdebindings-korundum/PKGBUILD | 6 +- extra/kdebindings-kross/PKGBUILD | 6 +- extra/kdebindings-perlkde/PKGBUILD | 6 +- extra/kdebindings-perlqt/PKGBUILD | 6 +- extra/kdebindings-python/PKGBUILD | 6 +- extra/kdebindings-qtruby/PKGBUILD | 6 +- extra/kdebindings-qyoto/PKGBUILD | 6 +- extra/kdebindings-smokegen/PKGBUILD | 6 +- extra/kdebindings-smokekde/PKGBUILD | 6 +- extra/kdebindings-smokeqt/PKGBUILD | 6 +- extra/kdeedu-analitza/PKGBUILD | 6 +- extra/kdeedu-blinken/PKGBUILD | 6 +- extra/kdeedu-cantor/PKGBUILD | 6 +- extra/kdeedu-kalgebra/PKGBUILD | 6 +- extra/kdeedu-kalzium/PKGBUILD | 6 +- extra/kdeedu-kanagram/PKGBUILD | 6 +- extra/kdeedu-kbruch/PKGBUILD | 6 +- extra/kdeedu-kgeography/PKGBUILD | 6 +- extra/kdeedu-khangman/PKGBUILD | 6 +- extra/kdeedu-kig/PKGBUILD | 6 +- extra/kdeedu-kiten/PKGBUILD | 6 +- extra/kdeedu-klettres/PKGBUILD | 6 +- extra/kdeedu-kmplot/PKGBUILD | 6 +- extra/kdeedu-kstars/PKGBUILD | 6 +- extra/kdeedu-ktouch/PKGBUILD | 6 +- extra/kdeedu-kturtle/PKGBUILD | 6 +- extra/kdeedu-kwordquiz/PKGBUILD | 6 +- extra/kdeedu-marble/PKGBUILD | 6 +- extra/kdeedu-pairs/PKGBUILD | 6 +- extra/kdeedu-parley/PKGBUILD | 6 +- extra/kdeedu-rocs/PKGBUILD | 6 +- extra/kdeedu-step/PKGBUILD | 6 +- extra/kdegames/PKGBUILD | 85 +-- extra/kdegraphics-gwenview/PKGBUILD | 8 +- extra/kdegraphics-kamera/PKGBUILD | 6 +- extra/kdegraphics-kcolorchooser/PKGBUILD | 6 +- extra/kdegraphics-kgamma/PKGBUILD | 6 +- extra/kdegraphics-kolourpaint/PKGBUILD | 6 +- extra/kdegraphics-kruler/PKGBUILD | 6 +- extra/kdegraphics-ksaneplugin/PKGBUILD | 6 +- extra/kdegraphics-ksnapshot/PKGBUILD | 6 +- extra/kdegraphics-mobipocket/PKGBUILD | 6 +- extra/kdegraphics-okular/PKGBUILD | 6 +- extra/kdegraphics-strigi-analyzer/PKGBUILD | 6 +- extra/kdegraphics-svgpart/PKGBUILD | 6 +- extra/kdegraphics-thumbnailers/PKGBUILD | 6 +- extra/kdemultimedia-audiocd-kio/PKGBUILD | 8 +- extra/kdemultimedia-dragonplayer/PKGBUILD | 7 +- extra/kdemultimedia-ffmpegthumbs/PKGBUILD | 7 +- extra/kdemultimedia-juk/PKGBUILD | 7 +- extra/kdemultimedia-kmix/PKGBUILD | 7 +- extra/kdemultimedia-kscd/PKGBUILD | 7 +- extra/kdemultimedia-mplayerthumbs/PKGBUILD | 7 +- extra/kdenetwork/PKGBUILD | 6 +- extra/kdepim-runtime/PKGBUILD | 8 +- extra/kdepim/PKGBUILD | 11 +- extra/kdepim/kdepim-ktnef.install | 12 + extra/kdepimlibs/PKGBUILD | 6 +- extra/kdeplasma-addons/PKGBUILD | 6 +- extra/kdesdk-kate/PKGBUILD | 6 +- extra/kdesdk/PKGBUILD | 6 +- extra/kdetoys/PKGBUILD | 6 +- extra/kdeutils-filelight/PKGBUILD | 6 +- extra/kdeutils-kcalc/PKGBUILD | 6 +- extra/kdeutils-kcharselect/PKGBUILD | 6 +- extra/kdeutils-kdf/PKGBUILD | 6 +- extra/kdeutils-kfloppy/PKGBUILD | 6 +- extra/kdeutils-kgpg/PKGBUILD | 6 +- extra/kdeutils-kremotecontrol/PKGBUILD | 4 +- extra/kdeutils-ktimer/PKGBUILD | 6 +- extra/kdeutils-kwallet/PKGBUILD | 6 +- extra/kdeutils-superkaramba/PKGBUILD | 6 +- extra/kdeutils-sweeper/PKGBUILD | 6 +- extra/kdewebdev/PKGBUILD | 6 +- extra/libkcddb/PKGBUILD | 6 +- extra/libkcompactdisc/PKGBUILD | 6 +- extra/libkdcraw/PKGBUILD | 6 +- extra/libkdeedu/PKGBUILD | 6 +- extra/libkexiv2/PKGBUILD | 8 +- extra/libkipi/PKGBUILD | 4 +- extra/libksane/PKGBUILD | 6 +- extra/libreoffice/PKGBUILD | 112 ++-- extra/libreoffice/git_fixes.diff | 743 ++++++++++++++++++++++++ extra/libreoffice/libreoffice-common.csh | 7 + extra/libreoffice/libreoffice-common.sh | 7 + extra/libvdpau/PKGBUILD | 10 +- extra/libwps/PKGBUILD | 18 +- extra/nasm/PKGBUILD | 6 +- extra/nepomuk-core/PKGBUILD | 6 +- extra/qpdf/PKGBUILD | 39 ++ extra/xcompmgr/PKGBUILD | 12 +- extra/xcompmgr/fix_broken_shadows.diff | 28 + extra/xf86-video-openchrome/PKGBUILD | 6 +- gnome-unstable/at-spi2-atk/PKGBUILD | 6 +- gnome-unstable/at-spi2-core/PKGBUILD | 6 +- gnome-unstable/atk/PKGBUILD | 6 +- gnome-unstable/glib2/PKGBUILD | 6 +- gnome-unstable/gobject-introspection/PKGBUILD | 6 +- gnome-unstable/gtk3/PKGBUILD | 42 ++ gnome-unstable/gtk3/gtk3.install | 16 + gnome-unstable/gtk3/settings.ini | 2 + gnome-unstable/gtk3/wacom.patch | 12 + gnome-unstable/harfbuzz/PKGBUILD | 29 + gnome-unstable/pango/PKGBUILD | 30 + gnome-unstable/pango/pango.install | 21 + multilib-testing/lib32-util-linux/PKGBUILD | 40 ++ multilib/lib32-sqlite/PKGBUILD | 50 ++ pcr/libegl-git/PKGBUILD | 105 ++++ pcr/mesa-git/PKGBUILD | 23 +- testing/fontconfig/29-replace-bitmap-fonts.conf | 37 ++ testing/fontconfig/PKGBUILD | 56 ++ testing/fontconfig/fontconfig.install | 39 ++ testing/less/PKGBUILD | 29 + testing/util-linux/PKGBUILD | 72 ++- testing/util-linux/pam-su | 9 + testing/util-linux/util-linux.install | 26 + 147 files changed, 2084 insertions(+), 644 deletions(-) create mode 100644 community/ulogd/ulogd.conf.min create mode 100644 community/ulogd/ulogd.service create mode 100644 extra/kdebase-workspace/fix-freeze.patch create mode 100644 extra/kdepim/kdepim-ktnef.install create mode 100644 extra/libreoffice/git_fixes.diff create mode 100644 extra/qpdf/PKGBUILD create mode 100644 extra/xcompmgr/fix_broken_shadows.diff create mode 100644 gnome-unstable/gtk3/PKGBUILD create mode 100644 gnome-unstable/gtk3/gtk3.install create mode 100644 gnome-unstable/gtk3/settings.ini create mode 100644 gnome-unstable/gtk3/wacom.patch create mode 100644 gnome-unstable/harfbuzz/PKGBUILD create mode 100644 gnome-unstable/pango/PKGBUILD create mode 100644 gnome-unstable/pango/pango.install create mode 100644 multilib-testing/lib32-util-linux/PKGBUILD create mode 100644 multilib/lib32-sqlite/PKGBUILD create mode 100644 pcr/libegl-git/PKGBUILD create mode 100644 testing/fontconfig/29-replace-bitmap-fonts.conf create mode 100644 testing/fontconfig/PKGBUILD create mode 100644 testing/fontconfig/fontconfig.install create mode 100644 testing/less/PKGBUILD create mode 100644 testing/util-linux/pam-su (limited to 'extra/kdeadmin') diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD index b16073d67..4755c9c88 100644 --- a/community/atop/PKGBUILD +++ b/community/atop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75558 2012-08-27 08:48:21Z spupykin $ +# $Id: PKGBUILD 75922 2012-09-05 14:45:58Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: John Gerritse pkgname=atop pkgver=1.27_3 -pkgrel=2 +pkgrel=3 pkgdesc="A system and process level monitor." arch=(i686 x86_64) url="http://www.atoptool.nl/" @@ -25,4 +25,6 @@ package() { rm -f $pkgdir/etc/cron.d/atop install -dm0755 $pkgdir/etc/cron.daily mv $pkgdir/etc/atop/atop.daily $pkgdir/etc/cron.daily/atop + sed -i 's|/etc/atop/atop.daily|/etc/cron.daily/atop|g' $pkgdir/etc/rc.d/atop + install -Dm0644 atop.service $pkgdir/usr/lib/systemd/system/atop.service } diff --git a/community/chromaprint/PKGBUILD b/community/chromaprint/PKGBUILD index 804f6dc65..6f7177ec3 100644 --- a/community/chromaprint/PKGBUILD +++ b/community/chromaprint/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 73467 2012-07-08 09:29:39Z ibiru $ +# $Id: PKGBUILD 75942 2012-09-06 00:10:52Z bisson $ # Contributor: Wieland Hoffmann # Maintainer: Gaetan Bisson pkgname=chromaprint -pkgver=0.6 -pkgrel=3 +pkgver=0.7 +pkgrel=1 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64') license=('LGPL') depends=('ffmpeg') makedepends=('cmake') -source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'ffmpeg.patch') -sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0' - '56057f824a29194fc6041bd73e0d07412fcc065b') +source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../ffmpeg.patch cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON . make } diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD index fa9b5bcc2..a09ddcb79 100644 --- a/community/dee/PKGBUILD +++ b/community/dee/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75004 2012-08-11 13:46:07Z bgyorgy $ +# $Id: PKGBUILD 75926 2012-09-05 16:57:29Z bgyorgy $ # Maintainer: Balló György pkgname=dee -pkgver=1.0.12 +pkgver=1.0.14 pkgrel=1 pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glib2' 'icu') makedepends=('python2' 'gobject-introspection' 'vala') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('8c0bcdf1f96882d2b24d6f5243480fae') +md5sums=('473b4181e26538af0fb753255da7945c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD index d59b21995..081f77510 100644 --- a/community/haskell-bytestring-show/PKGBUILD +++ b/community/haskell-bytestring-show/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 72384 2012-06-13 13:45:56Z tdziedzic $ +# $Id: PKGBUILD 75911 2012-09-05 10:26:10Z spupykin $ # Maintainer: Sergej Pupykin pkgname=haskell-bytestring-show -pkgver=0.3.5.1 -pkgrel=3 +pkgver=0.3.5.2 +pkgrel=1 pkgdesc="Efficient conversion of values into readable byte strings." -url="http://code.haskell.org/~dolio/" +#url="http://code.haskell.org/~dolio/" +url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/bytestring-show" license=("BSD3") arch=('i686' 'x86_64') depends=("ghc=7.4.2-1") install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") -md5sums=('7396bc2e8f88dedc3374c3f12f24e4bd') +md5sums=('bd7cc8c9da04814d5c81041f8f087a8c') build() { cd ${srcdir}/bytestring-show-${pkgver} diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index 4840f72b8..db574668e 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72391 2012-06-13 13:46:34Z tdziedzic $ +# $Id: PKGBUILD 75909 2012-09-05 10:20:43Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Arch Haskell Team pkgname=haskell-hslogger -pkgver=1.1.5 -pkgrel=7 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) -md5sums=('cd3dfd6f88176bd53b333ea29130a857') +md5sums=('e0737887b0df75a3781989c8f6689850') build() { cd ${srcdir}/hslogger-${pkgver} diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index d3fc34b01..9237d05ef 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75410 2012-08-22 13:10:25Z seblu $ +# $Id: PKGBUILD 75938 2012-09-05 20:32:43Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools pkgname=('perf' 'cpupower' 'x86_energy_perf_policy' 'usbip') pkgver=3.5 -pkgrel=4 +pkgrel=5 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -25,7 +25,6 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" 'cpupower.rc' 'cpupower.systemd' 'cpupower.service' - 'cpupower.pmutils' 'usbipd.conf' 'usbipd.rc' 'usbipd.service') @@ -34,7 +33,6 @@ md5sums=('24153eaaa81dedc9481ada8cd9c3b83d' '1d9214637968b91706b6e616a100d44b' 'c0d17b5295fe964623c772a2dd981771' '2450e8ff41b30eb58d43b5fffbfde1f4' - '1c2743ce57b56e16feec86a8b49f3391' 'e8fac9c45a628015644b4150b139278a' '8a3831d962ff6a9968c0c20fd601cdec' 'ba7c1c513314dd21fb2334fb8417738f') @@ -111,8 +109,6 @@ package_cpupower() { install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" install -Dm 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service" install -Dm 755 $pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$pkgname" - # install pm-utils hook - install -Dm 755 $pkgname.pmutils "$pkgdir/usr/lib/pm-utils/power.d/$pkgname" } package_x86_energy_perf_policy() { diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 7250ac699..65177aa26 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 74794 2012-08-05 10:59:30Z stativ $ +# $Id: PKGBUILD 75913 2012-09-05 11:10:59Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=luxrays -pkgver=1.0rc3 -_pkgver=eb749c000ffc +pkgver=1.0rc4 +_pkgver=752ba5c422e0 pkgrel=1 epoch=0 pkgdesc="Accelerate the ray intersection process by using GPUs" @@ -12,7 +12,7 @@ license=('GPL') depends=('freeimage' 'freeglut' 'glew' 'libcl') makedepends=('cmake' 'boost' 'opencl-headers') source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('f5f4b53df22a1c7ad301c78d046edd7d') +md5sums=('409a6d7b4279709c63cf2f1324d837ef') build() { cd "$srcdir/luxrender-$pkgname-$_pkgver" diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index c4a48682b..243906b9e 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74796 2012-08-05 13:47:21Z stativ $ +# $Id: PKGBUILD 75915 2012-09-05 11:28:27Z stativ $ # Maintainer: Lukas Jirkovsky # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya pkgname=luxrender -pkgver=1.0rc3 -_pkgver=9ed6b94cef05 +pkgver=1.0rc4 +_pkgver=0b4c3e188707 pkgrel=1 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ makedepends=('cmake' 'boost' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers') source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ boost_1.50_fix.diff) -md5sums=('54ff625a7833541c3cff5f0a77a93863' +md5sums=('0578f2500f51363ab4d8ea5004fea9dc' '4cddc606ef3ea7f0bbbc9b3415be38b0') build() { diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD index 3050d8c89..f55da6bd6 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,32 +1,24 @@ -# $Id: PKGBUILD 74690 2012-08-02 07:36:24Z bgyorgy $ +# $Id: PKGBUILD 75934 2012-09-05 19:46:18Z bgyorgy $ # Maintainer: Balló György pkgname=onboard -pkgver=0.97.1 -pkgrel=2 +pkgver=0.98.0 +pkgrel=1 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" arch=('i686' 'x86_64') url="https://launchpad.net/onboard" license=('GPL') -depends=('python2-cairo' 'python2-dbus' 'python2-gobject' 'libwnck3' 'python2-virtkey' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('python2-distutils-extra') +depends=('python-cairo' 'python-dbus' 'python-gobject' 'gtk3' 'python-virtkey' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('python-distutils-extra') optdepends=('at-spi2-atk: auto-show when editing text' 'mousetweaks: hover click with mouse') options=('!emptydirs') install=$pkgname.install source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('065dcdf89d5fe145ad7876c5721c0df5') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's/\"python\"/\"python2\"/g' scripts/sokSettings.py - - python2 setup.py install --root=$pkgdir/ --optimize=1 -} +md5sums=('0a2627840740f271e5daba4c1c9c9096') package() { - cd "$pkgdir" + cd "$srcdir/$pkgname-$pkgver" - find . -type f -name *.py | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + python setup.py install --root=$pkgdir/ --optimize=1 } diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index e1cabbea1..6bc5be4ad 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75571 2012-08-27 10:24:27Z mtorromeo $ +# $Id: PKGBUILD 75924 2012-09-05 16:47:49Z mtorromeo $ # Maintainer: Massimiliano Torromeo pkgname=percona-server -pkgver=5.5.27_rel28.0 +pkgver=5.5.27_rel28.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" } -sha256sums=('774a41905c1be51de298fc704eaf7a00beb2cf191b8851ca4b971ef2c176b65a' +sha256sums=('bf32acb0b56d3bfabf65748bbbcb5cfce33191bd31893040ed7e2aebc3548df4' 'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4' '400e9a6e6517bbfe0971b65456dfacfb363cb54a644e4c2bacd373171611d5aa' '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32' diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index ab22feaba..5d9a0c65a 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75278 2012-08-17 15:40:58Z speps $ +# $Id: PKGBUILD 75940 2012-09-05 23:11:46Z speps $ # Maintainer : speps # Contributor: _name=SuperCollider pkgname=supercollider -pkgver=3.5.4 +pkgver=3.5.5 pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('emacs: emacs interface' 'ruby: vim support') install="$pkgname.install" source=("http://download.sourceforge.net/project/$pkgname/Source/$pkgver/$_name-$pkgver-Source-linux.tar.bz2") -md5sums=('8f0cd3a77e3adf0fd44cf6882ad39703') +md5sums=('55c08e1d3665346b85dbff4c27c1accc') build() { cd "$srcdir/$_name-Source" diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD index 73c1ba391..9e975f8bb 100644 --- a/community/uget/PKGBUILD +++ b/community/uget/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 70730 2012-05-15 22:54:45Z bgyorgy $ +# $Id: PKGBUILD 75928 2012-09-05 17:18:03Z bgyorgy $ # Maintainer: Balló György pkgname=uget -pkgver=1.8.2 +pkgver=1.10 pkgrel=1 pkgdesc="GTK+ download manager featuring download classification and HTML import" arch=('i686' 'x86_64') @@ -12,14 +12,14 @@ depends=('libnotify' 'gtk3' 'gstreamer0.10' 'curl' 'hicolor-icon-theme' 'xdg-uti makedepends=('intltool') optdepends=('aria2: alternative backend') install=$pkgname.install -source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz) -md5sums=('42be57f08f41ffe4f5c4b60a4e8aa079') +source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver-2.tar.gz) +md5sums=('cf6f58b838321f97aa9f3c0b0b0315cf') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-appindicator --with-gtk3 + --disable-appindicator make } diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 26a00d382..bed484f6c 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74257 2012-07-23 07:12:03Z spupykin $ +# $Id: PKGBUILD 75920 2012-09-05 14:02:57Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Sebastien Luttringer # Contributor: Dale Blount @@ -6,12 +6,13 @@ pkgname=ulogd pkgver=2.0.0 -pkgrel=4 +pkgrel=5 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' license=('GPL2') depends=('libmnl') +backup=('etc/ulogd.conf') makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi' 'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack' 'linuxdoc-tools' 'groff' 'texlive-core') @@ -26,10 +27,14 @@ optdepends=('postgresql-libs' options=('!libtool') source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'rc' - 'logrotate') + 'logrotate' + 'ulogd.conf.min' + 'ulogd.service') md5sums=('211e68781e3860959606fc94b97cf22e' 'c42230c1cabf5dd9b80bf9a0fd87ca7e' - 'dd32eeee0949adff4188544419acd17e') + 'dd32eeee0949adff4188544419acd17e' + 'c21531312f95e790ed19aa267a17d35a' + '13a1227052322b4c17b258ed358f055e') build() { cd $pkgname-$pkgver @@ -51,4 +56,7 @@ package() { install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd" install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd" + + install -Dm0644 $srcdir/ulogd.conf.min $pkgdir/etc/ulogd.conf + install -Dm0644 $srcdir/ulogd.service $pkgdir/usr/lib/systemd/system/ulogd.service } diff --git a/community/ulogd/ulogd.conf.min b/community/ulogd/ulogd.conf.min new file mode 100644 index 000000000..822575613 --- /dev/null +++ b/community/ulogd/ulogd.conf.min @@ -0,0 +1,20 @@ +[global] +nlgroup=1 +logfile="/var/log/ulogd.log" +loglevel=5 +rmem=131071 +bufsize=150000 + +plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so" +plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so" +plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so" +plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so" +plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so" + +stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU + +[ulog1] +nlgroup=1 + +[emu1] +file=/var/log/ulogd.syslogemu diff --git a/community/ulogd/ulogd.service b/community/ulogd/ulogd.service new file mode 100644 index 000000000..3984bbced --- /dev/null +++ b/community/ulogd/ulogd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Netfilter Ulogd daemon +After=network.target + +[Service] +Type=forking +User=root +ExecStart=/usr/sbin/ulogd -d +PIDFile=/var/run/ulogd.pid + +[Install] +WantedBy=multi-user.target diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index ce8a8773e..943b05786 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 165376 2012-08-17 00:20:05Z allan $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 166192 2012-09-05 13:26:53Z foutrelis $ +# Maintainer: Evangelos Foutras +# Contributor: Allan McRae # Contributor: Tom Newsom pkgname=sudo -_ver=1.8.5p3 -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +_sudover=1.8.6 +pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64') @@ -12,31 +13,38 @@ url="http://www.sudo.ws/sudo/" license=('custom') depends=('glibc' 'pam') backup=('etc/sudoers' 'etc/pam.d/sudo') -options=('!libtool' '!makeflags') -source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} +options=('!libtool') +source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz sudo.pam) -md5sums=('aa50e0a9ca02ac35d1020881bd3a221f' - 'aceea97d5f4fe063d6803bead339364d' - '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') +sha256sums=('93c4481ae5261ca0e988d069179fef40032729b94a110ceb2a3e92ca7842d2d3' + 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') build() { - cd "$srcdir/$pkgname-$_ver" + cd "$srcdir/$pkgname-$_sudover" - ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ - --with-env-editor --with-all-insults --with-logfac=auth + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-logfac=auth \ + --with-pam \ + --with-env-editor \ + --with-passprompt="[sudo] password for %p: " \ + --with-all-insults make } check() { - cd "$srcdir/$pkgname-$_ver" + cd "$srcdir/$pkgname-$_sudover" make check } package() { - cd "$srcdir/$pkgname-$_ver" + cd "$srcdir/$pkgname-$_sudover" make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" } + +# vim:set ts=2 sw=2 et: diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index cf2632c83..38291f4f5 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165274 2012-08-14 20:33:11Z andyrtr $ +# $Id: PKGBUILD 166183 2012-09-05 08:15:25Z andyrtr $ # Maintainer: Andreas Radke pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.1 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" @@ -25,7 +25,7 @@ md5sums=('87ade07e3d1efd03c9c3add949cf9c00' '9b8467a1e51d360096b70e2c3c081e6c' '3733c23e77eb503bd94cc368e02830dc' '90c30380d4c8cd48a908cfdadae1ea24' - '7d2347b6d444e223f6b7dc6e706b9ffe' + 'b4868b83f7f2d6ec24a1be76509379f0' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch index 0eb5f4af1..83fabdb4f 100644 --- a/extra/cups/cups-systemd-socket.patch +++ b/extra/cups/cups-systemd-socket.patch @@ -1,7 +1,7 @@ -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 @@ +diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in +--- cups-1.6b1/config.h.in.systemd-socket 2012-05-17 00:57:03.000000000 +0200 ++++ cups-1.6b1/config.h.in 2012-05-28 11:16:35.657250584 +0200 +@@ -506,6 +506,13 @@ /* @@ -15,9 +15,9 @@ diff -up cups-1.5.0/config.h.in.systemd-socket cups-1.5.0/config.h.in * Various scripting languages... */ -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 +diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4 +--- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket 2012-05-28 11:16:35.658250577 +0200 ++++ cups-1.6b1/config-scripts/cups-systemd.m4 2012-05-28 11:16:35.658250577 +0200 @@ -0,0 +1,36 @@ +dnl +dnl "$Id$" @@ -55,18 +55,18 @@ diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/con +dnl +dnl "$Id$" +dnl -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) +diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in +--- cups-1.6b1/configure.in.systemd-socket 2012-04-23 19:26:57.000000000 +0200 ++++ cups-1.6b1/configure.in 2012-05-28 11:16:35.658250577 +0200 +@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4) sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-dnssd.m4) sinclude(config-scripts/cups-launchd.m4) +sinclude(config-scripts/cups-systemd.m4) sinclude(config-scripts/cups-defaults.m4) - sinclude(config-scripts/cups-pdf.m4) sinclude(config-scripts/cups-scripting.m4) -@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs + +@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs conf/snmp.conf cups-config data/testprint @@ -76,10 +76,10 @@ diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in desktop/cups.desktop doc/help/ref-cupsd-conf.html doc/help/standard.html -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( +diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c +--- cups-1.6b1/cups/usersys.c.systemd-socket 2012-04-23 19:26:57.000000000 +0200 ++++ cups-1.6b1/cups/usersys.c 2012-05-28 11:16:35.659250570 +0200 +@@ -975,7 +975,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.0/cups/usersys.c.systemd-socket cups-1.5.0/cups/usersys.c cups_server = CUPS_DEFAULT_DOMAINSOCKET; else #endif /* CUPS_DEFAULT_DOMAINSOCKET */ -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 +diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in +--- cups-1.6b1/data/cups.path.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 ++++ cups-1.6b1/data/cups.path.in 2012-05-28 11:16:35.659250570 +0200 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printer Service Spool @@ -100,9 +100,9 @@ diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.i + +[Install] +WantedBy=multi-user.target -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 +diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in +--- cups-1.6b1/data/cups.service.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 ++++ cups-1.6b1/data/cups.service.in 2012-05-28 11:16:35.659250570 +0200 @@ -0,0 +1,10 @@ +[Unit] +Description=CUPS Printing Service @@ -114,25 +114,22 @@ diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.ser +[Install] +Also=cups.socket cups.path +WantedBy=printer.target -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,11 @@ +diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in +--- cups-1.6b1/data/cups.socket.in.systemd-socket 2012-05-28 11:16:35.660250563 +0200 ++++ cups-1.6b1/data/cups.socket.in 2012-05-28 11:16:35.660250563 +0200 +@@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printing Service Sockets + +[Socket] +ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ -+ListenStream=631 -+ListenDatagram=0.0.0.0:631 -+BindIPv6Only=ipv6-only + +[Install] +WantedBy=sockets.target -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: +diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile +--- cups-1.6b1/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200 ++++ cups-1.6b1/data/Makefile 2012-05-28 11:16:35.660250563 +0200 +@@ -100,6 +100,12 @@ install-data: $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ done $(INSTALL_DIR) -m 755 $(DATADIR)/profiles @@ -145,8 +142,8 @@ diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile # -@@ -159,6 +165,9 @@ uninstall: - -$(RMDIR) $(DATADIR)/charsets +@@ -143,6 +149,9 @@ uninstall: + -$(RMDIR) $(DATADIR)/data -$(RMDIR) $(DATADIR)/banners -$(RMDIR) $(DATADIR) + for file in $(SYSTEMD_UNITS); do \ @@ -155,10 +152,10 @@ diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile # -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@ +diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in +--- cups-1.6b1/Makedefs.in.systemd-socket 2012-05-28 11:16:35.648250647 +0200 ++++ cups-1.6b1/Makedefs.in 2012-05-28 11:16:35.660250563 +0200 +@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ CXXLIBS = @CXXLIBS@ DBUS_NOTIFIER = @DBUS_NOTIFIER@ DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ @@ -166,15 +163,13 @@ diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in DNSSD_BACKEND = @DNSSD_BACKEND@ DSOFLAGS = -L../cups @DSOFLAGS@ DSOLIBS = @DSOLIBS@ $(COMMONLIBS) -@@ -151,6 +152,7 @@ FONTS = @FONTS@ - IMGLIBS = @IMGLIBS@ - IMGFILTERS = @IMGFILTERS@ + DNSSDLIBS = @DNSSDLIBS@ LAUNCHDLIBS = @LAUNCHDLIBS@ +SDLIBS = @SDLIBS@ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ -L../scheduler @LDARCHFLAGS@ \ @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) -@@ -267,6 +269,7 @@ PAMFILE = @PAMFILE@ +@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@ DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ DBUSDIR = @DBUSDIR@ @@ -182,10 +177,10 @@ diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in # -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 +diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h +--- cups-1.6b1/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100 ++++ cups-1.6b1/scheduler/client.h 2012-05-28 11:16:35.661250556 +0200 +@@ -77,6 +77,9 @@ typedef struct int fd; /* File descriptor for this server */ http_addr_t address; /* Bind address of socket */ http_encryption_t encryption; /* To encrypt or not to encrypt... */ @@ -195,9 +190,9 @@ diff -up cups-1.5.0/scheduler/client.h.systemd-socket cups-1.5.0/scheduler/clien } cupsd_listener_t; -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 +diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c +--- cups-1.6b1/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200 ++++ cups-1.6b1/scheduler/listen.c 2012-05-28 11:16:35.661250556 +0200 @@ -401,7 +401,11 @@ cupsdStopListening(void) lis; lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) @@ -211,9 +206,9 @@ diff -up cups-1.5.0/scheduler/listen.c.systemd-socket cups-1.5.0/scheduler/liste { #ifdef WIN32 closesocket(lis->fd); -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 +diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c +--- cups-1.6b1/scheduler/main.c.systemd-socket 2012-05-28 11:16:35.612250897 +0200 ++++ cups-1.6b1/scheduler/main.c 2012-05-28 12:49:32.698375139 +0200 @@ -26,6 +26,8 @@ * launchd_checkin() - Check-in with launchd and collect the listening * fds. @@ -244,7 +239,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c static void parent_handler(int sig); static void process_children(void); static void sigchld_handler(int sig); -@@ -537,6 +546,13 @@ main(int argc, /* I - Number of comm +@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -258,7 +253,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c /* * Startup the server... */ -@@ -759,6 +775,15 @@ main(int argc, /* I - Number of comm +@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -274,7 +269,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c /* * Startup the server... */ -@@ -1584,6 +1609,100 @@ launchd_checkout(void) +@@ -1516,6 +1541,102 @@ launchd_checkout(void) } #endif /* HAVE_LAUNCHD */ @@ -306,14 +301,16 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/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 (!r) ++ { + cupsdLogMessage(CUPSD_LOG_ERROR, + "systemd_checkin: Socket not of the right type"); + continue; @@ -327,7 +324,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c + continue; + } + -+ /* ++ /* + * Try to match the systemd socket address to one of the listeners... + */ + @@ -335,7 +332,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c + lis; + lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) + if (httpAddrEqual(&lis->address, &addr)) -+ break; ++ break; + + if (lis) + { @@ -375,10 +372,10 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c /* * 'parent_handler()' - Catch USR1/CHLD signals... -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 +diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile +--- cups-1.6b1/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200 ++++ cups-1.6b1/scheduler/Makefile 2012-05-28 11:16:35.663250542 +0200 +@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \ @@ -387,12 +384,12 @@ diff -up cups-1.5.0/scheduler/Makefile.systemd-socket cups-1.5.0/scheduler/Makef cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... -@@ -390,7 +390,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a +@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \ $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \ - $(LIBWRAP) -+ $(LIBWRAP) $(SDLIBS) ++ $(LIBWRAP) $(SDLIBS) + tls.o: tls-darwin.c tls-gnutls.c tls-openssl.c - # diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index 66b097e84..61bd980df 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164844 2012-08-06 23:13:12Z andrea $ +# $Id: PKGBUILD 166203 2012-09-05 18:26:55Z andrea $ # Maintainer: Andrea Scarpino pkgname=kactivities -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d7c3b9bd2d4ec4b64e208d02571eb62f9ac4ee90') +sha1sums=('f216d37e961f46f5830fb15d65c71a9c322cebfa') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index 6fdf36702..4e6cd1b2b 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164868 2012-08-06 23:15:44Z andrea $ +# $Id: PKGBUILD 166227 2012-09-05 18:29:27Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-jovie -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('2e5218951425e32d725001f4836283a2d2ac412f') +sha1sums=('f9edb471a3245f3d2e429d5d2140954673f97a9c') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 8657798b3..389877fca 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 164869 2012-08-06 23:15:48Z andrea $ +# $Id: PKGBUILD 166228 2012-09-05 18:29:31Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-kaccessible -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides accessibility services like focus tracking and a screenreader' -url='http://accessibility.kde.org/' +url='https://projects.kde.org/projects/kde/kdeaccessibility/kaccessible' license=('GPL' 'FDL') groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('a13180088fae411aa03ec3f2125ed766cd807160') +sha1sums=('8715188d1e3c01f204409bad2bad6d0f30a3f39a') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index a7e7a3957..8de02de3f 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164870 2012-08-06 23:15:54Z andrea $ +# $Id: PKGBUILD 166229 2012-09-05 18:29:38Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-kmag -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('32a2b02c78f3f3dac33df72dbeaf0c18ddf91269') +sha1sums=('9205eba59c39f9d9e0a38c8424bdde73cb43a174') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index 7b8b448e3..fa77f3ddf 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164871 2012-08-06 23:15:59Z andrea $ +# $Id: PKGBUILD 166230 2012-09-05 18:29:43Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-kmousetool -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('ea14b338f3f078fdffb3f7b0f69ebbddcc4b016d') +sha1sums=('ca977db4f5cbaa6ca99adb21ce6b16306f94de6b') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index 3f0b4b05d..e82468eb9 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164872 2012-08-06 23:16:04Z andrea $ +# $Id: PKGBUILD 166231 2012-09-05 18:29:48Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-kmouth -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('cfd00c317c5928b355ef095c3d46ed7ed581afeb') +sha1sums=('fae5e95a1d65a2e4b0a695969c159d6bb75283ef') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index af83473b0..108b02947 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164959 2012-08-07 15:57:09Z andrea $ +# $Id: PKGBUILD 166232 2012-09-05 18:29:55Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -7,15 +7,15 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.9.0 -pkgrel=2 +pkgver=4.9.1 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('d584265701d1fd17e98f756a21dd5a21a02df4a3' +sha1sums=('9c544f883c5116a928027944fce7a21715c421f3' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index e9b07f61e..1f273dd63 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164874 2012-08-06 23:16:15Z andrea $ +# $Id: PKGBUILD 166233 2012-09-05 18:29:59Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('d4531e0ba2fff19d74b1486390843da5d470117f') +sha1sums=('95a6aac7e6e39a1618de1452ef5d0bb1cb8c9956') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 38eca9a66..f44bc741f 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164875 2012-08-06 23:16:19Z andrea $ +# $Id: PKGBUILD 166234 2012-09-05 18:30:03Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebase-konsole -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('4ee3d7da93512788959f4d52e58d7a98c646e854') +sha1sums=('57af84c4fc441dfc3bcea9eef96b6283a3a8322e') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 4f4125954..9363a4fea 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164857 2012-08-06 23:14:44Z andrea $ +# $Id: PKGBUILD 166216 2012-09-05 18:28:21Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.9.0 -pkgrel=1 +pkgver=4.9.1 +pkgrel=3 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -29,8 +29,9 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('fa614c7f59a43e24e09229374c4193eea86f6865' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'fix-freeze.patch') +sha1sums=('ac1753e2264246ec6347961f44b0aae07072dbb4' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' @@ -38,13 +39,17 @@ sha1sums=('fa614c7f59a43e24e09229374c4193eea86f6865' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + '820135367cc577a8557061b9844d3ce4a5fde90f') build() { cd "${srcdir}"/${_pkgname}-${pkgver} patch -p1 -i "${srcdir}"/kdm-xinitrd.patch patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch + + # KDEBUG 306260 + patch -p1 -i "${srcdir}"/fix-freeze.patch cd "${srcdir}" mkdir build diff --git a/extra/kdebase-workspace/fix-freeze.patch b/extra/kdebase-workspace/fix-freeze.patch new file mode 100644 index 000000000..1926baebc --- /dev/null +++ b/extra/kdebase-workspace/fix-freeze.patch @@ -0,0 +1,56 @@ +diff --git a/kwin/tabbox/clientmodel.cpp b/kwin/tabbox/clientmodel.cpp +index 9591bab..a67d979 100644 +--- a/kwin/tabbox/clientmodel.cpp ++++ b/kwin/tabbox/clientmodel.cpp +@@ -188,7 +188,7 @@ void ClientModel::createClientList(int desktop, bool partialReset) + switch(tabBox->config().clientSwitchingMode()) { + case TabBoxConfig::FocusChainSwitching: { + TabBoxClient* c = start; +- if (!c) { ++ if (!tabBox->isInFocusChain(c)) { + QSharedPointer firstClient = tabBox->firstClientFocusChain().toStrongRef(); + if (firstClient) { + c = firstClient.data(); +diff --git a/kwin/tabbox/tabbox.cpp b/kwin/tabbox/tabbox.cpp +index d96d0bd..7a08d37 100644 +--- a/kwin/tabbox/tabbox.cpp ++++ b/kwin/tabbox/tabbox.cpp +@@ -112,6 +112,14 @@ QWeakPointer< TabBoxClient > TabBoxHandlerImpl::firstClientFocusChain() const + } + } + ++bool TabBoxHandlerImpl::isInFocusChain(TabBoxClient *client) const ++{ ++ if (TabBoxClientImpl *c = static_cast(client)) { ++ return Workspace::self()->globalFocusChain().contains(c->client()); ++ } ++ return false; ++} ++ + int TabBoxHandlerImpl::nextDesktopFocusChain(int desktop) const + { + return m_tabBox->nextDesktopFocusChain(desktop); +diff --git a/kwin/tabbox/tabbox.h b/kwin/tabbox/tabbox.h +index 6652f93..bba0b39 100644 +--- a/kwin/tabbox/tabbox.h ++++ b/kwin/tabbox/tabbox.h +@@ -52,6 +52,7 @@ public: + virtual QString desktopName(int desktop) const; + virtual QWeakPointer< TabBoxClient > nextClientFocusChain(TabBoxClient* client) const; + virtual QWeakPointer< TabBoxClient > firstClientFocusChain() const; ++ virtual bool isInFocusChain (TabBoxClient* client) const; + virtual int nextDesktopFocusChain(int desktop) const; + virtual int numberOfDesktops() const; + virtual TabBoxClientList stackingOrder() const; +diff --git a/kwin/tabbox/tabboxhandler.h b/kwin/tabbox/tabboxhandler.h +index 7abddfc..d9a6122 100644 +--- a/kwin/tabbox/tabboxhandler.h ++++ b/kwin/tabbox/tabboxhandler.h +@@ -119,6 +119,7 @@ public: + * @since 4.9.1 + **/ + virtual QWeakPointer firstClientFocusChain() const = 0; ++ virtual bool isInFocusChain(TabBoxClient* client) const = 0; + /** + * @param client The client whose desktop name should be retrieved + * @return The desktop name of the given TabBoxClient. If the client is diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index d1609ad54..19aab3394 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164858 2012-08-06 23:14:55Z andrea $ +# $Id: PKGBUILD 166217 2012-09-05 18:28:31Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('f5c358e3c7902b15328908a9966f98774827988e') +sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 3aab0f727..1ccc6c5eb 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164876 2012-08-06 23:16:23Z andrea $ +# $Id: PKGBUILD 166235 2012-09-05 18:30:06Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-kimono -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('5c196ced2b07e58ecdc66e779f21e4c412da8b4b') +sha1sums=('08b1a43eb800de1ad1ed7a0a147e6c73b3928bd8') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 1a5690a8b..67c19c604 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164877 2012-08-06 23:16:29Z andrea $ +# $Id: PKGBUILD 166236 2012-09-05 18:30:12Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-korundum -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'ruby19.patch') -sha1sums=('7c97b549bb6958223fc0b28f657fec09bb95b7e5' +sha1sums=('ea22f9bddd7450e15f6dcf3d7f243874f664bc71' 'c074f027bac3b9bffe70a2c2304a6a7be12be034') build() { diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index dbdbcf596..02574f353 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164878 2012-08-06 23:16:32Z andrea $ +# $Id: PKGBUILD 166237 2012-09-05 18:30:16Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('fb6bb9e50d9ec03a86f29f44e9433c521d29761c') +sha1sums=('d97c6ab445ab209d41a817eeebbfa42461c2511a') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index a0f41947c..9d8ba383b 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164879 2012-08-06 23:16:36Z andrea $ +# $Id: PKGBUILD 166238 2012-09-05 18:30:19Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlkde -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('cc716e7b285efc8c90a086d8881a7e9ff0d49263') +sha1sums=('9a4e298770152a9ed903eff22048021e19e5f257') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 6b7945b55..9caf961b4 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164852 2012-08-06 23:14:00Z andrea $ +# $Id: PKGBUILD 166211 2012-09-05 18:27:40Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlqt -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('c51a788cee16f6222e70c96361083581fad1fb51') +sha1sums=('9800056ce7e2ced8d8487776e7ecb58d3bf87370') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index d465db648..fdaf5713c 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164853 2012-08-06 23:14:04Z andrea $ +# $Id: PKGBUILD 166212 2012-09-05 18:27:44Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'pyqt' 'qscintilla' 'python2-sip' 'python-sip') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('eb51fcadd14a184895195be822e4ed704e74d3ed') +sha1sums=('b1066dc30d59ddfb16db3f7e1ee11a2f9895dfca') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 20c71429c..ed684d937 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164855 2012-08-06 23:14:14Z andrea $ +# $Id: PKGBUILD 166214 2012-09-05 18:27:52Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-qtruby -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('04146719f7e6e2001a1f2318b5a45d47f58ac0b3') +sha1sums=('6362e3e1e65085cda1c8b2793ba7105150ec989d') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index eef0e9b96..7d8223782 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164854 2012-08-06 23:14:08Z andrea $ +# $Id: PKGBUILD 166213 2012-09-05 18:27:49Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-qyoto -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('91e43ce4a1860e186fd93fdfec0bbe2da10133ac') +sha1sums=('a5a6b42a7c37c554fa67dcd9a9439c4d32a6c59a') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index c769aeb9e..d90f1d2ff 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164847 2012-08-06 23:13:29Z andrea $ +# $Id: PKGBUILD 166206 2012-09-05 18:27:11Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokegen -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('7470301b856703a365cf8bbd43d0f297ef4fff08') +sha1sums=('d73bd72550a644f073b94258591fe2c7c742360b') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 5a851d789..2f531bf86 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164851 2012-08-06 23:13:56Z andrea $ +# $Id: PKGBUILD 166210 2012-09-05 18:27:36Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokekde -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -16,7 +16,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdegraphics-okular: Okular bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('ab796e48995560a59d1f741e9e2125eaa4263aa5') +sha1sums=('ae611a3571306fe77fba5799ac8da4017633c84e') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 0239f7fd2..0ae1415ba 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164848 2012-08-06 23:13:35Z andrea $ +# $Id: PKGBUILD 166207 2012-09-05 18:27:14Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokeqt -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('d9c0b21882263e038cdb3de9d0e99ecbf2df7986') +sha1sums=('db56b4a6b4380a61735a4dd5366af75ad4901475') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 0e7384ed7..6c5ef2b90 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164865 2012-08-06 23:15:30Z andrea $ +# $Id: PKGBUILD 166224 2012-09-05 18:29:10Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-analitza -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('942057e56709288ade435f37f9cd2d63a1496e06') +sha1sums=('b69134548d366f705b8854f8da222758f2d6a0ef') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index 4bd66ba07..76753b9b7 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164880 2012-08-06 23:16:42Z andrea $ +# $Id: PKGBUILD 166239 2012-09-05 18:30:25Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-blinken -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('5debedb870be8d4f2ee7a129c104c193864e907e') +sha1sums=('874596bfccf8e675667c8a5ffe4d104850752c13') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 970dc69f4..34b86e024 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164881 2012-08-06 23:16:48Z andrea $ +# $Id: PKGBUILD 166240 2012-09-05 18:30:30Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-cantor -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('2d97209780542b6d2081d2c6f855c3a3751dd0e1') +sha1sums=('03e8344bdc258412550d5617424a1fcd8a762e16') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index 3481a369b..2d0540097 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164882 2012-08-06 23:16:53Z andrea $ +# $Id: PKGBUILD 166241 2012-09-05 18:30:36Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kalgebra -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('38a49f91dc4391868053efd1735582e86c879d01') +sha1sums=('15727b87d3951b95ef839dd6bb58dcf193f8fb5c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index d535edadb..3bacfa689 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164883 2012-08-06 23:16:58Z andrea $ +# $Id: PKGBUILD 166242 2012-09-05 18:30:41Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kalzium -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('da8c782a9e758a860a76204435aaeab15f5edd64') +sha1sums=('7a043108edb23a2d857622e44ffb51cf3e870530') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 28c2f13c4..878df2ea6 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164884 2012-08-06 23:17:04Z andrea $ +# $Id: PKGBUILD 166243 2012-09-05 18:30:46Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kanagram -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('b7dba4d67a119039bf7eea1abfbcca079ff9c04c') +sha1sums=('78961fcd7ee14991be5d3e79068bf0651b86ba3d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index 089d9725b..eaf180e27 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164885 2012-08-06 23:17:09Z andrea $ +# $Id: PKGBUILD 166244 2012-09-05 18:30:51Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kbruch -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('177d4410ab596baf80c046caf1207b65a82944c8') +sha1sums=('a4e4ede1732838e596d1a4f2db054b21ce3bc799') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index 5040c3959..fdb38c7e6 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164886 2012-08-06 23:17:15Z andrea $ +# $Id: PKGBUILD 166245 2012-09-05 18:30:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kgeography -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('5cedfb17606878dbc8900a11f846f6baa558bb66') +sha1sums=('a5c817949b35f8001a2489d0fabadddcbc7646df') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 69bc47bde..dee194428 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164887 2012-08-06 23:17:20Z andrea $ +# $Id: PKGBUILD 166246 2012-09-05 18:31:01Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-khangman -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('a8a5f3250bcb73def0ddd670f27b30f2a4621b19') +sha1sums=('3b07235ff8aa419cc6971c14791e56a15c10d39a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 755a55db8..f23d9f2fe 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164888 2012-08-06 23:17:26Z andrea $ +# $Id: PKGBUILD 166247 2012-09-05 18:31:06Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kig -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('170616856665f4a0ca8413f6bb9185ca54ee98d4') +sha1sums=('ab4382d1b463569eba87efc7fbf9b12d08b236a7') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 231449520..14f3cd003 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164889 2012-08-06 23:17:31Z andrea $ +# $Id: PKGBUILD 166248 2012-09-05 18:31:12Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kiten -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('60729b6df981d6102266eb159359827a58d34c7f') +sha1sums=('0a1b4228cc05d8bf185af5a929e864c541f6e0bf') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 1b5ecbbbd..5152b1264 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164890 2012-08-06 23:17:37Z andrea $ +# $Id: PKGBUILD 166249 2012-09-05 18:31:17Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-klettres -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('fef07c9bd7f0f0a7ffe96274e8d09fcddd06e691') +sha1sums=('f52621b525ba2d2598fc119cb121e96780c87f60') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 067247e92..c33090942 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164891 2012-08-06 23:17:42Z andrea $ +# $Id: PKGBUILD 166250 2012-09-05 18:31:23Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kmplot -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('fcae6ed767ea6effac98cda2f3be79c41a538ce8') +sha1sums=('7118af5ce1a66c79fd0439b9aa249169ef63b2cd') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index a88d17414..014575c70 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164892 2012-08-06 23:17:47Z andrea $ +# $Id: PKGBUILD 166251 2012-09-05 18:31:28Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kstars -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('ecb774bc2b946afd2fd3c4db48ae7109239272a0') +sha1sums=('ee07f3cd1141990a1c6bd9ad655413a8d74d8df9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index c74544063..8f731cb3e 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164893 2012-08-06 23:17:52Z andrea $ +# $Id: PKGBUILD 166252 2012-09-05 18:31:33Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-ktouch -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('8a9d25044d9a33281bd982e32a3c6fd72f5d22fb') +sha1sums=('a4203a226d3b02b5619efd01291816f1b4de2b50') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index ae388b5ca..c367e7023 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164894 2012-08-06 23:17:57Z andrea $ +# $Id: PKGBUILD 166253 2012-09-05 18:31:38Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kturtle -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('013d88bfd86183138eacf3129722efdfa0742064') +sha1sums=('c3ee656a8ca0fb4b75e810453e88f5fe30466de3') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index 30b2042e7..697b3b120 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164895 2012-08-06 23:18:02Z andrea $ +# $Id: PKGBUILD 166254 2012-09-05 18:31:43Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kwordquiz -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('026fedf11d7392d30703b127325671978d03c1d7') +sha1sums=('66d66016c7cb708aeb436861a647716fcde39028') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 5c83a1042..bc16a2517 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164860 2012-08-06 23:15:07Z andrea $ +# $Id: PKGBUILD 166219 2012-09-05 18:28:42Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-marble -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('2eb264123f487629399d807151e1ae6ea1c6c8bb') +sha1sums=('5975a99ef55b418b709279c95ff9afe01cf64264') build() { cd "${srcdir}" diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index 1f70e86d6..aaaaf809a 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164896 2012-08-06 23:18:08Z andrea $ +# $Id: PKGBUILD 166255 2012-09-05 18:31:48Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-pairs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('d040039b3cffc4b3375b6d5eca2e0a026187f359') +sha1sums=('f109037b7960d0e14e23726e7edbbf0bf430b764') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 5ea778e0f..f2792e837 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164897 2012-08-06 23:18:13Z andrea $ +# $Id: PKGBUILD 166256 2012-09-05 18:31:53Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-parley -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('5f4b600939ec81557f38eb39eca07f6abee30d87') +sha1sums=('8ca16eed35b87ce2416bb715dc392207198f802c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index f0c81b68d..8104ab064 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164898 2012-08-06 23:18:16Z andrea $ +# $Id: PKGBUILD 166257 2012-09-05 18:31:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-rocs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('e84667bf68c3f5d48b8153d0f15b033cac5267bc') +sha1sums=('92547f7b3402763395bef93ce43411a381694ffb') options=('!makeflags') build() { diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index f79a96d1a..305b7e536 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164899 2012-08-06 23:18:22Z andrea $ +# $Id: PKGBUILD 166258 2012-09-05 18:32:02Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-step -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('6d8c2e7e2d295418515f3e3787a4649226716cc4') +sha1sums=('87667ac074e6ac924e8b7123969796f5e61ec2d3') build() { cd "${srcdir}" diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index 291853424..00e623045 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164900 2012-08-06 23:18:49Z andrea $ +# $Id: PKGBUILD 166259 2012-09-05 18:32:27Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -43,7 +43,7 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('993c00841d9ab322e1bc1bd39b368579c62f4c45') +sha1sums=('5fc77f230cff0a9b243403affc176e4e4757a1e7') build() { cd $srcdir @@ -73,8 +73,6 @@ package_kdegames-bomber() { install='kdegames.install' cd $srcdir/build/bomber make DESTDIR=$pkgdir install - cd $srcdir/build/doc/bomber - make DESTDIR=$pkgdir install } package_kdegames-bovo() { @@ -84,8 +82,6 @@ package_kdegames-bovo() { install='kdegames.install' cd $srcdir/build/bovo make DESTDIR=$pkgdir install - cd $srcdir/build/doc/bovo - make DESTDIR=$pkgdir install } package_kdegames-granatier() { @@ -95,8 +91,6 @@ package_kdegames-granatier() { install='kdegames.install' cd $srcdir/build/granatier make DESTDIR=$pkgdir install - cd $srcdir/build/doc/granatier - make DESTDIR=$pkgdir install } package_kdegames-kajongg() { @@ -106,8 +100,6 @@ package_kdegames-kajongg() { install='kdegames.install' cd $srcdir/build/kajongg make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kajongg - make DESTDIR=$pkgdir install # Use the python2 executable find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' @@ -120,8 +112,6 @@ package_kdegames-kapman() { install='kdegames.install' cd $srcdir/build/kapman make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kapman - make DESTDIR=$pkgdir install } package_kdegames-katomic() { @@ -131,8 +121,6 @@ package_kdegames-katomic() { install='kdegames.install' cd $srcdir/build/katomic make DESTDIR=$pkgdir install - cd $srcdir/build/doc/katomic - make DESTDIR=$pkgdir install } package_kdegames-kbattleship() { @@ -142,8 +130,6 @@ package_kdegames-kbattleship() { install='kdegames-kbattleship.install' cd $srcdir/build/kbattleship make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbattleship - make DESTDIR=$pkgdir install } package_kdegames-kblackbox() { @@ -153,8 +139,6 @@ package_kdegames-kblackbox() { install='kdegames.install' cd $srcdir/build/kblackbox make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kblackbox - make DESTDIR=$pkgdir install } package_kdegames-kblocks() { @@ -164,8 +148,6 @@ package_kdegames-kblocks() { install='kdegames.install' cd $srcdir/build/kblocks make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kblocks - make DESTDIR=$pkgdir install } package_kdegames-kbounce() { @@ -175,8 +157,6 @@ package_kdegames-kbounce() { install='kdegames.install' cd $srcdir/build/kbounce make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbounce - make DESTDIR=$pkgdir install } package_kdegames-kbreakout() { @@ -186,8 +166,6 @@ package_kdegames-kbreakout() { install='kdegames.install' cd $srcdir/build/kbreakout make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbreakout - make DESTDIR=$pkgdir install } package_kdegames-kdiamond() { @@ -197,8 +175,6 @@ package_kdegames-kdiamond() { install='kdegames.install' cd $srcdir/build/kdiamond make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kdiamond - make DESTDIR=$pkgdir install } package_kdegames-kfourinline() { @@ -208,8 +184,6 @@ package_kdegames-kfourinline() { install='kdegames-kfourinline.install' cd $srcdir/build/kfourinline make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kfourinline - make DESTDIR=$pkgdir install } package_kdegames-kgoldrunner() { @@ -219,8 +193,6 @@ package_kdegames-kgoldrunner() { install='kdegames.install' cd $srcdir/build/kgoldrunner make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kgoldrunner - make DESTDIR=$pkgdir install } package_kdegames-kigo() { @@ -230,8 +202,6 @@ package_kdegames-kigo() { install='kdegames-kigo.install' cd $srcdir/build/kigo make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kigo - make DESTDIR=$pkgdir install } package_kdegames-killbots() { @@ -241,8 +211,6 @@ package_kdegames-killbots() { install='kdegames.install' cd $srcdir/build/killbots make DESTDIR=$pkgdir install - cd $srcdir/build/doc/killbots - make DESTDIR=$pkgdir install } package_kdegames-kiriki() { @@ -252,8 +220,6 @@ package_kdegames-kiriki() { install='kdegames.install' cd $srcdir/build/kiriki make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kiriki - make DESTDIR=$pkgdir install } package_kdegames-kjumpingcube() { @@ -263,8 +229,6 @@ package_kdegames-kjumpingcube() { install='kdegames.install' cd $srcdir/build/kjumpingcube make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kjumpingcube - make DESTDIR=$pkgdir install } package_kdegames-klickety() { @@ -276,8 +240,6 @@ package_kdegames-klickety() { install='kdegames.install' cd $srcdir/build/klickety make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klickety - make DESTDIR=$pkgdir install } package_kdegames-klines() { @@ -287,8 +249,6 @@ package_kdegames-klines() { install='kdegames.install' cd $srcdir/build/klines make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klines - make DESTDIR=$pkgdir install } package_kdegames-kmahjongg() { @@ -298,8 +258,6 @@ package_kdegames-kmahjongg() { install='kdegames.install' cd $srcdir/build/kmahjongg make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmahjongg - make DESTDIR=$pkgdir install } package_kdegames-kmines() { @@ -309,8 +267,6 @@ package_kdegames-kmines() { install='kdegames.install' cd $srcdir/build/kmines make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmines - make DESTDIR=$pkgdir install } package_kdegames-knetwalk() { @@ -320,8 +276,6 @@ package_kdegames-knetwalk() { install='kdegames.install' cd $srcdir/build/knetwalk make DESTDIR=$pkgdir install - cd $srcdir/build/doc/knetwalk - make DESTDIR=$pkgdir install } package_kdegames-kolf() { @@ -331,8 +285,6 @@ package_kdegames-kolf() { install='kdegames-kolf.install' cd $srcdir/build/kolf make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kolf - make DESTDIR=$pkgdir install } package_kdegames-kollision() { @@ -342,8 +294,6 @@ package_kdegames-kollision() { install='kdegames.install' cd $srcdir/build/kollision make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kollision - make DESTDIR=$pkgdir install } package_kdegames-konquest() { @@ -353,8 +303,6 @@ package_kdegames-konquest() { install='kdegames.install' cd $srcdir/build/konquest make DESTDIR=$pkgdir install - cd $srcdir/build/doc/konquest - make DESTDIR=$pkgdir install } package_kdegames-kpatience() { @@ -365,8 +313,6 @@ package_kdegames-kpatience() { replaces=('kdegames-kpat') cd $srcdir/build/kpat make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kpat - make DESTDIR=$pkgdir install } package_kdegames-kreversi() { @@ -376,8 +322,6 @@ package_kdegames-kreversi() { install='kdegames.install' cd $srcdir/build/kreversi make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kreversi - make DESTDIR=$pkgdir install } package_kdegames-kshisen() { @@ -387,8 +331,6 @@ package_kdegames-kshisen() { install='kdegames.install' cd $srcdir/build/kshisen make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kshisen - make DESTDIR=$pkgdir install } package_kdegames-ksirk() { @@ -398,8 +340,6 @@ package_kdegames-ksirk() { install='kdegames.install' cd $srcdir/build/ksirk make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksirk - make DESTDIR=$pkgdir install } package_kdegames-kspaceduel() { @@ -409,8 +349,6 @@ package_kdegames-kspaceduel() { install='kdegames-kspaceduel.install' cd $srcdir/build/kspaceduel make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kspaceduel - make DESTDIR=$pkgdir install } package_kdegames-ksquares() { @@ -420,8 +358,6 @@ package_kdegames-ksquares() { install='kdegames.install' cd $srcdir/build/ksquares make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksquares - make DESTDIR=$pkgdir install } package_kdegames-ksudoku() { @@ -431,8 +367,6 @@ package_kdegames-ksudoku() { install='kdegames.install' cd $srcdir/build/ksudoku make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksudoku - make DESTDIR=$pkgdir install } package_kdegames-ktron() { @@ -442,8 +376,6 @@ package_kdegames-ktron() { install='kdegames.install' cd $srcdir/build/ktron make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktron - make DESTDIR=$pkgdir install } package_kdegames-ktuberling() { @@ -453,8 +385,6 @@ package_kdegames-ktuberling() { install='kdegames-ktuberling.install' cd $srcdir/build/ktuberling make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktuberling - make DESTDIR=$pkgdir install } package_kdegames-kubrick() { @@ -464,8 +394,6 @@ package_kdegames-kubrick() { install='kdegames.install' cd $srcdir/build/kubrick make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kubrick - make DESTDIR=$pkgdir install } package_kdegames-libkdegames() { @@ -474,9 +402,6 @@ package_kdegames-libkdegames() { depends=('kdelibs' 'openal') cd $srcdir/build/libkdegames make DESTDIR=$pkgdir install - for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do - install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i) - done } package_kdegames-libkmahjongg() { @@ -494,8 +419,6 @@ package_kdegames-lskat() { install='kdegames-lskat.install' cd $srcdir/build/lskat make DESTDIR=$pkgdir install - cd $srcdir/build/doc/lskat - make DESTDIR=$pkgdir install } package_kdegames-palapeli() { @@ -505,6 +428,4 @@ package_kdegames-palapeli() { install='kdegames-palapeli.install' cd $srcdir/build/palapeli make DESTDIR=$pkgdir install - cd $srcdir/build/doc/palapeli - make DESTDIR=$pkgdir install } diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index 76aa6dd7d..2809d97bd 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164901 2012-08-06 23:18:55Z andrea $ +# $Id: PKGBUILD 166260 2012-09-05 18:32:33Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-gwenview -pkgver=4.9.0 -pkgrel=2 +pkgver=4.9.1 +pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('df2f8cba8de3f5afbbe65ba70faee46a30945283') +sha1sums=('5bc7a7da59e17e19f7f5e52648635b5b3bf77a22') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 7fa506471..bdd21b999 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164902 2012-08-06 23:18:58Z andrea $ +# $Id: PKGBUILD 166261 2012-09-05 18:32:36Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kamera -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('8f9bd832d7cb88dd6345b4c4da8e00133544c5eb') +sha1sums=('6f032fd551d68b406749e1890d8ee15993a240ac') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 09839964a..896b9c70b 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164903 2012-08-06 23:19:04Z andrea $ +# $Id: PKGBUILD 166262 2012-09-05 18:32:42Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kcolorchooser -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('3b1069b69d6718f974708f59ff1295a57aa21317') +sha1sums=('ec7dd7928b72dee38455315fd15e569d11f3cf1c') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index b70df48a5..f1f0dd85a 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164904 2012-08-06 23:19:09Z andrea $ +# $Id: PKGBUILD 166263 2012-09-05 18:32:45Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kgamma -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('51e519a3337188313f81bd79eb7e73ed0f4f9437') +sha1sums=('b38bfb571e13dc5a6db389b2980e130b85a874c6') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 7f9f1bfe5..d909439fb 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164905 2012-08-06 23:19:14Z andrea $ +# $Id: PKGBUILD 166264 2012-09-05 18:32:51Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kolourpaint -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('0110bc9c818995592589f52715eecf727979fdb0') +sha1sums=('80d14586a889bd57e522321a863ac11b990b8982') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 943599dd2..8a32d059e 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164906 2012-08-06 23:19:19Z andrea $ +# $Id: PKGBUILD 166265 2012-09-05 18:32:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kruler -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('981d221c7cdbbf6e0d716bc6a01ee4b891bff484') +sha1sums=('37855f2bae3ac92c15c4563c85e4e70a129aeb76') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index d0c261445..66253015c 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164907 2012-08-06 23:19:22Z andrea $ +# $Id: PKGBUILD 166266 2012-09-05 18:32:59Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-ksaneplugin -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('ebd38d9b089d1e3f95733c9d53f3c3973e6be6fd') +sha1sums=('832ed50f5f858cea1984050a297fd3a9da3691aa') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index fa71d0838..c11c73ee8 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164908 2012-08-06 23:19:28Z andrea $ +# $Id: PKGBUILD 166267 2012-09-05 18:33:04Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-ksnapshot -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('5c3e26a08a43f2221ef66458b01c88ae191c0db2') +sha1sums=('e3941822f70df00aeede53481db4123aeb27e7a9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 44295e45d..66bee01d7 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164909 2012-08-06 23:19:34Z andrea $ +# $Id: PKGBUILD 166268 2012-09-05 18:33:09Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-mobipocket -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5d3b549ca12914b649096da61b96fa8568976674') +sha1sums=('7361731d3d69acba9aeab3b9d16bb2a2e4c3a547') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index d2463b684..70f76b709 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164849 2012-08-06 23:13:40Z andrea $ +# $Id: PKGBUILD 166208 2012-09-05 18:27:20Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-okular -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('c2e70c106de3af3a7e2e4cc77e80da736d9abe39') +sha1sums=('d192961e5990f3bab323df77c9fed92262936279') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index 1568c04c3..bfa326666 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164910 2012-08-06 23:19:38Z andrea $ +# $Id: PKGBUILD 166269 2012-09-05 18:33:12Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-strigi-analyzer -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ec0f4aa6600aafeb8e616765645b4bc99c8dcca8') +sha1sums=('254c64c37cc672934024475918d86184e0357895') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index f582b8908..ae46cd93a 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164911 2012-08-06 23:19:42Z andrea $ +# $Id: PKGBUILD 166270 2012-09-05 18:33:16Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-svgpart -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A KPart for viewving SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('e66323aef77e08d3d7faee0fab8a7a69a1708489') +sha1sums=('92eecdc27174f4e9032f62ef166e09f54a81fb4c') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index b9ab6af4f..375f6a584 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164912 2012-08-06 23:19:46Z andrea $ +# $Id: PKGBUILD 166271 2012-09-05 18:33:19Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-thumbnailers -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('8d6a7da3e34c8d9dc88465e65a5b31ecb1fd10f8') +sha1sums=('b58497a68c5524c04a25fcde2e6d3617bc50a2aa') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 82912385d..30662365f 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164913 2012-08-06 23:19:50Z andrea $ +# $Id: PKGBUILD 166272 2012-09-05 18:33:23Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-audiocd-kio -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -10,11 +10,11 @@ arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') depends=('libkcddb' 'libkcompactdisc' 'lame') makedepends=('cmake' 'automoc4') -groups=('kdemultimedia') +groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('d6e53caf098b48f173641e64e96e035a3d83e37e') +sha1sums=('62049d902cc3b454ba4096e889482f341841240f') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index aae26c437..c23e31384 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 164914 2012-08-06 23:19:56Z andrea $ +# $Id: PKGBUILD 166273 2012-09-05 18:33:28Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-dragonplayer -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" url='http://kde.org/applications/multimedia/dragonplayer/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('ea0b6f6c18daac3af2ab146c3654f500c9c4d6de') +sha1sums=('4e228d66185fbbcc8846f0d69074e9509909287e') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 79754269f..4838ad2f1 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 164915 2012-08-06 23:19:59Z andrea $ +# $Id: PKGBUILD 166274 2012-09-05 18:33:31Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('c5259a80fa80a476f2cb3964401de820db067bd9') +sha1sums=('dea7f81eba98e98d040062945a25c5f6c3651c65') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index f3d900035..598fd5c51 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 164916 2012-08-06 23:20:04Z andrea $ +# $Id: PKGBUILD 166275 2012-09-05 18:33:36Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-juk -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('fdd079faeb1572ed286bd2c1cfdd0de15d632c7a') +sha1sums=('9fa4ac409da7d2386c51e3d92a63ef1996562259') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index 1c97da26a..c1c59ee19 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 164917 2012-08-06 23:20:09Z andrea $ +# $Id: PKGBUILD 166276 2012-09-05 18:33:41Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-kmix -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('b112295964112c4fb0afa2971926939328cbc569') +sha1sums=('43f6e8b635c9662bc930f31680d84ad0e5c0dd6a') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index abea9eb5a..00823f222 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 164918 2012-08-06 23:20:15Z andrea $ +# $Id: PKGBUILD 166277 2012-09-05 18:33:46Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-kscd -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('f2559914081ba7b2ad9da1a4772d6e8462a21cef') +sha1sums=('9cd9feef981bcbbb6f55d606a80abd2ef5635294') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index 1c235688c..fea9af997 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 164919 2012-08-06 23:20:19Z andrea $ +# $Id: PKGBUILD 166278 2012-09-05 18:33:49Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-mplayerthumbs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' arch=('i686' 'x86_64') +groups=('kde' 'kdemultimedia') license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('7965c695a0e11ab03e8fb6ba447616d2efe18e9c') +sha1sums=('f3f8b48b5c98e47bba0ed5df26f2543dacb07b4c') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 039dfea90..422680e26 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164920 2012-08-06 23:20:34Z andrea $ +# $Id: PKGBUILD 166279 2012-09-05 18:34:02Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('f5963684301d6569af4cfce2a39dbef140c1dc4d') +sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320') build() { cd "${srcdir}" diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 66fc876ba..83953bd54 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164846 2012-08-06 23:13:25Z andrea $ +# $Id: PKGBUILD 166205 2012-09-05 18:27:06Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdepim-runtime -pkgver=4.9.0 -pkgrel=2 +pkgver=4.9.1 +pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdepim-runtime' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('4358e9f39e22040d617a112c8a66a7fee93a62db') +sha1sums=('bb39a81f9cf909c84807a003c77b1db9d3a1730b') build() { cd "${srcdir}" diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 14b1a6b28..68928ec1c 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164965 2012-08-07 16:32:21Z andrea $ +# $Id: PKGBUILD 166280 2012-09-05 18:34:22Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -20,8 +20,8 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.9.0 -pkgrel=3 +pkgver=4.9.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-build.patch') -sha1sums=('5c2f2ef3a3be118ad673ebe8b307bf7fe15bffbf' +sha1sums=('0fe7ade5d525ed60310f228570de75cbbceac46b' '974056ad2c3a00b33a8ac9403b369ab636000832') build() { @@ -240,8 +240,9 @@ package_kdepim-ktimetracker() { package_kdepim-ktnef() { pkgdesc='A viewer/extractor for TNEF files' - depends=('kdepim-libkdepim') + depends=('kdebase-runtime' 'kdepimlibs') url="https://projects.kde.org/projects/kde/kdepim/ktnef" + install=kdepim-ktnef.install cd "${srcdir}"/build/ktnef make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/doc/ktnef diff --git a/extra/kdepim/kdepim-ktnef.install b/extra/kdepim/kdepim-ktnef.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/extra/kdepim/kdepim-ktnef.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 23c734e47..78e103f40 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164841 2012-08-06 23:13:02Z andrea $ +# $Id: PKGBUILD 166200 2012-09-05 18:26:45Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdepimlibs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('a5c3d362561320832f2e796e0f167f047bab4a98') +sha1sums=('28d1fdbba5136a09445cad2b83d3a31c4e05e284') build() { cd "${srcdir}" diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 61e3a7590..85776260f 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164922 2012-08-06 23:21:07Z andrea $ +# $Id: PKGBUILD 166281 2012-09-05 18:34:33Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -75,7 +75,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-potd' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -84,7 +84,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('bf3f548c1a86b9aedee0ee2962b0b10aa27c9c05') +sha1sums=('2be00830e0e7e030240ca897ec1d9f9978fd8682') build() { mkdir build diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 3bb6321a9..bb34f3a98 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 164850 2012-08-06 23:13:52Z andrea $ +# $Id: PKGBUILD 166209 2012-09-05 18:27:32Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('0d093dc9e66a8b2740e2b19069ca9b763bc1eefa' +sha1sums=('a3a1e0f56e22ca87d5b65768ef4874a43ce3ae71' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 04589d7b7..6404c0b4e 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164923 2012-08-06 23:21:32Z andrea $ +# $Id: PKGBUILD 166282 2012-09-05 18:34:56Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -20,7 +20,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('0e396586d49f74c5677749a762ceffbde1db4b08' +sha1sums=('319ebe0f912626b8d3539bc22d706cc2548723af' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 5e2350ac1..2b2bad013 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164924 2012-08-06 23:21:37Z andrea $ +# $Id: PKGBUILD 166283 2012-09-05 18:35:02Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('d08249578b5f94c732156231f69b99070628ebae') +sha1sums=('caa6a3222dccfb1b12513135e2f859904e385d7f') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index 0eee7c9a7..2c89d6661 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164926 2012-08-06 23:21:48Z andrea $ +# $Id: PKGBUILD 166285 2012-09-05 18:35:14Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-filelight -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('1bb66e0d375d7c71abe638e3d42d14e1bd969587') +sha1sums=('498a43e08a02e41dc36f0032c8a18f7e054c6cc6') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index 8df603c09..1723028ed 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164927 2012-08-06 23:21:54Z andrea $ +# $Id: PKGBUILD 166286 2012-09-05 18:35:19Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kcalc -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('b21a8eae3eda400137397b0048b0c96c502bd077') +sha1sums=('40eacf20d6c0ba278670a6383e42ab94e78530d1') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index a7448d174..24ac377a7 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164928 2012-08-06 23:21:57Z andrea $ +# $Id: PKGBUILD 166287 2012-09-05 18:35:22Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kcharselect -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('b14f0f6ec1fb469c9f6ecb8035ce1c25b7c32a06') +sha1sums=('1f8e70c69e63cdc9bd55b63eab5a90dcd81826ba') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index dffb41117..55c46c2b7 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164929 2012-08-06 23:22:03Z andrea $ +# $Id: PKGBUILD 166288 2012-09-05 18:35:28Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kdf -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('691aae64d68c5f998f2bc6aad5f4ed182580ccd7') +sha1sums=('1466bbfe715ff6e7a2129fbb5c6a42affbc48b16') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index 296490a9d..57ab3c5f3 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164930 2012-08-06 23:22:09Z andrea $ +# $Id: PKGBUILD 166289 2012-09-05 18:35:33Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kfloppy -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('d066f74e7513aad2121fa0222fc50eceb61bcc9d') +sha1sums=('9559d03483aaab1774dbf26fa7171f6b697774b0') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index 22c0be0ad..41b17d031 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164931 2012-08-06 23:22:14Z andrea $ +# $Id: PKGBUILD 166290 2012-09-05 18:35:38Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kgpg -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('24caeaf1837ace0b164d8ba0f0b6a3f630dd2bb1') +sha1sums=('9f1e181839c88485912beb013e0908b0e59877a3') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index a8f29d1ac..5b702f0b8 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino pkgname=kdeutils-kremotecontrol -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('d21512621bbdeb0bc520261b4e639cd79f74a20f') +sha1sums=('046345fe3fb01c264ac3161a376f79f851cd51f5') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index ed0071d61..d20d16bfb 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164933 2012-08-06 23:22:25Z andrea $ +# $Id: PKGBUILD 166292 2012-09-05 18:35:48Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-ktimer -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('fd0961124cd8a0b8bf23eef08dd72885d78be66c') +sha1sums=('6fdcea3ce24b41d04baf9ca4a244035488b01197') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index a620bac6d..873509cef 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164934 2012-08-06 23:22:30Z andrea $ +# $Id: PKGBUILD 166293 2012-09-05 18:35:53Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kwallet -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('d9c48dcc35a6eae6d3c4680d1f12bc745773d6ef') +sha1sums=('da1eef2fcb729fbcd28adeac486fedfc16175be2') build() { cd "${srcdir}" diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index edef5513c..fb9580890 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164936 2012-08-06 23:22:37Z andrea $ +# $Id: PKGBUILD 166295 2012-09-05 18:36:01Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-superkaramba -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('3f0d2f3134cf240a588f1490e5f0c2d4b02b6aa8') +sha1sums=('0a1f43ab28cc351ab99f2aaf6cb5061c4136daa7') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index 8760b824e..d3d236502 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164937 2012-08-06 23:22:41Z andrea $ +# $Id: PKGBUILD 166296 2012-09-05 18:36:04Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-sweeper -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('39a2ddd22ef2afb32062f4e3bacd4ad28b86bfa5') +sha1sums=('e64550d8fc5d5b5615eb464d9542167f0b5e17f3') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index ea25bc524..a927c0312 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164938 2012-08-06 23:22:49Z andrea $ +# $Id: PKGBUILD 166297 2012-09-05 18:36:12Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('5bc5318ce7b2ef04b1c57b8f8a25bb4b8a561075') +sha1sums=('0a64286114c10c3b09c64d1829058b9ab667986b') build() { cd $srcdir diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index 5950264d2..e2b2fe5f7 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164866 2012-08-06 23:15:34Z andrea $ +# $Id: PKGBUILD 166225 2012-09-05 18:29:15Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkcddb -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('4a2639ca08cdbaf6eee28b7145c46718f685a651') +sha1sums=('7c2009bfb19a36cc5084ac450f5a2155a193da55') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index b4e51f59e..10a339a22 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164867 2012-08-06 23:15:38Z andrea $ +# $Id: PKGBUILD 166226 2012-09-05 18:29:19Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkcompactdisc -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('70c10ce02960c8eb00cb126471831a50b7d6262e') +sha1sums=('5e35ecf40225c79e023c0a4eb28f94043e9a2a61') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 3f5f6b0c6..f0e54736e 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164861 2012-08-06 23:15:12Z andrea $ +# $Id: PKGBUILD 166220 2012-09-05 18:28:48Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdcraw -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('4f23263c1f38374fcfa482de8a79b0c85e2fb250') +sha1sums=('82911b0bf93a7762130e4a1aff4dc72ec48940c1') build() { cd "${srcdir}" diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index b4f666668..ca131c4dd 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164859 2012-08-06 23:15:01Z andrea $ +# $Id: PKGBUILD 166218 2012-09-05 18:28:37Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdeedu -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('cf98e194c8d7230120e15c27f72efeec392ff4f9') +sha1sums=('d472434ac86c2ca92318c9d5e24625d2a72fe654') build() { cd "${srcdir}" diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index f94423803..238222fd2 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164862 2012-08-06 23:15:15Z andrea $ +# $Id: PKGBUILD 166221 2012-09-05 18:28:54Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkexiv2 -pkgver=4.9.0 -pkgrel=3 +pkgver=4.9.1 +pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('121c63ebf328ca87e67b7cf0cf72d0f276e4ae2c') +sha1sums=('fec413daf7ad814299fb53db695c273b1c26bc3b') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 432fbf69a..93b90ea44 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino pkgname=libkipi -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('a50fe30343f720f7402b42edbe7f6b59b2add19a') +sha1sums=('8fb561ef477b6a35c264ada783f65efa2ae1d3b9') build() { cd "${srcdir}" diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 66fbb1fc9..ace88b054 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164864 2012-08-06 23:15:27Z andrea $ +# $Id: PKGBUILD 166223 2012-09-05 18:29:06Z andrea $ # Maintainer: Andrea Scarpino pkgname=libksane -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('0a7a18454d78a5c3c4cf22696163c2383bf6e333') +sha1sums=('c44eed9ec5f998d0449369f3c1b1abfc4ad2fcfd') build() { cd "${srcdir}" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 423774ecc..e53c4c31d 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165429 2012-08-19 07:58:11Z andyrtr $ +# $Id: PKGBUILD 166171 2012-09-05 06:03:48Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -24,22 +24,22 @@ pkgname=('libreoffice-common' 'libreoffice-extension-scripting-python' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.5.6.2 -pkgver=3.5.6 -pkgrel=1 +_LOver=3.6.1.2 +pkgver=3.6.1 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' # 'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.3' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' + 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' #'saxon' - currently broken # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -49,6 +49,7 @@ makedepends=( # makedepends _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @@ -76,12 +77,12 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - fix_broken_hebrew_wordwrapping.diff + ${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz + ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + buildfix.diff + git_fixes.diff libreoffice-common.sh libreoffice-common.csh) noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz @@ -92,8 +93,8 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz + 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -111,10 +112,11 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('f8bfdb449dd6748d99b1f23a5702e5a1' - 'ecf485e13adfe8d5d4428b68787d390f' - '41696d482cb90db0acb6c45acd9047ea' +md5sums=('3ddcf145b74daa4361e48dafe97e7d21' + '7966e66099729d23d9ee594f526a50ed' + '2555590c1b4395857fc5c469f7f1bd0c' '18f577b374d60b3c760a3a3350407632' 'f02578f5218f217a9f20e9c30e119c6a' '94e7f271e38c976462558b4278590178' @@ -141,14 +143,14 @@ md5sums=('f8bfdb449dd6748d99b1f23a5702e5a1' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' '0ff7d225d087793c8c2c680d77aac3e7' - 'e1c178b18f130b40494561f02bc1a948' - '7c2549f6b0a8bb604e6c4c729ffdcfe6' + '6097739c841f671cb21332b9cc593ae7' + '0d2dcdfbf28d6208751b33057f5361f0' + 'ce5a1def34578b75959ac31210f031f6' '185d60944ea767075d27247c3162b3bc' - '60ce5dc9bd098f95c2e621a930c98dd9' - '661a52a02a31b3afbe4b3b3146061afd' - '025d9b17d9eb90dc282c5c1289a666aa' - 'f0e72d0e1bc93a50a3aa9d31350b156c' - '867c682b45f477f916786e00c45d7ab7') + '234e91ac65945ce1ab1e3839780e90f7' + '2445aca137bdbf0cf7526e91f768a1d0' + 'abcb1b0a7deaffe13ab3d7ca70becb49' + '72790a4103da259a55cadd66db931d00') build() { @@ -169,17 +171,9 @@ build() { ln -s ../libreoffice-translations-$_LOver/translations . # buildfixes & bugfixes - # one late fix to solve make distro-pack-install issue - patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/smp_buildfix.diff - # https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e - patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff - - # unset C(XX)FLAGS - # http://www.openoffice.org/issues/show_bug.cgi?id=103205 -# unset CFLAGS -# unset CXXFLAGS - + patch -Np1 -i ${srcdir}/buildfix.diff + patch -Np1 -i ${srcdir}/git_fixes.diff + #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -191,12 +185,12 @@ build() { # python2 fix export PYTHON=python2 -# autoconf -f + #autoconf -f # non-SMP test build -# export MAKEFLAGS="-j1" + #export MAKEFLAGS="-j1" #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ -# touch autogen.lastrun + ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ @@ -230,12 +224,14 @@ build() { --without-afms\ --without-ppds\ --without-system-libwps\ + --without-system-libcdr \ --without-system-mdds\ --without-myspell-dicts \ --without-system-libvisio \ --without-system-libcmis \ - --without-system-sampleicc \ --without-system-libexttextcat \ + --without-system-jfreereport \ + --without-system-apache-commons \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -250,7 +246,7 @@ build() { --disable-mozilla \ --without-system-mozilla \ --without-system-mozilla-headers \ - --with-ant-home="/usr/share/java/apache-ant"\ + --with-ant-home="/usr/share/apache-ant"\ --without-system-boost\ --with-system-cairo\ --with-system-libs\ @@ -258,9 +254,8 @@ build() { --with-system-headers\ --with-system-hsqldb \ --with-alloc=system\ - --with-system-lucene\ - --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ + --with-system-clucene\ + --without-system-servlet-api \ --with-java-target-version=1.5 \ $EXTRAOPTS @@ -284,7 +279,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') #'saxon' optdepends=('libreoffice-langpack: additional language support' @@ -299,10 +294,10 @@ package_libreoffice-common() { 'vigra: C++ computer vision library, usable in Basebmp' 'libmspack: library for Microsoft compression formats for use in FontOOo' 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'lucene: full-text search engine library for Java needed in the help section' 'sane: for scanner access' 'unixodbc: adds ODBC database support' - 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') + 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress' + 'gtk2: for browser plugin') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) @@ -342,6 +337,11 @@ package_libreoffice-common() { install -dm755 ${pkgdir}/usr/share/bash-completion/completions mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh rm -rf ${pkgdir}/etc/bash_completion.d + + # some files would conflict + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb } package_libreoffice-base() { @@ -382,16 +382,16 @@ package_libreoffice-postgresql-connector() { install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry -# # create directories from *list.txt file + # create directories from *list.txt file # for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do # install -dm755 ${pkgdir}/${directory/\%dir/} # done -# # install files into the pkg from fakeinstall dir + # install files into the pkg from fakeinstall dir # for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do # dirname=`dirname $file` -# # check if directory has been already been created - some are missing like manpages + # check if directory has been already been created - some are missing like manpages # [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname -# # mv file from fakeinstall to pkgdir + # mv file from fakeinstall to pkgdir # mv ${srcdir}/fakeinstall${file} ${pkgdir}$file # done } @@ -629,7 +629,7 @@ package_libreoffice-extension-pdfimport() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport } package_libreoffice-extension-presenter-screen() { @@ -681,8 +681,8 @@ package_libreoffice-scripting-javascript() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ } package_libreoffice-extension-scripting-python() { diff --git a/extra/libreoffice/git_fixes.diff b/extra/libreoffice/git_fixes.diff new file mode 100644 index 000000000..a4cd891cb --- /dev/null +++ b/extra/libreoffice/git_fixes.diff @@ -0,0 +1,743 @@ +From 427529801dee122250e44d2311b34651db92bbdb Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 21 Aug 2012 16:55:11 +0000 +Subject: Typo + +Change-Id: I41fd1463b6432818ee36e7f90e920a5fd98c7106 +(cherry picked from commit 1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b) + +Signed-off-by: Eike Rathke +--- +diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx +index d929787..55ebaca 100644 +--- a/desktop/source/app/app.cxx ++++ b/desktop/source/app/app.cxx +@@ -194,7 +194,7 @@ void removeTree(OUString const & url) { + osl::FileBase::RC rc = osl::Directory::remove(url); + SAL_WARN_IF( + rc != osl::FileBase::E_None, "desktop", +- "cannot remove directory " << url << ": " +rc); ++ "cannot remove directory " << url << ": " << +rc); + // at least on Windows XP removing some existing directories fails with + // osl::FileBase::E_ACCESS because they are read-only; but keeping those + // directories around should be harmless once they are empty +-- +cgit v0.9.0.2-2-gbebe +From b4f8acb41165a28b2db47acd3c6b624a4c507c54 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Fri, 24 Aug 2012 14:06:15 +0000 +Subject: Fix removeRdbFiles (caused extension update to fail) + +removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes the +corresponding component (.so, .jar, etc.), but not the .rdb file. So removing +an .rdb file silently failed to remove the corresponding implementations, so re- +installing a similar enough .rdb (as typically happens during extension update) +would fail due to duplicate implementation names. + +Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe +Reviewed-on: https://gerrit.libreoffice.org/476 +Reviewed-by: Norbert Thiebaud +Tested-by: Norbert Thiebaud +--- +diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx +index c3bdba3..7fd1e4a 100644 +--- a/cppuhelper/source/defaultbootstrap.cxx ++++ b/cppuhelper/source/defaultbootstrap.cxx +@@ -130,9 +130,10 @@ struct ImplementationInfo: private boost::noncopyable { + rtl::OUString const & theName, rtl::OUString const & theLoader, + rtl::OUString const & theUri, rtl::OUString const & thePrefix, + css::uno::Reference< css::uno::XComponentContext > const & +- theAlienContext): ++ theAlienContext, ++ rtl::OUString const & theRdbFile): + name(theName), loader(theLoader), uri(theUri), prefix(thePrefix), +- alienContext(theAlienContext) ++ alienContext(theAlienContext), rdbFile(theRdbFile) + {} + + explicit ImplementationInfo(rtl::OUString const & theName): name(theName) {} +@@ -142,6 +143,7 @@ struct ImplementationInfo: private boost::noncopyable { + rtl::OUString const uri; + rtl::OUString const prefix; + css::uno::Reference< css::uno::XComponentContext > const alienContext; ++ rtl::OUString const rdbFile; + std::vector< rtl::OUString > services; + std::vector< rtl::OUString > singletons; + }; +@@ -149,12 +151,12 @@ struct ImplementationInfo: private boost::noncopyable { + struct Implementation: private boost::noncopyable { + Implementation( + rtl::OUString const & name, rtl::OUString const & loader, +- rtl::OUString const & uri, +- rtl::OUString const & prefix = rtl::OUString(), +- css::uno::Reference< css::uno::XComponentContext > const & +- alienContext +- = css::uno::Reference< css::uno::XComponentContext >()): +- info(new ImplementationInfo(name, loader, uri, prefix, alienContext)), ++ rtl::OUString const & uri, rtl::OUString const & prefix, ++ css::uno::Reference< css::uno::XComponentContext > const & alienContext, ++ rtl::OUString const & rdbFile): ++ info( ++ new ImplementationInfo( ++ name, loader, uri, prefix, alienContext, rdbFile)), + loaded(false) + {} + +@@ -466,7 +468,7 @@ void Parser::handleImplementation() { + implementation_.reset( + new Implementation( + attrImplementation_, attrLoader_, attrUri_, attrPrefix_, +- alienContext_)); ++ alienContext_, reader_.getUrl())); + if (!data_->namedImplementations.insert( + NamedImplementations::value_type( + attrImplementation_, implementation_)). +@@ -1502,7 +1504,9 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { + boost::shared_ptr< Implementation > impl( + new Implementation( + name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"), +- readLegacyRdbString(uri, implKey, "UNO/LOCATION"))); ++ readLegacyRdbString(uri, implKey, "UNO/LOCATION"), ++ rtl::OUString(), ++ css::uno::Reference< css::uno::XComponentContext >(), uri)); + if (!data_.namedImplementations.insert( + NamedImplementations::value_type(name, impl)). + second) +@@ -1744,7 +1748,7 @@ void ServiceManager::removeRdbFiles(std::vector< rtl::OUString > const & uris) { + j != data_.namedImplementations.end();) + { + assert(j->second.get() != 0); +- if (j->second->info->uri == *i) { ++ if (j->second->info->rdbFile == *i) { + clear.push_back(j->second); + //TODO: The below leaves data_ in an inconsistent state upon + // exceptions: +-- +cgit v0.9.0.2-2-gbebe +From 6d261e7aac12a876acb6496085e5329632595d39 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Fri, 24 Aug 2012 14:45:20 +0000 +Subject: fdo#53968 etc.: Fix more "doesn't start after upgrade" problems + +* fdo#53968 revealed that multiple soffice.bin instances can run removeTree in + parallel. Therefore, demoted failures from exceptions to SAL_WARNs. (And + keeping fingers crossed.) + +* a8cdce148c76c93c5d41820610d6e6ac175e03a7 "fdo#53655: Ignore failure to remove + directories (as happens on Windows XP)" was due to a forgotten + osl::Directory::close before calling osl::Directory::remove after all. + +* UserInstallations have been seen in the wild where no extensions were + installed per-user (any longer), but user/uno_packages/cache/registry/ + com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files + contained data nevertheless. To reliably clean out any old junk, + refreshBundledExtensionsDir has been extended to cleanExtensionsCache which in + tandem with an extended Desktop::SynchronizeExtensionRepositories now cleanly + re-installs all bundled, shared, and per-user extensions after a LO upgrade. + +Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0 +Reviewed-on: https://gerrit.libreoffice.org/477 +Reviewed-by: Norbert Thiebaud +Tested-by: Norbert Thiebaud +--- +diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx +index 25b6352..c830b02 100644 +--- a/desktop/inc/app.hxx ++++ b/desktop/inc/app.hxx +@@ -203,6 +203,7 @@ class Desktop : public Application + + sal_Bool m_bMinimized; + sal_Bool m_bInvisible; ++ bool m_bCleanedExtensionCache; + bool m_bServicesRegistered; + sal_uInt16 m_nAppEvents; + BootstrapError m_aBootstrapError; +diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx +index 55ebaca..5fb653b 100644 +--- a/desktop/source/app/app.cxx ++++ b/desktop/source/app/app.cxx +@@ -147,77 +147,81 @@ namespace { + + void removeTree(OUString const & url) { + osl::Directory dir(url); +- switch (dir.open()) { ++ osl::FileBase::RC rc = dir.open(); ++ switch (rc) { + case osl::FileBase::E_None: + break; + case osl::FileBase::E_NOENT: + return; //TODO: SAL_WARN if recursive + default: +- throw css::uno::RuntimeException( +- "cannot open directory " + url, +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN("desktop", "cannot open directory " << url << ": " << +rc); ++ return; + } + for (;;) { + osl::DirectoryItem i; +- osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32); ++ rc = dir.getNextItem(i, SAL_MAX_UINT32); + if (rc == osl::FileBase::E_NOENT) { + break; + } + if (rc != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- ("cannot iterate directory " + url + ": " +- + OUString::valueOf(static_cast< sal_Int32 >(rc))), +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN( ++ "desktop","cannot iterate directory " << url << ": " << +rc); ++ break; + } + osl::FileStatus stat( + osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName | + osl_FileStatus_Mask_FileURL); + rc = i.getFileStatus(stat); + if (rc != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- ("cannot stat in directory " + url + ": " +- + OUString::valueOf(static_cast< sal_Int32 >(rc))), +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN( ++ "desktop", "cannot stat in directory " << url << ": " << +rc); ++ continue; + } + if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks + removeTree(stat.getFileURL()); + } else { + rc = osl::File::remove(stat.getFileURL()); +- if (rc != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- ("cannot remove file " + stat.getFileURL() + ": " +- + OUString::valueOf(static_cast< sal_Int32 >(rc))), +- css::uno::Reference< css::uno::XInterface >()); +- } ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None, "desktop", ++ "cannot remove file " << stat.getFileURL() << ": " << +rc); + } + } +- osl::FileBase::RC rc = osl::Directory::remove(url); ++ if (dir.isOpen()) { ++ rc = dir.close(); ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None, "desktop", ++ "cannot close directory " << url << ": " << +rc); ++ } ++ rc = osl::Directory::remove(url); + SAL_WARN_IF( + rc != osl::FileBase::E_None, "desktop", + "cannot remove directory " << url << ": " << +rc); +- // at least on Windows XP removing some existing directories fails with +- // osl::FileBase::E_ACCESS because they are read-only; but keeping those +- // directories around should be harmless once they are empty + } + +-// Remove any existing UserInstallation's user/extensions/bundled cache +-// remaining from old installations. Apparently due to the old +-// share/prereg/bundled mechanism (disabled since +-// 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying +-// share/prereg/bundled to avoid startup crashes"), that cache could contain +-// corrupted information (like a UNO component registered twice, which got +-// changed from active to passive registration in one LO version, but the +-// version of the corresponding bundled extension only incremented in a later LO +-// version). At least in theory, this function could be removed again once no +-// UserInstallation can be poisoned by that old share/prereg/bundled mechanism +-// any more. (But then Desktop::SynchronizeExtensionRepositories might need to +-// be revisited, see 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 "Force +-// ExtensionManager resync when the implementation changes" which effectively +-// got reverted again now. Now, a mismatch between a UserInstallation's +-// user/extensions/bundled and an installation's share/extensions will always be +-// detected here and lead to a removal of user/extensions/bundled, so that +-// Desktop::SynchronizeExtensionRepositories will then definitely resync +-// share/extensions.) ++// Remove any existing UserInstallation's extensions cache data remaining from ++// old installations. This addresses at least two problems: ++// ++// For one, apparently due to the old share/prereg/bundled mechanism (disabled ++// since 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying ++// share/prereg/bundled to avoid startup crashes"), the user/extensions/bundled ++// cache could contain corrupted information (like a UNO component registered ++// twice, which got changed from active to passive registration in one LO ++// version, but the version of the corresponding bundled extension only ++// incremented in a later LO version). ++// ++// For another, UserInstallations have been seen in the wild where no extensions ++// were installed per-user (any longer), but user/uno_packages/cache/registry/ ++// com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files ++// contained data nevertheless. ++// ++// When a LO upgrade is detected (i.e., no/ user/extensions/bundled/buildid or ++// one containing an old build ID), then user/extensions/bundled, ++// user/extensions/shared, and user/uno_packages/cache/registry/ ++// com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc are ++// removed. That should prevent any problems starting the service manager due ++// to old junk. Later on in Desktop::SynchronizeExtensionRepositories, the ++// removed cache data is recreated. ++// + // As a special case, if you create a UserInstallation with LO >= 3.6.1, then + // run an old LO <= 3.5.x using share/prereg/bundled on the same + // UserInstallation (so that it partially overwrites user/extensions/bundled, +@@ -230,33 +234,50 @@ void removeTree(OUString const & url) { + // <= 3.5.x messed with user/extensions/bundled in the meantime, then it would + // have rewritten the unorc (dropping the token), and LO >= 3.6.1 can detect + // that. +-void refreshBundledExtensionsDir() { ++// ++// Multiple instances of soffice.bin can execute this code in parallel for a ++// single UserInstallation, as it is called before OfficeIPCThread is set up. ++// Therefore, any errors here only lead to SAL_WARNs. ++// ++// At least in theory, this function could be removed again once no ++// UserInstallation can be poisoned by old junk any more. ++bool cleanExtensionCache() { + OUString buildId( + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"); + rtl::Bootstrap::expandMacros(buildId); //TODO: detect failure +- OUString dir("$BUNDLED_EXTENSIONS_USER"); +- rtl::Bootstrap::expandMacros(dir); //TODO: detect failure +- OUString url(dir + "/buildid"); +- OUString nonPrereg( +- "${$BUNDLED_EXTENSIONS_USER/registry/" +- "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc:" +- "LIBO_NON_PREREG_BUNDLED_EXTENSIONS}"); +- rtl::Bootstrap::expandMacros(nonPrereg); +- if (nonPrereg == "TRUE") { +- osl::File f(url); +- switch (f.open(osl_File_OpenFlag_Read)) { ++ OUString extDir( ++ "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ++ ":UserInstallation}/user/extensions"); ++ rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure ++ OUString bundledDir = extDir + "/bundled"; ++ OUString buildIdFile(bundledDir + "/buildid"); ++ OUString bundledRcFile( ++ "$BUNDLED_EXTENSIONS_USER/registry/" ++ "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc"); ++ rtl::Bootstrap::expandMacros(bundledRcFile); //TODO: detect failure ++ rtl::Bootstrap bundledRc(bundledRcFile); ++ OUString nonPrereg; ++ if (bundledRc.getHandle() == 0 ++ || (bundledRc.getFrom("LIBO_NON_PREREG_BUNDLED_EXTENSIONS", nonPrereg) ++ && nonPrereg == "TRUE")) ++ { ++ osl::File f(buildIdFile); ++ osl::FileBase::RC rc = f.open(osl_File_OpenFlag_Read); ++ switch (rc) { + case osl::FileBase::E_None: + { + rtl::ByteSequence s1; +- osl::FileBase::RC rc = f.readLine(s1); +- if (f.close() != osl::FileBase::E_None) { +- SAL_WARN( +- "desktop", "cannot close " + url + " after reading"); +- } ++ rc = f.readLine(s1); ++ osl::FileBase::RC rc2 = f.close(); ++ SAL_WARN_IF( ++ rc2 != osl::FileBase::E_None, "desktop", ++ "cannot close " << buildIdFile << " after reading: " ++ << +rc2); + if (rc != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- "cannot read from " + url, +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN( ++ "desktop", ++ "cannot read from " << buildIdFile << ": " << +rc); ++ break; + } + OUString s2( + reinterpret_cast< char const * >(s1.getConstArray()), +@@ -264,53 +285,56 @@ void refreshBundledExtensionsDir() { + // using ISO 8859-1 avoids any and all conversion errors; + // the content should only be a subset of ASCII, anyway + if (s2 == buildId) { +- return; ++ return false; + } + break; + } + case osl::FileBase::E_NOENT: + break; + default: +- throw css::uno::RuntimeException( +- "cannot open " + url + " for reading", +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN( ++ "desktop", ++ "cannot open " << buildIdFile << " for reading: " << +rc); ++ break; + } + } +- removeTree(dir); +- switch (osl::Directory::createPath(dir)) { +- case osl::FileBase::E_None: +- case osl::FileBase::E_EXIST: +- break; +- default: +- throw css::uno::RuntimeException( +- "cannot create path " + dir, +- css::uno::Reference< css::uno::XInterface >()); +- } +- osl::File f(url); +- if (f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create) != +- osl::FileBase::E_None) +- { +- throw css::uno::RuntimeException( +- "cannot open " + url + " for writing", +- css::uno::Reference< css::uno::XInterface >()); ++ removeTree(extDir); ++ OUString userRcFile( ++ "$UNO_USER_PACKAGES_CACHE/registry/" ++ "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc"); ++ rtl::Bootstrap::expandMacros(userRcFile); //TODO: detect failure ++ osl::FileBase::RC rc = osl::File::remove(userRcFile); ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None && rc != osl::FileBase::E_NOENT, "desktop", ++ "cannot remove file " << userRcFile << ": " << +rc); ++ rc = osl::Directory::createPath(bundledDir); ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None && rc != osl::FileBase::E_EXIST, "desktop", ++ "cannot create path " << bundledDir << ": " << +rc); ++ osl::File f(buildIdFile); ++ rc = f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); ++ if (rc != osl::FileBase::E_None) { ++ SAL_WARN( ++ "desktop", ++ "cannot open " << buildIdFile << " for writing: " << +rc); ++ return true; + } + rtl::OString buf(OUStringToOString(buildId, RTL_TEXTENCODING_UTF8)); + // using UTF-8 avoids almost all conversion errors (and buildid + // containing single surrogate halves should never happen, anyway); the + // content should only be a subset of ASCII, anyway +- sal_uInt64 n; +- if (f.write(buf.getStr(), buf.getLength(), n) != osl::FileBase::E_None +- || n != static_cast< sal_uInt32 >(buf.getLength())) +- { +- throw css::uno::RuntimeException( +- "cannot write to " + url, +- css::uno::Reference< css::uno::XInterface >()); +- } +- if (f.close() != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- "cannot close " + url + " after writing", +- css::uno::Reference< css::uno::XInterface >()); +- } ++ sal_uInt64 n = 0; ++ rc = f.write(buf.getStr(), buf.getLength(), n); ++ SAL_WARN_IF( ++ (rc != osl::FileBase::E_None ++ || n != static_cast< sal_uInt32 >(buf.getLength())), ++ "desktop", ++ "cannot write to " << buildIdFile << ": " << +rc << ", " << n); ++ rc = f.close(); ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None, "desktop", ++ "cannot close " << buildIdFile << " after writing: " << +rc); ++ return true; + } + + } +@@ -538,7 +562,8 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) + } + + Desktop::Desktop() +-: m_bServicesRegistered( false ) ++: m_bCleanedExtensionCache( false ) ++, m_bServicesRegistered( false ) + , m_aBootstrapError( BE_OK ) + { + RTL_LOGFILE_TRACE( "desktop (cd100003) ::Desktop::Desktop" ); +@@ -553,7 +578,7 @@ void Desktop::Init() + RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" ); + SetBootstrapStatus(BS_OK); + +- refreshBundledExtensionsDir(); ++ m_bCleanedExtensionCache = cleanExtensionCache(); + + // We need to have service factory before going further, but see fdo#37195. + // Doing this will mmap common.rdb, making it not overwritable on windows, +diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx +index dd01d9b..a6221a9 100644 +--- a/desktop/source/app/check_ext_deps.cxx ++++ b/desktop/source/app/check_ext_deps.cxx +@@ -51,6 +51,7 @@ + #include "com/sun/star/deployment/ExtensionManager.hpp" + #include "com/sun/star/deployment/LicenseException.hpp" + #include "com/sun/star/deployment/ui/LicenseDialog.hpp" ++#include + #include + #include + #include +@@ -77,12 +78,15 @@ class SilentCommandEnv + task::XInteractionHandler, + ucb::XProgressHandler > + { ++ uno::Reference mxContext; + Desktop *mpDesktop; + sal_Int32 mnLevel; + sal_Int32 mnProgress; + + public: +- SilentCommandEnv( Desktop* pDesktop ); ++ SilentCommandEnv( ++ uno::Reference const & xContext, ++ Desktop* pDesktop ); + virtual ~SilentCommandEnv(); + + // XCommandEnvironment +@@ -105,12 +109,14 @@ public: + }; + + //----------------------------------------------------------------------------- +-SilentCommandEnv::SilentCommandEnv( Desktop* pDesktop ) +-{ +- mpDesktop = pDesktop; +- mnLevel = 0; +- mnProgress = 25; +-} ++SilentCommandEnv::SilentCommandEnv( ++ uno::Reference const & xContext, ++ Desktop* pDesktop ): ++ mxContext( xContext ), ++ mpDesktop( pDesktop ), ++ mnLevel( 0 ), ++ mnProgress( 25 ) ++{} + + //----------------------------------------------------------------------------- + SilentCommandEnv::~SilentCommandEnv() +@@ -144,10 +150,9 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe + + if ( request >>= licExc ) + { +- uno::Reference< uno::XComponentContext > xContext = comphelper_getProcessComponentContext(); + uno::Reference< ui::dialogs::XExecutableDialog > xDialog( + deployment::ui::LicenseDialog::create( +- xContext, VCLUnoHelper::GetInterface( NULL ), ++ mxContext, VCLUnoHelper::GetInterface( NULL ), + licExc.ExtensionName, licExc.Text ) ); + sal_Int16 res = xDialog->execute(); + if ( res == ui::dialogs::ExecutableDialogResults::CANCEL ) +@@ -416,7 +421,20 @@ sal_Bool Desktop::CheckExtensionDependencies() + void Desktop::SynchronizeExtensionRepositories() + { + RTL_LOGFILE_CONTEXT(aLog,"desktop (jl) ::Desktop::SynchronizeExtensionRepositories"); +- dp_misc::syncRepositories( new SilentCommandEnv( this ) ); ++ uno::Reference< uno::XComponentContext > context( ++ comphelper_getProcessComponentContext()); ++ uno::Reference< ucb::XCommandEnvironment > silent( ++ new SilentCommandEnv(context, this)); ++ if (m_bCleanedExtensionCache) { ++ deployment::ExtensionManager::get(context)->reinstallDeployedExtensions( ++ true, "user", Reference(), silent); ++ task::OfficeRestartManager::get(context)->requestRestart( ++ silent->getInteractionHandler()); ++ } else { ++ // reinstallDeployedExtensions above already calls syncRepositories ++ // internally: ++ dp_misc::syncRepositories(m_bCleanedExtensionCache, silent); ++ } + } + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +index 29ded17..7795e309 100644 +--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx ++++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +@@ -1124,7 +1124,7 @@ void ExtensionCmdQueue::acceptLicense( const uno::Reference< deployment::XPackag + + void ExtensionCmdQueue::syncRepositories( const uno::Reference< uno::XComponentContext > &xContext ) + { +- dp_misc::syncRepositories( new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) ); ++ dp_misc::syncRepositories( false, new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) ); + } + + void ExtensionCmdQueue::stop() +diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h +index 29fd140..06e67aa 100644 +--- a/desktop/source/deployment/inc/dp_misc.h ++++ b/desktop/source/deployment/inc/dp_misc.h +@@ -154,8 +154,10 @@ void TRACE(::rtl::OUString const & sText); + recently added or removed. + */ + DESKTOP_DEPLOYMENTMISC_DLLPUBLIC +-void syncRepositories(::com::sun::star::uno::Reference< +- ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv); ++void syncRepositories( ++ bool force, ++ ::com::sun::star::uno::Reference< ++ ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv); + + } + +diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx +index 68403f1..b3c21b4 100644 +--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx ++++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx +@@ -1205,9 +1205,10 @@ uno::Sequence< uno::Sequence > > + } + } + +-//only to be called from unopkg!!! ++// Only to be called from unopkg or soffice bootstrap (with force=true in the ++// latter case): + void ExtensionManager::reinstallDeployedExtensions( +- OUString const & repository, ++ sal_Bool force, OUString const & repository, + Reference const & xAbortChannel, + Reference const & xCmdEnv ) + throw (deploy::DeploymentException, +@@ -1220,10 +1221,11 @@ void ExtensionManager::reinstallDeployedExtensions( + xPackageManager = getPackageManager(repository); + + ::osl::MutexGuard guard(getMutex()); +- xPackageManager->reinstallDeployedPackages(xAbortChannel, xCmdEnv); ++ xPackageManager->reinstallDeployedPackages( ++ force, xAbortChannel, xCmdEnv); + //We must sync here, otherwise we will get exceptions when extensions + //are removed. +- dp_misc::syncRepositories(xCmdEnv); ++ dp_misc::syncRepositories(force, xCmdEnv); + const uno::Sequence< Reference > extensions( + xPackageManager->getDeployedPackages(xAbortChannel, xCmdEnv)); + +diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx +index 22e2d41..ec1edbc 100644 +--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx ++++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx +@@ -182,7 +182,7 @@ public: + css::uno::RuntimeException); + + virtual void SAL_CALL reinstallDeployedExtensions( +- ::rtl::OUString const & repository, ++ sal_Bool force, ::rtl::OUString const & repository, + css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel, + css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) + throw ( +diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx +index 8a08320c..8e3d109 100644 +--- a/desktop/source/deployment/manager/dp_manager.cxx ++++ b/desktop/source/deployment/manager/dp_manager.cxx +@@ -1164,14 +1164,14 @@ PackageManagerImpl::getDeployedPackages( + //ToDo: the function must not call registerPackage, do this in + //XExtensionManager.reinstallDeployedExtensions + void PackageManagerImpl::reinstallDeployedPackages( +- Reference const & /*xAbortChannel*/, ++ sal_Bool force, Reference const & /*xAbortChannel*/, + Reference const & xCmdEnv_ ) + throw (deployment::DeploymentException, + CommandFailedException, CommandAbortedException, + lang::IllegalArgumentException, RuntimeException) + { + check(); +- if (office_is_running()) ++ if (!force && office_is_running()) + throw RuntimeException( + OUSTR("You must close any running Office process before " + "reinstalling packages!"), static_cast(this) ); +diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h +index 3b335d7..3c7f8d9 100644 +--- a/desktop/source/deployment/manager/dp_manager.h ++++ b/desktop/source/deployment/manager/dp_manager.h +@@ -236,6 +236,7 @@ public: + css::uno::RuntimeException); + + virtual void SAL_CALL reinstallDeployedPackages( ++ sal_Bool force, + css::uno::Reference const & xAbortChannel, + css::uno::Reference const & xCmdEnv ) + throw (css::deployment::DeploymentException, +diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx +index b225db6..9ed579f 100644 +--- a/desktop/source/deployment/misc/dp_misc.cxx ++++ b/desktop/source/deployment/misc/dp_misc.cxx +@@ -591,7 +591,7 @@ void TRACE(::rtl::OString const & sText) + } + + void syncRepositories( +- Reference const & xCmdEnv) ++ bool force, Reference const & xCmdEnv) + { + OUString sDisable; + ::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() ); +@@ -602,7 +602,8 @@ void syncRepositories( + //synchronize shared before bundled otherewise there are + //more revoke and registration calls. + sal_Bool bModified = false; +- if (needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared"))) ++ if (force ++ || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared"))) + || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")))) + { + xExtensionManager = +diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx +index 43faed5..ef16ea1 100644 +--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx ++++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx +@@ -392,7 +392,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() + //synching is done in XExtensionManager.reinstall + if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall")) + && ! dp_misc::office_is_running()) +- dp_misc::syncRepositories(xCmdEnv); ++ dp_misc::syncRepositories(false, xCmdEnv); + + if ( subcmd_add || subCommand == "remove" ) + { +@@ -436,7 +436,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() + RTL_CONSTASCII_STRINGPARAM("reinstall") )) + { + xExtensionManager->reinstallDeployedExtensions( +- repository, Reference(), xCmdEnv); ++ false, repository, Reference(), xCmdEnv); + } + else if ( subCommand == "list" ) + { +diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl +index b68ab20..2912e45 100644 +--- a/offapi/com/sun/star/deployment/XExtensionManager.idl ++++ b/offapi/com/sun/star/deployment/XExtensionManager.idl +@@ -260,6 +260,9 @@ interface XExtensionManager +

+ Please use this in case of suspected cache inconsistencies only. +

++ @param force ++ set to true when called during soffice bootstrap after cleaning ++ old extension cache + @param repositroy + the name of the repository + @param xAbortChannel +@@ -268,6 +271,7 @@ interface XExtensionManager + command environment for error and progress handling + */ + void reinstallDeployedExtensions( ++ [in] boolean force, + [in] string repository, + [in] com::sun::star::task::XAbortChannel xAbortChannel, + [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv ) +diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl +index 12e7e0e..39ff04a 100644 +--- a/offapi/com/sun/star/deployment/XPackageManager.idl ++++ b/offapi/com/sun/star/deployment/XPackageManager.idl +@@ -225,12 +225,16 @@ interface XPackageManager + Please use this in case of suspected cache inconsistencies only. +

+ ++ @param force ++ set to true when called during soffice bootstrap after cleaning ++ old extension cache + @param xAbortChannel + abort channel to asynchronously abort the adding process + @param xCmdEnv + command environment for error and progress handling + */ + void reinstallDeployedPackages( ++ [in] boolean force, + [in] com::sun::star::task::XAbortChannel xAbortChannel, + [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv ) + raises (DeploymentException, +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/libreoffice-common.csh b/extra/libreoffice/libreoffice-common.csh index af31d4432..5efa39404 100644 --- a/extra/libreoffice/libreoffice-common.csh +++ b/extra/libreoffice/libreoffice-common.csh @@ -1 +1,8 @@ #setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program + +# to force a certain look'n feel + +#setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN kde4 +#setenv SAL_USE_VCLPLUGIN gtk +#setenv SAL_USE_VCLPLUGIN gtk3 diff --git a/extra/libreoffice/libreoffice-common.sh b/extra/libreoffice/libreoffice-common.sh index ee405b1aa..795867125 100644 --- a/extra/libreoffice/libreoffice-common.sh +++ b/extra/libreoffice/libreoffice-common.sh @@ -1 +1,8 @@ #export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" + +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk +#export SAL_USE_VCLPLUGIN=gtk3 diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD index bb012a83f..2bc1767ad 100644 --- a/extra/libvdpau/PKGBUILD +++ b/extra/libvdpau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143891 2011-11-30 19:04:39Z andrea $ +# $Id: PKGBUILD 166179 2012-09-05 07:50:49Z andyrtr $ # Maintainer: Jan de Groot pkgname=libvdpau -pkgver=0.4.1 -pkgrel=2 +pkgver=0.5 +pkgrel=1 pkgdesc="Nvidia VDPAU library" arch=(i686 x86_64) url='http://cgit.freedesktop.org/~aplattner/libvdpau' @@ -13,11 +13,11 @@ options=('!libtool') license=('custom') source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz) makedepends=('libx11') -sha256sums=('061b6f86c64912f79851bfefcac4f77b401e9a939dbbb7b1ec795bc7d5aaf59b') +sha1sums=('1b18b8f75eea52740af84881313d860ad5c27d0b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD index 011d4a9ba..1b57dbcc0 100644 --- a/extra/libwps/PKGBUILD +++ b/extra/libwps/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 151320 2012-02-25 13:44:08Z allan $ +# $Id: PKGBUILD 166173 2012-09-05 06:04:00Z andyrtr $ # Maintainer: AndyRTR # Contributor: Robert McCathie pkgname=libwps -pkgver=0.2.2 -pkgrel=2 +pkgver=0.2.7 +pkgrel=1 pkgdesc="a Microsoft Works file word processor format import filter library" arch=('i686' 'x86_64') url="http://libwps.sourceforge.net/" license=('LGPL') -depends=('libwpd>=0.9.2') +depends=('libwpd>=0.9.4') +makedepends=('boost') options=(!libtool) source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") -md5sums=('29721a16f25967d59969d5f0ae485b4a') +md5sums=('d197bd6211669a2fa4ca648faf04bcb1') build() { cd "$srcdir/$pkgname-$pkgver" - sed -i -e 's: -Wall -Werror -pedantic::' configure.in - touch NEWS AUTHORS ChangeLog - autoreconf -fi - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --disable-static \ + --disable-werror make } diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 3e8184e81..7fcc59b7a 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164757 2012-08-04 18:04:50Z stephane $ +# $Id: PKGBUILD 166317 2012-09-06 01:14:06Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: Aaron Griffin pkgname=nasm -pkgver=2.10.03 +pkgver=2.10.04 pkgrel=1 pkgdesc="An 80x86 assembler designed for portability and modularity" url="http://www.nasm.us" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('glibc') makedepends=('ghostscript') source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('78a8de9ba02da7c2ba8c583a57901ff6856ad6c6') +sha1sums=('d80b5ea8f59a4929efddcb8e90d00b8a0fc00cb5') install=nasm.install build() { diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index a9c5aabce..ff3419d74 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164843 2012-08-06 23:13:08Z andrea $ +# $Id: PKGBUILD 166202 2012-09-05 18:26:52Z andrea $ # Maintainer: Andrea Scarpino pkgname=nepomuk-core -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('55dc228d5155220052c4a5d38984092a90a9cae7') +sha1sums=('1dbb4467b7d4ec50133e5ce86c3837b57b95794d') build() { cd "${srcdir}" diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD new file mode 100644 index 000000000..dead82514 --- /dev/null +++ b/extra/qpdf/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 166182 2012-09-05 08:14:58Z andyrtr $ +# Maintainer: AndyRTR +# Contributor: Miguel Revilla +# Contributor: David Sotelo +# Contributor: Nuno Araujo + +pkgname=qpdf +pkgver=3.0.1 +pkgrel=2 +pkgdesc="QPDF: A Content-Preserving PDF Transformation System" +arch=('i686' 'x86_64') +url="http://qpdf.sourceforge.net/" +license=('custom:Artistic-2.0') +depends=('pcre' 'perl') +makedepends=('make') +options=('!libtool') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('48767e2519029d0214cd0fcafa3a8f8c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix rpath errors (from Fedora spec) + autoreconf -vfi + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + + mkdir -m755 -p ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 Artistic-2.0 ${pkgdir}/usr/share/licenses/${pkgname}/ +} diff --git a/extra/xcompmgr/PKGBUILD b/extra/xcompmgr/PKGBUILD index 24822a6c7..cab1793ed 100644 --- a/extra/xcompmgr/PKGBUILD +++ b/extra/xcompmgr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150240 2012-02-15 16:46:01Z andyrtr $ +# $Id: PKGBUILD 166176 2012-09-05 07:11:03Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Leslie P. Polzer pkgname=xcompmgr pkgver=1.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Composite Window-effects manager for X.org" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,11 +12,15 @@ license=('custom') depends=('libxcomposite' 'libxdamage' 'libxrender' 'libxext') conflicts=('xapps') replaces=('xapps') -source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a9cf78ea32bac51ff584115381f195566b164fe3') +source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2 + fix_broken_shadows.diff) +sha1sums=('a9cf78ea32bac51ff584115381f195566b164fe3' + '435f9f0ad652bdd759f822514bf1559abf119ffe') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # fix broken shadows in openbox - patch takern from https://bugs.freedesktop.org/show_bug.cgi?id=46285 + patch -Np0 -i ${srcdir}/fix_broken_shadows.diff ./configure --prefix=/usr make } diff --git a/extra/xcompmgr/fix_broken_shadows.diff b/extra/xcompmgr/fix_broken_shadows.diff new file mode 100644 index 000000000..39b8ac725 --- /dev/null +++ b/extra/xcompmgr/fix_broken_shadows.diff @@ -0,0 +1,28 @@ +--- xcompmgr.c 2011-11-19 01:49:52.000000000 -0600 ++++ xcompmgr.c 2012-08-11 21:58:58.000000000 -0500 +@@ -1028,7 +1028,6 @@ + { + w->borderClip = XFixesCreateRegion (dpy, NULL, 0); + XFixesCopyRegion (dpy, w->borderClip, region); +- XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); + } + w->prev_trans = t; + t = w; +@@ -1080,6 +1079,8 @@ + if (w->mode == WINDOW_TRANS) + { + int x, y, wid, hei; ++ XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); ++ XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip); + #if HAS_NAME_WINDOW_PIXMAP + x = w->a.x; + y = w->a.y; +@@ -1099,6 +1100,8 @@ + else if (w->mode == WINDOW_ARGB) + { + int x, y, wid, hei; ++ XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); ++ XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip); + #if HAS_NAME_WINDOW_PIXMAP + x = w->a.x; + y = w->a.y; diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 62bbad9bc..15a88f597 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164022 2012-07-24 15:38:49Z andyrtr $ +# $Id: PKGBUILD 166181 2012-09-05 07:54:00Z andyrtr $ # Contributor: Paul Mattal # Maintainer: Juergen Hoetzel pkgname=xf86-video-openchrome -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) @@ -15,7 +15,7 @@ replaces=('openchrome' 'xf86-video-via') options=('!libtool' '!emptydirs' '!makeflags') conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.99.902' 'unichrome-dri') source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('6916be0deaff4a07974590dcef1bc37a1a59e5df') +sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD index 064730448..d8166dc4f 100644 --- a/gnome-unstable/at-spi2-atk/PKGBUILD +++ b/gnome-unstable/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165756 2012-08-29 12:54:52Z jgc $ +# $Id: PKGBUILD 166313 2012-09-05 21:38:40Z jgc $ # Maintainer: Ionut Biru pkgname=at-spi2-atk -pkgver=2.5.90 +pkgver=2.5.91 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('373c46988fca380e36530c554bea470e05a2aa311292ee134746f856c5baf57e') +sha256sums=('0eeb0ca540c171aa44586c59db52dccb443e4d80acbba719ff6d599350da2c54') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD index df54a00c9..79cb9b14e 100644 --- a/gnome-unstable/at-spi2-core/PKGBUILD +++ b/gnome-unstable/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165752 2012-08-29 12:07:43Z jgc $ +# $Id: PKGBUILD 166311 2012-09-05 21:32:53Z jgc $ # Maintainer: Ionut Biru pkgname=at-spi2-core -pkgver=2.5.5 +pkgver=2.5.91 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9b4cd2d8abec1680c635c07e8b28144d2c3f07c5c3abad1a02a84015ea3dca25') +sha256sums=('bb7a9a0a3daa95c2c95bef0390623f724e3ecb87710805d0b88e923010bbdff1') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/atk/PKGBUILD b/gnome-unstable/atk/PKGBUILD index 0b6d74640..0c4433192 100644 --- a/gnome-unstable/atk/PKGBUILD +++ b/gnome-unstable/atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165747 2012-08-29 11:56:13Z jgc $ +# $Id: PKGBUILD 166309 2012-09-05 21:23:58Z jgc $ # Maintainer: Jan de Groot pkgname=atk -pkgver=2.5.4 +pkgver=2.5.91 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) url='http://www.gtk.org/' -sha256sums=('af6d6d8ec4543f338bf2476974de69891b7419913dd1cf4a94d53696bcc14aab') +sha256sums=('0b4e2a436a8f17730c1e7d11e42b53b0ef2a18a00c6067524d34e2c0a6b5bbbe') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/glib2/PKGBUILD b/gnome-unstable/glib2/PKGBUILD index 77d416a11..240eddf37 100644 --- a/gnome-unstable/glib2/PKGBUILD +++ b/gnome-unstable/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165744 2012-08-29 11:46:05Z jgc $ +# $Id: PKGBUILD 166301 2012-09-05 19:51:18Z jgc $ # Maintainer: Jan de Groot pkgname=glib2 -pkgver=2.33.10 +pkgver=2.33.12 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -16,7 +16,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.ta glib2.sh glib2.csh revert-warn-glib-compile-schemas.patch) -sha256sums=('6caf18eb963aa2c3c7c0dc63201021bc29e7972c60d191f566e8971af77e9505' +sha256sums=('a97dfd3fd36bcdc26f6726cbbcd3bc2353028a7ecd5dbe7ab3a4dc80d672a2e9' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') diff --git a/gnome-unstable/gobject-introspection/PKGBUILD b/gnome-unstable/gobject-introspection/PKGBUILD index 039beeb78..71d453354 100644 --- a/gnome-unstable/gobject-introspection/PKGBUILD +++ b/gnome-unstable/gobject-introspection/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165750 2012-08-29 12:01:00Z jgc $ +# $Id: PKGBUILD 166305 2012-09-05 20:36:25Z jgc $ # Maintainer: Jan de Groot pkgname=gobject-introspection -pkgver=1.33.9 +pkgver=1.33.10 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://live.gnome.org/GObjectIntrospection" @@ -12,7 +12,7 @@ depends=('glib2' 'python2') makedepends=('cairo') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4d8283bcbf30f78e13e2d085a8be9a41a8b197a22ad48dc913e6ea7bec3fe8b0') +sha256sums=('b000d5a6edeeff11040e07a733b31725feffdc9ff73a10862ede911c868ffdd7') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD new file mode 100644 index 000000000..be5c21b17 --- /dev/null +++ b/gnome-unstable/gtk3/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 166315 2012-09-05 21:51:12Z jgc $ +# Maintainer: Ionut Biru + +pkgname=gtk3 +pkgver=3.5.16 +pkgrel=1 +pkgdesc="GObject-based multi-platform GUI toolkit (v3)" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +install=gtk3.install +depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk') +makedepends=('gobject-introspection') +options=('!libtool') +backup=(etc/gtk-3.0/settings.ini) +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz + settings.ini wacom.patch) +sha256sums=('de013edc80684393487f893ff42003c692746df50783b54f6c0aa560ae43c1ae' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') +build() { + cd "gtk+-$pkgver" + + # Partially revert BGO#673440 in order to fix BGO#674157 + patch -Np1 -i ../wacom.patch + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-gtk2-dependency \ + --disable-schemas-compile + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd "gtk+-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" +} diff --git a/gnome-unstable/gtk3/gtk3.install b/gnome-unstable/gtk3/gtk3.install new file mode 100644 index 000000000..ca20d2865 --- /dev/null +++ b/gnome-unstable/gtk3/gtk3.install @@ -0,0 +1,16 @@ +post_install() { + /usr/bin/gtk-query-immodules-3.0 --update-cache + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache +} + +post_remove() { + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/gtk3/settings.ini b/gnome-unstable/gtk3/settings.ini new file mode 100644 index 000000000..039000d38 --- /dev/null +++ b/gnome-unstable/gtk3/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-fallback-icon-theme = gnome diff --git a/gnome-unstable/gtk3/wacom.patch b/gnome-unstable/gtk3/wacom.patch new file mode 100644 index 000000000..79ad84fc6 --- /dev/null +++ b/gnome-unstable/gtk3/wacom.patch @@ -0,0 +1,12 @@ +diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c +--- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c 2012-05-02 14:45:04.000000000 +0200 ++++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c 2012-05-03 18:34:18.034807644 +0200 +@@ -331,6 +331,8 @@ + input_source = GDK_SOURCE_ERASER; + else if (strstr (tmp_name, "cursor")) + input_source = GDK_SOURCE_CURSOR; ++ else if (strstr (tmp_name, "finger")) ++ input_source = GDK_SOURCE_TOUCHSCREEN; + else if (strstr (tmp_name, "wacom") || + strstr (tmp_name, "pen")) + input_source = GDK_SOURCE_PEN; diff --git a/gnome-unstable/harfbuzz/PKGBUILD b/gnome-unstable/harfbuzz/PKGBUILD new file mode 100644 index 000000000..3ceed5738 --- /dev/null +++ b/gnome-unstable/harfbuzz/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Jan de Groot + +pkgname=harfbuzz +pkgver=0.9.4 +pkgrel=1 +pkgdesc="OpenType text shaping engine." +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/HarfBuzz" +license=('MIT') +depends=('icu' 'glib2' 'freetype2') +makedepends=('icu' 'cairo' 'glib2' 'freetype2') +optdepends=('cairo: hb-view program') +options=(!libtool) +source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING" +} diff --git a/gnome-unstable/pango/PKGBUILD b/gnome-unstable/pango/PKGBUILD new file mode 100644 index 000000000..0826ef16b --- /dev/null +++ b/gnome-unstable/pango/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 166307 2012-09-05 21:16:30Z jgc $ +# Maintainer: Jan de Groot + +pkgname=pango +pkgver=1.31.1 +pkgrel=1 +pkgdesc="A library for layout and rendering of text" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('libthai' 'cairo' 'libxft' 'harfbuzz') +makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection') +options=('!libtool') +install=pango.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) +url="http://www.pango.org/" +sha256sums=('b87ecdde5bf6f9a407162155edbba452923e79f86bcf8a09d6ca1916222c9f81') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-included-modules=basic-fc + make +} + +package() { + cd ${pkgname}-${pkgver} + make -j1 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/pango" +} diff --git a/gnome-unstable/pango/pango.install b/gnome-unstable/pango/pango.install new file mode 100644 index 000000000..73b0f5bf1 --- /dev/null +++ b/gnome-unstable/pango/pango.install @@ -0,0 +1,21 @@ +# arg 1: the new package version +post_install() { + # we need to ldconfig first, in case xfree86's libs aren't + # in ld.so.cache yet + sbin/ldconfig -r . + usr/bin/pango-querymodules >etc/pango/pango.modules +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ -f usr/etc/pango/pango.modules ]; then + rm usr/etc/pango/pango.modules + fi + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + rm etc/pango/pango.modules +} diff --git a/multilib-testing/lib32-util-linux/PKGBUILD b/multilib-testing/lib32-util-linux/PKGBUILD new file mode 100644 index 000000000..704327be8 --- /dev/null +++ b/multilib-testing/lib32-util-linux/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 75896 2012-09-05 04:43:08Z dreisner $ +# Maintainer: Dave Reisner +# Contributor: judd + +_pkgbasename=util-linux +pkgname=lib32-$_pkgbasename +pkgver=2.22 +pkgrel=1 +pkgdesc="Miscellaneous system utilities for Linux (32-bit)" +url='http://www.kernel.org/pub/linux/utils/util-linux/' +arch=('x86_64') +depends=('lib32-glibc' "$_pkgbasename") +makedepends=('gcc-multilib') +provides=('lib32-util-linux-ng') +conflicts=('lib32-util-linux-ng') +replaces=('lib32-util-linux-ng') +license=('GPL2') +options=('!libtool' '!emptydirs') +source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v$pkgver/util-linux-$pkgver.tar.xz") +md5sums=('ba2d8cc12a937231c80a04f7f7149303') + +shopt -s extglob + +build() { + cd "$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --without-ncurses --libdir=/usr/lib32 + + make lib{uuid,blkid,mount}.la +} + +package() { + make -C "$_pkgbasename-$pkgver" \ + DESTDIR="$pkgdir" \ + install-usrlib_execLTLIBRARIES \ + install-pkgconfigDATA +} diff --git a/multilib/lib32-sqlite/PKGBUILD b/multilib/lib32-sqlite/PKGBUILD new file mode 100644 index 000000000..fce5a8978 --- /dev/null +++ b/multilib/lib32-sqlite/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Biru Ionut +# Contributor: Mikko Seppälä +# Contributor: Kaos < gianlucaatlas dot gmail dot com > + +_pkgbasename=sqlite +pkgname=lib32-sqlite +_amalgamationver=3071400 +pkgver=3.7.14 +pkgrel=2 +pkgdesc="A C library that implements an SQL database engine (32-bit)" +arch=('x86_64') +license=('custom') +url="http://www.sqlite.org/" +depends=(lib32-glibc $_pkgbasename) +makedepends=('tcl' 'gcc-multilib' 'lib32-readline') +source=(http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz) +options=(!libtool) +md5sums=('6464d429b1396a8db35864e791673b65') +provides=("lib32-sqlite3=$pkgver") +replaces=("lib32-sqlite3") +conflicts=("lib32-sqlite3") + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd ${srcdir}/sqlite-autoconf-${_amalgamationver} + export LTLINK_EXTRAS="-ldl" + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --enable-threadsafe \ + --disable-static + + # rpath removal + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + + make +} + + +package() { + cd ${srcdir}/sqlite-autoconf-${_amalgamationver} + make DESTDIR=${pkgdir} install + + rm -rf "${pkgdir}"/usr/{include,share,bin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/pcr/libegl-git/PKGBUILD b/pcr/libegl-git/PKGBUILD new file mode 100644 index 000000000..aa48ab5a3 --- /dev/null +++ b/pcr/libegl-git/PKGBUILD @@ -0,0 +1,105 @@ +# Maintainer: Márcio Silva + +pkgname=libegl-git +true && pkgver=9.0.0.git20120906 +true && pkgrel=1 +_mesaver=9.0 +arch=( + i686 + x86_64 + mips64el +) +makedepends=( + clang + dri2proto + git + glproto-git + imake + libdrm-git + libxdamage + libxml2 + libxxf86vm + python2 +) +license=( + MIT + Khronos + LGPL +) +depends=( + khrplatform-devel-git + libgbm-git + libxext + libxfixes + libvg-git +) +conflicts=( + ${pkgname%-git} + ${pkgname%-git}-wayland + ${pkgname%-git}-wayland-git +) +provides=( + ${pkgname%-git}=$_mesaver + ${pkgname%-git}-wayland-git=$_mesaver +) +pkgdesc='Mesa EGL libraries and headers' +url=http://mesa3d.sourceforge.net +#source=( +# ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2 +#) +#sha512sums=( +# b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57 +#) + +_gitroot=git://anongit.freedesktop.org/git/mesa/mesa +_gitname=mesa + +build() { + msg 'Connecting to git.freedesktop.org GIT server....' + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + else + git clone $_gitroot --depth 1 + fi + msg 'GIT checkout done or server timeout' + msg 'Starting make...' + + cd $srcdir + + # Cleanup and prepare the build dir + [ -d build ] && rm -rf build + cp -r $_gitname build + cd build + + #cd $srcdir/Mesa-$pkgver + + autoreconf -vfi + ./autogen.sh --prefix=/usr \ + --enable-egl \ + --enable-gallium-egl \ + --enable-gallium-gbm \ + --enable-gbm \ + --enable-openvg \ + --with-clang-libdir=/usr/lib \ + make +} + +package() { + #make -C $srcdir/build/src/egl DESTDIR=$pkgdir install + #make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install + + cd $srcdir/build + install -m755 -d $pkgdir/usr/include/EGL + install -m755 -d $pkgdir/usr/lib/egl + install -m755 -d $pkgdir/usr/lib/pkgconfig + install -m755 -d $pkgdir/usr/share/doc/${pkgname%-git} + install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-git} + bin/minstall include/EGL/* $pkgdir/usr/include/EGL + bin/minstall src/egl/main/libEGL.la $pkgdir/usr/lib + bin/minstall lib/libEGL.so* $pkgdir/usr/lib + bin/minstall lib/egl/egl_gallium.so $pkgdir/usr/lib/egl + bin/minstall src/egl/main/egl.pc $pkgdir/usr/lib/pkgconfig + bin/minstall docs/egl.html $pkgdir/usr/share/doc/${pkgname%-git} + bin/minstall docs/COPYING $pkgdir/usr/share/licenses/${pkgname%-git} + bin/minstall docs/license.html $pkgdir/usr/share/licenses/${pkgname%-git} +} diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD index 6ca8a419a..e4f96e5ae 100644 --- a/pcr/mesa-git/PKGBUILD +++ b/pcr/mesa-git/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( true && pkgname=( khrplatform-devel-git libcl-libre-git - libegl-git + libegl-wayland-git libgbm-git libgl-gallium-git libgl-git @@ -24,7 +24,7 @@ true && pkgname=( soft-xvmc-git mesa-git ) -true && pkgver=9.0.0.git20120905 +true && pkgver=9.0.0.git20120906 true && pkgrel=1 _mesaver=9.0 arch=( @@ -60,7 +60,7 @@ url=http://mesa3d.sourceforge.net # b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57 #) -_gitroot=git://anongit.freedesktop.org/git/mesa/mesa +_gitroot=git://anongit.freedesktop.org/git/${pkgbase%-git}/${pkgbase%-git} _gitname=${pkgbase%-git} build() { @@ -161,7 +161,7 @@ package_libcl-libre-git() { bin/minstall docs/license.html $pkgdir/usr/share/licenses/libcl } -package_libegl-git() { +package_libegl-wayland-git() { depends=( khrplatform-devel-git libgbm-git @@ -172,11 +172,14 @@ package_libegl-git() { ) conflicts=( libegl + libegl-git + libegl-wayland ) provides=( libegl=$_mesaver + libegl-git=$_mesaver ) - pkgdesc='Mesa EGL libraries and headers' + pkgdesc='Mesa EGL libraries and headers, with wayland Support' #make -C $srcdir/build/src/egl DESTDIR=$pkgdir install #make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install @@ -242,10 +245,12 @@ package_libgl-gallium-git() { libxxf86vm ) conflicts=( - libgl libgl-git + libgl + libgl-git ) provides=( libgl=$_mesaver + libgl-git=$_mesaver ) pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer' @@ -277,10 +282,12 @@ package_libgl-git() { libxxf86vm ) conflicts=( - libgl libgl-gallium-git + libgl + libgl-gallium-git ) provides=( libgl=$_mesaver + libgl-gallium-git=$_mesaver ) pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer' @@ -598,7 +605,7 @@ package_soft-xvmc-git() { package_mesa-git() { depends=( - dri2proto-git + dri2proto glproto-git libgl-git ) diff --git a/testing/fontconfig/29-replace-bitmap-fonts.conf b/testing/fontconfig/29-replace-bitmap-fonts.conf new file mode 100644 index 000000000..7ac4483c4 --- /dev/null +++ b/testing/fontconfig/29-replace-bitmap-fonts.conf @@ -0,0 +1,37 @@ + + + + + + + Helvetica + + + Arial + Liberation Sans + sans-serif + + + + + Courier + + + Courier New + Liberation Mono + monospace + + + + + Times + + + Times New Roman + Liberation Serif + serif + + + diff --git a/testing/fontconfig/PKGBUILD b/testing/fontconfig/PKGBUILD new file mode 100644 index 000000000..ffa5f2544 --- /dev/null +++ b/testing/fontconfig/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 166194 2012-09-05 14:35:55Z andyrtr $ +# Maintainer: Jan de Groot + +pkgname=fontconfig +pkgver=2.10.1 +pkgrel=2 +pkgdesc="A library for configuring and customizing font access" +arch=(i686 x86_64) +url="http://www.fontconfig.org/release/" +license=('custom') +depends=('expat' 'freetype2') +options=('!libtool') +install=fontconfig.install +source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz + 29-replace-bitmap-fonts.conf) +md5sums=('c94e380eea42f2f23ca9537035ef1899' + 'f6b67e8cc79197ed6abd4701911e83da') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well + libtoolize -f + autoreconf -f + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-templatedir=/etc/fonts/conf.avail \ + --with-xmldir=/etc/fonts \ + --localstatedir=/var \ + --disable-static \ + --with-default-fonts=/usr/share/fonts \ + --with-add-fonts=/usr/share/fonts + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # not upstream, not in FC and not in Gentoo, this should probably go upstream + # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back + install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail" + pushd $pkgdir/etc/fonts/conf.d + ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf . + popd + + #Install license + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/testing/fontconfig/fontconfig.install b/testing/fontconfig/fontconfig.install new file mode 100644 index 000000000..3a0ca573b --- /dev/null +++ b/testing/fontconfig/fontconfig.install @@ -0,0 +1,39 @@ +post_install() { + cat << _EOF + + Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d. + Read /etc/fonts/conf.d/README for more information. + + Configuration via /etc/fonts/local.conf is still possible, + but is no longer recommended for options available in conf.avail. + + Main systemwide configuration should be done by symlinks + (especially for autohinting, sub-pixel and lcdfilter): + + cd /etc/fonts/conf.d + ln -s ../conf.avail/XX-foo.conf + + Check also https://wiki.archlinux.org/index.php/Font_Configuration + and https://wiki.archlinux.org/index.php/Fonts. + +_EOF + + echo -n "updating font cache... " + /usr/bin/fc-cache -f + echo "done." +} + +post_upgrade() { + echo -n "updating font cache... " + /usr/bin/fc-cache -f + echo "done." +} + +post_remove() { + cat << _EOF + + Check for dead symlinks and leftover files + in /etc/fonts/conf.d/ + +_EOF +} diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD new file mode 100644 index 000000000..b5c8f869d --- /dev/null +++ b/testing/less/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 166186 2012-09-05 10:54:45Z allan $ +# Maintainer: Allan McRae +# Contributor: judd + +pkgname=less +pkgver=451 +pkgrel=1 +pkgdesc="A terminal based program for viewing text files" +license=('GPL3') +arch=('i686' 'x86_64') +url="http://www.greenwoodsoftware.com/less" +groups=('base') +depends=('ncurses' 'pcre') +source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('765f082658002b2b46b86af4a0da1842' + 'a5493f4598ba7c9f81782683f3c27119') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}"/usr install +} diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index 73d1c6cd4..20fc2f60c 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,36 +1,62 @@ -# $Id: PKGBUILD 163482 2012-07-13 02:30:58Z tomegun $ +# $Id: PKGBUILD 166189 2012-09-05 12:02:06Z dreisner $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux -pkgver=2.21.2 -pkgrel=5 +pkgver=2.22 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') groups=('base') depends=('pam') -conflicts=('util-linux-ng') -provides=("util-linux-ng=${pkgver}") +makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1 +conflicts=('util-linux-ng' 'eject') +provides=("util-linux-ng=${pkgver}" 'eject') license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz + su.1 + uuidd.tmpfiles pam-login - pam-common) -backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) + pam-common + pam-su) +backup=(etc/pam.d/chfn + etc/pam.d/chsh + etc/pam.d/login + etc/pam.d/su + etc/pam.d/su-l) install=util-linux.install +md5sums=('ba2d8cc12a937231c80a04f7f7149303' + '7f524538dcf57284a86f03a98e624f04' + 'a39554bfd65cccfd8254bb46922f4a67' + '4368b3f98abd8a32662e094c54e7f9b1' + 'a31374fef2cba0ca34dfc7078e2969e4' + 'fa85e5cce5d723275b14365ba71a8aad') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # unbreak --localstatedir + # TODO(dreisner): find out what sami hand in mind with these heuristics + sed -i '71,75d' configure.ac + ./autogen.sh + ./configure --prefix=/usr \ --libdir=/usr/lib \ + --localstatedir=/run \ --enable-fs-paths-extra=/usr/bin:/usr/sbin \ - --enable-write \ --enable-raw \ - --disable-wall \ - --enable-new-mount \ - --enable-login-utils + --enable-vipw \ + --enable-newgrp \ + --enable-chfn-chsh \ + --enable-write \ + --enable-mesg \ + --enable-socket-activation + +# --enable-reset \ # part of ncurses +# --enable-last \ # not part of any package +# --enable-line \ # not compat make } @@ -46,20 +72,22 @@ package() { cd "${pkgdir}" - # broken tool, going away in next major release, so just remove it now - rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} - - # delete stray empty dir, fixed upstream - rm -r usr/share/man/ru - # setuid chfn and chsh - chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn} + chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} # install PAM files for login-utils install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" + install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su" + install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l" + + # broken buildsys doesn't include su(1), which means it + # isn't even in the dist tarball + # TODO(dreisner): patch for this already sent upstream + install -m644 "$srcdir/su.1" "$pkgdir/usr/share/man/man1/su.1" + + # include tmpfiles fragment for uuidd + # TODO(dreisner): offer this upstream? + install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" } -md5sums=('54ba880f1d66782c2287ee2c898520e9' - '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4') diff --git a/testing/util-linux/pam-su b/testing/util-linux/pam-su new file mode 100644 index 000000000..cf15f40f1 --- /dev/null +++ b/testing/util-linux/pam-su @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install index 90ce5bd73..ef6dea117 100644 --- a/testing/util-linux/util-linux.install +++ b/testing/util-linux/util-linux.install @@ -1,3 +1,17 @@ +post_install() { + # create user for uuidd + if ! getent group uuidd >/dev/null; then + groupadd -r uuidd + fi + + if ! getent passwd uuidd >/dev/null; then + useradd -r -s /sbin/nologin -g uuidd uuidd + fi + + # ensure /run/uuidd exists + systemd-tmpfiles --create uuidd.conf +} + post_upgrade() { if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then if [ -f /var/lib/hwclock/adjtime ]; then @@ -7,4 +21,16 @@ post_upgrade() { rmdir /var/lib/hwclock fi fi + + post_install +} + +post_remove() { + if getent passwd uuidd >/dev/null; then + userdel uuidd + fi + + if getent group uuidd >/dev/null; then + userdel uuidd + fi } -- cgit v1.2.3-54-g00ecf