[csw-devel] SF.net SVN: gar:[20217] csw/mgar/pkg/samba/trunk

Fri Jan 25 14:50:55 CET 2013

Revision: 20217
          http://gar.svn.sourceforge.net/gar/?rev=20217&view=rev
Author:   janholzh
Date:     2013-01-25 13:50:54 +0000 (Fri, 25 Jan 2013)
Log Message:
-----------
samba/trunk: push what I have so far. So full build yet

Modified Paths:
--------------
    csw/mgar/pkg/samba/trunk/Makefile
    csw/mgar/pkg/samba/trunk/checksums

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================

--- csw/mgar/pkg/samba/trunk/Makefile	2013-01-25 10:38:18 UTC (rev 20216)
+++ csw/mgar/pkg/samba/trunk/Makefile	2013-01-25 13:50:54 UTC (rev 20217)
@@ -1,8 +1,6 @@
-# TBD:
-# - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time
 
 NAME = samba
-VERSION = 4.0.0
+VERSION = 4.0.1
 GARTYPE = v2
 
 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server)
@@ -24,9 +22,6 @@
 # This is taken from the old Samba package
 DISTFILES += cswkrb5.conf
 
-#What needs to be fixed:
-# Split libs and packages
-
 BUILD_DEP_PKGS += CSWlibtalloc-dev
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -59,12 +54,6 @@
 CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/net.8
 CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/swat.8
 
-# Make one unified package for now
-OBSOLETED_BY_CSWsamba += CSWsambacommon
-CATALOGNAME_CSWsambacommon = samba_common_stub
-OBSOLETED_BY_CSWsamba += CSWsambadoc
-CATALOGNAME_CSWsambadoc = samba_doc_stub
-
 PACKAGES += CSWsamba-client
 SPKG_DESC_CSWsamba-client = Client binaries for samba
 SMB_CLIENT_TOOLS = rpcclient smbcacls smbclient smbcquotas smbget smbspool smbtar smbtree
@@ -277,36 +266,39 @@
 CHECKPKG_OVERRIDES_CSWsamba-winbind += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/winbindd.8
 CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWlibnss-winbind1
 
-EXTRA_CFLAGS = -lintl
-EXTRA_LDFLAGS = -lintl
+EXTRA_CFLAGS = -lrt -lintl
+EXTRA_LDFLAGS = -lrt -lintl
 
 BUILD64 = 1
 ISAEXEC = 1
 
+GARCOMPILER = GNU
+
 SMBLOCKDIR = $(localstatedir)/samba/locks
 SMBLOGDIR = $(localstatedir)/samba/log
 SMBPRIVATEDIR = $(sysconfdir)/samba/private
 SMBCONFIGDIR = $(sysconfdir)/samba
 
-#CONFIGURE_SCRIPTS = $(WORKSRC)/source4/configure
 CONFIGURE_ARGS += $(DIRPATHS)
-CONFIGURE_ARGS += --enable-shared=yes
-CONFIGURE_ARGS += --enable-static=no
+#Remove exec_prefix from DIRPATHS:
+NODIRPATHS += --exec_prefix=/opt/csw 
+
+#CONFIGURE_ARGS += --enable-shared=yes
+#CONFIGURE_ARGS += --enable-static=no
 #CONFIGURE_ARGS += --enable-socket-wrapper
 #CONFIGURE_ARGS += --enable-nss-wrapper
 CONFIGURE_ARGS += --with-acl-support
 CONFIGURE_ARGS += --with-aio-support
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-winbind
-CONFIGURE_ARGS += --with-static-modules=vfs_solarisacl
-CONFIGURE_ARGS += --with-shared-modules=vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
-CONFIGURE_ARGS += --with-readline
+#CONFIGURE_ARGS += --with-static-modules=vfs_solarisacl
+#CONFIGURE_ARGS += --with-shared-modules=vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
+CONFIGURE_ARGS += --with-shared-modules=vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
+#CONFIGURE_ARGS += --with-readline
 CONFIGURE_ARGS += --with-ads
 CONFIGURE_ARGS += --with-ldap
 CONFIGURE_ARGS += --with-automount
-CONFIGURE_ARGS += --with-dnsupdate=no
-# Do not set krb5 this is handeled in gar. Otherwise 64bit will not build
-#CONFIGURE_ARGS += --with-krb5=$(prefix)
+#CONFIGURE_ARGS += --with-dnsupdate=no
 CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR)
 CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR)
 CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR)
@@ -320,43 +312,27 @@
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 
 # Can't use fdatasync atm do to linker problems
-CONFIGURE_ARGS += ac_cv_lib_rt_fdatasync=no
-CONFIGURE_ARGS += ac_cv_have_fdatasync_decl=no
-CONFIGURE_ARGS += ac_cv_lib_ext_rt_fdatasync=no
+#CONFIGURE_ARGS += ac_cv_lib_rt_fdatasync=no
+#CONFIGURE_ARGS += ac_cv_have_fdatasync_decl=no
+#CONFIGURE_ARGS += ac_cv_lib_ext_rt_fdatasync=no
 
 
 
-#BUILD_SCRIPTS = $(WORKSRC)/source4/Makefile
 
-#TEST_SCRIPTS = $(WORKSRC)/source4/Makefile
 TEST_TARGET = test
 
 # Tests need root
 SKIPTEST ?= 1
 
 
-#INSTALL_SCRIPTS = $(WORKSRC)/source4/Makefile
 
 INITSMF += /etc/opt/csw/init.d/cswsamba
 INITSMF += /etc/opt/csw/init.d/cswwinbind
 
-MIGRATE_FILES_CSWsamba += samba
 PRESERVECONF += $(sysconfdir)/samba/smb.conf
 
 include gar/category.mk
 
-# Use this hack until this bug has been fixed:
-#   https://bugzilla.samba.org/show_bug.cgi?id=8571
-post-extract-modulated:
-	# Make sure to EXCLUDE the include path from 'krb5-config --cflags' as it is prepended to CFLAGS
-	# leading to the inclusion of /opt/csw/include header files before the newly build ones.
-	# The line looks like this:
-	#   KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
-	# and after the transformation it looks like this:
-	#   KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s,-I/opt/csw/include,,`"
-	-perl -pi -e 's!/\@INCLUDE_des\@//!,-I$(includedir),,!' \
-		$(WORKSRC)/source3/configure
-
 post-install-modulated:
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall $(WORKDIR)/cswsamba $(DESTDIR)/etc/opt/csw/init.d/cswsamba

Modified: csw/mgar/pkg/samba/trunk/checksums
===================================================================
--- csw/mgar/pkg/samba/trunk/checksums	2013-01-25 10:38:18 UTC (rev 20216)
+++ csw/mgar/pkg/samba/trunk/checksums	2013-01-25 13:50:54 UTC (rev 20217)
@@ -1 +1 @@
-93e9aad40893ba48d08e1b28e7efff72  samba-4.0.0.tar.gz
+5daeece2053504f75eb0094ae966d5c7  samba-4.0.1.tar.gz

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

