Merge branch 'master' of ssh://parabolagnulinux.org:1863/abslibre

5 files changed, 67 insertions, 35 deletions

diff --git a/social/bip/PKGBUILD b/social/bip/PKGBUILD
new file mode 100644
index 000000000..fcb0ddcfe
--- /dev/null
+++ b/social/bip/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
+pkgname=bip
+pkgver=0.8.8
+pkgrel=1
+pkgdesc="Multiuser IRC proxy that supports replaying of logged irc conversations"
+arch=('i686' 'x86_64')
+url="http://bip.milkypond.org/"
+license=('GPL')
+depends=('openssl' 'perl')
+makedepends=('bison' 'flex')
+backup=('etc/bip.conf')
+source=(https://projects.duckcorp.org/attachments/download/39/$pkgname-$pkgver.tar.gz)
+sha256sums=('7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  make DESTDIR=${pkgdir} install
+
+  install -D -m755 ${srcdir}/$pkgname-$pkgver/scripts/bipgenconfig \
+    ${pkgdir}/usr/bin/bipgenconfig
+  install -D -m644 ${srcdir}/$pkgname-$pkgver/samples/$pkgname.conf \
+    ${pkgdir}/usr/share/$pkgname/$pkgname.conf.sample
+  install -D -m644 ${srcdir}/$pkgname-$pkgver/samples/$pkgname.vim \
+    ${pkgdir}/usr/share/vim/syntax/$pkgname.vim
+}
diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD
index 39a0b22b1..29e68d0f3 100644
--- a/social/bitcoin-daemon/PKGBUILD
+++ b/social/bitcoin-daemon/PKGBUILD
@@ -6,27 +6,22 @@
 
 pkgname=bitcoin-daemon
 _pkgname=bitcoin
-pkgver=0.4.0
+pkgver=0.5.1
 pkgrel=1
 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.46' 'miniupnpc>=1.6')
-makedepends=('boost')
+depends=('expat' 'boost-libs>=1.46' 'miniupnpc>=1.6' 'openssl')
+makedepends=('boost' 'gcc' 'make')
 conflicts=('bitcoin')
 license=('MIT')
 install="bitcoin-daemon.install"
 source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}-linux.tar.gz"
-        makefile.parabola
         bitcoin-daemon.install
         rc.bitcoind)
-md5sums=('cb085fef9d49d25e7f3dd263950b1ed2'
-         '8d40b6a332721bf7354cca4070e082df'
-         '0375ba4d6c3425eee350dc8b7575403d'
-         '7faa439885f3adbba5847ae75aac5484')
 
 s1=$srcdir/${_pkgname}-${pkgver}-linux
