diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
| commit | 0fb71e0215ed52863e462cccef73c01aff44d43d (patch) | |
| tree | 428fc3fa92f9c69ed02878e9b6151a9fb810e651 /sys-apps/systemd | |
| parent | 9bd54251864651f49e673a08aec9ef79cfe08f04 (diff) | |
gentoo resync : 18.12.2017
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/Manifest | 15 | ||||
| -rw-r--r-- | sys-apps/systemd/files/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch | 456 | ||||
| -rw-r--r-- | sys-apps/systemd/files/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch | 117 | ||||
| -rw-r--r-- | sys-apps/systemd/files/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch | 339 | ||||
| -rw-r--r-- | sys-apps/systemd/files/233-CVE-2017-9445.patch | 149 | ||||
| -rw-r--r-- | sys-apps/systemd/files/233-format-warnings.patch | 84 | ||||
| -rw-r--r-- | sys-apps/systemd/files/CVE-2017-9217.patch | 28 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-233-r4.ebuild | 460 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-233-r5.ebuild | 461 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-233-r6.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-236.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 3 |
12 files changed, 9 insertions, 2113 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 0a5cb69c6f58..2ddb98c4763b 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,27 +1,20 @@ AUX 218-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 AUX 228-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b4298181bec61ffdd7b231181bf764e1ed2dcfa3d5cdadae02ae961e53b796a8b68e0be66ad312f5c0e7521330 SHA512 fc3297cb0ceacdab58cdbd5b6c70c6005312aaa790768f87eb637b8cb26be01ba7c2f5f608893689f0132ac35f19561bc0bc77e34d167f01bdfaea3644b56e71 -AUX 233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch 14035 BLAKE2B 6d8ee6ed32d812a5e39079170f975f20853df777e5014f1eddabd340e1a0f484db26adc67894774ae8d934a00b403f3cccbe78acb74914d0437292e625723cdb SHA512 ab2520e1ab714c9370eb640efe5b465902e7cdca8acbae25c79b5845614311ceab2ce3dbb7fe7b6a0362c6192a3dc812f8248aaa9f813f6e5323e344ccb945a9 -AUX 233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch 6124 BLAKE2B bbe2c7d3f07b464af3824316dff3c59a8333bc5bfcc0c039c35309ede7ff9984b1a4556a59fb11edb97b5bbd66cfd6c075eabf6128f5093b7f8fbba025687542 SHA512 4a700bc40d0b7948cd937a674c5e7b7bb6e2f08a81bebd8d316375662ad198cd9562835ec2da557ec0e5fa927e825cdad8cf2c63ec3e5a4c8d2506e6293125f3 -AUX 233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch 16209 BLAKE2B c1906f3ba707b78c8df8d9fd296548414e9eedbb00ef07a812f6086e8db0da85777b198d4705267211eb8dd34f2a6e6ad8635a5284c28cc315414914ac7a07a8 SHA512 395c0a0a07f17ea5edc876c7541e5b0f7ebfb7e74ef675c7a685a32b5e86d80df0b59c09e345521a54d625093dfe6a9daa9d4ccc6b4529031bfedf16f9bbf824 -AUX 233-CVE-2017-9445.patch 5491 BLAKE2B 9c0e252dbbc273481fde939ef90be1d61046a8c4ae9c288d9aca0167322d669750c7545f572386ddefe2b666ecc26e79fe9f143109946a0be9e0eb6fd002f280 SHA512 16308657911dc3f85520d6de0ee85f04afed1a7940a8a23ece641af2b3766e44e88d8de21cb53afd4db7b8ad8324eeed2860009f3fcc05a227f0c6faafbf351f -AUX 233-format-warnings.patch 3837 BLAKE2B be24951d2b3b70c6596c9fdabf6faf7492791b3ea5310aff77462ab05fca1c82026e7aabe4fd3656dc486e5d11ce8138c64740c66f75a6151107a86282b90958 SHA512 491cdbdb75e1ef338cd660fd89c776e3dd2881922eb04f505dda985104f14813e9da9e758393d906ff224e9e03888cafd05f7e665f71c43580a2989af54981bc AUX 233-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78 AUX 236-uucp-group.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9 AUX CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9 -AUX CVE-2017-9217.patch 863 BLAKE2B 14b98f1a1c8f90d8a2421c5e841e9e34c310c891222caf6078f6849e9290c8713951f274a6f83dd505a22f1c8f34d13f3aaa73943b00a989a52e3d3d34d27880 SHA512 d323c6e79f60bb7abdb4583f021041532d1bf1514500d09d07b0a429b6cfb76787f590de04446ae84d51747b0023042d575aeb07da29e4e8c0ad13656a1877a5 AUX generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a DIST systemd-233-man.tar.gz 31386 BLAKE2B e4947e658db3efeec6b5a6adf340d2cc8e8aff2a14db4932720f90c3dc898b1e78595db983948373a2e28191fb3b0aad234f80feb91ee8ae4b607a44038a9cae SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40 +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.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d -EBUILD systemd-233-r4.ebuild 13626 BLAKE2B 42f723d97bd8cdb8bbbfd579026d486f8902e90ec4e6631ed458371bd840f2ed75fa6ea75ecfa7e3aaafea00cab37c59fb9f7474175b6ad31c683b22ef3484f8 SHA512 3527bc62210aba9c50f663d8023440b73ae6185f1a90e6e31a48b6dcc13ac2dc0b312c433cbe74e942cb50ad894d4dd4212d81caf50d17971c9f965cae9535a0 -EBUILD systemd-233-r5.ebuild 13669 BLAKE2B e97ff5d66a6c93ba08b8c728d4675454f853b1571ae7b71d297e98c214361533be02c1c190f3ce71cdcac1ab65e7f11162bc2d891f151871baa7380c782f0f6a SHA512 722307b55c7621f119dee2e483bb7271d5a460945bd938adee6e679345a3549eaf060c96493b54e7a5bcb94a2821ce31949cfaeb5b1a43aeef36b673ecc39d7c -EBUILD systemd-233-r6.ebuild 13699 BLAKE2B 3ed3402fc222d6ab58406f4c0f92b28864dfaa8af57855148bed7894807ee8598599dcc0a1a13b5eca0776f28e007483c1d45231e629ed950193a5d3b739656e SHA512 8d6f8d99211dbcaa6040657bb7065c2c15b3600f0d5c9e421e7ea3dcd642589679763155dfc80c7cd8ea89ef4afdde3871a2fe70641e49ddf55a7d3908b36751 +EBUILD systemd-233-r6.ebuild 13389 BLAKE2B e0a359f8ca505fc1033951ed7905ac52877ebdf162d27dc15f7c307b2b55471f76bfd97aab92fe5b67a6f1fe55f34c8b14a76057ede2b6e9e5cfa65bda847cd5 SHA512 ad74871cfb5a6f91630ea8018598d5470f881bfcd58baf955c376134c9b5b9321766f749fbbdd58c9438f6ccead3806e3bb243abaa18b53533b5a5bd68eaafe9 EBUILD systemd-235-r1.ebuild 13481 BLAKE2B be0a0674aa5a9c151e03311a5e0ea50f6c879cf3ae9bbbbf49eb6a2f9ad8bea5fe65c113583006d69c60b703311881d5038ff79ede1bf91dff3fbd4c856714a3 SHA512 11245b058f3dea86cef8cd852b5cc59ede421c552e4a7e0d22a2666e87bc33e14df68e0029d169dc3f4189d3d25d8e0147eec20d48d9a2f3cc0b9c3c96ab8e99 -EBUILD systemd-236.ebuild 12740 BLAKE2B d4572ae69d701e36447210aae5dc45e838c43aa39d244dd86fba884dab4a5b93a0716a0b123048cd1f4a369222d6ddcfb4621c17f170541cff928471ce0a4db0 SHA512 bb377eec41c240832afc0a40f23ce9ab8d7dd0442f8539672447f3445c988b232ade71fe4949234be8a5e28a89cc956c7a9c59ba932c2641716213380435ab30 -EBUILD systemd-9999.ebuild 12740 BLAKE2B d4572ae69d701e36447210aae5dc45e838c43aa39d244dd86fba884dab4a5b93a0716a0b123048cd1f4a369222d6ddcfb4621c17f170541cff928471ce0a4db0 SHA512 bb377eec41c240832afc0a40f23ce9ab8d7dd0442f8539672447f3445c988b232ade71fe4949234be8a5e28a89cc956c7a9c59ba932c2641716213380435ab30 +EBUILD systemd-236.ebuild 12817 BLAKE2B c7cb601e2bec78d4f03fcd7958cbf415aa4436c1ef0c0de924cac97e80bc46b9e687ae4b18e2bd1cf78ca2463c613da34a753d5d598c4dfe3dc82aebcfe49add SHA512 b7ad77337fe102094a49d246a77c0725855ab0ef20f4f0352762d35c53b7370bf81a8f8b3801e246e00bba5b1c38ff6d8ed2e90f4a3eb98fe02d69195ecdf72c +EBUILD systemd-9999.ebuild 12817 BLAKE2B c7cb601e2bec78d4f03fcd7958cbf415aa4436c1ef0c0de924cac97e80bc46b9e687ae4b18e2bd1cf78ca2463c613da34a753d5d598c4dfe3dc82aebcfe49add SHA512 b7ad77337fe102094a49d246a77c0725855ab0ef20f4f0352762d35c53b7370bf81a8f8b3801e246e00bba5b1c38ff6d8ed2e90f4a3eb98fe02d69195ecdf72c MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544 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 deleted file mode 100644 index be41fc4ec22c..000000000000 --- a/sys-apps/systemd/files/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch +++ /dev/null @@ -1,456 +0,0 @@ -From dac3407f02116b94866224e0b5ecd46a5fa1c161 Mon Sep 17 00:00:00 2001 -From: Michael Biebl <mbiebl@gmail.com> -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 <errno.h> - #include <fcntl.h> --#include <linux/dm-ioctl.h> - #include <linux/loop.h> - #include <string.h> - #include <sys/mount.h> -@@ -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 <libcryptsetup.h> - #endif --#include <linux/dm-ioctl.h> - #include <sys/mount.h> - - #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 000000000..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 <linux/types.h> -+ -+#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 debug. -+ * -+ * DM_LIST_DEVICES: -+ * Get a list of all the dm device names. -+ * -+ * DM_DEV_CREATE: -+ * Create a new device, neither the 'active' or 'inactive' table -+ * slots will be filled. The device will be in suspended state -+ * after creation, however any io to the device will get errored -+ * since it will be out-of-bounds. -+ * -+ * DM_DEV_REMOVE: -+ * Remove a device, destroy any tables. -+ * -+ * DM_DEV_RENAME: -+ * Rename a device or set its uuid if none was previously supplied. -+ * -+ * DM_SUSPEND: -+ * This performs both suspend and resume, depending which flag is -+ * passed in. -+ * Suspend: This command will not return until all pending io to -+ * the device has completed. Further io will be deferred until -+ * the device is resumed. -+ * Resume: It is no longer an error to issue this command on an -+ * unsuspended device. If a table is present in the 'inactive' -+ * slot, it will be moved to the active slot, then the old table -+ * from the active slot will be _destroyed_. Finally the device -+ * is resumed. -+ * -+ * DM_DEV_STATUS: -+ * Retrieves the status for the table in the 'active' slot. -+ * -+ * DM_DEV_WAIT: -+ * Wait for a significant event to occur to the device. This -+ * could either be caused by an event triggered by one of the -+ * targets of the table in the 'active' slot, or a table change. -+ * -+ * DM_TABLE_LOAD: -+ * Load a table into the 'inactive' slot for the device. The -+ * device does _not_ need to be suspended prior to this command. -+ * -+ * DM_TABLE_CLEAR: -+ * Destroy any table in the 'inactive' slot (ie. abort). -+ * -+ * DM_TABLE_DEPS: -+ * Return a set of device dependencies for the 'active' table. -+ * -+ * DM_TABLE_STATUS: -+ * Return the targets status for the 'active' table. -+ * -+ * DM_TARGET_MSG: -+ * Pass a message string to the target at a specific offset of a device. -+ * -+ * DM_DEV_SET_GEOMETRY: -+ * Set the geometry of a device by passing in a string in this format: -+ * -+ * "cylinders heads sectors_per_track start_sector" -+ * -+ * Beware that CHS geometry is nearly obsolete and only provided -+ * for compatibility with dm devices that can be booted by a PC -+ * BIOS. See struct hd_geometry for range limits. Also note that -+ * the geometry is erased if the device size changes. -+ */ -+ -+/* -+ * All ioctl arguments consist of a single chunk of memory, with -+ * this structure at the start. If a uuid is specified any -+ * lookup (eg. for a DM_INFO) will be done on that, *not* the -+ * name. -+ */ -+struct dm_ioctl { -+ /* -+ * The version number is made up of three parts: -+ * major - no backward or forward compatibility, -+ * minor - only backwards compatible, -+ * patch - both backwards and forwards compatible. -+ * -+ * All clients of the ioctl interface should fill in the -+ * version number of the interface that they were -+ * compiled with. -+ * -+ * All recognised ioctl commands (ie. those that don't -+ * return -ENOTTY) fill out this field, even if the -+ * command failed. -+ */ -+ __u32 version[3]; /* in/out */ -+ __u32 data_size; /* total size of data passed in -+ * including this struct */ -+ -+ __u32 data_start; /* offset to start of data -+ * relative to start of this struct */ -+ -+ __u32 target_count; /* in/out */ -+ __s32 open_count; /* out */ -+ __u32 flags; /* in/out */ -+ -+ /* -+ * event_nr holds either the event number (input and output) or the -+ * udev cookie value (input only). -+ * The DM_DEV_WAIT ioctl takes an event number as input. -+ * The DM_SUSPEND, DM_DEV_REMOVE and DM_DEV_RENAME ioctls -+ * use the field as a cookie to return in the DM_COOKIE -+ * variable with the uevents they issue. -+ * For output, the ioctls return the event number, not the cookie. -+ */ -+ __u32 event_nr; /* in/out */ -+ __u32 padding; -+ -+ __u64 dev; /* in/out */ -+ -+ char name[DM_NAME_LEN]; /* device name */ -+ char uuid[DM_UUID_LEN]; /* unique identifier for -+ * the block device */ -+ char data[7]; /* padding or data */ -+}; -+ -+/* -+ * Used to specify tables. These structures appear after the -+ * dm_ioctl. -+ */ -+struct dm_target_spec { -+ __u64 sector_start; -+ __u64 length; -+ __s32 status; /* used when reading from kernel only */ -+ -+ /* -+ * Location of the next dm_target_spec. -+ * - When specifying targets on a DM_TABLE_LOAD command, this value is -+ * the number of bytes from the start of the "current" dm_target_spec -+ * to the start of the "next" dm_target_spec. -+ * - When retrieving targets on a DM_TABLE_STATUS command, this value -+ * is the number of bytes from the start of the first dm_target_spec -+ * (that follows the dm_ioctl struct) to the start of the "next" -+ * dm_target_spec. -+ */ -+ __u32 next; -+ -+ char target_type[DM_MAX_TYPE_NAME]; -+ -+ /* -+ * Parameter string starts immediately after this object. -+ * Be careful to add padding after string to ensure correct -+ * alignment of subsequent dm_target_spec. -+ */ -+}; -+ -+/* -+ * Used to retrieve the target dependencies. -+ */ -+struct dm_target_deps { -+ __u32 count; /* Array size */ -+ __u32 padding; /* unused */ -+ __u64 dev[0]; /* out */ -+}; -+ -+/* -+ * Used to get a list of all dm devices. -+ */ -+struct dm_name_list { -+ __u64 dev; -+ __u32 next; /* offset to the next record from -+ the _start_ of this */ -+ char name[0]; -+}; -+ -+/* -+ * Used to retrieve the target versions -+ */ -+struct dm_target_versions { -+ __u32 next; -+ __u32 version[3]; -+ -+ char name[0]; -+}; -+ -+/* -+ * Used to pass message to a target -+ */ -+struct dm_target_msg { -+ __u64 sector; /* Device sector */ -+ -+ char message[0]; -+}; -+ -+/* -+ * If you change this make sure you make the corresponding change -+ * to dm-ioctl.c:lookup_ioctl() -+ */ -+enum { -+ /* Top level cmds */ -+ DM_VERSION_CMD = 0, -+ DM_REMOVE_ALL_CMD, -+ DM_LIST_DEVICES_CMD, -+ -+ /* device level cmds */ -+ DM_DEV_CREATE_CMD, -+ DM_DEV_REMOVE_CMD, -+ DM_DEV_RENAME_CMD, -+ DM_DEV_SUSPEND_CMD, -+ DM_DEV_STATUS_CMD, -+ DM_DEV_WAIT_CMD, -+ -+ /* Table level cmds */ -+ DM_TABLE_LOAD_CMD, -+ DM_TABLE_CLEAR_CMD, -+ DM_TABLE_DEPS_CMD, -+ DM_TABLE_STATUS_CMD, -+ -+ /* Added later */ -+ DM_LIST_VERSIONS_CMD, -+ DM_TARGET_MSG_CMD, -+ DM_DEV_SET_GEOMETRY_CMD -+}; -+ -+#define DM_IOCTL 0xfd -+ -+#define DM_VERSION _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl) -+#define DM_REMOVE_ALL _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, struct dm_ioctl) -+#define DM_LIST_DEVICES _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, struct dm_ioctl) -+ -+#define DM_DEV_CREATE _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, struct dm_ioctl) -+#define DM_DEV_REMOVE _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, struct dm_ioctl) -+#define DM_DEV_RENAME _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, struct dm_ioctl) -+#define DM_DEV_SUSPEND _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, struct dm_ioctl) -+#define DM_DEV_STATUS _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, struct dm_ioctl) -+#define DM_DEV_WAIT _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, struct dm_ioctl) -+ -+#define DM_TABLE_LOAD _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, struct dm_ioctl) -+#define DM_TABLE_CLEAR _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, struct dm_ioctl) -+#define DM_TABLE_DEPS _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, struct dm_ioctl) -+#define DM_TABLE_STATUS _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, struct dm_ioctl) -+ -+#define DM_LIST_VERSIONS _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, struct dm_ioctl) -+ -+#define DM_TARGET_MSG _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl) -+#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) -+ -+#define DM_VERSION_MAJOR 4 -+#define DM_VERSION_MINOR 27 -+#define DM_VERSION_PATCHLEVEL 0 -+#define DM_VERSION_EXTRA "-ioctl (2013-10-30)" -+ -+/* Status bits */ -+#define DM_READONLY_FLAG (1 << 0) /* In/Out */ -+#define DM_SUSPEND_FLAG (1 << 1) /* In/Out */ -+#define DM_PERSISTENT_DEV_FLAG (1 << 3) /* In */ -+ -+/* -+ * Flag passed into ioctl STATUS command to get table information -+ * rather than current status. -+ */ -+#define DM_STATUS_TABLE_FLAG (1 << 4) /* In */ -+ -+/* -+ * Flags that indicate whether a table is present in either of -+ * the two table slots that a device has. -+ */ -+#define DM_ACTIVE_PRESENT_FLAG (1 << 5) /* Out */ -+#define DM_INACTIVE_PRESENT_FLAG (1 << 6) /* Out */ -+ -+/* -+ * Indicates that the buffer passed in wasn't big enough for the -+ * results. -+ */ -+#define DM_BUFFER_FULL_FLAG (1 << 8) /* Out */ -+ -+/* -+ * This flag is now ignored. -+ */ -+#define DM_SKIP_BDGET_FLAG (1 << 9) /* In */ -+ -+/* -+ * Set this to avoid attempting to freeze any filesystem when suspending. -+ */ -+#define DM_SKIP_LOCKFS_FLAG (1 << 10) /* In */ -+ -+/* -+ * Set this to suspend without flushing queued ios. -+ * Also disables flushing uncommitted changes in the thin target before -+ * generating statistics for DM_TABLE_STATUS and DM_DEV_WAIT. -+ */ -+#define DM_NOFLUSH_FLAG (1 << 11) /* In */ -+ -+/* -+ * If set, any table information returned will relate to the inactive -+ * table instead of the live one. Always check DM_INACTIVE_PRESENT_FLAG -+ * is set before using the data returned. -+ */ -+#define DM_QUERY_INACTIVE_TABLE_FLAG (1 << 12) /* In */ -+ -+/* -+ * If set, a uevent was generated for which the caller may need to wait. -+ */ -+#define DM_UEVENT_GENERATED_FLAG (1 << 13) /* Out */ -+ -+/* -+ * If set, rename changes the uuid not the name. Only permitted -+ * if no uuid was previously supplied: an existing uuid cannot be changed. -+ */ -+#define DM_UUID_FLAG (1 << 14) /* In */ -+ -+/* -+ * If set, all buffers are wiped after use. Use when sending -+ * or requesting sensitive data such as an encryption key. -+ */ -+#define DM_SECURE_DATA_FLAG (1 << 15) /* In */ -+ -+/* -+ * If set, a message generated output data. -+ */ -+#define DM_DATA_OUT_FLAG (1 << 16) /* Out */ -+ -+/* -+ * If set with DM_DEV_REMOVE or DM_REMOVE_ALL this indicates that if -+ * the device cannot be removed immediately because it is still in use -+ * it should instead be scheduled for removal when it gets closed. -+ * -+ * On return from DM_DEV_REMOVE, DM_DEV_STATUS or other ioctls, this -+ * flag indicates that the device is scheduled to be removed when it -+ * gets closed. -+ */ -+#define DM_DEFERRED_REMOVE (1 << 17) /* In/Out */ -+ -+#endif /* _LINUX_DM_IOCTL_H */ --- -2.12.0 - 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 deleted file mode 100644 index fe30ef9ff617..000000000000 --- a/sys-apps/systemd/files/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 433e7893c6c0f6cbc98d8911fc5149ee9beedb79 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -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, &k); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers on %s, ignoring: %m", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, -+ "Failed to resolve unit specifiers on %s%s: %m", -+ fatal ? "" : ", ignoring", rvalue); -+ return fatal ? -ENOEXEC : 0; - } - - return config_parse_path(unit, filename, line, section, section_line, lvalue, ltype, k, data, userdata); -diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 265ac83dc..ffb905fb6 100644 ---- a/src/shared/conf-parser.c -+++ b/src/shared/conf-parser.c -@@ -614,6 +614,7 @@ int config_parse_bool(const char* unit, - - int k; - bool *b = data; -+ bool fatal = ltype; - - assert(filename); - assert(lvalue); -@@ -622,8 +623,10 @@ int config_parse_bool(const char* unit, - - k = parse_boolean(rvalue); - if (k < 0) { -- log_syntax(unit, LOG_ERR, filename, line, k, "Failed to parse boolean value, ignoring: %s", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, k, -+ "Failed to parse boolean value%s: %s", -+ fatal ? "" : ", ignoring", rvalue); -+ return fatal ? -ENOEXEC : 0; - } - - *b = !!k; -@@ -714,6 +717,7 @@ int config_parse_path( - void *userdata) { - - char **s = data, *n; -+ bool fatal = ltype; - - assert(filename); - assert(lvalue); -@@ -722,12 +726,14 @@ int config_parse_path( - - if (!utf8_is_valid(rvalue)) { - log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue); -- return 0; -+ return fatal ? -ENOEXEC : 0; - } - - if (!path_is_absolute(rvalue)) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Not an absolute path, ignoring: %s", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, 0, -+ "Not an absolute path%s: %s", -+ fatal ? "" : ", ignoring", rvalue); -+ return fatal ? -ENOEXEC : 0; - } - - n = strdup(rvalue); --- -2.13.2 - diff --git a/sys-apps/systemd/files/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch b/sys-apps/systemd/files/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch deleted file mode 100644 index 28961b4b1e36..000000000000 --- a/sys-apps/systemd/files/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch +++ /dev/null @@ -1,339 +0,0 @@ -From f135524cd4cd6b71e7f6073b02389da30c6e94d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Thu, 6 Jul 2017 13:28:19 -0400 -Subject: [PATCH 3/3] core/load-fragment: refuse units with errors in certain - directives - -If an error is encountered in any of the Exec* lines, WorkingDirectory, -SELinuxContext, ApparmorProfile, SmackProcessLabel, Service (in .socket -units), User, or Group, refuse to load the unit. If the config stanza -has support, ignore the failure if '-' is present. - -For those configuration directives, even if we started the unit, it's -pretty likely that it'll do something unexpected (like write files -in a wrong place, or with a wrong context, or run with wrong permissions, -etc). It seems better to refuse to start the unit and have the admin -clean up the configuration without giving the service a chance to mess -up stuff. - -Note that all "security" options that restrict what the unit can do -(Capabilities, AmbientCapabilities, Restrict*, SystemCallFilter, Limit*, -PrivateDevices, Protect*, etc) are _not_ treated like this. Such options are -only supplementary, and are not always available depending on the architecture -and compilation options, so unit authors have to make sure that the service -runs correctly without them anyway. - -Fixes #6237, #6277. ---- - src/core/load-fragment.c | 116 ++++++++++++++++++++++++++++------------------ - src/test/test-unit-file.c | 14 +++--- - 2 files changed, 78 insertions(+), 52 deletions(-) - -diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index ae4ec5cf0..f38240af3 100644 ---- a/src/core/load-fragment.c -+++ b/src/core/load-fragment.c -@@ -637,26 +637,36 @@ int config_parse_exec( - - r = unit_full_printf(u, f, &path); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers on %s, ignoring: %m", f); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, -+ "Failed to resolve unit specifiers on %s%s: %m", -+ f, ignore ? ", ignoring" : ""); -+ return ignore ? 0 : -ENOEXEC; - } - - if (isempty(path)) { - /* First word is either "-" or "@" with no command. */ -- log_syntax(unit, LOG_ERR, filename, line, 0, "Empty path in command line, ignoring: \"%s\"", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, 0, -+ "Empty path in command line%s: \"%s\"", -+ ignore ? ", ignoring" : "", rvalue); -+ return ignore ? 0 : -ENOEXEC; - } - if (!string_is_safe(path)) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Executable path contains special characters, ignoring: %s", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, 0, -+ "Executable path contains special characters%s: %s", -+ ignore ? ", ignoring" : "", rvalue); -+ return ignore ? 0 : -ENOEXEC; - } - if (!path_is_absolute(path)) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Executable path is not absolute, ignoring: %s", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, 0, -+ "Executable path is not absolute%s: %s", -+ ignore ? ", ignoring" : "", rvalue); -+ return ignore ? 0 : -ENOEXEC; - } - if (endswith(path, "/")) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Executable path specifies a directory, ignoring: %s", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, 0, -+ "Executable path specifies a directory%s: %s", -+ ignore ? ", ignoring" : "", rvalue); -+ return ignore ? 0 : -ENOEXEC; - } - - if (!separate_argv0) { -@@ -709,12 +719,14 @@ int config_parse_exec( - if (r == 0) - break; - if (r < 0) -- return 0; -+ return ignore ? 0 : -ENOEXEC; - - r = unit_full_printf(u, word, &resolved); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to resolve unit specifiers on %s, ignoring: %m", word); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, -+ "Failed to resolve unit specifiers on %s%s: %m", -+ word, ignore ? ", ignoring" : ""); -+ return ignore ? 0 : -ENOEXEC; - } - - if (!GREEDY_REALLOC(n, nbufsize, nlen + 2)) -@@ -725,8 +737,10 @@ int config_parse_exec( - } - - if (!n || !n[0]) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Empty executable name or zeroeth argument, ignoring: %s", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, 0, -+ "Empty executable name or zeroeth argument%s: %s", -+ ignore ? ", ignoring" : "", rvalue); -+ return ignore ? 0 : -ENOEXEC; - } - - nce = new0(ExecCommand, 1); -@@ -1333,8 +1347,10 @@ int config_parse_exec_selinux_context( - - r = unit_full_printf(u, rvalue, &k); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m"); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, -+ "Failed to resolve specifiers%s: %m", -+ ignore ? ", ignoring" : ""); -+ return ignore ? 0 : -ENOEXEC; - } - - free(c->selinux_context); -@@ -1381,8 +1397,10 @@ int config_parse_exec_apparmor_profile( - - r = unit_full_printf(u, rvalue, &k); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m"); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, -+ "Failed to resolve specifiers%s: %m", -+ ignore ? ", ignoring" : ""); -+ return ignore ? 0 : -ENOEXEC; - } - - free(c->apparmor_profile); -@@ -1429,8 +1447,10 @@ int config_parse_exec_smack_process_label( - - r = unit_full_printf(u, rvalue, &k); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m"); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, -+ "Failed to resolve specifiers%s: %m", -+ ignore ? ", ignoring" : ""); -+ return ignore ? 0 : -ENOEXEC; - } - - free(c->smack_process_label); -@@ -1648,19 +1668,19 @@ int config_parse_socket_service( - - r = unit_name_printf(UNIT(s), rvalue, &p); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %s", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers: %s", rvalue); -+ return -ENOEXEC; - } - - if (!endswith(p, ".service")) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Unit must be of type service, ignoring: %s", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, 0, "Unit must be of type service: %s", rvalue); -+ return -ENOEXEC; - } - - r = manager_load_unit(UNIT(s)->manager, p, NULL, &error, &x); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to load unit %s, ignoring: %s", rvalue, bus_error_message(&error, r)); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, "Failed to load unit %s: %s", rvalue, bus_error_message(&error, r)); -+ return -ENOEXEC; - } - - unit_ref_set(&s->service, x); -@@ -1911,13 +1931,13 @@ int config_parse_user_group( - - r = unit_full_printf(u, rvalue, &k); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s, ignoring: %m", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s: %m", rvalue); -+ return -ENOEXEC; - } - - if (!valid_user_group_name_or_id(k)) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID, ignoring: %s", k); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k); -+ return -ENOEXEC; - } - - n = k; -@@ -1975,19 +1995,19 @@ int config_parse_user_group_strv( - if (r == -ENOMEM) - return log_oom(); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax, ignoring: %s", rvalue); -- break; -+ log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax: %s", rvalue); -+ return -ENOEXEC; - } - - r = unit_full_printf(u, word, &k); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s, ignoring: %m", word); -- continue; -+ log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s: %m", word); -+ return -ENOEXEC; - } - - if (!valid_user_group_name_or_id(k)) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID, ignoring: %s", k); -- continue; -+ log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k); -+ return -ENOEXEC; - } - - r = strv_push(users, k); -@@ -2146,25 +2166,28 @@ int config_parse_working_directory( - - r = unit_full_printf(u, rvalue, &k); - if (r < 0) { -- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in working directory path '%s', ignoring: %m", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, r, -+ "Failed to resolve unit specifiers in working directory path '%s'%s: %m", -+ rvalue, missing_ok ? ", ignoring" : ""); -+ return missing_ok ? 0 : -ENOEXEC; - } - - path_kill_slashes(k); - - if (!utf8_is_valid(k)) { - log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue); -- return 0; -+ return missing_ok ? 0 : -ENOEXEC; - } - - if (!path_is_absolute(k)) { -- log_syntax(unit, LOG_ERR, filename, line, 0, "Working directory path '%s' is not absolute, ignoring.", rvalue); -- return 0; -+ log_syntax(unit, LOG_ERR, filename, line, 0, -+ "Working directory path '%s' is not absolute%s.", -+ rvalue, missing_ok ? ", ignoring" : ""); -+ return missing_ok ? 0 : -ENOEXEC; - } - -- free_and_replace(c->working_directory, k); -- - c->working_directory_home = false; -+ free_and_replace(c->working_directory, k); - } - - c->working_directory_missing_ok = missing_ok; -@@ -4444,8 +4467,11 @@ int unit_load_fragment(Unit *u) { - return r; - - r = load_from_path(u, k); -- if (r < 0) -+ if (r < 0) { -+ if (r == -ENOEXEC) -+ log_unit_notice(u, "Unit configuration has fatal error, unit will not be started."); - return r; -+ } - - if (u->load_state == UNIT_STUB) { - SET_FOREACH(t, u->names, i) { -diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 12f48bf43..fd797b587 100644 ---- a/src/test/test-unit-file.c -+++ b/src/test/test-unit-file.c -@@ -146,7 +146,7 @@ static void test_config_parse_exec(void) { - r = config_parse_exec(NULL, "fake", 4, "section", 1, - "LValue", 0, "/RValue/ argv0 r1", - &c, u); -- assert_se(r == 0); -+ assert_se(r == -ENOEXEC); - assert_se(c1->command_next == NULL); - - log_info("/* honour_argv0 */"); -@@ -161,7 +161,7 @@ static void test_config_parse_exec(void) { - r = config_parse_exec(NULL, "fake", 3, "section", 1, - "LValue", 0, "@/RValue", - &c, u); -- assert_se(r == 0); -+ assert_se(r == -ENOEXEC); - assert_se(c1->command_next == NULL); - - log_info("/* no command, whitespace only, reset */"); -@@ -220,7 +220,7 @@ static void test_config_parse_exec(void) { - "-@/RValue argv0 r1 ; ; " - "/goo/goo boo", - &c, u); -- assert_se(r >= 0); -+ assert_se(r == -ENOEXEC); - c1 = c1->command_next; - check_execcommand(c1, "/RValue", "argv0", "r1", NULL, true); - -@@ -374,7 +374,7 @@ static void test_config_parse_exec(void) { - r = config_parse_exec(NULL, "fake", 4, "section", 1, - "LValue", 0, path, - &c, u); -- assert_se(r == 0); -+ assert_se(r == -ENOEXEC); - assert_se(c1->command_next == NULL); - } - -@@ -401,21 +401,21 @@ static void test_config_parse_exec(void) { - r = config_parse_exec(NULL, "fake", 4, "section", 1, - "LValue", 0, "/path\\", - &c, u); -- assert_se(r == 0); -+ assert_se(r == -ENOEXEC); - assert_se(c1->command_next == NULL); - - log_info("/* missing ending ' */"); - r = config_parse_exec(NULL, "fake", 4, "section", 1, - "LValue", 0, "/path 'foo", - &c, u); -- assert_se(r == 0); -+ assert_se(r == -ENOEXEC); - assert_se(c1->command_next == NULL); - - log_info("/* missing ending ' with trailing backslash */"); - r = config_parse_exec(NULL, "fake", 4, "section", 1, - "LValue", 0, "/path 'foo\\", - &c, u); -- assert_se(r == 0); -+ assert_se(r == -ENOEXEC); - assert_se(c1->command_next == NULL); - - log_info("/* invalid space between modifiers */"); --- -2.13.2 - diff --git a/sys-apps/systemd/files/233-CVE-2017-9445.patch b/sys-apps/systemd/files/233-CVE-2017-9445.patch deleted file mode 100644 index 22a366ceba07..000000000000 --- a/sys-apps/systemd/files/233-CVE-2017-9445.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 29bb43cc46412366fc939c66331a916de07bfac4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -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 <chris.coulson@canonical.com>. - -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?= <zbyszek@in.waw.pl> -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?= <zbyszek@in.waw.pl> -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 comparisons with DNS_PACKET_SIZE_MAX. ---- - src/resolve/resolved-dns-packet.c | 2 +- - src/resolve/resolved-dns-packet.h | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c -index 9d806ab33..e2285b440 100644 ---- a/src/resolve/resolved-dns-packet.c -+++ b/src/resolve/resolved-dns-packet.c -@@ -28,7 +28,7 @@ - - #define EDNS0_OPT_DO (1<<15) - --#define DNS_PACKET_SIZE_START 512 -+#define DNS_PACKET_SIZE_START 512u - assert_cc(DNS_PACKET_SIZE_START > UDP_PACKET_HEADER_SIZE) - - typedef struct DnsPacketRewinder { -diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h -index 3abcaf8cf..5dff272fd 100644 ---- a/src/resolve/resolved-dns-packet.h -+++ b/src/resolve/resolved-dns-packet.h -@@ -58,13 +58,13 @@ struct DnsPacketHeader { - /* The various DNS protocols deviate in how large a packet can grow, - but the TCP transport has a 16bit size field, hence that appears to - be the absolute maximum. */ --#define DNS_PACKET_SIZE_MAX 0xFFFF -+#define DNS_PACKET_SIZE_MAX 0xFFFFu - - /* RFC 1035 say 512 is the maximum, for classic unicast DNS */ --#define DNS_PACKET_UNICAST_SIZE_MAX 512 -+#define DNS_PACKET_UNICAST_SIZE_MAX 512u - - /* 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_UNICAST_SIZE_LARGE_MAX 4096u - - struct DnsPacket { - int n_ref; --- -2.13.1 diff --git a/sys-apps/systemd/files/233-format-warnings.patch b/sys-apps/systemd/files/233-format-warnings.patch deleted file mode 100644 index 7bb08f0a3201..000000000000 --- a/sys-apps/systemd/files/233-format-warnings.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 3e7d14d78c4d15ec7789299216cbf5c58e61547b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Sat, 3 Jun 2017 05:41:17 -0400 -Subject: [PATCH] sd-bus: silence format warnings in kdbus code (#6072) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The code is mostly correct, but gcc is trying to outsmart us, and emits a -warning for a "llu vs lu" mismatch, even though they are the same size (on alpha): - -src/libsystemd/sd-bus/bus-control.c: In function ‘kernel_get_list’: -src/libsystemd/sd-bus/bus-control.c:267:42: error: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka long unsigned int}’ [-Werror=format=] - if (asprintf(&n, ":1.%llu", name->id) < 0) { - ^ -src/libsystemd/sd-bus/bus-control.c: In function ‘bus_get_name_creds_kdbus’: -src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka long unsigned int}’ [-Werror=format=] - if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) { - ^ -This is hard to work around properly, because kdbus.h uses __u64 which is -defined-differently-despite-being-the-same-size then uint64_t. Thus the simple -solution of using %PRIu64 fails on amd64: - -src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘__u64 {aka long long unsigned int}’ [-Werror=format=] - if (asprintf(&c->unique_name, ":1.%"PRIu64, conn_info->id) < 0) { - ^~~~~~ - -Let's just avoid the whole issue for now by silencing the warning. -After the next release, we should just get rid of the kdbus code. - -Fixes #5561. ---- - src/libsystemd/sd-bus/bus-control.c | 6 ++++++ - src/libsystemd/sd-bus/bus-kernel.c | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c -index 9e58ffbd8..303ae0f23 100644 ---- a/src/libsystemd/sd-bus/bus-control.c -+++ b/src/libsystemd/sd-bus/bus-control.c -@@ -264,10 +264,13 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { - if ((flags & KDBUS_LIST_UNIQUE) && name->id != previous_id && !(name->flags & KDBUS_HELLO_ACTIVATOR)) { - char *n; - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat" - if (asprintf(&n, ":1.%llu", name->id) < 0) { - r = -ENOMEM; - goto fail; - } -+#pragma GCC diagnostic pop - - r = strv_consume(x, n); - if (r < 0) -@@ -711,10 +714,13 @@ int bus_get_name_creds_kdbus( - } - - if (mask & SD_BUS_CREDS_UNIQUE_NAME) { -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat" - if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) { - r = -ENOMEM; - goto fail; - } -+#pragma GCC diagnostic pop - - c->mask |= SD_BUS_CREDS_UNIQUE_NAME; - } -diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c -index c82caeb3f..ca6aee7c0 100644 ---- a/src/libsystemd/sd-bus/bus-kernel.c -+++ b/src/libsystemd/sd-bus/bus-kernel.c -@@ -51,6 +51,8 @@ - #include "user-util.h" - #include "util.h" - -+#pragma GCC diagnostic ignored "-Wformat" -+ - #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t)) - - int bus_kernel_parse_unique_name(const char *s, uint64_t *id) { --- -2.13.2 - diff --git a/sys-apps/systemd/files/CVE-2017-9217.patch b/sys-apps/systemd/files/CVE-2017-9217.patch deleted file mode 100644 index 68d0f36d4913..000000000000 --- a/sys-apps/systemd/files/CVE-2017-9217.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a924f43f30f9c4acaf70618dd2a055f8b0f166be Mon Sep 17 00:00:00 2001 -From: Evgeny Vereshchagin <evvers@ya.ru> -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-r4.ebuild b/sys-apps/systemd/systemd-233-r4.ebuild deleted file mode 100644 index b263e395680b..000000000000 --- a/sys-apps/systemd/systemd-233-r4.ebuild +++ /dev/null @@ -1,460 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == 9999 ]]; 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-libs/glibc-2.16 - acl? ( sys-apps/acl:0= ) - apparmor? ( sys-libs/libapparmor:0= ) - audit? ( >=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 - !<sys-kernel/dracut-044 - !sys-fs/eudev - !sys-fs/udev" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - >=sys-apps/hwids-20150417[udev] - >=sys-fs/udev-init-scripts-25 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - >=sys-kernel/linux-headers-${MINKV} - virtual/pkgconfig - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) - test? ( sys-apps/dbus ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') ) -" - -python_check_deps() { - has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS - ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH - ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - if linux_chkconfig_present X86; then - CONFIG_CHECK+=" ~DMIID" - fi - fi - - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - check_extra_config - fi -} - -pkg_setup() { - : -} - -src_unpack() { - default - [[ ${PV} != 9999 ]] || git-r3_src_unpack -} - -src_prepare() { - # Bug 463376 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - local PATCHES=( - "${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch" - "${FILESDIR}/233-CVE-2017-9445.patch" - "${FILESDIR}/233-format-warnings.patch" - "${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch" - "${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch" - ) - - if ! use vanilla; then - PATCHES+=( - "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - "${FILESDIR}/228-noclean-tmp.patch" - "${FILESDIR}/233-systemd-user-pam.patch" - ) - fi - - [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - - default - - eautoreconf -} - -src_configure() { - # Keep using the one where the rules were installed. - MY_UDEVDIR=$(get_udevdir) - # Fix systems broken by bug #509454. - [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev - - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - use doc && python_setup - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - # disable -flto since it is an optimization flag - # and makes distcc less effective - cc_cv_CFLAGS__flto=no - # disable -fuse-ld=gold since Gentoo supports explicit linker - # choice and forcing gold is undesired, #539998 - # ld.gold may collide with user's LDFLAGS, #545168 - # ld.gold breaks sparc, #573874 - cc_cv_LDFLAGS__Wl__fuse_ld_gold=no - - # Workaround for gcc-4.7, bug 554454. - cc_cv_CFLAGS__Werror_shadow=no - - # Workaround for bug 516346 - --enable-dependency-tracking - - --disable-maintainer-mode - --localstatedir=/var - --with-pamlibdir=$(getpam_mod_dir) - # avoid bash-completion dep - --with-bashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in $PATH - --enable-split-usr - # For testing. - --with-rootprefix="${ROOTPREFIX-/usr}" - --with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)" - # disable sysv compatibility - --with-sysvinit-path= - --with-sysvrcnd-path= - # no deps - --enable-efi - --enable-ima - - # Optional components/dependencies - $(multilib_native_use_enable acl) - $(multilib_native_use_enable apparmor) - $(multilib_native_use_enable audit) - $(multilib_native_use_enable cryptsetup libcryptsetup) - $(multilib_native_use_enable curl libcurl) - $(multilib_native_use_enable elfutils) - $(use_enable gcrypt) - $(multilib_native_use_enable gnuefi) - --with-efi-libdir="/usr/$(get_libdir)" - $(multilib_native_use_enable http microhttpd) - $(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls) - $(multilib_native_use_enable idn libidn) - $(multilib_native_use_enable importd) - $(multilib_native_use_enable importd bzip2) - $(multilib_native_use_enable importd zlib) - $(multilib_native_use_enable kmod) - $(use_enable lz4) - $(use_enable lzma xz) - $(multilib_native_use_enable nat libiptc) - $(use_enable pam) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_enable qrcode qrencode) - $(multilib_native_use_enable seccomp) - $(multilib_native_use_enable selinux) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable test dbus) - $(multilib_native_use_enable xkb xkbcommon) - $(multilib_native_use_with doc python) - - # hardcode a few paths to spare some deps - KILL=/bin/kill - QUOTAON=/usr/sbin/quotaon - QUOTACHECK=/usr/sbin/quotacheck - - # TODO: we may need to restrict this to gcc - EFI_CC="$(tc-getCC)" - - # dbus paths - --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" - --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" - --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" - - --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - - # Breaks screen, tmux, etc. - --without-kill-user-processes - ) - - # Work around bug 463846. - tc-export CC - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - local mymakeopts=( - udevlibexecdir="${MY_UDEVDIR}" - ) - - if multilib_is_native_abi; then - emake "${mymakeopts[@]}" - else - emake built-sources - local targets=( - '$(rootlib_LTLIBRARIES)' - '$(lib_LTLIBRARIES)' - '$(pamlib_LTLIBRARIES)' - '$(pkgconfiglib_DATA)' - ) - echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f Makefile -f - gentoo - fi -} - -multilib_src_test() { - multilib_is_native_abi || return 0 - default -} - -multilib_src_install() { - local mymakeopts=( - # automake fails with parallel libtool relinking - # 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 "${mymakeopts[@]}" install - else - mymakeopts+=( - install-rootlibLTLIBRARIES - install-libLTLIBRARIES - install-pamlibLTLIBRARIES - install-pkgconfiglibDATA - install-includeHEADERS - install-pkgincludeHEADERS - ) - - emake "${mymakeopts[@]}" - fi -} - -multilib_src_install_all() { - prune_libtool_files --modules - einstalldocs - dodoc "${FILESDIR}"/nsswitch.conf - - if [[ ${PV} != 9999 ]]; then - use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7 - fi - - if use sysv-utils; then - for app in halt poweroff reboot runlevel shutdown telinit; do - dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} - done - dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init - else - # we just keep sysvinit tools, so no need for the mans - rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ - || die - rm "${D}"/usr/share/man/man1/init.1 || die - fi - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ - /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ - /var/log/journal/remote - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - - # If we install these symlinks, there is no way for the sysadmin to remove them - # permanently. - rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die - rm -r "${D}"/etc/systemd/system/network-online.target.wants || die - rm -r "${D}"/etc/systemd/system/sockets.target.wants || die - rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die -} - -migrate_locale() { - local envd_locale_def="${EROOT%/}/etc/env.d/02locale" - local envd_locale=( "${EROOT%/}"/etc/env.d/??locale ) - local locale_conf="${EROOT%/}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -pkg_postinst() { - newusergroup() { - enewgroup "$1" - enewuser "$1" -1 -1 -1 "$1" - } - - enewgroup input - enewgroup systemd-journal - newusergroup systemd-bus-proxy - newusergroup systemd-coredump - newusergroup systemd-journal-gateway - newusergroup systemd-journal-remote - newusergroup systemd-journal-upload - newusergroup systemd-network - newusergroup systemd-resolve - newusergroup systemd-timesync - - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${ROOT%/}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - systemd_reenable systemd-networkd.service systemd-resolved.service - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-233-r5.ebuild b/sys-apps/systemd/systemd-233-r5.ebuild deleted file mode 100644 index 74c4b9e56fee..000000000000 --- a/sys-apps/systemd/systemd-233-r5.ebuild +++ /dev/null @@ -1,461 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == 9999 ]]; 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-libs/glibc-2.16 - acl? ( sys-apps/acl:0= ) - apparmor? ( sys-libs/libapparmor:0= ) - audit? ( >=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 - !<sys-kernel/dracut-044 - !sys-fs/eudev - !sys-fs/udev" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - >=sys-apps/hwids-20150417[udev] - >=sys-fs/udev-init-scripts-25 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - >=sys-kernel/linux-headers-${MINKV} - virtual/pkgconfig - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) - test? ( sys-apps/dbus ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') ) -" - -python_check_deps() { - has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS - ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH - ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - if linux_chkconfig_present X86; then - CONFIG_CHECK+=" ~DMIID" - fi - fi - - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - check_extra_config - fi -} - -pkg_setup() { - : -} - -src_unpack() { - default - [[ ${PV} != 9999 ]] || git-r3_src_unpack -} - -src_prepare() { - # Bug 463376 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - local PATCHES=( - "${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch" - "${FILESDIR}/233-CVE-2017-9445.patch" - "${FILESDIR}/233-format-warnings.patch" - "${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch" - "${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch" - "${FILESDIR}/CVE-2017-15908.patch" - ) - - if ! use vanilla; then - PATCHES+=( - "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - "${FILESDIR}/228-noclean-tmp.patch" - "${FILESDIR}/233-systemd-user-pam.patch" - ) - fi - - [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - - default - - eautoreconf -} - -src_configure() { - # Keep using the one where the rules were installed. - MY_UDEVDIR=$(get_udevdir) - # Fix systems broken by bug #509454. - [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev - - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - use doc && python_setup - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - # disable -flto since it is an optimization flag - # and makes distcc less effective - cc_cv_CFLAGS__flto=no - # disable -fuse-ld=gold since Gentoo supports explicit linker - # choice and forcing gold is undesired, #539998 - # ld.gold may collide with user's LDFLAGS, #545168 - # ld.gold breaks sparc, #573874 - cc_cv_LDFLAGS__Wl__fuse_ld_gold=no - - # Workaround for gcc-4.7, bug 554454. - cc_cv_CFLAGS__Werror_shadow=no - - # Workaround for bug 516346 - --enable-dependency-tracking - - --disable-maintainer-mode - --localstatedir=/var - --with-pamlibdir=$(getpam_mod_dir) - # avoid bash-completion dep - --with-bashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in $PATH - --enable-split-usr - # For testing. - --with-rootprefix="${ROOTPREFIX-/usr}" - --with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)" - # disable sysv compatibility - --with-sysvinit-path= - --with-sysvrcnd-path= - # no deps - --enable-efi - --enable-ima - - # Optional components/dependencies - $(multilib_native_use_enable acl) - $(multilib_native_use_enable apparmor) - $(multilib_native_use_enable audit) - $(multilib_native_use_enable cryptsetup libcryptsetup) - $(multilib_native_use_enable curl libcurl) - $(multilib_native_use_enable elfutils) - $(use_enable gcrypt) - $(multilib_native_use_enable gnuefi) - --with-efi-libdir="/usr/$(get_libdir)" - $(multilib_native_use_enable http microhttpd) - $(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls) - $(multilib_native_use_enable idn libidn) - $(multilib_native_use_enable importd) - $(multilib_native_use_enable importd bzip2) - $(multilib_native_use_enable importd zlib) - $(multilib_native_use_enable kmod) - $(use_enable lz4) - $(use_enable lzma xz) - $(multilib_native_use_enable nat libiptc) - $(use_enable pam) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_enable qrcode qrencode) - $(multilib_native_use_enable seccomp) - $(multilib_native_use_enable selinux) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable test dbus) - $(multilib_native_use_enable xkb xkbcommon) - $(multilib_native_use_with doc python) - - # hardcode a few paths to spare some deps - KILL=/bin/kill - QUOTAON=/usr/sbin/quotaon - QUOTACHECK=/usr/sbin/quotacheck - - # TODO: we may need to restrict this to gcc - EFI_CC="$(tc-getCC)" - - # dbus paths - --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" - --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" - --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" - - --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - - # Breaks screen, tmux, etc. - --without-kill-user-processes - ) - - # Work around bug 463846. - tc-export CC - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - local mymakeopts=( - udevlibexecdir="${MY_UDEVDIR}" - ) - - if multilib_is_native_abi; then - emake "${mymakeopts[@]}" - else - emake built-sources - local targets=( - '$(rootlib_LTLIBRARIES)' - '$(lib_LTLIBRARIES)' - '$(pamlib_LTLIBRARIES)' - '$(pkgconfiglib_DATA)' - ) - echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f Makefile -f - gentoo - fi -} - -multilib_src_test() { - multilib_is_native_abi || return 0 - default -} - -multilib_src_install() { - local mymakeopts=( - # automake fails with parallel libtool relinking - # 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 "${mymakeopts[@]}" install - else - mymakeopts+=( - install-rootlibLTLIBRARIES - install-libLTLIBRARIES - install-pamlibLTLIBRARIES - install-pkgconfiglibDATA - install-includeHEADERS - install-pkgincludeHEADERS - ) - - emake "${mymakeopts[@]}" - fi -} - -multilib_src_install_all() { - prune_libtool_files --modules - einstalldocs - dodoc "${FILESDIR}"/nsswitch.conf - - if [[ ${PV} != 9999 ]]; then - use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7 - fi - - if use sysv-utils; then - for app in halt poweroff reboot runlevel shutdown telinit; do - dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} - done - dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init - else - # we just keep sysvinit tools, so no need for the mans - rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ - || die - rm "${D}"/usr/share/man/man1/init.1 || die - fi - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ - /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ - /var/log/journal/remote - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - - # If we install these symlinks, there is no way for the sysadmin to remove them - # permanently. - rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die - rm -r "${D}"/etc/systemd/system/network-online.target.wants || die - rm -r "${D}"/etc/systemd/system/sockets.target.wants || die - rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die -} - -migrate_locale() { - local envd_locale_def="${EROOT%/}/etc/env.d/02locale" - local envd_locale=( "${EROOT%/}"/etc/env.d/??locale ) - local locale_conf="${EROOT%/}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -pkg_postinst() { - newusergroup() { - enewgroup "$1" - enewuser "$1" -1 -1 -1 "$1" - } - - enewgroup input - enewgroup systemd-journal - newusergroup systemd-bus-proxy - newusergroup systemd-coredump - newusergroup systemd-journal-gateway - newusergroup systemd-journal-remote - newusergroup systemd-journal-upload - newusergroup systemd-network - newusergroup systemd-resolve - newusergroup systemd-timesync - - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${ROOT%/}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - systemd_reenable systemd-networkd.service systemd-resolved.service - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild index 42b0a4eb4c68..de147be79bd2 100644 --- a/sys-apps/systemd/systemd-233-r6.ebuild +++ b/sys-apps/systemd/systemd-233-r6.ebuild @@ -8,6 +8,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~floppym/dist/${P}-patches.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )" KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86" fi @@ -153,13 +154,7 @@ src_prepare() { sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die local PATCHES=( - "${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch" - "${FILESDIR}/233-CVE-2017-9445.patch" - "${FILESDIR}/233-format-warnings.patch" - "${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch" - "${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch" "${FILESDIR}/CVE-2017-15908.patch" - "${FILESDIR}/CVE-2017-9217.patch" ) if ! use vanilla; then diff --git a/sys-apps/systemd/systemd-236.ebuild b/sys-apps/systemd/systemd-236.ebuild index e0653a7a84ab..8142a96390ba 100644 --- a/sys-apps/systemd/systemd-236.ebuild +++ b/sys-apps/systemd/systemd-236.ebuild @@ -202,6 +202,7 @@ multilib_src_configure() { -Dbashcompletiondir="$(get_bashcompdir)" # make sure we get /bin:/sbin in PATH -Dsplit-usr=$(usex usrmerge false true) + -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" -Dsysvinit-path= -Dsysvrcnd-path= # no deps @@ -216,7 +217,7 @@ multilib_src_configure() { -Delfutils=$(meson_multilib_native_use elfutils) -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) - -Defi-libdir="/usr/$(get_libdir)" + -Defi-libdir="${EPREFIX}/usr/$(get_libdir)" -Dmicrohttpd=$(meson_multilib_native_use http) $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false) -Dimportd=$(meson_multilib_native_use importd) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index e0653a7a84ab..8142a96390ba 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -202,6 +202,7 @@ multilib_src_configure() { -Dbashcompletiondir="$(get_bashcompdir)" # make sure we get /bin:/sbin in PATH -Dsplit-usr=$(usex usrmerge false true) + -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" -Dsysvinit-path= -Dsysvrcnd-path= # no deps @@ -216,7 +217,7 @@ multilib_src_configure() { -Delfutils=$(meson_multilib_native_use elfutils) -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) - -Defi-libdir="/usr/$(get_libdir)" + -Defi-libdir="${EPREFIX}/usr/$(get_libdir)" -Dmicrohttpd=$(meson_multilib_native_use http) $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false) -Dimportd=$(meson_multilib_native_use importd) |