Commits

Bayard Bell committed 1bb1164

2172 Update Samba to 3.5.13 configured for illumos

  • Participants
  • Parent commits 25ff231

Comments (0)

Files changed (3)

File components/samba/samba/Makefile

 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	3.5.8
+COMPONENT_VERSION=	3.5.13
+COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha1:ffb71de38442eee14aafb44f819671354dc5cce9
+COMPONENT_ARCHIVE_HASH=	sha1:00793c4e1458894a1a55534030c77a145c2acbb6
 COMPONENT_ARCHIVE_URL=	http://ftp.samba.org/pub/samba/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://www.samba.org/
 
 COMPONENT_PREP_ACTION = (cd $(SOURCE_DIR)/source3; sh autogen.sh)
 
 # so go back to SS12.  Also need C99
 SPRO_VROOT =		$(SPRO_ROOT)/sunstudio12.3
 studio_C99MODE = 	$(studio_99_ENABLE)
+CFLAGS.gcc +=		-std=c99
 
 COMPILER = gcc
 GCC_ROOT = /usr/gcc/4.4
 CC.studio.64 +=	-m64
 CC.gcc.64 +=	-m64
 
+CPPFLAGS +=	$(CPP_LARGEFILES)
+CPPFLAGS +=	$(CPP_XPG6MODE)
+
+# libavahi is not for 64bits but we do not need it
+LIBS32 =	-lsendfile -lavahi-common -lavahi-core
+
+LDFLAGS.32 +=	-L $(PROTOUSRLIBDIR)
+LDFLAGS.32 +=	-L $(PROTOUSRLIBDIR)/samba -R/usr/lib/samba
+LDFLAGS.32 +=	$(LIBS32)
+
+LDFLAGS.64 +=	-L $(PROTOUSRLIBDIR)/$(MACH64)
+LDFLAGS.64 +=	-L $(PROTOUSRLIBDIR)/samba/$(MACH64) -R/usr/lib/samba/$(MACH64)
+
+ifeq ($(COMPILER), studio)
+LDFLAGS +=	$(LDFLAGS.$(BITS)) $(LD_OPTIONS)
+else
+LDFLAGS +=	$(LDFLAGS.$(BITS)) $(LD_OPTIONS:%=-Xlinker %)
+endif
+
 # override paths to .built
 BUILD_DIR_32 = $(BUILD_DIR)/$(MACH32)/source3
 BUILD_DIR_64 = $(BUILD_DIR)/$(MACH64)/source3
 # We need to work two levels down, and this needs to be relative
 CONFIGURE_SCRIPT =	$(SOURCE_DIR)/source3/configure
 
+
 CONFIGURE_OPTIONS +=	--includedir=/usr/include/samba
 CONFIGURE_OPTIONS +=	--sysconfdir=/etc/samba
 CONFIGURE_OPTIONS +=	--with-configdir=/etc/samba
 CONFIGURE_OPTIONS +=	--with-logfilebase=/var/samba/log
 CONFIGURE_OPTIONS +=	--enable-shared=yes
 CONFIGURE_OPTIONS +=	--enable-static=no
-#CONFIGURE_OPTIONS +=	--enable-socket-wrapper
-#CONFIGURE_OPTIONS +=	--enable-nss-wrapper
 CONFIGURE_OPTIONS +=	--with-static-modules=
-CONFIGURE_OPTIONS +=	--with-shared-modules=vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
+CONFIGURE_OPTIONS.32 +=	--with-shared-modules=vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
+CONFIGURE_OPTIONS.64 +=	--with-shared-modules=
 CONFIGURE_OPTIONS +=	--with-readline
+CONFIGURE_OPTIONS +=	--enable-cups
 CONFIGURE_OPTIONS +=	--with-aio-support
 CONFIGURE_OPTIONS +=	--with-acl-support
 CONFIGURE_OPTIONS +=	--with-ads
 CONFIGURE_OPTIONS +=	--with-dnsupdate
 CONFIGURE_OPTIONS +=	--with-pam
 CONFIGURE_OPTIONS +=	--with-winbind
+CONFIGURE_OPTIONS +=	LD=$(LD)
 CONFIGURE_OPTIONS +=	CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
-CONFIGURE_OPTIONS +=	CUPS_CONFIG=/usr/bin/cups-config
-CONFIGURE_OPTIONS +=	INSTALLCMD=/usr/bin/ginstall
+CONFIGURE_OPTIONS +=	LDFLAGS="$(LDFLAGS)"
+CONFIGURE_OPTIONS.32 +=	LIBS="$(LIBS32)"
+CONFIGURE_OPTIONS +=	CUPS_CONFIG=$(USRBINDIR)/cups-config
+CONFIGURE_OPTIONS +=	INSTALLCMD=$(INSTALL)
 CONFIGURE_OPTIONS +=	LIBREPLACE_NETWORK_LIBS=" -lsocket -lnsl"
 CONFIGURE_OPTIONS +=	MAKE=gmake
 
 
 CONFIGURE_OPTIONS.studio +=	CPP=/usr/sfw/bin/cpp
 
