diff options
3 files changed, 6 insertions, 68 deletions
diff --git a/main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch b/main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch deleted file mode 100644 index 976f64bb17..0000000000 --- a/main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ab68d58344a5e5421a52dccace155b5a42be4f14 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 21 Dec 2012 15:29:06 +0100 -Subject: [PATCH] setup-interfaces: fix ip: can't find device 'eth1.3' message - -ref #1404 ---- - setup-interfaces.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/setup-interfaces.in b/setup-interfaces.in -index c4ffa47..263beec 100755 ---- a/setup-interfaces.in -+++ b/setup-interfaces.in -@@ -73,7 +73,9 @@ get_default_mask() { - } - - get_default_gateway() { -- ip route show dev $1 | awk '/^default/ {print $3}' -+ if iface_exists $1; then -+ ip route show dev $1 | awk '/^default/ {print $3}' -+ fi - } - - ipaddr_help() { --- -1.8.0.2 - diff --git a/main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch b/main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch deleted file mode 100644 index 39298c4f51..0000000000 --- a/main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8201bedeef8250452bdcdf5db0699c12b7ff7066 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 1 Mar 2013 10:54:12 +0000 -Subject: [PATCH] setup-interfaces: fix vlan-raw-device - -ref #1624 ---- - setup-interfaces.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup-interfaces.in b/setup-interfaces.in -index 263beec..54d861a 100755 ---- a/setup-interfaces.in -+++ b/setup-interfaces.in -@@ -426,7 +426,7 @@ prompt_for_interfaces() { - echo -e "\tbond-slaves $bond_slaves" >> interfaces - fi - if [ -n "$raw_device" ]; then -- echo -e "\traw-device $raw_device" >> interfaces -+ echo -e "\tvlan-raw-device $raw_device" >> interfaces - fi - case "$iface" in - *.[0-9]*|vlan[0-9]*) PKGS="$PKGS vlan";; --- -1.8.1.4 - diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 5e38644303..af976469c8 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,13 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=2.12.0 -pkgrel=2 +pkgver=2.13.0 +pkgrel=0 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 - 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch - 0001-setup-interfaces-fix-vlan-raw-device.patch +source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz " arch="all" @@ -38,12 +36,6 @@ package() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -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" -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" -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" +md5sums="29907dff864b4545e1fb5f49e08629bc alpine-conf-2.13.0.tar.xz" +sha256sums="907c83a8fa1027e017fc84c7ff4bea62a41e7dcd2acd3ed7fa97ee1afc8a81ad alpine-conf-2.13.0.tar.xz" +sha512sums="fb083d154cedbd9dfa5a2ab044e7ee29ecc58dfefe80bd3c1ca9eac9d080deece561cddea996278d7db42aae44fac4b00f19d32a23ec996fbf6a6c76b78b0e85 alpine-conf-2.13.0.tar.xz" |