Updated anytun PKGBUILD and examples patch

2 files changed, 23 insertions, 30 deletions

diff --git a/arch-linux/anytun/PKGBUILD b/arch-linux/anytun/PKGBUILD
index 35beda8..b3336e4 100644
--- a/arch-linux/anytun/PKGBUILD
+++ b/arch-linux/anytun/PKGBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="secure anycast tunneling protocol implementation for flexible and fault-tolerant VPNs"
 arch=("i686" "x86_64")
 url="http://www.anytun.org/"
-license=('GPLv3')
+license=('GPL3')
 groups=()
 depends=(boost openssl glibc)
 #depends=(boost libgcrypt glibc)
@@ -18,33 +18,38 @@ options=(docs zipman ccache distcc)
 install=anytun.install
 source=("http://www.anytun.org/download/$pkgname-$pkgver.tar.gz" "boost-mt.patch" "examples.patch")
 noextract=()
+md5sums=('66f12b0a412a0f9e51d238943261a589'
+         'bc8713a0228af46f7692a85e77927871'
+         '8246dd06f1ea5b8560cdd56c7f60a334')
 
 build() {
-  echo "==== Building Source ===="
-  cd "$srcdir/$pkgname-$pkgver/src" || return 1
+  local sharedir="/usr/share/${pkgname}-${pkgver}-${pkgrel}"
+  local docdir="/usr/share/doc/${pkgname}-${pkgver}-${pkgrel}"
+  local examplesdir=${docdir}/etc-examples
+
+  msg "Building Source ..."
+  cd "${srcdir}/${pkgname}-${pkgver}/src" || return 1
   patch -p0 < ${srcdir}/boost-mt.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --use-ssl-crypto --no-examples || return 1 # use libssl
-  #./configure --prefix=/usr --sysconfdir=/etc || return 1 # use libgcrypt
+  ./configure --prefix=/usr --sysconfdir=/etc --use-ssl-crypto --examplesdir=${examplesdir} || return 1 # use libssl
+  #./configure --prefix=/usr --sysconfdir=/etc --examplesdir=${examplesdir} || return 1 # use libgcrypt
   make || return 1
 
-  echo "==== Building Manpages ===="
+  msg "Building Manpages ..."
   make manpage || return 1
 
-  #echo "==== Building AnyRTPProxy ===="
+  msg "Tweaking example for Arch ..."
   #make anyrtpproxy || return 1
 
-  echo "==== Tweaking example for Arch ===="
-  cd "$srcdir/$pkgname-$pkgver/etc/anytun/" 
-  patch -p0 < ${srcdir}/examples.patch 
+  msg "Tweaking example for Arch ..."
+  patch -p0 -d ../etc/anytun/ < ${srcdir}/examples.patch
 
-  echo "==== Installing anytun ===="
-  cd "$srcdir/$pkgname-$pkgver/src" || return 1
+  msg "Installing ${pkgname} ..."
+  mkdir -p ${pkgdir}${sharedir}/  ${pkgdir}/var/run/anytun  ${pkgdir}/var/run/anytun-controld  ${pkgdir}/etc/anytun &>/dev/null
   make install DESTDIR="${pkgdir}"
-  mkdir -p ${pkgdir}/var/run/anytun  ${pkgdir}/var/run/anytun-controld ${pkgdir}/etc/anytun &>/dev/null
   mv ${pkgdir}/etc/init.d/ ${pkgdir}/etc/rc.d/
-  rm -Rf ${pkgdir}/etc/anytun/*
-  mkdir -p ${pkgdir}/usr/share/doc/$pkgname-$pkgver-$pkgrel/etc-example/
-  cp -a ../etc/anytun ${pkgdir}/usr/share/doc/$pkgname-$pkgver-$pkgrel/etc-example/
-  install -Dd ../wireshark-lua ${pkgdir}/usr/share/$pkgname-$pkgver-$pkgrel/
+  rm -Rf ${pkgdir}/etc/anytun/*   
+  install -Dm 644 ../README ${pkgdir}${docdir}/README
+  install -Dm 644 ../ChangeLog ${pkgdir}${docdir}/ChangeLog
+  install -Dm 644 ../AUTHORS ${pkgdir}${docdir}/AUTHORS  
+  cp -r ../wireshark-lua ${pkgdir}${sharedir}/  
 }
-
diff --git a/arch-linux/anytun/examples.patch b/arch-linux/anytun/examples.patch
index f2bb40e..7a9d38d 100644
--- a/arch-linux/anytun/examples.patch
+++ b/arch-linux/anytun/examples.patch
@@ -25,18 +25,6 @@ diff -u -r ../../orig/anytun-0.3.1/etc/anytun/client3/post-up.sh ./client3/post-
  
  ip link set dev $1 up
  ip link set dev $1 mtu 1400
-diff -u -r ../../orig/anytun-0.3.1/etc/anytun/server/config ./server/config
---- ../../orig/anytun-0.3.1/etc/anytun/server/config	2009-11-03 20:35:44.232174612 +0100
-+++ ./server/config	2009-11-02 19:08:13.000000000 +0100
-@@ -56,7 +56,7 @@
- 
- ## change user and group after init
- username nobody
--groupname nogroup
-+groupname nobody
- 
- ## chroot to /var/run/anytun
- #chroot /var/run/anytun
 diff -u -r ../../orig/anytun-0.3.1/etc/anytun/server/post-up.sh ./server/post-up.sh
 --- ../../orig/anytun-0.3.1/etc/anytun/server/post-up.sh	2009-11-02 19:08:13.000000000 +0100
 +++ ./server/post-up.sh	2009-11-03 20:34:40.015513200 +0100