[csw-devel] SF.net SVN: gar:[21412] csw/mgar/pkg/samba/branches/samba3

lblume at users.sourceforge.net lblume at users.sourceforge.net
Sat Jun 29 13:53:37 CEST 2013


Revision: 21412
          http://gar.svn.sourceforge.net/gar/?rev=21412&view=rev
Author:   lblume
Date:     2013-06-29 11:53:32 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
samba/branches/samba3: Typo in recipe; additional bits of renaming for nss_winbind.so.1

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba3/Makefile
    csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2013-06-28 22:39:11 UTC (rev 21411)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2013-06-29 11:53:32 UTC (rev 21412)
@@ -24,9 +24,9 @@
 # This is taken from the old Samba package
 DISTFILES += cswkrb5.conf
 
-PATCHFILE += 0001-nss_winbind.patch
-PATCHFILE += 0002-smbd-patch-for-setgroups.c.patch
-PATCHFILE += 0003-rename-nss-modules.patch
+PATCHFILES += 0001-nss_winbind.patch
+PATCHFILES += 0002-smbd-patch-for-setgroups.c.patch
+PATCHFILES += 0003-rename-nss-modules.patch
 
 GARCOMPILER=SOS12U3
 
@@ -150,10 +150,11 @@
 PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1)
 SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1
 
-PACKAGES += CSWlibnss-winbind1
-CATALOGNAME_CSWlibnss-winbind1 = libnss_winbind1
-PKGFILES_CSWlibnss-winbind1 += $(call pkgfiles_lib,libnss_winbind.so.1)
-SPKG_DESC_CSWlibnss-winbind1 += Winbind nss libary,libnss_winbind.so.1
+PACKAGES += CSWnss-winbind1
+CATALOGNAME_CSWnss-winbind1 = nss_winbind1
+PKGFILES_CSWnss-winbind1 += $(call pkgfiles_lib,nss_winbind.so.1)
+SPKG_DESC_CSWnss-winbind1 += Winbind nss libary,nss_winbind.so.1
+OBSOLETED_BY_CSWnss-winbind1 += CSWlibnss-winbind1
 
 PACKAGES += CSWlibtevent0
 CATALOGNAME_CSWlibtevent0 = libtevent0
@@ -263,13 +264,13 @@
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibnss-winbind1
+RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWnss-winbind1
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtevent0
 OBSOLETED_BY_CSWsamba-winbind += CSWsambawb
 
-CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWlibnss-winbind1
+CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWnss-winbind1
 
 # Needed as the configure script doesn't add it
 EXTRA_LINKER_FLAGS += -lintl 
@@ -352,4 +353,4 @@
 	ginstall $(WORKDIR)/cswwinbind $(DESTDIR)/etc/opt/csw/init.d/cswwinbind
 	ginstall -d $(DESTDIR)/etc/opt/csw/samba
 	ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf
-	ginstall $(WORKSRC)/nsswitch/libnss_winbind.so $(DESTDIR)/$(libdir)/libnss_winbind.so.1
+	ginstall $(WORKSRC)/nsswitch/nss_winbind.so $(DESTDIR)/$(libdir)/nss_winbind.so.1

Modified: csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch	2013-06-28 22:39:11 UTC (rev 21411)
+++ csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch	2013-06-29 11:53:32 UTC (rev 21412)
@@ -20,3 +20,14 @@
  		;;
  	*hpux11*)
  		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o"
+--- a/source3/Makefile.in	Wed Jun 19 09:35:24 2013
++++ b/source3/Makefile.in	Sat Jun 29 13:30:23 2013
+@@ -3578,7 +3578,7 @@
+ test:: all torture timelimit
+ 	@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
+ 		SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \
+-		NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
++		NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/nss_winbind.so" \
+ 		SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \
+ 		SOURCEDIR="$(srcdir)" \
+ 		VFSLIBDIR="$(builddir)/bin" \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list