Mon Jun 6 22:47:16 UTC 2011

7 files changed, 225 insertions, 24 deletions

diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD
index c00439328..77dd1d86f 100644
--- a/social/bitcoin-daemon/PKGBUILD
+++ b/social/bitcoin-daemon/PKGBUILD
@@ -4,43 +4,50 @@
 
 pkgname=bitcoin-daemon
 _pkgname=bitcoin
-pkgver=0.3.21
-_bcver=0.3.21
+pkgver=0.3.22
+_bcver=0.3.22
 pkgrel=1
 pkgdesc="Bitcoin is a peer-to-peer network based digital currency."
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
-depends=('expat' 'boost-libs>=1.43')
-makedepends=('boost')
+depends=('expat' 'boost-libs>=1.43' 'miniupnpc')
+makedepends=('boost' 'openssl')
 conflicts=('bitcoin-bin' 'bitcoin')
 license=('MIT')
 install="bitcoin-daemon.install"
 source=(http://ufpr.dl.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-$_bcver/bitcoin-$pkgver-linux.tar.gz
-        makefile.archlinux
+        makefile.parabola
         bitcoin-daemon.install
         rc.bitcoind)
+md5sums=('87ed8d95dd0c94635d5237dc1490bb0d'
+         'dc3d207309d11e285ece6b3bdf61d90b'
+         'a388684057de2bb543cb7f795dc693cf'
+         '4a9ab4997487bb5f8e3c6b1d580045af')
 
 build() {
-	cd $srcdir/${_pkgname}-${pkgver}/src
+	cd $srcdir/${_pkgname}-${pkgver}/src/src
 	
 	# copy correct makefile to src dir
-	cp $srcdir/makefile.archlinux Makefile
+	cp $srcdir/makefile.parabola Makefile
 
     # fixes...
     mkdir -p obj/nogui 2>/dev/null
     rm -f cryptopp/obj/*
-	
+
 	# to build (single-threaded make due to OOM issues)
 	make bitcoind
 }
 
 package() {
-    cd $srcdir/${_pkgname}-${pkgver}
+    cd $srcdir/${_pkgname}-${pkgver}/src/src
+
 	mkdir -p $pkgdir/{usr/bin,usr/share/licenses/$pkgname,etc/rc.d,var/lib/$pkgname}
 	
-	install -D -m755 ./src/bitcoind $pkgdir/usr/bin/
+	install -D -m755 ./bitcoind $pkgdir/usr/bin/
 	install -D -m755 $srcdir/rc.bitcoind $pkgdir/etc/rc.d/bitcoind
-    install -m 644 ./license.txt $pkgdir/usr/share/licenses/$pkgname/
+
+    install -D -m 644 $srcdir/$_pkgname-$pkgver/COPYING \
+                      $pkgdir/usr/share/licenses/$pkgname/
 	
 	# strip shit from executables
 	find $pkgdir/usr/bin/ -type f | xargs -L1 strip
@@ -49,7 +56,3 @@ package() {
 	chown -R 8333:8333 $pkgdir/var/lib/$pkgname
 	chmod -R 700 $pkgdir/var/lib/$pkgname
 }
-md5sums=('19e530a9b60e3a0987998a87b30d8cdc'
-         '8e2ff558c2538e53c177513ad7d8b9a5'
-         'a388684057de2bb543cb7f795dc693cf'
-         '4a9ab4997487bb5f8e3c6b1d580045af')
diff --git a/social/bitcoin-daemon/makefile.parabola b/social/bitcoin-daemon/makefile.parabola
new file mode 100644
index 000000000..1f8236b66
--- /dev/null
+++ b/social/bitcoin-daemon/makefile.parabola
@@ -0,0 +1,88 @@
+# Copyright (c) 2009-2010 Satoshi Nakamoto
+# Rewritten for Archlinux by shahid
+# Distributed under the MIT/X11 software license, see the accompanying
+# file license.txt or http://www.opensource.org/licenses/mit-license.php.
+
+CXX=g++
+
+INCLUDEPATHS= \
+ -I"/usr/include" \
+
+LIBPATHS= \
+ -L"/usr/lib" \
+ -L"/usr/local/lib"
+
+DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL
+
+USE_UPNP:=1
+
+# --as-needed lazy linking set as default behavior of ld because i guess, there are useless libs here
+# Of couse, this may be overriden by LDFLAGS in makepkg.conf
+LIBS= \
+  -Wl,--as-needed \
+   ${LDFLAGS} \
+   -l boost_system \
+   -l boost_filesystem \
+   -l boost_program_options \
+   -l boost_thread \
+   -l db_cxx \
+
+ifdef USE_UPNP
+    LIBS += -l miniupnpc
+    DEFS += -DUSE_UPNP=$(USE_UPNP)
+endif
+
+LIBS+= \
+   -l gthread-2.0 \
+   -l z \
+   -l dl \
+   -l ssl \
+   -l crypto 
+
+#DEBUGFLAGS=-g -D__WXDEBUG__
+CCFLAGS=${CXXFLAGS} -DBOOST_FILESYSTEM_DEPRECATED -Wno-invalid-offsetof -Wformat $(WXDEFS) $(INCLUDEPATHS) $(DEFS)
+HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
+    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
+
+OBJS= \
+    obj/util.o \
+    obj/script.o \
+    obj/db.o \
+    obj/net.o \
+    obj/irc.o \
+    obj/main.o \
+    obj/rpc.o \
+    obj/init.o \
+    cryptopp/obj/sha.o \
+    cryptopp/obj/cpu.o
+
+
+all: bitcoin
+
+
+headers.h.gch: headers.h $(HEADERS)
+	$(CXX) -c $(CCFLAGS) -DGUI -o $@ $<
+
+obj/%.o: %.cpp $(HEADERS) headers.h.gch
+	$(CXX) -c $(CCFLAGS) -DGUI -o $@ $<
+
+# -DCRYPTOPP_DISABLE_SSE2
+cryptopp/obj/%.o: cryptopp/%.cpp
+	$(CXX) -c $(CCFLAGS) -O3 -o $@ $<
+
+bitcoin: $(OBJS) obj/ui.o obj/uibase.o
+	$(CXX) $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(WXLIBS)
+
+obj/nogui/%.o: %.cpp $(HEADERS)
+	$(CXX) -c $(CCFLAGS) -o $@ $<
+
+bitcoind: $(OBJS:obj/%=obj/nogui/%)
+	$(CXX) $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
+
+clean:
+	-rm -f obj/*.o
+	-rm -f obj/nogui/*.o
+	-rm -f cryptopp/obj/*.o
+	-rm -f headers.h.gch
+	-rm -f bitcoin
+	-rm -f bitcoind
diff --git a/social/miniupnpc/PKGBUILD b/social/miniupnpc/PKGBUILD
new file mode 100644
index 000000000..38f323a65
--- /dev/null
+++ b/social/miniupnpc/PKGBUILD
@@ -0,0 +1,18 @@
+# Contributor: Florian Loitsch <archlinux@florian.loitsch.com>
+pkgname=miniupnpc
+pkgver=1.5
+pkgrel=2
+pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices"
+arch=(i686 x86_64)
+url="http://miniupnp.free.fr"
+license=('BSD')
+depends=('sh')
+source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz")
+md5sums=('0efa7498d27c82a56a0300b0c05c4f58')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  make || return 1
+  make INSTALLPREFIX=$pkgdir/usr install || return 1
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/social/olsrd/PKGBUILD b/social/olsrd/PKGBUILD
new file mode 100644
index 000000000..dea029844
--- /dev/null
+++ b/social/olsrd/PKGBUILD
@@ -0,0 +1,30 @@
+# Contributor: William Rea <sillywilly@gmail.com>
+# Maintainer: Claudio Pisa <clauz@ninux.org>
+pkgname=olsrd
+pkgver="0.6.1"
+pkgrel=1
+pkgdesc="OLSR routing daemon (RFC 3626)"
+arch=(i686 x86_64 ppc)
+url="http://www.olsr.org"
+license=('BSD')
+depends=('glibc')
+makedepends=('bison')
+backup=(etc/olsrd.conf)
+install=(olsrd.install)
+source=(http://www.olsr.org/releases/0.6/${pkgname}-${pkgver}.tar.bz2 rc.d.olsrd)
+md5sums=('a75fc9b6252df5b5f49f13418fafeff1' 'bc3e393e0179ffff0a6d6c9d6a5c4b60')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make OS=linux build_all
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install_all
+
+  install -D -m755 $srcdir/rc.d.olsrd $pkgdir/etc/rc.d/olsrd
+  install -D -m644 license.txt $pkgdir/usr/share/licenses/olsrd/LICENSE
+}
+
diff --git a/social/olsrd/olsrd.install b/social/olsrd/olsrd.install
new file mode 100755
index 000000000..f49372538
--- /dev/null
+++ b/social/olsrd/olsrd.install
@@ -0,0 +1,21 @@
+post_install() {
+echo "--------------------------------------------------------------------"
+echo " Remember to edit /etc/olsrd.conf to match your network settings."
+echo "--------------------------------------------------------------------"
+/bin/true
+}
+
+post_upgrade() {
+/bin/true
+}
+
+pre_remove() {
+/etc/rc.d/olsrd stop
+/bin/true
+}
+
+op=$1
+shift
+
+$op "$@"
+
diff --git a/social/olsrd/rc.d.olsrd b/social/olsrd/rc.d.olsrd
new file mode 100755
index 000000000..d257e22ef
--- /dev/null
+++ b/social/olsrd/rc.d.olsrd
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/olsrd`
+case "$1" in
+  start)
+    stat_busy "Starting OLSR Daemon"
+    [ -z "$PID" ] && /usr/sbin/olsrd -d 0 &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon olsrd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping OLSR Daemon"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon olsrd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+
diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD
index 8c56c0fc2..c2a7dc51c 100644
--- a/social/tinc/PKGBUILD
+++ b/social/tinc/PKGBUILD
@@ -1,21 +1,26 @@
 pkgname=tinc
-pkgver=1.0.13
-pkgrel=2
+pkgver=1.0.14
+pkgrel=1
 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)
-md5sums=('86263994d38c750431efd17e9a91a248')
+md5sums=('967dfafc4aa41a614c1d2739df8a8372')
 
 build() {
-    cd "$startdir/src/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-    make || return 1
-    make DESTDIR="$startdir/pkg" install
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 
-    mkdir -p $startdir/pkg/etc/tinc/
-    tar xzvf doc/sample-config.tar.gz -C $startdir/pkg/etc/tinc/
+  install -d $pkgdir/etc/tinc
+  tar xzvf doc/sample-config.tar.gz -C $pkgdir/etc/tinc/
 }