aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2021-02-11 20:47:46 +0100
committerLeo <thinkabit.ukim@gmail.com>2021-02-14 14:50:28 +0000
commit565cbda96555ead55d8464a9d33df92fda239924 (patch)
tree4a1b7ea8860dc3c56e5b2c0be149329cb66022b3
parent65e0b59d10f19082a59cd5b187c1f6da2b4e92b6 (diff)
community/netatalk: fix state dir
Currently the state dir is: /var/netatalk Now: /var/lib/netatalk Added debian patch to reflect change in docs.
-rw-r--r--community/netatalk/APKBUILD6
-rw-r--r--community/netatalk/statedir.patch57
2 files changed, 61 insertions, 2 deletions
diff --git a/community/netatalk/APKBUILD b/community/netatalk/APKBUILD
index 9daedb4f301..cefcd7ab2d7 100644
--- a/community/netatalk/APKBUILD
+++ b/community/netatalk/APKBUILD
@@ -13,6 +13,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc"
source="https://downloads.sourceforge.net/netatalk/netatalk-$pkgver.tar.gz
netatalk.initd
gcc-10.patch
+ statedir.patch
"
# secfixes:
@@ -29,7 +30,7 @@ build() {
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --localstatedir=/var \
+ --localstatedir=/var/lib \
--disable-static \
--disable-silent-rules \
--disable-zeroconf \
@@ -70,4 +71,5 @@ package() {
sha512sums="ec4e4855628526742ad4bc2a25a0b2acac6fc20146a859b61d220f9f7786b006bd9af5ddc8505ca234913190f8d46649fbe8653eb8b5a0a1580a2bd56e5c09dc netatalk-3.1.12.tar.gz
c4dc6b1967f4b86ee2f1cfc480edab5467fb1f67fd0cbbed23c8454568d0aaceeedaa23db90f8ca5b47f24d346f72d5e12307557edfeeefcbee003f85c56cced netatalk.initd
-349ad76cc6a1f859a1925ab5a2363a27aac155f057e8ef0477c7646d21f8ffbbf8167feb74ff704bb37ae6d881d2d3b12639e750df76a0f3ffeb54bbeecc5c06 gcc-10.patch"
+349ad76cc6a1f859a1925ab5a2363a27aac155f057e8ef0477c7646d21f8ffbbf8167feb74ff704bb37ae6d881d2d3b12639e750df76a0f3ffeb54bbeecc5c06 gcc-10.patch
+d3914c91c3c58db6e79b6ff82e65d66f73df8556ab28ceb544a0b476f1b4b88fb05247ac27944ce3d57a911f447bdd9f39278b2e920a7028a1437081540156f8 statedir.patch"
diff --git a/community/netatalk/statedir.patch b/community/netatalk/statedir.patch
new file mode 100644
index 00000000000..0fe83a88f46
--- /dev/null
+++ b/community/netatalk/statedir.patch
@@ -0,0 +1,57 @@
+Description: Fix use FHS-compatible state dir /var/lib/netatalk
+Author: Jonas Smedegaard <dr@jones.dk>
+Forwarded: no
+Last-Update: 2019-02-15
+
+Modified for Alpine
+
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/manual/configuration.xml
++++ b/doc/manual/configuration.xml
+@@ -173,7 +173,7 @@
+ database storing ID &lt;-&gt; name mappings.</para>
+
+ <para>The CNID Databases are by default located in
+- <filename>/var/netatalk/CNID</filename>.</para>
++ <filename>/var/lib/netatalk/CNID</filename>.</para>
+
+ <para>There is a command line utility called <command>dbd</command>
+ available which can be used to verify, repair and rebuild the CNID
+@@ -1589,9 +1589,9 @@
+ the base directory Netatalk in installed to):<screen>$ su
+ # cat .tracker_profile
+ PREFIX="/"
+-export XDG_DATA_HOME="$PREFIX/var/netatalk/"
+-export XDG_CACHE_HOME="$PREFIX/var/netatalk/"
+-export DBUS_SESSION_BUS_ADDRESS="unix:path=$PREFIX/var/netatalk/spotlight.ipc"
++export XDG_DATA_HOME="$PREFIX/var/lib/netatalk/"
++export XDG_CACHE_HOME="$PREFIX/var/lib/netatalk/"
++export DBUS_SESSION_BUS_ADDRESS="unix:path=$PREFIX/var/lib/netatalk/spotlight.ipc"
+ # . .tracker_profile
+ #
+ </screen></para>
+--- a/doc/manual/upgrade.xml
++++ b/doc/manual/upgrade.xml
+@@ -137,8 +137,8 @@
+
+ <listitem>
+ <para>The CNID databases are now stored under
+- <filename>/var/netatalk/CNID/</filename>
+- by default. You can use configure --localstatedir=PATH at
++ <filename>/var/lib/netatalk/CNID/</filename>
++ on Alpine systems. You can use configure --localstatedir=PATH at
+ compile time to change the location.</para>
+ </listitem>
+
+@@ -183,8 +183,8 @@
+
+ <listitem>
+ <para>Move <filename>afp_voluuid.conf</filename> and
+- <filename>afp_signature.conf</filename> to the localstate directory (default
+- <filename>/var/netatalk/</filename>), you can use <command>afpd -v</command>
++ <filename>afp_signature.conf</filename> to the localstate directory (Debian uses
++ <filename>/var/lib/netatalk/</filename>), you can use <command>afpd -v</command>
+ in order to find the correct path</para>
+ </listitem>
+