[nss-pam-ldapd/f14] - jump to 0.7.13 - backport most of the packaging fixes from raw hide - backport part of r1476 to fi
Nalin Dahyabhai
nalin at fedoraproject.org
Wed Jul 27 19:37:30 UTC 2011
commit 185731539b2055aea20d1c329aa2c24f7ec087ae
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date: Wed Jul 27 15:36:37 2011 -0400
- jump to 0.7.13
- backport most of the packaging fixes from raw hide
- backport part of r1476 to fix gidNumber parsing
nss-pam-ldapd-0.7.x-buffers.patch | 29 +++++++++++++++++++
nss-pam-ldapd.spec | 56 +++++++++++++++++++++++++++++++++----
sources | 4 +-
3 files changed, 81 insertions(+), 8 deletions(-)
---
diff --git a/nss-pam-ldapd-0.7.x-buffers.patch b/nss-pam-ldapd-0.7.x-buffers.patch
new file mode 100644
index 0000000..d838e86
--- /dev/null
+++ b/nss-pam-ldapd-0.7.x-buffers.patch
@@ -0,0 +1,29 @@
+Parts of r1476 -- leave enough room for GID values above a billion and
+unusually large pwdLastSet values.
+
+diff --git a/nslcd/passwd.c b/nslcd/passwd.c
+index 15124fe..a649322 100644
+--- a/nslcd/passwd.c
++++ b/nslcd/passwd.c
+@@ -390,7 +390,7 @@ static int write_passwd(TFILE *fp,MYLDAP_ENTRY *entry,const char *requser,
+ const char *passwd;
+ uid_t uids[MAXUIDS_PER_ENTRY];
+ int numuids;
+- char gidbuf[10];
++ char gidbuf[32];
+ gid_t gid;
+ char gecos[100];
+ char homedir[100];
+diff --git a/nslcd/shadow.c b/nslcd/shadow.c
+index 6de372b..5d6dae7 100644
+--- a/nslcd/shadow.c
++++ b/nslcd/shadow.c
+@@ -112,7 +112,7 @@ void shadow_init(void)
+
+ static long to_date(const char *date,const char *attr)
+ {
+- char buffer[8];
++ char buffer[32];
+ long value;
+ char *tmp;
+ size_t l;
diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec
index 3ee2adc..feb54c4 100644
--- a/nss-pam-ldapd.spec
+++ b/nss-pam-ldapd.spec
@@ -1,5 +1,5 @@
Name: nss-pam-ldapd
-Version: 0.7.7
+Version: 0.7.13
Release: 1%{?dist}
Summary: An nsswitch module which uses directory servers
Group: System Environment/Base
@@ -8,15 +8,16 @@ 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
Source2: nslcd.init
+Patch0: nss-pam-ldapd-0.7.x-buffers.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openldap-devel, krb5-devel
Obsoletes: nss-ldapd < 0.7
Provides: nss-ldapd = %{version}-%{release}
-# Pull in the pam_ldap module, which is currently bundled with nss_ldap, to
+# Pull in the pam_ldap module, which is its own package in F14 and later, to
# keep upgrades from removing the module. We currently disable nss-pam-ldapd's
# own pam_ldap.so until it's more mature.
-Requires: /%{_lib}/security/pam_ldap.so
+Requires: pam_ldap%{?_isa}
# Pull in nscd, which is recommended.
Requires: nscd
Requires(post): /sbin/ldconfig, chkconfig, grep, sed
@@ -30,6 +31,7 @@ nsswitch module.
%prep
%setup -q
+%patch0 -p1 -b .buffers
%build
%configure --libdir=/%{_lib} --disable-pam
@@ -57,7 +59,7 @@ fi
sed -i -e 's,^uid.*,uid nslcd,g' -e 's,^gid.*,gid ldap,g' \
$RPM_BUILD_ROOT/%{_sysconfdir}/nslcd.conf
touch -r nslcd.conf $RPM_BUILD_ROOT/%{_sysconfdir}/nslcd.conf
-mkdir -p 0755 $RPM_BUILD_ROOT/var/run/nslcd
+mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/nslcd
%clean
rm -rf $RPM_BUILD_ROOT
@@ -68,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/*
/%{_lib}/*.so.*
%{_mandir}/*/*
-%attr(0600,root,root) %config(noreplace) /etc/nslcd.conf
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/nslcd.conf
%attr(0755,root,root) %{_initddir}/nslcd
%attr(0755,nslcd,root) /var/run/nslcd
%if 0%{?fedora} > 13
@@ -102,7 +104,7 @@ else
source=/etc/ldap.conf
fi
target=/etc/nslcd.conf
-if ! grep -q -F "# $comment" $target 2> /dev/null ; then
+if test "$1" -eq "1" && ! grep -q -F "# $comment" $target 2> /dev/null ; then
# Try to make sure we only do this the first time.
echo "# $comment" >> $target
if egrep -q '^uri[[:blank:]]' $source 2> /dev/null ; then
@@ -150,6 +152,10 @@ if grep -q '^gid nslcd' $target ; then
sed -i -e 's,^gid nslcd$,# gid nslcd,g' $target
fi
fi
+# Create the daemon's /var/run directory if it isn't there.
+if ! test -d /var/run/nslcd ; then
+ mkdir -p -m 0755 /var/run/nslcd
+fi
exit 0
%preun
@@ -167,6 +173,44 @@ fi
exit 0
%changelog
+* Wed Jul 21 2011 Nalin Dahyabhai <nalin at redhat.com> 0.7.13-1
+- switch to only munging the contents of /etc/nslcd.conf on the very first
+ install (#706454)
+- make sure that we have enough space to parse any valid GID value when
+ parsing a user's primary GID (#716822)
+- change the file path Requires: we have for pam_ldap into a package name
+ Requires: (#601931)
+- tag nslcd.conf with %%verify(not md5 size mtime), since we always tweak
+ it in %%post (#692225)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec 13 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.13-1
+- update to 0.7.13
+
+* Fri Oct 29 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.12-1
+- update to 0.7.12
+
+* Fri Oct 15 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.11-1
+- update to 0.7.11
+
+* Wed Sep 29 2010 jkeating - 0.7.10-2
+- Rebuilt for gcc bug 634757
+
+* Fri Sep 24 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.10-1
+- update to 0.7.10
+
+* Thu Sep 23 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.9-2
+- when creating /var/run/nslcd in the buildroot, specify that 0755 is a
+ permissions value and not another directory name (#636880)
+
+* Mon Aug 30 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.9-1
+- update to 0.7.9
+
+* Wed Aug 18 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.8-1
+- update to 0.7.8
+
* Wed Jul 7 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.7-1
- update to 0.7.7
diff --git a/sources b/sources
index 5f52981..5c88c36 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7b37cc13b465495f90248e1209a05595 nss-pam-ldapd-0.7.7.tar.gz
-f9854ed77c78aa08ffe2ea78d95e7d08 nss-pam-ldapd-0.7.7.tar.gz.sig
+a0493b4e57bfe3bdd74bda1e7dff0841 nss-pam-ldapd-0.7.13.tar.gz
+19c166a710dfa8af1a46566f4022959c nss-pam-ldapd-0.7.13.tar.gz.sig
More information about the scm-commits
mailing list