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

From:	Mike Gilbert <floppym@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date:	Sun, 23 Feb 2020 17:26:02
Message-Id:	`1582478720.abbe427ac62df0fa9ae86d86aa859c50152f72c8.floppym@gentoo`

1

commit:     abbe427ac62df0fa9ae86d86aa859c50152f72c8

2

Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>

3

AuthorDate: Sun Feb 23 17:25:20 2020 +0000

4

Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>

5

CommitDate: Sun Feb 23 17:25:20 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abbe427a

7

8

sys-apps/systemd: add pkcs11 and pwquality USE flags

9

10

Closes: https://bugs.gentoo.org/709378

11

Package-Manager: Portage-2.3.89_p9, Repoman-2.3.20_p79

12

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

13

14

 sys-apps/systemd/metadata.xml                             |  2 ++

15

 ...ystemd-245_rc1-r1.ebuild => systemd-245_rc1-r2.ebuild} | 15 ++++++++++++---

16

 sys-apps/systemd/systemd-9999.ebuild                      |  6 +++++-

17

 3 files changed, 19 insertions(+), 4 deletions(-)

18

19

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml

20

index d62c5159c4b..fdbbc809fd1 100644

21

--- a/sys-apps/systemd/metadata.xml

22

+++ b/sys-apps/systemd/metadata.xml

23

@@ -23,6 +23,8 @@

24

 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>

25

 		<flag name="lz4">Enable lz4 compression for the journal</flag>

26

 		<flag name="nat">Enable support for network address translation in networkd</flag>

27

+		<flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag>

28

+		<flag name="pwquality">Enable password quality checking in homed</flag>

29

 		<flag name="qrcode">Enable qrcode output support in journal</flag>

30

 		<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>

31

 		<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>

32

33

diff --git a/sys-apps/systemd/systemd-245_rc1-r1.ebuild b/sys-apps/systemd/systemd-245_rc1-r2.ebuild

34

similarity index 96%

35

rename from sys-apps/systemd/systemd-245_rc1-r1.ebuild

36

rename to sys-apps/systemd/systemd-245_rc1-r2.ebuild

37

index a49e87494d0..4d06a4bcf3d 100644

38

--- a/sys-apps/systemd/systemd-245_rc1-r1.ebuild

39

+++ b/sys-apps/systemd/systemd-245_rc1-r2.ebuild

40

@@ -7,10 +7,15 @@ if [[ ${PV} == 9999 ]]; then

41

 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"

42

 	inherit git-r3

43

 else

44

+	if [[ ${PV} == *.* ]]; then

45

+		MY_PN=systemd-stable

46

+	else

47

+		MY_PN=systemd

48

+	fi

49

 	MY_PV=${PV/_/-}

50

-	MY_P=${PN}-${MY_PV}

51

+	MY_P=${MY_PN}-${MY_PV}

52

 	S=${WORKDIR}/${MY_P}

53

-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"

54

+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"

55

 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"

56

fi

57

58

@@ -23,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"

59

60

 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"

61

 SLOT="0/2"

62

-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 static-libs +sysv-utils test vanilla xkb"

63

+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"

64

65

 REQUIRED_USE="importd? ( curl gcrypt lzma )"

66

 RESTRICT="!test? ( test )"

67

@@ -54,7 +59,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]

68

 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )

69

 	nat? ( net-firewall/iptables:0= )

70

 	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )

71

+	pkcs11? ( app-crypt/p11-kit:0= )

72

 	pcre? ( dev-libs/libpcre2 )

73

+	pwquality? ( dev-libs/libpwquality:0= )

74

 	qrcode? ( media-gfx/qrencode:0= )

75

 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )

76

 	selinux? ( sys-libs/libselinux:0= )

77

