[packages/nss_extrausers] - updated to 0.6

[hawk]

commit 83f5d554e74f38f17bed5a000539d7e50d4d009f
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Wed May 9 13:14:59 2018 +0000

    - updated to 0.6

 lfs.patch                     | 36 ------------------------------------
 nss_extrausers-makefile.patch | 22 +++++++++-------------
 nss_extrausers-pld.patch      | 31 -------------------------------
 nss_extrausers.spec           | 10 +++-------
 4 files changed, 12 insertions(+), 87 deletions(-)
---
diff --git a/nss_extrausers.spec b/nss_extrausers.spec
index a80b00a..90c32c8 100644
--- a/nss_extrausers.spec
+++ b/nss_extrausers.spec
@@ -1,15 +1,13 @@
 Summary:	NSS module providing additional passwd, group and shadow files
 Summary(pl.UTF-8):	Moduł NSS dostarczający dodatkowe pliki passwd, group i shadow
 Name:		nss_extrausers
-Version:	0.2
-Release:	3
+Version:	0.6
+Release:	1
 License:	LGPL
 Group:		Base
 Source0:	http://ftp.debian.org/debian/pool/main/libn/libnss-extrausers/libnss-extrausers_%{version}.orig.tar.gz
-# Source0-md5:	68f13e0dd0523a77182cac165dc5491b
+# Source0-md5:	5c57596251e9dfc420cee9f660fc3773
 Patch0:		%{name}-makefile.patch
-Patch1:		%{name}-pld.patch
-Patch2:		lfs.patch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,8 +23,6 @@ przeniesionych z innego serwera w oddzielnych plikach.
 %prep
 %setup -q -n libnss-extrausers-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 CC="%{__cc}"
diff --git a/lfs.patch b/lfs.patch
deleted file mode 100644
index 55df8ad..0000000
--- a/lfs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- libnss-extrausers-0.2.orig/group.c
-+++ libnss-extrausers-0.2/group.c
-@@ -29,6 +29,7 @@
-    Lesser General Public License for more details.
- */
- #define _GNU_SOURCE 1
-+#define _FILE_OFFSET_BITS 64
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -119,7 +120,9 @@
- 	gid_t t_gid;
- 	char *t_name,*t_passwd;
- 	char **t_mem;
-+	off_t last_position;
- 
-+	last_position = ftello(stream);
- 	flockfile(stream);
- 	while( 1 )  {
- 		buffer[buflen - 1] = '\xff';
-@@ -139,6 +142,7 @@
- 		if( buffer[buflen - 1] != '\xff' || h == NULL ) {
- 			funlockfile(stream);
- 			*errnop = ERANGE;
-+			fseeko(stream, last_position, SEEK_SET);
- 			return NSS_STATUS_TRYAGAIN;
- 		}
- 		while( isspace(*h) && h != p ) {
-@@ -177,6 +181,7 @@
- 		t_mem = parse_list(h,buffer,buflen,errnop);
- 		if( t_mem == NULL ){
- 			funlockfile(stream);
-+			fseeko(stream, last_position, SEEK_SET);
- 			return NSS_STATUS_TRYAGAIN;
- 		}
- 		if( t_gid < MINGID ) {
diff --git a/nss_extrausers-makefile.patch b/nss_extrausers-makefile.patch
index 67b1521..e27ab6f 100644
--- a/nss_extrausers-makefile.patch
+++ b/nss_extrausers-makefile.patch
@@ -1,7 +1,7 @@
-diff -ur libnss-extrausers-0.2.orig/Makefile libnss-extrausers-0.2/Makefile
---- libnss-extrausers-0.2.orig/Makefile	2009-05-27 16:18:26.000000000 +0200
-+++ libnss-extrausers-0.2/Makefile	2009-07-16 22:43:31.245529045 +0200
-@@ -2,19 +2,18 @@
+diff -ur libnss-extrausers-0.6.orig/Makefile libnss-extrausers-0.6/Makefile
+--- libnss-extrausers-0.6.orig/Makefile	2012-04-04 15:33:04.000000000 +0000
++++ libnss-extrausers-0.6/Makefile	2018-05-09 13:10:37.349525098 +0000
+@@ -2,19 +2,13 @@
  
  CC = gcc
  prefix = /usr
@@ -14,19 +14,15 @@ diff -ur libnss-extrausers-0.2.orig/Makefile libnss-extrausers-0.2/Makefile
  OBJECTS=shadow$(OBJSUFFIX) passwd$(OBJSUFFIX) group$(OBJSUFFIX)
  SHARED_OBJECT = libnss_extrausers$(BITSOFS).so.2
  INSTALL_NAME = libnss_extrausers.so.2
- # This only works sometimes, give manually when needed:
+-# This only works sometimes, give manually when needed:
 -BIT_CFLAGS = $(if $(BITSOFS),-m$(BITSOFS))
 -CFLAGS = $(BIT_CFLAGS) -g -O2 -Wall -Wstrict-prototypes -Wpointer-arith -Wmissing-prototypes
 -CPPFLAGS =
 -LIBS = -lc
-+#BIT_CFLAGS = $(if $(BITSOFS),-m$(BITSOFS))
-+#CFLAGS = $(BIT_CFLAGS) -g -O2 -Wall -Wstrict-prototypes -Wpointer-arith -Wmissing-prototypes
-+#CPPFLAGS =
-+#LIBS = -lc
- LDFLAGS = -shared -Wl,-soname,$(INSTALL_NAME) -Wl,-z,defs --no-allow-shlib-undefined
- 
- all: $(SHARED_OBJECT)
-@@ -26,8 +25,8 @@
+ LDLIBFLAGS = -shared -Wl,-soname,$(INSTALL_NAME)
+ LDFLAGS = -Wl,-z,defs
+ VERSION = unreleased
+@@ -28,8 +22,8 @@
  	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c -o $@ $<
  
  install:
diff --git a/nss_extrausers-pld.patch b/nss_extrausers-pld.patch
deleted file mode 100644
index ae10e8c..0000000
--- a/nss_extrausers-pld.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur libnss-extrausers-0.2.orig/shadow.c libnss-extrausers-0.2/shadow.c
---- libnss-extrausers-0.2.orig/shadow.c	2009-05-27 13:42:54.000000000 +0200
-+++ libnss-extrausers-0.2/shadow.c	2009-07-18 15:18:58.000000000 +0200
-@@ -123,22 +123,27 @@
- 		p = ++h;
- 		/* extract min */
- 		t_min = strtol(p,&h,10);
-+		if(p == h) t_min = -1;
- 		p=h;
- 		CHECKCOLON;
- 		/* extract max */
- 		t_max = strtol(p,&h,10);
-+		if(p == h) t_max = -1;
- 		p=h;
- 		CHECKCOLON;
- 		/* extract days of warning */
- 		t_warn = strtol(p,&h,10);
-+		if(p == h) t_warn = -1;
- 		p=h;
- 		CHECKCOLON;
- 		/* extract days of inactivity */
- 		t_inact = strtol(p,&h,10);
-+		if(p == h) t_inact = -1;
- 		p=h;
- 		CHECKCOLON;
- 		/* extract day of expire */
- 		t_expire = strtol(p,&h,10);
-+		if(p == h) t_expire = -1;
- 		p=h;
- 		CHECKCOLON;
- 		/* extract reserved flags */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nss_extrausers.git/commitdiff/83f5d554e74f38f17bed5a000539d7e50d4d009f