-CONFIGURE_OPTIONS.studio.32 +=	LDFLAGS=-R$(CONFIGURE_LIBDIR.32)
-CONFIGURE_OPTIONS.studio.64 +=	LDFLAGS=-R$(CONFIGURE_LIBDIR.64)
-
-CONFIGURE_OPTIONS.gcc.32 +=	LDFLAGS=-Wl,-rpath,$(CONFIGURE_LIBDIR.32)
-CONFIGURE_OPTIONS.gcc.64 +=	LDFLAGS=-Wl,-rpath,$(CONFIGURE_LIBDIR.64)
-
-
-CONFIGURE_OPTIONS +=	$(CONFIGURE_OPTIONS.$(COMPILER))
-CONFIGURE_OPTIONS.32 +=	$(CONFIGURE_OPTIONS.$(COMPILER).32)
-CONFIGURE_OPTIONS.64 += $(CONFIGURE_OPTIONS.$(COMPILER).64)
+$(BUILD_32): COMPONENT_BUILD_TARGETS = showlayout everything
+$(BUILD_64): COMPONENT_BUILD_TARGETS = showlayout nss_modules pam_modules pam_smbpass wins pam_winbind
+$(INSTALL_32): COMPONENT_INSTALL_TARGETS = showlayout install-everything
+$(INSTALL_64): COMPONENT_INSTALL_TARGETS = showlayout installpammodules
 
 build:		$(BUILD_32_and_64)
 
        $(CP) $(BUILD_DIR)/$(MACH64)/nsswitch/$$file $(PROTOUSRLIBDIR64)/$${file}.1; \
      done; )
 
-# Testing requires adding socket and nss wrappers
-#COMPONENT_TEST_TARGETS = test selftest
-#COMPONENT_PRE_TEST_ACTION += \
-#   ( $(CLONEY) $(SOURCE_DIR)/selftest $(BUILD_DIR)/$(MACH$(BITS))/selftest )
-
-#test:		$(TEST_32_and_64)
 test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)

File components/samba/samba/samba.p5m

 set name=pkg.summary \
     value="samba - A Windows SMB/CIFS fileserver for UNIX"
 set name=pkg.description \
-    value="samba 3.5.8 configured for illumos, with AD support"
+    value="samba 3.5.13 configured for illumos, with AD support"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/File System"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 dir path=usr/include
 dir path=usr/include/samba
 dir path=usr/lib
+dir path=usr/lib/$(MACH64)
 dir path=usr/lib/samba
-dir path=usr/lib/samba/$(MACH64)
 dir path=usr/lib/samba/auth
 dir path=usr/lib/samba/charset
 dir path=usr/lib/samba/gpext
 file path=usr/lib/security/pam_winbind.so.1
 file path=usr/lib/security/$(MACH64)/pam_smbpass.so.1
 file path=usr/lib/security/$(MACH64)/pam_winbind.so.1
