Sun May 20 00:04:49 UTC 2012

19 files changed, 206 insertions, 97 deletions

diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 53ff54a87..677e10b47 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69396 2012-04-15 17:01:41Z seblu $
+# $Id: PKGBUILD 70904 2012-05-18 22:37:04Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
@@ -6,7 +6,7 @@
 
 pkgname=acpid
 pkgver=2.0.16
-pkgrel=1
+pkgrel=2
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64')
 url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -16,15 +16,19 @@ optdepends=('perl: use perl based examples')
 replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
 source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
-        'acpid'
+        'acpid.rc'
+        'acpid.conf'
+        'acpid.socket'
+        'acpid.service'
         'anything'
-        'handler.sh'
-        'acpid.conf.d')
+        'handler.sh')
 md5sums=('d59fc02c9c34f0d5c137495302e2c074'
-         'd69203a032c4583f9abaafcf21a7ed84'
+         '077475c75fbdd9de75f9a397130ccd91'
+         '929c6d2e91295c22ed9ec6212d7eabef'
+         'ee6cb99e50e580c50331a73045412ae9'
+         '953e26477c5d4f5f013d6861c04b4af6'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '615439f4a89716c747907d4fc3c8df75'
-         '929c6d2e91295c22ed9ec6212d7eabef')
+         '74ee3c33714ff5cb44f30c9a0dceeef0')
 
 build() {
   cd $pkgname-$pkgver
@@ -33,15 +37,22 @@ build() {
 }
 
 package() {
-  cd $pkgname-$pkgver
+  pushd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
+  popd
+
+  # default config
+  install -Dm644 anything "$pkgdir/etc/acpi/events/anything"
+  install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh"
 
-  install -Dm755 ../acpid "$pkgdir/etc/rc.d/acpid"
-  install -Dm644 ../anything "$pkgdir/etc/acpi/events/anything"
-  install -Dm755 ../handler.sh "$pkgdir/etc/acpi/handler.sh"
-  install -Dm644 ../acpid.conf.d "$pkgdir/etc/conf.d/acpid"
+  # initscripts
+  install -Dm755 acpid.rc "$pkgdir/etc/rc.d/acpid"
+  install -Dm644 acpid.conf "$pkgdir/etc/conf.d/acpid"
+  install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket"
+  install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
 
-  chmod 755 "$pkgdir"/usr/sbin/acpid
+  # fix acpid rights
+  chmod 755 "$pkgdir/usr/sbin/acpid"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/acpid/acpid.conf b/community/acpid/acpid.conf
new file mode 100644
index 000000000..b60103a2d
--- /dev/null
+++ b/community/acpid/acpid.conf
@@ -0,0 +1,5 @@
+#
+# Arguments to be passed to the acpid daemon
+#
+
+ACPID_ARGS=""
diff --git a/community/acpid/acpid.rc b/community/acpid/acpid.rc
new file mode 100644
index 000000000..674f4621b
--- /dev/null
+++ b/community/acpid/acpid.rc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid
+
+PID=$(pidof -o %PPID /usr/sbin/acpid)
+case "$1" in
+  start)
+    stat_busy "Starting acpid"
+    [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon acpid
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping acpid"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon acpid
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service
new file mode 100644
index 000000000..31fcc0575
--- /dev/null
+++ b/community/acpid/acpid.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=ACPI event daemon
+Requires=acpid.socket
+
+[Service]
+EnvironmentFile=/etc/conf.d/acpid
+ExecStart=/usr/sbin/acpid -f $ACPID_ARGS
diff --git a/community/acpid/acpid.socket b/community/acpid/acpid.socket
new file mode 100644
index 000000000..1e5365bf1
--- /dev/null
+++ b/community/acpid/acpid.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=ACPID Listen Socket
+
+[Socket]
+ListenStream=/run/acpid.socket
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/acpid/handler.sh b/community/acpid/handler.sh
index aac143a9a..b5a548f43 100644
--- a/community/acpid/handler.sh
+++ b/community/acpid/handler.sh
@@ -9,16 +9,24 @@ set $*
 
 case "$1" in
     button/power)
-        #echo "PowerButton pressed!">/dev/tty5
         case "$2" in
-            PBTN|PWRF)  logger "PowerButton pressed: $2" ;;
-            *)          logger "ACPI action undefined: $2" ;;
+            PBTN|PWRF)
+                logger "PowerButton pressed: $2"
+                poweroff
+                ;;
+            *)
+                logger "ACPI action undefined: $2"
+                ;;
         esac
         ;;
     button/sleep)
         case "$2" in
