[nss-pam-ldapd] Rebase to 0.7.14

Jakub Hrozek jhrozek at fedoraproject.org
Fri Sep 23 11:06:13 UTC 2011


commit ff163e4e39d5bf0229c24c533f2f98181452ade8
Author: Jakub Hrozek <jhrozek at redhat.com>
Date:   Thu Sep 22 13:13:19 2011 +0200

    Rebase to 0.7.14
    
    * rebase the validname patch to apply on 0.7.14
    * obsolete the buffers patch

 .gitignore                           |    2 ++
 nss-pam-ldapd-0.7.13-validname.patch |    9 ---------
 nss-pam-ldapd-0.7.x-buffers.patch    |   29 -----------------------------
 nss-pam-ldapd.spec                   |   12 +++++-------
 sources                              |    4 ++--
 5 files changed, 9 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b1a0d88..f4dfa85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ nss-pam-ldapd-0.7.7.tar.gz.sig
 /nss-pam-ldapd-0.7.12.tar.gz.sig
 /nss-pam-ldapd-0.7.13.tar.gz
 /nss-pam-ldapd-0.7.13.tar.gz.sig
+/nss-pam-ldapd-0.7.14.tar.gz
+/nss-pam-ldapd-0.7.14.tar.gz.sig
diff --git a/nss-pam-ldapd-0.7.13-validname.patch b/nss-pam-ldapd-0.7.13-validname.patch
index 4b39ab9..4cd3e02 100644
--- a/nss-pam-ldapd-0.7.13-validname.patch
+++ b/nss-pam-ldapd-0.7.13-validname.patch
@@ -64,15 +64,6 @@ Index: nslcd/cfg.c
 ===================================================================
 --- nslcd/cfg.c	(revision 1410)
 +++ nslcd/cfg.c	(revision 1411)
-@@ -5,7 +5,7 @@
- 
-    Copyright (C) 1997-2005 Luke Howard
-    Copyright (C) 2007 West Consulting
--   Copyright (C) 2007, 2008, 2009, 2010 Arthur de Jong
-+   Copyright (C) 2007, 2008, 2009, 2010, 2011 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
 @@ -75,6 +75,11 @@
      exit(EXIT_FAILURE); \
    }
diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec
index 94f359a..e49017f 100644
--- a/nss-pam-ldapd.spec
+++ b/nss-pam-ldapd.spec
@@ -13,8 +13,8 @@
 %endif
 
 Name:		nss-pam-ldapd
-Version:	0.7.13
-Release:	9%{?dist}
+Version:	0.7.14
+Release:	1%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -24,7 +24,6 @@ Source1:	http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz.s
 Source2:	nslcd.init
 Source3:	nslcd.tmpfiles
 Source4:	nslcd.service
-Patch0:		nss-pam-ldapd-0.7.x-buffers.patch
 Patch1:		nss-pam-ldapd-0.7.13-validname.patch
 Patch2:		nss-pam-ldapd-0.7.x-dnssrv.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,7 +58,6 @@ nsswitch module.
 
 %prep
 %setup -q
-%patch0 -p1 -b .buffers
 %patch1 -p0 -b .validname
 %patch2 -p1 -b .dnssrv
 autoreconf -f -i
@@ -261,9 +259,9 @@ exit 0
 %endif
 
 %changelog
-* Mon Sep 12 2011 Nalin Dahyabhai <nalin at redhat.com> 0.7.13-9
-- update the validnames changes to the self-tests so that their expectations
-  match the modified defaults (#737496)
+* Fri Sep 23 2011 Jakub Hrozek <jhrozek at redhat.com> 0.7.14-1
+- new upstream release 0.7.14
+- obsoletes nss-pam-ldapd-0.7.x-buffers.patch
 
 * Wed Aug 24 2011 Nalin Dahyabhai <nalin at redhat.com> 0.7.13-8
 - include backported enhancement to take URIs in the form "dns:DOMAIN" in
diff --git a/sources b/sources
index 5c88c36..437aa4f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a0493b4e57bfe3bdd74bda1e7dff0841  nss-pam-ldapd-0.7.13.tar.gz
-19c166a710dfa8af1a46566f4022959c  nss-pam-ldapd-0.7.13.tar.gz.sig
+bc46b96eea32ca41d992dbff3de2400d  nss-pam-ldapd-0.7.14.tar.gz
+701f2d18801405d9ae58bf51df01d458  nss-pam-ldapd-0.7.14.tar.gz.sig


More information about the scm-commits mailing list