Upgraded netatalk

4 files changed, 46 insertions, 81 deletions

diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD
index 7e2fe14aa..816174590 100644
--- a/social/netatalk/PKGBUILD
+++ b/social/netatalk/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=netatalk
 pkgver=3.0.1
-pkgrel=1
+pkgrel=3
 pkgdesc='Open Source AFP fileserver'
 arch=('i686' 'x86_64')
 url='http://netatalk.sourceforge.net'
@@ -17,42 +17,36 @@ backup=('etc/afp.conf')
 options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(netatalk.rc http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('5e92015b0d9ac77af4b598cca6cb435c'
-	'62eb034011bb60b0bfd95072af3693dc')
+source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
+md5sums=('b4f5c932b2ca99f5292bd6b6d69b3ebc')
 
 build() {
-	cd $pkgname-$pkgver
+  cd $pkgname-$pkgver
 
 # TODO what does this fix?
-	msg2 'Fixing...'
-	sed -i 's/x"linux/x"generic/' macros/netatalk.m4
-
-	autoreconf
-
-# disable bundled libevent
-	echo -e "all:\ninstall:" >libevent/Makefile
-
-	CFLAGS="-Wno-unused-result" \
-    LIBS=-levent \
-    ./configure --prefix=/usr \
-                --disable-static \
-                --localstatedir=/etc \
-                --sysconfdir=/etc \
-        		--disable-bundled-libevent \
-                --with-cracklib \
-                --with-cnid-cdb-backend \
-                --enable-pgp-uam \
-                --with-init-style=systemd
-
-	make 
+  msg2 'Fixing...'
+  sed -i 's/x"linux/x"generic/' macros/netatalk.m4
+  sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in}
+
+  autoreconf
+
+  CFLAGS="-Wno-unused-result" \
+  ./configure --prefix=/usr \
+              --disable-static \
+              --localstatedir=/var/state \
+              --sysconfdir=/etc \
+              --with-init-style=systemd \
+              --with-cracklib \
+              --with-cnid-cdb-backend \
+              --enable-pgp-uam \
+              --without-libevent-header \
+              --without-libevent-lib
+
+  sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile
+  make 
 }
 package() {
-	cd $pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+  cd $pkgname-$pkgver
 
-	msg2 'Copying initscripts...'
-	install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk
+  make DESTDIR="$pkgdir" install
 }
-md5sums=('5e92015b0d9ac77af4b598cca6cb435c'
-         'b4f5c932b2ca99f5292bd6b6d69b3ebc')
diff --git a/social/netatalk/netatalk.changelog b/social/netatalk/netatalk.changelog
index b577562d4..b1ada018b 100644
--- a/social/netatalk/netatalk.changelog
+++ b/social/netatalk/netatalk.changelog
@@ -1,3 +1,21 @@
+2012-10-08 SJ_UnderWater
+
+	* 3.0.1-3 :
+	moved systemd from /etc
+	better rc.d install test
+
+2012-10-05 SJ_UnderWater
+
+	* 3.0.1-2 :
+	removed rc.d references
+
+2012-10-04 SJ_UnderWater
+
+	* 3.0.1-1 :
+	new version
+	moved to systemd
+	moved state to /var/db
+
 2012-07-14 SJ_UnderWater
 
 	* 3.0-3 :
diff --git a/social/netatalk/netatalk.install b/social/netatalk/netatalk.install
index a385add10..629586531 100644
--- a/social/netatalk/netatalk.install
+++ b/social/netatalk/netatalk.install
@@ -2,11 +2,11 @@ post_install() {
 	post_upgrade
 }
 post_upgrade() {
-	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
+	if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
 	echo '>>> Detected old netatalk daemon entries in';
 	echo '>>> /etc/rc.conf, please replace these with';
 	echo '>>> "netatalk" before restarting!';
-	else echo '>>> Add "netatalk" to your DAEMONS list in /etc/rc.conf';fi
+	else echo '>>> Add "netatalk" to your DAEMONS list';fi
 	echo '>>>';
 	if [ -f /etc/avahi/services/adisk.service ] ||
 	[ -f /etc/avahi/services/afpd.service ];then
@@ -18,6 +18,3 @@ post_upgrade() {
 	echo '>>> Found *.conf in /opt/netatalk, please';
 	echo '>>> migrate these to /etc/netatalk before restarting';fi
 }
-pre_remove() {
-	rc.d stop netatalk
-}
diff --git a/social/netatalk/netatalk.rc b/social/netatalk/netatalk.rc
deleted file mode 100644
index f14d67ee3..000000000
--- a/social/netatalk/netatalk.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-NAME="Appletalk Services Daemon"
-ARGS=
-DAEMON=netatalk
-
-[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
-
-PID=`get_pid $DAEMON`
-
-case "$1" in
- start)
-   stat_busy "Starting $NAME"
-   [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null
-   if [ $? = 0 ]; then
-     add_daemon $DAEMON
-     stat_done
-   else
-     stat_fail
-     exit 1
-   fi
-   ;;
- stop)
-   stat_busy "Stopping $NAME"
-   [ -n "$PID" ] && kill $PID &>/dev/null
-   if [ $? = 0 ]; then
-     rm_daemon $DAEMON
-     stat_done
-   else
-     stat_fail
-     exit 1
-   fi
-   ;;
- restart)
-   $0 stop
-   sleep 1
-   $0 start
-   ;;
- *)
-   echo "usage: $0 {start|stop|restart}"  
-esac