-            SLPB|SBTN)   echo -n mem >/sys/power/state ;;
-            *)      logger "ACPI action undefined: $2" ;;
+            SLPB|SBTN)
+                echo -n mem >/sys/power/state
+                ;;
+            *)
+                logger "ACPI action undefined: $2"
+                ;;
         esac
         ;;
     ac_adapter)
@@ -28,43 +36,51 @@ case "$1" in
                     00000000)
                         echo -n $minspeed >$setspeed
                         #/etc/laptop-mode/laptop-mode start
-                    ;;
+                        ;;
                     00000001)
                         echo -n $maxspeed >$setspeed
                         #/etc/laptop-mode/laptop-mode stop
-                    ;;
+                        ;;
                 esac
                 ;;
-            *)  logger "ACPI action undefined: $2" ;;
+            *)
+                logger "ACPI action undefined: $2"
+                ;;
         esac
         ;;
     battery)
         case "$2" in
             BAT0)
                 case "$4" in
-                    00000000)   #echo "offline" >/dev/tty5
-                    ;;
-                    00000001)   #echo "online"  >/dev/tty5
-                    ;;
+                    00000000)
+                        logger 'Battery online'
+                        ;;
+                    00000001)
+                        logger 'Battery offline'
+                        ;;
                 esac
                 ;;
-            CPU0)	
+            CPU0)
                 ;;
             *)  logger "ACPI action undefined: $2" ;;
         esac
         ;;
     button/lid)
-       	case "$3" in
-	    close)
-		#echo "LID closed!">/dev/tty5
-		;;
-	    open)
-		#echo "LID opened!">/dev/tty5
-        	;;
-	esac
-	;;
-
+        case "$3" in
+            close)
+                logger 'LID closed'
+                ;;
+            open)
+                logger 'LID opened'
+                ;;
+            *)
+                logger "ACPI action undefined: $3"
+                ;;
+    esac
+    ;;
     *)
         logger "ACPI group/action undefined: $1 / $2"
         ;;
 esac
+
+# vim:set ts=4 sw=4 ft=sh et:
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index 07120f0d6..3d14a89b5 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70693 2012-05-14 21:35:24Z lfleischer $
+# $Id: PKGBUILD 70879 2012-05-18 11:38:46Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
 pkgver=0.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc='An audio player for GNU/Linux based on GTK2.'
 arch=('i686' 'x86_64')
 url='http://deadbeef.sourceforge.net'
@@ -12,7 +12,7 @@ license=('GPL2')
 depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
              'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip'
-             'libsamplerate')
+             'libsamplerate' 'yasm')
 optdepends=('libsamplerate: for Resampler plugin'
             'libvorbis: for Ogg Vorbis playback'
             'libmad: for MP1/MP2/MP3 playback'
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index da3ed0a7e..57e1a992b 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64430 2012-02-13 06:18:52Z spupykin $
+# $Id: PKGBUILD 70883 2012-05-18 13:41:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tor Krill <tor@krill.nu>
 # Contributor: Lee.MaRS <leemars@gmail.com>
 
 pkgname=gsoap
-pkgver=2.8.7
+pkgver=2.8.8
 pkgrel=1
 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
 url="http://www.cs.fsu.edu/~engelen/soap.html"
@@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs')
 makedepends=('autoconf' 'automake')
 source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip
         LICENSE)
