From 9d33466d3837e0eda49a597a1a7345b8c97829d3 Mon Sep 17 00:00:00 2001 From: Olivier Mauras Date: Mon, 4 Jun 2018 22:32:02 +0000 Subject: [PATCH 1/2] 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 00000000000..54b8e2dff6e --- /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 9e36b69173f..b9515d35230 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 From 138807f71c536217ee87e9b34f1dd4ae6a84680f Mon Sep 17 00:00:00 2001 From: David Flatz Date: Wed, 30 May 2018 18:42:59 +0200 Subject: [PATCH 2/2] linux4.16: update to 4.16.15. [skip ci] --- srcpkgs/linux4.16/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.16/template b/srcpkgs/linux4.16/template index 1ea99c6ff5b..a316825407f 100644 --- a/srcpkgs/linux4.16/template +++ b/srcpkgs/linux4.16/template @@ -1,6 +1,6 @@ # Template file for 'linux4.16' pkgname=linux4.16 -version=4.16.12 +version=4.16.14 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=567078358d5a3490d1410696f36f36f5e88f98bef9f4d3c0d68c605aeb71111d +checksum=b708b6fd755df7d3f954ca9542e59d0070488b29653071ae4b13fb76b995dfc0 nodebug=yes # -dbg package is generated below manually nostrip=yes