@@ -271,8 +278,10 @@ multilib_src_configure() {

78

 		-Dxz=$(meson_use lzma)

79

 		-Dlibiptc=$(meson_multilib_native_use nat)

80

 		-Dpam=$(meson_use pam)

81

+		-Dp11kit=$(meson_multilib_native_use pkcs11)

82

 		-Dpcre2=$(meson_multilib_native_use pcre)

83

 		-Dpolkit=$(meson_multilib_native_use policykit)

84

+		-Dpwquality=$(meson_multilib_native_use pwquality)

85

 		-Dqrencode=$(meson_multilib_native_use qrcode)

86

 		-Dseccomp=$(meson_multilib_native_use seccomp)

87

 		-Dselinux=$(meson_multilib_native_use selinux)

88

89

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild

90

index 37223a9ddbb..586a16d1212 100644

91

--- a/sys-apps/systemd/systemd-9999.ebuild

92

+++ b/sys-apps/systemd/systemd-9999.ebuild

93

@@ -28,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"

94

95

 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"

96

 SLOT="0/2"

97

-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 static-libs +sysv-utils test vanilla xkb"

98

+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"

99

100

 REQUIRED_USE="importd? ( curl gcrypt lzma )"

101

 RESTRICT="!test? ( test )"

102

@@ -59,7 +59,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]

103

 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )

104

 	nat? ( net-firewall/iptables:0= )

105

 	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )

106

+	pkcs11? ( app-crypt/p11-kit:0= )

107

 	pcre? ( dev-libs/libpcre2 )

108

+	pwquality? ( dev-libs/libpwquality:0= )

109

 	qrcode? ( media-gfx/qrencode:0= )

110

 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )

111

 	selinux? ( sys-libs/libselinux:0= )

112

