diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2017-02-07 18:10:56 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2017-02-09 23:36:27 +0100 |
commit | 1f9f24a105a266c5dd389c8a03ce8e84d3dde63e (patch) | |
tree | 8232935db243df7f8b636ddb027aabe939546439 /sys-auth | |
parent | sys-boot/gnu-efi: remove unused patches (diff) | |
download | gentoo-1f9f24a105a266c5dd389c8a03ce8e84d3dde63e.tar.gz gentoo-1f9f24a105a266c5dd389c8a03ce8e84d3dde63e.tar.bz2 gentoo-1f9f24a105a266c5dd389c8a03ce8e84d3dde63e.zip |
sys-auth/sssd: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3873
Diffstat (limited to 'sys-auth')
-rw-r--r-- | sys-auth/sssd/files/0001_add_pthread_to_fix_as-needed.patch | 36 | ||||
-rw-r--r-- | sys-auth/sssd/files/0002_allow_xdm_openrc.patch | 19 | ||||
-rw-r--r-- | sys-auth/sssd/files/0003_new_krb5.patch | 46 | ||||
-rw-r--r-- | sys-auth/sssd/files/allow_xdm.patch | 19 | ||||
-rw-r--r-- | sys-auth/sssd/files/sssd-1.9.6-fix-init.patch | 31 |
5 files changed, 0 insertions, 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 00769a00597d..000000000000 --- 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 63e23f13d7ae..000000000000 --- 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 03a7c744f2ae..000000000000 --- 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 63e23f13d7ae..000000000000 --- 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 066a47efeb99..000000000000 --- 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 ${?} - } - |