-src=$s1/src/src/
+src=$s1/src/src
 makefile_unix=makefile.unix
 
 build() {
@@ -39,24 +34,23 @@ build() {
 		-e 's/\(USE_UPNP:=\)0/\11/' \
 		-e 's/$(DEBUGFLAGS)//g' \
 		-e 's/CXXFLAGS/CPPFLAGS/g' \
-		-e 's/-O[0-3]/${CXXFLAGS}/g' 
+		-e 's/-O[0-3]/${CXXFLAGS}/g'
 
-	# single-threaded build due to OOM issues reported
-	make -j1 -f $makefile_unix bitcoind
+	# make bitcoind
+	make $MAKEFLAGS -f $makefile_unix bitcoind
 }
 
 package() {
 	# get compiled binaries
-	mkdir -p $pkgdir/{usr/{bin,share/licenses/$pkgname},var/lib/$pkgname}
-	install -D -m755 $src/bitcoind $pkgdir/usr/bin/
+	install -d ${pkgdir}/{var/lib/${pkgname},usr/{share/licenses,bin},etc/rc.d}
 
-	# install locales (FIXME bicycle with find|xargs)
-	mkdir -p $pkgdir/usr/share/locale
-	cd $s1/locale/
-	find -name *.mo | xargs -I{} install -D -m644 {} $pkgdir/usr/share/locale/{}
-	
+	install -D -m755 ${src}/bitcoind ${pkgdir}/usr/bin/
 
-    install -D -m 644 $s1/COPYING \
-                      $pkgdir/usr/share/licenses/$pkgname/
+    install -D -m755 ${srcdir}/rc.bitcoind ${pkgdir}/etc/rc.d/
 
+    install -D -m 644 ${s1}/COPYING \
+                      ${pkgdir}/usr/share/licenses/${pkgname}/
 }
+md5sums=('1edeb3082d41741b8d0e5f850818328f'
+         '0375ba4d6c3425eee350dc8b7575403d'
+         '7faa439885f3adbba5847ae75aac5484')
diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD
index 1cf183cf7..57459173d 100644
--- a/social/diaspora-git/PKGBUILD
+++ b/social/diaspora-git/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgbase=diaspora-git
 pkgname=('diaspora-mysql-git' 'diaspora-postgresql-git' 'diaspora-sqlite-git')
-pkgver=20110623
+pkgver=20111229
 pkgrel=1
 pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network"
 arch=('i686' 'x86_64')
@@ -39,18 +39,18 @@ build() {
 
   if [[ -d $_gitname ]] ; then
     pushd $_gitname
-    git pull origin
+    $tsocks git pull origin
     msg "The local files are updated."
     popd
   else
-    git clone $_gitroot
+    $tsocks git clone $_gitroot
     msg "Git clone done."
   fi
 
   msg "Start making..."
 
   [[ -d $_gitname-build ]] && rm -fr $_gitname-build
-  git clone $_gitname $_gitname-build
+  $tsocks git clone $_gitname $_gitname-build
 
 # Include all gems
   export GEM_HOME="${PWD}/vendor"
@@ -59,7 +59,7 @@ build() {
 
   cd ${srcdir}/${_gitname}-build
 
-  gem install bundler
+  $tsocks gem install bundler
 }
 
 # Helper
diff --git a/social/ruby-headers/PKGBUILD b/social/ruby-headers/PKGBUILD
index c89b7accd..aa00d8d2c 100644
--- a/social/ruby-headers/PKGBUILD
+++ b/social/ruby-headers/PKGBUILD
@@ -3,15 +3,16 @@
 
 pkgname=ruby-headers
 _pkgname=ruby
-pkgver=1.9.2_p290
-_pkgver=1.9.2-p290
-pkgrel=2
+pkgver=1.9.3_p0
+_pkgver=1.9.3-p0
+pkgrel=1
 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug."
 arch=('any')
 url="http://www.ruby-lang.org/en/"
 license=('GPL2' 'custom:Ruby')
 depends=("ruby=$pkgver")
 source=("http://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2")
+md5sums=('65401fb3194cdccd6c1175ab29b8fdb8')
 
 build() {
   /bin/true
@@ -28,4 +29,3 @@ package() {
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-md5sums=('096758c3e853b839dc980b183227b182')
diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd
index d790ef86f..16f39f8ca 100644
--- a/social/tinc/tincd.rcd
+++ b/social/tinc/tincd.rcd
@@ -4,9 +4,10 @@ daemon_name=tincd
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
+. /etc/conf.d/${daemon_name}.conf
 
-PID=`pidof -o %PPID /usr/sbin/tincd`
+PIDFILE=/var/run/tinc.${NETNAME}
+[ -f "${PIDFILE}" ] && PID=$(<${PIDFILE})
 
 case "$1" in
     start)
@@ -14,7 +15,7 @@ case "$1" in
         [ -z "$PID" ] && \
             /usr/sbin/tincd -n ${NETNAME} \
                             ${OPTIONS} \
-                            --pidfile=/var/run/tinc.${NETNAME} &> /dev/null
+                            --pidfile=${PIDFILE} &> /dev/null
 
         if [ $? -gt 0 ]; then
             stat_fail
@@ -25,7 +26,7 @@ case "$1" in
         ;;
     stop)
         stat_busy "Stopping ${daemon_name}"
-        [ ! -z "$PID" ] && kill $PID &> /dev/null
+        [ ! -z "$PID" ] && /usr/sbin/tincd -n ${NETNAME} -k
         if [ $? -gt 0 ]; then
             stat_fail
         else
@@ -38,7 +39,10 @@ case "$1" in
         sleep 3
         $0 start
         ;;
+    reload)
+        [ ! -z "$PID" ] && /usr/sbin/tincd -n ${NETNAME} -k HUP
+        ;;
     *)
-        echo "usage: $0 {start|stop|restart}"
+        echo "usage: $0 {start|stop|restart|reload}"
 esac
 exit 0