From 4791b75bfebdea97defe1aa27d56b9223e58f6e8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Jan 2013 00:04:53 -0800 Subject: Fri Jan 11 00:04:53 PST 2013 --- community/darktable/PKGBUILD | 8 ++++---- community/darktable/darktable.install | 12 ++---------- community/ejabberd/PKGBUILD | 6 +++--- community/ejabberd/ejabberd.service | 1 - community/ipsec-tools/PKGBUILD | 6 +++--- community/ipsec-tools/ipsec.service | 3 ++- community/squid/PKGBUILD | 6 +++--- community/squid/squid | 3 ++- 8 files changed, 19 insertions(+), 26 deletions(-) (limited to 'community') diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 5cef5fb09..c574a3cec 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81093 2012-12-11 19:04:34Z spupykin $ +# $Id: PKGBUILD 82166 2013-01-10 09:21:45Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika @@ -6,15 +6,15 @@ pkgname=darktable pkgver=1.1.1 _pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' - 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt') + 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt' + 'libsoup') makedepends=('intltool>=0.40' 'cmake' 'librsvg') -# 'gnome-doc-utils' 'libxslt' 'fop') optdepends=('librsvg') install=darktable.install options=(!libtool) diff --git a/community/darktable/darktable.install b/community/darktable/darktable.install index 9fd6af293..8ea5d73af 100644 --- a/community/darktable/darktable.install +++ b/community/darktable/darktable.install @@ -1,8 +1,5 @@ -pkgname=darktable - post_install() { -# usr/sbin/gconfpkg --install ${pkgname} - [ -x `which update-desktop-database` ] && update-desktop-database -q + [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q } pre_upgrade() { @@ -13,11 +10,6 @@ post_upgrade() { post_install } -pre_remove() { -# usr/sbin/gconfpkg --uninstall ${pkgname} - true -} - post_remove() { - [ -x `which update-desktop-database` ] && update-desktop-database -q + [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q } diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index 8d4269da2..0f1d923d9 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80020 2012-11-15 13:56:56Z spupykin $ +# $Id: PKGBUILD 82170 2013-01-10 09:34:15Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jeff 'codemac' Mickey # Contributor: Alexander Rødseth pkgname=ejabberd pkgver=2.1.11 -pkgrel=7 +pkgrel=8 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686') url="http://www.ejabberd.im/" @@ -22,7 +22,7 @@ source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${ md5sums=('a70b040c4e7602f47718c8afe8780d50' 'f97c8a96160f30e0aecc9526c12e6606' '2338a6230ce5f9f60be6dddcfa39bc7e' - 'bd18cb1034df9ef1b699214f0e3b4567') + 'df32aa17e40a7bc5d9946d3ba6fe5e16') build() { cd "$srcdir/$pkgname-$pkgver/src" diff --git a/community/ejabberd/ejabberd.service b/community/ejabberd/ejabberd.service index e7cef53b2..036cc7c53 100644 --- a/community/ejabberd/ejabberd.service +++ b/community/ejabberd/ejabberd.service @@ -5,7 +5,6 @@ After=network.target [Service] Type=forking User=ejabberd -Group=jabber LimitNOFILE=16000 RestartSec=5 ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\" diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index 1ca011b8c..ba3c746bb 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78385 2012-10-17 16:23:33Z spupykin $ +# $Id: PKGBUILD 82168 2013-01-10 09:22:20Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Allan Henriksen pkgname=ipsec-tools pkgver=0.8.0 -pkgrel=5 +pkgrel=6 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64') url="http://ipsec-tools.sourceforge.net/" @@ -21,7 +21,7 @@ md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619' '416b8e362d86987b8c55f7153cdafbeb' '90d0810267cbd847383ae3101699b192' '1632fce55ba5592dea1f8bf661106e7d' - 'bc05a2b85e41bf89dac809657e857730') + '5bf7478590c751b465617681a31619fe') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service index 63db40b22..3a6dea38b 100644 --- a/community/ipsec-tools/ipsec.service +++ b/community/ipsec-tools/ipsec.service @@ -3,7 +3,8 @@ Description=Load IPSec Security Policy Database After=syslog.target network.target [Service] -Type=simple +Type=oneshot +RemainAfterExit=true ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 49fbf40a9..d88935fa4 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82135 2013-01-09 09:35:56Z spupykin $ +# $Id: PKGBUILD 82172 2013-01-10 09:49:38Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Mark Coolen # Contributor: Tom Newsom @@ -6,7 +6,7 @@ pkgname=squid pkgver=3.2.6 -pkgrel=1 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' @@ -25,7 +25,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2" 'squid.cron' 'squid.service') md5sums=('87915ad83aebafc7af6871c770b23339' - '02f7b5bd793f778e40834fd6457d2199' + 'e90895ce22c0b618c89a46a9a181fe6c' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' 'b499c2b725aefd7bd60bec2f1a9de392' diff --git a/community/squid/squid b/community/squid/squid index da5534427..ea80aaa2e 100644 --- a/community/squid/squid +++ b/community/squid/squid @@ -8,8 +8,9 @@ pidfile=/run/squid.pid { read -r PID /dev/null -if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then +if [[ $PID && ! /proc/$PID/exe -ef /usr/sbin/squid ]]; then rm /run/squid.pid + unset PID fi case $1 in -- cgit v1.2.3-54-g00ecf