From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b6b0f37a1d5c18a0e874c6c7aefb219facf26d6e
Date: Thu, 01 Sep 2016 12:42:02 +0100 [thread overview]
Message-ID: <20160901114202.9D0EF1078E81@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 7384 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via b6b0f37a1d5c18a0e874c6c7aefb219facf26d6e (commit)
via 9c0932bf56db1bef503c525ce5f49225bc74f59b (commit)
from 1220db420c51d1c45d836ec5555a24f7c5f5a84d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b6b0f37a1d5c18a0e874c6c7aefb219facf26d6e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Sep 1 13:35:25 2016 +0200
systemd: Generate machine-id on first run.
Do not longer generate the machine-id during the installation progress,
it will be gernerated (if not exists) on the first run of the system
automatically.
Fixes #10078.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9c0932bf56db1bef503c525ce5f49225bc74f59b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 1 10:14:06 2016 +0100
network: Update to 008
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
network/network.nm | 4 +-
...tcalc-Allow-build-on-64-bit-architectures.patch | 127 ---------------------
systemd/systemd.nm | 5 +-
3 files changed, 3 insertions(+), 133 deletions(-)
delete mode 100644 network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch
Difference in files:
diff --git a/network/network.nm b/network/network.nm
index ab31539..c4e6f2c 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -5,8 +5,8 @@
name = network
epoch = 1
-version = 007
-release = 2
+version = 008
+release = 1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Base Networking/Tools
diff --git a/network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch b/network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch
deleted file mode 100644
index fec5b2c..0000000
--- a/network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From cf3fb03ccc299b1233fa1a3cc4ce66520c324e70 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer(a)ipfire.org>
-Date: Wed, 21 Oct 2015 18:42:06 +0200
-Subject: [PATCH] inetcalc: Allow build on 64 bit architectures
-
-inetcalc previously used a GCC extension that was only
-available on 64 bit platforms. This patch changes the
-code to use struct in6_addr instead of __uint128_t for
-storing IP addresses.
-
-Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
----
- src/inetcalc.c | 47 +++++++++++++++++++++++++++++++++--------------
- 1 file changed, 33 insertions(+), 14 deletions(-)
-
-diff --git a/src/inetcalc.c b/src/inetcalc.c
-index f821d6ed41a6..ba692542aba7 100644
---- a/src/inetcalc.c
-+++ b/src/inetcalc.c
-@@ -30,17 +30,26 @@
-
- typedef struct ip_address {
- int family;
-- __uint128_t addr;
-+ struct in6_addr addr;
- int prefix;
- } ip_address_t;
-
--static __uint128_t prefix_to_bitmask(int prefix) {
-- __uint128_t bitmask = ~0;
-+static struct in6_addr prefix_to_bitmask(int prefix) {
-+ assert(prefix <= 128);
-
-- for (int i = 0; i < 128 - prefix; i++)
-- bitmask >>= 1;
-+ struct in6_addr bitmask;
-
-- return bitmask;
-+ for (int i = 0; i < 16; i++)
-+ bitmask.s6_addr[i] = 0;
-+
-+ for (int i = prefix, j = 0; i > 0; i -= 8, j++) {
-+ if (i >= 8)
-+ bitmask.s6_addr[j] = 0xff;
-+ else
-+ bitmask.s6_addr[j] = 0xff << (8 - i);
-+ }
-+
-+ return bitmask;
- }
-
- static int bitmask_to_prefix(uint32_t bits) {
-@@ -171,7 +180,7 @@ static int ip_address_eq(const ip_address_t* a1, const ip_address_t* a2) {
- if (a1->family != a2->family)
- return 1;
-
-- if (a1->addr != a2->addr)
-+ if (a1->addr.s6_addr != a2->addr.s6_addr)
- return 1;
-
- if (a1->prefix != a2->prefix)
-@@ -184,7 +193,7 @@ static int ip_address_gt(const ip_address_t* a1, const ip_address_t* a2) {
- if (a1->family != a2->family || a1->prefix != a2->prefix)
- return -1;
-
-- if (a1->addr > a2->addr)
-+ if (a1->addr.s6_addr > a2->addr.s6_addr)
- return 0;
-
- return 1;
-@@ -193,7 +202,7 @@ static int ip_address_gt(const ip_address_t* a1, const ip_address_t* a2) {
- static int ip_address_format_string(char* buffer, size_t size, const ip_address_t* ip) {
- assert(ip->family == AF_INET || ip->family == AF_INET6);
-
-- const char* p = inet_ntop(ip->family, &ip->addr, buffer, size);
-+ const char* p = inet_ntop(ip->family, &ip->addr.s6_addr, buffer, size);
- if (!p)
- return errno;
-
-@@ -218,21 +227,25 @@ static void ip_address_print(const ip_address_t* ip) {
- static void ip_address_make_network(ip_address_t* net, const ip_address_t* ip) {
- assert(ip->prefix >= 0);
-
-- __uint128_t mask = prefix_to_bitmask(ip->prefix);
-+ struct in6_addr mask = prefix_to_bitmask(ip->prefix);
-
- net->family = ip->family;
- net->prefix = ip->prefix;
-- net->addr = ip->addr & mask;
-+
-+ for (int i = 0; i < 16; i++)
-+ net->addr.s6_addr[i] = ip->addr.s6_addr[i] & mask.s6_addr[i];
- }
-
- static void ip_address_make_broadcast(ip_address_t* broadcast, const ip_address_t* ip) {
- assert(ip->family == AF_INET && ip->prefix >= 0);
-
-- __uint128_t mask = prefix_to_bitmask(ip->prefix);
-+ struct in6_addr mask = prefix_to_bitmask(ip->prefix);
-
- broadcast->family = ip->family;
- broadcast->prefix = ip->prefix;
-- broadcast->addr = ip->addr | ~mask;
-+
-+ for (int i = 0; i < 16; i++)
-+ broadcast->addr.s6_addr[i] = ip->addr.s6_addr[i] | ~mask.s6_addr[i];
- }
-
- static int action_check(const int family, const char* address) {
-@@ -342,7 +355,13 @@ static int action_prefix(const int family, const char* addr1, const char* addr2)
- if (r)
- return r;
-
-- uint32_t mask = ntohl(network.addr ^ broadcast.addr);
-+ struct in6_addr netmask;
-+ for (int i = 0; i < 16; i++)
-+ netmask.s6_addr[i] = network.addr.s6_addr[i] ^ broadcast.addr.s6_addr[i];
-+
-+ uint32_t mask = netmask.s6_addr[0] << 24 | netmask.s6_addr[1] << 16 |
-+ netmask.s6_addr[2] << 8 | netmask.s6_addr[3];
-+
- int prefix = bitmask_to_prefix(~mask);
- if (prefix < 0)
- return 1;
---
-2.4.3
-
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 35d2b0b..585916b 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
name = systemd
version = 221
-release = 4
+release = 5
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = System/Base
@@ -231,9 +231,6 @@ packages
end
script postin
- # Generate Machine ID.
- /usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
-
# Reexec systemd daemon.
/usr/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2016-09-01 11:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160901114202.9D0EF1078E81@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox