X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mail.alpinelinux.org (Postfix) with SMTP id 2134DDC0140 for ; Sun, 28 Oct 2012 21:16:11 +0000 (UTC) Received: (qmail invoked by alias); 28 Oct 2012 21:16:09 -0000 Received: from orgasmatron.0x539.eu (EHLO alpine-master.my.domain) [5.9.30.99] by mail.gmx.net (mp019) with SMTP; 28 Oct 2012 22:16:09 +0100 X-Authenticated: #23809366 X-Provags-ID: V01U2FsdGVkX1/Mgy0pDBDMh8klcYDjbGxvNVAvBi9hbKL90rJcEn XeLhjiz6yTltY6 From: Oliver Loch To: alpine-devel@lists.alpinelinux.org Cc: Oliver Loch Subject: [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. Date: Sun, 28 Oct 2012 22:16:03 +0100 Message-Id: <1351458963-1975-1-git-send-email-grimeton@gmx.net> X-Mailer: git-send-email 1.8.0 X-Y-GMX-Trusted: 0 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- 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 ---