Patchwork netatalk: bump version

login
register
mail settings
Submitter Maxime Hadjinlian
Date Oct. 1, 2012, 4:23 p.m.
Message ID <1349108616-5814-1-git-send-email-maxime.hadjinlian@gmail.com>
Download mbox | patch
Permalink /patch/188323/
State Accepted
Headers show

Comments

Maxime Hadjinlian - Oct. 1, 2012, 4:23 p.m.
Netatalk goes to version 3.0.
The startup script has changed too, there is now only one binary called
netatalk. No more afpd, cnid, ... at startup ! They are executed by netatalk.

All the config is done within /etc/afp.conf, look at :
http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html
for more info about the upgrade process.
---
 package/netatalk/S50netatalk |   32 +++++++++++---------------------
 package/netatalk/netatalk.mk |    4 ++--
 2 files changed, 13 insertions(+), 23 deletions(-)
Peter Korsgaard - Oct. 8, 2012, 1:47 p.m.
>>>>> "Maxime" == Maxime Hadjinlian <maxime.hadjinlian@gmail.com> writes:

 Maxime> Netatalk goes to version 3.0.
 Maxime> The startup script has changed too, there is now only one binary called
 Maxime> netatalk. No more afpd, cnid, ... at startup ! They are executed by netatalk.

 Maxime> All the config is done within /etc/afp.conf, look at :
 Maxime> http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html
 Maxime> for more info about the upgrade process.

I did a quick test build here:

  CC     afpd-switch.o
status.c:38:18: fatal error: krb5.h: No such file or directory
compilation terminated.
make[4]: *** [afpd-status.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[4]: Leaving directory `/home/peko/source/buildroot/output/build/netatalk-3.0/etc/afpd'

We don't have kerberos in buildroot, so I added --without-kerberos and
committed, thanks.
Thomas Petazzoni - Oct. 25, 2012, 6:53 a.m.
Dear Maxime Hadjinlian,

On Mon,  1 Oct 2012 18:23:36 +0200, Maxime Hadjinlian wrote:
> Netatalk goes to version 3.0.
> The startup script has changed too, there is now only one binary called
> netatalk. No more afpd, cnid, ... at startup ! They are executed by netatalk.
> 
> All the config is done within /etc/afp.conf, look at :
> http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html
> for more info about the upgrade process.
> ---
>  package/netatalk/S50netatalk |   32 +++++++++++---------------------
>  package/netatalk/netatalk.mk |    4 ++--
>  2 files changed, 13 insertions(+), 23 deletions(-)

This update is apparently breaking the build in certain configurations:
http://autobuild.buildroot.net/results/4fada48332abc7f9bcd49a70debbc7950bc2263a/build-end.log

I see that your package as a dependency on berkeyleydb, but somehow,
the configure script fails to find it.

Can you look into it?

See
http://autobuild.buildroot.net/results/4fada48332abc7f9bcd49a70debbc7950bc2263a/
for the full configuration files.

Thanks,

Thomas
Maxime Hadjinlian - Oct. 25, 2012, 8:57 a.m.
On Thu, Oct 25, 2012 at 8:53 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Maxime Hadjinlian,
Hi Thomas,
>
> On Mon,  1 Oct 2012 18:23:36 +0200, Maxime Hadjinlian wrote:
>> Netatalk goes to version 3.0.
>> The startup script has changed too, there is now only one binary called
>> netatalk. No more afpd, cnid, ... at startup ! They are executed by netatalk.
>>
>> All the config is done within /etc/afp.conf, look at :
>> http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html
>> for more info about the upgrade process.
>> ---
>>  package/netatalk/S50netatalk |   32 +++++++++++---------------------
>>  package/netatalk/netatalk.mk |    4 ++--
>>  2 files changed, 13 insertions(+), 23 deletions(-)
>
> This update is apparently breaking the build in certain configurations:
> http://autobuild.buildroot.net/results/4fada48332abc7f9bcd49a70debbc7950bc2263a/build-end.log
>
> I see that your package as a dependency on berkeyleydb, but somehow,
> the configure script fails to find it.
>
> Can you look into it?
I will !
>
> See
> http://autobuild.buildroot.net/results/4fada48332abc7f9bcd49a70debbc7950bc2263a/
> for the full configuration files.
Thanks
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com

Patch

diff --git a/package/netatalk/S50netatalk b/package/netatalk/S50netatalk
index 94bb161..f109174 100755
--- a/package/netatalk/S50netatalk
+++ b/package/netatalk/S50netatalk
@@ -1,40 +1,30 @@ 
-#!/bin/sh 
-# 
-# Start netatalk daemon  (aftpd && cnid_metad)
+#!/bin/sh
+#
+# Start netatalk
 #
-
-AFPD_UAMLIST="-U uams_dhx2.so,uams_clrtxt.so"
 
 start() {
-    echo -n "Starting Netatalk services (this will take a while): "
-    echo "Starting afpd"
-    echo -n " afpd"
-    start-stop-daemon -S -q -p /var/run/afpd.pid --exec /usr/sbin/afpd -- $AFPD_UAMLIST -g nobody -c 50
-    echo -n " cnid_metad"
-    start-stop-daemon -S -q -p /var/run/cnid_metad.pid --exec /usr/sbin/cnid_metad -- -l log_note
-    echo "."
+    echo "Starting Netatalk"
+    start-stop-daemon -S -q -p /var/run/netatalk.pid --exec /usr/sbin/netatalk
 }
 
 stop(){
-    echo -n "Stopping Netatalk Daemons:"
-    echo -n " afpd"
-    start-stop-daemon -K -q -p /var/run/afpd.pid
-    echo -n " cnid_metad"
-    start-stop-daemon -K -q -p /var/run/cnid_metad.pid
+    echo "Stopping Netatalk"
+    start-stop-daemon -K -q -p /var/run/netatalk.pid
 }
 
 case "$1" in
     start)
         start
-    ;; 
+    ;;
     stop)
         stop
-    ;; 
+    ;;
     restart)
         start
         stop
-    ;; 
-    *) 
+    ;;
+    *)
         echo $"Usage: $0 {start|stop|restart}"
         exit 1
 esac
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 4b8d66f..a8d78c3 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -3,8 +3,8 @@ 
 # netatalk
 #
 #############################################################
-NETATALK_VERSION = 2.2.2
-NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)/
+NETATALK_VERSION = 3.0
+NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
 NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error