Revision: 25635
http://sourceforge.net/p/gar/code/25635
Author: janholzh
Date: 2016-03-29 11:48:30 +0000 (Tue, 29 Mar 2016)
Log Message:
-----------
samba/branches/samba4: update to 4.4.0
Modified Paths:
--------------
csw/mgar/pkg/samba/branches/samba4/Makefile
csw/mgar/pkg/samba/branches/samba4/checksums
Modified: csw/mgar/pkg/samba/branches/samba4/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/Makefile 2016-03-29 08:46:01 UTC (rev
25634)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile 2016-03-29 11:48:30 UTC (rev
25635)
@@ -1,5 +1,5 @@
NAME = samba
-VERSION = 4.3.4
+VERSION = 4.4.0
GARTYPE = v2
DESCRIPTION = Tools to access a servers filespace and printers via SMB (server)
@@ -66,11 +66,11 @@
#PATCHFILES +=fix_bugid_11512
#From
https://hg.java.net/hg/solaris-userland~gate/file/73dae8fa5c34/components/samba/samba/patches/talloc_dict_sigbus.patch
-PATCHFILES += talloc_dict_sigbus.patch
+#PATCHFILES += talloc_dict_sigbus.patch
#fix build problems with idmap patch not in 4.3 but master
#https://git.samba.org/?p=samba.git;a=patch;h=5134d29cbb2edcc2326de8896c5465afb3a0f392
-PATCHFILES +=idmap_fix
+#PATCHFILES +=idmap_fix
NOGITPATCH += 1
@@ -121,7 +121,7 @@
PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/vfs_.*)
PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/idmap_.*)
PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),mit_samba\.so)
-PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),security/pam_smbpass\.so)
+#PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),security/pam_smbpass\.so)
PKGFILES_CSWsamba4 += /etc/opt/csw/samba/.*
PKGFILES_CSWsamba4 += /var/opt/csw/samba/.*
@@ -136,7 +136,7 @@
RUNTIME_DEP_PKGS_CSWsamba4_5.11 += CSWlibgcrypt11
RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1
+#RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2
RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0
RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL))
@@ -210,6 +210,7 @@
CHECKPKG_OVERRIDES_CSWsamba4-client +=
file-collision|/opt/csw/bin/smbtree|CSWsamba-client|CSWsamba4-client
CHECKPKG_OVERRIDES_CSWsamba4-client +=
file-collision|/opt/csw/bin/tdbbackup|CSWsamba|CSWsamba4-client
CHECKPKG_OVERRIDES_CSWsamba4-client +=
file-collision|/opt/csw/share/man/man1/smbget.1|CSWsamba-client|CSWsamba4-client
+CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 +=
soname-not-found|libarchive.so.12|is|needed|by|opt/csw/bin/smbclient
CHECKPKG_OVERRIDES_CSWsamba4-client +=
$(CHECKPKG_OVERRIDES_CSWsamba4-client_$(GAROSREL))
INCOMPATIBLE_PKGS_CSWsamba4-client += CSWsamba-client
@@ -246,7 +247,7 @@
SMB_LIBS += libndr-krb5pac.so.0 libndr-nbt.so.0 libndr-standard.so.0
libndr.so.0 libnetapi.so.0 libpdb.so.0
SMB_LIBS += libregistry.so.0 libsamba-credentials.so.0
libsamba-hostconfig.so.0 libsamba-policy.so.0
SMB_LIBS += libsamba-util.so.0 libsamdb.so.0 libsmbclient-raw.so.0
libsmbconf.so.0 libsmbldap.so.0 libtevent-util.so.0
-SMB_LIBS += libtorture.so.0 libsamba-passdb.so.0 libsmbclient.so.0
libwbclient.so.0
+SMB_LIBS += libtorture.so.0 libsamba-passdb.so.0 libsmbclient.so.0
libwbclient.so.0 libsamba-errors.so.1 libtevent-unix-util.so.0
PKGFILES_CSWsamba4-libs += $(foreach L,$(SMB_LIBS),$(call pkgfiles_lib,$L))
PKGFILES_CSWsamba4-libs += $(SMBPRIVATELIB)/.*
@@ -293,7 +294,7 @@
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libregistry.so.0.0.1|soname=libregistry.so.0|pkgname=CSWsamba4-libs|expected=CSWlibregistry0
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-credentials.so.0.0.1|soname=libsamba-credentials.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-credentials0
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-hostconfig.so.0.0.1|soname=libsamba-hostconfig.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-hostconfig0
-CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-passdb.so.0.24.1|soname=libsamba-passdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-passdb0
+CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-passdb.so.0.25.0|soname=libsamba-passdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-passdb0
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-policy.so.0.0.1|soname=libsamba-policy.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-policy0
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-util.so.0.0.1|soname=libsamba-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-util0
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamdb.so.0.0.1|soname=libsamdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamdb0
@@ -304,6 +305,8 @@
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libtevent-util.so.0.0.1|soname=libtevent-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtevent-util0
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libtorture.so.0.0.1|soname=libtorture.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtorture0
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libwbclient.so.0.12|soname=libwbclient.so.0|pkgname=CSWsamba4-libs|expected=CSWlibwbclient0
+CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-errors.so.1|soname=libsamba-errors.so.1|pkgname=CSWsamba4-libs|expected=CSWlibsamba-errors1
+CHECKPKG_OVERRIDES_CSWsamba4-libs +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libtevent-unix-util.so.0.0.1|soname=libtevent-unix-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtevent-unix-util0
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
file-collision|/opt/csw/lib/libwbclient.so.0|CSWlibwbclient0|CSWsamba4-libs
CHECKPKG_OVERRIDES_CSWsamba4-libs +=
file-collision|/opt/csw/lib/libnetapi.so.0|CSWlibnetapi0|CSWsamba4-libs
@@ -423,11 +426,11 @@
ARCHALL_CSWsamba4-pam-system-links = 1
CATALOGNAME_CSWsamba4-pam-system-links = samba4_pam_system_links
INCOMPATIBLE_PKGS_CSWsamba4-pam-system-links += CSWsamba-pam-system-links
-PKGFILES_CSWsamba4-pam-system-links = /usr/lib/security/pam_smbpass_csw.so
+#PKGFILES_CSWsamba4-pam-system-links = /usr/lib/security/pam_smbpass_csw.so
PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/pam_winbind_csw.so
-PKGFILES_CSWsamba4-pam-system-links +=
/usr/lib/security/amd64/pam_smbpass_csw.so
+#PKGFILES_CSWsamba4-pam-system-links +=
/usr/lib/security/amd64/pam_smbpass_csw.so
PKGFILES_CSWsamba4-pam-system-links +=
/usr/lib/security/amd64/pam_winbind_csw.so
-PKGFILES_CSWsamba4-pam-system-links +=
/usr/lib/security/sparcv9/pam_smbpass_csw.so
+#PKGFILES_CSWsamba4-pam-system-links +=
/usr/lib/security/sparcv9/pam_smbpass_csw.so
PKGFILES_CSWsamba4-pam-system-links +=
/usr/lib/security/sparcv9/pam_winbind_csw.so
SPKG_DESC_CSWsamba4-pam-system-links += Samba 4 pam modules links for the
system
RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSWsamba4
@@ -468,7 +471,6 @@
NODIRPATHS += --exec_prefix=/opt/csw
CONFIGURE_ARGS += --with-acl-support
-CONFIGURE_ARGS += --with-aio-support
CONFIGURE_ARGS += --with-pam
CONFIGURE_ARGS += --with-winbind
CONFIGURE_ARGS += --with-shared-modules=$(SMB_MODULES)
@@ -533,9 +535,9 @@
#NSS_WINS_64 = ../../..$(libdir)/libnss_wins.so.2
PAM_WINBIND_32 = ../../..$(libdir)/security/pam_winbind.so
-PAM_SMBPASS_32 = ../../..$(libdir)/security/pam_smbpass.so
+#PAM_SMBPASS_32 = ../../..$(libdir)/security/pam_smbpass.so
PAM_WINBIND_64 = ../../../..$(libdir)/security/pam_winbind.so
-PAM_SMBPASS_64 = ../../../..$(libdir)/security/pam_smbpass.so
+#PAM_SMBPASS_64 = ../../../..$(libdir)/security/pam_smbpass.so
post-install-modulated:
ginstall -d $(DESTDIR)/etc/opt/csw/init.d
@@ -554,7 +556,7 @@
# system's pam.conf
ginstall -d -m 0755 $(DESTDIR)$(PAM_MODULE_DIR)
gln -s $(PAM_WINBIND_$(MEMORYMODEL))
$(DESTDIR)$(PAM_MODULE_DIR)/pam_winbind_csw.so
- gln -s $(PAM_SMBPASS_$(MEMORYMODEL))
$(DESTDIR)$(PAM_MODULE_DIR)/pam_smbpass_csw.so
+ #gln -s $(PAM_SMBPASS_$(MEMORYMODEL))
$(DESTDIR)$(PAM_MODULE_DIR)/pam_smbpass_csw.so
@$(MAKECOOKIE)
# python buildtools/bin/waf -v build
Modified: csw/mgar/pkg/samba/branches/samba4/checksums
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/checksums 2016-03-29 08:46:01 UTC
(rev 25634)
+++ csw/mgar/pkg/samba/branches/samba4/checksums 2016-03-29 11:48:30 UTC
(rev 25635)
@@ -1 +1 @@
-48df803c6c6c475a714cae82a2dc219e samba-4.3.4.tar.gz
+e42b884d0e07528c8571641a4df40666 samba-4.4.0.tar.gz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
