[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2020-11-03 Thread Mike Gilbert 
commit: 38ec013fbbf4b11185706d21fd079881f628f272
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Nov  3 15:48:10 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 15:48:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ec013f

sys-apps/systemd: include system-auth in PAM config

Closes: https://bugs.gentoo.org/751199
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/files/gentoo-pam.patch | 33 +
 sys-apps/systemd/systemd-246.6.ebuild   |  1 +
 sys-apps/systemd/systemd-.ebuild|  1 +
 3 files changed, 35 insertions(+)

diff --git a/sys-apps/systemd/files/gentoo-pam.patch 
b/sys-apps/systemd/files/gentoo-pam.patch
new file mode 100644
index 000..4d022b508ba
--- /dev/null
+++ b/sys-apps/systemd/files/gentoo-pam.patch
@@ -0,0 +1,33 @@
+From b744751e2ced66c2ec191e8bd490cb9bdffc630a Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Tue, 3 Nov 2020 10:42:51 -0500
+Subject: [PATCH] pam: include system-auth for systemd --user
+
+---
+ src/login/systemd-user.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
+index f6313f79fe..bcf84b4c64 100644
+--- a/src/login/systemd-user.m4
 b/src/login/systemd-user.m4
+@@ -5,7 +5,7 @@
+ m4_ifdef(`ENABLE_HOMED',
+ -account sufficient pam_systemd_home.so
+ )m4_dnl
+-account sufficient pam_unix.so
++account include system-auth
+ account required pam_permit.so
+ 
+ m4_ifdef(`HAVE_SELINUX',
+@@ -13,6 +13,7 @@ session required pam_selinux.so close
+ session required pam_selinux.so nottys open
+ )m4_dnl
+ session required pam_loginuid.so
++session include system-auth
+ session optional pam_keyinit.so force revoke
+ m4_ifdef(`ENABLE_HOMED',
+ -session optional pam_systemd_home.so
+-- 
+2.29.0
+

diff --git a/sys-apps/systemd/systemd-246.6.ebuild 
b/sys-apps/systemd/systemd-246.6.ebuild
index 3cca3239a60..4c0c3699148 100644
--- a/sys-apps/systemd/systemd-246.6.ebuild
+++ b/sys-apps/systemd/systemd-246.6.ebuild
@@ -210,6 +210,7 @@ src_prepare() {
"${FILESDIR}/gentoo-generator-path-r2.patch"
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
"${FILESDIR}/gentoo-journald-audit.patch"
+   "${FILESDIR}/gentoo-pam.patch"
)
fi
 

diff --git a/sys-apps/systemd/systemd-.ebuild 
b/sys-apps/systemd/systemd-.ebuild
index 3cca3239a60..4c0c3699148 100644
--- a/sys-apps/systemd/systemd-.ebuild
+++ b/sys-apps/systemd/systemd-.ebuild
@@ -210,6 +210,7 @@ src_prepare() {
"${FILESDIR}/gentoo-generator-path-r2.patch"
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
"${FILESDIR}/gentoo-journald-audit.patch"
+   "${FILESDIR}/gentoo-pam.patch"
)
fi

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2020-10-14 Thread Mike Gilbert 
commit: 23570445095cd6edec4d3206d61c26efe6b29cdc
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Oct 14 18:05:31 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Oct 14 19:15:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23570445

sys-apps/systemd: remove old

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/Manifest  |   1 -
 .../gentoo-Dont-enable-audit-by-default.patch  |  30 --
 .../systemd/files/gentoo-generator-path-r1.patch   |  27 --
 .../systemd/files/gentoo-systemd-user-pam.patch|  16 -
 sys-apps/systemd/systemd-245.7-r1.ebuild   | 527 -
 5 files changed, 601 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index db43ac9e2de..0e7a4c8589d 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,2 +1 @@
 DIST systemd-246.tar.gz 9534036 BLAKE2B 
71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0
 SHA512 
7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
-DIST systemd-stable-245.7.tar.gz 9171465 BLAKE2B 
77117360155ef6358244a382ebd521fe180d8dd982cc2edda18790105933cd5e8880030572eb50d5405b9afdab519b06e0721f48c57394d3d1043a123169ccb1
 SHA512 
306b3a9cd1d8985a05be259f8a08efb5e9f7102a657eccdef58e082822b61a6e82246dc4f3b6e0bd33eedbd550af54e0029af9d0d2b70416e27626ec43921449

diff --git a/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch 
b/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch
deleted file mode 100644
index f44b4be85d5..000
--- a/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Martin Pitt 
-Date: Sun, 28 Dec 2014 12:49:35 +0100
-Subject: Don't enable audit by default
-
-It causes flooding of dmesg and syslog, suppressing actually important
-messages.
-
-Don't enable it for now, until a better solution is found:
-http://lists.freedesktop.org/archives/systemd-devel/2014-December/026591.html
-
-Bug-Debian: https://bugs.debian.org/773528

- src/journal/journald-audit.c | 5 -
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
-index 69742fa..25ef743 100644
 a/src/journal/journald-audit.c
-+++ b/src/journal/journald-audit.c
-@@ -542,10 +542,5 @@ int server_open_audit(Server *s) {
- if (r < 0)
- return log_error_errno(r, "Failed to add audit fd to event 
loop: %m");
- 
--/* We are listening now, try to enable audit */
--r = enable_audit(s->audit_fd, true);
--if (r < 0)
--log_warning_errno(r, "Failed to issue audit enable call: %m");
--
- return 0;
- }

diff --git a/sys-apps/systemd/files/gentoo-generator-path-r1.patch 
b/sys-apps/systemd/files/gentoo-generator-path-r1.patch
deleted file mode 100644
index 459be9d99ed..000
--- a/sys-apps/systemd/files/gentoo-generator-path-r1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3c7918deafa34313b935851171279d8fdb5cfadb Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Tue, 25 Dec 2018 22:52:50 -0500
-Subject: [PATCH] path-lookup: look for generators in
- {,/usr}/lib/systemd/system-generators
-
-Bug: https://bugs.gentoo.org/625402

- src/shared/path-lookup.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
-index 442fde7b2d..6814164504 100644
 a/src/shared/path-lookup.c
-+++ b/src/shared/path-lookup.c
-@@ -888,6 +888,8 @@ char **generator_binary_paths(UnitFileScope scope) {
- return strv_new("/run/systemd/system-generators",
- "/etc/systemd/system-generators",
- "/usr/local/lib/systemd/system-generators",
-+"/usr/lib/systemd/system-generators",
-+"/lib/systemd/system-generators",
- SYSTEM_GENERATOR_PATH);
- 
- case UNIT_FILE_GLOBAL:
--- 
-2.20.1
-

diff --git a/sys-apps/systemd/files/gentoo-systemd-user-pam.patch 
b/sys-apps/systemd/files/gentoo-systemd-user-pam.patch
deleted file mode 100644
index eb2223e52f2..000
--- a/sys-apps/systemd/files/gentoo-systemd-user-pam.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 a/src/login/systemd-user.m4
-+++ b/src/login/systemd-user.m4
-@@ -2,11 +2,7 @@
- #
- # Used by systemd --user instances.
- 
--account required pam_unix.so
--m4_ifdef(`HAVE_SELINUX',
--session required pam_selinux.so close
--session required pam_selinux.so nottys open
--)m4_dnl
--session required pam_loginuid.so
-+account include system-auth
-+session include system-auth
- session optional pam_keyinit.so force revoke
- session optional pam_systemd.so

diff --git a/sys-apps/systemd/systemd-245.7-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2020-09-24 Thread Mike Gilbert 
commit: c7fb3be35836126c26ce27ae5f5ad221b53114f8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep 24 14:49:32 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 24 14:49:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7fb3be3

sys-apps/systemd: remove old

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/Manifest  |   2 -
 sys-apps/systemd/files/245-clang-gnu11.patch   |  60 ---
 .../systemd/files/245-libmicrohttpd-0.9.71.patch   |  67 ---
 sys-apps/systemd/systemd-244.3.ebuild  | 507 
 sys-apps/systemd/systemd-245.5.ebuild  | 529 -
 5 files changed, 1165 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 176014c52ae..db43ac9e2de 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,2 @@
 DIST systemd-246.tar.gz 9534036 BLAKE2B 
71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0
 SHA512 
7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
-DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 
25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d
 SHA512 
f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
-DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 
7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d
 SHA512 
47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 DIST systemd-stable-245.7.tar.gz 9171465 BLAKE2B 
77117360155ef6358244a382ebd521fe180d8dd982cc2edda18790105933cd5e8880030572eb50d5405b9afdab519b06e0721f48c57394d3d1043a123169ccb1
 SHA512 
306b3a9cd1d8985a05be259f8a08efb5e9f7102a657eccdef58e082822b61a6e82246dc4f3b6e0bd33eedbd550af54e0029af9d0d2b70416e27626ec43921449

diff --git a/sys-apps/systemd/files/245-clang-gnu11.patch 
b/sys-apps/systemd/files/245-clang-gnu11.patch
deleted file mode 100644
index 9056b56d48e..000
--- a/sys-apps/systemd/files/245-clang-gnu11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 36e0d89a88c51ba879a2d7e2f90ea9b38333e2c0 Mon Sep 17 00:00:00 2001
-From: Denis Pronin 
-Date: Sun, 8 Mar 2020 23:57:07 +0300
-Subject: [PATCH] Support compiling with clang and gnu11 standard
-
-Signed-off-by: Denis Pronin 

- src/shared/json-internal.h | 35 ---
- 1 file changed, 24 insertions(+), 11 deletions(-)
-
-diff --git a/src/shared/json-internal.h b/src/shared/json-internal.h
-index bf158bff0d4..fabff0c860e 100644
 a/src/shared/json-internal.h
-+++ b/src/shared/json-internal.h
-@@ -26,21 +26,34 @@ assert_cc(sizeof(JsonValue) == 16U);
- /* We use fake JsonVariant objects for some special values, in order to avoid 
memory allocations for them. Note that
-  * effectively this means that there are multiple ways to encode the same 
objects: via these magic values or as
-  * properly allocated JsonVariant. We convert between both on-the-fly as 
necessary. */
--#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) 1)
--#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) 2)
--#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) 3)
--#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 4)
--#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 5)
--#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 6)
--#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 7)
--#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 8)
--#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) 9)
--#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) 10)
-+enum
-+{
-+ _JSON_VARIANT_MAGIC_TRUE = 1,
-+#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) _JSON_VARIANT_MAGIC_TRUE)
-+ _JSON_VARIANT_MAGIC_FALSE,
-+#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) _JSON_VARIANT_MAGIC_FALSE)
-+ _JSON_VARIANT_MAGIC_NULL,
-+#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) _JSON_VARIANT_MAGIC_NULL)
-+ _JSON_VARIANT_MAGIC_ZERO_INTEGER,
-+#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 
_JSON_VARIANT_MAGIC_ZERO_INTEGER)
-+ _JSON_VARIANT_MAGIC_ZERO_UNSIGNED,
-+#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 
_JSON_VARIANT_MAGIC_ZERO_UNSIGNED)
-+ _JSON_VARIANT_MAGIC_ZERO_REAL,
-+#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 
_JSON_VARIANT_MAGIC_ZERO_REAL)
-+ _JSON_VARIANT_MAGIC_EMPTY_STRING,
-+#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 
_JSON_VARIANT_MAGIC_EMPTY_STRING)
-+ _JSON_VARIANT_MAGIC_EMPTY_ARRAY,
-+#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 
_JSON_VARIANT_MAGIC_EMPTY_ARRAY)
-+ _JSON_VARIANT_MAGIC_EMPTY_OBJECT,
-+#define JSON_VARIANT_MAGIC_EMPTY_OBJECT

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2020-08-21 Thread Mike Gilbert 
commit: 3f7665c563412f6cdd8a4ba4bc918ecc2b983d08
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 22 01:43:09 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 22 01:55:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7665c5

sys-apps/systemd: do not change the kernel audit setting by default

Closes: https://bugs.gentoo.org/736910
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/files/gentoo-journald-audit.patch | 40 ++
 ...ystemd-245.7.ebuild => systemd-245.7-r1.ebuild} |  1 +
 .../{systemd-246.ebuild => systemd-246-r1.ebuild}  |  1 +
 sys-apps/systemd/systemd-.ebuild   |  1 +
 4 files changed, 43 insertions(+)

diff --git a/sys-apps/systemd/files/gentoo-journald-audit.patch 
b/sys-apps/systemd/files/gentoo-journald-audit.patch
new file mode 100644
index 000..088bceb7696
--- /dev/null
+++ b/sys-apps/systemd/files/gentoo-journald-audit.patch
@@ -0,0 +1,40 @@
+From 593db1c78011ddce551051ce17eda6feac079b3d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Fri, 21 Aug 2020 13:16:17 -0400
+Subject: [PATCH] journald: do not change the kernel audit setting by default
+
+Bug: https://bugs.gentoo.org/736910
+---
+ man/journald.conf.xml | 2 +-
+ src/journal/journald-server.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/journald.conf.xml b/man/journald.conf.xml
+index bfd359a903..7e93d4050e 100644
+--- a/man/journald.conf.xml
 b/man/journald.conf.xml
+@@ -411,7 +411,7 @@
+ systemd-journald collects generated audit records, 
it just controls whether it
+ tells the kernel to generate them. This means if another tool turns 
on auditing even if
+ systemd-journald left it off, it will still 
collect the generated
+-messages. Defaults to on.
++messages.
+   
+ 
+   
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index 5865bf9809..163be685a8 100644
+--- a/src/journal/journald-server.c
 b/src/journal/journald-server.c
