Revision: 25676 http://sourceforge.net/p/gar/code/25676 Author: janholzh Date: 2016-04-20 10:32:24 +0000 (Wed, 20 Apr 2016) Log Message: ----------- samba/branches/samba4: update to 4.4.2
Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile csw/mgar/pkg/samba/branches/samba4/checksums Added Paths: ----------- csw/mgar/pkg/samba/branches/samba4/files/0004-fix_clearenv.patch Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2016-04-20 07:51:32 UTC (rev 25675) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2016-04-20 10:32:24 UTC (rev 25676) @@ -1,5 +1,5 @@ NAME = samba -VERSION = 4.4.0 +VERSION = 4.4.2 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -72,6 +72,9 @@ #https://git.samba.org/?p=samba.git;a=patch;h=5134d29cbb2edcc2326de8896c5465afb3a0f392 #PATCHFILES +=idmap_fix +#from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208767 +PATCHFILES += 0004-fix_clearenv.patch + NOGITPATCH += 1 # Filesystem layout @@ -139,6 +142,7 @@ #RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL)) # Silence conflicts with CSWsamba CHECKPKG_OVERRIDES_CSWsamba4 += file-collision @@ -172,10 +176,10 @@ PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(mandir),man1/$C\.1)) RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibform5 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibform6 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel5 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel6 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-client_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client_sparc_5.10 += CSWlibintl8 @@ -441,6 +445,7 @@ CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4-winbind CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4 CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4 Modified: csw/mgar/pkg/samba/branches/samba4/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba4/checksums 2016-04-20 07:51:32 UTC (rev 25675) +++ csw/mgar/pkg/samba/branches/samba4/checksums 2016-04-20 10:32:24 UTC (rev 25676) @@ -1 +1 @@ -e42b884d0e07528c8571641a4df40666 samba-4.4.0.tar.gz +03a65a3adf08ceb1636ad59d234d7f9d samba-4.4.2.tar.gz Added: csw/mgar/pkg/samba/branches/samba4/files/0004-fix_clearenv.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba4/files/0004-fix_clearenv.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba4/files/0004-fix_clearenv.patch 2016-04-20 10:32:24 UTC (rev 25676) @@ -0,0 +1,25 @@ +From 23a6c34de123f819a50036ab4cd4c40fdf238903 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter <j...@opencsw.org> +Date: Tue, 19 Apr 2016 14:39:10 +0200 +Subject: [PATCH] fix_clearenv + +--- + source3/client/smbspool_krb5_wrapper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source3/client/smbspool_krb5_wrapper.c b/source3/client/smbspool_krb5_wrapper.c +index e19fd92..0310bfb 100644 +--- a/source3/client/smbspool_krb5_wrapper.c ++++ b/source3/client/smbspool_krb5_wrapper.c +@@ -195,7 +195,7 @@ int main(int argc, char *argv[]) + * Make sure we do not have LD_PRELOAD or other security relevant + * environment variables set. + */ +- clearenv(); ++ environ[0] = NULL; + + CUPS_SMB_DEBUG("Setting KRB5CCNAME to '%s'", gen_cc); + setenv("KRB5CCNAME", gen_cc, 1); +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.