diff options
71 files changed, 767 insertions, 276 deletions
diff --git a/community/dgen-sdl/PKGBUILD b/community/dgen-sdl/PKGBUILD index 411a0964f..6e2d2073b 100644 --- a/community/dgen-sdl/PKGBUILD +++ b/community/dgen-sdl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 82263 2013-01-13 21:31:21Z jsteel $ +# $Id: PKGBUILD 84168 2013-02-12 18:03:41Z jsteel $ # Maintainer: Jonathan Steel <mail@jsteel.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Joker-jar <joker-jar@yandex.ru> pkgname=dgen-sdl -pkgver=1.31 -pkgrel=2 +pkgver=1.32 +pkgrel=1 pkgdesc="An emulator for Sega Genesis/Mega Drive systems ported to SDL" arch=('i686' 'x86_64') url="http://dgen.sourceforge.net" @@ -14,8 +14,7 @@ license=('BSD') depends=('sdl' 'libgl' 'libarchive') makedepends=('nasm') source=(http://downloads.sourceforge.net/dgen/$pkgname-$pkgver.tar.gz) -md5sums=('3f297010cc17c471c8c66652d9dee905') - +md5sums=('81b6f1c4bd612e81a9b8663c38d51890') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 2ac6fc73a..b34dee1cd 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82913 2013-01-25 17:29:35Z spupykin $ +# $Id: PKGBUILD 84155 2013-02-12 09:34:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.3.0 +pkgver=1.5.4.0 pkgrel=1 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" @@ -15,7 +15,7 @@ makedepends=("gimp" "qt" "fftw" "openexr" "opencv") #options=('!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" "opencv-buildfix.patch") -md5sums=('2b3c385d727556d201767d338d97946f' +md5sums=('a686719a663b856d4a8b1611d2c90df5' '120319b0d6c81c5af186abe2281b79ca') build() { diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index e030c1e09..f218c9121 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82275 2013-01-14 09:20:19Z spupykin $ +# $Id: PKGBUILD 84159 2013-02-12 12:14:09Z thomas $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" arch=('i686' 'x86_64') url="http://w1.fi/hostapd/" diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index d33df7be1..16d7bc4b7 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81173 2012-12-12 18:41:15Z lcarlier $ +# $Id: PKGBUILD 84160 2013-02-12 12:14:10Z thomas $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,12 +6,12 @@ pkgname=knemo pkgver=0.7.6 -pkgrel=1 +pkgrel=2 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=12956" license=('GPL') -depends=('kdebase-workspace' 'wireless_tools' 'iw' 'gtk-update-icon-cache') +depends=('kdebase-workspace' 'wireless_tools' 'iw' 'libnl' 'gtk-update-icon-cache') makedepends=('cmake' 'automoc4') install=${pkgname}.install options=('libtool') diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index baa038c17..0a1f8fac4 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83408 2013-01-31 16:11:20Z spupykin $ +# $Id: PKGBUILD 84161 2013-02-12 12:14:11Z thomas $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD index 9e1d02240..1fc896965 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77847 2012-10-15 09:41:41Z spupykin $ +# $Id: PKGBUILD 84162 2013-02-12 12:14:12Z thomas $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64') license=('LGPL') diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD index d1cc4b5e8..1a12858cf 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79142 2012-10-31 02:45:48Z bgyorgy $ +# $Id: PKGBUILD 84150 2013-02-12 01:00:22Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=onboard @@ -20,5 +20,11 @@ md5sums=('7b44ab2873ca7b76ff1d9ab0b3398487') build() { cd "$srcdir/$pkgname-$pkgver" + python3 setup.py build +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python3 setup.py install --root=$pkgdir/ --optimize=1 } diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD index 30cda1f32..42dff9eef 100644 --- a/community/powertop/PKGBUILD +++ b/community/powertop/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81993 2013-01-05 11:39:29Z jlichtblau $ +# $Id: PKGBUILD 84163 2013-02-12 12:14:14Z thomas $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Xilon <xilonmu@gmail.com> pkgname=powertop pkgver=2.2 -pkgrel=1 +pkgrel=2 pkgdesc='A tool to diagnose issues with power consumption and power management' arch=('i686' 'x86_64') url='https://01.org/powertop/' diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index 579b5b416..dd26c5deb 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165664 2012-08-28 11:02:19Z thomas $ +# $Id: PKGBUILD 177947 2013-02-12 12:13:43Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda -pkgver=1.1.2 -pkgrel=4 +pkgver=1.1.3 +pkgrel=1 pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" @@ -12,15 +12,12 @@ depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw') makedepends=('python-m2crypto') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 - set-wireless-regdom - libnl32.patch) -md5sums=('5226f65aebacf94baaf820f8b4e06df4' - '65c93f2ff2eb1b29d9e9fa102ae2dd45' - 'c1f7aff29f15a0364ae6f7905a1d4ae6') + set-wireless-regdom) +md5sums=('29579185e06a75675507527243d28e5c' + '65c93f2ff2eb1b29d9e9fa102ae2dd45') build() { cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np1 -i "$srcdir/libnl32.patch" sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py make crda regdbdump } diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index b1623ed81..d1c646dc9 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 169687 2012-10-26 01:36:12Z dreisner $ +# $Id: PKGBUILD 177948 2013-02-12 12:13:44Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.5.1 +pkgver=1.6.0 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -14,9 +14,9 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -md5sums=('87cc018c0c65f36043f38ceb8ffd4d81' - '5f711687f453f4d5a38596f60df5247a' - 'c970831d733ca42e20415005967e7843' +md5sums=('99002ac59a65ea371e7a98200943cb80' + 'd933e3e59998e491f674b42fd66d6183' + 'c279d86d6dc18322c054d2272ebb9e90' '21c45f9cab3e0b5165f68358884fbd0f') build() { diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook index 11db3443a..819c4cf60 100644 --- a/core/cryptsetup/encrypt_hook +++ b/core/cryptsetup/encrypt_hook @@ -66,7 +66,7 @@ EOF dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then - if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then + if eval cryptsetup --key-file ${ckeyfile} open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -78,7 +78,7 @@ EOF echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password - while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do + while ! eval cryptsetup open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -98,7 +98,7 @@ EOF err "Non-LUKS decryption not attempted..." return 1 fi - exe="cryptsetup create $cryptname $resolved $cryptargs" + exe="cryptsetup open --type plain $resolved $cryptname $cryptargs" IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF $crypto EOF diff --git a/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch b/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch new file mode 100644 index 000000000..aaedc27c6 --- /dev/null +++ b/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch @@ -0,0 +1,39 @@ +From da3fc1ee91de656a30f3a12de394bcba55119872 Mon Sep 17 00:00:00 2001 +From: Linus Nielsen Feltzing <linus@haxx.se> +Date: Sun, 10 Feb 2013 22:57:58 +0100 +Subject: [PATCH] Fix NULL pointer reference when closing an unused multi + handle. + +--- + lib/multi.c | 8 +++++--- + tests/data/Makefile.am | 1 + + tests/data/test1508 | 31 +++++++++++++++++++++++++++++ + tests/libtest/Makefile.inc | 6 +++++- + tests/libtest/lib1508.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 91 insertions(+), 4 deletions(-) + create mode 100644 tests/data/test1508 + create mode 100644 tests/libtest/lib1508.c + +diff --git a/lib/multi.c b/lib/multi.c +index fa0afb9..706df23 100644 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle) + /* Close all the connections in the connection cache */ + close_all_connections(multi); + +- multi->closure_handle->dns.hostcache = multi->hostcache; +- Curl_hostcache_clean(multi->closure_handle); ++ if(multi->closure_handle) { ++ multi->closure_handle->dns.hostcache = multi->hostcache; ++ Curl_hostcache_clean(multi->closure_handle); + +- Curl_close(multi->closure_handle); ++ Curl_close(multi->closure_handle); ++ } + multi->closure_handle = NULL; + + Curl_hash_destroy(multi->sockhash); +-- +1.8.1.3 + diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 1c0f41e45..51d860f43 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177786 2013-02-08 18:18:03Z dreisner $ +# $Id: PKGBUILD 177958 2013-02-12 13:57:28Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ pkgname=curl pkgver=7.29.0 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -15,9 +15,11 @@ license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch curlbuild.h) md5sums=('4f57d3b4a3963038bd5e04dbff385390' '6283fbb36933cf8720acc34c43169f1d' + '5bfd1899e8b19cfdd78774f6337f8b47' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') @@ -32,6 +34,8 @@ esac build() { cd "$pkgname-$pkgver" + patch -Np1 <"$srcdir/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch" + ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index 4c8482e6b..e51db25dc 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 177059 2013-02-05 10:01:13Z thomas $ +# $Id: PKGBUILD 177972 2013-02-12 18:00:18Z eric $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=iw pkgver=3.8 -pkgrel=1 +pkgrel=2 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") url="http://wireless.kernel.org/en/users/Documentation/iw" license=("GPL") depends=("libnl") makedepends=("linux-api-headers") -source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('3dae92ca5989cbc21155941fa01907a5536da3c5f6898642440c61484fc7e0f9') +source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('50c07d5fcf38240b3912fb6950f6ec566b8d27c321cbdacc1de53fc3be96af9a') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index da91aedcb..7f8f9decd 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162745 2012-06-29 11:46:12Z thomas $ +# $Id: PKGBUILD 177950 2013-02-12 12:13:46Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libnl -pkgver=3.2.11 +pkgver=3.2.19 pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=(glibc) backup=(etc/libnl/classid etc/libnl/pktloc) options=(!libtool) source=("$url/files/$pkgname-$pkgver.tar.gz") -sha256sums=('9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d') +sha256sums=('37a611ad84e84a15daf2736cdd2c5191f3af4e1b12354f7d260f0264383b098b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index 1974ff4c0..918f593ec 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162746 2012-06-29 11:46:18Z thomas $ +# $Id: PKGBUILD 177951 2013-02-12 12:13:47Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libpcap pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64') url="http://www.tcpdump.org/" @@ -13,7 +13,7 @@ makedepends=('flex') source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} libnl32.patch) sha256sums=('41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9' - '8004a6655fb98acd89f3dea7ce95f182f4874298ce692f5b8f4a7dae65d7993f' + 'a078cf1c0f36151cc84a0da7c25ad81fef87afa6bece58c990c62886a7beef99' '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6') build() { diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 014eeb8ad..f34523f4d 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169698 2012-10-26 08:32:04Z thomas $ +# $Id: PKGBUILD 177953 2013-02-12 12:13:50Z thomas $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.98 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -14,27 +14,34 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2_install lvm2_hook 11-dm-initramfs.rules - lvm.service - lvm-on-crypt.service - lvm2.conf) + lvm2.conf + dmeventd.service + dmeventd.socket + lvm-monitoring.service + lvmetad.service + lvmetad.socket) sha1sums=('077425115b164c335a9930df745943e9ea666a8a' '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8' - '3e1680f9b76ce9150d08865d99db90fd15532271' - 'cedc9948123c870f9c5aa3357d0075b41a9c8135' + '8008547b133af89f79461a6df5412539ed3f26b7' + 'ff0fdf0a3005a41acd4b36865056109effc3474b' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'edce6b6e8d03f7cbad4bfff49fab01d618415be8' - '652fb58dd7676caa0515f0a06d537744e071c6cf' - 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4') + 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4' + 'cbc64f377fbb1c1a9ff53bc6ca85c324075499b7' + '1d56f47a81350ae37ffbf61ee036fe31f4c5d504' + 'ae945cae2d71b286439a9945876acb78dc9eeaf7' + '460b094e8689298ed59842d1abcee5d4e706e1d7' + 'fcfc265e3b10294cc4b10949a342e9db4310b186') build() { cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS - ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ - --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \ - --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules \ - --with-default-locking-dir=/run/lock/lvm + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-udev-prefix=/usr \ + --with-systemdsystemunitdir=/usr/lib/systemd/system --with-default-pid-dir=/run \ + --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \ + --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ + --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \ + --enable-lvmetad make } @@ -47,6 +54,11 @@ package_device-mapper() { make DESTDIR="${pkgdir}" install_device-mapper # extra udev rule for device-mapper in initramfs install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" + # Install dmeventd socket and service + install -D -m644 "${srcdir}/dmeventd.service" "${pkgdir}/usr/lib/systemd/system/dmeventd.service" + install -D -m644 "${srcdir}/dmeventd.socket" "${pkgdir}/usr/lib/systemd/system/dmeventd.socket" + install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants" + ln -sf /usr/lib/systemd/system/dmeventd.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dmeventd.socket" } package_lvm2() { @@ -55,6 +67,7 @@ package_lvm2() { conflicts=('lvm' 'mkinitcpio<0.7') backup=('etc/lvm/lvm.conf') options=('!makeflags') + install=lvm2.install cd "${srcdir}/LVM2.${pkgver}" make DESTDIR="${pkgdir}" install_lvm2 @@ -66,7 +79,12 @@ package_lvm2() { install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" # systemd support - install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service" - install -D -m644 "${srcdir}/lvm-on-crypt.service" "${pkgdir}/usr/lib/systemd/system/lvm-on-crypt.service" install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf" + install -D -m644 "${srcdir}/lvm-monitoring.service" "${pkgdir}/usr/lib/systemd/system/lvm-monitoring.service" + install -D -m644 "${srcdir}/lvmetad.service" "${pkgdir}/usr/lib/systemd/system/lvmetad.service" + install -D -m644 "${srcdir}/lvmetad.socket" "${pkgdir}/usr/lib/systemd/system/lvmetad.socket" + install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants" + ln -sf /usr/lib/systemd/system/lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/lvmetad.socket" + # enable lvmetad + sed 's|use_lvmetad = 0|use_lvmetad = 1|' -i "${pkgdir}/etc/lvm/lvm.conf" } diff --git a/core/lvm2/dmeventd.service b/core/lvm2/dmeventd.service new file mode 100644 index 000000000..15ca21c0b --- /dev/null +++ b/core/lvm2/dmeventd.service @@ -0,0 +1,14 @@ +[Unit] +Description=Device-mapper event daemon +Documentation=man:dmeventd(8) +Requires=dmeventd.socket +After=dmeventd.socket +DefaultDependencies=no + +[Service] +Type=forking +ExecStart=/usr/sbin/dmeventd +ExecReload=/usr/sbin/dmeventd -R +Environment=SD_ACTIVATION=1 +PIDFile=/run/dmeventd.pid +OOMScoreAdjust=-1000 diff --git a/core/lvm2/dmeventd.socket b/core/lvm2/dmeventd.socket new file mode 100644 index 000000000..726d11236 --- /dev/null +++ b/core/lvm2/dmeventd.socket @@ -0,0 +1,11 @@ +[Unit] +Description=Device-mapper event daemon FIFOs +Documentation=man:dmeventd(8) +Before=sockets.target +DefaultDependencies=no +Conflicts=shutdown.target + +[Socket] +ListenFIFO=/run/dmeventd-server +ListenFIFO=/run/dmeventd-client +SocketMode=0600 diff --git a/core/lvm2/lvm-monitoring.service b/core/lvm2/lvm-monitoring.service new file mode 100644 index 000000000..8f5247b00 --- /dev/null +++ b/core/lvm2/lvm-monitoring.service @@ -0,0 +1,18 @@ +[Unit] +Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling +Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) +Requires=dmeventd.socket +After=dmeventd.socket lvmetad.socket lvmetad.service dmeventd.service +Before=local-fs-pre.target +DefaultDependencies=no +Conflicts=shutdown.target + +[Service] +Type=oneshot +Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 +ExecStart=/usr/sbin/lvm vgchange --monitor y +ExecStop=/usr/sbin/lvm vgchange --monitor n +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/core/lvm2/lvm-on-crypt.service b/core/lvm2/lvm-on-crypt.service deleted file mode 100644 index 346c5ac8e..000000000 --- a/core/lvm2/lvm-on-crypt.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=LVM activation of encrypted devices -DefaultDependencies=no -Requires=systemd-udev-settle.service -After=systemd-udev-settle.service cryptsetup.target -Before=shutdown.target -Conflicts=shutdown.target - -[Service] -ExecStart=/sbin/vgchange --available y -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes - -[Install] -WantedBy=basic.target diff --git a/core/lvm2/lvm.service b/core/lvm2/lvm.service deleted file mode 100644 index 14269b1be..000000000 --- a/core/lvm2/lvm.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=LVM activation -DefaultDependencies=no -Requires=systemd-udev-settle.service -After=systemd-udev-settle.service -Before=basic.target shutdown.target -Conflicts=shutdown.target - -[Service] -ExecStart=/sbin/vgchange --available y -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes - -[Install] -WantedBy=basic.target diff --git a/core/lvm2/lvm2.install b/core/lvm2/lvm2.install new file mode 100644 index 000000000..7faf708d4 --- /dev/null +++ b/core/lvm2/lvm2.install @@ -0,0 +1,16 @@ +post_upgrade() { + if [ $(vercmp $2 2.02.98-2) -lt 0 ]; then + echo "Changes to the lvm2 package:" + echo " + Activating lvm in mkinitcpio now requires both the 'udev' and 'lvm2' hooks." + echo " + LVM volumes are automatically activated by udev (full hotplug support)." + echo " + You MUST have use_lvmetad = 1 in /etc/lvm/lvm.conf (the default)." + echo " + If you uncomment auto_activation_volume_list in /etc/lvm/lvm.conf, only the" + echo " volumes listed there will be activated (default: it is commented out)." + if [ -f /etc/lvm/lvm.conf.pacnew ]; then + echo "WARNING: /etc/lvm/lvm.conf.pacnew exists. You MUST merge the required changes" + echo " into /etc/lvm/lvm.conf or LVM will fail to work." + fi + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook index e69b3349a..65de7bd2f 100644 --- a/core/lvm2/lvm2_hook +++ b/core/lvm2/lvm2_hook @@ -1,24 +1,12 @@ #!/usr/bin/ash -run_hook() { - local pvdev - - modprobe -q dm-mod >/dev/null 2>&1 - - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - for pvdev in ${lvmwait//,/ }; do - poll_device ${pvdev} ${rootdelay} - done - - msg "Activating logical volumes..." - [ -d /etc/lvm ] && lvm vgscan +run_earlyhook() { + mkdir /run/lvm + lvmetad +} - if [ -n "$quiet" ]; then - lvm vgchange --sysinit -a y >/dev/null - else - lvm vgchange --sysinit -a y - fi +run_cleanuphook() { + kill $(cat /run/lvmetad.pid) } # vim: set ft=sh ts=4 sw=4 et: diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install index 145ce49b2..be27614bd 100644 --- a/core/lvm2/lvm2_install +++ b/core/lvm2/lvm2_install @@ -6,25 +6,23 @@ build() { add_module "$mod" done - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" + add_binary "/usr/sbin/lvm" + add_binary "/usr/sbin/lvmetad" + add_binary "/usr/sbin/dmsetup" add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules" add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + add_file "/etc/lvm/lvm.conf" add_runscript } help() { cat <<HELPEOF -This hook loads the necessary modules for an LVM2 root device. - -The optional lvmwait= parameter followed by a comma-separated -list of device names can be given on the command line. -It will cause the hook to wait until all given devices exist -before trying to scan and activate any volume groups. +This hook enables LVM2 volumes in initramfs. HELPEOF } diff --git a/core/lvm2/lvmetad.service b/core/lvm2/lvmetad.service new file mode 100644 index 000000000..64168f465 --- /dev/null +++ b/core/lvm2/lvmetad.service @@ -0,0 +1,16 @@ +[Unit] +Description=LVM2 metadata daemon +Documentation=man:lvmetad(8) +Requires=lvmetad.socket +After=lvmetad.socket +DefaultDependencies=no +Conflicts=shutdown.target + +[Service] +Type=forking +NonBlocking=true +ExecStart=/usr/sbin/lvmetad +ExecReload=/usr/sbin/lvmetad -R +Environment=SD_ACTIVATION=1 +Restart=on-abort +PIDFile=/run/lvmetad.pid diff --git a/core/lvm2/lvmetad.socket b/core/lvm2/lvmetad.socket new file mode 100644 index 000000000..9c0ffa5b4 --- /dev/null +++ b/core/lvm2/lvmetad.socket @@ -0,0 +1,10 @@ +[Unit] +Description=LVM2 metadata daemon socket +Documentation=man:lvmetad(8) +Before=sockets.target systemd-udev-trigger.service +DefaultDependencies=no +Conflicts=shutdown.target + +[Socket] +ListenStream=/run/lvm/lvmetad.socket +SocketMode=0600 diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index f00b8d0fa..08405c999 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170043 2012-10-31 07:26:06Z tpowa $ +# $Id: PKGBUILD 177952 2013-02-12 12:13:48Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.6 -pkgrel=1 +pkgrel=3 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -19,12 +19,14 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm_hook mdadm_udev_install mdadm.service - disable-werror.patch) + disable-werror.patch + mdadm-fix-udev-rules.patch) replaces=('raidtools') build() { cd $srcdir/$pkgname-$pkgver patch -Np0 -i ../disable-werror.patch + patch -p1 -i ../mdadm-fix-udev-rules.patch make CXFLAGS="$CFLAGS" # build static mdassemble for Arch's initramfs make MDASSEMBLE_AUTO=1 mdassemble @@ -40,19 +42,15 @@ package() { install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev - # symlink for backward compatibility - ln -sf /usr/lib/initcpio/hooks/mdadm $pkgdir/usr/lib/initcpio/hooks/raid - # move /lib/* to /usr/lib/ - mv $pkgdir/lib/udev $pkgdir/usr/lib/ - rm -rf $pkgdir/lib # systemd service file install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service } md5sums=('3e255dc71e5144bbcb872788ca647267' '8333d405f550317c2bacd5510bf1cb60' '00cbed931db4f15b6ce49e3e7d433966' - '609d10888727710cb20db7ac3e096116' + '815245a3af16a73ec1c5e5989fb892e9' 'fbb5542d9bdf87441a11dd7e7a0a17f8' - 'd1d8e9eb81ce9347de74f3c84a9db09e' + '0e35422d0cc007c3654a5e2591a9f9b5' 'aafb5f9ac8437a284cbf948b9b13b179' - '4ad87b74a4bc9a34621280abe0e0c3e4') + '4ad87b74a4bc9a34621280abe0e0c3e4' + '0bf45d6dcb3ea14facddbb10b3303806') diff --git a/core/mdadm/mdadm-fix-udev-rules.patch b/core/mdadm/mdadm-fix-udev-rules.patch new file mode 100644 index 000000000..60f5ae131 --- /dev/null +++ b/core/mdadm/mdadm-fix-udev-rules.patch @@ -0,0 +1,137 @@ +diff --git a/Makefile b/Makefile +index b6edb23..bedef96 100644 +--- a/Makefile ++++ b/Makefile +@@ -253,8 +253,9 @@ + $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 + $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 + +-install-udev: udev-md-raid.rules +- $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules ++install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules ++ $(INSTALL) -D -m 644 udev-md-raid-arrays.rules $(DESTDIR)/usr/lib/udev/rules.d/63-md-raid-arrays.rules ++ $(INSTALL) -D -m 644 udev-md-raid-assembly.rules $(DESTDIR)/usr/lib/udev/rules.d/64-md-raid-assembly.rules + + uninstall: + rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm +diff --git a/udev-md-raid-arrays.rules b/udev-md-raid-arrays.rules +new file mode 100644 +index 0000000..883ee4d +--- /dev/null ++++ b/udev-md-raid-arrays.rules +@@ -0,0 +1,35 @@ ++# do not edit this file, it will be overwritten on update ++ ++SUBSYSTEM!="block", GOTO="md_end" ++ ++# handle md arrays ++ACTION!="add|change", GOTO="md_end" ++KERNEL!="md*", GOTO="md_end" ++ ++# partitions have no md/{array_state,metadata_version}, but should not ++# for that reason be ignored. ++ENV{DEVTYPE}=="partition", GOTO="md_ignore_state" ++ ++# container devices have a metadata version of e.g. 'external:ddf' and ++# never leave state 'inactive' ++ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state" ++TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end" ++ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" ++LABEL="md_ignore_state" ++ ++IMPORT{program}="/sbin/mdadm --detail --export $devnode" ++ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" ++ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" ++ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" ++ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace" ++ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n" ++ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" ++ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" ++ ++IMPORT{builtin}="blkid" ++OPTIONS+="link_priority=100" ++OPTIONS+="watch" ++ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" ++ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" ++ ++LABEL="md_end" +diff --git a/udev-md-raid-assembly.rules b/udev-md-raid-assembly.rules +new file mode 100644 +index 0000000..b89775e +--- /dev/null ++++ b/udev-md-raid-assembly.rules +@@ -0,0 +1,19 @@ ++# do not edit this file, it will be overwritten on update ++ ++# assemble md arrays ++ ++SUBSYSTEM!="block", GOTO="md_inc_end" ++ ++# handle potential components of arrays (the ones supported by md) ++ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", GOTO="md_inc" ++GOTO="md_inc_end" ++ ++LABEL="md_inc" ++ ++# remember you can limit what gets auto/incrementally assembled by ++# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' ++ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot" ++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" ++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name" ++ ++LABEL="md_inc_end" +diff --git a/udev-md-raid.rules b/udev-md-raid.rules +deleted file mode 100644 +index cc7f5ef..0000000 +--- a/udev-md-raid.rules ++++ /dev/null +@@ -1,49 +0,0 @@ +-# do not edit this file, it will be overwritten on update +- +-SUBSYSTEM!="block", GOTO="md_end" +- +-# handle potential components of arrays (the ones supported by md) +-ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", GOTO="md_inc" +-GOTO="md_inc_skip" +- +-LABEL="md_inc" +- +-# remember you can limit what gets auto/incrementally assembled by +-# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' +-ACTION=="add", RUN+="/sbin/mdadm --incremental $tempnode --offroot" +-ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" +-ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name" +- +-LABEL="md_inc_skip" +- +-# handle md arrays +-ACTION!="add|change", GOTO="md_end" +-KERNEL!="md*", GOTO="md_end" +- +-# partitions have no md/{array_state,metadata_version}, but should not +-# for that reason be ignored. +-ENV{DEVTYPE}=="partition", GOTO="md_ignore_state" +- +-# container devices have a metadata version of e.g. 'external:ddf' and +-# never leave state 'inactive' +-ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state" +-TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end" +-ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" +-LABEL="md_ignore_state" +- +-IMPORT{program}="/sbin/mdadm --detail --export $tempnode" +-ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" +-ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" +-ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" +-ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace" +-ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n" +-ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" +-ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" +- +-IMPORT{program}="/sbin/blkid -o udev -p $tempnode" +-OPTIONS+="link_priority=100" +-OPTIONS+="watch" +-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" +-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" +- +-LABEL="md_end" diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index cf6159e40..36b37fd0b 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -9,6 +9,7 @@ build() { add_file "/etc/mdadm.conf" fi add_binary "/sbin/mdassemble" + add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules" add_runscript } diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install index f6f5de4ad..5635b8f63 100644 --- a/core/mdadm/mdadm_udev_install +++ b/core/mdadm/mdadm_udev_install @@ -10,7 +10,8 @@ build() { fi add_binary "mdadm" - add_file "/usr/lib/udev/rules.d/64-md-raid.rules" + add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules" + add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules" } help() { diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD index c5afc3912..40fe8cad9 100644 --- a/core/openvpn/PKGBUILD +++ b/core/openvpn/PKGBUILD @@ -1,45 +1,46 @@ -# $Id: PKGBUILD 165626 2012-08-27 12:27:33Z dreisner $ +# $Id: PKGBUILD 177954 2013-02-12 12:13:51Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=openvpn -pkgver=2.2.2 +pkgver=2.3.0 pkgrel=2 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" arch=(i686 x86_64) url="http://openvpn.net/index.php/open-source.html" depends=('openssl' 'lzo2' 'iproute2') +makedepends=('systemd') license=('custom') backup=(usr/share/openvpn/easy-rsa/vars - usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf - etc/conf.d/openvpn-tapdev) + usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf) source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc + http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz + http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz.asc openvpn@.service - openvpn.rc - openvpn-tapdev.rc - openvpn-tapdev.conf) -md5sums=('c5181e27b7945fa6276d21873329c5c7' - '81ff11ec8cd9fc3c8bc646aae24c4298' - '44047df812a3fcd57a7e36a61732a9b9' - 'a3809b9727f0c2af2d0770f5c7442db2' - 'd2c48e970088d679dd3c2afd914ff731' - '722f483c9e3ce2ec66d3301aaf7cf3d5') + openvpn-2.3.0-fix-systemd-ask-password-path.patch) +md5sums=('56cffde5d5320e0b1ec364d3e486aca9' + '3f67e2fa605800a964dbbcfca644d283' + 'fbf818b6e1f212e77b9ce0e6d92584a1' + '46df49b85f9850fec287e311279bdbef' + '0846aa59d0b123d61030890f9a4135ae' + 'e1bd1523e38745e948c710db1a330bb1') +options=(!libtool) build() { cd $srcdir/$pkgname-$pkgver + patch -p0 -i $srcdir/openvpn-2.3.0-fix-systemd-ask-password-path.patch # Build openvpn CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \ --prefix=/usr \ --enable-password-save \ --mandir=/usr/share/man \ - --enable-iproute2 + --enable-iproute2 \ + --enable-systemd + make + # Build easy-rsa + cd $srcdir/easy-rsa-2.2.0_master + ./configure --prefix=/usr --with-easyrsadir=/usr/share/openvpn/easy-rsa make - - # Build plugins - for plug in auth-pam down-root; do - cd $srcdir/$pkgname-$pkgver/plugin/$plug - make - done } package() { @@ -49,27 +50,16 @@ package() { install -d -m755 $pkgdir/etc/openvpn # Install examples install -d -m755 $pkgdir/usr/share/openvpn - cp -r sample-config-files $pkgdir/usr/share/openvpn/examples - find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \; - find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \; + cp -r sample/sample-config-files $pkgdir/usr/share/openvpn/examples # Install license install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - # Install plugins - for plug in auth-pam down-root; do - cd $srcdir/$pkgname-$pkgver/plugin/$plug - install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so - cd - - done # Install contrib install -d -m755 $pkgdir/usr/share/openvpn/contrib cp -r contrib $pkgdir/usr/share/openvpn # Install easy-rsa - cd $srcdir/$pkgname-$pkgver - make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa + cd $srcdir/easy-rsa-2.2.0_master + make install DESTDIR=$pkgdir rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf # Install rc scripts - install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn - install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev - install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev install -D -m644 $srcdir/openvpn@.service $pkgdir/usr/lib/systemd/system/openvpn@.service } diff --git a/core/openvpn/openvpn-2.3.0-fix-systemd-ask-password-path.patch b/core/openvpn/openvpn-2.3.0-fix-systemd-ask-password-path.patch new file mode 100644 index 000000000..77291727a --- /dev/null +++ b/core/openvpn/openvpn-2.3.0-fix-systemd-ask-password-path.patch @@ -0,0 +1,11 @@ +--- src/openvpn/console.c.orig 2013-01-30 09:42:57.480257300 +0100 ++++ src/openvpn/console.c 2013-01-30 09:43:07.446179811 +0100 +@@ -162,7 +162,7 @@ get_console_input_systemd (const char *p + struct argv argv; + + argv_init (&argv); +- argv_printf (&argv, "/bin/systemd-ask-password"); ++ argv_printf (&argv, "/usr/bin/systemd-ask-password"); + argv_printf_cat (&argv, "%s", prompt); + + if ((std_out = openvpn_popen (&argv, NULL)) < 0) { diff --git a/core/openvpn/openvpn@.service b/core/openvpn/openvpn@.service index c3de3bdf7..0b7232899 100644 --- a/core/openvpn/openvpn@.service +++ b/core/openvpn/openvpn@.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i --cd /etc/openvpn +ExecStart=/usr/sbin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i [Install] WantedBy=multi-user.target diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index c042742d2..b2732903b 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177060 2013-02-05 10:02:51Z thomas $ +# $Id: PKGBUILD 177955 2013-02-12 12:13:52Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD index 26cbe5081..c49926f8f 100644 --- a/extra/bluefish/PKGBUILD +++ b/extra/bluefish/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 162427 2012-06-27 03:30:42Z eric $ +# $Id: PKGBUILD 177998 2013-02-12 22:00:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=bluefish -pkgver=2.2.3 +pkgver=2.2.4 pkgrel=1 pkgdesc="A powerful HTML editor for experienced web designers and programmers" arch=('i686' 'x86_64') url="http://bluefish.openoffice.nl/" license=('GPL3') -depends=('gtk3' 'enchant' 'desktop-file-utils' 'hicolor-icon-theme') +depends=('gtk3' 'enchant' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('gucharmap' 'intltool') optdepends=('gucharmap: for using the charmap plugin') options=('!libtool') install=bluefish.install source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig}) -sha1sums=('181f28b595f6259441eb13f4aaae60def596b980' - 'e8c4e3ba0623e476adeb8bf8466044894aa034c8') +sha1sums=('b65310617b5fd525a8c57f7681e023f6f4496378' + '6ff0474602c520e2a638436c5423957cfe4be4d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ - src/plugin_zencoding/zencoding/{,filters/,actions/}*.py data/lorem-ipsum-generator + src/plugin_zencoding/zencoding/{,filters/,actions/}*.py \ + data/{cssmin.py,jsbeautify,jsmin.py,lorem-ipsum-generator} + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-spell-check --disable-update-databases --disable-xml-catalog-update make diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD index 1d7ffb350..605f1431c 100644 --- a/extra/diffstat/PKGBUILD +++ b/extra/diffstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146517 2012-01-12 10:18:19Z giovanni $ +# $Id: PKGBUILD 177978 2013-02-12 19:03:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de> pkgname=diffstat -pkgver=1.55 +pkgver=1.56 pkgrel=1 pkgdesc="Display a histogram of diff changes" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://invisible-island.net/diffstat" depends=('glibc') license=('MIT') source=("ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz") -md5sums=('630d5278f1cd874dc3cc68cff3fddecf') +md5sums=('3841a3831122674865d41be39d27052f') build () { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index b611231dc..e1da18b2d 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175162 2013-01-15 18:14:28Z andyrtr $ +# $Id: PKGBUILD 177976 2013-02-12 18:43:03Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -7,18 +7,18 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 -_updatever=u9 -_icedtea_ver=2.3.4 +_updatever=u13 +_icedtea_ver=2.3.6 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=dc9234e25ab0 -_JAXP_CHANGESET=aa3654afea12 -_JAXWS_CHANGESET=7182233cc27e -_JDK_CHANGESET=96d4f04f2b7c -_LANGTOOLS_CHANGESET=946195011b30 -_OPENJDK_CHANGESET=8bd8e70d4a03 +_CORBA_CHANGESET=97a8b625f6e9 +_JAXP_CHANGESET=d7feafb8427b +_JAXWS_CHANGESET=b900024eb4ba +_JDK_CHANGESET=6bb01322bb5a +_LANGTOOLS_CHANGESET=e0739a8783d1 +_OPENJDK_CHANGESET=dd8d1a8f222f -_HOTSPOT_CHANGESET=beecf0b9e760 # see "${srcdir}/icedtea7"/hotspot.map +_HOTSPOT_CHANGESET=bc0de5a0ece2 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('ea859f37fb20904ffd40802a41396326f7e301fa6873d88d01bf4afef5a60ca8' - '3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd' - '911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8' - 'cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7' - '7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590' - 'afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b' - 'a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144' - 'de7a5397a83bb7c7be2458809b576133e8a3b75dc62d62d2f2983b97c220dc4f' +sha256sums=('f55f2f2e5cdfa8b0429eaa56b4ecba7d63c701e867dbb636883c03cd8e64f4f9' + 'a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092' + '511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d' + '81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941' + '276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2' + 'a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2' + '85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb' + '4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 090e15b78..873ad157f 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177576 2013-02-07 16:27:21Z andyrtr $ +# $Id: PKGBUILD 177982 2013-02-12 19:24:37Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp pkgver=4.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') license=('GPL3') @@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('59351bc6fd71e65485cb0b5dd6dbf07a') +md5sums=('b877c1f82b2d4dc503f40dcce4978ff4') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index 1878f8445..d821d2bf9 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174288 2013-01-03 23:42:31Z eric $ +# $Id: PKGBUILD 177974 2013-02-12 18:22:48Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Eric Gillingham <sysrq@sysrq.tk> pkgname=libdiscid -pkgver=0.3.0 +pkgver=0.3.2 pkgrel=1 pkgdesc="A Library for creating MusicBrainz DiscIDs" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('glibc') options=('!libtool') source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") -md5sums=('17e51260062b7583e5981c82cf618127') +md5sums=('eeffcbf2e63ee056b0e0a3dd967233ce') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index 1bc3cab9e..01d3b10cf 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 174025 2013-01-01 19:16:09Z andyrtr $ +# $Id: PKGBUILD 177994 2013-02-12 20:05:14Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb pkgver=1.9 -pkgrel=2 +pkgrel=3 pkgdesc="X11 client-side library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xcb.freedesktop.org/" depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau') makedepends=('pkgconfig' 'libxslt' 'python2') @@ -20,7 +20,7 @@ sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' build() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" - PYTHON=/usr/bin/python2 + export PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr \ --enable-xinput \ --enable-xkb \ diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index e06801945..25e51b873 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176935 2013-02-02 19:40:08Z eric $ +# $Id: PKGBUILD 177956 2013-02-12 12:13:57Z thomas $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64') url="http://www.net-snmp.org/" diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 0c93887a4..edb3f262c 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169996 2012-10-30 23:01:16Z heftig $ +# $Id: PKGBUILD 177957 2013-02-12 12:13:58Z thomas $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -9,7 +9,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index a4946edd3..67fb29697 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 177074 2013-02-05 19:26:45Z andyrtr $ +# $Id: PKGBUILD 177967 2013-02-12 16:59:18Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.12.1 +_icedteaver=1.12.2 _openjdk_version=b27 _openjdk_date=26_oct_2012 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} @@ -33,8 +33,8 @@ noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_04.zip jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -sha256sums=('8e73a3939ba8c2cca888defc6c90811c959273a9bc7bd1352338a72cefcf1157' - 'a4d9d3e427943efc8715688d58eca6e8e111907f962524af78dd9a71e6892d60' +sha256sums=('897a8834b8ddd6891f0eef46c0f799d11cbecf168c4383cfb26d0dad80328794' + '5f67865307b7ff905304da4dca1fa0511c884480da0ddff269758bada392c8f4' '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0' '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c' '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD index b979e87d5..d3e6b3a33 100644 --- a/extra/phonon-vlc/PKGBUILD +++ b/extra/phonon-vlc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170852 2012-11-12 18:34:07Z andrea $ +# $Id: PKGBUILD 177946 2013-02-12 07:43:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon-vlc -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 arch=('i686' 'x86_64') url='http://phonon.kde.org/' @@ -11,11 +11,10 @@ license=('LGPL') depends=('vlc') makedepends=('cmake' 'automoc4' 'phonon') provides=('phonon-backend') -source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.xz") -md5sums=('d227b92619124a2b85e2d2e5f0fff90e') +source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.xz") +md5sums=('1ae8b15594714841d2bcf8c72813a176') build() { - cd "${srcdir}" mkdir build cd build cmake ../phonon-backend-vlc-${pkgver} \ @@ -26,6 +25,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index fc8cfec9e..81807f02a 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177039 2013-02-05 03:00:26Z bisson $ +# $Id: PKGBUILD 177942 2013-02-12 02:33:16Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix -pkgver=2.9.6 +pkgver=2.10.0 pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' @@ -17,7 +17,7 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p 'aliases.patch' 'service' 'rc.d') -sha1sums=('9d7af8670fd13fd5e5290ff2e3f00d724178f0fb' +sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' '5fc3de6c7df1e5851a0a379e825148868808318b' '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD index 336177d71..a8f23bf39 100644 --- a/extra/syslog-ng/PKGBUILD +++ b/extra/syslog-ng/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 173195 2012-12-12 17:17:00Z dreisner $ +# $Id: PKGBUILD 177980 2013-02-12 19:15:26Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=syslog-ng -pkgver=3.3.7 +pkgver=3.4.1 pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') url="http://www.balabit.com/network-security/syslog-ng/" depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd') -makedepends=('flex' 'pkg-config') +makedepends=('flex' 'pkg-config' 'python2') optdepends=('logrotate: for rotating log files') options=('!libtool') backup=('etc/syslog-ng/modules.conf' @@ -25,8 +25,8 @@ source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source syslog-ng.conf.d syslog-ng.logrotate syslog-ng.rc) -sha1sums=('06f09057c3dfb84eba381e0141f92565673ec0c8' - 'db14f4937a821e449b769c938faf2275a7ef188e' +sha1sums=('e75892262863b77f74a401d19661164154f716e7' + '0aaf695ea6756b59198ff2e4af237b4a6186525d' '9b2eb6ea9e27c9f1b6c1c855be211ec3da51d3c8' '949128fe3d7f77a7aab99048061f885bc758000c' '94af81a84e3add6653755122cdd5080694de059d') diff --git a/extra/syslog-ng/syslog-ng.conf b/extra/syslog-ng/syslog-ng.conf index c79e531de..969798e6d 100644 --- a/extra/syslog-ng/syslog-ng.conf +++ b/extra/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.3 +@version: 3.4 # # /etc/syslog-ng/syslog-ng.conf # diff --git a/community/wayland/PKGBUILD b/extra/wayland/PKGBUILD index ce252694a..24e354e17 100644 --- a/community/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84054 2013-02-09 14:17:18Z seblu $ +# $Id: PKGBUILD 177964 2013-02-12 16:53:44Z tomegun $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD index 41394e64e..42d589c22 100644 --- a/extra/x2goclient/PKGBUILD +++ b/extra/x2goclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175060 2013-01-12 11:27:38Z andyrtr $ +# $Id: PKGBUILD 177992 2013-02-12 19:50:15Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> # Contributor: Richard Murri <admin@richardmurri.com> pkgname=x2goclient -pkgver=4.0.0.1 +pkgver=4.0.0.2 pkgrel=1 pkgdesc="x2go qt4 client" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('qt' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-them makedepends=('man2html') install=x2goclient.install source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e8786329cfe97652d337f71caa71f432') +md5sums=('7a8b6869d51e82989c24fb1191df09ad') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD index c4bf4e883..2bc48e061 100644 --- a/extra/xorg-sessreg/PKGBUILD +++ b/extra/xorg-sessreg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176901 2013-02-02 07:10:44Z andyrtr $ +# $Id: PKGBUILD 177990 2013-02-12 19:46:14Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-sessreg -pkgver=1.0.7 -pkgrel=2 +pkgver=1.0.8 +pkgrel=1 pkgdesc="Register X sessions in system utmp/utmpx databases" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('glibc') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2) -sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52') +sha256sums=('0e2accc6272fcc2321aef7370f4ccf0df0fe259b2e942938264e2aaedee6c4c3') build() { cd "${srcdir}/sessreg-${pkgver}" diff --git a/extra/xorg-xkbutils/PKGBUILD b/extra/xorg-xkbutils/PKGBUILD index 6584c6adc..5203a4fbb 100644 --- a/extra/xorg-xkbutils/PKGBUILD +++ b/extra/xorg-xkbutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151027 2012-02-24 13:40:04Z allan $ +# $Id: PKGBUILD 177986 2013-02-12 19:41:06Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xkbutils -pkgver=1.0.3 -pkgrel=3 +pkgver=1.0.4 +pkgrel=1 pkgdesc="XKB utility demos" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxaw' 'libxt' 'libx11') makedepends=('xorg-util-macros' 'xproto' 'inputproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xkbutils-${pkgver}.tar.bz2) -sha1sums=('e5a2619b9449f95e02b520b492de0575bc4551d6') +sha256sums=('d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130') build() { cd "${srcdir}/xkbutils-${pkgver}" diff --git a/extra/xorg-xvinfo/PKGBUILD b/extra/xorg-xvinfo/PKGBUILD index 84f55418d..f3ef41f7d 100644 --- a/extra/xorg-xvinfo/PKGBUILD +++ b/extra/xorg-xvinfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151163 2012-02-25 06:42:49Z allan $ +# $Id: PKGBUILD 177988 2013-02-12 19:43:20Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xvinfo -pkgver=1.1.1 -pkgrel=3 +pkgver=1.1.2 +pkgrel=1 pkgdesc="Prints out the capabilities of any video adaptors associated with the display that are accessible through the X-Video extension" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11' 'libxv') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xvinfo-${pkgver}.tar.bz2) -sha1sums=('dc326464748fa608da50386112a89024804c1910') +sha256sums=('eed3d90ffd788ef728c4a5e7aa4bd86dc6bbcebac929caf7a0479cf8b53b50e3') build() { cd "${srcdir}/xvinfo-${pkgver}" diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index f169fa92a..970585286 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -pkgver=${_basekernel}.6 +pkgver=${_basekernel}.7 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -23,7 +23,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '90b2c4b9a05b108219bd44ac4804db84' + '6645c512b49498f17183298ab1ae98f2' '48a1026f5d36a915b8ef68f8138a7c18' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index f0bb07f04..007925fdd 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.7.6-1-LIBRE-PAE +KERNEL_VERSION=3.7.7-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index e8a96277f..fa4b38b9c 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -pkgver=${_basekernel}.6 -pkgrel=2 +pkgver=${_basekernel}.7 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -23,7 +23,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '90b2c4b9a05b108219bd44ac4804db84' + '6645c512b49498f17183298ab1ae98f2' '36aadecfb87577e90931025f46cd9d53' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index da0b7de36..b72fbbaf9 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.7.6-1-LIBRE-XEN +KERNEL_VERSION=3.7.7-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index f82a250bf..caaad4901 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.7.6 +_kernver=3.7.7 _kernrel=1 pkgname=('linux-libre-kmod-alx') -_version=v3.8-rc5 -_pkgver=3.8-rc5-1-u -pkgver=3.8rc5.1 +_version=v3.8-rc7 +_pkgver=3.8-rc7-1-u +pkgver=3.8rc7.1 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) -md5sums=('6ad873fbc6664aa4c15160e3ad7cb4c1') +md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') build() { diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 61b978fdc..0840667de 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.62 +_kernver=3.0.63 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_version=v3.8-rc5 -_pkgver=3.8-rc5-1-u -pkgver=3.8rc5.1 +_version=v3.8-rc7 +_pkgver=3.8-rc7-1-u +pkgver=3.8rc7.1 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) -md5sums=('6ad873fbc6664aa4c15160e3ad7cb4c1') +md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') build() { diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 4a4972307..f17cf91f5 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=62 +_sublevel=63 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.61 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.62 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '90b2c4b9a05b108219bd44ac4804db84' + '5e4e976cce788a37cd17ea469dea7e6e' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '8436bee363b959651d12eeb21bf0ec23') + '00c97c232129ecd16c739b0da0de87ce') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index dc9b9e2d1..df16319ea 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.62-1-LIBRE-LTS +KERNEL_VERSION=3.0.63-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b37ac7027..0f7f9fa06 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.7 -_sublevel=6 +_sublevel=7 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'fat-3.6.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('06bf9601d859531e7378eb43d4ca7dd3' - '90b2c4b9a05b108219bd44ac4804db84' + '6645c512b49498f17183298ab1ae98f2' '53c782740eb3ddf875ad98c31c1bf213' '71a6f703cb0bee098a76ea42d5836d06' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -41,7 +41,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' - '22056cd3540f16d19a4adfc83e055b1f') + '7e1f0776614380b36038a2baa1b0f54b') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index d31ca0b7c..10833c845 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.7.6-1-LIBRE +KERNEL_VERSION=3.7.7-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/multiwatch/PKGBUILD b/pcr/multiwatch/PKGBUILD new file mode 100644 index 000000000..2cf0bcc68 --- /dev/null +++ b/pcr/multiwatch/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Paul Dann <pdgiddie at gmail dot com> +pkgname=multiwatch +pkgver='1.0.0' +pkgrel=1 +pkgdesc='Forks and watches multiple instances of a program in the same context' +arch=('i686' 'x86_64') +url="http://redmine.lighttpd.net/projects/multiwatch/wiki" +license=('MIT') +depends=('libev') +makedepends=('cmake') +source=("http://download.lighttpd.net/multiwatch/releases-1.x/multiwatch-$pkgver.tar.bz2") +md5sums=('87f74dbaf5318f2b2dce3d0bf9f5025c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + rm -rf build + mkdir build + cd build + cmake .. + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + install -Dm 755 multiwatch $pkgdir/usr/bin/multiwatch +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/python2-polib/PKGBUILD b/pcr/python2-polib/PKGBUILD new file mode 100644 index 000000000..206bd9b4f --- /dev/null +++ b/pcr/python2-polib/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Esteban V. Carnevale <evcarnevale@gmail.com> + +pkgname=python2-polib +_pkgname='polib' +pkgver=0.7.0 +pkgrel=2 +pkgdesc='A library to manipulate gettext files' +url='http://polib.readthedocs.org/en/latest/index.html' +arch=('any') +license=('MIT') +depends=('python2') + +source=("https://bitbucket.org/izi/polib/downloads/polib-${pkgver}.tar.gz") +md5sums=('958f8f81ade7d2484edc25b3989fe247') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + python2 setup.py build +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + python2 setup.py install --root="${pkgdir}" --optimize=1 + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD new file mode 100644 index 000000000..497a50920 --- /dev/null +++ b/pcr/python2-relatorio/PKGBUILD @@ -0,0 +1,21 @@ +# Contributor: Florian Walch <florian.walch@gmx.at> +# Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net> +pkgname=python2-relatorio +pkgver=0.5.6 +pkgrel=2 +pkgdesc="A templating library able to output odt and pdf files" +arch=('i686' 'x86_64' 'mips64el') +url="http://relatorio.openhex.org" +license=('GPL') +depends=('python2-genshi>=0.5' 'python2-lxml>=1.3.6') +makedepends=('python2-distribute') +source=("http://pypi.python.org/packages/source/r/relatorio/relatorio-$pkgver.tar.gz") + +build() { + cd $srcdir/relatorio-$pkgver + chmod 644 relatorio.egg-info/* + python2 setup.py install --root=$pkgdir +} + + +md5sums=('944fb60fadaff451ab6ee8818de516ad') diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD new file mode 100644 index 000000000..bae5d2f4e --- /dev/null +++ b/pcr/trytond/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond +pkgver=2.4.0 +_pkgdir=2.4 +pkgrel=2 +pkgdesc="A three-tiers high-level general purpose application platform (server application)" +arch=('any') +url="http://www.tryton.org/" +license=('GPL3') +depends=('python2>=2.4' 'python2-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=0.2.0' 'python2-genshi>=0.5' +'python2-polib') +optdepends=('python2-psycopg2: support for PostgreSQL database' + 'python2-pywebdav: support for WebDAV feature' + 'pydot: support for displaying workflow graphs' + 'python2-pytz: timezone support' + 'python2-pyopenssl: support for SSL connection') +makedepends=('python2-distribute') +install="trytond.install" +source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz" + 'trytond.install' + 'trytond.rc') +md5sums=('ce0bbb8fcd0ef6a02c575823712e29e4' + '768e68c01cb5913e36ea89c67fc98038' + '3ca6aff9b30a52bcf159be7ca630fb6e') + +build() { + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$pkgdir + install -D -m644 etc/trytond.conf $pkgdir/etc/trytond.conf + install -D -m755 $srcdir/trytond.rc $pkgdir/etc/rc.d/trytond +} diff --git a/pcr/trytond/trytond.install b/pcr/trytond/trytond.install new file mode 100644 index 000000000..46d6daaba --- /dev/null +++ b/pcr/trytond/trytond.install @@ -0,0 +1,20 @@ +post_install() { + echo + echo "Adding tryton group... " + groupadd tryton + echo + echo "Adding tryton user... " + useradd -c "Tryton Server Daemon" -g tryton -s /bin/false tryton + + echo "Note:" + echo "==> Please don't forget to configure your PostgreSQL database for the program." +} + +post_remove() { + echo "Removing tryton system user... " + userdel tryton && echo "trytond [done]" +} + +op=$1 +shift +[ "$(type -t "$op")" = "function" ] && $op "$@" diff --git a/pcr/trytond/trytond.rc b/pcr/trytond/trytond.rc new file mode 100644 index 000000000..a93172a58 --- /dev/null +++ b/pcr/trytond/trytond.rc @@ -0,0 +1,52 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/python /usr/bin/trytond` +case "$1" in + start) + stat_busy "Starting Tryton server" + # handling log file + if [ ! -e /var/log/trytond/trytond.log ]; then + mkdir -p /var/log/trytond + touch /var/log/trytond/trytond.log + chown -R trytond:trytond /var/log/trytond + fi + # starting the daemon + if [ -z "$PID" ]; then + su - trytond -s /bin/bash -c "/usr/bin/python2 /usr/bin/trytond \ + --logfile=/var/log/trytond/trytond.log &> /dev/null &" + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon trytond + stat_done + fi + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping Tryton server" + if [ ! -z "$PID" ]; then + if [ $? -gt 0 ]; then + stat_fail + else + kill $PID &> /dev/null & + rm_daemon trytond + stat_done + fi + else + stat_fail + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/pcr/uci/PKGBUILD b/pcr/uci/PKGBUILD new file mode 100644 index 000000000..41541fa07 --- /dev/null +++ b/pcr/uci/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> +pkgname=uci +pkgver=0.8.0 +pkgrel=2 +pkgdesc="OpenWRT's Unified Configuration Interface" +arch=('i686' 'x86_64' 'mips64el') +url="https://openwrt.org" +license=('GPL2') +makedepends=('git' 'cmake' 'lua51') +source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz + uci-0.8.0-lua5.1.patch) +md5sums=('135bf6c4188b72c7fd7954f592b1e4e4' + '2c8f4d59b2b7adb990dcaa07e0ed484c') + +# source PKGBUILD; mksource +mksource() { + + if [ -d uci/.git ]; then + pushd uci; git pull; popd + else + git clone git://nbd.name/uci.git + fi + + cd uci/ + git archive --prefix=${pkgname}-${pkgver}/ v${pkgver} | \ + gzip -9 > ../${pkgname}-${pkgver}.tar.gz + cd .. +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/uci-0.8.0-lua5.1.patch + cmake . + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir}/ install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/uci/uci-0.8.0-lua5.1.patch b/pcr/uci/uci-0.8.0-lua5.1.patch new file mode 100644 index 000000000..d3e486f87 --- /dev/null +++ b/pcr/uci/uci-0.8.0-lua5.1.patch @@ -0,0 +1,31 @@ +--- uci-0.8.0.orig/lua/CMakeLists.txt 2011-07-19 15:39:56.000000000 -0500 ++++ uci-0.8.0/lua/CMakeLists.txt 2013-02-12 21:16:02.583984374 -0500 +@@ -4,7 +4,18 @@ + + SET(CMAKE_INSTALL_PREFIX /) + +-ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I..) ++IF(NOT LUA_CFLAGS) ++ FIND_PROGRAM(PKG_CONFIG pkg-config) ++ IF(PKG_CONFIG) ++ EXECUTE_PROCESS( ++ COMMAND pkg-config --silence-errors --cflags lua5.1 ++ OUTPUT_VARIABLE LUA_CFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ) ++ ENDIF() ++ENDIF() ++ ++ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I.. ${LUA_CFLAGS}) + LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) + + IF(APPLE) +@@ -13,7 +24,7 @@ + + IF(NOT LUAPATH) + EXECUTE_PROCESS( +- COMMAND lua -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end" ++ COMMAND lua5.1 -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end" + OUTPUT_VARIABLE LUAPATH + RESULT_VARIABLE LUA_CHECK_RES + OUTPUT_STRIP_TRAILING_WHITESPACE |