diff --git a/Create-var-run-nslcd-socket-after-dropping-privilege.patch b/Create-var-run-nslcd-socket-after-dropping-privilege.patch deleted file mode 100644 index 0873ccbe2d13d7db6d76bf37989690f91f315d49..0000000000000000000000000000000000000000 --- a/Create-var-run-nslcd-socket-after-dropping-privilege.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3760b43241b579406242961c551b9fb25b0c673b Mon Sep 17 00:00:00 2001 -From: Arthur de Jong -Date: Sat, 21 Jul 2018 11:14:08 +0200 -Subject: [PATCH 01/10] Create /var/run/nslcd/socket after dropping privileges - -This is needed to avoid a problem where a call to initgroups() can -result in NSS lookups. If nscd is configured the mechanism to avoid -loopback lookups using nss_ldap_enablelookups will not work and cause -for delays on start-up. - -Note that this changes ownership of the socket to the user running -nslcd. ---- - nslcd/nslcd.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/nslcd/nslcd.c b/nslcd/nslcd.c -index 82c09ab..be14ac9 100644 ---- a/nslcd/nslcd.c -+++ b/nslcd/nslcd.c -@@ -2,7 +2,7 @@ - nslcd.c - ldap local connection daemon - - Copyright (C) 2006 West Consulting -- Copyright (C) 2006-2017 Arthur de Jong -+ Copyright (C) 2006-2018 Arthur de Jong - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public -@@ -769,8 +769,6 @@ int main(int argc, char *argv[]) - exit(EXIT_FAILURE); - } - adjust_oom_score(); -- /* create socket */ -- nslcd_serversocket = create_socket(NSLCD_SOCKET); - /* start subprocess to do invalidating if reconnect_invalidate is set */ - for (i = 0; i < LM_NONE; i++) - if (nslcd_cfg->reconnect_invalidate[i]) -@@ -825,6 +823,8 @@ int main(int argc, char *argv[]) - } - log_log(LOG_DEBUG, "setuid(%lu) done", (unsigned long int)nslcd_cfg->uid); - } -+ /* create socket */ -+ nslcd_serversocket = create_socket(NSLCD_SOCKET); - /* start worker threads */ - log_log(LOG_INFO, "accepting connections"); - nslcd_threads = (pthread_t *)malloc(nslcd_cfg->threads * sizeof(pthread_t)); --- -2.19.1 - diff --git a/Fix-crash-in-chsh.ldap.patch b/Fix-crash-in-chsh.ldap.patch deleted file mode 100644 index efe41569b001c481fa35369e6845ff1bd9230b52..0000000000000000000000000000000000000000 --- a/Fix-crash-in-chsh.ldap.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bfcf0025b6ba264e6c0c1899d9de2bad8f39ee1a Mon Sep 17 00:00:00 2001 -From: Mizunashi Mana -Date: Wed, 5 Sep 2018 20:06:31 +0900 -Subject: [PATCH 09/10] Fix crash in chsh.ldap - -Specify result type of getusershell. - -Closes https://github.com/arthurdejong/nss-pam-ldapd/pull/31 ---- - utils/shells.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/utils/shells.py b/utils/shells.py -index dcabfaf..92dba2f 100644 ---- a/utils/shells.py -+++ b/utils/shells.py -@@ -28,9 +28,11 @@ import sys - def list_shells(): - """List the shells from /etc/shells.""" - libc = ctypes.CDLL(ctypes.util.find_library("c")) -+ getusershell = libc.getusershell -+ getusershell.restype = ctypes.c_char_p - libc.setusershell() - while True: -- shell = ctypes.c_char_p(libc.getusershell()).value -+ shell = getusershell() - if not shell: - break - yield shell --- -2.19.1 - diff --git a/nss-pam-ldapd-0.9.11.tar.gz b/nss-pam-ldapd-0.9.11.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..efa7fc71b91a8105f934d64e9e25682e967c3487 Binary files /dev/null and b/nss-pam-ldapd-0.9.11.tar.gz differ diff --git a/nss-pam-ldapd-0.9.11.tar.gz.sig b/nss-pam-ldapd-0.9.11.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..fb5daa732006684411453bf6c242eb5318363d3a Binary files /dev/null and b/nss-pam-ldapd-0.9.11.tar.gz.sig differ diff --git a/nss-pam-ldapd-0.9.9.tar.gz b/nss-pam-ldapd-0.9.9.tar.gz deleted file mode 100644 index b63b26c5dce319d3bdd55d6116138eff87eca854..0000000000000000000000000000000000000000 Binary files a/nss-pam-ldapd-0.9.9.tar.gz and /dev/null differ diff --git a/nss-pam-ldapd-0.9.9.tar.gz.sig b/nss-pam-ldapd-0.9.9.tar.gz.sig deleted file mode 100644 index 0113179ebe1bc5d362a047e5f9637699275d8f65..0000000000000000000000000000000000000000 Binary files a/nss-pam-ldapd-0.9.9.tar.gz.sig and /dev/null differ diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec index 7f48d4bdfd82d8aefa245fc2bb87041eca378244..9386113e4f2ed5210181a95fc7e1b38457234bef 100644 --- a/nss-pam-ldapd.spec +++ b/nss-pam-ldapd.spec @@ -1,21 +1,18 @@ %define _hardened_build 1 Name: nss-pam-ldapd -Version: 0.9.9 -Release: 5 +Version: 0.9.11 +Release: 1 Summary: NSS and PAM libraries for name lookups and authentication using LDAP License: LGPLv2+ URL: http://arthurdejong.org/nss-pam-ldapd/ -Source0: http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz -Source1: http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz.sig +Source0: http://arthurdejong.org/%{name}/%{name}-%{version}.tar.gz +Source1: http://arthurdejong.org/%{name}/%{name}-%{version}.tar.gz.sig Source3: nslcd.tmpfiles Source4: nslcd.service -Patch0001: 0001-Disable-pylint-tests.patch -Patch0002: 0002-Watch-for-uint32_t-overflows.patch - -Patch9001: Create-var-run-nslcd-socket-after-dropping-privilege.patch -Patch9002: Fix-crash-in-chsh.ldap.patch +Patch0: 0001-Disable-pylint-tests.patch +Patch1: 0002-Watch-for-uint32_t-overflows.patch BuildRequires: gcc, openldap-devel, krb5-devel, autoconf, automake, pam-devel, systemd-units %{?systemd_requires} @@ -103,6 +100,12 @@ getent passwd nslcd > /dev/null || \ %{_mandir}/*/* %changelog +* Mon Jul 27 2020 Liquor - 0.9.11-1 +- Type:bugfix +- ID:NA +- SUG:restart +- DESC:update to 0.9.11 + * Mon Apr 08 2019 yanghua - 0.9.9-5 - Type:bugfix - ID:NA diff --git a/nss-pam-ldapd.yaml b/nss-pam-ldapd.yaml deleted file mode 100644 index 680d7d2bbd70a0087e3ff482a9eb7cd3f1806d40..0000000000000000000000000000000000000000 --- a/nss-pam-ldapd.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: git -src_repo: https://arthurdejong.org/git/nss-pam-ldapd -tag_prefix: -seperator: