main/alpine-conf: upgrade to 3.4.1

5 files changed, 5 insertions, 187 deletions

diff --git a/main/alpine-conf/0001-setup-alpine-fix-openrc-warning.patch b/main/alpine-conf/0001-setup-alpine-fix-openrc-warning.patch
deleted file mode 100644
index 1ec1453934..0000000000
--- a/main/alpine-conf/0001-setup-alpine-fix-openrc-warning.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b709cfbbbf86ecfa74a674349ed0f9b5c04cbd46 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 13 Jun 2016 12:23:54 +0000
-Subject: [PATCH] setup-alpine: fix openrc warning
-
----
- setup-alpine.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/setup-alpine.in b/setup-alpine.in
-index 050016c..c120c99 100644
---- a/setup-alpine.in
-+++ b/setup-alpine.in
-@@ -48,7 +48,7 @@ while getopts "af:c:hq" opt ; do
- done
- shift `expr $OPTIND - 1`
- 
--rc_sys=$(rc --sys)
-+rc_sys=$(openrc --sys)
- # mount xenfs so we can detect xen dom0
- if [ "$rc_sys" = "XENU" ] && ! grep -q '^xenfs' /proc/mounts; then
- 	modprobe xenfs
-@@ -156,8 +156,8 @@ done
- /etc/init.d/hostname --quiet restart
- 
- # start up the services
--rc boot
--rc default
-+openrc boot
-+openrc default
- 
- # update /etc/hosts - after we have got dhcp address
- # Get default fully qualified domain name from *first* domain
--- 
-2.8.4
-
diff --git a/main/alpine-conf/0001-setup-disk-don-t-install-syslinux-for-data-only.patch b/main/alpine-conf/0001-setup-disk-don-t-install-syslinux-for-data-only.patch
deleted file mode 100644
index 963e803b68..0000000000
--- a/main/alpine-conf/0001-setup-disk-don-t-install-syslinux-for-data-only.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0dd1f10889920ec8a63f6072601786c0acc9a249 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 20 May 2016 09:55:42 +0000
-Subject: [PATCH] setup-disk: don't install syslinux for data-only
-
----
- setup-disk.in | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index ad0bdb7..0df6d96 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -458,7 +458,7 @@ init_progs() {
- 		btrfs) fstools="$fstools btrfs-progs";;
- 		esac
- 	done
--	apk add --quiet sfdisk $lvmpkg $raidpkg syslinux $fstools $@
-+	apk add --quiet sfdisk $lvmpkg $raidpkg $fstools $@
- }
- 
- show_disk_info() {
-@@ -505,7 +505,9 @@ setup_partitions() {
- 	echo "w" | fdisk $diskdev >/dev/null
- 
- 	# fix the MBR while here so extlinux can boot
--	cat "$MBR" > $diskdev
-+	if [ -f "$MBR" ]; then
-+		cat "$MBR" > $diskdev
-+	fi
- 
- 	local start=1M
- 	local line=
-@@ -771,7 +773,7 @@ native_disk_install_lvm() {
- 	local lvm_size=
- 	local root_dev=/dev/$vgname/lv_root
- 
--	init_progs || return 1
-+	init_progs syslinux || return 1
- 	confirm_erase $@ || return 1
- 
- 	if [ -n "$USE_RAID" ]; then
-@@ -802,7 +804,7 @@ native_disk_install() {
- 	local root_size=
- 	local root_dev= boot_dev= swap_dev=
- 
--	init_progs || return 1
-+	init_progs syslinux || return 1
- 	confirm_erase $@ || return 1
- 
- 	if [ -n "$USE_RAID" ]; then
--- 
-2.8.2
-
diff --git a/main/alpine-conf/0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch b/main/alpine-conf/0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch
deleted file mode 100644
index 412a3a1728..0000000000
--- a/main/alpine-conf/0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cf023ac1ffecfdcc1997ee7b8e57cacdde62870e Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 13 Jun 2016 13:34:02 +0000
-Subject: [PATCH] setup-disk: only restart syslog if its already running
-
-ref #5719
----
- setup-disk.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 0df6d96..3ab35cd 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -661,7 +661,7 @@ setup_var() {
- 	mv /.var/* /var/
- 	rmdir /.var
- 
--	/etc/init.d/syslog --quiet restart
-+	service syslog --quiet condrestart
- 	setup_mdadm_conf
- }
- 
--- 
-2.8.4
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 53441df136..a2296822dc 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,16 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=3.4.0
-pkgrel=3
+pkgver=3.4.1
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 arch="all"
 license="MIT"
 depends="openrc>0.13"
 source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
-	0001-setup-disk-don-t-install-syslinux-for-data-only.patch
-	0001-setup-alpine-fix-openrc-warning.patch
-	0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -27,15 +24,6 @@ package() {
 	done
 }
 
-md5sums="4bea789ad26d94e9df8684fa8f01cbee  alpine-conf-3.4.0.tar.xz
-aee178615c62bd51a468415b20ade309  0001-setup-disk-don-t-install-syslinux-for-data-only.patch
-393cb82aac7004fb887cb84ea0a1cae6  0001-setup-alpine-fix-openrc-warning.patch
-b3d2c995c98c287522d8ea2b304bd920  0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch"
-sha256sums="4f66c10aa7834f60ce5697487d6d8c47780bc954aa443976d957b4e8bbbfa61e  alpine-conf-3.4.0.tar.xz
-23c0e2c18cbb1c374d966cdf645ed74ea9ba59e7f1b98fe0e9696d79dfeb2d2f  0001-setup-disk-don-t-install-syslinux-for-data-only.patch
-52e62958a4ddd5828387003a497a0bc1fb93e3b9fbf14c78be30fcb50d704c3e  0001-setup-alpine-fix-openrc-warning.patch
-8c42769e7644981b635496b8f5e8f217cb95a2a9b8798d3ead65ac88581b7d8e  0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch"
-sha512sums="c652dfc0660f7483a10342cd2f374ec60b4329448476fad5bc93b5b31501529e08062d25248b5f4792643252b18cacb430273c08a3e0b7b901104f414733cb75  alpine-conf-3.4.0.tar.xz
-408d6590030432c5173266db6038471f697578091954a2accc2f4778fad3b56484eb7caf40d566f1fb7a8a6db1f57a35ac4c0f5faec53604fb2852aa2dd13497  0001-setup-disk-don-t-install-syslinux-for-data-only.patch
-76129a435374a490480b5686d7577e19a9d3b088091104c30efe1aae3ff57b38c592fe11c9a6feaa66c9c9fab5ec7fa89f94e44810150e87b42c8594eea9e5d0  0001-setup-alpine-fix-openrc-warning.patch
-d5867474db27b5da460902f6affb21cdbc626b702b1f6c222aa1c3b3e42bc1a1341cc3b5824fc2966ab6b10630363ed808e0043fbbb02bca2264658f8207ae06  0001-setup-disk-only-restart-syslog-if-its-already-runnin.patch"
+md5sums="c599b27ef9754e61cbd6726b9239fa59  alpine-conf-3.4.1.tar.xz"
+sha256sums="92c5cbb8078c2ee8ed9e9e749acb40f6cd69a3fbb5e49429abeff2282228f697  alpine-conf-3.4.1.tar.xz"
+sha512sums="eda1640e146727edf35713039143f6db4bb485ad34236f21a837f80f09bc27b38cae3e854310eb3a4d8b937766f3e8aab0cf887849bbf385f7f511d24e19cb30  alpine-conf-3.4.1.tar.xz"
diff --git a/main/alpine-conf/git.patch b/main/alpine-conf/git.patch
deleted file mode 100644
index 963e803b68..0000000000
--- a/main/alpine-conf/git.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0dd1f10889920ec8a63f6072601786c0acc9a249 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 20 May 2016 09:55:42 +0000
-Subject: [PATCH] setup-disk: don't install syslinux for data-only
-
----
- setup-disk.in | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index ad0bdb7..0df6d96 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -458,7 +458,7 @@ init_progs() {
- 		btrfs) fstools="$fstools btrfs-progs";;
- 		esac
- 	done
--	apk add --quiet sfdisk $lvmpkg $raidpkg syslinux $fstools $@
-+	apk add --quiet sfdisk $lvmpkg $raidpkg $fstools $@
- }
- 
- show_disk_info() {
-@@ -505,7 +505,9 @@ setup_partitions() {
- 	echo "w" | fdisk $diskdev >/dev/null
- 
- 	# fix the MBR while here so extlinux can boot
--	cat "$MBR" > $diskdev
-+	if [ -f "$MBR" ]; then
-+		cat "$MBR" > $diskdev
-+	fi
- 
- 	local start=1M
- 	local line=
-@@ -771,7 +773,7 @@ native_disk_install_lvm() {
- 	local lvm_size=
- 	local root_dev=/dev/$vgname/lv_root
- 
--	init_progs || return 1
-+	init_progs syslinux || return 1
- 	confirm_erase $@ || return 1
- 
- 	if [ -n "$USE_RAID" ]; then
-@@ -802,7 +804,7 @@ native_disk_install() {
- 	local root_size=
- 	local root_dev= boot_dev= swap_dev=
- 
--	init_progs || return 1
-+	init_progs syslinux || return 1
- 	confirm_erase $@ || return 1
- 
- 	if [ -n "$USE_RAID" ]; then
--- 
-2.8.2
-