summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/amarok/PKGBUILD23
-rw-r--r--extra/cups/PKGBUILD8
-rw-r--r--extra/gdk-pixbuf2/PKGBUILD10
-rw-r--r--extra/libcap-ng/PKGBUILD10
-rw-r--r--extra/libdrm/PKGBUILD6
-rw-r--r--extra/libotr/PKGBUILD8
-rw-r--r--extra/openslp/PKGBUILD18
-rw-r--r--extra/openslp/openslp.service11
-rw-r--r--extra/p11-kit/PKGBUILD10
-rw-r--r--extra/speech-dispatcher/PKGBUILD14
-rw-r--r--extra/speech-dispatcher/speech-dispatcher.install2
-rw-r--r--extra/speech-dispatcher/speech-dispatcherd.service10
-rw-r--r--extra/subversion/PKGBUILD28
-rw-r--r--extra/subversion/subversion-1.7.5-kwallet-gcc47.patch56
-rw-r--r--extra/subversion/svnserve.service11
-rw-r--r--extra/subversion/svnserve.tmpfiles1
-rw-r--r--extra/varnish/PKGBUILD31
-rw-r--r--extra/varnish/rc.varnish26
-rw-r--r--extra/varnish/varnish-vcl-reload21
-rw-r--r--extra/varnish/varnish.service10
-rw-r--r--extra/x11vnc/PKGBUILD20
-rw-r--r--extra/x11vnc/service7
22 files changed, 238 insertions, 103 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index 63a4c1566..bbeb27b28 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 163143 2012-07-08 09:30:39Z ibiru $
+# $Id: PKGBUILD 165272 2012-08-14 19:57:06Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=amarok
replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.5.0
-pkgrel=5
+pkgver=2.6.0
+pkgrel=1
pkgdesc="The powerful music player for KDE"
arch=("i686" "x86_64")
url="http://amarok.kde.org"
@@ -21,25 +21,12 @@ optdepends=("libgpod: support for Apple iPod audio devices"
"ifuse: support for Apple iPod Touch and iPhone"
"libmygpo-qt: gpodder.net Internet Service")
install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- "toolbarfix.patch"
- "amarok-2.5.0-ffmpeg-fixes.patch"
- "contextviewfix.patch")
-sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
- 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f'
- '61193ccc48e9f99b4856eef27fe7a4aaf465feec'
- 'a95e3bfb177adacc268552ae479dd88b70f5f9e1')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('2cfcdabb67436418ba0012075ba105bbb630b48d')
build() {
cd "${srcdir}"
- patch -Np0 -i "${srcdir}"/toolbarfix.patch
- patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch
-
- pushd ${pkgname}-${pkgver}
- patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448
- popd
-
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 7702bec15..cf2632c83 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 165181 2012-08-12 16:18:01Z andyrtr $
+# $Id: PKGBUILD 165274 2012-08-14 20:33:11Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.6.1
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd')
source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-no-export-ssllibs.patch
@@ -123,7 +123,7 @@ backup=(etc/cups/cupsd.conf
etc/logrotate.d/cups
etc/pam.d/cups
etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
optdepends=('xdg-utils: xdg .desktop file support')
cd ${srcdir}/${pkgbase}-${pkgver}
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index d2818346e..2326056f7 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156774 2012-04-23 09:05:18Z ibiru $
+# $Id: PKGBUILD 165244 2012-08-14 15:06:13Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gdk-pixbuf2
-pkgver=2.26.1
+pkgver=2.26.2
pkgrel=1
pkgdesc="An image loading library"
arch=('i686' 'x86_64')
@@ -13,10 +13,10 @@ makedepends=('gtk-doc' 'gobject-introspection')
options=('!libtool')
install=gdk-pixbuf2.install
source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba')
+sha256sums=('3555521050e30e2fa090bfe650910c14649b6ab0acb35a5a7eaf90fe694f1403')
build() {
- cd "gdk-pixbuf-$pkgver"
+ cd gdk-pixbuf-$pkgver
./configure --prefix=/usr \
--without-libjasper \
@@ -26,7 +26,7 @@ build() {
}
package() {
- cd "gdk-pixbuf-$pkgver"
+ cd gdk-pixbuf-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index 1e3544bfd..5f294fe1a 100644
--- a/extra/libcap-ng/PKGBUILD
+++ b/extra/libcap-ng/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139367 2011-10-01 18:59:37Z ibiru $
+# $Id: PKGBUILD 165245 2012-08-14 15:06:17Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
pkgname=libcap-ng
-pkgver=0.6.6
+pkgver=0.7
pkgrel=1
pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap"
arch=('i686' 'x86_64')
@@ -12,17 +12,17 @@ license=('GPL2' 'LGPL2.1')
depends=('glibc')
options=('!libtool')
source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('eb71f967cecb44b4342baac98ef8cb0f')
+md5sums=('85c14a2442a3721383a1e2284e254846')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure --prefix=/usr --enable-static=no --with-python=no
make
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
make DESTDIR=$pkgdir install
}
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 48333609c..dcf1819f0 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162833 2012-07-01 07:57:51Z andyrtr $
+# $Id: PKGBUILD 165281 2012-08-14 20:41:57Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdrm
-pkgver=2.4.37
+pkgver=2.4.38
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64)
@@ -15,7 +15,7 @@ url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
no-pthread-stubs.patch
COPYING)
-sha256sums=('e4ea39a901d4a8e59064f10f413bb037dad7790f7c16a5986e7cc1453b36488f'
+sha256sums=('3e5a2f318edaf1eef41e7e6c85aa9596d6f9f8b083ec4d7d6710ffbb8921e7e9'
'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7'
'9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD
index 2529987dd..3ac3a9866 100644
--- a/extra/libotr/PKGBUILD
+++ b/extra/libotr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149079 2012-02-05 16:55:15Z bisson $
+# $Id: PKGBUILD 165291 2012-08-14 23:10:37Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Contributor: Bug <Bug2000@gmail.com>
pkgname=libotr
-pkgver=3.2.0
-pkgrel=3
+pkgver=3.2.1
+pkgrel=1
pkgdesc='Off-the-Record Messaging Library and Toolkit'
url='http://www.cypherpunks.ca/otr/'
license=('GPL' 'LGPL')
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64')
depends=('libgcrypt')
options=('!libtool')
source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('e5e10b8ddaf59b0ada6046d156d0431cd2790db9')
+sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD
index 70e0833a2..241d2d0bd 100644
--- a/extra/openslp/PKGBUILD
+++ b/extra/openslp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150461 2012-02-18 00:02:24Z allan $
+# $Id: PKGBUILD 165260 2012-08-14 16:48:24Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=openslp
pkgver=1.2.1
-pkgrel=4
+pkgrel=5
pkgdesc="Open-source implementation of Service Location Protocol"
arch=('i686' 'x86_64')
url="http://www.openslp.org"
@@ -11,12 +11,19 @@ license=('BSD')
depends=('bash' 'openssl')
backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi')
options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd)
-md5sums=('ff9999d1b44017281dd00ed2c4d32330' '4f6889a5944894b8be2c01404a9566d2')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd
+ #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae
+ openslp.service)
+md5sums=('ff9999d1b44017281dd00ed2c4d32330'
+ '4f6889a5944894b8be2c01404a9566d2'
+ '296dc3c8f75e7a1823fcb9dd97ea0971')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
+ ./configure --prefix=/usr \
+ --disable-static \
+ --enable-slpv1 \
+ --enable-slpv2-security # service would fail to start without this
make
}
@@ -25,4 +32,5 @@ package() {
make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install
install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
install -D -m755 $srcdir/rc.slpd ${pkgdir}/etc/rc.d/slpd
+ install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service
}
diff --git a/extra/openslp/openslp.service b/extra/openslp/openslp.service
new file mode 100644
index 000000000..e17eb3b1d
--- /dev/null
+++ b/extra/openslp/openslp.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Service Location Protocol
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=network.target
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index 639a27964..b90323aa1 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154982 2012-04-01 07:46:19Z ibiru $
+# $Id: PKGBUILD 165246 2012-08-14 15:06:21Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=p11-kit
-pkgver=0.12
+pkgver=0.13
pkgrel=1
pkgdesc="Library to work with PKCS#11 modules"
arch=(i686 x86_64)
@@ -11,17 +11,17 @@ license=('BSD')
depends=(glibc)
options=(!libtool)
source=($url/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('66baf7ddde982d1b7294d3bd63be7446')
+md5sums=('3892bc07ff54b1b391aad4628911801d')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
--with-module-path=/usr/lib/pkcs11
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
}
diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD
index 2c4ea7099..bb96b719b 100644
--- a/extra/speech-dispatcher/PKGBUILD
+++ b/extra/speech-dispatcher/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 150548 2012-02-18 12:43:30Z pierre $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 165252 2012-08-14 16:20:06Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Steve Holmes <steve.holmes88@gmail.com>
# Contributor: Alexander Jenisch <nt@divzero.at>
# Contributor: Chris Brannon <cmbrannon@cox.net>
@@ -7,7 +8,7 @@
pkgname=speech-dispatcher
pkgver=0.7.1
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
pkgdesc="High-level device independent layer for speech synthesis interface"
url="http://www.freebsoft.org/speechd"
@@ -36,9 +37,10 @@ backup=(etc/speech-dispatcher/clients/gnome-speech.conf
etc/speech-dispatcher/speechd.conf)
install="${pkgname}.install"
source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz"
- 'speechd.sh')
+ 'speechd.sh' 'speech-dispatcherd.service')
md5sums=('ccfc30ac006673d36b4223eb760ed696'
- '858293f464b83f03f3b6bb796291c71d')
+ '858293f464b83f03f3b6bb796291c71d'
+ 'd26f52e2e95a30eaa83560f0e63faca5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -54,6 +56,8 @@ package() {
make DESTDIR=${pkgdir} install
install -Dm755 ${srcdir}/speechd.sh ${pkgdir}/etc/rc.d/speechd
+ install -d "${pkgdir}/usr/lib/systemd/system/"
+ install -m644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/"
install -d ${pkgdir}/var/log/speech-dispatcher
# Fix spd-conf to use python 2.7
diff --git a/extra/speech-dispatcher/speech-dispatcher.install b/extra/speech-dispatcher/speech-dispatcher.install
index 17e273bed..93f4f9363 100644
--- a/extra/speech-dispatcher/speech-dispatcher.install
+++ b/extra/speech-dispatcher/speech-dispatcher.install
@@ -1,4 +1,4 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
info_files=('speech-dispatcher.info'
'speech-dispatcher-cs.info'
'ssip.info'
diff --git a/extra/speech-dispatcher/speech-dispatcherd.service b/extra/speech-dispatcher/speech-dispatcherd.service
new file mode 100644
index 000000000..ce21c5650
--- /dev/null
+++ b/extra/speech-dispatcher/speech-dispatcherd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Speech-Dispatcher an high-level device independent layer for speech synthesis.
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/speech-dispatcher -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 8ff469795..c38ea4a3a 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160577 2012-06-02 10:29:00Z bluewind $
+# $Id: PKGBUILD 165293 2012-08-15 00:13:54Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=subversion
pkgver=1.7.5
-pkgrel=2
+pkgrel=3
pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64')
license=('APACHE')
@@ -19,12 +19,21 @@ url="http://subversion.apache.org/"
provides=('svn')
options=('!makeflags' '!libtool' '!emptydirs')
source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
- svnserve svn svnserve.conf subversion.rpath.fix.patch)
+ svnserve
+ svn
+ svnserve.conf
+ svnserve.tmpfiles
+ svnserve.service
+ subversion-1.7.5-kwallet-gcc47.patch
+ subversion.rpath.fix.patch)
sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1'
'b267cba19b4f56360657a5bf5b231950e027a45a'
'64ba3e6ebafc08ac62f59d788f7a825fdce69573'
'73b36c046c09cec2093354911c89e3ba8056af6c'
'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
+ '00cc36e69077a8c45674ead6dd62a7647b3a3b6d'
+ '9f6790d842cf3e0228b007483a43e39a42724068'
+ 'aa0d01e606de2ebc5eed9c533d218d37a217c50c'
'3d1e28408a9abb42af2e531adc0d01ce21acfad6')
build() {
@@ -34,6 +43,8 @@ build() {
patch -p0 -i ../subversion.rpath.fix.patch
sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
+ patch -Np1 -i ../subversion-1.7.5-kwallet-gcc47.patch
+
./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
--with-zlib=/usr --with-neon=/usr --with-apxs \
--with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
@@ -60,15 +71,24 @@ package() {
swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
install install-swig-py install-swig-pl install-javahl # install-swig-rb
- install -d "${pkgdir}"/usr/share/subversion
+ install -dm755 "${pkgdir}"/usr/share/subversion
cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
rm -r "${pkgdir}"/usr/lib/perl5/core_perl
+ ## svnserve ...
+
+ # ... iniscript/xinetd
install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
+
+ # ... systemd
+ install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service
+ install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf
+
+ # ... common config
install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
install -Dm 644 tools/client-side/bash_completion \
diff --git a/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch
new file mode 100644
index 000000000..a571c3c3c
--- /dev/null
+++ b/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch
@@ -0,0 +1,56 @@
+diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
+--- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500
++++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400
+@@ -60,6 +60,9 @@
+ /* KWallet simple provider, puts passwords in KWallet */
+ /*-----------------------------------------------------------------------*/
+
++static int q_argc = 1;
++static char q_argv0[] = "svn"; // Build non-const char * from string constant
++static char *q_argv[] = { q_argv0 };
+
+ static const char *
+ get_application_name(apr_hash_t *parameters,
+@@ -175,6 +178,10 @@
+ "kwallet-initialized",
+ APR_HASH_KEY_STRING,
+ NULL);
++ apr_hash_set(parameters,
++ "kwallet-wallet",
++ APR_HASH_KEY_STRING,
++ NULL);
+ }
+ return APR_SUCCESS;
+ }
+@@ -203,12 +210,11 @@
+ QCoreApplication *app;
+ if (! qApp)
+ {
+- int argc = 1;
+- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++ int argc = q_argc;
++ app = new QCoreApplication(argc, q_argv);
+ }
+
+- KCmdLineArgs::init(1,
+- (char *[1]) {(char *) "svn"},
++ KCmdLineArgs::init(q_argc, q_argv,
+ get_application_name(parameters, pool),
+ "subversion",
+ ki18n(get_application_name(parameters, pool)),
+@@ -273,12 +279,11 @@
+ QCoreApplication *app;
+ if (! qApp)
+ {
+- int argc = 1;
+- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++ int argc = q_argc;
++ app = new QCoreApplication(argc, q_argv);
+ }
+
+- KCmdLineArgs::init(1,
+- (char *[1]) {(char *) "svn"},
++ KCmdLineArgs::init(q_argc, q_argv,
+ get_application_name(parameters, pool),
+ "subversion",
+ ki18n(get_application_name(parameters, pool)),
diff --git a/extra/subversion/svnserve.service b/extra/subversion/svnserve.service
new file mode 100644
index 000000000..d8a8e10c1
--- /dev/null
+++ b/extra/subversion/svnserve.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Subversion protocol daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/svnserve
+ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/subversion/svnserve.tmpfiles b/extra/subversion/svnserve.tmpfiles
new file mode 100644
index 000000000..e8487d373
--- /dev/null
+++ b/extra/subversion/svnserve.tmpfiles
@@ -0,0 +1 @@
+D /run/svnserve 0700 root root -
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 4f7f1b42d..89e9a668e 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149976 2012-02-11 23:31:36Z allan $
+# $Id: PKGBUILD 165295 2012-08-15 00:30:47Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Douglas Soares de Andrade
@@ -6,7 +6,7 @@
pkgname=varnish
pkgver=3.0.2
-pkgrel=5
+pkgrel=6
pkgdesc="High-performance HTTP accelerator"
arch=('i686' 'x86_64')
url="http://www.varnish-cache.org/"
@@ -18,13 +18,17 @@ install=$pkgname.install
options=('!libtool')
source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
"$pkgname.conf.d"
- "rc.$pkgname")
+ "rc.$pkgname"
+ varnish-vcl-reload
+ varnish.service)
md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
'edd1237d097d72173d9772754335890c'
- '8366f51568c0bbb3d3891aa0cc724369')
+ '40b4c83b3ad225ed2f4bd7e677fe41a2'
+ '56be884f43b8b4c900a073d9282f124a'
+ '45cc1fd57aa2ffc22d6af62f9eedc842')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
./configure \
--prefix=/usr \
@@ -35,11 +39,18 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" install
+ # reload helper
+ install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
- install -D -m755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
- install -D -m644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
- install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ # sysvinit
+ install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+ install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
+
+ # systemd
+ install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+
+ # license
+ install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish
index 2841665e5..352f07dbd 100644
--- a/extra/varnish/rc.varnish
+++ b/extra/varnish/rc.varnish
@@ -4,27 +4,6 @@
. /etc/rc.d/functions
. /etc/conf.d/varnish
-reload_vcl() {
- local activecfg newcfg
-
- if [[ -z $VARNISH_CFG ]]; then
- printf '==> ERROR: VARNISH_CFG is undefined in /etc/conf.d/varnish!\n'
- return 1
- fi
-
- activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
- if [[ -z $activecfg ]]; then
- printf '==> ERROR: No active VCL found!\n'
- return 1
- fi
-
- printf -v newcfg 'vcl-%(%s)T' -1
-
- varnishadm "vcl.load $newcfg $VARNISH_CFG" &&
- varnishadm "vcl.use $newcfg" &&
- varnishadm "vcl.discard $activecfg" || return 1
-}
-
pidfile=/run/varnish.pid
if [[ -r $pidfile ]]; then
read -r PID < "$pidfile"
@@ -62,10 +41,9 @@ case $1 in
$0 start
;;
reload)
- stat_busy "Recompiling and Reloading VCL"
- reload_vcl && stat_done || stat_fail
+ status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG
;;
*)
- echo "usage: $0 {start|stop|restart}"
+ echo "usage: $0 {start|stop|restart|reload}"
;;
esac
diff --git a/extra/varnish/varnish-vcl-reload b/extra/varnish/varnish-vcl-reload
new file mode 100644
index 000000000..aaac385c4
--- /dev/null
+++ b/extra/varnish/varnish-vcl-reload
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+cfg=${1:-/etc/varnish/default.vcl}
+
+if [ ! -e "$cfg" ]; then
+ printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2
+ exit 1
+fi
+
+activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
+if [ -z "$activecfg" ]; then
+ printf 'ERROR: No active VCL found!\n' >&2
+ exit 1
+fi
+
+newcfg=$(date +'vcl-%s')
+printf 'INFO: using new config %s\n' "$cfg"
+
+varnishadm "vcl.load $newcfg $cfg" &&
+varnishadm "vcl.use $newcfg" &&
+varnishadm "vcl.discard $activecfg"
diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service
new file mode 100644
index 000000000..c8bb6c6e1
--- /dev/null
+++ b/extra/varnish/varnish.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Web Application Accelerator
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -b localhost:8080 -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
+ExecReload=/usr/bin/varnish-vcl-reload
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD
index fd49db451..91885eae6 100644
--- a/extra/x11vnc/PKGBUILD
+++ b/extra/x11vnc/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 137979 2011-09-13 20:01:54Z bisson $
+# $Id: PKGBUILD 165299 2012-08-15 01:45:56Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=x11vnc
pkgver=0.9.13
-pkgrel=1
+pkgrel=2
pkgdesc='VNC server for real X displays'
-arch=('i686' 'x86_64')
url='http://www.karlrunge.com/x11vnc/'
+arch=('i686' 'x86_64')
license=('GPL2')
-depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
+depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
optdepends=('tk: for GUI support')
backup=('etc/conf.d/x11vnc')
source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
- 'conf.d'
- 'rc.d')
+ 'service'
+ 'conf.d'
+ 'rc.d')
sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa'
+ '53e1ed7f84518a699a29607a03bee2321f9f9624'
'11011cce06511e9ba61672a1c80bb63a3a187539'
'477892cf0f0020043444b7493c80684762ded506')
@@ -28,9 +30,7 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
-
+ install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/x11vnc"
+ install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/x11vnc"
rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver
-
- install -D -m 755 "${srcdir}/rc.d" "${pkgdir}/etc/rc.d/x11vnc"
- install -D -m 644 "${srcdir}/conf.d" "${pkgdir}/etc/conf.d/x11vnc"
}
diff --git a/extra/x11vnc/service b/extra/x11vnc/service
new file mode 100644
index 000000000..0ccc2fea0
--- /dev/null
+++ b/extra/x11vnc/service
@@ -0,0 +1,7 @@
+[Unit]
+Description=VNC Server for X11
+Requires=graphical.target
+After=graphical.target
+
+[Service]
+ExecStart=/usr/bin/x11vnc
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-29 22:20:54 +0000