| [1273] | 1 | --- nss-ldapd.spec.orig | 
|---|
 | 2 | +++ nss-ldapd.spec | 
|---|
 | 3 | @@ -19,20 +19,20 @@ | 
|---|
| [912] | 4 |   | 
|---|
| [1132] | 5 |   | 
|---|
| [912] | 6 |  Name:           nss-ldapd | 
|---|
 | 7 | -BuildRequires:  db-devel krb5-devel openldap2-devel | 
|---|
 | 8 | +BuildRequires:  db4-devel krb5-devel openldap-devel autoconf automake libtool | 
|---|
 | 9 |  License:        LGPL v2.1 or later | 
|---|
 | 10 |  Group:          Productivity/Networking/LDAP/Clients | 
|---|
| [1132] | 11 |  AutoReqProv:    on | 
|---|
 | 12 |  PreReq:         /bin/chmod | 
|---|
 | 13 |  Conflicts:      nss_ldap | 
|---|
| [1273] | 14 |  Version:        0.6.10 | 
|---|
 | 15 | -Release:        6.2 | 
|---|
 | 16 | +Release:        6.2.scripts.%{scriptsversion} | 
|---|
| [1132] | 17 |  Summary:        NSS module and daemon for using LDAP as a naming service | 
|---|
| [1273] | 18 |  Url:            http://arthurdejong.org/nss-ldapd/ | 
|---|
| [912] | 19 |  Source:         nss-ldapd-%{version}.tar.bz2 | 
|---|
 | 20 | -Source1:        rc.nslcd | 
|---|
| [1273] | 21 |  Source100:      nss-ldapd-0.6.8-rpmlintrc | 
|---|
 | 22 |  Patch0:         nslcd-passwd-offbyone.dif | 
|---|
| [912] | 23 | +Patch1000:      rc.nslcd.patch | 
|---|
 | 24 |  BuildRoot:      %{_tmppath}/%{name}-%{version}-build | 
|---|
 | 25 |   | 
|---|
| [1273] | 26 |  %description | 
|---|
 | 27 | @@ -53,8 +53,8 @@ | 
|---|
| [912] | 28 |   | 
|---|
 | 29 |  %prep | 
|---|
 | 30 |  %setup -q | 
|---|
 | 31 | -cp -v %{S:1} . | 
|---|
| [1273] | 32 | -%patch -p1 | 
|---|
 | 33 | +%patch0 -p1 | 
|---|
| [912] | 34 | +%patch1000 -p0 -b .rc | 
|---|
 | 35 |   | 
|---|
 | 36 |  %build | 
|---|
 | 37 |  %{?suse_update_config:%{suse_update_config -f}} | 
|---|
| [1273] | 38 | @@ -71,7 +71,6 @@ | 
|---|
| [912] | 39 |  mkdir -p $RPM_BUILD_ROOT/etc/init.d/ | 
|---|
 | 40 |  mkdir -p $RPM_BUILD_ROOT/usr/sbin/ | 
|---|
 | 41 |  install -m 755 rc.nslcd $RPM_BUILD_ROOT/etc/init.d/nslcd | 
|---|
 | 42 | -ln -sf ../../etc/init.d/nslcd $RPM_BUILD_ROOT/usr/sbin/rcnslcd | 
|---|
 | 43 |  make DESTDIR=$RPM_BUILD_ROOT install | 
|---|
 | 44 |  mkdir -p $RPM_BUILD_ROOT/var/run/nslcd | 
|---|
 | 45 |  install -m 644 man/nss-ldapd.conf.5 $RPM_BUILD_ROOT/usr/share/man/man5 | 
|---|
| [1273] | 46 | @@ -87,13 +86,8 @@ | 
|---|
| [1132] | 47 |      /bin/chmod 640 /etc/nss-ldapd.conf | 
|---|
 | 48 |  fi | 
|---|
| [913] | 49 |   | 
|---|
 | 50 | -%preun | 
|---|
 | 51 | -%stop_on_removal nslcd | 
|---|
 | 52 | - | 
|---|
 | 53 |  %postun  | 
|---|
 | 54 |  /sbin/ldconfig | 
|---|
 | 55 | -%restart_on_update nslcd | 
|---|
 | 56 | -%insserv_cleanup | 
|---|
 | 57 |   | 
|---|
 | 58 |  %files | 
|---|
 | 59 |  %defattr(-,root,root) | 
|---|
| [1273] | 60 | @@ -103,7 +97,6 @@ | 
|---|
| [912] | 61 |  %doc %{_mandir}/man8/* | 
|---|
| [1132] | 62 |  %config(noreplace) %attr(640,root,root) /etc/nss-ldapd.conf | 
|---|
| [912] | 63 |  %config /etc/init.d/nslcd | 
|---|
 | 64 | -/usr/sbin/rcnslcd | 
|---|
 | 65 |  %dir /var/run/nslcd | 
|---|
 | 66 |  /usr/sbin/nslcd | 
|---|
 | 67 |   | 
|---|
| [1273] | 68 | @@ -151,6 +144,10 @@ | 
|---|
| [1132] | 69 |  - Adjust config file permissions upon update, to fix world-readable | 
|---|
 | 70 |    /etc/nss-ldapd.conf as created by older versions | 
|---|
 | 71 |    (bnc#487737, CVE-2009-1073) | 
|---|
| [912] | 72 | +* Wed Dec 31 2008  <quentin@mit.edu> - 0.6.4-3.0 | 
|---|
 | 73 | +- add init script for Fedora | 
|---|
 | 74 | +* Wed Dec 31 2008  <quentin@mit.edu> - 0.6.4-2.4 | 
|---|
 | 75 | +- port from openSUSE to Fedora | 
|---|
| [1132] | 76 |  * Fri Aug 15 2008 rhafer@suse.de | 
|---|
 | 77 |  - Fixed "Required-Stop" Tag to include the same services as | 
|---|
 | 78 |    "Required-Start" | 
|---|