From 9d33466d3837e0eda49a597a1a7345b8c97829d3 Mon Sep 17 00:00:00 2001
From: Olivier Mauras <olivier@mauras.ch>
Date: Mon, 4 Jun 2018 22:32:02 +0000
Subject: [PATCH] runit-void: Fix incorrect path for /etc/default/apparmor

---
 srcpkgs/runit-void/files/{rc.apparmor => apparmor} |  0
 srcpkgs/runit-void/runit-void-apparmor.INSTALL     | 13 +++++++++++++
 srcpkgs/runit-void/template                        |  5 +++--
 3 files changed, 16 insertions(+), 2 deletions(-)
 rename srcpkgs/runit-void/files/{rc.apparmor => apparmor} (100%)
 create mode 100644 srcpkgs/runit-void/runit-void-apparmor.INSTALL

diff --git a/srcpkgs/runit-void/files/rc.apparmor b/srcpkgs/runit-void/files/apparmor
similarity index 100%
rename from srcpkgs/runit-void/files/rc.apparmor
rename to srcpkgs/runit-void/files/apparmor
diff --git a/srcpkgs/runit-void/runit-void-apparmor.INSTALL b/srcpkgs/runit-void/runit-void-apparmor.INSTALL
new file mode 100644
index 0000000000..54b8e2dff6
--- /dev/null
+++ b/srcpkgs/runit-void/runit-void-apparmor.INSTALL
@@ -0,0 +1,13 @@
+case "$ACTION" in
+pre)
+  # Fix incorrect path in /etc/default
+  if [ -e /etc/default/apparmor/rc.apparmor ]; then
+    mv /etc/default/apparmor/rc.apparmor /etc/default/rc.apparmor
+    rm -rf /etc/default/apparmor
+    mv /etc/default/rc.apparmor /etc/default/apparmor
+  fi
+  if [ -d /etc/default/apparmor ]; then
+    rm -rf /etc/default/apparmor
+  fi
+	;;
+esac
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 9e36b69173..b9515d3523 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20171102
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="http://www.voidlinux.eu"
@@ -32,7 +32,7 @@ post_install() {
 	vconf ${FILESDIR}/hostname
 	vconf ${FILESDIR}/os-release
 	vconf ${FILESDIR}/locale.conf
-	vinstall ${FILESDIR}/rc.apparmor 644 /etc/default/apparmor
+	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
 	# Enable services at post-install time instead.
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
@@ -44,6 +44,7 @@ post_install() {
 runit-void-apparmor_package() {
 	short_desc+=" - AppArmor initialization"
 	depends="${sourcepkg}-${version}_${revision}"
+	conf_files="/etc/default/apparmor"
 	pkg_install() {
 		vmove etc/default/apparmor
 		vmove etc/runit/core-services/09-apparmor.sh