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

slowfranklin at users.sourceforge.net slowfranklin at users.sourceforge.net
Wed Sep 25 12:54:53 CEST 2013 

Revision: 22005
          http://gar.svn.sourceforge.net/gar/?rev=22005&view=rev
Author:   slowfranklin
Date:     2013-09-25 10:54:52 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
samba/branches/samba4: Add missing assignment to whoami variable, also add a final fallback

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba4/Makefile
    csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch

Modified: csw/mgar/pkg/samba/branches/samba4/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/Makefile	2013-09-25 10:41:40 UTC (rev 22004)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile	2013-09-25 10:54:52 UTC (rev 22005)
@@ -90,6 +90,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient0
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtdb1
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2
+CHECKPKG_OVERRIDES_CSWsamba4 += soname-unused
 
 # Package with clients, finished
 PACKAGES += CSWsamba4-client
@@ -108,6 +109,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1
 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtevent0
+CHECKPKG_OVERRIDES_CSWsamba4-client += soname-unused
 
 # Development package
 PACKAGES += CSWsamba4-dev
@@ -143,6 +145,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0
+CHECKPKG_OVERRIDES_CSWsamba4-dev += soname-unused
 
 # Package CSWsamba4 libraries
 PACKAGES += CSWsamba4-libs
@@ -168,6 +171,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtdb1
+CHECKPKG_OVERRIDES_CSWsamba4-libs += soname-unused
 
 PACKAGES += CSWlibdcerpc-atsvc0
 PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0\.0\.1)
@@ -177,6 +181,7 @@
 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += soname-unused
 
 PACKAGES += CSWlibdcerpc-binding0
 PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0\.0\.1)
@@ -189,6 +194,7 @@
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += soname-unused
 
 PACKAGES += CSWlibdcerpc-samr0
 PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0\.0\.1)
@@ -197,6 +203,7 @@
 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0 += soname-unused
 
 PACKAGES += CSWlibdcerpc-server0
 PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0\.0\.1)
@@ -217,6 +224,7 @@
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += soname-unused
 
 PACKAGES += CSWlibdcerpc0
 PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0\.0\.1)
@@ -226,6 +234,7 @@
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibdcerpc0 += soname-unused
 
 PACKAGES += CSWlibgensec0
 PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0\.0\.1)
@@ -242,6 +251,7 @@
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2
+CHECKPKG_OVERRIDES_CSWlibgensec0 += soname-unused
 
 PACKAGES += CSWlibndr-krb5pac0
 PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0\.0\.1)
@@ -249,6 +259,7 @@
 SPKG_DESC_CSWlibndr-krb5pac0 += $(DESCRIPTION), libndr-krb5pac.so.0
 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibndr-krb5pac0 += soname-unused
 
 PACKAGES += CSWlibndr-nbt0
 PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0\.0\.1)
@@ -256,6 +267,7 @@
 SPKG_DESC_CSWlibndr-nbt0 += $(DESCRIPTION), libndr-nbt.so.0
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibndr-nbt0 += soname-unused
 
 PACKAGES += CSWlibndr-standard0
 PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0\.0\.1)
@@ -263,6 +275,7 @@
 SPKG_DESC_CSWlibndr-standard0 += $(DESCRIPTION), libndr-standard.so.0
 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibndr-standard0 += soname-unused
 
 PACKAGES += CSWlibndr0
 PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1)
@@ -271,6 +284,7 @@
 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibndr0 += soname-unused
 
 PACKAGES += CSWlibnetapi0
 PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0)
@@ -280,6 +294,7 @@
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibnetapi0 += soname-unused
 
 PACKAGES += CSWlibpdb0
 PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0)
@@ -289,6 +304,7 @@
 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1
+CHECKPKG_OVERRIDES_CSWlibpdb0 += soname-unused
 
 PACKAGES += CSWlibregistry0
 PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0\.0\.1)
@@ -297,6 +313,7 @@
 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibregistry0 += soname-unused
 
 PACKAGES += CSWlibsamba-credentials0
 PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0\.0\.1)
@@ -308,6 +325,7 @@
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += soname-unused
 
 PACKAGES += CSWlibsamba-hostconfig0
 PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0\.0\.1)
@@ -318,6 +336,7 @@
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibsamba-hostconfig0 += soname-unused
 
 PACKAGES += CSWlibsamba-policy0
 PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0\.0\.1)
@@ -331,6 +350,7 @@
 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsmbclient-raw0
 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibsamba-policy0 += soname-unused
 
 PACKAGES += CSWlibsamba-util0
 PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0\.0\.1)
@@ -339,6 +359,7 @@
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWlibsamba-util0 += soname-unused
 
 PACKAGES += CSWlibsamdb0
 PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0\.0\.1)
@@ -351,6 +372,7 @@
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibsamdb0 += soname-unused
 
 PACKAGES += CSWlibsmbclient-raw0
 PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0\.0\.1)
@@ -360,6 +382,7 @@
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += soname-unused
 
 PACKAGES += CSWlibsmbconf0
 PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0)
@@ -374,8 +397,8 @@
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibsmbconf0 += soname-unused
 
-
 PACKAGES += CSWlibsmbldap0
 PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0)
 PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0(\.\d+)*)
@@ -387,6 +410,7 @@
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibsmbldap0 += soname-unused
 
 PACKAGES += CSWlibtevent-util0
 PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0\.0\.1)
@@ -398,6 +422,7 @@
 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibsamba-util0
+CHECKPKG_OVERRIDES_CSWlibtevent-util0 += soname-unused
 
 PACKAGES += CSWlibtorture0
 PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0\.0\.1)
@@ -405,6 +430,7 @@
 SPKG_DESC_CSWlibtorture0 += $(DESCRIPTION), libtorture.so.0
 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibtorture0 += soname-unused
 
 # Python package
 PACKAGES += CSWsamba4-python
@@ -417,6 +443,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpytalloc-util2
 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtdb1
+CHECKPKG_OVERRIDES_CSWsamba4-python += soname-unused
 
 # winbind daemon, NSS and PAM modules
 PACKAGES += CSWsamba4-winbind
@@ -445,6 +472,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1
+CHECKPKG_OVERRIDES_CSWsamba4-winbind += soname-unused
 
 PACKAGES += CSWsamba4-nss-system-links
 CATALOGNAME_CSWsamba4-nss-system-links = samba4_nss_system_links

Modified: csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch	2013-09-25 10:41:40 UTC (rev 22004)
+++ csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch	2013-09-25 10:54:52 UTC (rev 22005)
@@ -7,7 +7,7 @@
      else
 -	whoami=`whoami || id -un`
 +	# Solaris id does not like -u
-+	whoami 2> /dev/null || id -un 2> /dev/null || /usr/xpg4/bin/id -un
++	whoami=`whoami 2> /dev/null || id -un 2> /dev/null || /usr/xpg4/bin/id -un || echo unknown`
      fi
  fi
  

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