-file path=usr/lib/samba/$(MACH64)/auth/script.so
-file path=usr/lib/samba/$(MACH64)/charset/CP437.so
-file path=usr/lib/samba/$(MACH64)/charset/CP850.so
-file path=usr/lib/samba/$(MACH64)/idmap/ad.so
-file path=usr/lib/samba/$(MACH64)/idmap/adex.so
-file path=usr/lib/samba/$(MACH64)/idmap/hash.so
-file path=usr/lib/samba/$(MACH64)/idmap/ldap.so
-file path=usr/lib/samba/$(MACH64)/idmap/rid.so
-file path=usr/lib/samba/$(MACH64)/idmap/tdb2.so
-file path=usr/lib/samba/$(MACH64)/libnetapi.so.0
-file path=usr/lib/samba/$(MACH64)/libsmbclient.so.0
-file path=usr/lib/samba/$(MACH64)/libsmbsharemodes.so.0
-file path=usr/lib/samba/$(MACH64)/libtalloc.so.2
-file path=usr/lib/samba/$(MACH64)/libtdb.so.1
-file path=usr/lib/samba/$(MACH64)/libwbclient.so.0
-file path=usr/lib/samba/$(MACH64)/vfs/acl_tdb.so
-file path=usr/lib/samba/$(MACH64)/vfs/acl_xattr.so
-file path=usr/lib/samba/$(MACH64)/vfs/audit.so
-file path=usr/lib/samba/$(MACH64)/vfs/cacheprime.so
-file path=usr/lib/samba/$(MACH64)/vfs/cap.so
-file path=usr/lib/samba/$(MACH64)/vfs/catia.so
-file path=usr/lib/samba/$(MACH64)/vfs/commit.so
-file path=usr/lib/samba/$(MACH64)/vfs/default_quota.so
-file path=usr/lib/samba/$(MACH64)/vfs/dirsort.so
-file path=usr/lib/samba/$(MACH64)/vfs/expand_msdfs.so
-file path=usr/lib/samba/$(MACH64)/vfs/extd_audit.so
-file path=usr/lib/samba/$(MACH64)/vfs/fake_perms.so
-file path=usr/lib/samba/$(MACH64)/vfs/full_audit.so
-file path=usr/lib/samba/$(MACH64)/vfs/netatalk.so
-file path=usr/lib/samba/$(MACH64)/vfs/prealloc.so
-file path=usr/lib/samba/$(MACH64)/vfs/preopen.so
-file path=usr/lib/samba/$(MACH64)/vfs/readahead.so
-file path=usr/lib/samba/$(MACH64)/vfs/readonly.so
-file path=usr/lib/samba/$(MACH64)/vfs/recycle.so
-file path=usr/lib/samba/$(MACH64)/vfs/scannedonly.so
-file path=usr/lib/samba/$(MACH64)/vfs/shadow_copy.so
-file path=usr/lib/samba/$(MACH64)/vfs/shadow_copy2.so
-file path=usr/lib/samba/$(MACH64)/vfs/smb_traffic_analyzer.so
-file path=usr/lib/samba/$(MACH64)/vfs/streams_depot.so
-file path=usr/lib/samba/$(MACH64)/vfs/streams_xattr.so
-file path=usr/lib/samba/$(MACH64)/vfs/syncops.so
-file path=usr/lib/samba/$(MACH64)/vfs/xattr_tdb.so
-file path=usr/lib/samba/$(MACH64)/vfs/zfsacl.so
 file path=usr/lib/samba/auth/script.so
 file path=usr/lib/samba/charset/CP437.so
 file path=usr/lib/samba/charset/CP850.so
 file path=usr/share/samba/swat/lang/tr/images/shares.gif
 file path=usr/share/samba/swat/lang/tr/images/status.gif
 file path=usr/share/samba/swat/lang/tr/images/viewconfig.gif
+link path=usr/lib/libnss_winbind.so target=usr/lib/libnss_winbind.so.1
+link path=usr/lib/libnss_wins.so target=usr/lib/libnss_wins.so.1
+link path=usr/lib/$(MACH64)/libnss_winbind.so \
+    target=usr/lib/$(MACH64)/libnss_winbind.so.1
+link path=usr/lib/$(MACH64)/libnss_wins.so \
+    target=usr/lib/$(MACH64)/libnss_wins.so.1
 link path=usr/lib/samba/libnetapi.so target=libnetapi.so.0
 link path=usr/lib/samba/libsmbclient.so target=libsmbclient.so.0
 link path=usr/lib/samba/libsmbsharemodes.so target=libsmbsharemodes.so.0
 link path=usr/lib/samba/nss_info/rfc2307.so target=../idmap/ad.so
 link path=usr/lib/samba/nss_info/sfu.so target=../idmap/ad.so
 link path=usr/lib/samba/nss_info/sfu20.so target=../idmap/ad.so
+link path=usr/lib/security/pam_smbpass.so \
+    target=usr/lib/security/pam_smbpass.so.1
+link path=usr/lib/security/pam_winbind.so \
+    target=usr/lib/security/pam_winbind.so.1
+link path=usr/lib/security/$(MACH64)/pam_smbpass.so \
+    target=usr/lib/security/$(MACH64)/pam_smbpass.so.1
+link path=usr/lib/security/$(MACH64)/pam_winbind.so \
+    target=usr/lib/security/$(MACH64)/pam_winbind.so.1
 
 legacy pkg=SUNWsmbar \
  desc="samba - A Windows SMB/CIFS fileserver for UNIX (Root)" \

File components/samba/samba/sample.manifest

 file path=usr/lib/samba/vfs/acl_tdb.so.old
 file path=usr/lib/samba/vfs/acl_xattr.so
 file path=usr/lib/samba/vfs/acl_xattr.so.old
+file path=usr/lib/samba/vfs/aio_fork.so
 file path=usr/lib/samba/vfs/audit.so
 file path=usr/lib/samba/vfs/audit.so.old
 file path=usr/lib/samba/vfs/cacheprime.so
 file path=usr/share/man/man8/umount.cifs.8
 file path=usr/share/man/man8/vfs_acl_tdb.8
 file path=usr/share/man/man8/vfs_acl_xattr.8
+file path=usr/share/man/man8/vfs_aio_fork.8
 file path=usr/share/man/man8/vfs_audit.8
 file path=usr/share/man/man8/vfs_cacheprime.8
 file path=usr/share/man/man8/vfs_cap.8