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

lblume at users.sourceforge.net lblume at users.sourceforge.net
Wed Sep 25 11:19:55 CEST 2013


Revision: 21999
          http://gar.svn.sourceforge.net/gar/?rev=21999&view=rev
Author:   lblume
Date:     2013-09-25 09:19:55 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
samba/branches/samba4: Add patch to fix incompatible id use

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba4/Makefile

Added Paths:
-----------
    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 09:02:05 UTC (rev 21998)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile	2013-09-25 09:19:55 UTC (rev 21999)
@@ -29,6 +29,8 @@
 PATCHFILES += smbd_patch_for_setgroups.patch
 # From https://bugzilla.samba.org/show_bug.cgi?id=10112
 PATCHFILES += 0003-Use-R-linker-flag-instead-of-rpath.patch
+# Help the script to find the username
+PATCHFILES += 0004-solaris-id-is-not-xpg4.patch
 
 # Filesystem layout
 SMBLOCKDIR = $(localstatedir)/samba/locks
@@ -512,7 +514,7 @@
 
 # The build fails to add the right rpath to at least the public libs
 EXTRA_LDFLAGS = -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect
-# EXTRA_LD_OPTIONS = -B direct -z ignore
+EXTRA_LD_OPTIONS = -Bdirect -z ignore -z nolazyload
 
 # At the moment there are errors about python headers missing on 64 bit
 #BUILD64 = 1

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch	2013-09-25 09:19:55 UTC (rev 21999)
@@ -0,0 +1,13 @@
+index eb54f37..e734c44 100755
+--- a/source3/script/build_env.sh
++++ b/source3/script/build_env.sh
+@@ -18,7 +18,8 @@ else
+     if [ ! "x$LOGNAME" = "x" ]; then
+ 	whoami=$LOGNAME
+     else
+-	whoami=`whoami || id -un`
++	# Solaris id does not like -u
++	whoami 2> /dev/null || id -a 2> /dev/null || /usr/xpg4/bin/id -un
+     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