6 files changed, 75 insertions, 18 deletions
diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD
index 77dd1d86f..9ef03573d 100644
--- a/social/bitcoin-daemon/PKGBUILD
+++ b/social/bitcoin-daemon/PKGBUILD
@@ -4,28 +4,24 @@
 
 pkgname=bitcoin-daemon
 _pkgname=bitcoin
-pkgver=0.3.22
-_bcver=0.3.22
+pkgver=0.3.24
+_bcver=0.3.24
 pkgrel=1
-pkgdesc="Bitcoin is a peer-to-peer network based digital currency."
+pkgdesc="Bitcoin is a peer-to-peer network based digital currency (daemon with JSON-RPC interface)."
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
 depends=('expat' 'boost-libs>=1.43' 'miniupnpc')
 makedepends=('boost' 'openssl')
-conflicts=('bitcoin-bin' 'bitcoin')
+conflicts=('bitcoin')
 license=('MIT')
 install="bitcoin-daemon.install"
 source=(http://ufpr.dl.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-$_bcver/bitcoin-$pkgver-linux.tar.gz
         makefile.parabola
         bitcoin-daemon.install
         rc.bitcoind)
-md5sums=('87ed8d95dd0c94635d5237dc1490bb0d'
-         'dc3d207309d11e285ece6b3bdf61d90b'
-         'a388684057de2bb543cb7f795dc693cf'
-         '4a9ab4997487bb5f8e3c6b1d580045af')
 
 build() {
-	cd $srcdir/${_pkgname}-${pkgver}/src/src
+	cd $srcdir/$_pkgname-$_bcver/src/src
 	
 	# copy correct makefile to src dir
 	cp $srcdir/makefile.parabola Makefile
@@ -39,14 +35,14 @@ build() {
 }
 
 package() {
-    cd $srcdir/${_pkgname}-${pkgver}/src/src
+    cd $srcdir/$_pkgname-$_bcver/src/src
 
 	mkdir -p $pkgdir/{usr/bin,usr/share/licenses/$pkgname,etc/rc.d,var/lib/$pkgname}
 	
 	install -D -m755 ./bitcoind $pkgdir/usr/bin/
 	install -D -m755 $srcdir/rc.bitcoind $pkgdir/etc/rc.d/bitcoind
 
-    install -D -m 644 $srcdir/$_pkgname-$pkgver/COPYING \
+    install -D -m 644 $srcdir/$_pkgname-$_bcver/COPYING \
                       $pkgdir/usr/share/licenses/$pkgname/
 	
 	# strip shit from executables
@@ -56,3 +52,11 @@ package() {
 	chown -R 8333:8333 $pkgdir/var/lib/$pkgname
 	chmod -R 700 $pkgdir/var/lib/$pkgname
 }
+md5sums=('7a9e5d45cccd21ef88b8cbbe20946599'
+         'dc3d207309d11e285ece6b3bdf61d90b'
+         'a388684057de2bb543cb7f795dc693cf'
+         '7faa439885f3adbba5847ae75aac5484')
+md5sums=('7a9e5d45cccd21ef88b8cbbe20946599'
+         '3172bdbc0096cb277971a26e0ca9adb6'
+         'a388684057de2bb543cb7f795dc693cf'
+         '7faa439885f3adbba5847ae75aac5484')
diff --git a/social/bitcoin-daemon/makefile.parabola b/social/bitcoin-daemon/makefile.parabola
index 1f8236b66..9d7d5cffe 100644
--- a/social/bitcoin-daemon/makefile.parabola
+++ b/social/bitcoin-daemon/makefile.parabola
@@ -53,8 +53,10 @@ OBJS= \
     obj/main.o \
     obj/rpc.o \
     obj/init.o \
+    obj/wallet.o \
+    obj/keystore.o \
     cryptopp/obj/sha.o \
-    cryptopp/obj/cpu.o
+    cryptopp/obj/cpu.o 
 
 
 all: bitcoin
diff --git a/social/bitcoin-daemon/rc.bitcoind b/social/bitcoin-daemon/rc.bitcoind
index 98d713ffd..be09251d1 100644
--- a/social/bitcoin-daemon/rc.bitcoind
+++ b/social/bitcoin-daemon/rc.bitcoind
@@ -6,7 +6,7 @@
 case "$1" in
   start)
     stat_busy "Starting bitcoind"
-    su -s /bin/bash -c "nohup bitcoind -gen -datadir=/var/lib/bitcoin-daemon &" bitcoin > /dev/null 2>&1
+    su -s /bin/bash -c "nohup bitcoind -gen=0 -datadir=/var/lib/bitcoin-daemon &" bitcoin > /dev/null 2>&1
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD
index 1dd9ad328..b8f16a57c 100644
--- a/social/tinc/PKGBUILD
+++ b/social/tinc/PKGBUILD
@@ -1,12 +1,15 @@
 pkgname=tinc
 pkgver=1.0.15
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=(i686 x86_64)
 url="http://www.tinc-vpn.org/"
 license=('GPL')
 depends=('lzo2' 'zlib' 'openssl')
-source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz)
+source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
+        tincd.conf
+        tincd.rcd)
+md5sums=('44bb7d1618955a0a56e9e159f1c46362')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,7 +23,11 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
-  install -d $pkgdir/etc/tinc
-  tar xzvf doc/sample-config.tar.gz -C $pkgdir/etc/tinc/
+  install -d $pkgdir/etc/{tinc,rc.d,conf.d}
+
+  install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd
+  install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd
 }
-md5sums=('44bb7d1618955a0a56e9e159f1c46362')
+md5sums=('44bb7d1618955a0a56e9e159f1c46362'
+         '9b40646cd898709e90ae3c32baecb075'
+         '75516d05803ee6c6b22516e10129ad99')
diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf
new file mode 100644
index 000000000..84547936c
--- /dev/null
+++ b/social/tinc/tincd.conf
@@ -0,0 +1 @@
+NETNAME=yournetname
diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd
new file mode 100644
index 000000000..f0a456e17
--- /dev/null
+++ b/social/tinc/tincd.rcd
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+daemon_name=tincd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/$daemon_name.conf
+
+PID=`pidof -o %PPID /usr/sbin/tincd`
+
+case "$1" in
+    start)
+        stat_busy "Starting ${daemon_name}"
+        [ -z "$PID" ] && \
+            /usr/sbin/tincd -n ${NETNAME} \
+                            --pidfile=/var/run/tinc.${NETNAME} &> /dev/null
+
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon ${daemon_name}
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping ${daemon_name}"
+        [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon ${daemon_name}
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+        sleep 3
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+esac
+exit 0