* [gentoo-commits] repo/gentoo:master commit in: sys-auth/sssd/files/
@ 2017-02-09 22:37 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-02-09 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 1f9f24a105a266c5dd389c8a03ce8e84d3dde63e
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 7 17:10:56 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 22:36:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9f24a1
sys-auth/sssd: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3873
.../files/0001_add_pthread_to_fix_as-needed.patch | 36 -----------------
sys-auth/sssd/files/0002_allow_xdm_openrc.patch | 19 ---------
sys-auth/sssd/files/0003_new_krb5.patch | 46 ----------------------
sys-auth/sssd/files/allow_xdm.patch | 19 ---------
sys-auth/sssd/files/sssd-1.9.6-fix-init.patch | 31 ---------------
5 files changed, 151 deletions(-)
diff --git a/sys-auth/sssd/files/0001_add_pthread_to_fix_as-needed.patch b/sys-auth/sssd/files/0001_add_pthread_to_fix_as-needed.patch
deleted file mode 100644
index 00769a0059..0000000000
--- a/sys-auth/sssd/files/0001_add_pthread_to_fix_as-needed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -313,7 +313,8 @@
- $(DHASH_LIBS) \
- $(SSS_CRYPT_LIBS) \
- $(OPENLDAP_LIBS) \
-- $(TDB_LIBS)
-+ $(TDB_LIBS) \
-+ -lpthread
-
- PYTHON_BINDINGS_LIBS = \
- $(TALLOC_LIBS) \
-@@ -338,7 +339,8 @@
- $(COLLECTION_LIBS) \
- $(DHASH_LIBS) \
- $(OPENLDAP_LIBS) \
-- $(TDB_LIBS)
-+ $(TDB_LIBS) \
-+ -lpthread
-
- if BUILD_SELINUX
- PYTHON_BINDINGS_LIBS += $(SELINUX_LIBS)
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,8 @@
- AM_PROG_CC_C_O
- AC_DISABLE_STATIC
- AC_PROG_INSTALL
--AC_PROG_LIBTOOL
-+LT_INIT
-+AM_PROG_AR
- AC_CONFIG_MACRO_DIR([m4])
- AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION([0.14])
diff --git a/sys-auth/sssd/files/0002_allow_xdm_openrc.patch b/sys-auth/sssd/files/0002_allow_xdm_openrc.patch
deleted file mode 100644
index 63e23f13d7..0000000000
--- a/sys-auth/sssd/files/0002_allow_xdm_openrc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/sysv/gentoo/sssd.old 2011-08-02 23:14:48.000000000 +0300
-+++ src/sysv/gentoo/sssd 2011-08-24 12:15:18.413929409 +0300
-@@ -1,13 +1,13 @@
- #!/sbin/openrc-run
-
- depend(){
-- need localmount netmount clock
-- use syslog
-+ need localmount netmount clock nscd
-+ use syslog xdm
- }
-
- start(){
- ebegin "Starting sssd"
-- start-stop-daemon --start --exec /usr/sbin/sssd -- -D
-+ start-stop-daemon --start --exec /usr/sbin/sssd -- -Df
- eend ${?}
- }
-
diff --git a/sys-auth/sssd/files/0003_new_krb5.patch b/sys-auth/sssd/files/0003_new_krb5.patch
deleted file mode 100644
index 03a7c744f2..0000000000
--- a/sys-auth/sssd/files/0003_new_krb5.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4e78fab6a1b2e9653a7959cbdb7d54bb750041d0 Mon Sep 17 00:00:00 2001
-From: Jakub Hrozek <jhrozek@redhat.com>
-Date: Mon, 04 Feb 2013 16:30:48 +0000
-Subject: krb5: include backwards compatible declaration of krb5_trace_info
-
-krb5-1.10 used to include "struct krb5_trace_info", now krb5-1.11
-includes a "krb5_trace_info" typedefed from "struct _krb5_trace_info".
-
-Do the same in the SSSD to allow compiling with both 1.10 and 1.11.
----
-diff --git a/src/external/krb5.m4 b/src/external/krb5.m4
-index 5bc8711..f1679a1 100644
---- a/src/external/krb5.m4
-+++ b/src/external/krb5.m4
-@@ -37,7 +37,7 @@ SAVE_LIBS=$LIBS
- CFLAGS="$CFLAGS $KRB5_CFLAGS"
- LIBS="$LIBS $KRB5_LIBS"
- AC_CHECK_HEADERS([krb5.h krb5/krb5.h])
--AC_CHECK_TYPES([krb5_ticket_times, krb5_times], [], [],
-+AC_CHECK_TYPES([krb5_ticket_times, krb5_times, krb5_trace_info], [], [],
- [ #ifdef HAVE_KRB5_KRB5_H
- #include <krb5/krb5.h>
- #else
-diff --git a/src/util/sss_krb5.c b/src/util/sss_krb5.c
-index bb61d10..ab0344c 100644
---- a/src/util/sss_krb5.c
-+++ b/src/util/sss_krb5.c
-@@ -1001,9 +1001,15 @@ sss_krb5_residual_check_type(const char *full_location,
- }
-
- #ifdef HAVE_KRB5_SET_TRACE_CALLBACK
-+
-+#ifndef HAVE_KRB5_TRACE_INFO
-+/* krb5-1.10 had struct krb5_trace_info, 1.11 has type named krb5_trace_info */
-+typedef struct krb5_trace_info krb5_trace_info;
-+#endif /* HAVE_KRB5_TRACE_INFO */
-+
- static void
- sss_child_krb5_trace_cb(krb5_context context,
-- const struct krb5_trace_info *info, void *data)
-+ const krb5_trace_info *info, void *data)
- {
- if (info == NULL) {
- /* Null info means destroy the callback data. */
---
-cgit v0.9.1
diff --git a/sys-auth/sssd/files/allow_xdm.patch b/sys-auth/sssd/files/allow_xdm.patch
deleted file mode 100644
index 63e23f13d7..0000000000
--- a/sys-auth/sssd/files/allow_xdm.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/sysv/gentoo/sssd.old 2011-08-02 23:14:48.000000000 +0300
-+++ src/sysv/gentoo/sssd 2011-08-24 12:15:18.413929409 +0300
-@@ -1,13 +1,13 @@
- #!/sbin/openrc-run
-
- depend(){
-- need localmount netmount clock
-- use syslog
-+ need localmount netmount clock nscd
-+ use syslog xdm
- }
-
- start(){
- ebegin "Starting sssd"
-- start-stop-daemon --start --exec /usr/sbin/sssd -- -D
-+ start-stop-daemon --start --exec /usr/sbin/sssd -- -Df
- eend ${?}
- }
-
diff --git a/sys-auth/sssd/files/sssd-1.9.6-fix-init.patch b/sys-auth/sssd/files/sssd-1.9.6-fix-init.patch
deleted file mode 100644
index 066a47efeb..0000000000
--- a/sys-auth/sssd/files/sssd-1.9.6-fix-init.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-A couple of changes are necessary to make sssd work better on Gentoo Linux
-systems.
-
-- login manager can use sssd for login. Therefore it's necessary to adjust
-the dependencies of the script to use 'xdm' if it is available.
-- We need to send the debug output to files instead of stderr.
-
-Upstream:
-https://git.fedorahosted.org/cgit/sssd.git/commit/?id=c20dbd8f20e08676637ee7fc185ea7882a1f8651
-https://git.fedorahosted.org/cgit/sssd.git/commit/?id=9882475d3c59f4750a19953bb7d02edab198c900
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
-Index: sssd-1.9.6/src/sysv/gentoo/sssd.in
-===================================================================
---- sssd-1.9.6.orig/src/sysv/gentoo/sssd.in
-+++ sssd-1.9.6/src/sysv/gentoo/sssd.in
-@@ -2,12 +2,12 @@
-
- depend(){
- need localmount netmount clock
-- use syslog
-+ use syslog xdm
- }
-
- start(){
- ebegin "Starting sssd"
-- start-stop-daemon --start --exec @sbindir@/sssd -- -D
-+ start-stop-daemon --start --exec @sbindir@/sssd -- -Df
- eend ${?}
- }
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/sssd/files/
@ 2024-06-22 18:54 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2024-06-22 18:54 UTC (permalink / raw
To: gentoo-commits
commit: c31fce4e3be7b190b8a67a7c9fdbef3f2c19df5d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 18 17:29:12 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 18:50:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31fce4e
sys-auth/sssd: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...ept-krb5-1.21-for-building-the-PAC-plugin.patch | 31 --------
...9.1-certmap-fix-partial-string-comparison.patch | 87 ----------------------
...-cert-show-and-cert-eval-rule-as-non-root.patch | 39 ----------
3 files changed, 157 deletions(-)
diff --git a/sys-auth/sssd/files/sssd-2.9.1-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch b/sys-auth/sssd/files/sssd-2.9.1-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch
deleted file mode 100644
index c849fe76b446..000000000000
--- a/sys-auth/sssd/files/sssd-2.9.1-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 74d0f4538deb766592079b1abca0d949d6dea105 Mon Sep 17 00:00:00 2001
-From: Alexey Tikhonov <atikhono@redhat.com>
-Date: Thu, 15 Jun 2023 12:05:03 +0200
-Subject: [PATCH 1/1] BUILD: Accept krb5 1.21 for building the PAC plugin
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Alejandro López <allopez@redhat.com>
-Reviewed-by: Sumit Bose <sbose@redhat.com>
----
- src/external/pac_responder.m4 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4
-index 3cbe3c9cfba03b59e26a8c5c2d73446eead2acea..90727185b574411bddd928f8d87efdc87076eba4 100644
---- a/src/external/pac_responder.m4
-+++ b/src/external/pac_responder.m4
-@@ -22,7 +22,8 @@ then
- Kerberos\ 5\ release\ 1.17* | \
- Kerberos\ 5\ release\ 1.18* | \
- Kerberos\ 5\ release\ 1.19* | \
-- Kerberos\ 5\ release\ 1.20*)
-+ Kerberos\ 5\ release\ 1.20* | \
-+ Kerberos\ 5\ release\ 1.21*)
- krb5_version_ok=yes
- AC_MSG_RESULT([yes])
- ;;
---
-2.41.0
-
diff --git a/sys-auth/sssd/files/sssd-2.9.1-certmap-fix-partial-string-comparison.patch b/sys-auth/sssd/files/sssd-2.9.1-certmap-fix-partial-string-comparison.patch
deleted file mode 100644
index 258940bab38e..000000000000
--- a/sys-auth/sssd/files/sssd-2.9.1-certmap-fix-partial-string-comparison.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 11afa7a6ef7e15f1e98c7145ad5c80bbdfc520e2 Mon Sep 17 00:00:00 2001
-From: Sumit Bose <sbose@redhat.com>
-Date: Tue, 4 Jul 2023 19:06:27 +0200
-Subject: [PATCH 3/3] certmap: fix partial string comparison
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the formatting option of the certificate digest/hash function
-contained and additional specifier separated with a '_' the comparison
-of the provided digest name and the available ones was incomplete, the
-last character was ignored and the comparison was successful if even if
-there was only a partial match.
-
-Resolves: https://github.com/SSSD/sssd/issues/6802
-
-Reviewed-by: Alejandro López <allopez@redhat.com>
-Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
-(cherry picked from commit 0817ca3b366f51510705ab77d7900c0b65b7d2fc)
----
- src/lib/certmap/sss_certmap_ldap_mapping.c | 9 ++++++++-
- src/tests/cmocka/test_certmap.c | 22 ++++++++++++++++++++++
- 2 files changed, 30 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/certmap/sss_certmap_ldap_mapping.c b/src/lib/certmap/sss_certmap_ldap_mapping.c
-index 2f16837a1..354b0310b 100644
---- a/src/lib/certmap/sss_certmap_ldap_mapping.c
-+++ b/src/lib/certmap/sss_certmap_ldap_mapping.c
-@@ -228,14 +228,21 @@ int check_digest_conversion(const char *inp, const char **digest_list,
- bool colon = false;
- bool reverse = false;
- char *c;
-+ size_t len = 0;
-
- sep = strchr(inp, '_');
-+ if (sep != NULL) {
-+ len = sep - inp;
-+ }
-
- for (d = 0; digest_list[d] != NULL; d++) {
- if (sep == NULL) {
- cmp = strcasecmp(digest_list[d], inp);
- } else {
-- cmp = strncasecmp(digest_list[d], inp, (sep - inp -1));
-+ if (strlen(digest_list[d]) != len) {
-+ continue;
-+ }
-+ cmp = strncasecmp(digest_list[d], inp, len);
- }
-
- if (cmp == 0) {
-diff --git a/src/tests/cmocka/test_certmap.c b/src/tests/cmocka/test_certmap.c
-index da312beaf..a15984d60 100644
---- a/src/tests/cmocka/test_certmap.c
-+++ b/src/tests/cmocka/test_certmap.c
-@@ -2183,6 +2183,28 @@ static void test_sss_certmap_ldapu1_cert(void **state)
- assert_non_null(ctx);
- assert_null(ctx->prio_list);
-
-+ /* cert!sha */
-+ ret = sss_certmap_add_rule(ctx, 91,
-+ "KRB5:<ISSUER>.*",
-+ "LDAP:rule91={cert!sha}", NULL);
-+ assert_int_equal(ret, EINVAL);
-+
-+ ret = sss_certmap_add_rule(ctx, 91,
-+ "KRB5:<ISSUER>.*",
-+ "LDAPU1:rule91={cert!sha}", NULL);
-+ assert_int_equal(ret, EINVAL);
-+
-+ /* cert!sha_u */
-+ ret = sss_certmap_add_rule(ctx, 90,
-+ "KRB5:<ISSUER>.*",
-+ "LDAP:rule90={cert!sha_u}", NULL);
-+ assert_int_equal(ret, EINVAL);
-+
-+ ret = sss_certmap_add_rule(ctx, 99,
-+ "KRB5:<ISSUER>.*",
-+ "LDAPU1:rule90={cert!sha_u}", NULL);
-+ assert_int_equal(ret, EINVAL);
-+
- /* cert!sha555 */
- ret = sss_certmap_add_rule(ctx, 89,
- "KRB5:<ISSUER>.*",
---
-2.38.1
-
diff --git a/sys-auth/sssd/files/sssd-2.9.1-sssct-allow-cert-show-and-cert-eval-rule-as-non-root.patch b/sys-auth/sssd/files/sssd-2.9.1-sssct-allow-cert-show-and-cert-eval-rule-as-non-root.patch
deleted file mode 100644
index 3a724363382b..000000000000
--- a/sys-auth/sssd/files/sssd-2.9.1-sssct-allow-cert-show-and-cert-eval-rule-as-non-root.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 15d7d34b20219e2fd45c43881088f5d542e9603e Mon Sep 17 00:00:00 2001
-From: Sumit Bose <sbose@redhat.com>
-Date: Tue, 4 Jul 2023 18:56:35 +0200
-Subject: [PATCH 2/3] sssct: allow cert-show and cert-eval-rule as non-root
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The cert-show and cert-eval-rule sub-commands do not need root access and
-do not require SSSD to be configured on the host.
-
-Resolves: https://github.com/SSSD/sssd/issues/6802
-
-Reviewed-by: Alejandro López <allopez@redhat.com>
-Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
-(cherry picked from commit 8466f0e4d0c6cd2b98d2789970847b9adc01d7d4)
----
- src/tools/sssctl/sssctl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tools/sssctl/sssctl.c b/src/tools/sssctl/sssctl.c
-index 855260aed..04c41aa9a 100644
---- a/src/tools/sssctl/sssctl.c
-+++ b/src/tools/sssctl/sssctl.c
-@@ -340,9 +340,9 @@ int main(int argc, const char **argv)
- SSS_TOOL_COMMAND_FLAGS("config-check", "Perform static analysis of SSSD configuration", 0, sssctl_config_check, SSS_TOOL_FLAG_SKIP_CMD_INIT),
- #endif
- SSS_TOOL_DELIMITER("Certificate related tools:"),
-- SSS_TOOL_COMMAND("cert-show", "Print information about the certificate", 0, sssctl_cert_show),
-+ SSS_TOOL_COMMAND_FLAGS("cert-show", "Print information about the certificate", 0, sssctl_cert_show, SSS_TOOL_FLAG_SKIP_CMD_INIT|SSS_TOOL_FLAG_SKIP_ROOT_CHECK),
- SSS_TOOL_COMMAND("cert-map", "Show users mapped to the certificate", 0, sssctl_cert_map),
-- SSS_TOOL_COMMAND("cert-eval-rule", "Check mapping and matching rule with a certificate", 0, sssctl_cert_eval_rule),
-+ SSS_TOOL_COMMAND_FLAGS("cert-eval-rule", "Check mapping and matching rule with a certificate", 0, sssctl_cert_eval_rule, SSS_TOOL_FLAG_SKIP_CMD_INIT|SSS_TOOL_FLAG_SKIP_ROOT_CHECK),
- #ifdef BUILD_PASSKEY
- SSS_TOOL_DELIMITER("Passkey related tools:"),
- SSS_TOOL_COMMAND_FLAGS("passkey-register", "Perform passkey registration", 0, sssctl_passkey_register, SSS_TOOL_FLAG_SKIP_CMD_INIT|SSS_TOOL_FLAG_SKIP_ROOT_CHECK),
---
-2.38.1
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-22 18:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-22 18:54 [gentoo-commits] repo/gentoo:master commit in: sys-auth/sssd/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2017-02-09 22:37 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox