main/alpine-conf: fix running syslinux trigger from setup-disk

fixes #2250
(cherry picked from commit 562765e842b43133319b1f084f0479ba4843abbe)

Conflicts:
	main/alpine-conf/APKBUILD

2 files changed, 97 insertions, 4 deletions

diff --git a/main/alpine-conf/0001-setup-disk-fix-running-update-extlinux-in-chroot.patch b/main/alpine-conf/0001-setup-disk-fix-running-update-extlinux-in-chroot.patch
new file mode 100644
index 0000000000..d22db9e98d
--- /dev/null
+++ b/main/alpine-conf/0001-setup-disk-fix-running-update-extlinux-in-chroot.patch
@@ -0,0 +1,89 @@
+From c9533d0ea64f29de872e48be67b6eaa10b7e2ca3 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 2 Oct 2013 07:51:33 +0000
+Subject: [PATCH] setup-disk: fix running update-extlinux in chroot
+
+When installling the packages in new root, the update-extlinux trigger
+script will be executed. We make sure this does not fail by:
+ - run extlinux --install before we install packages
+ - mount /dev and /proc for the chroot
+ - temprorary disable grsecurity's chroot_caps
+---
+ setup-disk.in | 39 ++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 34 insertions(+), 5 deletions(-)
+
+diff --git a/setup-disk.in b/setup-disk.in
+index d3a4500..8d3e14d 100644
+--- a/setup-disk.in
++++ b/setup-disk.in
+@@ -160,6 +160,31 @@ find_pvs_in_vg() {
+ 	pvs --noheadings | awk "\$2 == \"$vg\" {print \$1}"
+ }
+ 
++# echo current grsecurity option and set new
++set_grsec() {
++	local key="$1" value="$2"
++	if ! [ -e /proc/sys/kernel/grsecurity/$key ]; then
++		return 0
++	fi
++	cat /proc/sys/kernel/grsecurity/$key
++	echo $value > /proc/sys/kernel/grsecurity/$key
++}
++
++init_chroot_mounts() {
++	local mnt="$1" i=
++	for i in proc dev; do
++		mkdir -p "$mnt"/$i
++		mount --bind /$i "$mnt"/$i
++	done
++}
++
++cleanup_chroot_mounts() {
++	local mnt="$1" i=
++	for i in proc dev; do
++		umount "$mnt"/$i
++	done
++}
++
+ install_mounted_root() {
+ 	local mnt="$1" mnt_boot= boot_fs= root_fs=
+ 	local initfs_features="ata base ide scsi usb virtio"
+@@ -266,15 +291,15 @@ install_mounted_root() {
+ /dev/fd0	/media/floppy	vfat	noauto	0 0
+ /dev/usbdisk	/media/usb	vfat	noauto	0 0
+ EOF
+-
+ 	# remove the installed db in case its there so we force re-install
+ 	rm -f "$mnt"/var/lib/apk/installed "$mnt"/lib/apk/db/installed
+ 	echo "Installing system on $rootdev:"
++	extlinux $extlinux_raidopt --install "$mnt"/boot
++
+ 	# apk reads config from target root so we need to copy the config
+ 	mkdir -p "$mnt"/etc/apk/keys/
+ 	cp /etc/apk/keys/* "$mnt"/etc/apk/keys/
+ 
+-
+ 	local apkflags="--initdb --quiet --progress --update-cache --clean-protected"
+ 	local pkgs=$(cat "$mnt"/etc/apk/world "$mnt"/var/lib/apk/world 2>/dev/null)
+ 	pkgs="$pkgs acct linux-$KERNEL_FLAVOR alpine-base"
+@@ -287,10 +312,14 @@ EOF
+ 		repoflags="$repoflags --repository $i"
+ 	done
+ 	
++	chroot_caps=$(set_grsec chroot_caps 0)
++	init_chroot_mounts "$mnt"
+ 	apk add --root "$mnt" $apkflags --overlay-from-stdin \
+-		$repoflags $pkgs <$ovlfiles>/dev/null || return 1
+-	echo ""
+-	extlinux $extlinux_raidopt --install "$mnt"/boot
++		$repoflags $pkgs <$ovlfiles>/dev/null
++	local ret=$?
++	cleanup_chroot_mounts "$mnt"
++	set_grsec chroot_caps $chroot_caps > /dev/null
++	return $ret
+ }
+ 
+ unmount_partitions() {
+-- 
+1.8.4
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 5e38644303..a76bbba301 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -5,9 +5,10 @@ pkgrel=2
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.bz2
 	0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
 	0001-setup-interfaces-fix-vlan-raw-device.patch
+	0001-setup-disk-fix-running-update-extlinux-in-chroot.patch
 	"
 
 arch="all"
@@ -40,10 +41,13 @@ package() {
 }
 md5sums="4038a3be9a785ead649d913e208e2bd8  alpine-conf-2.12.0.tar.bz2
 1f2ee5791a9bb40bd5e9862f60299ce2  0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
-8e528859d2ea4d24e2de9436c499a64d  0001-setup-interfaces-fix-vlan-raw-device.patch"
+8e528859d2ea4d24e2de9436c499a64d  0001-setup-interfaces-fix-vlan-raw-device.patch
+5f8c8ef78f6ff53e4683a9daacf16355  0001-setup-disk-fix-running-update-extlinux-in-chroot.patch"
 sha256sums="d3f2a2e9a14ff2152731ed97aad9435da4be698b192400dc8dc942fc7830f0c4  alpine-conf-2.12.0.tar.bz2
 4e24ab7e3c0c851af03ea48016aeaa7e066962ceddc96cdc9cdd5566f25b2bfd  0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
-591cb749663bf0c1b0caff12e5e340cb468257409580e56b0dbecf4abba2ed94  0001-setup-interfaces-fix-vlan-raw-device.patch"
+591cb749663bf0c1b0caff12e5e340cb468257409580e56b0dbecf4abba2ed94  0001-setup-interfaces-fix-vlan-raw-device.patch
+3320a82abd79daa893a34cb9a235b27f539af12f8d32806b5630a7cef62d7aa6  0001-setup-disk-fix-running-update-extlinux-in-chroot.patch"
 sha512sums="93cc71a83d9e773b92a9993003c0b8b5ed98b5ee42db74c69cde635ca9230c59be0ce99588828729ec41c1a4262bbe9fdb60a81adf282c3f063ff916666e1140  alpine-conf-2.12.0.tar.bz2
 400b527ada2dff3662a55f6046a9e2ae762e91456574ee3cb665bc2c469e1c0f29b2d9f9c1ea2e4bdf5d02554f20df0a6ebe78b06e957cce17e21233fd08a097  0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
-2cb3c59f9edce7d4ebc821571314af41310ec94a543783ed67c738258434133d70be3cacc9d552e75381036ad014c2a38dec611101ce9d3649e326f120378cdf  0001-setup-interfaces-fix-vlan-raw-device.patch"
+2cb3c59f9edce7d4ebc821571314af41310ec94a543783ed67c738258434133d70be3cacc9d552e75381036ad014c2a38dec611101ce9d3649e326f120378cdf  0001-setup-interfaces-fix-vlan-raw-device.patch
+1dd5132cd0179083cf06c11e1a8513b6e49d1d75f0d14c0f402997641537c29afe3fb709910eb7b9b6ecb17a89fd77224d16dd1478725296f5bacfdcfff240fd  0001-setup-disk-fix-running-update-extlinux-in-chroot.patch"