Some settings changed, and fixed the paths netatalk uses to find it's deamons. Also added additional auth modules and fixed the dependency list. v1 PROPOSED

Oliver Loch: 1
 Some settings changed, and fixed the paths netatalk uses to find it's deamons. Also added additional auth modules and fixed the dependency list.

 1 files changed, 11 insertions(+), 10 deletions(-)

[alpine-devel] [PATCH] Some settings changed, and fixed the paths netatalk uses to find it's deamons. Also added additional auth modules and fixed the dependency list. Export this patch

---
 main/netatalk/APKBUILD | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/main/netatalk/APKBUILD b/main/netatalk/APKBUILD
index 6c160a9..31c4eaf 100644
--- a/main/netatalk/APKBUILD
+++ b/main/netatalk/APKBUILD
@@ -7,8 +7,8 @@ pkgdesc="High performance, super stable AFP Fileserver for Macintosh Computers"
 url="http://netatalk.sourceforge.net"
 arch="all"
 license="GPL2"
-depends="dbus libintl libattr readline sqlite-libs dbus-libs avahi-libs avahi libsasl libevent libgssglue heimdal"
-depends_dev="libiconv-dev db-dev dbus-dev readline-dev avahi-dev libdaemon-dev libevent-dev libgssglue-dev heimdal-dev $depends"
+depends="dbus libintl libattr readline sqlite-libs dbus-libs avahi-libs avahi libsasl libevent libgssglue heimdal libgpg-error libgcrypt"
+depends_dev="libiconv-dev db-dev dbus-dev readline-dev avahi-dev libdaemon-dev libevent-dev libgssglue-dev heimdal-dev libgpg-error-dev libgcrypt-dev $depends"
 makedepends="$depends_dev"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-dev $pkgname-doc"
@@ -36,8 +36,6 @@ build() {
 	cd "$_builddir"
 	./configure \
 	--prefix=/usr \
-	--bindir=/usr/bin \
-	--sbindir=/usr/sbin \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--mandir=/usr/share/man \
@@ -47,7 +45,6 @@ build() {
 	--enable-krbV-uam \
 	--enable-overwrite \
 	--disable-bundled-libevent \
-	--enable-fhs \
 	--with-pam=no \
 	--with-kerberos \
 	--with-libevent-header=/usr/include/ \
@@ -59,12 +56,16 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	[ ! -d "$pkgdir/usr/" ] && mkdir "$pkgdir/usr/"
-	[ ! -d "$pkgdir/etc/netatalk/" ] && mkdir "$pkgdir/etc/netatalk/"
-	[ -d "$pkgdir/sbin/" ] && mv "$pkgdir/sbin/" "$pkgdir/usr/sbin/"
-	[ -d "$pkgdir/bin/" ] && mv "$pkgdir/bin/" "$pkgdir/usr/bin/"
-	[ -d "$pkgdir/lib/" ] && mv "$pkgdir/lib/" "$pkgdir/usr/lib/"
 	[ -f "$pkgdir/etc/afp.conf" ] && mv "$pkgdir/etc/afp.conf" "$pkgdir/etc/netatalk/afp.conf"	
+	[ -h "$pkgdir/usr/lib/netatalk/uams_clrtxt.so" ] && rm "$pkgdir/usr/lib/netatalk/uams_clrtxt.so"
+	[ -h "$pkgdir/usr/lib/netatalk/uams_dhx.so" ] && rm "$pkgdir/usr/lib/netatalk/uams_dhx.so"
+	[ -h "$pkgdir/usr/lib/netatalk/uams_dhx2.so" ] && rm "$pkgdir/usr/lib/netatalk/uams_dhx2.so"
+	_olddir="$(pwd)"
+	cd "$pkgdir/usr/lib/netatalk/"
+	ln -s uams_dhx2_passwd.so uams_dhx2.so
+	ln -s uams_dhx_passwd.so uams_dhx.so
+	ln -s uams_passwd.so uams_clrtxt.so
+	cd "$_olddir"
 
 	install -m755 -D "$srcdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname || return 1
-- 
1.8.0



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---