netatalk: Fix non-working package:

- Disable SLP support, probably noone uses it and these tests break do_qa_configure
- Update init script to work
- Split up non-AFP over IP stuff into separate packages
- Disable PAM or this means adding lots of pam modules to any distros that want this to work

1 files changed, 30 insertions, 22 deletions

diff --git a/packages/netatalk/netatalk_2.0.3.bb b/packages/netatalk/netatalk_2.0.3.bb
index 4f802dbcf6..0ed580d6f1 100644
--- a/packages/netatalk/netatalk_2.0.3.bb
+++ b/packages/netatalk/netatalk_2.0.3.bb
@@ -1,38 +1,46 @@
 SECTION = "net"
-PR = "r0"
+PR = "r1"
 LICENSE = "GPL"
 
-DEPENDS = "cups db openssl libpam"
+DEPENDS = "cups db openssl"
 
 SRC_URI = "http://ovh.dl.sourceforge.net/sourceforge/netatalk/netatalk-${PV}.tar.gz \
 	   file://netatalk-2.0.3-db43.patch;patch=1 \
 	   file://netatalk-2.0.3-newerdb.patch;patch=1 \
 	   file://netatalk-2.0.3-xfs.patch;patch=1 \
-	   file://init \
-		"
+	   file://netatalk.conf \
+	   file://init"
+
+inherit autotools update-rc.d
+
 INITSCRIPT_NAME = "atalk"
 INITSCRIPT_PARAMS = "defaults 65"
 
-inherit autotools update-rc.d
+PACKAGES = "${PN}-atalkd ${PN}-pap ${PN}-timelord ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev"
 
-do_configure () {
-	autoreconf
-	ac_cv_header_rpcsvc_rquota_h=no LDFLAGS="-lpthread -L${STAGING_LIBDIR}" ./configure \
-		--build=${BUILD_SYS} \
-		--host=${HOST_SYS} \
-		--target=${TARGET_SYS} \
-		--prefix=${prefix} \
-		--with-bdb=${STAGING_DIR_TARGET}${layout_exec_prefix} \
-		--with-ssl-dir=${STAGING_DIR_TARGET}${layout_exec_prefix} \
-		--without-shadow \
-		--sysconfdir=${sysconfdir} \
-		--disable-nls \
-		--disable-static \
-		--with-pam \
-		--mandir=${mandir}
-	cp ${STAGING_BINDIR_NATIVE}/${TARGET_SYS}-libtool ./${TARGET_SYS}-libtool
-}
+RRECOMMENDS_${PN}-atalkd = "kernel-module-appletalk"
+
+FILES_${PN}-atalkd += "${sysconfdir}/netatalk/atalkd.conf \
+                       /usr/sbin/atalkd"
+FILES_${PN}-pap +=  "/usr/bin/pap \
+                     ${sysconfdir}/netatalk/papd.conf \
+                     /usr/sbin/papd \
+                     /usr/bin/papstatus"
+FILES_${PN}-timelord += "/usr/sbin/timelord"
+FILES_${PN}-dbg += "${sysconfdir}/netatalk/uams/.debug"
+           
+EXTRA_OECONF += "ac_cv_path_KRB5_CONFIG=no \
+                 ac_cv_header_rpcsvc_rquota_h=no \
+                 --with-bdb=${STAGING_DIR_TARGET}${layout_exec_prefix} \
+                 --enable-timelord \
+                 --without-shadow \
+                 --enable-static=no \
+                 --disable-srvloc \
+                 --without-pam \
+                 --with-ssl-dir=${STAGING_DIR_TARGET}${layout_exec_prefix}"
+LDFLAGS += "-lpthread -L${STAGING_LIBDIR}"
 
 do_install_append() {
 	install -D -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/atalk
+	install -D -m 0644 ${WORKDIR}/netatalk.conf ${D}${sysconfdir}/netatalk/netatalk.conf
 }