rpms/samba/devel samba-3.0.24-enable_pam_nss_tests.patch, NONE, 1.1 samba-3.0.24-nss_wins.patch, NONE, 1.1 samba.spec, 1.102, 1.103

[fedora-cvs-commits at redhat.com]

Author: gdeschne

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30375

Modified Files:
	samba.spec 
Added Files:
	samba-3.0.24-enable_pam_nss_tests.patch 
	samba-3.0.24-nss_wins.patch 
Log Message:
- enable PAM and NSS dlopen checks during build
- fix unresolved symbols in libnss_wins.so (bug #198230)

Guenther



samba-3.0.24-enable_pam_nss_tests.patch:
 Makefile.in |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE samba-3.0.24-enable_pam_nss_tests.patch ---
--- source/Makefile.in
+++ source/Makefile.in
@@ -160,6 +160,8 @@
 
 PAM_MODULES = @PAM_MODULES@
 
+NSS_MODULES = @WINBIND_WINS_NSS@ @WINBIND_NSS@
+
 SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
 
 VFS_MODULES = @VFS_MODULES@
@@ -769,6 +771,12 @@
 all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
 	$(SHLIBS) $(MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
 
+nss_modules : $(NSS_MODULES)
+
+libnss_winbind : SHOWFLAGS proto_exists nsswitch/libnss_winbind. at SHLIBEXT@
+
+libnss_wins : SHOWFLAGS proto_exists nsswitch/libnss_wins. at SHLIBEXT@
+
 pam_modules : $(PAM_MODULES)
 
 pam_smbpass : SHOWFLAGS proto_exists bin/pam_smbpass. at SHLIBEXT@
@@ -1736,6 +1744,14 @@
 ######################################################################
 # Samba Testing Framework
 
+# Check for NSS module problems. 
+test_nss_modules: nss_modules
+	@echo "Testing $(NSS_MODULES) "
+	@for module in $(NSS_MODULES); do \
+		./script/tests/dlopen.sh $${module} \
+			|| exit 1; \
+	done
+
 # Check for PAM module problems.  Specifically, check that every module we
 # built can actually be loaded by a minimal PAM-aware application.
 test_pam_modules: pam_modules

samba-3.0.24-nss_wins.patch:
 Makefile.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE samba-3.0.24-nss_wins.patch ---
Index: source/Makefile.in
===================================================================
--- source/Makefile.in.orig
+++ source/Makefile.in
@@ -687,7 +687,8 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) \
             $(RPC_NTSVCS_OBJ) utils/passwd_util.o
 
 WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
-	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
+	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
+	$(SECRETS_OBJ)
 
 WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=. at PICSUFFIX@)
 
@@ -1231,7 +1232,7 @@ bin/winbindd at EXEEXT@: $(WINBINDD_OBJ) @B
 @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
 	@echo "Linking $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
-		$(LDAP_LIBS) $(KRB5LIBS) \
+		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) \
 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
 
 bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@) bin/.dummy


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- samba.spec	30 Mar 2007 19:39:40 -0000	1.102
+++ samba.spec	3 Apr 2007 14:18:24 -0000	1.103
@@ -4,7 +4,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.24
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -51,6 +51,8 @@
 Patch116: samba-3.0.24-arch_macro.patch
 Patch117: samba-3.0.24-pam_winbind-fixes.patch
 Patch118: samba-3.0.24-tar_options.patch
+Patch119: samba-3.0.24-enable_pam_nss_tests.patch
+Patch120: samba-3.0.24-nss_wins.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64 %{auth} 
@@ -175,6 +177,8 @@
 %patch116 -p0 -b .arch_macro
 %patch117 -p0 -b .pam_winbind
 %patch118 -p0 -b .tar_options
+%patch119 -p0 -b .pam_nss_test
+%patch120 -p0 -b .nss_wins
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -224,7 +228,7 @@
 	proto
 
 make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
-	all nsswitch/libnss_wins.so modules
+	all nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules
 
 make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
 	debug2html
@@ -627,6 +631,10 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Apr 03 2007 Guenther Deschner <gdeschner at redhat.com> 3.0.24-11.fc7
+- enable PAM and NSS dlopen checks during build
+- fix unresolved symbols in libnss_wins.so (bug #198230)
+
 * Fri Mar 30 2007 Simo Sorce <ssorce at redhat.com> 3.0.24-10.fc7
 - set passdb backend = tdbsam as default in smb.conf
 - remove samba-docs dependency from swat, that was a mistake