+@@ -2208,7 +2208,7 @@ int server_init(Server *s, const char *namespace) {
+ .compress.threshold_bytes = (uint64_t) -1,
+ .seal = true,
+ 
+-.set_audit = true,
++.set_audit = -1,
+ 
+ .watchdog_usec = USEC_INFINITY,
+ 
+-- 
+2.28.0
+

diff --git a/sys-apps/systemd/systemd-245.7.ebuild 
b/sys-apps/systemd/systemd-245.7-r1.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-245.7.ebuild
rename to sys-apps/systemd/systemd-245.7-r1.ebuild
index 586484176c7..3da9bb72e33 100644
--- a/sys-apps/systemd/systemd-245.7.ebuild
+++ b/sys-apps/systemd/systemd-245.7-r1.ebuild
@@ -207,6 +207,7 @@ src_prepare() {
PATCHES+=(
"${FILESDIR}/gentoo-generator-path-r1.patch"
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
+   "${FILESDIR}/gentoo-journald-audit.patch"
)
fi
 

diff --git a/sys-apps/systemd/systemd-246.ebuild 
b/sys-apps/systemd/systemd-246-r1.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-246.ebuild
rename to sys-apps/systemd/systemd-246-r1.ebuild
index 5097bffb2dd..a3cf9676ba5 100644
--- a/sys-apps/systemd/systemd-246.ebuild
+++ b/sys-apps/systemd/systemd-246-r1.ebuild
@@ -207,6 +207,7 @@ src_prepare() {
PATCHES+=(
"${FILESDIR}/gentoo-generator-path-r2.patch"
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
+   "${FILESDIR}/gentoo-journald-audit.patch"
)
fi
 

diff --git a/sys-apps/systemd/systemd-.ebuild 
b/sys-apps/systemd/systemd-.ebuild
index 5097bffb2dd..a3cf9676ba5 100644
--- a/sys-apps/systemd/systemd-.ebuild
+++ b/sys-apps/systemd/systemd-.ebuild
@@ -207,6 +207,7 @@ src_prepare() {
PATCHES+=(
"${FILESDIR}/gentoo-generator-path-r2.patch"
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
+   "${FILESDIR}/gentoo-journald-audit.patch"
)
fi

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2020-07-06 Thread Mike Gilbert 
commit: cb42fec761f69750bed2e7494fda976a315dc8e9
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul  6 14:01:41 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul  6 14:05:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb42fec7

sys-apps/systemd: fix build with libmicrohttpd-0.9.71

Signed-off-by: Mike Gilbert  gentoo.org>

 .../systemd/files/245-libmicrohttpd-0.9.71.patch   | 67 ++
 sys-apps/systemd/systemd-245.5.ebuild  |  1 +
 2 files changed, 68 insertions(+)

diff --git a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch 
b/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
new file mode 100644
index 000..08affa50170
--- /dev/null
+++ b/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
@@ -0,0 +1,67 @@
+From d17eabb1052e7c8c432331a7a782845e36164f01 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Tue, 30 Jun 2020 09:56:10 +0200
+Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20=C2=B5httpd=200.9.71?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The return type of callbacks was changed from int to an enum.
+---
+ src/journal-remote/journal-gatewayd.c| 4 ++--
+ src/journal-remote/journal-remote-main.c | 2 +-
+ src/journal-remote/microhttpd-util.h | 6 ++
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/journal-remote/journal-gatewayd.c 
b/src/journal-remote/journal-gatewayd.c
+index 5177e0d1577..3ab7c98b0b5 100644
+--- a/src/journal-remote/journal-gatewayd.c
 b/src/journal-remote/journal-gatewayd.c
+@@ -349,7 +349,7 @@ static int request_parse_range(
+ return 0;
+ }
+ 
+-static int request_parse_arguments_iterator(
++static mhd_result request_parse_arguments_iterator(
+ void *cls,
+ enum MHD_ValueKind kind,
+ const char *key,
+@@ -796,7 +796,7 @@ static int request_handler_machine(
+ return MHD_queue_response(connection, MHD_HTTP_OK, response);
+ }
+ 
+-static int request_handler(
++static mhd_result request_handler(
+ void *cls,
+ struct MHD_Connection *connection,
+ const char *url,
+diff --git a/src/journal-remote/journal-remote-main.c 
b/src/journal-remote/journal-remote-main.c
+index 69a111afead..f82d188a8c6 100644
+--- a/src/journal-remote/journal-remote-main.c
 b/src/journal-remote/journal-remote-main.c
+@@ -253,7 +253,7 @@ static int process_http_upload(
+ return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK.");
+ };
+ 
+-static int request_handler(
++static mhd_result request_handler(
+ void *cls,
+ struct MHD_Connection *connection,
+ const char *url,
+diff --git a/src/journal-remote/microhttpd-util.h 
b/src/journal-remote/microhttpd-util.h
+index d90c6bbd4f1..4ca9a5c4f16 100644
+--- a/src/journal-remote/microhttpd-util.h
 b/src/journal-remote/microhttpd-util.h
+@@ -47,6 +47,12 @@
+ #  define MHD_create_response_from_fd_at_offset64 
MHD_create_response_from_fd_at_offset
+ #endif
+ 
++#if MHD_VERSION >= 0x00097002
++#  define mhd_result enum MHD_Result
++#else
++#  define mhd_result int
++#endif
++
+ void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
+ 
+ /* respond_oom() must be usable with return, hence this form. */

diff --git a/sys-apps/systemd/systemd-245.5.ebuild 
b/sys-apps/systemd/systemd-245.5.ebuild
index 7ae8a3de58d..88016e66769 100644
--- a/sys-apps/systemd/systemd-245.5.ebuild
+++ b/sys-apps/systemd/systemd-245.5.ebuild
@@ -201,6 +201,7 @@ src_prepare() {
 
# Add local patches here
PATCHES+=(
+   "${FILESDIR}/245-libmicrohttpd-0.9.71.patch"
)
 
if ! use vanilla; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2020-06-10 Thread Mike Gilbert 
commit: 33eed1b877eea0d533760a7cec37fb2ea37c57d0
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jun 11 02:29:00 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Jun 11 02:29:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33eed1b8

sys-apps/systemd: remove old

Bug: https://bugs.gentoo.org/708806
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/Manifest   |   1 -
 sys-apps/systemd/files/244-efi-gcc-10.patch |  40 ---
 sys-apps/systemd/systemd-244.ebuild | 503 
 3 files changed, 544 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 2b7c2f78b20..a80bda081e4 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,3 @@
-DIST systemd-244.tar.gz 8445963 BLAKE2B 
19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256
 SHA512 
08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb
 DIST systemd-245.tar.gz 8993479 BLAKE2B 
be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35
 SHA512 
1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
 DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 
25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d
 SHA512 
f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
 DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 
7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d
 SHA512 
47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172

diff --git a/sys-apps/systemd/files/244-efi-gcc-10.patch 
b/sys-apps/systemd/files/244-efi-gcc-10.patch
deleted file mode 100644
index ce37ac300be..000
--- a/sys-apps/systemd/files/244-efi-gcc-10.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2c3ab079560664926189d5135b08eccc9797ab9e Mon Sep 17 00:00:00 2001
-From: Susant Sahani 
-Date: Sat, 25 Jan 2020 11:30:08 +0100
-Subject: [PATCH] efi: fix build.
-
-```
-ninja -C build
-ninja: Entering directory `build'
-[29/101] Generating systemd_boot.so with a custom command.
-FAILED: src/boot/efi/systemd_boot.so
-/usr/bin/ld -o src/boot/efi/systemd_boot.so -T 
/usr/lib64/gnuefi/elf_x64_efi.lds -shared -Bsymbolic -nostdlib -znocombreloc -L 
/usr/lib64 /usr/lib64/gnuefi/crt0-efi-x64.o src/boot/efi/disk.c.o 
src/boot/efi/graphics.c.o src/boot/efi/measure.c.o src/boot/efi/pe.c.o 
src/boot/efi/util.c.o src/boot/efi/boot.c.o src/boot/efi/console.c.o 
src/boot/efi/crc32.c.o src/boot/efi/random-seed.c.o src/boot/efi/sha256.c.o 
src/boot/efi/shim.c.o -lefi -lgnuefi 
/usr/lib/gcc/x86_64-redhat-linux/10/libgcc.a
-/usr/bin/ld: 
src/boot/efi/graphics.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
-/usr/bin/ld: 
src/boot/efi/pe.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
-/usr/bin/ld: 
src/boot/efi/util.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
-/usr/bin/ld: 
src/boot/efi/boot.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
-/usr/bin/ld: 
src/boot/efi/console.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
-/usr/bin/ld: 
src/boot/efi/random-seed.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58:
 multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
-/usr/bin/ld: 
src/boot/efi/shim.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
-[31/101] Generating stub.c.o with a custom command.
-ninja: build stopped: subcommand failed.
-make: *** [Makefile:2: all] Error 1
-
-```

- src/boot/efi/util.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/boot/efi/util.h

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2020-03-09 Thread Mike Gilbert 
commit: ff57f388b782354cb5f6bca825cc4aa34e23e16b
Author: Denis Pronin  yandex  ru>
AuthorDate: Mon Mar  9 15:29:58 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Mar  9 21:21:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff57f388

sys-apps/systemd: patch to support gnu11 standard for compilation

Closes: https://github.com/gentoo/gentoo/pull/14901
Signed-off-by: Denis Pronin  yandex.ru>
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/files/245-clang-gnu11.patch | 60 
 sys-apps/systemd/systemd-243-r2.ebuild   |  1 +
 sys-apps/systemd/systemd-244.3.ebuild|  1 +
 sys-apps/systemd/systemd-244.ebuild  |  1 +
 sys-apps/systemd/systemd-245.ebuild  |  1 +
 5 files changed, 64 insertions(+)

diff --git a/sys-apps/systemd/files/245-clang-gnu11.patch 
b/sys-apps/systemd/files/245-clang-gnu11.patch
new file mode 100644
index 000..9056b56d48e
--- /dev/null
+++ b/sys-apps/systemd/files/245-clang-gnu11.patch
@@ -0,0 +1,60 @@
+From 36e0d89a88c51ba879a2d7e2f90ea9b38333e2c0 Mon Sep 17 00:00:00 2001
+From: Denis Pronin 
+Date: Sun, 8 Mar 2020 23:57:07 +0300
+Subject: [PATCH] Support compiling with clang and gnu11 standard
+
+Signed-off-by: Denis Pronin 
+---
+ src/shared/json-internal.h | 35 ---
+ 1 file changed, 24 insertions(+), 11 deletions(-)
+
+diff --git a/src/shared/json-internal.h b/src/shared/json-internal.h
+index bf158bff0d4..fabff0c860e 100644
+--- a/src/shared/json-internal.h
 b/src/shared/json-internal.h
+@@ -26,21 +26,34 @@ assert_cc(sizeof(JsonValue) == 16U);
+ /* We use fake JsonVariant objects for some special values, in order to avoid 
memory allocations for them. Note that
+  * effectively this means that there are multiple ways to encode the same 
objects: via these magic values or as
+  * properly allocated JsonVariant. We convert between both on-the-fly as 
necessary. */
+-#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) 1)
+-#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) 2)
+-#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) 3)
+-#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 4)
+-#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 5)
+-#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 6)
+-#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 7)
+-#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 8)
+-#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) 9)
+-#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) 10)
++enum
++{
++ _JSON_VARIANT_MAGIC_TRUE = 1,
++#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) _JSON_VARIANT_MAGIC_TRUE)
++ _JSON_VARIANT_MAGIC_FALSE,
++#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) _JSON_VARIANT_MAGIC_FALSE)
++ _JSON_VARIANT_MAGIC_NULL,
++#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) _JSON_VARIANT_MAGIC_NULL)
++ _JSON_VARIANT_MAGIC_ZERO_INTEGER,
++#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 
_JSON_VARIANT_MAGIC_ZERO_INTEGER)
++ _JSON_VARIANT_MAGIC_ZERO_UNSIGNED,
++#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 
_JSON_VARIANT_MAGIC_ZERO_UNSIGNED)
++ _JSON_VARIANT_MAGIC_ZERO_REAL,
++#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 
_JSON_VARIANT_MAGIC_ZERO_REAL)
++ _JSON_VARIANT_MAGIC_EMPTY_STRING,
++#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 
_JSON_VARIANT_MAGIC_EMPTY_STRING)
++ _JSON_VARIANT_MAGIC_EMPTY_ARRAY,
++#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 
_JSON_VARIANT_MAGIC_EMPTY_ARRAY)
++ _JSON_VARIANT_MAGIC_EMPTY_OBJECT,
++#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) 
_JSON_VARIANT_MAGIC_EMPTY_OBJECT)
++ __JSON_VARIANT_MAGIC_MAX
++#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) __JSON_VARIANT_MAGIC_MAX)
++};
+ 
+ /* This is only safe as long as we don't define more than 4K magic pointers, 
i.e. the page size of the simplest
+  * architectures we support. That's because we rely on the fact that malloc() 
will never allocate from the first memory
+  * page, as it is a faulting page for catching NULL pointer dereferences. */
+-assert_cc((uintptr_t) _JSON_VARIANT_MAGIC_MAX < 4096U);
++assert_cc((unsigned) __JSON_VARIANT_MAGIC_MAX < 4096U);
+ 
+ enum { /* JSON tokens */
+ JSON_TOKEN_END,

diff --git a/sys-apps/systemd/systemd-243-r2.ebuild 
b/sys-apps/systemd/systemd-243-r2.ebuild
index 5c4c417bc34..a46b5c8519f 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -188,6 +188,7 @@ src_prepare() {
# Add local patches here
PATCHES+=(
"${FILESDIR}/243-seccomp.patch"
+   "${FILESDIR}/245-clang-gnu11.patch"
)
 
if ! use vanilla; then

diff --git a/sys-apps/systemd/systemd-244.3.ebuild 
b/sys-apps/systemd/systemd-244.3.ebuild
index c61aa348281..ee3dfc93eef 100644
--- a/sys-apps/systemd/systemd-244.3.ebuild
+++ b/sys-apps/systemd/systemd-244.3.ebuild
@@ -192,6 +192,7 @@ src_prepare() {
 
# Add local patches

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2020-01-26 Thread Mike Gilbert 
commit: 7c0cb0a875021f18b06ab03e85e5163f773830eb
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jan 26 17:18:58 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jan 26 17:18:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0cb0a8

sys-apps/systemd: fix build with gcc 10

Package-Manager: Portage-2.3.85_p2, Repoman-2.3.20_p36
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/files/244-efi-gcc-10.patch | 40 +
 sys-apps/systemd/systemd-244.ebuild |  1 +
 2 files changed, 41 insertions(+)

diff --git a/sys-apps/systemd/files/244-efi-gcc-10.patch 
b/sys-apps/systemd/files/244-efi-gcc-10.patch
new file mode 100644
index 000..ce37ac300be
--- /dev/null
+++ b/sys-apps/systemd/files/244-efi-gcc-10.patch
@@ -0,0 +1,40 @@
+From 2c3ab079560664926189d5135b08eccc9797ab9e Mon Sep 17 00:00:00 2001
+From: Susant Sahani 
+Date: Sat, 25 Jan 2020 11:30:08 +0100
+Subject: [PATCH] efi: fix build.
+
+```
+ninja -C build
+ninja: Entering directory `build'
+[29/101] Generating systemd_boot.so with a custom command.
+FAILED: src/boot/efi/systemd_boot.so
+/usr/bin/ld -o src/boot/efi/systemd_boot.so -T 
/usr/lib64/gnuefi/elf_x64_efi.lds -shared -Bsymbolic -nostdlib -znocombreloc -L 
/usr/lib64 /usr/lib64/gnuefi/crt0-efi-x64.o src/boot/efi/disk.c.o 
src/boot/efi/graphics.c.o src/boot/efi/measure.c.o src/boot/efi/pe.c.o 
src/boot/efi/util.c.o src/boot/efi/boot.c.o src/boot/efi/console.c.o 
src/boot/efi/crc32.c.o src/boot/efi/random-seed.c.o src/boot/efi/sha256.c.o 
src/boot/efi/shim.c.o -lefi -lgnuefi 
/usr/lib/gcc/x86_64-redhat-linux/10/libgcc.a
+/usr/bin/ld: 
src/boot/efi/graphics.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
+/usr/bin/ld: 
src/boot/efi/pe.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
+/usr/bin/ld: 
src/boot/efi/util.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
+/usr/bin/ld: 
src/boot/efi/boot.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
+/usr/bin/ld: 
src/boot/efi/console.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
+/usr/bin/ld: 
src/boot/efi/random-seed.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58:
 multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
+/usr/bin/ld: 
src/boot/efi/shim.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
multiple definition of `loader_guid'; 
src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: 
first defined here
+[31/101] Generating stub.c.o with a custom command.
+ninja: build stopped: subcommand failed.
+make: *** [Makefile:2: all] Error 1
+
+```
+---
+ src/boot/efi/util.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
+index 8518dfde77e..b13f22476c6 100644
+--- a/src/boot/efi/util.h
 b/src/boot/efi/util.h
+@@ -55,7 +55,7 @@ static inline void FileHandleClosep(EFI_FILE_HANDLE *handle) 
{
+ uefi_call_wrapper((*handle)->Close, 1, *handle);
+ }
+ 
+-const EFI_GUID loader_guid;
++extern const EFI_GUID loader_guid;
+ 
+ #define UINTN_MAX (~(UINTN)0)
+ #define INTN_MAX ((INTN)(UINTN_MAX>>1))

diff --git a/sys-apps/systemd/systemd-244.ebuild 
b/sys-apps/systemd/systemd-244.ebuild
index daed59e210c..948689867c8 100644
--- a/sys-apps/systemd/systemd-244.ebuild
+++ b/sys-apps/systemd/systemd-244.ebuild
@@ -185,6 +185,7 @@ src_prepare() {
 
# Add local patches here
PATCHES+=(
+   "${FILESDIR}"/244-efi-gcc-10.patch
)
 
if ! use vanilla; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2020-01-06 Thread Mike Gilbert 
commit: 22e17afdf3972504ccca959e51bf8ea7254d5513
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Jan  7 07:19:05 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Jan  7 07:19:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e17afd

sys-apps/systemd: remove old

Bug: https://bugs.gentoo.org/693156
Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/Manifest  |   1 -
 sys-apps/systemd/files/242-file-max.patch  |  31 --
 sys-apps/systemd/files/242-gcc-9.patch | 163 ---
 sys-apps/systemd/files/242-network-domains.patch   |  57 ---
 .../systemd/files/242-networkd-ipv6-token.patch| 152 ---
 sys-apps/systemd/files/242-rdrand-ryzen.patch  | 353 ---
 .../files/242-socket-util-flush-accept.patch   |  46 --
 .../systemd/files/242-wireguard-listenport.patch   |  49 --
 sys-apps/systemd/files/CVE-2019-15718.patch|  31 --
 sys-apps/systemd/metadata.xml  |   1 -
 sys-apps/systemd/systemd-242-r6.ebuild | 499 
 sys-apps/systemd/systemd-242-r7.ebuild | 500 -
 sys-apps/systemd/systemd-243.ebuild| 492 
 13 files changed, 2375 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c751d06835a..ca6af94c9ac 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,2 @@
-DIST systemd-242.tar.gz 7831435 BLAKE2B 
288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd
 SHA512 
578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 DIST systemd-243.tar.gz 8242522 BLAKE2B 
89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb
 SHA512 
56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-244.tar.gz 8445963 BLAKE2B 
19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256
 SHA512 
08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb

diff --git a/sys-apps/systemd/files/242-file-max.patch 
b/sys-apps/systemd/files/242-file-max.patch
deleted file mode 100644
index 0a1fe950e29..000
--- a/sys-apps/systemd/files/242-file-max.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6e2f78948403a4cce45b9e34311c9577c624f066 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering 
-Date: Mon, 17 Jun 2019 10:51:25 +0200
-Subject: [PATCH] core: set fs.file-max sysctl to LONG_MAX rather than
- ULONG_MAX
-
-Since kernel 5.2 the kernel thankfully returns proper errors when we
-write a value out of range to the sysctl. Which however breaks writing
-ULONG_MAX to request the maximum value. Hence let's write the new
-maximum value instead, LONG_MAX.

- src/core/main.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/core/main.c b/src/core/main.c
-index b33ea1b5b52..e7f51815f07 100644
 a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1245,9 +1245,9 @@ static void bump_file_max_and_nr_open(void) {
- #endif
- 
- #if BUMP_PROC_SYS_FS_FILE_MAX
--/* I so wanted to use STRINGIFY(ULONG_MAX) here, but alas we can't as 
glibc/gcc define that as
-- * "(0x7fffL * 2UL + 1UL)". Seriously.  */
--if (asprintf(, "%lu\n", ULONG_MAX) < 0) {
-+/* The maximum the kernel allows for this since 5.2 is LONG_MAX, use 
that. (Previously thing where
-+ * different but the operation would fail silently.) */
-+if (asprintf(, "%li\n", LONG_MAX) < 0) {
- log_oom();
- return;
- }

diff --git a/sys-apps/systemd/files/242-gcc-9.patch 
b/sys-apps/systemd/files/242-gcc-9.patch
deleted file mode 100644
index e9f690a65be..000
--- a/sys-apps/systemd/files/242-gcc-9.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
-Date: Tue, 7 May 2019 13:46:55 +0200
-Subject: [PATCH] network: remove redunant link name in message
-
-Fixes #12454.
-
-gcc was complaining that the link->ifname argument is NULL. Adding
-assert(link->ifname) right before the call has no effect. It seems that
-gcc is confused by the fact that log_link_warning_errno() internally
-calls log_object(), with link->ifname passed as the object. log_object()
-is also a macro and is does a check whether the passed object is NULL.
-So we have a check if something is NULL right next an unconditional use
-of it where it cannot be NULL. I think it's a bug in gcc.
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2019-09-03 Thread Mike Gilbert 
commit: 5d54665bac2e0881b4d22cf48632fd0412623565
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Sep  3 15:26:42 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Sep  3 15:26:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d54665b

sys-apps/systemd: add patch for CVE-2019-15718

Bug: https://bugs.gentoo.org/693156
Package-Manager: Portage-2.3.73_p4, Repoman-2.3.17_p24
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/files/CVE-2019-15718.patch| 31 
 ...ystemd-243_rc2.ebuild => systemd-242-r7.ebuild} | 33 ++
 ...md-243_rc2.ebuild => systemd-243_rc2-r1.ebuild} |  1 +
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/sys-apps/systemd/files/CVE-2019-15718.patch 
b/sys-apps/systemd/files/CVE-2019-15718.patch
new file mode 100644
index 000..8186f7096f8
--- /dev/null
+++ b/sys-apps/systemd/files/CVE-2019-15718.patch
@@ -0,0 +1,31 @@
+From 35e528018f315798d3bffcb592b32a0d8f5162bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Tue, 27 Aug 2019 19:00:34 +0200
+Subject: [PATCH] shared/but-util: drop trusted annotation from
+ bus_open_system_watch_bind_with_description()
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1746057
+
+This only affects systemd-resolved. 
bus_open_system_watch_bind_with_description()
+is also used in timesyncd, but it has no methods, only read-only properties, 
and
+in networkd, but it annotates all methods with SD_BUS_VTABLE_UNPRIVILEGED and 
does
+polkit checks.
+---
+ src/shared/bus-util.c | 4 
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
+index 6af115e7aa..821339d4ae 100644
+--- a/src/shared/bus-util.c
 b/src/shared/bus-util.c
+@@ -1705,10 +1705,6 @@ int bus_open_system_watch_bind_with_description(sd_bus 
**ret, const char *descri
+ if (r < 0)
+ return r;
+ 
+-r = sd_bus_set_trusted(bus, true);
+-if (r < 0)
+-return r;
+-
+ r = sd_bus_negotiate_creds(bus, true, 
SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS);
+ if (r < 0)
+ return r;

diff --git a/sys-apps/systemd/systemd-243_rc2.ebuild 
b/sys-apps/systemd/systemd-242-r7.ebuild
similarity index 93%
copy from sys-apps/systemd/systemd-243_rc2.ebuild
copy to sys-apps/systemd/systemd-242-r7.ebuild
index f00c416fa38..da5e7533d89 100644
--- a/sys-apps/systemd/systemd-243_rc2.ebuild
+++ b/sys-apps/systemd/systemd-242-r7.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd;
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls 
elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit 
qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt 
gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode 
+resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -45,7 +45,10 @@ 
COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
>=net-libs/gnutls-3.1.4:0=
)
-   idn? ( net-dns/libidn2:= )
+   idn? (
+   libidn2? ( net-dns/libidn2:= )
+   !libidn2? ( net-dns/libidn:= )
+   )
importd? (
app-arch/bzip2:0=
sys-libs/zlib:0=
@@ -185,6 +188,14 @@ src_prepare() {
 
# Add local patches here
PATCHES+=(
+   "${FILESDIR}"/242-gcc-9.patch
+   "${FILESDIR}"/242-socket-util-flush-accept.patch
+   "${FILESDIR}"/242-wireguard-listenport.patch
+   "${FILESDIR}"/242-file-max.patch
+   "${FILESDIR}"/242-rdrand-ryzen.patch
+   "${FILESDIR}"/242-networkd-ipv6-token.patch
+   "${FILESDIR}"/242-network-domains.patch
+   "${FILESDIR}"/CVE-2019-15718.patch
)
 
if ! use vanilla; then
@@ -244,7 +255,6 @@ multilib_src_configure() {
# no deps
-Defi=$(meson_multilib)
-Dima=true
-   -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
# Optional components/dependencies
-Dacl=$(meson_multilib_native_use acl)
-Dapparmor=$(meson_multilib_native_use apparmor)
@@ -257,7 +267,6 @@ multilib_src_configure() {
-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-Dmicrohttpd=$(meson_multilib_native_use http)
-   -Didn=$(meson_multilib_native_use idn)
-Dimportd=$(meson_multilib_native_use importd)

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2019-07-31 Thread Mike Gilbert 
commit: bcd58187d0fe53114f2968d7f345bd48f50b89df
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Jul 31 14:06:37 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Jul 31 14:06:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd58187

sys-apps/systemd: bump to 243-rc1

Package-Manager: Portage-2.3.69_p8_p111567, Repoman-2.3.16_p17_p111567
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/Manifest|   1 +
 sys-apps/systemd/files/243-rc1-analyze.patch | 125 +++
 sys-apps/systemd/systemd-243_rc1.ebuild  | 472 +++
 3 files changed, 598 insertions(+)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 88ceb157a23..da67bf86c71 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1 +1,2 @@
 DIST systemd-242.tar.gz 7831435 BLAKE2B 
288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd
 SHA512 
578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
+DIST systemd-243-rc1.tar.gz 8209533 BLAKE2B 
6f28d839563104b488bfe030483bf1b24c3d01cedb59ffa655f03a37d7c636c2daef34ca9d13b9fbe848b131d21920138583c63a049c1747f7e569c68384c0bf
 SHA512 
6626d7fd5781578d01a30c0d2647a293668d0819f2f85ce78a6aaf62ae1aa4b2c687cf237ca833c5befbc00321a344ff5ca56747cedc6ce00cd0f51c71dd25ff

diff --git a/sys-apps/systemd/files/243-rc1-analyze.patch 
b/sys-apps/systemd/files/243-rc1-analyze.patch
new file mode 100644
index 000..e38b51eb121
--- /dev/null
+++ b/sys-apps/systemd/files/243-rc1-analyze.patch
@@ -0,0 +1,125 @@
+From 417b82e1c341946d277383471f2972b7227061ff Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Tue, 30 Jul 2019 14:51:38 -0400
+Subject: [PATCH] analyze: declare dump_exit_status outside of HAVE_SECCOMP
+ block
+
+Fixes: 76ed04d936f757763c32db5dbaaebd8b13785d7b
+Closes: https://github.com/systemd/systemd/issues/13230
+---
+ src/analyze/analyze.c | 92 +--
+ 1 file changed, 46 insertions(+), 46 deletions(-)
+
+diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
+index f62879371d..4d81026084 100644
+--- a/src/analyze/analyze.c
 b/src/analyze/analyze.c
+@@ -1608,6 +1608,52 @@ static int dump_unit_paths(int argc, char *argv[], void 
*userdata) {
+ return 0;
+ }
+ 
++static int dump_exit_status(int argc, char *argv[], void *userdata) {
++_cleanup_(table_unrefp) Table *table = NULL;
++int r;
++
++table = table_new("name", "status", "class");
++if (!table)
++return log_oom();
++
++r = table_set_align_percent(table, table_get_cell(table, 0, 1), 100);
++if (r < 0)
++return log_error_errno(r, "Failed to right-align status: %m");
++
++if (strv_isempty(strv_skip(argv, 1)))
++for (size_t i = 0; i < ELEMENTSOF(exit_status_mappings); i++) 
{
++if (!exit_status_mappings[i].name)
++continue;
++
++r = table_add_many(table,
++   TABLE_STRING, 
exit_status_mappings[i].name,
++   TABLE_INT, (int) i,
++   TABLE_STRING, 
exit_status_class(i));
++if (r < 0)
++return r;
++}
++else
++for (int i = 1; i < argc; i++) {
++int status;
++
++status = exit_status_from_string(argv[i]);
++if (status < 0)
++return log_error_errno(r, "Invalid exit 
status \"%s\": %m", argv[i]);
++
++assert(status >= 0 && (size_t) status < 
ELEMENTSOF(exit_status_mappings));
++r = table_add_many(table,
++   TABLE_STRING, 
exit_status_mappings[status].name ?: "-",
++   TABLE_INT, status,
++   TABLE_STRING, 
exit_status_class(status) ?: "-");
++if (r < 0)
++return r;
++}
++
++(void) pager_open(arg_pager_flags);
++
++return table_print(table, NULL);
++}
++
+ #if HAVE_SECCOMP
+ 
+ static int load_kernel_syscalls(Set **ret) {
+@@ -1685,52 +1731,6 @@ static void dump_syscall_filter(const SyscallFilterSet 
*set) {
+ printf("%s%s%s\n", syscall[0] == '@' ? ansi_underline() : 
"", syscall, ansi_normal());
+ }
+ 
+-static int dump_exit_status(int argc, char *argv[], void *userdata) {
+-_cleanup_(table_unrefp) Table *table = NULL;
+-int r;
+-
+-table = table_new("name", "status", "class");
+-if (!table)
+-return

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2019-06-17 Thread Mike Gilbert 
commit: ff8eb9b0e29b1949fc45e890e06767c8f656a4e0
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jun 17 16:19:04 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jun 17 16:19:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8eb9b0

sys-apps/systemd: avoid error setting fs.file-max on linux-5.2

Package-Manager: Portage-2.3.67_p9, Repoman-2.3.14_p4
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/files/242-file-max.patch  | 31 ++
 ...systemd-241-r1.ebuild => systemd-241-r2.ebuild} |  1 +
 ...systemd-242-r2.ebuild => systemd-242-r3.ebuild} |  1 +
 3 files changed, 33 insertions(+)

diff --git a/sys-apps/systemd/files/242-file-max.patch 
b/sys-apps/systemd/files/242-file-max.patch
new file mode 100644
index 000..0a1fe950e29
--- /dev/null
+++ b/sys-apps/systemd/files/242-file-max.patch
@@ -0,0 +1,31 @@
+From 6e2f78948403a4cce45b9e34311c9577c624f066 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering 
+Date: Mon, 17 Jun 2019 10:51:25 +0200
+Subject: [PATCH] core: set fs.file-max sysctl to LONG_MAX rather than
+ ULONG_MAX
+
+Since kernel 5.2 the kernel thankfully returns proper errors when we
+write a value out of range to the sysctl. Which however breaks writing
+ULONG_MAX to request the maximum value. Hence let's write the new
+maximum value instead, LONG_MAX.
+---
+ src/core/main.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/main.c b/src/core/main.c
+index b33ea1b5b52..e7f51815f07 100644
+--- a/src/core/main.c
 b/src/core/main.c
+@@ -1245,9 +1245,9 @@ static void bump_file_max_and_nr_open(void) {
+ #endif
+ 
+ #if BUMP_PROC_SYS_FS_FILE_MAX
+-/* I so wanted to use STRINGIFY(ULONG_MAX) here, but alas we can't as 
glibc/gcc define that as
+- * "(0x7fffL * 2UL + 1UL)". Seriously.  */
+-if (asprintf(, "%lu\n", ULONG_MAX) < 0) {
++/* The maximum the kernel allows for this since 5.2 is LONG_MAX, use 
that. (Previously thing where
++ * different but the operation would fail silently.) */
++if (asprintf(, "%li\n", LONG_MAX) < 0) {
+ log_oom();
+ return;
+ }

diff --git a/sys-apps/systemd/systemd-241-r1.ebuild 
b/sys-apps/systemd/systemd-241-r2.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-241-r1.ebuild
rename to sys-apps/systemd/systemd-241-r2.ebuild
index a6ba1136fd7..f1d8b6296e6 100644
--- a/sys-apps/systemd/systemd-241-r1.ebuild
+++ b/sys-apps/systemd/systemd-241-r2.ebuild
@@ -170,6 +170,7 @@ src_prepare() {

"${FILESDIR}"/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
"${FILESDIR}"/241-version-dep.patch
"${FILESDIR}"/242-gcc-9.patch
+   "${FILESDIR}"/242-file-max.patch
)
 
if ! use vanilla; then

diff --git a/sys-apps/systemd/systemd-242-r2.ebuild 
b/sys-apps/systemd/systemd-242-r3.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-242-r2.ebuild
rename to sys-apps/systemd/systemd-242-r3.ebuild
index c2b6ac9fb90..4af6fc44b6e 100644
--- a/sys-apps/systemd/systemd-242-r2.ebuild
+++ b/sys-apps/systemd/systemd-242-r3.ebuild
@@ -173,6 +173,7 @@ src_prepare() {
"${FILESDIR}"/242-gcc-9.patch
"${FILESDIR}"/242-socket-util-flush-accept.patch
"${FILESDIR}"/242-wireguard-listenport.patch
+   "${FILESDIR}"/242-file-max.patch
)
 
if ! use vanilla; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2019-05-23 Thread Louis Sautier 
commit: e1b8494fbe9bcb998eba339df9ccf48dd27b22dd
Author: Louis Sautier  gentoo  org>
AuthorDate: Thu May 23 08:32:28 2019 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Thu May 23 12:25:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b8494f

sys-apps/systemd: network: backport fix for ListenPort in WireGuard

This fixes the fact that systemd-network had been ignoring ListenPort=
in [WireGuard] since v242.
See https://github.com/systemd/systemd/issues/12377

Closes: https://github.com/gentoo/gentoo/pull/12089
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Louis Sautier  gentoo.org>

 .../systemd/files/242-wireguard-listenport.patch   |  49 ++
 sys-apps/systemd/systemd-242-r2.ebuild | 492 +
 2 files changed, 541 insertions(+)

diff --git a/sys-apps/systemd/files/242-wireguard-listenport.patch 
b/sys-apps/systemd/files/242-wireguard-listenport.patch
new file mode 100644
index 000..39b3c7c0a54
--- /dev/null
+++ b/sys-apps/systemd/files/242-wireguard-listenport.patch
@@ -0,0 +1,49 @@
+From a62b7bb79e9a2aa683624c32cde1c756d8466fb4 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe 
+Date: Thu, 25 Apr 2019 00:39:04 +0200
+Subject: [PATCH] network: fix ListenPort= in [WireGuard] section
+
+This fixes a bug introduced by f1368a333e5e08575f0b45dfe41e936b106a8627.
+
+Fixes #12377.
+---
+ src/network/netdev/wireguard.c | 19 ++-
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
+index f3084c0773f..5ebc5dfed84 100644
+--- a/src/network/netdev/wireguard.c
 b/src/network/netdev/wireguard.c
+@@ -452,22 +452,23 @@ int config_parse_wireguard_listen_port(
+ void *userdata) {
+ 
+ uint16_t *s = data;
+-uint16_t port = 0;
+ int r;
+ 
+ assert(rvalue);
+ assert(data);
+ 
+-if (!streq(rvalue, "auto")) {
+-r = parse_ip_port(rvalue, s);
+-if (r < 0) {
+-log_syntax(unit, LOG_ERR, filename, line, r,
+-   "Invalid port specification, ignoring 
assignment: %s", rvalue);
+-return 0;
+-}
++if (isempty(rvalue) || streq(rvalue, "auto")) {
++*s = 0;
++return 0;
++}
++
++r = parse_ip_port(rvalue, s);
++if (r < 0) {
++log_syntax(unit, LOG_ERR, filename, line, r,
++   "Invalid port specification, ignoring assignment: 
%s", rvalue);
++return 0;
+ }
+ 
+-*s = port;
+ return 0;
+ }
+ 

diff --git a/sys-apps/systemd/systemd-242-r2.ebuild 
b/sys-apps/systemd/systemd-242-r2.ebuild
new file mode 100644
index 000..c2b6ac9fb90
--- /dev/null
+++ b/sys-apps/systemd/systemd-242-r2.ebuild
@@ -0,0 +1,492 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://github.com/systemd/systemd.git;
+   inherit git-r3
+else
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-${MY_PV}
+   S=${WORKDIR}/${MY_P}
+   
SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam 
python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd;
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt 
gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit 
qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+   sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+   !=sys-process/audit-2:0= )
+   cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+   curl? ( net-misc/curl:0= )
+   dns-over-tls? (
+   gnutls? ( >=net-libs/gnutls-3.5.3:0= )
+   !gnutls? ( >=dev-libs/openssl-1.1.0:0= )
+   )
+   elfutils? ( >=dev-libs/elfutils-0.158:0= )
+   gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+   http? (
+   >=net-libs/libmicrohttpd-0.9.33:0=
+   gnutls? ( >=net-libs/gnutls-3.1.4:0= )
+   )
+   idn? (
+   libidn2? ( net-dns/libidn2:= )
+   !libidn2? ( net-dns/libidn:= )
+   )
+   importd? (
+   app-arch/bzip2:0=
+   sys-libs/zlib:0=
+   )
+   kmod? (

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2019-05-09 Thread Mike Gilbert 
commit: eb1d80e6a30d09f9f139877c5b754c8a8e918d7a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu May  9 13:41:30 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu May  9 13:41:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1d80e6

sys-apps/systemd: backport patch to fix dracut boot

Closes: https://bugs.gentoo.org/685002
Package-Manager: Portage-2.3.66_p2, Repoman-2.3.12_p111
Signed-off-by: Mike Gilbert  gentoo.org>

 .../files/242-socket-util-flush-accept.patch   | 46 ++
 .../{systemd-242.ebuild => systemd-242-r1.ebuild}  |  1 +
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/systemd/files/242-socket-util-flush-accept.patch 
b/sys-apps/systemd/files/242-socket-util-flush-accept.patch
new file mode 100644
index 000..4849c4c0789
--- /dev/null
+++ b/sys-apps/systemd/files/242-socket-util-flush-accept.patch
@@ -0,0 +1,46 @@
+From f3d75364fbebf2ddb6393e54db5e10b6f6234e14 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering 
+Date: Thu, 18 Apr 2019 15:13:54 +0200
+Subject: [PATCH] socket-util: make sure flush_accept() doesn't hang on
+ unexpected EOPNOTSUPP
+
+So apparently there are two reasons why accept() can return EOPNOTSUPP:
+because the socket is not a listening stream socket (or similar), or
+because the incoming TCP connection for some reason wasn't acceptable to
+the host. THe latter should be a transient error, as suggested on
+accept(2). The former however should be considered fatal for
+flush_accept(). Let's fix this by explicitly checking whether the socket
+is a listening socket beforehand.
+---
+ src/basic/socket-util.c | 17 +++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
+index 904bafb76f9..e787d53d8f4 100644
+--- a/src/basic/socket-util.c
 b/src/basic/socket-util.c
+@@ -1225,9 +1225,22 @@ int flush_accept(int fd) {
+ .fd = fd,
+ .events = POLLIN,
+ };
+-int r;
++int r, b;
++socklen_t l = sizeof(b);
++
++/* Similar to flush_fd() but flushes all incoming connection by 
accepting them and immediately
++ * closing them.  */
++
++if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, , ) < 0)
++return -errno;
+ 
+-/* Similar to flush_fd() but flushes all incoming connection by 
accepting them and immediately closing them. */
++assert(l == sizeof(b));
++if (!b) /* Let's check if this is a socket accepting connections 
before calling accept(). That's
++ * because accept4() can return EOPNOTSUPP in the fd we are 
called on is not a listening
++ * socket, or in case the incoming TCP connection transiently 
triggered that (see accept(2)
++ * man page for details). The latter case is a transient 
error we should continue looping
++ * on. The former case however is fatal. */
++return -ENOTTY;
+ 
+ for (;;) {
+ int cfd;

diff --git a/sys-apps/systemd/systemd-242.ebuild 
b/sys-apps/systemd/systemd-242-r1.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-242.ebuild
rename to sys-apps/systemd/systemd-242-r1.ebuild
index d09494587fc..a2626727385 100644
--- a/sys-apps/systemd/systemd-242.ebuild
+++ b/sys-apps/systemd/systemd-242-r1.ebuild
@@ -171,6 +171,7 @@ src_prepare() {
# Add local patches here
PATCHES+=(
"${FILESDIR}"/242-gcc-9.patch
+   "${FILESDIR}"/242-socket-util-flush-accept.patch
)
 
if ! use vanilla; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2019-05-08 Thread Mike Gilbert 
commit: b2c1cefa829dd2cfd7fbc88c323e96a8749f2188
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed May  8 17:28:45 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed May  8 17:29:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c1cefa

sys-apps/systemd: fix build with GCC 9

Closes: https://bugs.gentoo.org/685090
Package-Manager: Portage-2.3.66_p2, Repoman-2.3.12_p111
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/files/242-gcc-9.patch | 35 ++
 sys-apps/systemd/systemd-241-r1.ebuild |  1 +
 sys-apps/systemd/systemd-242.ebuild|  1 +
 3 files changed, 37 insertions(+)

diff --git a/sys-apps/systemd/files/242-gcc-9.patch 
b/sys-apps/systemd/files/242-gcc-9.patch
new file mode 100644
index 000..e12d6571823
--- /dev/null
+++ b/sys-apps/systemd/files/242-gcc-9.patch
@@ -0,0 +1,35 @@
+From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Tue, 7 May 2019 13:46:55 +0200
+Subject: [PATCH] network: remove redunant link name in message
+
+Fixes #12454.
+
+gcc was complaining that the link->ifname argument is NULL. Adding
+assert(link->ifname) right before the call has no effect. It seems that
+gcc is confused by the fact that log_link_warning_errno() internally
+calls log_object(), with link->ifname passed as the object. log_object()
+is also a macro and is does a check whether the passed object is NULL.
+So we have a check if something is NULL right next an unconditional use
+of it where it cannot be NULL. I think it's a bug in gcc.
+
+Anyway, we don't need to use link->ifname here. log_object() already prepends
+the object name to the message.
+---
+ src/network/networkd-link.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 533193ac932..6fc82940033 100644
+--- a/src/network/networkd-link.c
 b/src/network/networkd-link.c
+@@ -338,8 +338,7 @@ static int link_enable_ipv6(Link *link) {
+ 
+ r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, 
"disable_ipv6", disabled);
+ if (r < 0)
+-log_link_warning_errno(link, r, "Cannot %s IPv6 for interface 
%s: %m",
+-   enable_disable(!disabled), 
link->ifname);
++log_link_warning_errno(link, r, "Cannot %s IPv6: %m", 
enable_disable(!disabled));
+ else
+ log_link_info(link, "IPv6 successfully %sd", 
enable_disable(!disabled));
+ 

diff --git a/sys-apps/systemd/systemd-241-r1.ebuild 
b/sys-apps/systemd/systemd-241-r1.ebuild
index e136800d069..d1c0ba26976 100644
--- a/sys-apps/systemd/systemd-241-r1.ebuild
+++ b/sys-apps/systemd/systemd-241-r1.ebuild
@@ -169,6 +169,7 @@ src_prepare() {

"${FILESDIR}"/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch

"${FILESDIR}"/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
"${FILESDIR}"/241-version-dep.patch
+   "${FILESDIR}"/242-gcc-9.patch
)
 
if ! use vanilla; then

diff --git a/sys-apps/systemd/systemd-242.ebuild 
b/sys-apps/systemd/systemd-242.ebuild
index 201667ade31..d09494587fc 100644
--- a/sys-apps/systemd/systemd-242.ebuild
+++ b/sys-apps/systemd/systemd-242.ebuild
@@ -170,6 +170,7 @@ src_prepare() {
 
# Add local patches here
PATCHES+=(
+   "${FILESDIR}"/242-gcc-9.patch
)
 
if ! use vanilla; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2019-04-05 Thread Mike Gilbert 
commit: 91b78b35cbcba29071c641afa477c333c88d1938
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Apr  5 20:56:15 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Apr  5 20:56:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b78b35

sys-apps/systemd: backport version.h dependency fix

Closes: https://bugs.gentoo.org/682624
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/files/241-version-dep.patch | 111 +++
 sys-apps/systemd/systemd-241-r1.ebuild   |   1 +
 2 files changed, 112 insertions(+)

diff --git a/sys-apps/systemd/files/241-version-dep.patch 
b/sys-apps/systemd/files/241-version-dep.patch
new file mode 100644
index 000..55abea98931
--- /dev/null
+++ b/sys-apps/systemd/files/241-version-dep.patch
@@ -0,0 +1,111 @@
+From 60722ad778d005790231038eecc4ba3034c1a0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Sun, 24 Feb 2019 22:49:38 +0100
+Subject: [PATCH] meson: declare version.h as dep for various targets that
+ include build.h
+
+Should fix #11565.
+---
+ meson.build  | 19 +--
+ src/core/meson.build |  3 ++-
+ src/udev/meson.build |  1 +
+ 3 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ed787d47492..82ecb4d0e69 100644
+--- a/meson.build
 b/meson.build
+@@ -1634,7 +1634,8 @@ exe = executable('systemd-analyze',
+  include_directories : includes,
+  link_with : [libcore,
+   libshared],
+- dependencies : [threads,
++ dependencies : [versiondep,
++ threads,
+  librt,
+  libseccomp,
+  libselinux,
+@@ -2180,7 +2181,8 @@ if conf.get('ENABLE_IMPORTD') == 1
+   systemd_pull_sources,
+   include_directories : includes,
+   link_with : [libshared],
+-  dependencies : [libcurl,
++  dependencies : [versiondep,
++  libcurl,
+   libz,
+   libbzip2,
+   libxz,
+@@ -2229,7 +2231,8 @@ if conf.get('ENABLE_REMOTE') == 1 and 
conf.get('HAVE_LIBCURL') == 1
+  systemd_journal_upload_sources,
+  include_directories : includes,
+  link_with : [libshared],
+- dependencies : [threads,
++ dependencies : [versiondep,
++ threads,
+  libcurl,
+  libgnutls,
+  libxz,
+@@ -2555,6 +2558,7 @@ exe = executable('systemd-stdio-bridge',
+  'src/stdio-bridge/stdio-bridge.c',
+  include_directories : includes,
+  link_with : [libshared],
++ dependencies : [versiondep],
+  install_rpath : rootlibexecdir,
+  install : true)
+ public_programs += exe
+@@ -2638,7 +2642,8 @@ exe = executable('systemd-udevd',
+  link_with : [libudev_core,
+   libsystemd_network,
+   libudev_static],
+- dependencies : [threads,
++ dependencies : [versiondep,
++ threads,
+  libkmod,
+  libidn,
+  libacl,
+@@ -2655,7 +2660,8 @@ exe = executable('udevadm',
+  link_with : [libudev_core,
+   libsystemd_network,
+   libudev_static],
+- dependencies : [threads,
++ dependencies : [versiondep,
++ threads,
+  libkmod,
+  libidn,
+  libacl,
+@@ -2795,7 +2801,8 @@ foreach tuple : tests
+ sources,
+ include_directories : incs,
+ link_with : link_with,
+-dependencies : dependencies,
++dependencies : [versiondep,
++dependencies],
+ c_args : defs,
+ build_by_default : want_tests != 'false',
+ install_rpath : rootlibexecdir,
+diff --git a/src/core/meson.build b/src/core/meson.build
+index

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2018-10-30 Thread Mike Gilbert 
commit: e815d3e67234fd9672992bfb3bcfea2588164d4c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Oct 30 14:32:29 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Oct 30 14:33:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e815d3e6

sys-apps/systemd: remove old

Bug: https://bugs.gentoo.org/669664
Package-Manager: Portage-2.3.51_p2, Repoman-2.3.11_p27
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/Manifest  |   5 -
 sys-apps/systemd/files/238-initctl.patch   |  46 ---
 sys-apps/systemd/files/238-libmount-include.patch  |  72 
 sys-apps/systemd/files/238-nspawn-wait.patch   |  83 
 sys-apps/systemd/files/238-sparc-raw-clone.patch   |  42 --
 .../systemd/files/238-timesync-connection.patch|  49 ---
 sys-apps/systemd/systemd-236-r5.ebuild | 437 
 sys-apps/systemd/systemd-238-r7.ebuild | 440 
 sys-apps/systemd/systemd-239-r1.ebuild | 448 -
 sys-apps/systemd/systemd-239.ebuild| 446 
 10 files changed, 2068 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 151c9029776..fa8f964949e 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,7 +1,2 @@
-DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B 
bce5f9e234c975a2b6e474ca2a0c2c82e704f02cf19885134dddc5edbd0b7bfb3773d737f88f78ba2ab81093dfceeb44d76ecda99cf2b916072dcdfa84720c19
 SHA512 
b74ab6944135c938b2d0d2a1dd40ac4cc4ff26d072603d6bfbe4529d808b2e481eb910155895bce14607842ad6d30751aded51654a53f76278becbb5e317b875
-DIST systemd-236.tar.gz 6759035 BLAKE2B 
0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3
 SHA512 
1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515fdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
-DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 
9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04
 SHA512 
809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c
-DIST systemd-238.tar.gz 6954022 BLAKE2B 
9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde
 SHA512 
c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
-DIST systemd-239-patches-0.tar.gz 14007 BLAKE2B 
a1653ac6cb46347fa1e1a4a81a7003af0e565ac2ba43e1aaed9df87d7e4bd13cdcf26ffc9527f46defa226d7d11b03fbc6b018f0734a6654a0f4bf88bf4ef6e7
 SHA512 
a640a446db153523a2ca97b811e20bc42c8273d2c494ebd8a6c5cd33718c714e37544533749cad57e887c17635cbfca01b86b52e9f5a12878ef70f2e95fc7485
 DIST systemd-239-patches-1.tar.gz 20639 BLAKE2B 
9b03367becdef20d16056cdbbeaaefd9f10bf6c56528ad1a738684ab08d99a464411c23aea32d47307b0399f092107069d09ad42fb07217f8eca520cc4010b84
 SHA512 
757c7fc8f60ccf99d2803128a8c4d8b924093b150384569c5ffb3bc39f06728e99b18e2f77ff0f1c16bbd45bc75cbb0f385dac0135443d70c7dcd9cc1e84a490
 DIST systemd-239.tar.gz 7157293 BLAKE2B 
975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0
 SHA512 
fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f

diff --git a/sys-apps/systemd/files/238-initctl.patch 
b/sys-apps/systemd/files/238-initctl.patch
deleted file mode 100644
index 39991697743..000
--- a/sys-apps/systemd/files/238-initctl.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4d8c7c1b3a5feebca948a3b8663f5be887b57731 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Fri, 30 Mar 2018 11:00:17 -0400
-Subject: [PATCH] units: initctl: move the fifo to /run/initctl to match
- sysvinit
-
-The fifo location was moved in sysvinit-2.89.
-
-http://git.savannah.nongnu.org/cgit/sysvinit.git/commit/?id=80dbcf3de3c1b83aeaa713a8fe5b8d35d8649af2

- units/systemd-initctl.service.in | 2 +-
- units/systemd-initctl.socket | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/units/systemd-initctl.service.in 
b/units/systemd-initctl.service.in
-index 6cfed3da11f..2b4b957dce3 100644
 a/units/systemd-initctl.service.in
-+++ b/units/systemd-initctl.service.in
-@@ -8,7 +8,7 @@
- #  (at your option) any later version.
- 
- [Unit]
--Description=/dev/initctl Compatibility Daemon
-+Description=initctl Compatibility Daemon
- Documentation=man:systemd-initctl.service(8)
- DefaultDependencies=no
- 
-diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket
-index 61f877ba7d2..9d975799081 100644
 a/units/systemd-initctl.socket
-+++ b/units/systemd-initctl.socket
-@@ -8,12 +8,12 @@
- #  (at your option) any later version.
- 
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2018-09-29 Thread Mike Gilbert 
commit: e8192a2eff5472db971b1be47db26ef70bbad226
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Sep 29 15:23:46 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Sep 29 15:26:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8192a2e

sys-apps/systemd: rename debug meson option

Closes: https://bugs.gentoo.org/667300
Signed-off-by: Mike Gilbert  gentoo.org>
Package-Manager: Portage-2.3.50_p2, Repoman-2.3.11_p9

 sys-apps/systemd/files/239-debug-extra.patch | 40 
 sys-apps/systemd/systemd-239-r1.ebuild   |  3 ++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/sys-apps/systemd/files/239-debug-extra.patch 
b/sys-apps/systemd/files/239-debug-extra.patch
new file mode 100644
index 000..19db590257c
--- /dev/null
+++ b/sys-apps/systemd/files/239-debug-extra.patch
@@ -0,0 +1,40 @@
+From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Sun, 19 Aug 2018 19:11:30 +0200
+Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
+
+Meson added -Doptimization and -Ddebug options, which obviously causes
+a conflict with our -Ddebug options. Let's rename it.
+
+Fixes #9883.
+---
+ meson.build   | 2 +-
+ meson_options.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f79ac4b12e7..2209c935ad6 100644
+--- a/meson.build
 b/meson.build
+@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
+ 
+ enable_debug_hashmap = false
+ enable_debug_mmap_cache = false
+-foreach name : get_option('debug')
++foreach name : get_option('debug-extra')
+ if name == 'hashmap'
+ enable_debug_hashmap = true
+ elif name == 'mmap-cache'
+diff --git a/meson_options.txt b/meson_options.txt
+index e3140c8c110..7b1f61bf464 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
+description : 'path to debug shell binary')
+ option('debug-tty', type : 'string', value : '/dev/tty9',
+description : 'specify the tty device for debug shell')
+-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : 
[],
++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], 
value : [],
+description : 'enable extra debugging')
+ option('memory-accounting-default', type : 'boolean',
+description : 'enable MemoryAccounting= by default')

diff --git a/sys-apps/systemd/systemd-239-r1.ebuild 
b/sys-apps/systemd/systemd-239-r1.ebuild
index 1fc28a80c2a..69bfa21435e 100644
--- a/sys-apps/systemd/systemd-239-r1.ebuild
+++ b/sys-apps/systemd/systemd-239-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -154,6 +154,7 @@ src_prepare() {
 
# Add local patches here
PATCHES+=(
+   "${FILESDIR}"/239-debug-extra.patch
)
 
if ! use vanilla; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2018-03-26 Thread Pacho Ramos 
commit: 21bf005cd5ebd9245ee07c183a93b0deae574a66
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Mar 26 21:12:29 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Mar 26 21:12:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bf005c

sys-apps/systemd: Apply upstream patch to fix check for address to keep 
interface names stable (also fixing bug #651414 affecting NM failing to 
reconnect properly after suspend).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...-check-for-address-to-keep-interface-8458.patch |  37 ++
 sys-apps/systemd/systemd-238-r2.ebuild | 437 +
 2 files changed, 474 insertions(+)

diff --git 
a/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch
 
b/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch
new file mode 100644
index 000..693d67152ea
--- /dev/null
+++ 
b/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch
@@ -0,0 +1,37 @@
+From 8eebb6a9e5e74ec0ef40902e2da53d24559b94a4 Mon Sep 17 00:00:00 2001
+From: Filipe Brandenburger 
+Date: Thu, 15 Mar 2018 10:42:38 -0700
+Subject: [PATCH] udev/net-id: Fix check for address to keep interface names
+ stable (#8458)
+
+This was a bug inadvertently added by commit 73fc96c8ac0aa9.
+
+The intent of the check is to "match slot address with device by
+stripping the function" (as the comment above states it), for example
+match network device PCI address :05:00.0 (including a .0 for
+function) to PCI slot address :05:00, but changing that to a streq()
+call prevented the match.
+
+Change that to startswith(), which should both fix the bug and make the
+intent of the check more clear and prevent unintentional bugs from being
+introduced by future refactorings.
+---
+ src/udev/udev-builtin-net_id.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
+index 36994360c7..6efa712930 100644
+--- a/src/udev/udev-builtin-net_id.c
 b/src/udev/udev-builtin-net_id.c
+@@ -297,7 +297,7 @@ static int dev_pci_slot(struct udev_device *dev, struct 
netnames *names) {
+ if (snprintf_ok(str, sizeof str, "%s/%s/address", slots, 
dent->d_name) &&
+ read_one_line_file(str, ) >= 0)
+ /* match slot address with device by stripping the 
function */
+-if (streq(address, 
udev_device_get_sysname(names->pcidev)))
++if 
(startswith(udev_device_get_sysname(names->pcidev), address))
+ hotplug_slot = i;
+ 
+ if (hotplug_slot > 0)
+-- 
+2.16.2
+

diff --git a/sys-apps/systemd/systemd-238-r2.ebuild 
b/sys-apps/systemd/systemd-238-r2.ebuild
new file mode 100644
index 000..c4951b63a00
--- /dev/null
+++ b/sys-apps/systemd/systemd-238-r2.ebuild
@@ -0,0 +1,437 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://github.com/systemd/systemd.git;
+   inherit git-r3
+else
+   SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam 
python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd;
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http 
idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp 
selinux ssl +sysv-utils test usrmerge vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+   sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+   !=sys-process/audit-2:0= )
+   cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+   curl? ( net-misc/curl:0= )
+   elfutils? ( >=dev-libs/elfutils-0.158:0= )
+   gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+   http? (
+   >=net-libs/libmicrohttpd-0.9.33:0=
+   ssl? ( >=net-libs/gnutls-3.1.4:0= )
+   )
+   idn? (
+   libidn2? ( net-dns/libidn2 )
+   !libidn2? ( net-dns/libidn )
+   )
+   importd? (
+   app-arch/bzip2:0=
+   sys-libs/zlib:0=
+   )
+   kmod? ( >=sys-apps/kmod-15:0= )
+   lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+   lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+   nat? ( net-firewall/iptables:0= )
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-12-30 Thread Mike Gilbert 
commit: aac31a78d92fdc12493fee7e77fc169c28885edc
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Dec 31 01:39:36 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Dec 31 01:39:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac31a78

sys-apps/systemd: cleanup gentoo-specific patch naming

 ...default.patch => gentoo-Dont-enable-audit-by-default.patch} |  0
 .../{generator-path.patch => gentoo-generator-path.patch}  |  0
 .../files/{228-noclean-tmp.patch => gentoo-noclean-tmp.patch}  |  0
 ...33-systemd-user-pam.patch => gentoo-systemd-user-pam.patch} |  0
 .../files/{234-uucp-group.patch => gentoo-uucp-group-r0.patch} |  0
 .../files/{236-uucp-group.patch => gentoo-uucp-group-r1.patch} |  0
 sys-apps/systemd/systemd-233-r6.ebuild |  6 +++---
 sys-apps/systemd/systemd-235-r1.ebuild | 10 +-
 sys-apps/systemd/systemd-236-r3.ebuild |  8 
 sys-apps/systemd/systemd-.ebuild   |  8 
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch 
b/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch
similarity index 100%
rename from sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch
rename to sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch

diff --git a/sys-apps/systemd/files/generator-path.patch 
b/sys-apps/systemd/files/gentoo-generator-path.patch
similarity index 100%
rename from sys-apps/systemd/files/generator-path.patch
rename to sys-apps/systemd/files/gentoo-generator-path.patch

diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch 
b/sys-apps/systemd/files/gentoo-noclean-tmp.patch
similarity index 100%
rename from sys-apps/systemd/files/228-noclean-tmp.patch
rename to sys-apps/systemd/files/gentoo-noclean-tmp.patch

diff --git a/sys-apps/systemd/files/233-systemd-user-pam.patch 
b/sys-apps/systemd/files/gentoo-systemd-user-pam.patch
similarity index 100%
rename from sys-apps/systemd/files/233-systemd-user-pam.patch
rename to sys-apps/systemd/files/gentoo-systemd-user-pam.patch

diff --git a/sys-apps/systemd/files/234-uucp-group.patch 
b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
similarity index 100%
rename from sys-apps/systemd/files/234-uucp-group.patch
rename to sys-apps/systemd/files/gentoo-uucp-group-r0.patch

diff --git a/sys-apps/systemd/files/236-uucp-group.patch 
b/sys-apps/systemd/files/gentoo-uucp-group-r1.patch
similarity index 100%
rename from sys-apps/systemd/files/236-uucp-group.patch
rename to sys-apps/systemd/files/gentoo-uucp-group-r1.patch

diff --git a/sys-apps/systemd/systemd-233-r6.ebuild 
b/sys-apps/systemd/systemd-233-r6.ebuild
index d735dd02ab9..fded2f5f4a0 100644
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -158,9 +158,9 @@ src_prepare() {
 
if ! use vanilla; then
PATCHES+=(
-   "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-   "${FILESDIR}/228-noclean-tmp.patch"
-   "${FILESDIR}/233-systemd-user-pam.patch"
+   "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+   "${FILESDIR}/gentoo-noclean-tmp.patch"
+   "${FILESDIR}/gentoo-systemd-user-pam.patch"
)
fi
 

diff --git a/sys-apps/systemd/systemd-235-r1.ebuild 
b/sys-apps/systemd/systemd-235-r1.ebuild
index 1175508fe8d..a0800a27a1d 100644
--- a/sys-apps/systemd/systemd-235-r1.ebuild
+++ b/sys-apps/systemd/systemd-235-r1.ebuild
@@ -156,11 +156,11 @@ src_prepare() {
 
if ! use vanilla; then
PATCHES+=(
-   "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-   "${FILESDIR}/228-noclean-tmp.patch"
-   "${FILESDIR}/233-systemd-user-pam.patch"
-   "${FILESDIR}/234-uucp-group.patch"
-   "${FILESDIR}/generator-path.patch"
+   "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+   "${FILESDIR}/gentoo-noclean-tmp.patch"
+   "${FILESDIR}/gentoo-systemd-user-pam.patch"
+   "${FILESDIR}/gentoo-uucp-group-r0.patch"
+   "${FILESDIR}/gentoo-generator-path.patch"
)
fi
 

diff --git a/sys-apps/systemd/systemd-236-r3.ebuild 
b/sys-apps/systemd/systemd-236-r3.ebuild
index b97c3c364c4..8d68e3a31ba 100644
--- a/sys-apps/systemd/systemd-236-r3.ebuild
+++ b/sys-apps/systemd/systemd-236-r3.ebuild
@@ -154,10 +154,10 @@ src_prepare() {
 
if ! use vanilla; then
PATCHES+=(
-   "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-   "${FILESDIR}/233-systemd-user-pam.patch"
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-12-28 Thread Mike Gilbert 
commit: 74c80b910f8cd292bf52a0d78324ef7bb47ec8e9
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Dec 28 16:00:39 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Dec 28 16:00:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c80b91

sys-apps/systemd: backport networkd bugfix

Closes: https://bugs.gentoo.org/642116
Package-Manager: Portage-2.3.19_p2, Repoman-2.3.6_p36

 sys-apps/systemd/Manifest  |  1 +
 ...generator-Don-t-mistake-NULL-input-as-OOM.patch | 49 --
 ...systemd-236-r1.ebuild => systemd-236-r2.ebuild} |  8 ++--
 3 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 78aba9661e6..aac30281a91 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,4 +2,5 @@ DIST systemd-233-man.tar.gz 31386 BLAKE2B 
e4947e658db3efeec6b5a6adf340d2cc8e8aff
 DIST systemd-233-patches.tar.gz 12553 BLAKE2B 
5d19f2dc82cc6cbd9b2e9393f932dfa3c88a981358b282fe56d43cd432d0ee0c0245e9c13d5460b94d83908b84a382dad3348b999f2356ab3ef2ae2c542a867d
 SHA512 
3081f4cf64542ba64a28fe2eff11d8040af42255eb99b5210db9d583fc4b4360a4a4bb8769a1e43d38474d69ead681974cb98d4605968b38f98fd3d9b40bf211
 DIST systemd-233.tar.gz 4660737 BLAKE2B 
38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2
 SHA512 
5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B 
f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e
 SHA512 
243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
+DIST systemd-236-patches-0.tar.gz 2545 BLAKE2B 
9c5aa8e845726b4324cefa41397b0be283b8583cec4b7ded08b3e8909747015bc55fafd8502eac38c62985d5a8a6364e9d3eb71b68b1950c400bde11c14335d9
 SHA512 
1951fec7ccb1856c7a893a47c6d1931e60465d71ccb9d5a6ace3595d5a2bea75fa92c89aac2791e4deb2df19e580dec87eb0252ed81ed3b8dd4cdf2ca587cf83
 DIST systemd-236.tar.gz 6759035 BLAKE2B 
0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3
 SHA512 
1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515fdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d

diff --git 
a/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch
 
b/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch
deleted file mode 100644
index d1c451835e3..000
--- 
a/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 357ffd95294e1f9a1e91f8ca01213fb7db2b7614 Mon Sep 17 00:00:00 2001
-From: Jan Alexander Steffens 
-Date: Mon, 18 Dec 2017 14:47:18 +0100
-Subject: [PATCH] cryptsetup-generator: Don't mistake NULL input as OOM (#7688)
-
-Since systemd v236, several Arch users complained that
-systemd-cryptsetup-generator exits with an OOM error and that it
-prevents the boot from continuing.
-
-Investigating the diff of cryptsetup-generator between v235 and v236 I
-noticed that create_disk allowed for the `password` and `filtered`
-variables to be NULL (they're handled with `strempty()`) but not their
-`*_escaped` versions, and returned OOM errors in those cases.
-
-Fix this by checking that the input string is non-NULL before deciding
-that `specifier_escape` had an OOM error.
-
-I could not test this fix myself, but some users have reported success.
-
-Downstream bug: https://bugs.archlinux.org/task/56733

- src/cryptsetup/cryptsetup-generator.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cryptsetup/cryptsetup-generator.c 
b/src/cryptsetup/cryptsetup-generator.c
-index 7e61332e5..f91451353 100644
 a/src/cryptsetup/cryptsetup-generator.c
-+++ b/src/cryptsetup/cryptsetup-generator.c
-@@ -111,7 +111,7 @@ static int create_disk(
- return log_error_errno(r, "Failed to generate unit name: %m");
- 
- password_escaped = specifier_escape(password);
--if (!password_escaped)
-+if (password && !password_escaped)
- return log_oom();
- 
- f = fopen(p, "wxe");
-@@ -184,7 +184,7 @@ static int create_disk(
- return r;
- 
- filtered_escaped = specifier_escape(filtered);
--if (!filtered_escaped)
-+if (filtered && !filtered_escaped)
- return log_oom();
- 
- fprintf(f,
--- 
-2.15.1
-

diff --git a/sys-apps/systemd/systemd-236-r1.ebuild 
b/sys-apps/systemd/systemd-236-r2.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-236-r1.ebuild
rename to sys-apps/systemd/systemd-236-r2.ebuild
index

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-10-28 Thread Mike Gilbert 
commit: 2e698f887553690f3172ab1c1cabf36296dd901e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Oct 28 18:57:31 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct 28 18:58:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e698f88

sys-apps/systemd: backport fix for CVE-2017-9217

Bug: https://bugs.gentoo.org/635718
Package-Manager: Portage-2.3.12_p5, Repoman-2.3.3_p75

 sys-apps/systemd/files/CVE-2017-9217.patch |  28 ++
 sys-apps/systemd/systemd-233-r6.ebuild | 462 +
 2 files changed, 490 insertions(+)

diff --git a/sys-apps/systemd/files/CVE-2017-9217.patch 
b/sys-apps/systemd/files/CVE-2017-9217.patch
new file mode 100644
index 000..68d0f36d491
--- /dev/null
+++ b/sys-apps/systemd/files/CVE-2017-9217.patch
@@ -0,0 +1,28 @@
+From a924f43f30f9c4acaf70618dd2a055f8b0f166be Mon Sep 17 00:00:00 2001
+From: Evgeny Vereshchagin 
+Date: Wed, 24 May 2017 08:56:48 +0300
+Subject: [PATCH] resolved: bugfix of null pointer p->question dereferencing
+ (#6020)
+
+See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1621396
+---
+ src/resolve/resolved-dns-packet.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/resolve/resolved-dns-packet.c 
b/src/resolve/resolved-dns-packet.c
+index 652970284..240ee448f 100644
+--- a/src/resolve/resolved-dns-packet.c
 b/src/resolve/resolved-dns-packet.c
+@@ -2269,6 +2269,9 @@ int dns_packet_is_reply_for(DnsPacket *p, const 
DnsResourceKey *key) {
+ if (r < 0)
+ return r;
+ 
++if (!p->question)
++return 0;
++
+ if (p->question->n_keys != 1)
+ return 0;
+ 
+-- 
+2.15.0.rc2
+

diff --git a/sys-apps/systemd/systemd-233-r6.ebuild 
b/sys-apps/systemd/systemd-233-r6.ebuild
new file mode 100644
index 000..e6ffcf46e81
--- /dev/null
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://github.com/systemd/systemd.git;
+   inherit git-r3
+else
+   SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit autotools bash-completion-r1 linux-info multilib-minimal pam 
python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd;
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http
+   idn importd +kmod +lz4 lzma nat pam policykit
+   qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
+   sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+   !=sys-process/audit-2:0= )
+   cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+   curl? ( net-misc/curl:0= )
+   elfutils? ( >=dev-libs/elfutils-0.158:0= )
+   gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+   http? (
+   >=net-libs/libmicrohttpd-0.9.33:0=
+   ssl? ( >=net-libs/gnutls-3.1.4:0= )
+   )
+   idn? ( net-dns/libidn:0= )
+   importd? (
+   app-arch/bzip2:0=
+   sys-libs/zlib:0=
+   )
+   kmod? ( >=sys-apps/kmod-15:0= )
+   lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+   lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+   nat? ( net-firewall/iptables:0= )
+   pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+   qrcode? ( media-gfx/qrencode:0= )
+   seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+   selinux? ( sys-libs/libselinux:0= )
+   sysv-utils? (
+   !sys-apps/systemd-sysv-utils
+   !sys-apps/sysvinit )
+   xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+   abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+   >=sys-apps/baselayout-2.2
+   selinux? ( sec-policy/selinux-base-policy[systemd] )
+   !build? ( || (
+   sys-apps/util-linux[kill(-)]
+   sys-process/procps[kill(+)]
+   sys-apps/coreutils[kill(-)]
+   ) )
+   !sys-auth/nss-myhostname
+   !https://bugs.gentoo.org/show_bug.cgi?id=491398
+   -j1
+
+   udevlibexecdir="${MY_UDEVDIR}"
+   dist_udevhwdb_DATA=
+   DESTDIR="${D}"
+   )
+
+   if multilib_is_native_abi; then
+   emake

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-10-08 Thread Mike Gilbert 
commit: 56ed29f119c41b339fba8eaea6044226355dbe36
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct  8 17:08:39 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct  8 17:09:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ed29f1

sys-apps/systemd: networkd startup fix

Package-Manager: Portage-2.3.10_p4, Repoman-2.3.3_p52

 ...n-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch | 47 ++
 sys-apps/systemd/systemd-235.ebuild|  1 +
 2 files changed, 48 insertions(+)

diff --git 
a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
 
b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
new file mode 100644
index 000..99e7342ffb2
--- /dev/null
+++ 
b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
@@ -0,0 +1,47 @@
+From 3bd3ac67477ea319cc169dbd1c377912cf8ff198 Mon Sep 17 00:00:00 2001
+From: Susant Sahani 
+Date: Sun, 8 Oct 2017 21:51:35 +0530
+Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in
+ kernel.
+
+if FIB Rules in not supported by the kernel then networkd fails to
+start as it retuns error=-EOPNOTSUPP.
+In this case just ignore and let start networkd.
+
+
+sendto(5, {{len=28, type=RTM_GETRULE, 
flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, 
dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, 
flags=0}}, 28, 0, {sa_family=AF_NETLINK, nl_pid=0, nl_groups=}, 16) = 28
+recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=}, 
msg_namelen=128->12, msg_iov=[{iov_base=NULL, iov_len=0}], msg_iovlen=1, 
msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], 
msg_controllen=24, msg_flags=MSG_TRUNC}, MSG_PEEK|MSG_TRUNC) = 48
+recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=}, 
msg_namelen=128->12, msg_iov=[{iov_base={{len=48, type=NLMSG_ERROR, flags=0, 
seq=8, pid=8856}, {error=-EOPNOTSUPP, msg={{len=28, type=RTM_GETRULE, 
flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, 
dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, 
flags=0, iov_len=7416}], msg_iovlen=1, msg_control=[{cmsg_len=20, 
cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=0}, 
MSG_TRUNC) = 48
+```
+
+```
+Oct 08 10:22:24 naomi systemd[1]: Starting Network Service...
+Oct 08 10:22:24 naomi systemd-networkd[983]: Could not enumerate rules: 
Operation not supported
+Oct 08 10:22:24 naomi systemd[1]: systemd-networkd.service: Main process 
exited, code=exited, status=1/FAILURE
+```
+
+Fixes #7027
+---
+ src/network/networkd.c | 6 ++
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/network/networkd.c b/src/network/networkd.c
+index d5ba6893e..7f7223c0c 100644
+--- a/src/network/networkd.c
 b/src/network/networkd.c
+@@ -133,10 +133,8 @@ int main(int argc, char *argv[]) {
+ }
+ 
+ r = manager_rtnl_enumerate_rules(m);
+-if (r < 0) {
+-log_error_errno(r, "Could not enumerate rules: %m");
+-goto out;
+-}
++if (r < 0)
++log_warning_errno(r, "Could not enumerate rules: %m");
+ 
+ r = manager_start(m);
+ if (r < 0) {
+-- 
+2.14.2
+

diff --git a/sys-apps/systemd/systemd-235.ebuild 
b/sys-apps/systemd/systemd-235.ebuild
index 6647d41a680..68265aa9401 100644
--- a/sys-apps/systemd/systemd-235.ebuild
+++ b/sys-apps/systemd/systemd-235.ebuild
@@ -149,6 +149,7 @@ src_unpack() {
 src_prepare() {
local PATCHES=(

"${FILESDIR}"/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
+   
"${FILESDIR}"/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
)
 
if ! use vanilla; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-09-08 Thread Mike Gilbert 
commit: 10dac99b679c3c105be855afc5e75b3a179c4885
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Sep  8 21:15:49 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Sep  8 21:16:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10dac99b

sys-apps/systemd: backport patch for dbus error in logind

Closes: https://bugs.gentoo.org/630424
Package-Manager: Portage-2.3.6_p60, Repoman-2.3.3_p38

 ...-sure-we-don-t-process-the-same-method-ca.patch | 29 ++
 ...systemd-234-r3.ebuild => systemd-234-r4.ebuild} |  1 +
 2 files changed, 30 insertions(+)

diff --git 
a/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
 
b/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
new file mode 100644
index 000..97230f9dd2a
--- /dev/null
+++ 
b/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
@@ -0,0 +1,29 @@
+From f7d27d130eaac222b2d11c4d4415c9b599934da8 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering 
+Date: Sat, 26 Aug 2017 15:19:26 +0200
+Subject: [PATCH] logind: make sure we don't process the same method call twice
+ (#6583)
+
+Tiny mistake, big effect.
+
+Fixes: #6375
+---
+ src/login/logind-session-dbus.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
+index 22e5349a6..649f3c155 100644
+--- a/src/login/logind-session-dbus.c
 b/src/login/logind-session-dbus.c
+@@ -457,7 +457,7 @@ static int method_take_device(sd_bus_message *message, 
void *userdata, sd_bus_er
+ goto error;
+ 
+ session_save(s);
+-return 0;
++return 1;
+ 
+ error:
+ session_device_free(sd);
+-- 
+2.14.1
+

diff --git a/sys-apps/systemd/systemd-234-r3.ebuild 
b/sys-apps/systemd/systemd-234-r4.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-234-r3.ebuild
rename to sys-apps/systemd/systemd-234-r4.ebuild
index 15bf64cd732..2582732b6cc 100644
--- a/sys-apps/systemd/systemd-234-r3.ebuild
+++ b/sys-apps/systemd/systemd-234-r4.ebuild
@@ -151,6 +151,7 @@ src_prepare() {

"${FILESDIR}"/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch

"${FILESDIR}"/234-0002-cryptsetup-fix-infinite-timeout-6486.patch

"${FILESDIR}"/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
+   
"${FILESDIR}"/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
)
 
if ! use vanilla; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-08-13 Thread Mike Gilbert 
commit: 4ad264dbae71c361b268ef521ace36d81b118dc8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug 13 23:32:31 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Aug 13 23:32:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad264db

sys-apps/systemd: backport bug fixes

Bug: https://bugs.gentoo.org/625970
Bug: https://bugs.gentoo.org/625480
Package-Manager: Portage-2.3.6_p34, Repoman-2.3.3_p12

 ...-look-for-generators-in-usr-lib-systemd-s.patch |  4 +-
 ...0002-cryptsetup-fix-infinite-timeout-6486.patch | 43 ++
 ...ke-sure-idn2-conversions-are-roundtrippab.patch | 92 ++
 ...systemd-234-r2.ebuild => systemd-234-r3.ebuild} |  2 +
 4 files changed, 139 insertions(+), 2 deletions(-)

diff --git 
a/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch
 
b/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch
index 47e2730a7b3..6912b481f20 100644
--- 
a/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch
+++ 
b/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch
@@ -1,7 +1,7 @@
 From d9287b10d714175521e3bcd6c53de4819b1357c5 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert 
 Date: Mon, 17 Jul 2017 11:21:25 -0400
-Subject: [PATCH] path-lookup: look for generators in
+Subject: [PATCH 1/3] path-lookup: look for generators in
  {,/usr}/lib/systemd/system-generators
 
 Bug: https://bugs.gentoo.org/625402
@@ -23,5 +23,5 @@ index e2b3f8b74..1ee0e1cdb 100644
  NULL);
  
 -- 
-2.13.3
+2.14.0
 

diff --git 
a/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch 
b/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
new file mode 100644
index 000..8ea131adfd0
--- /dev/null
+++ b/sys-apps/systemd/files/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
@@ -0,0 +1,43 @@
+From 793c786f470aeedf443686cff30f97acaff23a04 Mon Sep 17 00:00:00 2001
+From: Andrew Soutar 
+Date: Mon, 31 Jul 2017 02:19:16 -0400
+Subject: [PATCH 2/3] cryptsetup: fix infinite timeout (#6486)
+
+0004f698d causes `arg_timeout` to be infinity instead of 0 when timeout=0. The
+logic here now matches this change.
+
+Fixes #6381
+---
+ src/cryptsetup/cryptsetup.c | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
+index 3b4c08616..08ed7e53b 100644
+--- a/src/cryptsetup/cryptsetup.c
 b/src/cryptsetup/cryptsetup.c
+@@ -56,7 +56,7 @@ static bool arg_tcrypt_veracrypt = false;
+ static char **arg_tcrypt_keyfiles = NULL;
+ static uint64_t arg_offset = 0;
+ static uint64_t arg_skip = 0;
+-static usec_t arg_timeout = 0;
++static usec_t arg_timeout = USEC_INFINITY;
+ 
+ /* Options Debian's crypttab knows we don't:
+ 
+@@ -670,10 +670,10 @@ int main(int argc, char *argv[]) {
+ if (arg_discards)
+ flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
+ 
+-if (arg_timeout > 0)
+-until = now(CLOCK_MONOTONIC) + arg_timeout;
+-else
++if (arg_timeout == USEC_INFINITY)
+ until = 0;
++else
++until = now(CLOCK_MONOTONIC) + arg_timeout;
+ 
+ arg_key_size = (arg_key_size > 0 ? arg_key_size : (256 / 8));
+ 
+-- 
+2.14.0
+

diff --git 
a/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
 
b/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
new file mode 100644
index 000..e083f854107
--- /dev/null
+++ 
b/sys-apps/systemd/files/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
@@ -0,0 +1,92 @@
+From 47d36aeaebc3083795de40c80e75f0fda48c3053 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Fri, 21 Jul 2017 07:51:07 -0400
+Subject: [PATCH 3/3] resolved: make sure idn2 conversions are roundtrippable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+While working on the gateway→_gateway conversion, I noticed that
+libidn2 strips the leading underscore in some names.
+https://gitlab.com/libidn/libidn2/issues/30 was resolved in
+https://gitlab.com/libidn/libidn2/commit/05d753ea69e2308cd02436d0511f4b844071dc79,
+which disabled "STD3 ASCII rules" by default, i.e. disabled stripping
+of underscores. So the situation is that with previously released libidn2
+versions we would get incorrect behaviour, and once new libidn2 is released,
+we should be OK.
+
+Let's implement a simple test which checks that the name survives the
+roundtrip, and if it doesn't, skip IDN resolution. Under old libidn2 this will
+fail in more cases, and under new libidn2 in fewer, but should

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-07-12 Thread Mike Gilbert 
commit: df2c32b5b39e04b224ac686bdd9845bb893d5ede
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Jul 12 20:19:48 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Jul 12 20:21:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2c32b5

sys-apps/systemd: backport fix for CVE-2017-182

Bug: https://bugs.gentoo.org/623532
Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84

 ...ragment-refuse-units-with-errors-in-RootD.patch | 117 ++
 ...ragment-refuse-units-with-errors-in-certa.patch | 339 +++
 sys-apps/systemd/systemd-233-r4.ebuild | 463 +
 3 files changed, 919 insertions(+)

diff --git 
a/sys-apps/systemd/files/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch
 
b/sys-apps/systemd/files/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch
new file mode 100644
index 000..fe30ef9ff61
--- /dev/null
+++ 
b/sys-apps/systemd/files/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch
@@ -0,0 +1,117 @@
+From 433e7893c6c0f6cbc98d8911fc5149ee9beedb79 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Thu, 6 Jul 2017 13:54:42 -0400
+Subject: [PATCH 2/3] core/load-fragment: refuse units with errors in
+ RootDirectory/RootImage/DynamicUser
+
+Behaviour of the service is completely different with the option off, so the
+service would probably mess up state on disk and do unexpected things.
+---
+ src/core/load-fragment-gperf.gperf.m4 |  6 +++---
+ src/core/load-fragment.c  |  7 +--
+ src/shared/conf-parser.c  | 16 +++-
+ 3 files changed, 19 insertions(+), 10 deletions(-)
+
+diff --git a/src/core/load-fragment-gperf.gperf.m4 
b/src/core/load-fragment-gperf.gperf.m4
+index cb9e6fea2..d0868bf40 100644
+--- a/src/core/load-fragment-gperf.gperf.m4
 b/src/core/load-fragment-gperf.gperf.m4
+@@ -18,8 +18,8 @@ struct ConfigPerfItem;
+ m4_dnl Define the context options only once
+ m4_define(`EXEC_CONTEXT_CONFIG_ITEMS',
+ `$1.WorkingDirectory,config_parse_working_directory, 0,   
  offsetof($1, exec_context)
+-$1.RootDirectory,config_parse_unit_path_printf,  0,   
  offsetof($1, exec_context.root_directory)
+-$1.RootImage,config_parse_unit_path_printf,  0,   
  offsetof($1, exec_context.root_image)
++$1.RootDirectory,config_parse_unit_path_printf,  true,
  offsetof($1, exec_context.root_directory)
++$1.RootImage,config_parse_unit_path_printf,  true,
  offsetof($1, exec_context.root_image)
+ $1.User, config_parse_user_group,0,   
  offsetof($1, exec_context.user)
+ $1.Group,config_parse_user_group,0,   
  offsetof($1, exec_context.group)
+ $1.SupplementaryGroups,  config_parse_user_group_strv,   0,   
  offsetof($1, exec_context.supplementary_groups)
+@@ -35,7 +35,7 @@ $1.UMask,config_parse_mode,  
0,
+ $1.Environment,  config_parse_environ,   0,   
  offsetof($1, exec_context.environment)
+ $1.EnvironmentFile,  config_parse_unit_env_file, 0,   
  offsetof($1, exec_context.environment_files)
+ $1.PassEnvironment,  config_parse_pass_environ,  0,   
  offsetof($1, exec_context.pass_environment)
+-$1.DynamicUser,  config_parse_bool,  0,   
  offsetof($1, exec_context.dynamic_user)
++$1.DynamicUser,  config_parse_bool,  true,
  offsetof($1, exec_context.dynamic_user)
+ $1.StandardInput,config_parse_exec_input,0,   
  offsetof($1, exec_context)
+ $1.StandardOutput,   config_parse_exec_output,   0,   
  offsetof($1, exec_context)
+ $1.StandardError,config_parse_exec_output,   0,   
  offsetof($1, exec_context)
+diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
+index 5b7471c0d..ae4ec5cf0 100644
+--- a/src/core/load-fragment.c
 b/src/core/load-fragment.c
+@@ -242,6 +242,7 @@ int config_parse_unit_path_printf(
+ _cleanup_free_ char *k = NULL;
+ Unit *u = userdata;
+ int r;
++bool fatal = ltype;
+ 
+ assert(filename);
+ assert(lvalue);
+@@ -250,8 +251,10 @@ int config_parse_unit_path_printf(
+ 
+ r = unit_full_printf(u, rvalue, );
+ if (r < 0) {
+-log_syntax(unit, LOG_ERR, filename,

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-06-28 Thread Mike Gilbert 
commit: 6d6384e102e34db05c2897b20d63587173f141c5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Jun 28 17:01:09 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Jun 28 17:01:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d6384e1

sys-apps/systemd: backport fix for CVE-2017-9445

Bug: https://bugs.gentoo.org/622874
Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77

 sys-apps/systemd/files/233-CVE-2017-9445.patch | 178 ++
 sys-apps/systemd/systemd-233-r2.ebuild | 460 +
 2 files changed, 638 insertions(+)

diff --git a/sys-apps/systemd/files/233-CVE-2017-9445.patch 
b/sys-apps/systemd/files/233-CVE-2017-9445.patch
new file mode 100644
index 000..a05c41f47b6
--- /dev/null
+++ b/sys-apps/systemd/files/233-CVE-2017-9445.patch
@@ -0,0 +1,178 @@
+From 29bb43cc46412366fc939c66331a916de07bfac4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Sun, 18 Jun 2017 16:07:57 -0400
+Subject: [PATCH 1/4] resolved: simplify alloc size calculation
+
+The allocation size was calculated in a complicated way, and for values
+close to the page size we would actually allocate less than requested.
+
+Reported by Chris Coulson .
+
+CVE-2017-9445
+---
+ src/resolve/resolved-dns-packet.c | 8 +---
+ src/resolve/resolved-dns-packet.h | 2 --
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/src/resolve/resolved-dns-packet.c 
b/src/resolve/resolved-dns-packet.c
+index 652970284..2034e3c8c 100644
+--- a/src/resolve/resolved-dns-packet.c
 b/src/resolve/resolved-dns-packet.c
+@@ -47,13 +47,7 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, 
size_t mtu) {
+ 
+ assert(ret);
+ 
+-if (mtu <= UDP_PACKET_HEADER_SIZE)
+-a = DNS_PACKET_SIZE_START;
+-else
+-a = mtu - UDP_PACKET_HEADER_SIZE;
+-
+-if (a < DNS_PACKET_HEADER_SIZE)
+-a = DNS_PACKET_HEADER_SIZE;
++a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
+ 
+ /* round up to next page size */
+ a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - 
ALIGN(sizeof(DnsPacket));
+diff --git a/src/resolve/resolved-dns-packet.h 
b/src/resolve/resolved-dns-packet.h
+index 2c92392e4..3abcaf8cf 100644
+--- a/src/resolve/resolved-dns-packet.h
 b/src/resolve/resolved-dns-packet.h
+@@ -66,8 +66,6 @@ struct DnsPacketHeader {
+ /* With EDNS0 we can use larger packets, default to 4096, which is what is 
commonly used */
+ #define DNS_PACKET_UNICAST_SIZE_LARGE_MAX 4096
+ 
+-#define DNS_PACKET_SIZE_START 512
+-
+ struct DnsPacket {
+ int n_ref;
+ DnsProtocol protocol;
+-- 
+2.13.1
+
+
+From cd3d8a7ebc01cd6913eaa9a591f7d606038a7588 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Tue, 27 Jun 2017 14:20:00 -0400
+Subject: [PATCH 2/4] resolved: do not allocate packets with minimum size
+
+dns_packet_new() is sometimes called with mtu == 0, and in that case we should
+allocate more than the absolute minimum (which is the dns packet header size),
+otherwise we have to resize immediately again after appending the first data to
+the packet.
+
+This partially reverts the previous commit.
+---
+ src/resolve/resolved-dns-packet.c | 12 +++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/resolve/resolved-dns-packet.c 
b/src/resolve/resolved-dns-packet.c
+index 2034e3c8c..9d806ab33 100644
+--- a/src/resolve/resolved-dns-packet.c
 b/src/resolve/resolved-dns-packet.c
+@@ -28,6 +28,9 @@
+ 
+ #define EDNS0_OPT_DO (1<<15)
+ 
++#define DNS_PACKET_SIZE_START 512
++assert_cc(DNS_PACKET_SIZE_START > UDP_PACKET_HEADER_SIZE)
++
+ typedef struct DnsPacketRewinder {
+ DnsPacket *packet;
+ size_t saved_rindex;
+@@ -47,7 +50,14 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, 
size_t mtu) {
+ 
+ assert(ret);
+ 
+-a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
++/* When dns_packet_new() is called with mtu == 0, allocate more than 
the
++ * absolute minimum (which is the dns packet header size), to avoid
++ * resizing immediately again after appending the first data to the 
packet.
++ */
++if (mtu < UDP_PACKET_HEADER_SIZE)
++a = DNS_PACKET_SIZE_START;
++else
++a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
+ 
+ /* round up to next page size */
+ a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - 
ALIGN(sizeof(DnsPacket));
+-- 
+2.13.1
+
+
+From a03fc1acd66d23e239f2545e9a6887c7d0aad7c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Tue, 27 Jun 2017 16:59:06 -0400
+Subject: [PATCH 3/4] resolved: define various packet sizes as unsigned
+
+This seems like the right thing to do, and apparently at least some compilers
+warn about signed/unsigned

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-03-12 Thread Mike Gilbert 
commit: 3d96b2887c29e934abd6eb6a42cb554146a14eed
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Mar 12 17:58:54 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Mar 12 17:59:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d96b288

sys-apps/systemd: backport dm abi fix

Package-Manager: Portage-2.3.3_p79, Repoman-2.3.1_p72

 ...ct-DM-interface-version-dependencies-5519.patch | 456 +
 .../{systemd-233.ebuild => systemd-233-r1.ebuild}  |   1 +
 2 files changed, 457 insertions(+)

diff --git 
a/sys-apps/systemd/files/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch
 
b/sys-apps/systemd/files/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch
new file mode 100644
index 000..be41fc4ec22
--- /dev/null
+++ 
b/sys-apps/systemd/files/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch
@@ -0,0 +1,456 @@
+From dac3407f02116b94866224e0b5ecd46a5fa1c161 Mon Sep 17 00:00:00 2001
+From: Michael Biebl 
+Date: Thu, 2 Mar 2017 19:11:37 +0100
+Subject: [PATCH] Avoid strict DM interface version dependencies (#5519)
+
+Compiling against the dm-ioctl.h header as provided by the Linux kernel
+will embed the DM interface version number. Running an older kernel can
+result in an error like this on shutdown:
+
+Could not detach DM dm-11: ioctl mismatch, kernel(4.34.4), user(4.35.4)
+
+Work around this by shipping a local copy of dm-ioctl.h. We need at
+least the version from 3.13 for DM_DEFERRED_REMOVE [1], so bump the
+requirements in README accordingly.
+
+[1] 
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2c140a246dc0bc085b98eddde978060fcec1080c
+
+Fixes: #5492
+---
+ Makefile.am  |   1 +
+ README   |   2 +-
+ src/core/umount.c|   2 +-
+ src/shared/dissect-image.c   |   2 +-
+ src/shared/linux-3.13/dm-ioctl.h | 355 +++
+ 5 files changed, 359 insertions(+), 3 deletions(-)
+ create mode 100644 src/shared/linux-3.13/dm-ioctl.h
+
+diff --git a/Makefile.am b/Makefile.am
+index 2a5610740..65de9f16d 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -1018,6 +1018,7 @@ libshared_la_SOURCES = \
+   src/shared/gpt.h \
+   src/shared/udev-util.h \
+   src/shared/linux/auto_dev-ioctl.h \
++  src/shared/linux-3.13/dm-ioctl.h \
+   src/shared/initreq.h \
+   src/shared/dns-domain.c \
+   src/shared/dns-domain.h \
+diff --git a/README b/README
+index a4a649395..30b5f7187 100644
+--- a/README
 b/README
+@@ -35,7 +35,7 @@ LICENSE:
+ - except src/udev/* which is (currently still) GPLv2, GPLv2+
+ 
+ REQUIREMENTS:
+-Linux kernel >= 3.12
++Linux kernel >= 3.13
+ Linux kernel >= 4.2 for unified cgroup hierarchy support
+ 
+ Kernel Config Options:
+diff --git a/src/core/umount.c b/src/core/umount.c
+index 2f4b12bdb..454383e7e 100644
+--- a/src/core/umount.c
 b/src/core/umount.c
+@@ -19,7 +19,6 @@
+ 
+ #include 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+@@ -31,6 +30,7 @@
+ #include "escape.h"
+ #include "fd-util.h"
+ #include "fstab-util.h"
++#include "linux-3.13/dm-ioctl.h"
+ #include "list.h"
+ #include "mount-setup.h"
+ #include "path-util.h"
+diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
+index 39e724c51..1c9d21566 100644
+--- a/src/shared/dissect-image.c
 b/src/shared/dissect-image.c
+@@ -20,7 +20,6 @@
+ #ifdef HAVE_LIBCRYPTSETUP
+ #include 
+ #endif
+-#include 
+ #include 
+ 
+ #include "architecture.h"
+@@ -32,6 +31,7 @@
+ #include "fs-util.h"
+ #include "gpt.h"
+ #include "hexdecoct.h"
++#include "linux-3.13/dm-ioctl.h"
+ #include "mount-util.h"
+ #include "path-util.h"
+ #include "stat-util.h"
+diff --git a/src/shared/linux-3.13/dm-ioctl.h 
b/src/shared/linux-3.13/dm-ioctl.h
+new file mode 100644
+index 0..c8a430209
+--- /dev/null
 b/src/shared/linux-3.13/dm-ioctl.h
+@@ -0,0 +1,355 @@
++/*
++ * Copyright (C) 2001 - 2003 Sistina Software (UK) Limited.
++ * Copyright (C) 2004 - 2009 Red Hat, Inc. All rights reserved.
++ *
++ * This file is released under the LGPL.
++ */
++
++#ifndef _LINUX_DM_IOCTL_V4_H
++#define _LINUX_DM_IOCTL_V4_H
++
++#include 
++
++#define DM_DIR "mapper"   /* Slashes not supported */
++#define DM_CONTROL_NODE "control"
++#define DM_MAX_TYPE_NAME 16
++#define DM_NAME_LEN 128
++#define DM_UUID_LEN 129
++
++/*
++ * A traditional ioctl interface for the device mapper.
++ *
++ * Each device can have two tables associated with it, an
++ * 'active' table which is the one currently used by io passing
++ * through the device, and an 'inactive' one which is a table
++ * that is being prepared as a replacement for the 'active' one.
++ *
++ * DM_VERSION:
++ * Just get the version information for the ioctl interface.
++ *
++ * DM_REMOVE_ALL:
++ * Remove all dm devices, destroy all tables.  Only really used
++ * for

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2017-01-03 Thread Mike Gilbert 
commit: d8a4eca97c26279ab339be03dd587ff25644d851
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Jan  3 18:14:18 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Jan  3 18:15:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a4eca9

sys-apps/systemd: backport lz4 version check fix

226 does not check the version at all, so skip it.

Bug: https://bugs.gentoo.org/595210
Package-Manager: Portage-2.3.3_p13, Repoman-2.3.1_p6

 sys-apps/systemd/files/232-lz4-version.patch | 44 
 sys-apps/systemd/systemd-231.ebuild  |  3 +-
 sys-apps/systemd/systemd-232.ebuild  |  3 +-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/files/232-lz4-version.patch 
b/sys-apps/systemd/files/232-lz4-version.patch
new file mode 100644
index ..d99ceda
--- /dev/null
+++ b/sys-apps/systemd/files/232-lz4-version.patch
@@ -0,0 +1,44 @@
+From 3d4cf7de48a74726694abbaa09f9804b845ff3ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Wed, 23 Nov 2016 10:18:30 -0500
+Subject: [PATCH] build-sys: check for lz4 in the old and new numbering scheme
+ (#4717)
+
+lz4 upstream decided to switch to an incompatible numbering scheme
+(1.7.3 follows 131, to match the so version).
+PKG_CHECK_MODULES does not allow two version matches for the same package,
+so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for
+"new" numbers (anything below 10 is assume to be new), once for the "old"
+numbers (anything above >= 125). This assumes that the "new" versioning
+will not get to 10 to quickly. I think that's a safe assumption, lz4 is a
+mature project.
+
+Fixed #4690.
+---
+ configure.ac | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 65eaae1ae..5979de4dc 100644
+--- a/configure.ac
 b/configure.ac
+@@ -621,10 +621,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
+ have_lz4=no
+ AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [disable optional LZ4 
support]))
+ AS_IF([test "x$enable_lz4" != "xno"], [
+-PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
+-   [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
++PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ],
++   [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
+ have_lz4=yes],
+-have_lz4=no)
++[PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
++  [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
++  have_lz4=yes],
++  have_lz4=no)])
+ AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
+   [AC_MSG_ERROR([*** LZ4 support requested but libraries not 
found])])
+ ])
+-- 
+2.11.0
+

diff --git a/sys-apps/systemd/systemd-231.ebuild 
b/sys-apps/systemd/systemd-231.ebuild
index 1561160..e27e74f 100644
--- a/sys-apps/systemd/systemd-231.ebuild
+++ b/sys-apps/systemd/systemd-231.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -162,6 +162,7 @@ src_prepare() {
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
 
local PATCHES=(
+   "${FILESDIR}/232-lz4-version.patch"
"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
"${FILESDIR}/228-noclean-tmp.patch"
)

diff --git a/sys-apps/systemd/systemd-232.ebuild 
b/sys-apps/systemd/systemd-232.ebuild
index 431852f..d2e71ed 100644
--- a/sys-apps/systemd/systemd-232.ebuild
+++ b/sys-apps/systemd/systemd-232.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -150,6 +150,7 @@ src_prepare() {
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
 
local PATCHES=(
+   "${FILESDIR}/232-lz4-version.patch"
)
 
if ! use vanilla; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2016-12-18 Thread Mike Gilbert 
commit: db84e270c44409f10a83c6db053bd4cb3418a37b
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Dec 18 23:06:34 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Dec 18 23:07:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db84e270

sys-apps/systemd: update systemd-user-pam patch

Package-Manager: Portage-2.3.3_p7, Repoman-2.3.1

 sys-apps/systemd/files/233-systemd-user-pam.patch | 16 
 sys-apps/systemd/systemd-.ebuild  |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/sys-apps/systemd/files/233-systemd-user-pam.patch 
b/sys-apps/systemd/files/233-systemd-user-pam.patch
new file mode 100644
index ..eb2223e
--- /dev/null
+++ b/sys-apps/systemd/files/233-systemd-user-pam.patch
@@ -0,0 +1,16 @@
+--- a/src/login/systemd-user.m4
 b/src/login/systemd-user.m4
+@@ -2,11 +2,7 @@
+ #
+ # Used by systemd --user instances.
+ 
+-account required pam_unix.so
+-m4_ifdef(`HAVE_SELINUX',
+-session required pam_selinux.so close
+-session required pam_selinux.so nottys open
+-)m4_dnl
+-session required pam_loginuid.so
++account include system-auth
++session include system-auth
+ session optional pam_keyinit.so force revoke
+ session optional pam_systemd.so

diff --git a/sys-apps/systemd/systemd-.ebuild 
b/sys-apps/systemd/systemd-.ebuild
index cf316ac..fd6a46f 100644
--- a/sys-apps/systemd/systemd-.ebuild
+++ b/sys-apps/systemd/systemd-.ebuild
@@ -156,7 +156,7 @@ src_prepare() {
PATCHES+=(
"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
"${FILESDIR}/228-noclean-tmp.patch"
-   "${FILESDIR}/232-systemd-user-pam.patch"
+   "${FILESDIR}/233-systemd-user-pam.patch"
)
fi

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2016-04-16 Thread Mike Gilbert 
commit: 9fa567f59170f6a859e83c6ca2dfccf969632896
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 16 20:31:44 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 16 20:32:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa567f5

sys-apps/systemd: Backport sysmacros fix

Package-Manager: portage-2.2.28_p3

 sys-apps/systemd/files/229-sysmacros.patch | 79 ++
 sys-apps/systemd/systemd-229-r100.ebuild   |  1 +
 sys-apps/systemd/systemd-229.ebuild|  1 +
 3 files changed, 81 insertions(+)

diff --git a/sys-apps/systemd/files/229-sysmacros.patch 
b/sys-apps/systemd/files/229-sysmacros.patch
new file mode 100644
index 000..7b0dfbf
--- /dev/null
+++ b/sys-apps/systemd/files/229-sysmacros.patch
@@ -0,0 +1,79 @@
+From 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Mon, 14 Mar 2016 17:44:49 -0400
+Subject: [PATCH] include sys/sysmacros.h in more places
+
+Since glibc is moving away from implicitly including sys/sysmacros.h
+all the time via sys/types.h, include the header directly in more
+places.  This seems to cover most makedev/major/minor usage.
+---
+ src/basic/macro.h   | 1 +
+ src/basic/util.h| 1 +
+ src/libudev/libudev.h   | 1 +
+ src/systemd/sd-device.h | 1 +
+ src/udev/udev.h | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/basic/macro.h b/src/basic/macro.h
+index c34441d..b36a956 100644
+--- a/src/basic/macro.h
 b/src/basic/macro.h
+@@ -23,6 +23,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
+diff --git a/src/basic/util.h b/src/basic/util.h
+index e095254..286db05 100644
+--- a/src/basic/util.h
 b/src/basic/util.h
+@@ -36,6 +36,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
+index eb58740..3f6d0ed 100644
+--- a/src/libudev/libudev.h
 b/src/libudev/libudev.h
+@@ -21,6 +21,7 @@
+ #define _LIBUDEV_H_
+ 
+ #include 
++#include 
+ #include 
+ 
+ #ifdef __cplusplus
+diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h
+index 5bfca6e..c1d0756 100644
+--- a/src/systemd/sd-device.h
 b/src/systemd/sd-device.h
+@@ -22,6 +22,7 @@
+ ***/
+ 
+ #include 
++#include 
+ #include 
+ 
+ #include "_sd-common.h"
+diff --git a/src/udev/udev.h b/src/udev/udev.h
+index 5659051..8433e8d 100644
+--- a/src/udev/udev.h
 b/src/udev/udev.h
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include 
++#include 
+ #include 
+ 
+ #include "libudev.h"
+-- 
+2.8.1
+

diff --git a/sys-apps/systemd/systemd-229-r100.ebuild 
b/sys-apps/systemd/systemd-229-r100.ebuild
index cd9d446..66357cf 100644
--- a/sys-apps/systemd/systemd-229-r100.ebuild
+++ b/sys-apps/systemd/systemd-229-r100.ebuild
@@ -153,6 +153,7 @@ src_prepare() {
"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
"${FILESDIR}/228-noclean-tmp.patch"
"${FILESDIR}/linux-headers-if.h.patch"
+   "${FILESDIR}/229-sysmacros.patch"
)
[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
 

diff --git a/sys-apps/systemd/systemd-229.ebuild 
b/sys-apps/systemd/systemd-229.ebuild
index 0a35d50..0c297d2 100644
--- a/sys-apps/systemd/systemd-229.ebuild
+++ b/sys-apps/systemd/systemd-229.ebuild
@@ -153,6 +153,7 @@ src_prepare() {
"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
"${FILESDIR}/228-noclean-tmp.patch"
"${FILESDIR}/linux-headers-if.h.patch"
+   "${FILESDIR}/229-sysmacros.patch"
)
[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2015-12-12 Thread Mike Gilbert 
commit: ab855566294f01bf4fedf03d1cf12035c5c4b923
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Dec 12 15:16:23 2015 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Dec 12 15:16:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab855566

sys-apps/systemd: Backport build fix for IA64

Bug: https://bugs.gentoo.org/560492

Package-Manager: portage-2.2.26_p25

 sys-apps/systemd/files/226-kcmp.patch  | 31 +++
 sys-apps/systemd/systemd-226-r2.ebuild |  1 +
 2 files changed, 32 insertions(+)

diff --git a/sys-apps/systemd/files/226-kcmp.patch 
b/sys-apps/systemd/files/226-kcmp.patch
new file mode 100644
index 000..a91f49f
--- /dev/null
+++ b/sys-apps/systemd/files/226-kcmp.patch
@@ -0,0 +1,31 @@
+From 75b554579b4e962e2c02053129a37611a2dc9133 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Mon, 14 Sep 2015 18:55:09 -0400
+Subject: [PATCH] Add fallback for kcmp() in case __NR_kcmp is undefined
+
+IA64 is missing this syscall as of linux-4.2.
+This works around it until the necessary kernel patch gets merged.
+---
+ src/basic/missing.h | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index dc1f244..371ef8a 100644
+--- a/src/basic/missing.h
 b/src/basic/missing.h
+@@ -1028,7 +1028,12 @@ static inline int renameat2(int oldfd, const char 
*oldname, int newfd, const cha
+ 
+ #if !HAVE_DECL_KCMP
+ static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, 
unsigned long idx2) {
++#if defined(__NR_kcmp)
+ return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2);
++#else
++errno = ENOSYS;
++return -1;
++#endif
+ }
+ #endif
+ 
+-- 
+2.6.4
+

diff --git a/sys-apps/systemd/systemd-226-r2.ebuild 
b/sys-apps/systemd/systemd-226-r2.ebuild
index 10471ac..44742e8 100644
--- a/sys-apps/systemd/systemd-226-r2.ebuild
+++ b/sys-apps/systemd/systemd-226-r2.ebuild
@@ -147,6 +147,7 @@ src_prepare() {
epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
epatch "${FILESDIR}/226-noclean-tmp.patch"
epatch "${FILESDIR}/CVE-2015-7510.patch"
+   epatch "${FILESDIR}/226-kcmp.patch"
epatch_user
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2015-11-24 Thread Mike Gilbert 
commit: 7f59a94c88c938260171d6b5327ea8ae79a032c1
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Nov 24 16:25:56 2015 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Nov 24 16:26:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f59a94c

sys-apps/systemd: Backport fix for CVE-2015-7510

Bug: https://bugs.gentoo.org/566716

Package-Manager: portage-2.2.25_p7

 sys-apps/systemd/files/CVE-2015-7510.patch | 37 ++
 ...systemd-226-r1.ebuild => systemd-226-r2.ebuild} |  1 +
 .../{systemd-228.ebuild => systemd-228-r1.ebuild}  |  1 +
 3 files changed, 39 insertions(+)

diff --git a/sys-apps/systemd/files/CVE-2015-7510.patch 
b/sys-apps/systemd/files/CVE-2015-7510.patch
new file mode 100644
index 000..088adbb
--- /dev/null
+++ b/sys-apps/systemd/files/CVE-2015-7510.patch
@@ -0,0 +1,37 @@
+From cb31827d62066a04b02111df3052949fda4b6888 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Mon, 23 Nov 2015 13:59:43 -0500
+Subject: [PATCH] nss-mymachines: do not allow overlong machine names
+
+https://github.com/systemd/systemd/issues/2002
+---
+ src/nss-mymachines/nss-mymachines.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/nss-mymachines/nss-mymachines.c 
b/src/nss-mymachines/nss-mymachines.c
+index 969fa96..c98a959 100644
+--- a/src/nss-mymachines/nss-mymachines.c
 b/src/nss-mymachines/nss-mymachines.c
+@@ -416,6 +416,9 @@ enum nss_status _nss_mymachines_getpwnam_r(
+ if (!e || e == p)
+ goto not_found;
+ 
++if (e - p > HOST_NAME_MAX - 1) /* -1 for the last dash */
++goto not_found;
++
+ r = parse_uid(e + 1, );
+ if (r < 0)
+ goto not_found;
+@@ -573,6 +576,9 @@ enum nss_status _nss_mymachines_getgrnam_r(
+ if (!e || e == p)
+ goto not_found;
+ 
++if (e - p > HOST_NAME_MAX - 1)  /* -1 for the last dash */
++goto not_found;
++
+ r = parse_gid(e + 1, );
+ if (r < 0)
+ goto not_found;
+-- 
+2.6.3
+

diff --git a/sys-apps/systemd/systemd-226-r1.ebuild 
b/sys-apps/systemd/systemd-226-r2.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-226-r1.ebuild
rename to sys-apps/systemd/systemd-226-r2.ebuild
index 9a7bc96..10471ac 100644
--- a/sys-apps/systemd/systemd-226-r1.ebuild
+++ b/sys-apps/systemd/systemd-226-r2.ebuild
@@ -146,6 +146,7 @@ src_prepare() {
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
epatch "${FILESDIR}/226-noclean-tmp.patch"
+   epatch "${FILESDIR}/CVE-2015-7510.patch"
epatch_user
eautoreconf
 }

diff --git a/sys-apps/systemd/systemd-228.ebuild 
b/sys-apps/systemd/systemd-228-r1.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-228.ebuild
rename to sys-apps/systemd/systemd-228-r1.ebuild
index 440c35f..1ca11da 100644
--- a/sys-apps/systemd/systemd-228.ebuild
+++ b/sys-apps/systemd/systemd-228-r1.ebuild
@@ -146,6 +146,7 @@ src_prepare() {
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
epatch "${FILESDIR}/228-noclean-tmp.patch"
+   epatch "${FILESDIR}/CVE-2015-7510.patch"
epatch_user
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

2015-10-25 Thread Michał Górny 
commit: cff9b423cf44e94d3f370dc81acc53a1cdf78e34
Author: Elias Probst  eliasprobst  eu>
AuthorDate: Sat Oct 24 21:08:36 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct 24 21:08:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff9b423

sys-apps/systemd: Update `noclean-tmp` patch

>From `sys-apps/systemd-228` on, many `tmpfiles.d` definitions were
switched from `v` (subvolume) to `q` (subvolume with quota).

Package-Manager: portage-2.2.23

 sys-apps/systemd/files/228-noclean-tmp.patch | 28 
 sys-apps/systemd/systemd-.ebuild |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch 
b/sys-apps/systemd/files/228-noclean-tmp.patch
new file mode 100644
index 000..769aa04
--- /dev/null
+++ b/sys-apps/systemd/files/228-noclean-tmp.patch
@@ -0,0 +1,28 @@
+From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Fri, 25 Sep 2015 10:26:18 -0400
+Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp
+
+Bug: https://bugs.gentoo.org/490676
+---
+ tmpfiles.d/tmp.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
+index 6bbd1aa..a361062 100644
+--- a/tmpfiles.d/tmp.conf
 b/tmpfiles.d/tmp.conf
+@@ -8,8 +8,8 @@
+ # See tmpfiles.d(5) for details
+ 
+ # Clear tmp directories separately, to make them easier to override
+-q /tmp 1777 root root 10d
+-q /var/tmp 1777 root root 30d
++q /tmp 1777 root root
++q /var/tmp 1777 root root
+ 
+ # Exclude namespace mountpoints created with PrivateTmp=yes
+ x /tmp/systemd-private-%b-*
+-- 
+2.4.10
+

diff --git a/sys-apps/systemd/systemd-.ebuild 
b/sys-apps/systemd/systemd-.ebuild
index 72c65e0..c196654 100644
--- a/sys-apps/systemd/systemd-.ebuild
+++ b/sys-apps/systemd/systemd-.ebuild
@@ -145,7 +145,7 @@ src_prepare() {
# Bug 463376
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-   epatch "${FILESDIR}/226-noclean-tmp.patch"
+   epatch "${FILESDIR}/228-noclean-tmp.patch"
epatch_user
eautoreconf
 }