sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d14b40c27bb48b5fb74cc79a4d0ff29bc4effe8e)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d14b40c27bb48b5fb74cc79a4d0ff29bc4effe8e)
- Date: Tue, 27 Sep 2016 00:46:06 +0000
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
net/ifupdown/0001-do-not-use-dpkg-architecture.patch | 7 --
net/ifupdown/0002-sbin-ip.patch | 65
+++++++++++--------
net/ifupdown/DETAILS | 8 --
net/ifupdown/HISTORY | 5 +
utils/run-parts/DETAILS | 6 -
utils/run-parts/HISTORY | 3
6 files changed, 55 insertions(+), 39 deletions(-)
New commits:
commit d14b40c27bb48b5fb74cc79a4d0ff29bc4effe8e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ifupdown: => 0.8.16
commit 7f3a7117f574247ae87a9859f5913949491180f6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
run-parts: => 4.8
diff --git a/net/ifupdown/0001-do-not-use-dpkg-architecture.patch
b/net/ifupdown/0001-do-not-use-dpkg-architecture.patch
index 3533ce9..a8e8cd0 100644
--- a/net/ifupdown/0001-do-not-use-dpkg-architecture.patch
+++ b/net/ifupdown/0001-do-not-use-dpkg-architecture.patch
@@ -1,13 +1,12 @@
-diff -Naur ifupdown.orig/Makefile ifupdown/Makefile
---- ifupdown.orig/Makefile 2015-12-11 11:56:06.000000000 -0800
-+++ ifupdown/Makefile 2016-03-08 13:45:59.561777694 -0800
+--- ifupdown/Makefile.orig 2016-09-26 20:25:32.050091106 -0400
++++ ifupdown/Makefile 2016-09-26 20:27:58.532721317 -0400
@@ -46,7 +46,7 @@
ifquery: ifup
ln -sf ifup ifquery
-ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ARCH := 'linux'
- check:
+ check: ifup ifdown
@echo running ./tests/testbuild-$(ARCH)
@if ! exec ./tests/testbuild-$(ARCH); then \
diff -Naur ifupdown.orig/defn2c.pl ifupdown/defn2c.pl
diff --git a/net/ifupdown/0002-sbin-ip.patch b/net/ifupdown/0002-sbin-ip.patch
index f7a40b4..019ddba 100644
--- a/net/ifupdown/0002-sbin-ip.patch
+++ b/net/ifupdown/0002-sbin-ip.patch
@@ -1,6 +1,5 @@
-diff -Naur ifupdown.orig/inet.defn ifupdown/inet.defn
---- ifupdown.orig/inet.defn 2016-04-20 05:57:37.000000000 -0700
-+++ ifupdown/inet.defn 2016-06-01 13:19:31.682554276 -0700
+--- ifupdown/inet.defn.orig 2016-04-20 08:57:37.000000000 -0400
++++ ifupdown/inet.defn 2016-09-26 20:35:06.011280480 -0400
@@ -6,10 +6,10 @@
This method may be used to define the IPv4 loopback interface.
@@ -101,19 +100,21 @@ diff -Naur ifupdown.orig/inet.defn ifupdown/inet.defn
method ppp
description
-diff -Naur ifupdown.orig/inet6.defn ifupdown/inet6.defn
---- ifupdown.orig/inet6.defn 2016-05-19 03:05:34.000000000 -0700
-+++ ifupdown/inet6.defn 2016-06-01 13:19:31.682554276 -0700
-@@ -25,7 +25,7 @@
+--- ifupdown/inet6.defn.orig 2016-09-17 05:19:54.000000000 -0400
++++ ifupdown/inet6.defn 2016-09-26 20:35:06.016280533 -0400
+@@ -25,9 +25,9 @@
-[[/sbin/sysctl -q -e -w
net.ipv6.conf.%iface/.//%.use_tempaddr=%privext%]]
-/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.accept_ra=%accept_ra%
-/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.autoconf=1
+- /bin/ip addr flush dev %iface% mngtmpaddr \
++ /sbin/ip addr flush dev %iface% mngtmpaddr \
+ if (var_set("accept_ra", ifd) && !var_true("accept_ra", ifd))
- /bin/ip link set dev %iface% up
+ /sbin/ip link set dev %iface% up
/lib/ifupdown/wait-for-ll6.sh if (var_true("dhcp", ifd) &&
execable("/lib/ifupdown/wait-for-ll6.sh"))
/sbin/dhclient -6 -P -pf /run/dhclient6.%iface%.pid -lf
/var/lib/dhcp/dhclient6.%iface%.leases -I -df
/var/lib/dhcp/dhclient.%iface%.leases %iface% \
if (var_true("dhcp", ifd) && execable("/sbin/dhclient") &&
var_true("request_prefix", ifd))
-@@ -35,19 +35,19 @@
+@@ -37,19 +37,19 @@
elsif (var_true("dhcp", ifd))
down
@@ -139,10 +140,13 @@ diff -Naur ifupdown.orig/inet6.defn ifupdown/inet6.defn
method static
description
-@@ -85,18 +85,18 @@
+@@ -87,20 +87,20 @@
-[[/sbin/sysctl -q -e -w
net.ipv6.conf.%iface/.//%.accept_ra=%accept_ra%]]
-[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.autoconf=%autoconf%]]
-[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.mtu=%mtu%]]
+- /bin/ip addr flush dev %iface% mngtmpaddr \
++ /sbin/ip addr flush dev %iface% mngtmpaddr \
+ if (var_set("accept_ra", ifd) && !var_true("accept_ra", ifd))
- /bin/ip link set dev %iface% [[address %hwaddress%]] up
- /bin/ip -6 addr add %address%[[/%netmask%]] [[scope %scope%]] dev
%iface% [[preferred_lft %preferred-lifetime%]] \
+ /sbin/ip link set dev %iface% [[address %hwaddress%]] up
@@ -165,7 +169,7 @@ diff -Naur ifupdown.orig/inet6.defn ifupdown/inet6.defn
if (iface_is_link())
method manual
-@@ -114,11 +114,11 @@
+@@ -118,11 +118,11 @@
up
-[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.mtu=%mtu%]]
@@ -180,16 +184,19 @@ diff -Naur ifupdown.orig/inet6.defn ifupdown/inet6.defn
if (iface_is_link() || !do_all)
method dhcp
-@@ -142,7 +142,7 @@
+@@ -146,9 +146,9 @@
/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
-[[/sbin/sysctl -q -e -w
net.ipv6.conf.%iface/.//%.accept_ra=%accept_ra%]]
-[[/sbin/sysctl -q -e -w net.ipv6.conf.%iface/.//%.autoconf=%autoconf%]]
+- /bin/ip addr flush dev %iface% mngtmpaddr \
++ /sbin/ip addr flush dev %iface% mngtmpaddr \
+ if (var_set("accept_ra", ifd) && !var_true("accept_ra", ifd))
- /bin/ip link set dev %iface% [[address %hwaddress%]] up
+ /sbin/ip link set dev %iface% [[address %hwaddress%]] up
/lib/ifupdown/wait-for-ll6.sh if
(execable("/lib/ifupdown/wait-for-ll6.sh"))
/sbin/dhclient -6 -pf /run/dhclient6.%iface%.pid -lf
/var/lib/dhcp/dhclient6.%iface%.leases -I -P -N -df
/var/lib/dhcp/dhclient.%iface%.leases %iface% \
if (execable("/sbin/dhclient") && var_true("request_prefix", ifd))
-@@ -157,7 +157,7 @@
+@@ -163,7 +163,7 @@
echo 'No DHCPv6 client software found!' >/dev/stderr; false \
elsif (1)
@@ -198,7 +205,7 @@ diff -Naur ifupdown.orig/inet6.defn ifupdown/inet6.defn
if (iface_is_link())
method v4tunnel
-@@ -183,15 +183,15 @@
+@@ -189,15 +189,15 @@
up
/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
@@ -220,7 +227,7 @@ diff -Naur ifupdown.orig/inet6.defn ifupdown/inet6.defn
method 6to4
description
-@@ -212,16 +212,16 @@
+@@ -218,16 +218,16 @@
up
/sbin/modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
@@ -244,17 +251,17 @@ diff -Naur ifupdown.orig/inet6.defn ifupdown/inet6.defn
architecture kfreebsd
-diff -Naur ifupdown.orig/link.defn ifupdown/link.defn
---- ifupdown.orig/link.defn 2016-04-21 08:35:56.000000000 -0700
-+++ ifupdown/link.defn 2016-06-01 13:19:31.682554276 -0700
-@@ -16,15 +16,15 @@
- if test -d /sys/class/net/%link% -a \
- ! -d /sys/class/net/%iface0% ; \
- then \
-- /bin/ip link set up dev %link%; \
-- /bin/ip link add link %link% name %iface0% type vlan id %vlan_id%; \
-+ /sbin/ip link set up dev %link%; \
-+ /sbin/ip link add link %link% name %iface0% type vlan id %vlan_id%;
\
+--- ifupdown/link.defn.orig 2016-09-22 05:19:23.000000000 -0400
++++ ifupdown/link.defn 2016-09-26 20:35:06.017280543 -0400
+@@ -19,20 +19,20 @@
+ if test -d /sys/class/net/%link%/device/infiniband; then \
+ echo 0x%vlan_id1% > /sys/class/net/%link%/create_child; \
+ else \
+- /bin/ip link set up dev %link%; \
+- /bin/ip link add link %link% name %iface0% type vlan id
%vlan_id%; \
++ /sbin/ip link set up dev %link%; \
++ /sbin/ip link add link %link% name %iface0% type vlan id
%vlan_id%; \
+ fi; \
fi if (iface_has(".") && (!var_set_anywhere("bridge_ports", ifd)))
- -/bin/ip link set up dev %iface% 2>/dev/null \
+ -/sbin/ip link set up dev %iface% 2>/dev/null \
@@ -262,9 +269,13 @@ diff -Naur ifupdown.orig/link.defn ifupdown/link.defn
- [[/bin/ip link set %iface0% alias "%description%"]]
+ [[/sbin/ip link set %iface0% alias "%description%"]]
down
-- /bin/ip link del %iface% if (iface_has(".") && (!iface_has(":")) &&
(!var_set_anywhere("bridge_ports", ifd)))
+ if test -d /sys/class/net/%link%/device/infiniband; then \
+ echo 0x%vlan_id1% > /sys/class/net/%link%/delete_child; \
+ else \
+- /bin/ip link del %iface%; \
++ /sbin/ip link del %iface%; \
+ fi if (iface_has(".") && (!iface_has(":")) &&
(!var_set_anywhere("bridge_ports", ifd)))
- -/bin/ip link set down dev %iface% 2>/dev/null \
-+ /sbin/ip link del %iface% if (iface_has(".") && (!iface_has(":")) &&
(!var_set_anywhere("bridge_ports", ifd)))
+ -/sbin/ip link set down dev %iface% 2>/dev/null \
if (iface_is_lo())
[[-test -n "%description%" && /bin/echo >
/sys/class/net/%iface0%/ifalias]]
diff --git a/net/ifupdown/DETAILS b/net/ifupdown/DETAILS
index 1e3384a..ff67ed2 100755
--- a/net/ifupdown/DETAILS
+++ b/net/ifupdown/DETAILS
@@ -1,12 +1,10 @@
SPELL=ifupdown
- VERSION=0.8.13
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:1c85a9a55616a4310b122ba45429bd1b61f3da5da30291ed828791d2483bb53b34f87718b76625f8698aec60ff4e60be6346cd6ed38fb69e4853ccba381ff0fd
+ VERSION=0.8.16
SOURCE=${SPELL}_$VERSION.tar.xz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=http://http.debian.net/debian/pool/main/i/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:817d5f98325aed78cfa2f688d090ce8dc658dd0157594b9eb8e8f5de3152af8c87308df4b95e45234bef86a1c02f1cf937dc7ca1de5f164eebe0b39674456fad
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
LICENSE[0]=GPL
- PATCHLEVEL=2
WEB_SITE=https://packages.debian.org/source/sid/ifupdown
ENTERED=20080123
KEYWORDS="tools net"
diff --git a/net/ifupdown/HISTORY b/net/ifupdown/HISTORY
index 14eafec..176661c 100644
--- a/net/ifupdown/HISTORY
+++ b/net/ifupdown/HISTORY
@@ -1,3 +1,8 @@
+2016-09-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.16
+ * 0001-do-not-use-dpkg-architecture.patch: updated
+ * 0002-sbin-ip.patch: regenerated
+
2016-09-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* INSTALL: install dummy files as another protection measure against
diff --git a/utils/run-parts/DETAILS b/utils/run-parts/DETAILS
index 863d2ed..c94a701 100755
--- a/utils/run-parts/DETAILS
+++ b/utils/run-parts/DETAILS
@@ -1,9 +1,9 @@
SPELL=run-parts
- VERSION=4.7
-
SOURCE_HASH=sha512:74110d194de8b6b61d40b133b97629520048a8fdedac349ec2031c793c0246526c1c7904e88098b4c2a121e5efba2d724924139ab1aca15d129a4d210f94a1aa
+ VERSION=4.8
SOURCE=debianutils_$VERSION.tar.xz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/debianutils-$VERSION"
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/d/debianutils/$SOURCE
+
SOURCE_HASH=sha512:25119e4079892f80d0780ba167a58b789769472611d76e5974df7f5ccd22c95cbbb3ae60f6d23937b968b091eeb835c009071b7ec7ab892a6c7fa9cf119b9b23
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/debianutils-$VERSION"
WEB_SITE=http://packages.debian.org/testing/base/debianutils
GATHER_DOCS=off
ENTERED=20040925
diff --git a/utils/run-parts/HISTORY b/utils/run-parts/HISTORY
index 6b8ea39..d4584b8 100644
--- a/utils/run-parts/HISTORY
+++ b/utils/run-parts/HISTORY
@@ -1,3 +1,6 @@
+2016-09-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.8
+
2016-02-19 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 4.7
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d14b40c27bb48b5fb74cc79a4d0ff29bc4effe8e), Vlad Glagolev, 09/26/2016
Archive powered by MHonArc 2.6.24.