Author: lmuelle Date: 2006-03-13 14:22:43 +0000 (Mon, 13 Mar 2006) New Revision: 14317
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14317 Log: Use source/bin as dir to link pam_winbind instead of source/nsswitch/ The intention is to have the resulting binaries at one place. This is also usefull for upcoming changes to provide a test_pammodules rule. With these changes I even got aware of testsuite/nsswitch/pam_winbind_syms.exp But this only covers pam_winbind. Modified: branches/SAMBA_3_0/packaging/Debian/debian-sarge/rules branches/SAMBA_3_0/packaging/Debian/debian-unstable/rules branches/SAMBA_3_0/packaging/Debian/debian-woody/rules branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl branches/SAMBA_3_0/packaging/Solaris/makepkg.sh branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/testsuite/nsswitch/pam_winbind_syms.exp trunk/packaging/Debian/debian-sarge/rules trunk/packaging/Debian/debian-unstable/rules trunk/packaging/Debian/debian-woody/rules trunk/packaging/RHEL/samba.spec.tmpl trunk/packaging/RedHat-9/samba.spec.tmpl trunk/packaging/Solaris/makepkg.sh trunk/source/Makefile.in trunk/source/configure.in trunk/testsuite/nsswitch/pam_winbind_syms.exp Changeset: Modified: branches/SAMBA_3_0/packaging/Debian/debian-sarge/rules =================================================================== --- branches/SAMBA_3_0/packaging/Debian/debian-sarge/rules 2006-03-13 12:43:59 UTC (rev 14316) +++ branches/SAMBA_3_0/packaging/Debian/debian-sarge/rules 2006-03-13 14:22:43 UTC (rev 14317) @@ -181,7 +181,7 @@ # Install winbind stuff not installed by 'make install' install -m 0644 source/nsswitch/libnss_winbind.so \ $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so \ + install -m 0644 source/bin/pam_winbind.so \ $(DESTDIR)/lib/security/ # Install libnss_wins.so, which is not installed by 'make install' either. Modified: branches/SAMBA_3_0/packaging/Debian/debian-unstable/rules =================================================================== --- branches/SAMBA_3_0/packaging/Debian/debian-unstable/rules 2006-03-13 12:43:59 UTC (rev 14316) +++ branches/SAMBA_3_0/packaging/Debian/debian-unstable/rules 2006-03-13 14:22:43 UTC (rev 14317) @@ -176,7 +176,7 @@ # Install winbind stuff not installed by 'make install' install -m 0644 source/nsswitch/libnss_winbind.so \ $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so \ + install -m 0644 source/bin/pam_winbind.so \ $(DESTDIR)/lib/security/ # Install libnss_wins.so, which is not installed by 'make install' either. Modified: branches/SAMBA_3_0/packaging/Debian/debian-woody/rules =================================================================== --- branches/SAMBA_3_0/packaging/Debian/debian-woody/rules 2006-03-13 12:43:59 UTC (rev 14316) +++ branches/SAMBA_3_0/packaging/Debian/debian-woody/rules 2006-03-13 14:22:43 UTC (rev 14317) @@ -147,7 +147,7 @@ # Install winbind stuff not installed by 'make install' install -m 0644 source/nsswitch/libnss_winbind.so \ $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so \ + install -m 0644 source/bin/pam_winbind.so \ $(DESTDIR)/lib/security/ # Install libnss_wins.so, which is not installed by 'make install' either. Modified: branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl =================================================================== --- branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl 2006-03-13 12:43:59 UTC (rev 14316) +++ branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl 2006-03-13 14:22:43 UTC (rev 14317) @@ -211,7 +211,7 @@ cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so # NSS & PAM winbind support -install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so +install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so ( cd $RPM_BUILD_ROOT/%{_lib}; Modified: branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl =================================================================== --- branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl 2006-03-13 12:43:59 UTC (rev 14316) +++ branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl 2006-03-13 14:22:43 UTC (rev 14317) @@ -177,7 +177,7 @@ # Install winbind shared libraries install -m755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib ( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_winbind.so libnss_winbind.so.2 ) -install -m755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security +install -m755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/lib/security # Install pam_smbpass.so install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security Modified: branches/SAMBA_3_0/packaging/Solaris/makepkg.sh =================================================================== --- branches/SAMBA_3_0/packaging/Solaris/makepkg.sh 2006-03-13 12:43:59 UTC (rev 14316) +++ branches/SAMBA_3_0/packaging/Solaris/makepkg.sh 2006-03-13 14:22:43 UTC (rev 14317) @@ -172,8 +172,8 @@ ## cp -fp nsswitch/libnss_wins.so $TMPINSTALLDIR/$LIBDIR/nss_wins.so.1 cp -fp nsswitch/libnss_winbind.so $TMPINSTALLDIR/$LIBDIR/nss_winbind.so.1 -if [ -f nsswitch/pam_winbind.so ]; then - cp -fp nsswitch/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so +if [ -f bin/pam_winbind.so ]; then + cp -fp bin/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so fi if [ -f bin/smbwrapper.so ]; then cp -fp bin/smbwrapper.so $TMPINSTALLDIR/$INSTALL_BASE/lib Modified: branches/SAMBA_3_0/source/Makefile.in =================================================================== --- branches/SAMBA_3_0/source/Makefile.in 2006-03-13 12:43:59 UTC (rev 14316) +++ branches/SAMBA_3_0/source/Makefile.in 2006-03-13 14:22:43 UTC (rev 14317) @@ -788,7 +788,7 @@ talloctort : SHOWFLAGS bin/[EMAIL PROTECTED]@ nsswitch : SHOWFLAGS bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @WINBIND_NSS@ \ - @WINBIND_WINS_NSS@ nsswitch/[EMAIL PROTECTED]@ + @WINBIND_WINS_NSS@ bin/[EMAIL PROTECTED]@ wins : SHOWFLAGS @WINBIND_WINS_NSS@ @@ -1196,7 +1196,7 @@ $(LDAP_LIBS) $(KRB5LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED]@SONAMEVERSIONSUFFIX@ -nsswitch/[EMAIL PROTECTED]@: $(PAM_WINBIND_PICOBJ) bin/.dummy +bin/[EMAIL PROTECTED]@: $(PAM_WINBIND_PICOBJ) bin/.dummy @echo "Linking $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \ @[EMAIL PROTECTED] [EMAIL PROTECTED] $(LIBS) -lpam Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2006-03-13 12:43:59 UTC (rev 14316) +++ branches/SAMBA_3_0/source/configure.in 2006-03-13 14:22:43 UTC (rev 14317) @@ -5107,7 +5107,7 @@ SHLIB_PROGS="$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS" if test x"$with_pam" = x"yes"; then - SHLIB_PROGS="$SHLIB_PROGS nsswitch/pam_winbind.$SHLIBEXT" + SHLIB_PROGS="$SHLIB_PROGS bin/pam_winbind.$SHLIBEXT" fi fi else Modified: branches/SAMBA_3_0/testsuite/nsswitch/pam_winbind_syms.exp =================================================================== --- branches/SAMBA_3_0/testsuite/nsswitch/pam_winbind_syms.exp 2006-03-13 12:43:59 UTC (rev 14316) +++ branches/SAMBA_3_0/testsuite/nsswitch/pam_winbind_syms.exp 2006-03-13 14:22:43 UTC (rev 14317) @@ -29,7 +29,7 @@ # Run load-dl.c set output [util_start "$srcdir/$subdir/pam_winbind_syms" \ - "nsswitch/pam_winbind.so"] + "bin/pam_winbind.so"] if {[regexp "FAIL:" $output]} { fail "run pam_winbind_syms" Modified: trunk/packaging/Debian/debian-sarge/rules =================================================================== --- trunk/packaging/Debian/debian-sarge/rules 2006-03-13 12:43:59 UTC (rev 14316) +++ trunk/packaging/Debian/debian-sarge/rules 2006-03-13 14:22:43 UTC (rev 14317) @@ -180,7 +180,7 @@ # Install winbind stuff not installed by 'make install' install -m 0644 source/nsswitch/libnss_winbind.so \ $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so \ + install -m 0644 source/bin/pam_winbind.so \ $(DESTDIR)/lib/security/ # Install libnss_wins.so, which is not installed by 'make install' either. Modified: trunk/packaging/Debian/debian-unstable/rules =================================================================== --- trunk/packaging/Debian/debian-unstable/rules 2006-03-13 12:43:59 UTC (rev 14316) +++ trunk/packaging/Debian/debian-unstable/rules 2006-03-13 14:22:43 UTC (rev 14317) @@ -176,7 +176,7 @@ # Install winbind stuff not installed by 'make install' install -m 0644 source/nsswitch/libnss_winbind.so \ $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so \ + install -m 0644 source/bin/pam_winbind.so \ $(DESTDIR)/lib/security/ # Install libnss_wins.so, which is not installed by 'make install' either. Modified: trunk/packaging/Debian/debian-woody/rules =================================================================== --- trunk/packaging/Debian/debian-woody/rules 2006-03-13 12:43:59 UTC (rev 14316) +++ trunk/packaging/Debian/debian-woody/rules 2006-03-13 14:22:43 UTC (rev 14317) @@ -147,7 +147,7 @@ # Install winbind stuff not installed by 'make install' install -m 0644 source/nsswitch/libnss_winbind.so \ $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so \ + install -m 0644 source/bin/pam_winbind.so \ $(DESTDIR)/lib/security/ # Install libnss_wins.so, which is not installed by 'make install' either. Modified: trunk/packaging/RHEL/samba.spec.tmpl =================================================================== --- trunk/packaging/RHEL/samba.spec.tmpl 2006-03-13 12:43:59 UTC (rev 14316) +++ trunk/packaging/RHEL/samba.spec.tmpl 2006-03-13 14:22:43 UTC (rev 14317) @@ -179,7 +179,7 @@ cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so # NSS & PAM winbind support -install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so +install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so ( cd $RPM_BUILD_ROOT/%{_lib}; Modified: trunk/packaging/RedHat-9/samba.spec.tmpl =================================================================== --- trunk/packaging/RedHat-9/samba.spec.tmpl 2006-03-13 12:43:59 UTC (rev 14316) +++ trunk/packaging/RedHat-9/samba.spec.tmpl 2006-03-13 14:22:43 UTC (rev 14317) @@ -177,7 +177,7 @@ # Install winbind shared libraries install -m755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib ( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_winbind.so libnss_winbind.so.2 ) -install -m755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security +install -m755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/lib/security # Install pam_smbpass.so install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security Modified: trunk/packaging/Solaris/makepkg.sh =================================================================== --- trunk/packaging/Solaris/makepkg.sh 2006-03-13 12:43:59 UTC (rev 14316) +++ trunk/packaging/Solaris/makepkg.sh 2006-03-13 14:22:43 UTC (rev 14317) @@ -172,8 +172,8 @@ ## cp -fp nsswitch/libnss_wins.so $TMPINSTALLDIR/$LIBDIR/nss_wins.so.1 cp -fp nsswitch/libnss_winbind.so $TMPINSTALLDIR/$LIBDIR/nss_winbind.so.1 -if [ -f nsswitch/pam_winbind.so ]; then - cp -fp nsswitch/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so +if [ -f bin/pam_winbind.so ]; then + cp -fp bin/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so fi if [ -f bin/smbwrapper.so ]; then cp -fp bin/smbwrapper.so $TMPINSTALLDIR/$INSTALL_BASE/lib Modified: trunk/source/Makefile.in =================================================================== --- trunk/source/Makefile.in 2006-03-13 12:43:59 UTC (rev 14316) +++ trunk/source/Makefile.in 2006-03-13 14:22:43 UTC (rev 14317) @@ -804,7 +804,7 @@ talloctort : SHOWFLAGS bin/[EMAIL PROTECTED]@ nsswitch : SHOWFLAGS bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @WINBIND_NSS@ \ - @WINBIND_WINS_NSS@ nsswitch/[EMAIL PROTECTED]@ + @WINBIND_WINS_NSS@ bin/[EMAIL PROTECTED]@ wins : SHOWFLAGS @WINBIND_WINS_NSS@ @@ -1225,7 +1225,7 @@ $(LDAP_LIBS) $(KRB5LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED]@NSSSONAMEVERSIONSUFFIX@ -nsswitch/[EMAIL PROTECTED]@: $(PAM_WINBIND_PICOBJ) bin/.dummy +bin/[EMAIL PROTECTED]@: $(PAM_WINBIND_PICOBJ) bin/.dummy @echo "Linking $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \ @[EMAIL PROTECTED] [EMAIL PROTECTED] $(LIBS) -lpam Modified: trunk/source/configure.in =================================================================== --- trunk/source/configure.in 2006-03-13 12:43:59 UTC (rev 14316) +++ trunk/source/configure.in 2006-03-13 14:22:43 UTC (rev 14317) @@ -5107,7 +5107,7 @@ SHLIB_PROGS="$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS" if test x"$with_pam" = x"yes"; then - SHLIB_PROGS="$SHLIB_PROGS nsswitch/pam_winbind.$SHLIBEXT" + SHLIB_PROGS="$SHLIB_PROGS bin/pam_winbind.$SHLIBEXT" fi fi else Modified: trunk/testsuite/nsswitch/pam_winbind_syms.exp =================================================================== --- trunk/testsuite/nsswitch/pam_winbind_syms.exp 2006-03-13 12:43:59 UTC (rev 14316) +++ trunk/testsuite/nsswitch/pam_winbind_syms.exp 2006-03-13 14:22:43 UTC (rev 14317) @@ -29,7 +29,7 @@ # Run load-dl.c set output [util_start "$srcdir/$subdir/pam_winbind_syms" \ - "nsswitch/pam_winbind.so"] + "bin/pam_winbind.so"] if {[regexp "FAIL:" $output]} { fail "run pam_winbind_syms"
