packages: samba/samba-link.patch, samba/samba-nscd.patch - reverted

[amateja]

Author: amateja                      Date: Thu Sep 10 06:58:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reverted

---- Files affected:
packages/samba:
   samba-link.patch (1.4 -> 1.5) , samba-nscd.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/samba/samba-link.patch
diff -u packages/samba/samba-link.patch:1.4 packages/samba/samba-link.patch:1.5
--- packages/samba/samba-link.patch:1.4	Thu Sep 10 08:51:33 2009
+++ packages/samba/samba-link.patch	Thu Sep 10 08:57:59 2009
@@ -1,11 +1,11 @@
---- samba-3.4.1/source3/Makefile.in.orig	2009-09-10 08:02:36.000000000 +0200
-+++ samba-3.4.1/source3/Makefile.in	2009-09-10 08:05:13.000000000 +0200
+--- samba-3.2.4/source3/Makefile.in.orig	2008-10-09 23:09:56.133256245 +0200
++++ samba-3.2.4/source3/Makefile.in	2008-10-09 23:10:15.631916148 +0200
 @@ -1468,7 +1468,7 @@
  bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
  	@echo Linking $@
  	@$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
--		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
-+		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) $(ZLIB_LIBS) \
+-		-lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
++		-lkeyutils $(LIBSMBCLIENT_OBJ1) $(LIBS) $(KRB5LIBS) $(ZLIB_LIBS) \
  		$(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
  		$(LIBTDB_LIBS) $(NSCD_LIBS)
  

================================================================
Index: packages/samba/samba-nscd.patch
diff -u packages/samba/samba-nscd.patch:1.3 packages/samba/samba-nscd.patch:1.4
--- packages/samba/samba-nscd.patch:1.3	Thu Sep 10 08:51:33 2009
+++ packages/samba/samba-nscd.patch	Thu Sep 10 08:57:59 2009
@@ -1,11 +1,12 @@
---- samba-3.4.1/source3/Makefile.in.orig	2009-09-09 20:51:56.000000000 +0200
-+++ samba-3.4.1/source3/Makefile.in	2009-09-10 07:57:29.000000000 +0200
+diff -urN samba-3.2.1.org/source3/Makefile.in samba-3.2.1/source3/Makefile.in
+--- samba-3.2.1.org/source3/Makefile.in	2008-08-05 08:22:33.000000000 +0200
++++ samba-3.2.1/source3/Makefile.in	2008-08-17 23:24:32.085914644 +0200
 @@ -1430,7 +1430,7 @@
- 	@$(CC) -o $@ $(LDFLAGS) $(RPCCLIENT_OBJ) \
+ 	@$(CC) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
  		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
  		$(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
--		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS)
-+		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS) $(NSCD_LIBS)
+-		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
++		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(NSCD_LIBS)
  
  bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
  	@echo Linking $@
@@ -18,3 +19,4 @@
  
  bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
  	@echo Linking $@
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-link.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba-nscd.patch?r1=1.3&r2=1.4&f=u