@@ -274,8 +276,10 @@ multilib_src_configure() {

113

 		-Dxz=$(meson_use lzma)

114

 		-Dlibiptc=$(meson_multilib_native_use nat)

115

 		-Dpam=$(meson_use pam)

116

+		-Dp11kit=$(meson_multilib_native_use pkcs11)

117

 		-Dpcre2=$(meson_multilib_native_use pcre)

118

 		-Dpolkit=$(meson_multilib_native_use policykit)

119

+		-Dpwquality=$(meson_multilib_native_use pwquality)

120

 		-Dqrencode=$(meson_multilib_native_use qrcode)

121

 		-Dseccomp=$(meson_multilib_native_use seccomp)

122

 		-Dselinux=$(meson_multilib_native_use selinux)

1	commit: abbe427ac62df0fa9ae86d86aa859c50152f72c8
2	Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3	AuthorDate: Sun Feb 23 17:25:20 2020 +0000
4	Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5	CommitDate: Sun Feb 23 17:25:20 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abbe427a
7
8	sys-apps/systemd: add pkcs11 and pwquality USE flags
9
10	Closes: https://bugs.gentoo.org/709378
11	Package-Manager: Portage-2.3.89_p9, Repoman-2.3.20_p79
12	Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14	sys-apps/systemd/metadata.xml \| 2 ++
15	...ystemd-245_rc1-r1.ebuild => systemd-245_rc1-r2.ebuild} \| 15 ++++++++++++---
16	sys-apps/systemd/systemd-9999.ebuild \| 6 +++++-
17	3 files changed, 19 insertions(+), 4 deletions(-)
18
19	diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
20	index d62c5159c4b..fdbbc809fd1 100644
21	--- a/sys-apps/systemd/metadata.xml
22	+++ b/sys-apps/systemd/metadata.xml
23	@@ -23,6 +23,8 @@
24	<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
25	<flag name="lz4">Enable lz4 compression for the journal</flag>
26	<flag name="nat">Enable support for network address translation in networkd</flag>
27	+ <flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag>
28	+ <flag name="pwquality">Enable password quality checking in homed</flag>
29	<flag name="qrcode">Enable qrcode output support in journal</flag>
30	<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
31	<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
32
33	diff --git a/sys-apps/systemd/systemd-245_rc1-r1.ebuild b/sys-apps/systemd/systemd-245_rc1-r2.ebuild
34	similarity index 96%
35	rename from sys-apps/systemd/systemd-245_rc1-r1.ebuild
36	rename to sys-apps/systemd/systemd-245_rc1-r2.ebuild
37	index a49e87494d0..4d06a4bcf3d 100644
38	--- a/sys-apps/systemd/systemd-245_rc1-r1.ebuild
39	+++ b/sys-apps/systemd/systemd-245_rc1-r2.ebuild
40	@@ -7,10 +7,15 @@ if [[ ${PV} == 9999 ]]; then
41	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
42	inherit git-r3
43	else
44	+ if [[ ${PV} == . ]]; then
45	+ MY_PN=systemd-stable
46	+ else
47	+ MY_PN=systemd
48	+ fi
49	MY_PV=${PV/_/-}
50	- MY_P=${PN}-${MY_PV}
51	+ MY_P=${MY_PN}-${MY_PV}
52	S=${WORKDIR}/${MY_P}
53	- SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
54	+ SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
55	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
56	fi
57
58	@@ -23,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
59
60	LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
61	SLOT="0/2"
62	-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 static-libs +sysv-utils test vanilla xkb"
63	+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
64
65	REQUIRED_USE="importd? ( curl gcrypt lzma )"
66	RESTRICT="!test? ( test )"
67	@@ -54,7 +59,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
68	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
69	nat? ( net-firewall/iptables:0= )
70	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
71	+ pkcs11? ( app-crypt/p11-kit:0= )
72	pcre? ( dev-libs/libpcre2 )
73	+ pwquality? ( dev-libs/libpwquality:0= )
74	qrcode? ( media-gfx/qrencode:0= )
75	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
76	selinux? ( sys-libs/libselinux:0= )
77	@@ -271,8 +278,10 @@ multilib_src_configure() {
78	-Dxz=$(meson_use lzma)
79	-Dlibiptc=$(meson_multilib_native_use nat)
80	-Dpam=$(meson_use pam)
81	+ -Dp11kit=$(meson_multilib_native_use pkcs11)
82	-Dpcre2=$(meson_multilib_native_use pcre)
83	-Dpolkit=$(meson_multilib_native_use policykit)
84	+ -Dpwquality=$(meson_multilib_native_use pwquality)
85	-Dqrencode=$(meson_multilib_native_use qrcode)
86	-Dseccomp=$(meson_multilib_native_use seccomp)
87	-Dselinux=$(meson_multilib_native_use selinux)
88
89	diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
90	index 37223a9ddbb..586a16d1212 100644
91	--- a/sys-apps/systemd/systemd-9999.ebuild
92	+++ b/sys-apps/systemd/systemd-9999.ebuild
93	@@ -28,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
94
95	LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
96	SLOT="0/2"
97	-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 static-libs +sysv-utils test vanilla xkb"
98	+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
99
100	REQUIRED_USE="importd? ( curl gcrypt lzma )"
101	RESTRICT="!test? ( test )"
102	@@ -59,7 +59,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
103	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
104	nat? ( net-firewall/iptables:0= )
105	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
106	+ pkcs11? ( app-crypt/p11-kit:0= )
107	pcre? ( dev-libs/libpcre2 )
108	+ pwquality? ( dev-libs/libpwquality:0= )
109	qrcode? ( media-gfx/qrencode:0= )
110	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
111	selinux? ( sys-libs/libselinux:0= )
112	@@ -274,8 +276,10 @@ multilib_src_configure() {
113	-Dxz=$(meson_use lzma)
114	-Dlibiptc=$(meson_multilib_native_use nat)
115	-Dpam=$(meson_use pam)
116	+ -Dp11kit=$(meson_multilib_native_use pkcs11)
117	-Dpcre2=$(meson_multilib_native_use pcre)
118	-Dpolkit=$(meson_multilib_native_use policykit)
119	+ -Dpwquality=$(meson_multilib_native_use pwquality)
120	-Dqrencode=$(meson_multilib_native_use qrcode)
121	-Dseccomp=$(meson_multilib_native_use seccomp)
122	-Dselinux=$(meson_multilib_native_use selinux)

Gentoo Archives: gentoo-commits