[csw-devel] SF.net SVN: gar:[16142] csw/mgar/pkg/samba/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Nov 8 16:59:36 CET 2011
Revision: 16142
http://gar.svn.sourceforge.net/gar/?rev=16142&view=rev
Author: dmichelsen
Date: 2011-11-08 15:59:36 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
samba/trunk: Partly reenable package split, disable cups for 64 bit
Modified Paths:
--------------
csw/mgar/pkg/samba/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/samba/trunk/files/cswsamba
Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile 2011-11-08 13:41:39 UTC (rev 16141)
+++ csw/mgar/pkg/samba/trunk/Makefile 2011-11-08 15:59:36 UTC (rev 16142)
@@ -18,6 +18,7 @@
PACKAGES += CSWsamba
SPKG_DESC_CSWsamba = $(DESCRIPTION)
+# PKGFILES is catchall
RUNTIME_DEP_PKGS_CSWsamba += CSWlibpopt0
RUNTIME_DEP_PKGS_CSWsamba += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWsamba += CSWlibz1
@@ -31,14 +32,34 @@
RUNTIME_DEP_PKGS_CSWsamba += CSWlibcups2
RUNTIME_DEP_PKGS_CSWsamba += CSWlibtalloc2
RUNTIME_DEP_PKGS_CSWsamba += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWsamba += CSWoldaprt
+# Make one unified package for now
+OBSOLETED_BY_CSWsamba += CSWsambaclient
+OBSOLETED_BY_CSWsamba += CSWsambacommon
+OBSOLETED_BY_CSWsamba += CSWsambadoc
+OBSOLETED_BY_CSWsamba += CSWsambalib
+
#PACKAGES += CSWsambaclient
SPKG_DESC_CSWsambaclient = Client binaries for samba
-RUNTIME_DEP_PKGS_CSWsambaclient = CSWsasl CSWsambacommon CSWreadline CSWlibpopt CSWlibnet CSWkrb5lib CSWiconv CSWggettext
+RUNTIME_DEP_PKGS_CSWsambaclient += CSWsasl
+RUNTIME_DEP_PKGS_CSWsambaclient += CSWsambacommon
+RUNTIME_DEP_PKGS_CSWsambaclient += CSWreadline
+RUNTIME_DEP_PKGS_CSWsambaclient += CSWlibpopt
+RUNTIME_DEP_PKGS_CSWsambaclient += CSWlibnet
+RUNTIME_DEP_PKGS_CSWsambaclient += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWsambaclient += CSWiconv
+RUNTIME_DEP_PKGS_CSWsambaclient += CSWggettext
#PACKAGES += CSWsambacommon
SPKG_DESC_CSWsambacommon = Shared support files for samba
-RUNTIME_DEP_PKGS_CSWsambacommon = CSWsasl CSWreadline CSWlibpopt CSWlibnet CSWkrb5lib CSWiconv CSWggettext
+RUNTIME_DEP_PKGS_CSWsambacommon += CSWsasl
+RUNTIME_DEP_PKGS_CSWsambacommon += CSWreadline
+RUNTIME_DEP_PKGS_CSWsambacommon += CSWlibpopt
+RUNTIME_DEP_PKGS_CSWsambacommon += CSWlibnet
+RUNTIME_DEP_PKGS_CSWsambacommon += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWsambacommon += CSWiconv
+RUNTIME_DEP_PKGS_CSWsambacommon += CSWggettext
#PACKAGES += CSWsambadoc
SPKG_DESC_CSWsambadoc = Samba documentation
@@ -46,29 +67,56 @@
#PACKAGES += CSWsambalib
SPKG_DESC_CSWsambalib = Samba shared libraries
-RUNTIME_DEP_PKGS_CSWsambalib = CSWsasl CSWlibnet CSWkrb5lib CSWiconv
+RUNTIME_DEP_PKGS_CSWsambalib += CSWsasl
+RUNTIME_DEP_PKGS_CSWsambalib += CSWlibnet
+RUNTIME_DEP_PKGS_CSWsambalib += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWsambalib += CSWiconv
PACKAGES += CSWsamba-dev
SPKG_DESC_CSWsamba-dev = Development files for the samba libraries
PKGFILES_CSWsamba-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWsamba-dev += CSWsamba
OBSOLETED_BY_CSWsamba-dev += CSWsambalibdev
CATALOGNAME_CSWsambalibdev = samba_libdev_stub
-#PACKAGES += CSWsambaswat
-SPKG_DESC_CSWsambaswat = Web-based samba administration tools
-RUNTIME_DEP_PKGS_CSWsambaswat = CSWsasl CSWlibpopt CSWlibnet CSWlibcups CSWkrb5lib CSWiconv CSWggettext
+PACKAGES += CSWsamba-swat
+SPKG_DESC_CSWsamba-swat = Web-based samba administration tools
+PKGFILES_CSWsamba-swat += $(call baseisadirs,$(sbindir),swat)
+PKGFILES_CSWsamba-swat += $(mandir)/.*/swat\.*
+#PKGFILES_CSWsamba-swat += $(sharedstatedir)/samba/swat/.*
+PKGFILES_CSWsamba-swat += $(prefix)/swat/.*
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibpopt0
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibz1
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWsamba
+OBSOLETED_BY_CSWsamba-swat = CSWsambaswat
+CATALOGNAME_CSWsambaswat = samba_swat_stub
#PACKAGES += CSWsambawb
-SPKG_DESC_CSWsambawb = not sure what this is
+SPKG_DESC_CSWsambawb = Tools to authenticate users from active directory using winbind
RUNTIME_DEP_PKGS_CSWsambawb = CSWsamba
EXTRA_CFLAGS = -lintl
EXTRA_LDFLAGS = -lintl
+BUILD64 = 1
+ISAEXEC = 1
+
CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --enable-socket-wrapper
+CONFIGURE_ARGS-64 += --disable-cups
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+
BUILD_SCRIPTS = $(WORKSRC)/source3/Makefile
TEST_SCRIPTS = $(WORKSRC)/source3/Makefile
Added: csw/mgar/pkg/samba/trunk/files/cswsamba
===================================================================
--- csw/mgar/pkg/samba/trunk/files/cswsamba (rev 0)
+++ csw/mgar/pkg/samba/trunk/files/cswsamba 2011-11-08 15:59:36 UTC (rev 16142)
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH
+
+SMBCONF=/opt/csw/etc/samba/smb.conf
+KRBCONF=/etc/krb5.conf
+export SMBCONF
+export KRBCONF
+
+case "$1" in
+ start)
+ if [ -f $SMBCONF ]; then
+ echo "Starting samba..."
+ /opt/csw/sbin/nmbd -D
+ /opt/csw/sbin/smbd -D
+ if [ -f $KRBCONF ]; then
+ echo "Starting winbind..."
+ /opt/csw/sbin/winbindd -B
+ fi
+ else
+ echo "No $SMBCONF found. Not starting";
+ fi
+ ;;
+ stop)
+ echo "Stopping Samba..."
+ kill "`cat /opt/csw/var/locks/smbd.pid`"
+ kill "`cat /opt/csw/var/locks/nmbd.pid`"
+ if [ -f $KRBCONF ]; then
+ echo "Stopping Winbind..."
+ kill "`cat /opt/csw/var/locks/winbindd.pid`"
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "$0 {start | stop | restart}"
+ exit 1;
+ ;;
+esac
+
Property changes on: csw/mgar/pkg/samba/trunk/files/cswsamba
___________________________________________________________________
Added: svn:executable
+ *
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