1 |
commit: 7cead118afb53b22923e581340d3e0c8d279a5bc |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 1 06:38:43 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 1 06:38:43 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cead118 |
7 |
|
8 |
net-nds/gssproxy: fix configure w/o systemd |
9 |
|
10 |
Closes: https://bugs.gentoo.org/848909 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../files/gssproxy-0.9.0-configure-systemd.patch | 38 ++++++++++++++++++++++ |
14 |
net-nds/gssproxy/gssproxy-0.9.0.ebuild | 22 ++++++++++++- |
15 |
2 files changed, 59 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/net-nds/gssproxy/files/gssproxy-0.9.0-configure-systemd.patch b/net-nds/gssproxy/files/gssproxy-0.9.0-configure-systemd.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..501fe3896666 |
20 |
--- /dev/null |
21 |
+++ b/net-nds/gssproxy/files/gssproxy-0.9.0-configure-systemd.patch |
22 |
@@ -0,0 +1,38 @@ |
23 |
+https://github.com/gssapi/gssproxy/commit/325869a33cb923ab2123ab4179399a37503ed3b5.patch |
24 |
+https://bugs.gentoo.org/848909 |
25 |
+ |
26 |
+From: Simo Sorce <simo@××××××.com> |
27 |
+Date: Tue, 31 May 2022 11:09:14 -0400 |
28 |
+Subject: [PATCH] Move some configure checks out of a condition |
29 |
+ |
30 |
+I was too aggressive in moving all systemd checks, some of them need to |
31 |
+be performed at all times because there are conditionals ependent on the |
32 |
+detection. |
33 |
+ |
34 |
+The actual build for gss-only module is controlled by the BUILD_PROXY |
35 |
+guard anyway, so the checking unconditionally should not cause any |
36 |
+change for that configuration even when unused. |
37 |
+ |
38 |
+Signed-off-by: Simo Sorce <simo@××××××.com> |
39 |
+--- a/configure.ac |
40 |
++++ b/configure.ac |
41 |
+@@ -164,13 +164,13 @@ if test x$only_gss_module != xyes; then |
42 |
+ [AC_MSG_ERROR([Could not find libcap headers])]) |
43 |
+ fi |
44 |
+ |
45 |
+- if test x$initscript = xsystemd; then |
46 |
+- WITH_SYSTEMD_UNIT_DIR |
47 |
+- WITH_SYSTEMD_USER_UNIT_DIR |
48 |
+- AM_CHECK_SYSTEMD |
49 |
+- fi |
50 |
+ fi |
51 |
+ AM_CONDITIONAL([BUILD_PROXY], [test x$only_gss_module != xyes ]) |
52 |
++if test x$initscript = xsystemd; then |
53 |
++ WITH_SYSTEMD_UNIT_DIR |
54 |
++ WITH_SYSTEMD_USER_UNIT_DIR |
55 |
++fi |
56 |
++AM_CHECK_SYSTEMD |
57 |
+ |
58 |
+ AC_ARG_ENABLE([always-interpose], |
59 |
+ [AC_HELP_STRING([--enable-always-interpose], |
60 |
+ |
61 |
|
62 |
diff --git a/net-nds/gssproxy/gssproxy-0.9.0.ebuild b/net-nds/gssproxy/gssproxy-0.9.0.ebuild |
63 |
index ac3daab25f48..3a9749f43991 100644 |
64 |
--- a/net-nds/gssproxy/gssproxy-0.9.0.ebuild |
65 |
+++ b/net-nds/gssproxy/gssproxy-0.9.0.ebuild |
66 |
@@ -3,6 +3,9 @@ |
67 |
|
68 |
EAPI=7 |
69 |
|
70 |
+# Can drop after 0.9.0, just for patch |
71 |
+inherit autotools |
72 |
+ |
73 |
DESCRIPTION="Daemon to proxy GSSAPI context establishment and channel handling" |
74 |
HOMEPAGE="https://github.com/gssapi/gssproxy" |
75 |
SRC_URI="https://github.com/gssapi/${PN}/releases/download/v${PV}/${P}.tar.gz" |
76 |
@@ -30,6 +33,10 @@ BDEPEND=" |
77 |
# unfeasible. |
78 |
RESTRICT="test" |
79 |
|
80 |
+PATCHES=( |
81 |
+ "${FILESDIR}"/${P}-configure-systemd.patch |
82 |
+) |
83 |
+ |
84 |
# pkg_setup() { |
85 |
# # Here instead of flag-logic in DEPEND, since virtual/krb5 does not |
86 |
# # allow to specify the openldap use flag, which heimdal doesn't |
87 |
@@ -55,6 +62,13 @@ RESTRICT="test" |
88 |
# "${S}/tests/testlib.py" || die |
89 |
# } |
90 |
|
91 |
+src_prepare() { |
92 |
+ default |
93 |
+ |
94 |
+ # Just for 0.9.0 systemd patch |
95 |
+ eautoreconf |
96 |
+} |
97 |
+ |
98 |
src_configure() { |
99 |
local myeconfargs=( |
100 |
# The build assumes localstatedir is /var and takes care of |
101 |
@@ -65,7 +79,13 @@ src_configure() { |
102 |
--with-initscript=$(usex systemd systemd none) |
103 |
$(use_with selinux) |
104 |
$(use_with debug gssidebug) |
105 |
- $(use_with hardened hardening) |
106 |
+ |
107 |
+ # We already set FORTIFY_SOURCE by default along with the |
108 |
+ # other bits. But setting it on each compile line interferes |
109 |
+ # with efforts to try e.g. FORTIFY_SOURCE=3. So, disable it, |
110 |
+ # but there's no actual difference to the safety of the binaries |
111 |
+ # because of Gentoo's configuration/patches to the toolchain. |
112 |
+ --without-hardening |
113 |
) |
114 |
|
115 |
econf "${myeconfargs[@]}" |