summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-19 17:54:19 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-19 17:54:19 -0300
commit251b132bc8d5157b996afff54617d2483637aa4b (patch)
tree7c1b56c3d3ffaadc49e329930b7eb0be75b328cb /extra
parent3ed19e74567434fe0bc82d835513b5b62f151838 (diff)
parent07455ea1de16867b168628e8a9f7f5bffc169a5f (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/r8168-lts/PKGBUILD community-testing/evas_generic_loaders-svn/PKGBUILD community-testing/gambas2/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/libextractor/PKGBUILD community-testing/pdf2djvu/PKGBUILD community-testing/r8168-lts/PKGBUILD community-testing/sage-mathematics/PKGBUILD community/ruby-gtk2/PKGBUILD core/dhcpcd/PKGBUILD core/glibc/PKGBUILD core/net-tools/PKGBUILD cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD extra/cups/PKGBUILD extra/maxima/PKGBUILD extra/scim-hangul/PKGBUILD extra/speech-dispatcher/PKGBUILD extra/subversion/PKGBUILD extra/telepathy-idle/PKGBUILD extra/x11vnc/PKGBUILD multilib-testing/binutils-multilib/PKGBUILD multilib-testing/gcc-multilib/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib/binutils-multilib/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-glibc/PKGBUILD multilib/lib32-krb5/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libxml2/PKGBUILD multilib/lib32-libxrandr/PKGBUILD multilib/lib32-p11-kit/PKGBUILD testing/binutils/PKGBUILD testing/calligra/PKGBUILD testing/dhcp/PKGBUILD testing/gcc/PKGBUILD testing/glibc/PKGBUILD testing/inkscape/PKGBUILD testing/iproute2/PKGBUILD testing/libreoffice/PKGBUILD testing/libreoffice/PKGBUILD.36 testing/poppler/PKGBUILD
Diffstat (limited to 'extra')
-rw-r--r--extra/amarok/PKGBUILD23
-rw-r--r--extra/cups/PKGBUILD8
-rw-r--r--extra/doxygen/PKGBUILD8
-rw-r--r--extra/gdk-pixbuf2/PKGBUILD10
-rw-r--r--extra/git/PKGBUILD8
-rw-r--r--extra/gnome-applets/PKGBUILD7
-rw-r--r--extra/libcap-ng/PKGBUILD10
-rw-r--r--extra/libdrm/PKGBUILD6
-rw-r--r--extra/libotr/PKGBUILD8
-rw-r--r--extra/maxima/PKGBUILD6
-rw-r--r--extra/nmap/PKGBUILD12
-rw-r--r--extra/nmap/kdesu.patch14
-rw-r--r--extra/openslp/PKGBUILD18
-rw-r--r--extra/openslp/openslp.service11
-rw-r--r--extra/p11-kit/PKGBUILD10
-rw-r--r--extra/php-apc/PKGBUILD6
-rw-r--r--extra/php/PKGBUILD8
-rw-r--r--extra/php/php-fpm.conf.in.patch10
-rw-r--r--extra/rsync/PKGBUILD13
-rw-r--r--extra/rsync/rsyncd.socket11
-rw-r--r--extra/rsync/rsyncd@.service11
-rw-r--r--extra/sbcl/PKGBUILD6
-rw-r--r--extra/scim-hangul/2012.patch23
-rw-r--r--extra/scim-hangul/PKGBUILD22
-rw-r--r--extra/scim-pinyin/PKGBUILD14
-rw-r--r--extra/scim-tables/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/PKGBUILD41
-rw-r--r--extra/subversion/subversion-1.7.5-kwallet-gcc47.patch56
-rw-r--r--extra/subversion/subversion-1.7.6-kwallet-gcc47.patch56
-rw-r--r--extra/subversion/svnserve.service11
-rw-r--r--extra/subversion/svnserve.tmpfiles1
-rw-r--r--extra/telepathy-gabble/PKGBUILD6
-rw-r--r--extra/telepathy-glib/PKGBUILD10
-rw-r--r--extra/telepathy-idle/PKGBUILD17
-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
43 files changed, 440 insertions, 192 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index a744ec262..510062cc1 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" 'mips64el')
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 4f4580f7b..be2512277 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' 'mips64el')
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/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index dc7d127d2..a5dbb427c 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 163499 2012-07-13 14:44:33Z dan $
+# $Id: PKGBUILD 165316 2012-08-15 13:47:42Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgbase=doxygen
pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.1.2
+pkgver=1.8.2
pkgrel=1
license=('GPL')
arch=(i686 x86_64 'mips64el')
url="http://www.doxygen.org/"
makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra')
source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('9c62259c34d51d839dafd1f0d5d85f17')
-sha1sums=('a11e65a597019510051290d2af0e6f379838b9c5')
+md5sums=('6fa7baf995fa3f71cfc09e264ba88a83')
+sha1sums=('7b88ade3989ce0f43f0fb2b2574436c4f1fa1c5a')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index fb5362252..fa2f13408 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' 'mips64el')
@@ -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/git/PKGBUILD b/extra/git/PKGBUILD
index 9e61fe9f9..1e41925c6 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164342 2012-07-31 00:52:22Z dan $
+# $Id: PKGBUILD 165345 2012-08-16 02:47:11Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.11.4
+pkgver=1.7.11.5
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
@@ -100,7 +100,7 @@ package() {
install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
}
-md5sums=('21c7100cddee8579233a924111e829ab'
- '397af842126a5099968238ab946580a5'
+md5sums=('9985d35c11531d546426ebefb327c847'
+ 'f08a5a60e57f00399bbd384cfd7791f3'
'8e2648910fd5dd4f1c41d3c7fa9e9156'
'2e42bf97779a1c6411d89043334c9e78')
diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD
index bdbf2f516..92bade7d3 100644
--- a/extra/gnome-applets/PKGBUILD
+++ b/extra/gnome-applets/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 156798 2012-04-23 09:05:53Z ibiru $
+# $Id: PKGBUILD 165330 2012-08-15 21:16:25Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-applets
pkgver=3.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME Applets"
arch=(i686 x86_64 'mips64el')
license=('GPL')
-depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils')
+depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify')
makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager')
options=(!emptydirs)
url="http://www.gnome.org"
-groups=(gnome)
install=gnome-applets.install
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e')
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index 43dd4017f..2886b817d 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' 'mips64el')
@@ -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 2848e7dce..70130c1a1 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 'mips64el')
@@ -16,7 +16,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 a47c47a03..6bf521ec7 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' 'mips64el')
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/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 64ff33ff5..99de5523b 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160970 2012-06-07 18:26:20Z juergen $
+# $Id: PKGBUILD 165312 2012-08-15 11:35:19Z juergen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir@archlinux.org>
pkgname=maxima
pkgver=5.27.0
-pkgrel=2
+pkgrel=3
pkgdesc="Maxima - a sophisticated computer algebra system"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
if [ "${CARCH}" == "mips64el" ] ; then
depends=('clisp' 'texinfo' 'sh')
else
- depends=('sbcl=1.0.57' 'texinfo' 'sh')
+ depends=('sbcl=1.0.58' 'texinfo' 'sh')
fi
makedepends=('python2')
optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index efa432755..24f0a2900 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 161987 2012-06-17 23:52:34Z bisson $
+# $Id: PKGBUILD 165381 2012-08-17 08:46:12Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=nmap
pkgver=6.01
-pkgrel=1
+pkgrel=2
pkgdesc='Utility for network discovery and security auditing'
url='http://nmap.org/'
arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,10 @@ license=('GPL')
makedepends=('pygtk')
optdepends=('pygtk: zenmap')
depends=('pcre' 'openssl' 'libpcap' 'lua')
-source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a')
+source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2"
+ 'kdesu.patch')
+sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a'
+ '159bc1243564d3a9dee820291bf07168870cbaf6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,6 +25,8 @@ build() {
echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap.desktop
echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap-root.desktop
+ patch -p1 -i ../kdesu.patch # FS#31158
+
./configure \
--prefix=/usr \
--libexecdir=/usr/lib \
diff --git a/extra/nmap/kdesu.patch b/extra/nmap/kdesu.patch
new file mode 100644
index 000000000..daed631d6
--- /dev/null
+++ b/extra/nmap/kdesu.patch
@@ -0,0 +1,14 @@
+diff -Naur old/zenmap/install_scripts/unix/su-to-zenmap.sh new/zenmap/install_scripts/unix/su-to-zenmap.sh
+--- old/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:34:05.863827354 +1000
++++ new/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:35:53.872952226 +1000
+@@ -40,8 +40,8 @@
+ fi
+ case $SU_TO_ROOT_X in
+ gksu) gksu -u "$PRIV" "$COMMAND";;
+- kdesu) kdesu -u "$PRIV" "$COMMAND";;
+- kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
++ kdesu) kdesu -u "$PRIV" -c "$COMMAND";;
++ kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" -c "$COMMAND";;
+ ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
+ # As a last resort, open a new xterm use sudo/su
+ sdterm) xterm -e "sudo -u $PRIV $COMMAND";;
diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD
index de9291836..9c2b9cd4a 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' 'mips64el')
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 7ad40468d..9acfa4d99 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 mips64el)
@@ -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/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index 1b5e921cf..c72063e03 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163778 2012-07-19 22:22:31Z pierre $
+# $Id: PKGBUILD 165375 2012-08-16 20:55:01Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=php-apc
-pkgver=3.1.11
+pkgver=3.1.12
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
@@ -11,7 +11,7 @@ depends=('php')
license=('PHP')
source=("http://pecl.php.net/get/APC-${pkgver}.tgz")
backup=('etc/php/conf.d/apc.ini')
-md5sums=('199b69ed1423aa869acafff485ef5f06')
+md5sums=('b0ab91726717f410dfa284d5d1723b60')
build() {
cd $srcdir/APC-$pkgver
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 5ceae2e78..6ace812ff 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163752 2012-07-19 05:20:23Z pierre $
+# $Id: PKGBUILD 165374 2012-08-16 20:54:57Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.4.5
+pkgver=5.4.6
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('PHP')
@@ -33,11 +33,11 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('ffcc7f4dcf2b79d667fe0c110e6cb724'
+md5sums=('c9aa0f4996d1b91ee9e45afcfaeb5d2e'
'0b0bc7a917fc592bdf11dcd3c5c255e9'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'6d46667e00d65933ec0c958279c0a803'
- '825e580dd5708d959b50944afa1b12b6'
+ '5c1f4c967b66ce3eaf819b46951dcbf5'
'f56b5bb7e93c802ae8519182fbea3387'
'86c73d481f3099e740e602869bacf637'
'c60343df74f8e1afb13b084d5c0e47ed')
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index 0b17182fd..d618fca4e 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
---- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100
+--- sapi/fpm/php-fpm.conf.in 2012-08-15 06:26:05.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in 2012-08-16 14:17:41.809663595 +0200
@@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p arguement)
@@ -18,7 +18,7 @@
; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -140,7 +140,8 @@
+@@ -148,7 +148,8 @@
; specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
@@ -28,7 +28,7 @@
; Set listen(2) backlog.
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -151,9 +152,9 @@
+@@ -159,9 +160,9 @@
; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user
; mode is set to 0666
@@ -41,7 +41,7 @@
; List of ipv4 addresses of FastCGI clients which are allowed to connect.
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -442,7 +443,7 @@
+@@ -458,7 +459,7 @@
; Chdir to this directory at the start.
; Note: relative path can be used.
; Default Value: current directory or / when chroot
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index dbe19cdb7..97de68332 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160933 2012-06-07 05:56:33Z pierre $
+# $Id: PKGBUILD 165402 2012-08-18 01:22:52Z heftig $
pkgname=rsync
pkgver=3.0.9
-pkgrel=3
+pkgrel=4
pkgdesc="A file transfer program to keep remote files in sync"
arch=('i686' 'x86_64' 'mips64el')
url="http://samba.anu.edu.au/rsync/"
@@ -10,12 +10,15 @@ license=('GPL3')
depends=('perl')
backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
- 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service')
+ 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service'
+ 'rsyncd.socket' 'rsyncd@.service')
md5sums=('5ee72266fe2c1822333c407e1761b92b'
'bce64d122a8e0f86872a4a21a03bc7f3'
'ba413da4ebca05c57860151fda21efbc'
'ea3e9277dc908bc51f9eddc0f6b935c1'
- 'ec96f9089d71109557cdcaa3f0633ed6')
+ 'ec96f9089d71109557cdcaa3f0633ed6'
+ 'af4eabd94380050191b20ab03e6f6076'
+ '53f94e613e0bc502d38dd61bd2cd7636')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -35,5 +38,7 @@ package() {
install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync"
install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service"
+ install -m644 ../rsyncd.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket"
+ install -m644 ../rsyncd@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service"
install -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync"
}
diff --git a/extra/rsync/rsyncd.socket b/extra/rsync/rsyncd.socket
new file mode 100644
index 000000000..83724159f
--- /dev/null
+++ b/extra/rsync/rsyncd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Description=Rsync Socket
+After=network.target
+Conflicts=rsyncd.service
+
+[Socket]
+ListenStream=873
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/extra/rsync/rsyncd@.service b/extra/rsync/rsyncd@.service
new file mode 100644
index 000000000..33db95c4c
--- /dev/null
+++ b/extra/rsync/rsyncd@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=A file transfer program to keep remote files in sync
+After=network.target
+
+[Service]
+ExecStart=-/usr/bin/rsync --daemon
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
+User=nobody
+Group=nobody
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 641dba58f..cb17c8c36 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160967 2012-06-07 17:45:43Z juergen $
+# $Id: PKGBUILD 165308 2012-08-15 11:11:17Z juergen $
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: Daniel White <daniel@whitehouse.id.au>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Leslie Polzer (skypher)
pkgname=sbcl
-pkgver=1.0.57
+pkgver=1.0.58
pkgrel=1
pkgdesc="Steel Bank Common Lisp"
url="http://www.sbcl.org/"
@@ -19,7 +19,7 @@ makedepends=('clisp' 'texinfo')
install=sbcl.install
source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
"arch-fixes.lisp")
-md5sums=('bb0e4f5c2dad3491802197525283f6b0'
+md5sums=('341952949dc90af6f83a89f685da5dde'
'7ac0c1936547f4278198b8bf7725204d')
build() {
diff --git a/extra/scim-hangul/2012.patch b/extra/scim-hangul/2012.patch
new file mode 100644
index 000000000..cc837fa51
--- /dev/null
+++ b/extra/scim-hangul/2012.patch
@@ -0,0 +1,23 @@
+diff -aur old/src/scim_hangul_imengine.cpp new/src/scim_hangul_imengine.cpp
+--- old/src/scim_hangul_imengine.cpp 2012-08-16 01:33:25.996258740 +1000
++++ new/src/scim_hangul_imengine.cpp 2012-08-16 01:33:41.932950046 +1000
+@@ -33,6 +33,7 @@
+ #include <config.h>
+ #endif
+
++#include <unistd.h>
+ #include <cstring>
+ #include <scim.h>
+ #include "scim_hangul_imengine.h"
+diff -aur old/src/scim_hangul_imengine_setup.cpp new/src/scim_hangul_imengine_setup.cpp
+--- old/src/scim_hangul_imengine_setup.cpp 2012-08-16 01:33:25.996258740 +1000
++++ new/src/scim_hangul_imengine_setup.cpp 2012-08-16 01:43:39.823860324 +1000
+@@ -346,7 +346,7 @@
+ for (i = 0; i < n; i++) {
+ const char* name = hangul_ic_get_keyboard_name(i);
+ #if GTK_CHECK_VERSION(2, 24, 0)
+- gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combo_box), NULL, name);
++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), name);
+ #else
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), name);
+ #endif
diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD
index 3f0ceaf22..7b7631e83 100644
--- a/extra/scim-hangul/PKGBUILD
+++ b/extra/scim-hangul/PKGBUILD
@@ -1,28 +1,24 @@
-# $Id: PKGBUILD 140551 2011-10-17 07:24:46Z bisson $
+# $Id: PKGBUILD 165326 2012-08-15 15:47:04Z bisson $
# Contributor: damir <damir@archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=scim-hangul
-pkgver=0.3.2
-pkgrel=4
+pkgver=0.4.0
+pkgrel=1
pkgdesc='Korean input method module for SCIM'
-arch=('i686' 'x86_64' 'mips64el')
url='http://www.scim-im.org/'
license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
depends=('libhangul' 'scim')
options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz"
- 'gcc43.patch'
- 'unistd.patch')
-sha1sums=('d1f4a2114d284c926d64fbfe8ea83307b8d8e2ec'
- '956bb2b6bd75b3d2756895f8ade429f95bacc0ff'
- '1cfce9a7d5240f6d19aea008edcd9c6989e94e62')
+source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
+ '2012.patch')
+sha1sums=('2ba06a6d851a1d86c5a9b659c573bfd87e6a7555'
+ 'a046c40b78521f85418b8ad2138b51815d47abec')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../gcc43.patch
- patch -p1 -i "$srcdir/unistd.patch"
- ./bootstrap # skim complains; it's alright
+ patch -p1 -i ../2012.patch
./configure --prefix=/usr --enable-skim-support
make
}
diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD
index 5f4f4220d..905db2a4c 100644
--- a/extra/scim-pinyin/PKGBUILD
+++ b/extra/scim-pinyin/PKGBUILD
@@ -1,26 +1,22 @@
-# $Id: PKGBUILD 149097 2012-02-05 17:19:20Z bisson $
+# $Id: PKGBUILD 165322 2012-08-15 15:28:33Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributer: Gan Lu <rhythm.gan@gmail.com>
pkgname=scim-pinyin
-pkgver=0.5.91
-pkgrel=6
+pkgver=0.5.92
+pkgrel=1
pkgdesc='Chinese pinyin input for SCIM'
url='http://www.scim-im.org/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('scim')
options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
- 'gcc43.patch')
-sha1sums=('58bea437a211b7af8420057541a38933a41841c7'
- 'b78ecec237ee0e04ec43604fcc344ff43ccfb7b3')
+source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d7c2d52a5712753af241a5301db23527ba438ea1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../gcc43.patch
-
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD
index 26f611328..91591a9c5 100644
--- a/extra/scim-tables/PKGBUILD
+++ b/extra/scim-tables/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 148920 2012-02-05 11:55:57Z ibiru $
+# $Id: PKGBUILD 165324 2012-08-15 15:29:35Z bisson $
# Contributor: damir <damir@archlinux.org>
# Contributor: Gan Lu <rhythm.gan@gmail.com>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=scim-tables
-pkgver=0.5.10
-pkgrel=2
+pkgver=0.5.11
+pkgrel=1
pkgdesc='Generic table input method module for SCIM'
url='http://www.scim-im.org/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('scim')
options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('c6e6fbd9999ceba5cb982349fee8391e16a9c2fe')
+source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('25dd1fcc809f57671e7df369f4011c14ba225b6b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD
index 4743486d2..053b65878 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' 'mips64el')
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 56981ccf4..b38400de2 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 160577 2012-06-02 10:29:00Z bluewind $
+# $Id: PKGBUILD 165382 2012-08-17 10:46:53Z 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
+pkgver=1.7.6
+pkgrel=1
pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64' 'mips64el')
license=('APACHE')
depends=('neon' 'apr-util' 'sqlite' 'file')
optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
- 'python2: for some hook scripts') # 'ruby: for some hook scripts' 'java-environment')
+ 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts')
makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
[ "$CARCH" = "mips64el" ] && \
@@ -22,12 +22,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)
-sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1'
- 'b267cba19b4f56360657a5bf5b231950e027a45a'
+ svnserve
+ svn
+ svnserve.conf
+ svnserve.tmpfiles
+ svnserve.service
+ subversion-1.7.6-kwallet-gcc47.patch
+ subversion.rpath.fix.patch)
+sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068'
+ 'd8d99c01c49b189047389816b720923f1d9dbf2a'
'64ba3e6ebafc08ac62f59d788f7a825fdce69573'
'73b36c046c09cec2093354911c89e3ba8056af6c'
'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
+ '00cc36e69077a8c45674ead6dd62a7647b3a3b6d'
+ '9f6790d842cf3e0228b007483a43e39a42724068'
+ 'aa0d01e606de2ebc5eed9c533d218d37a217c50c'
'3d1e28408a9abb42af2e531adc0d01ce21acfad6')
build() {
@@ -36,9 +45,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.6-kwallet-gcc47.patch
- # configure
- autoreconf
if [ "$CARCH" = "mips64el" ]; then
./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
--with-zlib=/usr --with-neon=/usr --with-apxs \
@@ -54,7 +62,7 @@ build() {
make external-all
make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
- swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb
+ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl #swig-rb
}
#check() {
@@ -70,17 +78,26 @@ package() {
make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
- install install-swig-py install-swig-pl install-javahl # install-swig-rb
+ 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/subversion-1.7.6-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch
new file mode 100644
index 000000000..a571c3c3c
--- /dev/null
+++ b/extra/subversion/subversion-1.7.6-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/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index c1cec70f7..d871e6679 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162120 2012-06-21 01:49:02Z ibiru $
+# $Id: PKGBUILD 165360 2012-08-16 12:35:13Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Daniel Balieiro <daniel@balieiro.com>
# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
pkgname=telepathy-gabble
-pkgver=0.16.1
+pkgver=0.16.2
pkgrel=1
pkgdesc="A Jabber/XMPP connection manager for Telepathy"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2')
options=('!libtool' '!emptydirs')
source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
install=telepathy-gabble.install
-md5sums=('f4e6ca551cc4603276f9acdc2b5d4db4')
+md5sums=('d79fc12524e9b68e9a1a833960f97d01')
build() {
cd $pkgname-$pkgver
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 8f71df019..efbd46530 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156974 2012-04-23 09:10:23Z ibiru $
+# $Id: PKGBUILD 165356 2012-08-16 11:08:48Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
pkgname=telepathy-glib
-pkgver=0.18.1
+pkgver=0.18.2
pkgrel=1
pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,10 +14,10 @@ options=('!libtool' '!emptydirs')
depends=('dbus-glib')
makedepends=('libxslt' 'vala' 'gobject-introspection')
source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('461732739e3fbf8467991bbe661fb29a')
+md5sums=('034ec8e4c3a60d4ba1da67952ef3ee2f')
build() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
--libexecdir=/usr/lib/telepathy \
--enable-vala-bindings \
@@ -26,6 +26,6 @@ build() {
}
package() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index 93f9dd16f..b49458f7f 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141602 2011-10-31 15:52:30Z ibiru $
+# $Id: PKGBUILD 165358 2012-08-16 11:39:38Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
# Contributor: Samuel Mendes <heka.lok@gmail.com>
pkgname=telepathy-idle
-pkgver=0.1.11
-pkgrel=1.1
+pkgver=0.1.12
+pkgrel=1
pkgdesc="An IRC connection manager for Telepathy"
arch=('i686' 'x86_64' 'mips64el')
url="http://telepathy.freedesktop.org"
@@ -14,17 +14,18 @@ license=('LGPL')
depends=('telepathy-glib' 'openssl')
makedepends=('libxslt' 'python2')
install=telepathy-idle.install
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('be277e8f0bd32ae56af799f0ff4ec72e')
+options=(!makeflags)
+source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('e77e5b84cc8f77cf12d15727c30df366')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
./configure --prefix=/usr \
--libexecdir=/usr/lib/telepathy
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
}
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 525f48584..f5e38afc7 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' 'mips64el')
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 c1324d590..cf6298e63 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' 'mips64el')
url='http://www.karlrunge.com/x11vnc/'
+arch=('i686' 'x86_64' 'mips64el')
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