-md5sums=('48a8dfddffd8f10b3ca82a6a9583e206'
+md5sums=('cffb523b66eb36c51ca455645f1cfeb0'
          '27aaa3f5166db94d44044c11a7b2c37b')
 
 build() {
diff --git a/community/hardlink/PKGBUILD b/community/hardlink/PKGBUILD
new file mode 100644
index 000000000..edf5d6973
--- /dev/null
+++ b/community/hardlink/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 70897 2012-05-18 22:12:06Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=hardlink
+pkgver=0.2.0
+pkgrel=1
+pkgdesc='Replace file copies using hardlinks'
+arch=('i686' 'x86_64')
+url='http://jak-linux.org/projects/hardlink/'
+license=('custom: MIT')
+depends=('glibc' 'pcre')
+source=("http://jak-linux.org/projects/hardlink/hardlink_$pkgver.tar.gz")
+md5sums=('4c1621ee7850a1c8b316735a7bced993')
+
+build() {
+  cd $pkgname-$pkgver
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  # install icense
+  install -Dm 644 debian/copyright "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index caa14c7c5..02d9efcfd 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67614 2012-03-13 14:20:23Z spupykin $
+# $Id: PKGBUILD 70872 2012-05-18 10:00:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hostapd
-pkgver=0.7.3
-pkgrel=8
+pkgver=1.0
+pkgrel=1
 pkgdesc="daemon for wireless software access points"
 arch=('i686' 'x86_64')
 url="http://hostap.epitest.fi/hostapd/"
@@ -25,25 +25,19 @@ backup=('etc/hostapd/hostapd.conf'
 	'etc/hostapd/wired.conf')
 install=hostapd.install
 source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
-	hostap_allow-linking-with-libnl-3.2.patch
 	config
 	hostapd
 	hostapd.conf.d)
-md5sums=('91a7c8d0f090b7104152d3455a84c112'
-         'e904e62b12c5d64132dd9441e8b45dce'
+md5sums=('236247a7bbd4f60d5fa3e99849d1ffc9'
          '5d7ee10b04e33f22c37be56a4c33dddb'
          'd570327c385f34a4af24d3a0d61cea19'
          'f169534b0f59b341f6df1a21e0344511')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
-
-  cd hostapd
+  cd "$srcdir/$pkgname-$pkgver"/hostapd
   cp "$srcdir/config" ./.config
-
   sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
-
+  export CFLAGS="$CFLAGS `pkg-config --cflags libnl-3.0`"
   make
 }
 
diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD
index cf1651064..5510e5d13 100644
--- a/community/hubbub/PKGBUILD
+++ b/community/hubbub/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 59698 2011-11-29 12:42:33Z arodseth $
+# $Id: PKGBUILD 70911 2012-05-18 23:52:08Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+
 pkgname=hubbub
-pkgver=0.1.1
-pkgrel=2
+pkgver=0.1.2
+pkgrel=1
 pkgdesc="HTML5 compliant parsing library"
 arch=('x86_64' 'i686')
 url="http://www.netsurf-browser.org/projects/hubbub/"
 license=('MIT')
 depends=('libparserutils')
 source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz")
-md5sums=('98f49be58e228010c88381bc39f39e19')
+sha256sums=('95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 5a81c144c..565c5597e 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68868 2012-04-04 11:24:37Z stativ $
+# $Id: PKGBUILD 70885 2012-05-18 16:05:18Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=11.1.1
-_pkgver=117.117
+pkgver=11.1.2
+_pkgver=117.418
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('09f814cc26b6c98d6e5f0fdf2aaa293c')
+md5sums=('eae2d36d088677e1d5670986da311f85')
 
 build() {
   cd "$srcdir"
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index a488b7e06..fc1a1ebcf 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70843 2012-05-17 18:23:03Z idevolder $
+# $Id: PKGBUILD 70866 2012-05-18 06:01:51Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD
index a05aac7a3..f455c9485 100644
--- a/community/libcss/PKGBUILD
+++ b/community/libcss/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 64859 2012-02-18 18:11:23Z arodseth $
+# $Id: PKGBUILD 70909 2012-05-18 23:49:56Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libcss
-pkgver=0.1.1
+pkgver=0.1.2
 pkgrel=1
 pkgdesc="CSS parser and selection engine"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 url="http://www.netsurf-browser.org/projects/libcss/"
 license=('MIT')
 depends=('libparserutils' 'libwapcaplet')
 source=("http://www.netsurf-browser.org/projects/releases/libcss-$pkgver-src.tar.gz")
-sha256sums=('383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0')
+sha256sums=('92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD
index 4eb5dd94e..62c641f11 100644
--- a/community/libwapcaplet/PKGBUILD
+++ b/community/libwapcaplet/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 64868 2012-02-18 18:47:16Z arodseth $
+# $Id: PKGBUILD 70913 2012-05-18 23:56:14Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libwapcaplet
-pkgver=0.1.0
-pkgrel=3
+pkgver=0.1.1
+pkgrel=1
 pkgdesc="String internment library with rapid string comparison"
 arch=('x86_64' 'i686')
 url="http://www.netsurf-browser.org/projects/libwapcaplet/"
 license=('MIT')
 source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz")
-sha256sums=('e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7')
+sha256sums=('cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver-src"
+  cd "$srcdir/$pkgname-$pkgver"
   
   make PREFIX=/usr COMPONENT_TYPE="lib-shared" 
   make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver-src"
+  cd "$srcdir/$pkgname-$pkgver"
   
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" 
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD
index cb5c70e38..c34f660cc 100644
--- a/community/r8168-lts/PKGBUILD
+++ b/community/r8168-lts/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70815 2012-05-17 08:00:37Z mtorromeo $
+# $Id: PKGBUILD 70870 2012-05-18 08:29:14Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=r8168-lts
 _pkgname=r8168
 pkgver=8.030.00
-pkgrel=1
-pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts"
+pkgrel=2
+pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts"
 url="http://www.realtek.com.tw"
 license=("GPL")
 arch=('i686' 'x86_64')
diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD
index e64dfe966..23495b212 100644
--- a/community/snort/PKGBUILD
+++ b/community/snort/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69276 2012-04-11 23:23:45Z lfleischer $
+# $Id: PKGBUILD 70868 2012-05-18 06:19:27Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 
 pkgname=snort
-pkgver=2.9.2.2
+pkgver=2.9.2.3
 pkgrel=1
 pkgdesc='A lightweight network intrusion detection system.'
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ install='snort.install'
 source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz"
         'snort'
         'snort.conf.d')
-md5sums=('4254389550e3be31afebc70e64e6002f'
+md5sums=('9ddb26005d864577fca66a9a1cdfdc8a'
          '361b8b9e40b9af0164f6b3e3da2e8277'
          'b4fb8a68490589cd34df93de7609bfac')
 
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 7b4254d11..1d2f48306 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70458 2012-05-08 13:27:24Z seblu $
+# $Id: PKGBUILD 70896 2012-05-18 22:00:49Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
 # Contributor: Jason Rodriguez <jason-aur@catloaf.net>
 
 pkgname=sslh
-pkgver=1.12
+pkgver=1.13b
 pkgrel=1
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('i686' 'x86_64')
@@ -14,38 +14,37 @@ depends=('libconfig')
 backup=('etc/conf.d/sslh' 'etc/sslh.conf')
 source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
         'sslh.rc'
-        'sslh.conf'
-        'sslh.service')
-md5sums=('265014ecdae4512eacca91aaff0b9a81'
-         'e1c44f8160b7fef397f81db63eec8421'
-         'c51c63d2b28080bae4c1c7a0c469bab7'
-         'ee8a4fcfc1f6839f7c93deb6f59f7fd6')
+        'sslh.conf')
+md5sums=('fbd8934e6f799437c562866f09afee5b'
+         'c2a0c7c58d091acf5b4672f58066ee8f'
+         'c51c63d2b28080bae4c1c7a0c469bab7')
 
 build() {
-  cd $pkgname-$pkgver
+  #cd $pkgname-$pkgver
+  cd $pkgname-1.13
   # fix archlinux path in manpage
   sed -i 's/init.d/rc.d/' sslh.pod
   sed -i 's+/etc/default+/etc/conf.d+' sslh.pod
-  # remove default pidfile in example
-  sed -i '/pidfile:/d' example.cfg
-  # daemon mode by default (as not overridable in command line)
-  sed -i 's/foreground: true;/foreground: false;/' example.cfg
-  make
+  make VERSION=\"v$pkgver\"
 }
 
 package() {
   # install initscripts
   install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh"
   install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh"
-  # install systemd service
-  install -Dm 644 sslh.service "$pkgdir/usr/lib/systemd/system/sslh.service"
   # manually install to have both ssl-fork and ssl-select
-  cd $pkgname-$pkgver
+  #cd $pkgname-$pkgver
+  cd $pkgname-1.13
   install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
   install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select"
   ln -s sslh-fork "$pkgdir/usr/bin/sslh"
+  # install manpage
   install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
+  # install example file
   install -Dm 0644 example.cfg "$pkgdir/etc/sslh.conf"
+  # install systemd service
+  install -Dm 644 scripts/systemd.sslh.service \
+    "$pkgdir/usr/lib/systemd/system/sslh.service"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc
index cd5397cad..456e122f4 100644
--- a/community/sslh/sslh.rc
+++ b/community/sslh/sslh.rc
@@ -6,6 +6,7 @@
 
 DAEMON=/usr/bin/sslh
 PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTS="--background $DAEMON_OPTS"
 
 case "$1" in
   start)