From dmichelsen at users.sourceforge.net Mon Nov 2 10:26:28 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 2 Nov 2015 09:26:28 +0000 Subject: SF.net SVN: gar:[25335] csw/mgar/pkg/sudo/trunk Message-ID: <3nq85K50rsz1KK@mail.opencsw.org> Revision: 25335 http://sourceforge.net/p/gar/code/25335 Author: dmichelsen Date: 2015-11-02 09:26:27 +0000 (Mon, 02 Nov 2015) Log Message: ----------- sudo/trunk: Update to 1.8.15 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sudo/trunk/files/bug464.patch Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2015-10-30 12:29:28 UTC (rev 25334) +++ csw/mgar/pkg/sudo/trunk/Makefile 2015-11-02 09:26:27 UTC (rev 25335) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.14p3 +VERSION = 1.8.15 GARTYPE = v2 EXTRA_MODULATORS = LDAP @@ -21,6 +21,9 @@ DISTFILES += sudo.conf.CSW DISTFILES += map.sudo +# Taken from http://bugzilla.sudo.ws/show_bug.cgi?id=727 +PATCHFILES += bug464.patch + LICENSE = doc/LICENSE VENDOR_URL = http://www.sudo.ws Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2015-10-30 12:29:28 UTC (rev 25334) +++ csw/mgar/pkg/sudo/trunk/checksums 2015-11-02 09:26:27 UTC (rev 25335) @@ -1 +1 @@ -93dbd1e47c136179ff1b01494c1c0e75 sudo-1.8.14p3.tar.gz +7cf6b9b76d0478a572432bed481dd7b5 sudo-1.8.15.tar.gz Added: csw/mgar/pkg/sudo/trunk/files/bug464.patch =================================================================== --- csw/mgar/pkg/sudo/trunk/files/bug464.patch (rev 0) +++ csw/mgar/pkg/sudo/trunk/files/bug464.patch 2015-11-02 09:26:27 UTC (rev 25335) @@ -0,0 +1,27 @@ +--- a/plugins/sudoers/timestamp.c Sat Oct 31 17:35:44 2015 -0600 ++++ a/plugins/sudoers/timestamp.c Sun Nov 01 15:13:41 2015 -0700 +@@ -310,7 +310,7 @@ + (long long)old_eof); + } + } +- debug_return_size_t(-1); ++ debug_return_size_t((size_t)-1); + } + debug_return_size_t(nwritten); + } +@@ -354,13 +354,13 @@ + static void + ts_fill(struct timestamp_entry *entry, struct passwd *pw, int flags) + { +- return ts_fill4(entry, pw, flags, def_tty_tickets); ++ ts_fill4(entry, pw, flags, def_tty_tickets); + } + + static void + ts_fill_tty(struct timestamp_entry *entry, struct passwd *pw, int flags) + { +- return ts_fill4(entry, pw, flags, true); ++ ts_fill4(entry, pw, flags, true); + } + + /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 10:53:48 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 09:53:48 +0000 Subject: SF.net SVN: gar:[25336] csw/mgar/pkg/lang-python Message-ID: <3nq8hm3ln9z1Mr@mail.opencsw.org> Revision: 25336 http://sourceforge.net/p/gar/code/25336 Author: janholzh Date: 2015-11-02 09:53:48 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/zope-component/trunk: add py_zope-component Added Paths: ----------- csw/mgar/pkg/lang-python/zope-component/ csw/mgar/pkg/lang-python/zope-component/Makefile csw/mgar/pkg/lang-python/zope-component/branches/ csw/mgar/pkg/lang-python/zope-component/tags/ csw/mgar/pkg/lang-python/zope-component/trunk/ csw/mgar/pkg/lang-python/zope-component/trunk/Makefile csw/mgar/pkg/lang-python/zope-component/trunk/checksums csw/mgar/pkg/lang-python/zope-component/trunk/files/ Added: csw/mgar/pkg/lang-python/zope-component/Makefile =================================================================== --- csw/mgar/pkg/lang-python/zope-component/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/zope-component/Makefile 2015-11-02 09:53:48 UTC (rev 25336) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/zope-component/trunk =================================================================== --- csw/mgar/pkg/lang-python/zope-component/trunk 2015-11-02 09:26:27 UTC (rev 25335) +++ csw/mgar/pkg/lang-python/zope-component/trunk 2015-11-02 09:53:48 UTC (rev 25336) Property changes on: csw/mgar/pkg/lang-python/zope-component/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/zope-component/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/zope-component/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/zope-component/trunk/Makefile 2015-11-02 09:53:48 UTC (rev 25336) @@ -0,0 +1,32 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = zope.component +VERSION = 4.2.2 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Zope Component Architecture + +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +VENDOR_URL = http://pypi.python.org/pypi/zope.component +LICENSE = LICENSE.txt + +PACKAGES = CSWpy-zope-component +SPKG_DESC_CSWpy-zope-component = Zope Component Architecture +# PKGFILES is catchall + +ARCHALL_CSWpy-zope-component = 1 + +RUNTIME_DEP_PKGS_CSWpy-zope-component += CSWpy-zope-event +RUNTIME_DEP_PKGS_CSWpy-zope-component += CSWpy-zope-interface + +SKIPTEST ?= 1 + +CHECKPKG_OVERRIDES_CSWpy-zope-component += surplus-dependency|CSWpy-zope-interface +CHECKPKG_OVERRIDES_CSWpy-zope-component += surplus-dependency|CSWpy-zope-event + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/zope-component/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/zope-component/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/zope-component/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/zope-component/trunk/checksums 2015-11-02 09:53:48 UTC (rev 25336) @@ -0,0 +1 @@ +c6d04acac31f6d9e2420d0ac042617ae zope.component-4.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 11:07:39 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 10:07:39 +0000 Subject: SF.net SVN: gar:[25337] csw/mgar/pkg/lang-python Message-ID: <3nq90q1JyTz1Qc@mail.opencsw.org> Revision: 25337 http://sourceforge.net/p/gar/code/25337 Author: janholzh Date: 2015-11-02 10:07:39 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/configargparse/trunk: add py_configargparse Added Paths: ----------- csw/mgar/pkg/lang-python/configargparse/ csw/mgar/pkg/lang-python/configargparse/Makefile csw/mgar/pkg/lang-python/configargparse/branches/ csw/mgar/pkg/lang-python/configargparse/tags/ csw/mgar/pkg/lang-python/configargparse/trunk/ csw/mgar/pkg/lang-python/configargparse/trunk/Makefile csw/mgar/pkg/lang-python/configargparse/trunk/checksums csw/mgar/pkg/lang-python/configargparse/trunk/files/ Added: csw/mgar/pkg/lang-python/configargparse/Makefile =================================================================== --- csw/mgar/pkg/lang-python/configargparse/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/configargparse/Makefile 2015-11-02 10:07:39 UTC (rev 25337) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/configargparse/trunk =================================================================== --- csw/mgar/pkg/lang-python/configargparse/trunk 2015-11-02 09:53:48 UTC (rev 25336) +++ csw/mgar/pkg/lang-python/configargparse/trunk 2015-11-02 10:07:39 UTC (rev 25337) Property changes on: csw/mgar/pkg/lang-python/configargparse/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/configargparse/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/configargparse/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/configargparse/trunk/Makefile 2015-11-02 10:07:39 UTC (rev 25337) @@ -0,0 +1,27 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# + +NAME = ConfigArgParse +VERSION = 0.9.3 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = A drop-in replacement for argparse that allows options to also be set via config files and/or environment variables. + +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +# This is a new package, don't bother building for 2.6 +MODULATIONS_PYTHON_VERSION = 2_7 + + +PACKAGES += CSWpy-configargparse +SPKG_DESC_CSWpy-configargparse = A drop-in replacement for argparse + +# PKGFILES is catchall +ARCHALL_CSWpy-configargparse = 1 + +CHECKPKG_OVERRIDES_CSWpy-configargparse += python-package-missing-py26-files + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/configargparse/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/configargparse/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/configargparse/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/configargparse/trunk/checksums 2015-11-02 10:07:39 UTC (rev 25337) @@ -0,0 +1 @@ +69273e8099661cd12985b85d795ab73e ConfigArgParse-0.9.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 11:38:21 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 10:38:21 +0000 Subject: SF.net SVN: gar:[25338] csw/mgar/pkg/lang-python Message-ID: <3nq9hB6l4Yz1TG@mail.opencsw.org> Revision: 25338 http://sourceforge.net/p/gar/code/25338 Author: janholzh Date: 2015-11-02 10:38:21 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/psutil/trunk: add py_psutil Added Paths: ----------- csw/mgar/pkg/lang-python/psutil/ csw/mgar/pkg/lang-python/psutil/Makefile csw/mgar/pkg/lang-python/psutil/branches/ csw/mgar/pkg/lang-python/psutil/tags/ csw/mgar/pkg/lang-python/psutil/trunk/ csw/mgar/pkg/lang-python/psutil/trunk/Makefile csw/mgar/pkg/lang-python/psutil/trunk/checksums csw/mgar/pkg/lang-python/psutil/trunk/files/ csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch Added: csw/mgar/pkg/lang-python/psutil/Makefile =================================================================== --- csw/mgar/pkg/lang-python/psutil/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/psutil/Makefile 2015-11-02 10:38:21 UTC (rev 25338) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/psutil/trunk =================================================================== --- csw/mgar/pkg/lang-python/psutil/trunk 2015-11-02 10:07:39 UTC (rev 25337) +++ csw/mgar/pkg/lang-python/psutil/trunk 2015-11-02 10:38:21 UTC (rev 25338) Property changes on: csw/mgar/pkg/lang-python/psutil/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/psutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/psutil/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/psutil/trunk/Makefile 2015-11-02 10:38:21 UTC (rev 25338) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# + +NAME = psutil +VERSION = 3.2.2 +GARTYPE = v2 +CATEGORIES = python + +define BLURB +psutil is a cross-platform library for retrieving information onrunning processes and system utilization (CPU,memory, disks, network)in Python. +endef + + +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +# This is a new package, don't bother building for 2.6 some deps are 2.7 only anyway +#MODULATIONS_PYTHON_VERSION = 2_7 + +PATCHFILES += fix_solaris_build.patch + +PACKAGES += CSWpy-psutil +SPKG_DESC_CSWpy-psutil = Psutil is a library for retrieving information onrunning processes +# PKGFILES is catchall + +RUNTIME_DEP_PKGS_CSWpy-psutil += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-psutil += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-psutil += CSWlibgcc-s1 + + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/psutil/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/psutil/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/psutil/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/psutil/trunk/checksums 2015-11-02 10:38:21 UTC (rev 25338) @@ -0,0 +1 @@ +56df1727c9e26076a80da4c3f8f67976 psutil-3.2.2.tar.gz Added: csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch =================================================================== --- csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch (rev 0) +++ csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch 2015-11-02 10:38:21 UTC (rev 25338) @@ -0,0 +1,61 @@ +From f89aec2e56e1e1e503a6292850048bbea6de31a1 Mon Sep 17 00:00:00 2001 +From: bsebi +Date: Wed, 28 Oct 2015 18:50:41 +0200 +Subject: [PATCH] #704: psutil does not compile/cannot be imported on solaris + sparc + +--- + CREDITS | 5 +++++ + psutil/__init__.py | 2 +- + psutil/_psutil_posix.c | 2 +- + setup.py | 4 ++-- + 5 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/psutil/__init__.py b/psutil/__init__.py +index 1a75a9f..2343391 100644 +--- a/psutil/__init__.py ++++ b/psutil/__init__.py +@@ -121,7 +121,7 @@ + elif sys.platform.startswith("freebsd"): + from . import _psbsd as _psplatform + +-elif sys.platform.startswith("sunos"): ++elif sys.platform.startswith("sunos") or sys.platform.startswith("solaris"): + from . import _pssunos as _psplatform + from ._pssunos import (CONN_IDLE, # NOQA + CONN_BOUND) +diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c +index 1e27cdb..1dfbcf4 100644 +--- a/psutil/_psutil_posix.c ++++ b/psutil/_psutil_posix.c +@@ -16,7 +16,7 @@ + #include + + #ifdef PSUTIL_SUNOS10 +-#include "arch/solaris10/ifaddrs.h" ++#include "arch/solaris/v10/ifaddrs.h" + #else + #include + #endif +diff --git a/setup.py b/setup.py +index 3cb2dd6..8ff41d3 100644 +--- a/setup.py ++++ b/setup.py +@@ -71,7 +71,7 @@ def write(self, s): + posix_extension = Extension( + 'psutil._psutil_posix', + sources=['psutil/_psutil_posix.c']) +- if sys.platform.startswith("sunos"): ++ if sys.platform.startswith("sunos") or sys.platform.startswith("solaris"): + posix_extension.libraries.append('socket') + if platform.release() == '5.10': + posix_extension.sources.append('psutil/arch/solaris/v10/ifaddrs.c') +@@ -175,7 +175,7 @@ def on_exit(): + define_macros=macros) + extensions = [ext, posix_extension] + # Solaris +-elif sys.platform.lower().startswith('sunos'): ++elif sys.platform.lower().startswith('sunos') or sys.platform.lower().startswith('solaris'): + ext = Extension( + 'psutil._psutil_sunos', + sources=['psutil/_psutil_sunos.c'], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 11:47:02 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 10:47:02 +0000 Subject: SF.net SVN: gar:[25339] csw/mgar/pkg/lang-python Message-ID: <3nq9t86dbLz1Wg@mail.opencsw.org> Revision: 25339 http://sourceforge.net/p/gar/code/25339 Author: janholzh Date: 2015-11-02 10:47:02 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/configobj/trunk: add py_configobj Added Paths: ----------- csw/mgar/pkg/lang-python/configobj/ csw/mgar/pkg/lang-python/configobj/Makefile csw/mgar/pkg/lang-python/configobj/branches/ csw/mgar/pkg/lang-python/configobj/tags/ csw/mgar/pkg/lang-python/configobj/trunk/ csw/mgar/pkg/lang-python/configobj/trunk/Makefile csw/mgar/pkg/lang-python/configobj/trunk/checksums csw/mgar/pkg/lang-python/configobj/trunk/files/ Added: csw/mgar/pkg/lang-python/configobj/Makefile =================================================================== --- csw/mgar/pkg/lang-python/configobj/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/configobj/Makefile 2015-11-02 10:47:02 UTC (rev 25339) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/configobj/trunk =================================================================== --- csw/mgar/pkg/lang-python/configobj/trunk 2015-11-02 10:38:21 UTC (rev 25338) +++ csw/mgar/pkg/lang-python/configobj/trunk 2015-11-02 10:47:02 UTC (rev 25339) Property changes on: csw/mgar/pkg/lang-python/configobj/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/configobj/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/configobj/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/configobj/trunk/Makefile 2015-11-02 10:47:02 UTC (rev 25339) @@ -0,0 +1,24 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# + +NAME = configobj +VERSION = 5.0.6 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Config file reading, writing and validation. + +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +PACKAGES += CSWpy-configobj +SPKG_DESC_CSWpy-configobj = Config file reading, writing and validation. + +# PKGFILES is catchall +ARCHALL_CSWpy-configobj = 1 + +SKIPTEST = 1 + + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/configobj/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/configobj/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/configobj/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/configobj/trunk/checksums 2015-11-02 10:47:02 UTC (rev 25339) @@ -0,0 +1 @@ +e472a3a1c2a67bb0ec9b5d54c13a47d6 configobj-5.0.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 11:53:01 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 10:53:01 +0000 Subject: SF.net SVN: gar:[25340] csw/mgar/pkg/lang-python Message-ID: <3nqB142DbTz1v@mail.opencsw.org> Revision: 25340 http://sourceforge.net/p/gar/code/25340 Author: janholzh Date: 2015-11-02 10:53:01 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/parsedatetime/trunk: add py_parsedatetime Added Paths: ----------- csw/mgar/pkg/lang-python/parsedatetime/ csw/mgar/pkg/lang-python/parsedatetime/Makefile csw/mgar/pkg/lang-python/parsedatetime/branches/ csw/mgar/pkg/lang-python/parsedatetime/tags/ csw/mgar/pkg/lang-python/parsedatetime/trunk/ csw/mgar/pkg/lang-python/parsedatetime/trunk/Makefile csw/mgar/pkg/lang-python/parsedatetime/trunk/checksums csw/mgar/pkg/lang-python/parsedatetime/trunk/files/ Added: csw/mgar/pkg/lang-python/parsedatetime/Makefile =================================================================== --- csw/mgar/pkg/lang-python/parsedatetime/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/parsedatetime/Makefile 2015-11-02 10:53:01 UTC (rev 25340) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/parsedatetime/trunk =================================================================== --- csw/mgar/pkg/lang-python/parsedatetime/trunk 2015-11-02 10:47:02 UTC (rev 25339) +++ csw/mgar/pkg/lang-python/parsedatetime/trunk 2015-11-02 10:53:01 UTC (rev 25340) Property changes on: csw/mgar/pkg/lang-python/parsedatetime/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/parsedatetime/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/parsedatetime/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/parsedatetime/trunk/Makefile 2015-11-02 10:53:01 UTC (rev 25340) @@ -0,0 +1,21 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# + +NAME = parsedatetime +VERSION = 1.5 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Parse human-readable date/time text. + +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +PACKAGES += CSWpy-parsedatetime +SPKG_DESC_CSWpy-parsedatetime = Parse human-readable date/time text. + +# PKGFILES is catchall +ARCHALL_CSWpy-parsedatetime = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/parsedatetime/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/parsedatetime/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/parsedatetime/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/parsedatetime/trunk/checksums 2015-11-02 10:53:01 UTC (rev 25340) @@ -0,0 +1 @@ +e72720f9cd638bb9bbb3b616bc2508d4 parsedatetime-1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 11:59:20 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 10:59:20 +0000 Subject: SF.net SVN: gar:[25341] csw/mgar/pkg/lang-python Message-ID: <3nqB8M0pMbz4R@mail.opencsw.org> Revision: 25341 http://sourceforge.net/p/gar/code/25341 Author: janholzh Date: 2015-11-02 10:59:20 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/pyrfc3339/trunk: add py_pyrfc3339 Added Paths: ----------- csw/mgar/pkg/lang-python/pyrfc3339/ csw/mgar/pkg/lang-python/pyrfc3339/Makefile csw/mgar/pkg/lang-python/pyrfc3339/branches/ csw/mgar/pkg/lang-python/pyrfc3339/tags/ csw/mgar/pkg/lang-python/pyrfc3339/trunk/ csw/mgar/pkg/lang-python/pyrfc3339/trunk/Makefile csw/mgar/pkg/lang-python/pyrfc3339/trunk/checksums csw/mgar/pkg/lang-python/pyrfc3339/trunk/files/ Added: csw/mgar/pkg/lang-python/pyrfc3339/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyrfc3339/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pyrfc3339/Makefile 2015-11-02 10:59:20 UTC (rev 25341) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/pyrfc3339/trunk =================================================================== --- csw/mgar/pkg/lang-python/pyrfc3339/trunk 2015-11-02 10:53:01 UTC (rev 25340) +++ csw/mgar/pkg/lang-python/pyrfc3339/trunk 2015-11-02 10:59:20 UTC (rev 25341) Property changes on: csw/mgar/pkg/lang-python/pyrfc3339/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/pyrfc3339/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyrfc3339/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pyrfc3339/trunk/Makefile 2015-11-02 10:59:20 UTC (rev 25341) @@ -0,0 +1,21 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# + +NAME = pyRFC3339 +VERSION = 0.2 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Generate and parse RFC 3339 timestamps + +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +PACKAGES += CSWpy-pyrfc3339 +SPKG_DESC_CSWpy-pyrfc3339 = Generate and parse RFC 3339 timestamps + +# PKGFILES is catchall +ARCHALL_CSWpy-pyrfc3339 = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/pyrfc3339/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/pyrfc3339/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyrfc3339/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/pyrfc3339/trunk/checksums 2015-11-02 10:59:20 UTC (rev 25341) @@ -0,0 +1 @@ +5e0f7e40e363812180fffaae52daf2e6 pyRFC3339-0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 12:26:30 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 11:26:30 +0000 Subject: SF.net SVN: gar:[25342] csw/mgar/pkg/lang-python Message-ID: <3nqBlj6tTXz78@mail.opencsw.org> Revision: 25342 http://sourceforge.net/p/gar/code/25342 Author: janholzh Date: 2015-11-02 11:26:30 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/python2-pythondialog/trunk: add py_python2-pythondialog Added Paths: ----------- csw/mgar/pkg/lang-python/python2-pythondialog/ csw/mgar/pkg/lang-python/python2-pythondialog/Makefile csw/mgar/pkg/lang-python/python2-pythondialog/branches/ csw/mgar/pkg/lang-python/python2-pythondialog/tags/ csw/mgar/pkg/lang-python/python2-pythondialog/trunk/ csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile csw/mgar/pkg/lang-python/python2-pythondialog/trunk/checksums csw/mgar/pkg/lang-python/python2-pythondialog/trunk/files/ Added: csw/mgar/pkg/lang-python/python2-pythondialog/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python2-pythondialog/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/python2-pythondialog/Makefile 2015-11-02 11:26:30 UTC (rev 25342) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/python2-pythondialog/trunk =================================================================== --- csw/mgar/pkg/lang-python/python2-pythondialog/trunk 2015-11-02 10:59:20 UTC (rev 25341) +++ csw/mgar/pkg/lang-python/python2-pythondialog/trunk 2015-11-02 11:26:30 UTC (rev 25342) Property changes on: csw/mgar/pkg/lang-python/python2-pythondialog/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile 2015-11-02 11:26:30 UTC (rev 25342) @@ -0,0 +1,25 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# + +NAME = python2-pythondialog +VERSION = 3.3.0 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = A Python interface to the UNIX dialog utility and mostly-compatible programs + +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +NOGITPATCH += 1 +SKIPTEST = 1 + + +PACKAGES += CSWpy-py2-pydialog +SPKG_DESC_CSWpy-py2-pydialog = A Python interface to the UNIX dialog utility and mostly-compatible programs + +# PKGFILES is catchall +#ARCHALL_CSWpy-asn1 = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/python2-pythondialog/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python2-pythondialog/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/python2-pythondialog/trunk/checksums 2015-11-02 11:26:30 UTC (rev 25342) @@ -0,0 +1 @@ +f6a0e5fa66c26231a79b11fa45723cc5 python2-pythondialog-3.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 12:31:10 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 11:31:10 +0000 Subject: SF.net SVN: gar:[25343] csw/mgar/pkg/lang-python/python2-pythondialog/trunk /Makefile Message-ID: <3nqBs40Rq8z9l@mail.opencsw.org> Revision: 25343 http://sourceforge.net/p/gar/code/25343 Author: janholzh Date: 2015-11-02 11:31:10 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/python2-pythondialog/trunk: add deps Modified Paths: -------------- csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile 2015-11-02 11:26:30 UTC (rev 25342) +++ csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile 2015-11-02 11:31:10 UTC (rev 25343) @@ -15,11 +15,15 @@ NOGITPATCH += 1 SKIPTEST = 1 +RUNTIME_DEP_PKGS_py2-pydialog += CSWdialog + PACKAGES += CSWpy-py2-pydialog SPKG_DESC_CSWpy-py2-pydialog = A Python interface to the UNIX dialog utility and mostly-compatible programs # PKGFILES is catchall -#ARCHALL_CSWpy-asn1 = 1 +ARCHALL_CSWpy-py2-pydialog = 1 +RUNTIME_DEP_PKGS_py2-pydialog += CSWdialog + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 12:43:55 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 11:43:55 +0000 Subject: SF.net SVN: gar:[25344] csw/mgar/pkg/lang-python/python2-pythondialog/trunk /Makefile Message-ID: <3nqC7p0DXfzD8@mail.opencsw.org> Revision: 25344 http://sourceforge.net/p/gar/code/25344 Author: janholzh Date: 2015-11-02 11:43:55 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/python2-pythondialog/trunk: add fix overrides Modified Paths: -------------- csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile 2015-11-02 11:31:10 UTC (rev 25343) +++ csw/mgar/pkg/lang-python/python2-pythondialog/trunk/Makefile 2015-11-02 11:43:55 UTC (rev 25344) @@ -15,7 +15,6 @@ NOGITPATCH += 1 SKIPTEST = 1 -RUNTIME_DEP_PKGS_py2-pydialog += CSWdialog PACKAGES += CSWpy-py2-pydialog @@ -24,6 +23,8 @@ # PKGFILES is catchall ARCHALL_CSWpy-py2-pydialog = 1 -RUNTIME_DEP_PKGS_py2-pydialog += CSWdialog +RUNTIME_DEP_PKGS_CSWpy-py2-pydialog += CSWdialog +CHECKPKG_OVERRIDES_CSWpy-py2-pydialog += surplus-dependency|CSWdialog + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 12:56:04 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 11:56:04 +0000 Subject: SF.net SVN: gar:[25345] csw/mgar/pkg/lang-python/pyopenssl/trunk Message-ID: <3nqCPq0D0GzGl@mail.opencsw.org> Revision: 25345 http://sourceforge.net/p/gar/code/25345 Author: janholzh Date: 2015-11-02 11:56:04 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/pyopenssl/trunk: update to 0.15.1 Modified Paths: -------------- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums Modified: csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2015-11-02 11:43:55 UTC (rev 25344) +++ csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2015-11-02 11:56:04 UTC (rev 25345) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = pyOpenSSL -VERSION = 0.13.1 +VERSION = 0.15.1 GARTYPE = v2 CATEGORIES = python @@ -13,15 +13,21 @@ BUILD_DEP_PKGS_CSWpy-openssl += CSWpython_dev BUILD_DEP_PKGS_CSWpy-openssl += CSWpython27_dev +BUILD_DEP_PKGS_CSWpy-openssl += CSWpy-cryptography +BUILD_DEP_PKGS_CSWpy-openssl += CSWpy-six PACKAGES += CSWpy-openssl SPKG_DESC_CSWpy-openssl = OpenSSL bindings for Python # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibpython2-7-1-0 -RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibssl1-0-0 +ARCHALL_CSWpy-openssl = 1 + +RUNTIME_DEP_PKGS_CSWpy-openssl += CSWpy-six +RUNTIME_DEP_PKGS_CSWpy-openssl += CSWpy-cryptography +CHECKPKG_OVERRIDES_CSWpy-openssl += surplus-dependency|CSWpy-cryptography +CHECKPKG_OVERRIDES_CSWpy-openssl += surplus-dependency|CSWpy-six + + TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums 2015-11-02 11:43:55 UTC (rev 25344) +++ csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums 2015-11-02 11:56:04 UTC (rev 25345) @@ -1 +1 @@ -e27a3b76734c39ea03952ca94cc56715 pyOpenSSL-0.13.1.tar.gz +f447644afcbd5f0a1f47350fec63a4c6 pyOpenSSL-0.15.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 13:13:13 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 12:13:13 +0000 Subject: SF.net SVN: gar:[25346] csw/mgar/pkg/lang-python/werkzeug/trunk Message-ID: <3nqCnb5qcwzKV@mail.opencsw.org> Revision: 25346 http://sourceforge.net/p/gar/code/25346 Author: janholzh Date: 2015-11-02 12:13:13 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/werkzeug/trunk: update to 0.10.4 Modified Paths: -------------- csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile csw/mgar/pkg/lang-python/werkzeug/trunk/checksums Modified: csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile 2015-11-02 11:56:04 UTC (rev 25345) +++ csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile 2015-11-02 12:13:13 UTC (rev 25346) @@ -3,7 +3,7 @@ # $Id$ NAME = Werkzeug -VERSION = 0.9.4 +VERSION = 0.10.4 CATEGORIES = python GARTYPE = v2 DESCRIPTION = The Swiss Army knife of Python web development Modified: csw/mgar/pkg/lang-python/werkzeug/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/werkzeug/trunk/checksums 2015-11-02 11:56:04 UTC (rev 25345) +++ csw/mgar/pkg/lang-python/werkzeug/trunk/checksums 2015-11-02 12:13:13 UTC (rev 25346) @@ -1 +1 @@ -670fad41f57c13b71a6816765765a3dd Werkzeug-0.9.4.tar.gz +66a488e0ac50a9ec326fe020b3083450 Werkzeug-0.10.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 13:21:07 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 12:21:07 +0000 Subject: SF.net SVN: gar:[25347] csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile Message-ID: <3nqCyj37ggzMw@mail.opencsw.org> Revision: 25347 http://sourceforge.net/p/gar/code/25347 Author: janholzh Date: 2015-11-02 12:21:07 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/werkzeug/trunk: add py_werkzeug Modified Paths: -------------- csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile Modified: csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile 2015-11-02 12:13:13 UTC (rev 25346) +++ csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile 2015-11-02 12:21:07 UTC (rev 25347) @@ -15,4 +15,6 @@ PACKAGES = CSWpy-werkzeug ARCHALL_CSWpy-werkzeug = 1 +SKIPTEST = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 13:32:52 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 12:32:52 +0000 Subject: SF.net SVN: gar:[25348] csw/mgar/pkg/lang-python Message-ID: <3nqDDJ1jVmzQd@mail.opencsw.org> Revision: 25348 http://sourceforge.net/p/gar/code/25348 Author: janholzh Date: 2015-11-02 12:32:51 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/ndg-httpsclient/trunk: add py_ndg-httpsclient Added Paths: ----------- csw/mgar/pkg/lang-python/ndg-httpsclient/ csw/mgar/pkg/lang-python/ndg-httpsclient/Makefile csw/mgar/pkg/lang-python/ndg-httpsclient/branches/ csw/mgar/pkg/lang-python/ndg-httpsclient/tags/ csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/ csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/Makefile csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/checksums csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/files/ Added: csw/mgar/pkg/lang-python/ndg-httpsclient/Makefile =================================================================== --- csw/mgar/pkg/lang-python/ndg-httpsclient/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/ndg-httpsclient/Makefile 2015-11-02 12:32:51 UTC (rev 25348) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/ndg-httpsclient/trunk =================================================================== --- csw/mgar/pkg/lang-python/ndg-httpsclient/trunk 2015-11-02 12:21:07 UTC (rev 25347) +++ csw/mgar/pkg/lang-python/ndg-httpsclient/trunk 2015-11-02 12:32:51 UTC (rev 25348) Property changes on: csw/mgar/pkg/lang-python/ndg-httpsclient/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/Makefile 2015-11-02 12:32:51 UTC (rev 25348) @@ -0,0 +1,30 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = ndg_httpsclient +VERSION = 0.4.0 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL + +MASTER_SITES = https://pypi.python.org/packages/source/n/ndg-httpsclient/ +DISTFILES += $(DISTNAME).tar.gz + +BUILD_DEP_PKGS_CSWpy-openssl += CSWpy-openssl +BUILD_DEP_PKGS_CSWpy-openssl += CSWpy-asn1 + +PACKAGES += CSWpy-ndg-httpsclient +SPKG_DESC_CSWpy-ndg-httpsclient = Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL +# PKGFILES is catchall + +ARCHALL_CSWpy-ndg-httpsclient = 1 + +RUNTIME_DEP_PKGS_CSWpy-ndg-httpsclient += CSWpy-openssl +RUNTIME_DEP_PKGS_CSWpy-ndg-httpsclient += CSWpy-asn1 +CHECKPKG_OVERRIDES_CSWpy-ndg-httpsclient += surplus-dependency|CSWpy-openssl +CHECKPKG_OVERRIDES_CSWpy-ndg-httpsclient += surplus-dependency|CSWpy-asn1 + + +include gar/category.mk + Property changes on: csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/ndg-httpsclient/trunk/checksums 2015-11-02 12:32:51 UTC (rev 25348) @@ -0,0 +1 @@ +81972c0267d5a47d678211ac854838f5 ndg_httpsclient-0.4.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 14:36:54 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 13:36:54 +0000 Subject: SF.net SVN: gar:[25349] csw/mgar/pkg/lang-python Message-ID: <3nqFfB4qvXzTl@mail.opencsw.org> Revision: 25349 http://sourceforge.net/p/gar/code/25349 Author: janholzh Date: 2015-11-02 13:36:53 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/acme/trunk: add py_acme Added Paths: ----------- csw/mgar/pkg/lang-python/acme/ csw/mgar/pkg/lang-python/acme/Makefile csw/mgar/pkg/lang-python/acme/branches/ csw/mgar/pkg/lang-python/acme/tags/ csw/mgar/pkg/lang-python/acme/trunk/ csw/mgar/pkg/lang-python/acme/trunk/Makefile csw/mgar/pkg/lang-python/acme/trunk/checksums csw/mgar/pkg/lang-python/acme/trunk/files/ Added: csw/mgar/pkg/lang-python/acme/Makefile =================================================================== --- csw/mgar/pkg/lang-python/acme/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/acme/Makefile 2015-11-02 13:36:53 UTC (rev 25349) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/acme/trunk =================================================================== --- csw/mgar/pkg/lang-python/acme/trunk 2015-11-02 12:32:51 UTC (rev 25348) +++ csw/mgar/pkg/lang-python/acme/trunk 2015-11-02 13:36:53 UTC (rev 25349) Property changes on: csw/mgar/pkg/lang-python/acme/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/acme/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/acme/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/acme/trunk/Makefile 2015-11-02 13:36:53 UTC (rev 25349) @@ -0,0 +1,56 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Work in progress quick moving Version so don't release yet. Just to get deps in place and track +NAME = acme +VERSION = 0.0.0.dev20151030 +CATEGORIES = python +GARTYPE = v2 +SPKG_DESC_CSWpy-acme = ACME protocol implementation in Python + +define BLURB +ACME protocol implementation in Python +endef + +PACKAGES = CSWpy-acme +VENDOR_URL = https://pypi.python.org/pypi/acme +DISTFILES = $(NAME)-$(VERSION).tar.gz +LICENSE = PKG-INFO + +ARCHALL_CSWacme = 1 + + +# This is a new package, don't bother building for 2.6 some deps are 2.7 only anyway +MODULATIONS_PYTHON_VERSION = 2_7 + +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpython27 +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-six +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-requests +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-tz +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-openssl +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-cryptography +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-asn1 +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-pyrfc3339 +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-mock +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-werkzeug +RUNTIME_DEP_PKGS_CSWpy-acme += CSWpy-ndg-httpsclient + +SKIPTEST = 1 + + +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-openssl +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-requests +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-tz +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-six +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-mock +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-cryptography +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-pyrfc3339 +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpython27 +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-asn1 +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-ndg-httpsclient +CHECKPKG_OVERRIDES_CSWpy-acme += surplus-dependency|CSWpy-werkzeug +CHECKPKG_OVERRIDES_CSWpy-acme += python-package-missing-py26-files + + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/acme/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/acme/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/acme/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/acme/trunk/checksums 2015-11-02 13:36:53 UTC (rev 25349) @@ -0,0 +1 @@ +1acd85f7d185a088bc889522dd1f0801 acme-0.0.0.dev20151030.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 2 14:42:07 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 2 Nov 2015 13:42:07 +0000 Subject: SF.net SVN: gar:[25350] csw/mgar/pkg Message-ID: <3nqFmG5q6ZzXG@mail.opencsw.org> Revision: 25350 http://sourceforge.net/p/gar/code/25350 Author: dmichelsen Date: 2015-11-02 13:42:06 +0000 (Mon, 02 Nov 2015) Log Message: ----------- libicu56: Initial commit Modified Paths: -------------- csw/mgar/pkg/libicu56/trunk/Makefile csw/mgar/pkg/libicu56/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libicu56/ Modified: csw/mgar/pkg/libicu56/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu55/trunk/Makefile 2015-10-19 12:51:46 UTC (rev 25302) +++ csw/mgar/pkg/libicu56/trunk/Makefile 2015-11-02 13:42:06 UTC (rev 25350) @@ -1,6 +1,6 @@ # $Id$ NAME = libicu -VERSION = 55.1 +VERSION = 56.1 GARTYPE = v2 DESCRIPTION = International Components for Unicode @@ -15,72 +15,72 @@ LICENSE = license.html -PACKAGES += CSWlibicudata55 -SPKG_DESC_CSWlibicudata55 = International Components for Unicode, libicudata.so.55 -PKGFILES_CSWlibicudata55 += $(call pkgfiles_lib,libicudata.so.55) +PACKAGES += CSWlibicudata56 +SPKG_DESC_CSWlibicudata56 = International Components for Unicode, libicudata.so.56 +PKGFILES_CSWlibicudata56 += $(call pkgfiles_lib,libicudata.so.56) -PACKAGES += CSWlibicui18n55 -SPKG_DESC_CSWlibicui18n55 = International Components for Unicode, libicui18n.so.55 -PKGFILES_CSWlibicui18n55 += $(call pkgfiles_lib,libicui18n.so.55) -RUNTIME_DEP_PKGS_CSWlibicui18n55 += CSWlibicuuc55 -RUNTIME_DEP_PKGS_CSWlibicui18n55 += CSWlibicudata55 +PACKAGES += CSWlibicui18n56 +SPKG_DESC_CSWlibicui18n56 = International Components for Unicode, libicui18n.so.56 +PKGFILES_CSWlibicui18n56 += $(call pkgfiles_lib,libicui18n.so.56) +RUNTIME_DEP_PKGS_CSWlibicui18n56 += CSWlibicuuc56 +RUNTIME_DEP_PKGS_CSWlibicui18n56 += CSWlibicudata56 -PACKAGES += CSWlibicuio55 -SPKG_DESC_CSWlibicuio55 = International Components for Unicode, libicuio.so.55 -PKGFILES_CSWlibicuio55 += $(call pkgfiles_lib,libicuio.so.55) -RUNTIME_DEP_PKGS_CSWlibicuio55 += CSWlibicui18n55 -RUNTIME_DEP_PKGS_CSWlibicuio55 += CSWlibicuuc55 -RUNTIME_DEP_PKGS_CSWlibicuio55 += CSWlibicudata55 +PACKAGES += CSWlibicuio56 +SPKG_DESC_CSWlibicuio56 = International Components for Unicode, libicuio.so.56 +PKGFILES_CSWlibicuio56 += $(call pkgfiles_lib,libicuio.so.56) +RUNTIME_DEP_PKGS_CSWlibicuio56 += CSWlibicui18n56 +RUNTIME_DEP_PKGS_CSWlibicuio56 += CSWlibicuuc56 +RUNTIME_DEP_PKGS_CSWlibicuio56 += CSWlibicudata56 -PACKAGES += CSWlibicule55 -SPKG_DESC_CSWlibicule55 = International Components for Unicode, libicule.so.55 -PKGFILES_CSWlibicule55 += $(call pkgfiles_lib,libicule.so.55) -RUNTIME_DEP_PKGS_CSWlibicule55 += CSWlibicuuc55 -RUNTIME_DEP_PKGS_CSWlibicule55 += CSWlibicudata55 +PACKAGES += CSWlibicule56 +SPKG_DESC_CSWlibicule56 = International Components for Unicode, libicule.so.56 +PKGFILES_CSWlibicule56 += $(call pkgfiles_lib,libicule.so.56) +RUNTIME_DEP_PKGS_CSWlibicule56 += CSWlibicuuc56 +RUNTIME_DEP_PKGS_CSWlibicule56 += CSWlibicudata56 -PACKAGES += CSWlibiculx55 -SPKG_DESC_CSWlibiculx55 = International Components for Unicode, libiculx.so.55 -PKGFILES_CSWlibiculx55 += $(call pkgfiles_lib,libiculx.so.55) -RUNTIME_DEP_PKGS_CSWlibiculx55 += CSWlibicuuc55 -RUNTIME_DEP_PKGS_CSWlibiculx55 += CSWlibicule55 -RUNTIME_DEP_PKGS_CSWlibiculx55 += CSWlibicudata55 +PACKAGES += CSWlibiculx56 +SPKG_DESC_CSWlibiculx56 = International Components for Unicode, libiculx.so.56 +PKGFILES_CSWlibiculx56 += $(call pkgfiles_lib,libiculx.so.56) +RUNTIME_DEP_PKGS_CSWlibiculx56 += CSWlibicuuc56 +RUNTIME_DEP_PKGS_CSWlibiculx56 += CSWlibicule56 +RUNTIME_DEP_PKGS_CSWlibiculx56 += CSWlibicudata56 -PACKAGES += CSWlibicutest55 -SPKG_DESC_CSWlibicutest55 = International Components for Unicode, libicutest.so.55 -PKGFILES_CSWlibicutest55 += $(call pkgfiles_lib,libicutest.so.55) -RUNTIME_DEP_PKGS_CSWlibicutest55 += CSWlibicutu55 -RUNTIME_DEP_PKGS_CSWlibicutest55 += CSWlibicuuc55 -RUNTIME_DEP_PKGS_CSWlibicutest55 += CSWlibicui18n55 -RUNTIME_DEP_PKGS_CSWlibicutest55 += CSWlibicudata55 +PACKAGES += CSWlibicutest56 +SPKG_DESC_CSWlibicutest56 = International Components for Unicode, libicutest.so.56 +PKGFILES_CSWlibicutest56 += $(call pkgfiles_lib,libicutest.so.56) +RUNTIME_DEP_PKGS_CSWlibicutest56 += CSWlibicutu56 +RUNTIME_DEP_PKGS_CSWlibicutest56 += CSWlibicuuc56 +RUNTIME_DEP_PKGS_CSWlibicutest56 += CSWlibicui18n56 +RUNTIME_DEP_PKGS_CSWlibicutest56 += CSWlibicudata56 -PACKAGES += CSWlibicutu55 -SPKG_DESC_CSWlibicutu55 = International Components for Unicode, libicutu.so.55 -PKGFILES_CSWlibicutu55 += $(call pkgfiles_lib,libicutu.so.55) -RUNTIME_DEP_PKGS_CSWlibicutu55 += CSWlibicuuc55 -RUNTIME_DEP_PKGS_CSWlibicutu55 += CSWlibicui18n55 -RUNTIME_DEP_PKGS_CSWlibicutu55 += CSWlibicudata55 +PACKAGES += CSWlibicutu56 +SPKG_DESC_CSWlibicutu56 = International Components for Unicode, libicutu.so.56 +PKGFILES_CSWlibicutu56 += $(call pkgfiles_lib,libicutu.so.56) +RUNTIME_DEP_PKGS_CSWlibicutu56 += CSWlibicuuc56 +RUNTIME_DEP_PKGS_CSWlibicutu56 += CSWlibicui18n56 +RUNTIME_DEP_PKGS_CSWlibicutu56 += CSWlibicudata56 -PACKAGES += CSWlibicuuc55 -SPKG_DESC_CSWlibicuuc55 = International Components for Unicode, libicuuc.so.55 -PKGFILES_CSWlibicuuc55 += $(call pkgfiles_lib,libicuuc.so.55) -RUNTIME_DEP_PKGS_CSWlibicuuc55 += CSWlibicudata55 +PACKAGES += CSWlibicuuc56 +SPKG_DESC_CSWlibicuuc56 = International Components for Unicode, libicuuc.so.56 +PKGFILES_CSWlibicuuc56 += $(call pkgfiles_lib,libicuuc.so.56) +RUNTIME_DEP_PKGS_CSWlibicuuc56 += CSWlibicudata56 # This is the presence of /usr/share/lib/zoneinfo which is ok -CHECKPKG_OVERRIDES_CSWlibicuuc55 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.55.1 -CHECKPKG_OVERRIDES_CSWlibicuuc55 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.55.1 -CHECKPKG_OVERRIDES_CSWlibicuuc55 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.55.1 +CHECKPKG_OVERRIDES_CSWlibicuuc56 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.56.1 +CHECKPKG_OVERRIDES_CSWlibicuuc56 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.56.1 +CHECKPKG_OVERRIDES_CSWlibicuuc56 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.56.1 PACKAGES += CSWlibicu-dev -SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.55 +SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.56 # This package is PKGFILES catchall -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata55 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n55 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio55 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule55 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx55 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest55 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu55 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc55 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata56 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n56 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio56 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule56 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx56 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest56 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu56 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc56 # This is a false positive. Override until this is fixed: # http://lists.opencsw.org/pipermail/maintainers/2015-January/019612.html @@ -92,13 +92,13 @@ CHECKPKG_OVERRIDES_CSWlibicu-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/icu/current/pkgdata.inc|CSWlibicu-dev|contains|symlink|/opt/csw/lib/icu/pkgdata.inc|which|needs|the|target|file:|/opt/csw/lib/icu/current/pkgdata.inc # For i386 due to different linker settings -CHECKPKG_OVERRIDES_CSWlibicule55 += surplus-dependency|CSWlibicudata55 -CHECKPKG_OVERRIDES_CSWlibicutu55 += surplus-dependency|CSWlibicudata55 -CHECKPKG_OVERRIDES_CSWlibiculx55 += surplus-dependency|CSWlibicudata55 -CHECKPKG_OVERRIDES_CSWlibicuio55 += surplus-dependency|CSWlibicudata55 -CHECKPKG_OVERRIDES_CSWlibicutest55 += surplus-dependency|CSWlibicudata55 -CHECKPKG_OVERRIDES_CSWlibicutest55 += surplus-dependency|CSWlibicui18n55 -CHECKPKG_OVERRIDES_CSWlibicui18n55 += surplus-dependency|CSWlibicudata55 +CHECKPKG_OVERRIDES_CSWlibicule56 += surplus-dependency|CSWlibicudata56 +CHECKPKG_OVERRIDES_CSWlibicutu56 += surplus-dependency|CSWlibicudata56 +CHECKPKG_OVERRIDES_CSWlibiculx56 += surplus-dependency|CSWlibicudata56 +CHECKPKG_OVERRIDES_CSWlibicuio56 += surplus-dependency|CSWlibicudata56 +CHECKPKG_OVERRIDES_CSWlibicutest56 += surplus-dependency|CSWlibicudata56 +CHECKPKG_OVERRIDES_CSWlibicutest56 += surplus-dependency|CSWlibicui18n56 +CHECKPKG_OVERRIDES_CSWlibicui18n56 += surplus-dependency|CSWlibicudata56 DISTNAME = icu WORKSRC = $(WORKDIR)/$(DISTNAME)/source Modified: csw/mgar/pkg/libicu56/trunk/checksums =================================================================== --- csw/mgar/pkg/libicu55/trunk/checksums 2015-10-19 12:51:46 UTC (rev 25302) +++ csw/mgar/pkg/libicu56/trunk/checksums 2015-11-02 13:42:06 UTC (rev 25350) @@ -1 +1 @@ -e2d523df79d6cb7855c2fbe284f4db29 icu4c-55_1-src.tgz +c4a2d71ff56aec5ebfab2a3f059be99d icu4c-56_1-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 2 14:47:28 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 2 Nov 2015 13:47:28 +0000 Subject: SF.net SVN: gar:[25351] csw/mgar/pkg/stunnel/trunk Message-ID: <3nqFtM3k85zZh@mail.opencsw.org> Revision: 25351 http://sourceforge.net/p/gar/code/25351 Author: dmichelsen Date: 2015-11-02 13:47:28 +0000 (Mon, 02 Nov 2015) Log Message: ----------- stunnel/trunk: Update to 5.25 Modified Paths: -------------- csw/mgar/pkg/stunnel/trunk/Makefile csw/mgar/pkg/stunnel/trunk/checksums Added Paths: ----------- csw/mgar/pkg/stunnel/trunk/files/0001-Solaris-fixes.patch Modified: csw/mgar/pkg/stunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/stunnel/trunk/Makefile 2015-11-02 13:42:06 UTC (rev 25350) +++ csw/mgar/pkg/stunnel/trunk/Makefile 2015-11-02 13:47:28 UTC (rev 25351) @@ -7,7 +7,7 @@ # Test on Solaris 8 / 9 for comparison # NAME = stunnel -VERSION = 5.24 +VERSION = 5.25 # BETA = b4 GARTYPE = v2 @@ -29,6 +29,10 @@ DISTFILES += $(DISTNAME)$(BETA).tar.gz DISTFILES += cswstunnel.xml +# As reported in +# http://www.stunnel.org/pipermail/stunnel-users/2015-November/005282.html +PATCHFILES += 0001-Solaris-fixes.patch + VENDOR_URL = http://www.stunnel.org BUILD_DEP_PKGS += CSWlibssl-dev Modified: csw/mgar/pkg/stunnel/trunk/checksums =================================================================== --- csw/mgar/pkg/stunnel/trunk/checksums 2015-11-02 13:42:06 UTC (rev 25350) +++ csw/mgar/pkg/stunnel/trunk/checksums 2015-11-02 13:47:28 UTC (rev 25351) @@ -1 +1 @@ -24ad1f10525181edcf82433aac8bad0b stunnel-5.24.tar.gz +326126f56a76eec974d3a31ebedb9623 stunnel-5.25.tar.gz Added: csw/mgar/pkg/stunnel/trunk/files/0001-Solaris-fixes.patch =================================================================== --- csw/mgar/pkg/stunnel/trunk/files/0001-Solaris-fixes.patch (rev 0) +++ csw/mgar/pkg/stunnel/trunk/files/0001-Solaris-fixes.patch 2015-11-02 13:47:28 UTC (rev 25351) @@ -0,0 +1,39 @@ +From 9778752c2f397490e09259564833b7d22bb6c76c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 2 Nov 2015 14:40:31 +0100 +Subject: [PATCH] Solaris fixes + +--- + src/client.c | 2 ++ + src/network.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/client.c b/src/client.c +index 76b808d..e957406 100644 +--- a/src/client.c ++++ b/src/client.c +@@ -48,6 +48,8 @@ + #define SHUT_RDWR 2 + #endif + ++extern char **environ; ++ + NOEXPORT void client_try(CLI *); + NOEXPORT void client_run(CLI *); + NOEXPORT void local_start(CLI *); +diff --git a/src/network.c b/src/network.c +index e222268..15be34a 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -40,6 +40,8 @@ + #define FD_SETSIZE 1000000 + #endif + ++#include ++ + #include "common.h" + #include "prototypes.h" + +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 2 15:02:27 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 2 Nov 2015 14:02:27 +0000 Subject: SF.net SVN: gar:[25352] csw/mgar/pkg/zabbix/trunk Message-ID: <3nqGCf1qWqzd8@mail.opencsw.org> Revision: 25352 http://sourceforge.net/p/gar/code/25352 Author: dmichelsen Date: 2015-11-02 14:02:26 +0000 (Mon, 02 Nov 2015) Log Message: ----------- zabbix/trunk: Update to 2.4.6 Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/checksums Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-02 13:47:28 UTC (rev 25351) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-02 14:02:26 UTC (rev 25352) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = zabbix -VERSION = 2.2.8 +VERSION = 2.4.6 GARTYPE = v2 DESCRIPTION = Zabbix monitoring system @@ -38,6 +38,7 @@ RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp30 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibintl8 # These are just examples #CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8 @@ -57,9 +58,10 @@ RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiksemel3 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibintl8 # MySQL uses gcc, so we need to do also or the compiler flags bust -GARCOMPILER = GCC4 +# GARCOMPILER = GCC4 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config Modified: csw/mgar/pkg/zabbix/trunk/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums 2015-11-02 13:47:28 UTC (rev 25351) +++ csw/mgar/pkg/zabbix/trunk/checksums 2015-11-02 14:02:26 UTC (rev 25352) @@ -1 +1 @@ -8dc2f909cf4587a8ca8144dcf7ee7fa5 zabbix-2.2.8.tar.gz +06ad8d5808a0eddf2b9f0a256b6a5fde zabbix-2.4.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 15:02:29 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 14:02:29 +0000 Subject: SF.net SVN: gar:[25353] csw/mgar/pkg/lang-python/letsencrypt/trunk Message-ID: <3nqGCk1vnczdn@mail.opencsw.org> Revision: 25353 http://sourceforge.net/p/gar/code/25353 Author: janholzh Date: 2015-11-02 14:02:29 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/letsencrypt/trunk: update deps Modified Paths: -------------- csw/mgar/pkg/lang-python/letsencrypt/trunk/Makefile csw/mgar/pkg/lang-python/letsencrypt/trunk/checksums Modified: csw/mgar/pkg/lang-python/letsencrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/letsencrypt/trunk/Makefile 2015-11-02 14:02:26 UTC (rev 25352) +++ csw/mgar/pkg/lang-python/letsencrypt/trunk/Makefile 2015-11-02 14:02:29 UTC (rev 25353) @@ -3,11 +3,10 @@ # $Id$ # Work in progress quick moving Version so don't release yet. Just to get deps in place and track NAME = letsencrypt -VERSION = 0.0.0.dev20151024 +VERSION = 0.0.0.dev20151030 CATEGORIES = python GARTYPE = v2 SPKG_DESC_CSWletsencrypt = Let's Encrypt client -#ARCHALL_CSWpy-virtualenv = 1 define BLURB The Let's Encrypt Client is a tool to automatically receive and install X.509 certificates to enable TLS on servers. The client will interoperate with the Let's Encrypt CA. @@ -18,6 +17,13 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz LICENSE = PKG-INFO +ARCHALL_CSWletsencrypt = 1 + + +# This is a new package, don't bother building for 2.6 some deps are 2.7 only anyway +MODULATIONS_PYTHON_VERSION = 2_7 + +RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpython27 RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-zope-interface RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-six RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-setuptools @@ -25,20 +31,19 @@ RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-tz RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-mock RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-openssl -#Missing: +RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-cryptography +RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-zope-component +RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-configargparse +RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-psutil +RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-configobj +RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-pyrfc3339 +RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-parsedatetime +RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-py2-pydialog -#RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-configargparse -#RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-zope-component -#RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-psutil -#RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-cryptography -#RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-configobj +#Add leter when released as acme is moving target also #RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-acme -#RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-py2-pythondialog -#RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-parsedatetime -#RUNTIME_DEP_PKGS_CSWletsencrypt += CSWpy-pyrfc3339 -MODULATIONS_PYTHON_VERSION = 2_7 SKIPTEST = 1 @@ -52,5 +57,14 @@ CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-six CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-mock CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-zope-interface +CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-cryptography +CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-zope-component +CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-configargparse +CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-psutil +CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-configobj +CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-pyrfc3339 +CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-parsedatetime +CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpy-py2-pydialog +CHECKPKG_OVERRIDES_CSWletsencrypt += surplus-dependency|CSWpython27 include gar/category.mk Modified: csw/mgar/pkg/lang-python/letsencrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/letsencrypt/trunk/checksums 2015-11-02 14:02:26 UTC (rev 25352) +++ csw/mgar/pkg/lang-python/letsencrypt/trunk/checksums 2015-11-02 14:02:29 UTC (rev 25353) @@ -1 +1 @@ -86b8ffc407af81b66a69d1dad29c0705 letsencrypt-0.0.0.dev20151024.tar.gz +eb4bd8c6eed5f80f22c9cfb8cf67bbd1 letsencrypt-0.0.0.dev20151030.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 2 15:29:29 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 2 Nov 2015 14:29:29 +0000 Subject: SF.net SVN: gar:[25354] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: <3nqGpr34Vxzkt@mail.opencsw.org> Revision: 25354 http://sourceforge.net/p/gar/code/25354 Author: dmichelsen Date: 2015-11-02 14:29:28 +0000 (Mon, 02 Nov 2015) Log Message: ----------- zabbix/trunk: Adjust for linker anomaly Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-02 14:02:29 UTC (rev 25353) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-02 14:29:28 UTC (rev 25354) @@ -38,8 +38,11 @@ RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp30 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWzabbix-agent_sparc += CSWlibintl8 +# Linker anomaly +RUNTIME_DEP_PKGS_CSWzabbix-agent += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH)) + # These are just examples #CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8 #CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zabbix_sender.1 @@ -58,8 +61,11 @@ RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiksemel3 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWzabbix-server_sparc += CSWlibintl8 +# Linker anomaly +RUNTIME_DEP_PKGS_CSWzabbix-server += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH)) + # MySQL uses gcc, so we need to do also or the compiler flags bust # GARCOMPILER = GCC4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 2 16:43:55 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 2 Nov 2015 15:43:55 +0000 Subject: SF.net SVN: gar:[25355] csw/mgar/pkg/lang-python/acme/trunk/Makefile Message-ID: <3nqJSj64dlzpW@mail.opencsw.org> Revision: 25355 http://sourceforge.net/p/gar/code/25355 Author: janholzh Date: 2015-11-02 15:43:55 +0000 (Mon, 02 Nov 2015) Log Message: ----------- lang-python/acme/trunk: fix ARCHALL Modified Paths: -------------- csw/mgar/pkg/lang-python/acme/trunk/Makefile Modified: csw/mgar/pkg/lang-python/acme/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/acme/trunk/Makefile 2015-11-02 14:29:28 UTC (rev 25354) +++ csw/mgar/pkg/lang-python/acme/trunk/Makefile 2015-11-02 15:43:55 UTC (rev 25355) @@ -18,9 +18,10 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz LICENSE = PKG-INFO -ARCHALL_CSWacme = 1 +ARCHALL_CSWpy-acme = 1 + # This is a new package, don't bother building for 2.6 some deps are 2.7 only anyway MODULATIONS_PYTHON_VERSION = 2_7 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 2 17:09:27 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 2 Nov 2015 16:09:27 +0000 Subject: SF.net SVN: gar:[25356] csw/mgar/pkg/logstash/trunk Message-ID: <3nqK2B0T6bzsP@mail.opencsw.org> Revision: 25356 http://sourceforge.net/p/gar/code/25356 Author: dmichelsen Date: 2015-11-02 16:09:27 +0000 (Mon, 02 Nov 2015) Log Message: ----------- logstash/trunk: Update to 2.0.0 Modified Paths: -------------- csw/mgar/pkg/logstash/trunk/Makefile csw/mgar/pkg/logstash/trunk/checksums Modified: csw/mgar/pkg/logstash/trunk/Makefile =================================================================== --- csw/mgar/pkg/logstash/trunk/Makefile 2015-11-02 15:43:55 UTC (rev 25355) +++ csw/mgar/pkg/logstash/trunk/Makefile 2015-11-02 16:09:27 UTC (rev 25356) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = logstash -VERSION = 1.5.4 +VERSION = 2.0.0 GARTYPE = v2 DESCRIPTION = A tool for managing events and logs Modified: csw/mgar/pkg/logstash/trunk/checksums =================================================================== --- csw/mgar/pkg/logstash/trunk/checksums 2015-11-02 15:43:55 UTC (rev 25355) +++ csw/mgar/pkg/logstash/trunk/checksums 2015-11-02 16:09:27 UTC (rev 25356) @@ -1 +1 @@ -e68f82c5f1f49a5207473ee3cea7b84b logstash-1.5.4.tar.gz +4fb2576bae64be73ad9c9285e87c582b logstash-2.0.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 3 11:50:59 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 3 Nov 2015 10:50:59 +0000 Subject: SF.net SVN: gar:[25357] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: <3nqnwP3KQFz1B0@mail.opencsw.org> Revision: 25357 http://sourceforge.net/p/gar/code/25357 Author: dmichelsen Date: 2015-11-03 10:50:59 +0000 (Tue, 03 Nov 2015) Log Message: ----------- zabbix/trunk: Make version with PostgreSQL support Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-02 16:09:27 UTC (rev 25356) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-03 10:50:59 UTC (rev 25357) @@ -34,7 +34,8 @@ RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssh2-1 -RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18 +#RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibpq5 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp30 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2 @@ -53,7 +54,8 @@ PACKAGES += $(PACKAGES-$(GAROSREL)) SPKG_DESC_CSWzabbix-server = Zabbix monitoring system server PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server) -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18 +#RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibpq5 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWliblber2-4-2 @@ -61,10 +63,9 @@ RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiksemel3 -RUNTIME_DEP_PKGS_CSWzabbix-server_sparc += CSWlibintl8 # Linker anomaly -RUNTIME_DEP_PKGS_CSWzabbix-server += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH)) +# RUNTIME_DEP_PKGS_CSWzabbix-server += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH)) # MySQL uses gcc, so we need to do also or the compiler flags bust # GARCOMPILER = GCC4 @@ -90,14 +91,18 @@ # We need the latest Solaris 10 for the mysql bindings LINKER_MAP_RELEASE = -CONFIGURE_ARGS += --with-mysql +# CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config # CONFIGURE_ARGS += --with-sqlite3 -# CONFIGURE_ARGS += --with-postgresql -CONFIGURE_ARGS += --with-libcurl=$(prefix)/bin/curl-config -CONFIGURE_ARGS += --with-net-snmp=$(prefix)/bin/net-snmp-config +# PostgreSQL +CONFIGURE_ARGS += --without-mysql +CONFIGURE_ARGS += --with-postgresql=$(bindir)/pg_config +CONFIGURE_ARGS += --with-libcurl=$(bindir)/curl-config + +CONFIGURE_ARGS += --with-net-snmp=$(bindir)/net-snmp-config + CONFIGURE_ARGS += --with-jabber PRESERVECONF += $(sysconfdir)/zabbix_agent.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Nov 4 14:06:03 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 4 Nov 2015 13:06:03 +0000 Subject: SF.net SVN: gar:[25358] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files Message-ID: <3nrSsq1GJNz4L@mail.opencsw.org> Revision: 25358 http://sourceforge.net/p/gar/code/25358 Author: lblume Date: 2015-11-04 13:06:03 +0000 (Wed, 04 Nov 2015) Log Message: ----------- mysql5/branches/mysql-5.6.x: Switch the default operation mode to the kernel ISA Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW 2015-11-03 10:50:59 UTC (rev 25357) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW 2015-11-04 13:06:03 UTC (rev 25358) @@ -18,9 +18,6 @@ Running MySQL is handled by the cswmysql56 service. * The preferred architecture can be set using mysql56_arch= in csw.conf: - the current default (no value) is to use the 32-bit version, to avoid - changing the architecture without user interaction. Since 32-bit hardware - is becoming scarce, This may be modified in a future Mysql release (5.6) to - have the kernel ISA be the default. + the current default (no value) is to use the same ISA as the kernel. Possible value are: sparcv9 amd64 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl 2015-11-03 10:50:59 UTC (rev 25357) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql56.tpl 2015-11-04 13:06:03 UTC (rev 25358) @@ -216,23 +216,38 @@ fi fi -# If a value was found -if [ -n "$mysql56_arch" ]; then - if [ "$mysql56_arch" = "kernel" ]; then - # Use the system's default arch - mysql56_arch=`isainfo -k` +# If no value, use the kernel +if [ -z "$mysql56_arch" ]; then + mysql56_arch=kernel +fi + +# At this point, it must have a value +if [ "$mysql56_arch" = "kernel" ]; then + # Use the system's default arch + mysql56_arch=`isainfo -k` +fi + +# Check the value selected is supported +for a in `isainfo`; do + if [ "$a" = "$mysql56_arch" ]; then + arch_supported=1 fi - # Add the architecture suffix to the executables' directories, if it exists - # The binaries themselves are tested below, so the script should fail - # mostly gracefully if a non-present arch is set up. - if [ -d "$bindir/$mysql56_arch" -a \ - -d "$sbindir/$mysql56_arch" -a \ - -d "$libexecdir/$mysql56_arch" ]; then - bindir="$bindir/$mysql56_arch" - sbindir="$sbindir/$mysql56_arch" - libexecdir="$libexecdir/$mysql56_arch" + if [ -z "$arch_supported" ]; then + echo "The selected value for mysql56_arch ($mysql56_arch) is invalid on this system." + exit 1 fi +done + +# Add the architecture suffix to the executables' directories, if it exists +# The binaries themselves are tested below, so the script should fail +# mostly gracefully if a non-present arch is set up. +if [ -d "$bindir/$mysql56_arch" -a \ + -d "$sbindir/$mysql56_arch" -a \ + -d "$libexecdir/$mysql56_arch" ]; then + bindir="$bindir/$mysql56_arch" + sbindir="$sbindir/$mysql56_arch" + libexecdir="$libexecdir/$mysql56_arch" fi ### END OPENCSW ARCHITECTURE SELECTION This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Nov 4 14:07:36 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 4 Nov 2015 13:07:36 +0000 Subject: SF.net SVN: gar:[25359] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Message-ID: <3nrSvQ3nyWz6k@mail.opencsw.org> Revision: 25359 http://sourceforge.net/p/gar/code/25359 Author: lblume Date: 2015-11-04 13:07:36 +0000 (Wed, 04 Nov 2015) Log Message: ----------- mysql5/branches/mysql-5.6.x: Bump to 5.6.27 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2015-11-04 13:06:03 UTC (rev 25358) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2015-11-04 13:07:36 UTC (rev 25359) @@ -20,7 +20,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)56 BASE_VERSION = 5.6 -PATCHLEVEL = 26 +PATCHLEVEL = 27 ALTS_PRIO = 56 VERSION = $(BASE_VERSION).$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From sfbsdsx at users.sourceforge.net Wed Nov 4 21:25:46 2015 From: sfbsdsx at users.sourceforge.net (sfbsdsx at users.sourceforge.net) Date: Wed, 4 Nov 2015 20:25:46 +0000 Subject: SF.net SVN: gar:[25360] csw/mgar/pkg/fossil/trunk Message-ID: <3nrfd10c9xzRm@mail.opencsw.org> Revision: 25360 http://sourceforge.net/p/gar/code/25360 Author: sfbsdsx Date: 2015-11-04 20:25:45 +0000 (Wed, 04 Nov 2015) Log Message: ----------- version 1.34 fix libreadline / lineedit Modified Paths: -------------- csw/mgar/pkg/fossil/trunk/Makefile csw/mgar/pkg/fossil/trunk/checksums Modified: csw/mgar/pkg/fossil/trunk/Makefile =================================================================== --- csw/mgar/pkg/fossil/trunk/Makefile 2015-11-04 13:07:36 UTC (rev 25359) +++ csw/mgar/pkg/fossil/trunk/Makefile 2015-11-04 20:25:45 UTC (rev 25360) @@ -1,10 +1,9 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) -# * next release don't use readline anymore (https://www.fossil-scm.org/fossil/info/851485657643dc2c) # Recipe sent in by Freddy DISSAUX freddy.dsx free.fr NAME = fossil -VERSION = 1.33 +VERSION = 1.34 GARTYPE = v2 DESCRIPTION = DSCM with built-in wiki, http interface and server, tickets database @@ -32,8 +31,6 @@ CONFIGURE_ARGS += --with-openssl=auto CONFIGURE_ARGS += --with-zlib=$(includedir) CONFIGURE_ARGS += --disable-fusefs -# Find libreadline always fail -CONFIGURE_ARGS += --disable-lineedit # No test/check target provided by fossil TEST_SCRIPTS = Modified: csw/mgar/pkg/fossil/trunk/checksums =================================================================== --- csw/mgar/pkg/fossil/trunk/checksums 2015-11-04 13:07:36 UTC (rev 25359) +++ csw/mgar/pkg/fossil/trunk/checksums 2015-11-04 20:25:45 UTC (rev 25360) @@ -1 +1 @@ -53f8145084a2065d6cb734980c172c7e fossil-src-1.33.tar.gz +3d5a7da5c506a47784942236a788b29b fossil-src-1.34.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From sfbsdsx at users.sourceforge.net Wed Nov 4 21:39:23 2015 From: sfbsdsx at users.sourceforge.net (sfbsdsx at users.sourceforge.net) Date: Wed, 4 Nov 2015 20:39:23 +0000 Subject: SF.net SVN: gar:[25361] csw/mgar/pkg/fossil/trunk/Makefile Message-ID: <3nrfwj0gV4zVC@mail.opencsw.org> Revision: 25361 http://sourceforge.net/p/gar/code/25361 Author: sfbsdsx Date: 2015-11-04 20:39:23 +0000 (Wed, 04 Nov 2015) Log Message: ----------- s/svn commit/mgar commit/ Modified Paths: -------------- csw/mgar/pkg/fossil/trunk/Makefile Modified: csw/mgar/pkg/fossil/trunk/Makefile =================================================================== --- csw/mgar/pkg/fossil/trunk/Makefile 2015-11-04 20:25:45 UTC (rev 25360) +++ csw/mgar/pkg/fossil/trunk/Makefile 2015-11-04 20:39:23 UTC (rev 25361) @@ -1,6 +1,6 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) -# Recipe sent in by Freddy DISSAUX freddy.dsx free.fr +# Recipe sent in by Freddy DISSAUX freddy.dsx free.fr NAME = fossil VERSION = 1.34 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 5 09:43:28 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 5 Nov 2015 08:43:28 +0000 Subject: SF.net SVN: gar:[25362] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums Message-ID: <3nrz094zzKzhG@mail.opencsw.org> Revision: 25362 http://sourceforge.net/p/gar/code/25362 Author: lblume Date: 2015-11-05 08:43:28 +0000 (Thu, 05 Nov 2015) Log Message: ----------- mysql5/branches/mysql-5.6.x: Checksum Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2015-11-04 20:39:23 UTC (rev 25361) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2015-11-05 08:43:28 UTC (rev 25362) @@ -1 +1 @@ -733e1817c88c16fb193176e76f5b818f mysql-5.6.26.tar.gz +7754df40bb5567b03b041ccb6b5ddffa mysql-5.6.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 6 12:47:59 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 6 Nov 2015 11:47:59 +0000 Subject: SF.net SVN: gar:[25363] csw/mgar/pkg/stunnel/trunk Message-ID: <3nsg2p2Jlwz1VB@mail.opencsw.org> Revision: 25363 http://sourceforge.net/p/gar/code/25363 Author: dmichelsen Date: 2015-11-06 11:47:59 +0000 (Fri, 06 Nov 2015) Log Message: ----------- stunnel/trunk: Update to 5.26 Modified Paths: -------------- csw/mgar/pkg/stunnel/trunk/Makefile csw/mgar/pkg/stunnel/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/stunnel/trunk/files/0001-Solaris-fixes.patch Modified: csw/mgar/pkg/stunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/stunnel/trunk/Makefile 2015-11-05 08:43:28 UTC (rev 25362) +++ csw/mgar/pkg/stunnel/trunk/Makefile 2015-11-06 11:47:59 UTC (rev 25363) @@ -7,8 +7,8 @@ # Test on Solaris 8 / 9 for comparison # NAME = stunnel -VERSION = 5.25 -# BETA = b4 +VERSION = 5.26 +# BETA = b1 GARTYPE = v2 DESCRIPTION = Universal SSL Wrapper @@ -24,15 +24,10 @@ # Upstream moves versions to an obsolete/ subdir over time, consider it too MAJOR_VER = $(firstword $(subst ., ,$(VERSION))) MASTER_SITES += https://www.stunnel.org/downloads/archive/$(MAJOR_VER).x/ - MASTER_SITES += https://www.stunnel.org/downloads/beta/ DISTFILES += $(DISTNAME)$(BETA).tar.gz DISTFILES += cswstunnel.xml -# As reported in -# http://www.stunnel.org/pipermail/stunnel-users/2015-November/005282.html -PATCHFILES += 0001-Solaris-fixes.patch - VENDOR_URL = http://www.stunnel.org BUILD_DEP_PKGS += CSWlibssl-dev Modified: csw/mgar/pkg/stunnel/trunk/checksums =================================================================== --- csw/mgar/pkg/stunnel/trunk/checksums 2015-11-05 08:43:28 UTC (rev 25362) +++ csw/mgar/pkg/stunnel/trunk/checksums 2015-11-06 11:47:59 UTC (rev 25363) @@ -1 +1 @@ -326126f56a76eec974d3a31ebedb9623 stunnel-5.25.tar.gz +cd72bf9b7fb3577a0330df315cd88b0a stunnel-5.26.tar.gz Deleted: csw/mgar/pkg/stunnel/trunk/files/0001-Solaris-fixes.patch =================================================================== --- csw/mgar/pkg/stunnel/trunk/files/0001-Solaris-fixes.patch 2015-11-05 08:43:28 UTC (rev 25362) +++ csw/mgar/pkg/stunnel/trunk/files/0001-Solaris-fixes.patch 2015-11-06 11:47:59 UTC (rev 25363) @@ -1,39 +0,0 @@ -From 9778752c2f397490e09259564833b7d22bb6c76c Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 2 Nov 2015 14:40:31 +0100 -Subject: [PATCH] Solaris fixes - ---- - src/client.c | 2 ++ - src/network.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/client.c b/src/client.c -index 76b808d..e957406 100644 ---- a/src/client.c -+++ b/src/client.c -@@ -48,6 +48,8 @@ - #define SHUT_RDWR 2 - #endif - -+extern char **environ; -+ - NOEXPORT void client_try(CLI *); - NOEXPORT void client_run(CLI *); - NOEXPORT void local_start(CLI *); -diff --git a/src/network.c b/src/network.c -index e222268..15be34a 100644 ---- a/src/network.c -+++ b/src/network.c -@@ -40,6 +40,8 @@ - #define FD_SETSIZE 1000000 - #endif - -+#include -+ - #include "common.h" - #include "prototypes.h" - --- -2.4.0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 9 17:59:22 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 9 Nov 2015 16:59:22 +0000 Subject: SF.net SVN: gar:[25364] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: <3nvdpk1CkWzln@mail.opencsw.org> Revision: 25364 http://sourceforge.net/p/gar/code/25364 Author: janholzh Date: 2015-11-09 16:59:22 +0000 (Mon, 09 Nov 2015) Log Message: ----------- zabbix/trunk: more addjustments Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-06 11:47:59 UTC (rev 25363) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-09 16:59:22 UTC (rev 25364) @@ -12,6 +12,9 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz +GARCOMPILER = SOS12U3 + + # PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -19,6 +22,9 @@ REINPLACE_MATCH_etc = /usr/local/etc REINPLACE_WITH_etc = $(sysconfdir) REINPLACE_FILES_etc += conf/zabbix_proxy.conf +REINPLACE_FILES_etc += conf/zabbix_agentd.conf +REINPLACE_FILES_etc += conf/zabbix_agent.conf +REINPLACE_FILES_etc += conf/zabbix_server.conf # This is just for the server which is in 64 bit only on Solars 10 BUILD64-5.9 = @@ -33,13 +39,9 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssh2-1 -#RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp30 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWzabbix-agent_sparc += CSWlibintl8 +#RUNTIME_DEP_PKGS_CSWzabbix-agent_sparc += CSWlibintl8 # Linker anomaly RUNTIME_DEP_PKGS_CSWzabbix-agent += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH)) @@ -47,13 +49,17 @@ # These are just examples #CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8 #CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zabbix_sender.1 -CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agentd.conf.CSW -CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agent.conf.CSW +#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agentd.conf.CSW +#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agent.conf.CSW PACKAGES-5.10 += CSWzabbix-server PACKAGES += $(PACKAGES-$(GAROSREL)) SPKG_DESC_CSWzabbix-server = Zabbix monitoring system server PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server) +PKGFILES_CSWzabbix-server += $(mandir)/man8/zabbix_server\.8 +PKGFILES_CSWzabbix-server += $(sysconfdir)/zabbix_server\.conf\.CSW +PKGFILES_CSWzabbix-server += $(sysconfdir)/zabbix_proxy\.conf\.d +PKGFILES_CSWzabbix-server += /opt/csw/share/zabbix/frontends/php/.* #RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibpq5 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2 @@ -64,6 +70,38 @@ RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiksemel3 +#PHP for frontend +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-session +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-gd +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-sockets +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-bcmath +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-xmlwriter +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-xmlreader +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-gettext +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-mbstring +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-ctype +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-dom +#For database connection + +PACKAGES += CSWzabbix-proxy +SPKG_DESC_CSWzabbix-proxy = Zabbix monitoring system proxy +PKGFILES_CSWzabbix-proxy += $(call baseisadirs,$(sbindir),zabbix_proxy) +PKGFILES_CSWzabbix-proxy += $(mandir)/man8/zabbix_proxy\.8 +PKGFILES_CSWzabbix-proxy += $(sysconfdir)/zabbix_proxy\.conf\.CSW +PKGFILES_CSWzabbix-proxy += $(sysconfdir)/zabbix_proxy\.conf\.d +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibssh2-1 +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibnetsnmp30 +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibldap2-4-2 +#With postgres build +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibpq5 + +# Config files are in 64bit build +MERGE_SCRIPTS_isa-default64 = copy-relocate + # Linker anomaly # RUNTIME_DEP_PKGS_CSWzabbix-server += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH)) @@ -89,8 +127,6 @@ CONFIGURE_ARGS += --with-ssh2=$(prefix) CONFIGURE_ARGS += --with-ldap -# We need the latest Solaris 10 for the mysql bindings -LINKER_MAP_RELEASE = # CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config # CONFIGURE_ARGS += --with-sqlite3 @@ -107,6 +143,15 @@ PRESERVECONF += $(sysconfdir)/zabbix_agent.conf PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf +PRESERVECONF += $(sysconfdir)/zabbix_proxy.conf +PRESERVECONF += $(sysconfdir)/zabbix_server.conf include gar/category.mk +post-install-modulated: + ginstall -d $(DESTDIR)/opt/csw/share/zabbix/frontends + ginstall -d $(DESTDIR)/opt/csw/share/zabbix/database + cp -r $(WORKDIR)/zabbix-$(VERSION)/frontends/php $(DESTDIR)/opt/csw/share/zabbix/frontends + cp -r $(WORKDIR)/zabbix-$(VERSION)/database $(DESTDIR)/opt/csw/share/zabbix/database + rm $(DESTDIR)/opt/csw/share/zabbix/database/Make* + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Nov 9 18:00:38 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 9 Nov 2015 17:00:38 +0000 Subject: SF.net SVN: gar:[25365] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: <3nvdr26ms6zpF@mail.opencsw.org> Revision: 25365 http://sourceforge.net/p/gar/code/25365 Author: janholzh Date: 2015-11-09 17:00:38 +0000 (Mon, 09 Nov 2015) Log Message: ----------- zabbix/trunk: add database dir Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-09 16:59:22 UTC (rev 25364) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-09 17:00:38 UTC (rev 25365) @@ -60,6 +60,7 @@ PKGFILES_CSWzabbix-server += $(sysconfdir)/zabbix_server\.conf\.CSW PKGFILES_CSWzabbix-server += $(sysconfdir)/zabbix_proxy\.conf\.d PKGFILES_CSWzabbix-server += /opt/csw/share/zabbix/frontends/php/.* +PKGFILES_CSWzabbix-server += /opt/csw/share/zabbix/database/.* #RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibpq5 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Nov 10 12:12:39 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 10 Nov 2015 11:12:39 +0000 Subject: SF.net SVN: gar:[25366] csw/mgar/pkg/zabbix/trunk Message-ID: <3nw6450ZJ7z1Lk@mail.opencsw.org> Revision: 25366 http://sourceforge.net/p/gar/code/25366 Author: janholzh Date: 2015-11-10 11:12:39 +0000 (Tue, 10 Nov 2015) Log Message: ----------- zabbix/trunk: more tuning Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-09 17:00:38 UTC (rev 25365) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 11:12:39 UTC (rev 25366) @@ -11,6 +11,7 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz +DISTFILES += cswzabbix-agent.xml GARCOMPILER = SOS12U3 @@ -34,6 +35,8 @@ BUILD_DEP_PKGS += CSWlibiksemel-dev +USERGROUP = /etc/opt/csw/pkg/CSWzabbix-agent/cswusergroup + PACKAGES += CSWzabbix-agent SPKG_DESC_CSWzabbix-agent = Zabbix monitoring system agent # PKGFILES is catchall @@ -46,11 +49,7 @@ # Linker anomaly RUNTIME_DEP_PKGS_CSWzabbix-agent += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH)) -# These are just examples -#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8 -#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zabbix_sender.1 -#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agentd.conf.CSW -#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agent.conf.CSW +CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswzabbix-agent.xml PACKAGES-5.10 += CSWzabbix-server PACKAGES += $(PACKAGES-$(GAROSREL)) @@ -62,6 +61,7 @@ PKGFILES_CSWzabbix-server += /opt/csw/share/zabbix/frontends/php/.* PKGFILES_CSWzabbix-server += /opt/csw/share/zabbix/database/.* #RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWzabbix-agent RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibpq5 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4 @@ -84,12 +84,26 @@ RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-dom #For database connection +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-session +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-gd +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-xmlwriter +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-dom +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-gettext +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-bcmath +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-ctype +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-xmlreader +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWzabbix-agent +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-mbstring +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-sockets + + PACKAGES += CSWzabbix-proxy SPKG_DESC_CSWzabbix-proxy = Zabbix monitoring system proxy PKGFILES_CSWzabbix-proxy += $(call baseisadirs,$(sbindir),zabbix_proxy) PKGFILES_CSWzabbix-proxy += $(mandir)/man8/zabbix_proxy\.8 PKGFILES_CSWzabbix-proxy += $(sysconfdir)/zabbix_proxy\.conf\.CSW PKGFILES_CSWzabbix-proxy += $(sysconfdir)/zabbix_proxy\.conf\.d +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWzabbix-agent RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibintl8 @@ -100,6 +114,8 @@ #With postgres build RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibpq5 +CHECKPKG_OVERRIDES_CSWzabbix-proxy += surplus-dependency|CSWzabbix-agent + # Config files are in 64bit build MERGE_SCRIPTS_isa-default64 = copy-relocate @@ -147,12 +163,18 @@ PRESERVECONF += $(sysconfdir)/zabbix_proxy.conf PRESERVECONF += $(sysconfdir)/zabbix_server.conf +PROTOTYPE_MODIFIERS += smf +PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswzabbix-agent.xml +PROTOTYPE_CLASS_smf = manifest + include gar/category.mk post-install-modulated: ginstall -d $(DESTDIR)/opt/csw/share/zabbix/frontends - ginstall -d $(DESTDIR)/opt/csw/share/zabbix/database + ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWzabbix-agent + ginstall -m 644 $(FILEDIR)/CSWzabbix-agent.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWzabbix-agent/cswusergroup cp -r $(WORKDIR)/zabbix-$(VERSION)/frontends/php $(DESTDIR)/opt/csw/share/zabbix/frontends - cp -r $(WORKDIR)/zabbix-$(VERSION)/database $(DESTDIR)/opt/csw/share/zabbix/database + cp -r $(WORKDIR)/zabbix-$(VERSION)/database $(DESTDIR)/opt/csw/share/zabbix/ rm $(DESTDIR)/opt/csw/share/zabbix/database/Make* + ginstall -D -m 0644 $(WORKDIR)/cswzabbix-agent.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswzabbix-agent.xml @$(MAKECOOKIE) Added: csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup (rev 0) +++ csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup 2015-11-10 11:12:39 UTC (rev 25366) @@ -0,0 +1 @@ +zabbix:zabbix::::: Added: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml =================================================================== (Binary files differ) Index: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml 2015-11-09 17:00:38 UTC (rev 25365) +++ csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml 2015-11-10 11:12:39 UTC (rev 25366) Property changes on: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/xml \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Nov 10 12:29:07 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 10 Nov 2015 11:29:07 +0000 Subject: SF.net SVN: gar:[25367] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: <3nw6R062tjz2V@mail.opencsw.org> Revision: 25367 http://sourceforge.net/p/gar/code/25367 Author: janholzh Date: 2015-11-10 11:29:06 +0000 (Tue, 10 Nov 2015) Log Message: ----------- zabbix/trunk: add linker diffs Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 11:12:39 UTC (rev 25366) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 11:29:06 UTC (rev 25367) @@ -44,11 +44,7 @@ RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2 -#RUNTIME_DEP_PKGS_CSWzabbix-agent_sparc += CSWlibintl8 -# Linker anomaly -RUNTIME_DEP_PKGS_CSWzabbix-agent += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH)) - CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswzabbix-agent.xml PACKAGES-5.10 += CSWzabbix-server @@ -106,11 +102,16 @@ RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWzabbix-agent RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibintl8 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibnetsnmp30 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWzabbix-proxy_sparc += CSWlibintl8 + +# Linker anomaly +RUNTIME_DEP_PKGS_CSWzabbix-proxy += $(RUNTIME_DEP_PKGS_CSWzabbix-proxy_$(GARCH)) + + #With postgres build RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibpq5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Nov 10 14:16:42 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 10 Nov 2015 13:16:42 +0000 Subject: SF.net SVN: gar:[25368] csw/mgar/pkg/zabbix/trunk Message-ID: <3nw8qn1Srhz6c@mail.opencsw.org> Revision: 25368 http://sourceforge.net/p/gar/code/25368 Author: janholzh Date: 2015-11-10 13:16:41 +0000 (Tue, 10 Nov 2015) Log Message: ----------- zabbix/trunk: add config and more smf Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup Added Paths: ----------- csw/mgar/pkg/zabbix/trunk/files/cswzabbix-proxy.xml csw/mgar/pkg/zabbix/trunk/files/cswzabbix-server.xml csw/mgar/pkg/zabbix/trunk/files/zabbix_agentd.conf csw/mgar/pkg/zabbix/trunk/files/zabbix_proxy.conf csw/mgar/pkg/zabbix/trunk/files/zabbix_server.conf Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 11:29:06 UTC (rev 25367) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 13:16:41 UTC (rev 25368) @@ -12,6 +12,11 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz DISTFILES += cswzabbix-agent.xml +DISTFILES += cswzabbix-server.xml +DISTFILES += cswzabbix-proxy.xml +DISTFILES += zabbix_agentd.conf +DISTFILES += zabbix_server.conf +DISTFILES += zabbix_proxy.conf GARCOMPILER = SOS12U3 @@ -22,10 +27,7 @@ REINPLACEMENTS += etc REINPLACE_MATCH_etc = /usr/local/etc REINPLACE_WITH_etc = $(sysconfdir) -REINPLACE_FILES_etc += conf/zabbix_proxy.conf -REINPLACE_FILES_etc += conf/zabbix_agentd.conf REINPLACE_FILES_etc += conf/zabbix_agent.conf -REINPLACE_FILES_etc += conf/zabbix_server.conf # This is just for the server which is in 64 bit only on Solars 10 BUILD64-5.9 = @@ -56,6 +58,7 @@ PKGFILES_CSWzabbix-server += $(sysconfdir)/zabbix_proxy\.conf\.d PKGFILES_CSWzabbix-server += /opt/csw/share/zabbix/frontends/php/.* PKGFILES_CSWzabbix-server += /opt/csw/share/zabbix/database/.* +PKGFILES_CSWzabbix-server += /var/opt/csw/svc/manifest/cswzabbix-server\.xml #RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWzabbix-agent RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibpq5 @@ -91,14 +94,17 @@ CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWzabbix-agent CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-mbstring CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-sockets +CHECKPKG_OVERRIDES_CSWzabbix-server += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswzabbix-server.xml + PACKAGES += CSWzabbix-proxy SPKG_DESC_CSWzabbix-proxy = Zabbix monitoring system proxy PKGFILES_CSWzabbix-proxy += $(call baseisadirs,$(sbindir),zabbix_proxy) PKGFILES_CSWzabbix-proxy += $(mandir)/man8/zabbix_proxy\.8 PKGFILES_CSWzabbix-proxy += $(sysconfdir)/zabbix_proxy\.conf\.CSW PKGFILES_CSWzabbix-proxy += $(sysconfdir)/zabbix_proxy\.conf\.d +PKGFILES_CSWzabbix-proxy += /var/opt/csw/svc/manifest/cswzabbix-proxy.xml RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWzabbix-agent RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibiconv2 @@ -116,7 +122,9 @@ RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibpq5 CHECKPKG_OVERRIDES_CSWzabbix-proxy += surplus-dependency|CSWzabbix-agent +CHECKPKG_OVERRIDES_CSWzabbix-proxy += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswzabbix-proxy.xml + # Config files are in 64bit build MERGE_SCRIPTS_isa-default64 = copy-relocate @@ -166,16 +174,22 @@ PROTOTYPE_MODIFIERS += smf PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswzabbix-agent.xml +PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswzabbix-server.xml +PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswzabbix-proxy.xml PROTOTYPE_CLASS_smf = manifest include gar/category.mk post-install-modulated: ginstall -d $(DESTDIR)/opt/csw/share/zabbix/frontends - ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWzabbix-agent - ginstall -m 644 $(FILEDIR)/CSWzabbix-agent.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWzabbix-agent/cswusergroup cp -r $(WORKDIR)/zabbix-$(VERSION)/frontends/php $(DESTDIR)/opt/csw/share/zabbix/frontends cp -r $(WORKDIR)/zabbix-$(VERSION)/database $(DESTDIR)/opt/csw/share/zabbix/ rm $(DESTDIR)/opt/csw/share/zabbix/database/Make* + ginstall -D -m 0644 $(FILEDIR)/CSWzabbix-agent.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWzabbix-agent/cswusergroup ginstall -D -m 0644 $(WORKDIR)/cswzabbix-agent.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswzabbix-agent.xml + ginstall -D -m 0644 $(WORKDIR)/cswzabbix-server.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswzabbix-server.xml + ginstall -D -m 0644 $(WORKDIR)/cswzabbix-proxy.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswzabbix-proxy.xml + ginstall -D -m 0644 $(WORKDIR)/zabbix_agentd.conf $(DESTDIR)/etc/opt/csw/zabbix_agentd.conf + ginstall -D -m 0644 $(WORKDIR)/zabbix_server.conf $(DESTDIR)/etc/opt/csw/zabbix_server.conf + ginstall -D -m 0644 $(WORKDIR)/zabbix_proxy.conf $(DESTDIR)/etc/opt/csw/zabbix_proxy.conf @$(MAKECOOKIE) Modified: csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup 2015-11-10 11:29:06 UTC (rev 25367) +++ csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup 2015-11-10 13:16:41 UTC (rev 25368) @@ -1 +1 @@ -zabbix:zabbix::::: +zabbix:zabbix:CSW zabbix User:/:/bin/false:::NP Added: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-proxy.xml =================================================================== (Binary files differ) Index: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-proxy.xml =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/cswzabbix-proxy.xml 2015-11-10 11:29:06 UTC (rev 25367) +++ csw/mgar/pkg/zabbix/trunk/files/cswzabbix-proxy.xml 2015-11-10 13:16:41 UTC (rev 25368) Property changes on: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-proxy.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/xml \ No newline at end of property Added: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-server.xml =================================================================== (Binary files differ) Index: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-server.xml =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/cswzabbix-server.xml 2015-11-10 11:29:06 UTC (rev 25367) +++ csw/mgar/pkg/zabbix/trunk/files/cswzabbix-server.xml 2015-11-10 13:16:41 UTC (rev 25368) Property changes on: csw/mgar/pkg/zabbix/trunk/files/cswzabbix-server.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/xml \ No newline at end of property Added: csw/mgar/pkg/zabbix/trunk/files/zabbix_agentd.conf =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/zabbix_agentd.conf (rev 0) +++ csw/mgar/pkg/zabbix/trunk/files/zabbix_agentd.conf 2015-11-10 13:16:41 UTC (rev 25368) @@ -0,0 +1,294 @@ +# This is a config file for the Zabbix agent daemon (Unix) +# To get more information about Zabbix, visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +PidFile=/var/run/zabbix_agentd.pid + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/var/adm/zabbix_agentd.log + +### Option: LogFileSize +# Maximum size of log file in MB. +# 0 - disable automatic log rotation. +# +# Mandatory: no +# Range: 0-1024 +# Default: +# LogFileSize=1 + +### Option: DebugLevel +# Specifies debug level +# 0 - basic information about starting and stopping of Zabbix processes +# 1 - critical information +# 2 - error information +# 3 - warnings +# 4 - for debugging (produces lots of information) +# +# Mandatory: no +# Range: 0-4 +# Default: +# DebugLevel=3 + +### Option: SourceIP +# Source IP address for outgoing connections. +# +# Mandatory: no +# Default: +# SourceIP= + +### Option: EnableRemoteCommands +# Whether remote commands from Zabbix server are allowed. +# 0 - not allowed +# 1 - allowed +# +# Mandatory: no +# Default: +# EnableRemoteCommands=0 + +### Option: LogRemoteCommands +# Enable logging of executed shell commands as warnings. +# 0 - disabled +# 1 - enabled +# +# Mandatory: no +# Default: +# LogRemoteCommands=0 + +##### Passive checks related + +### Option: Server +# List of comma delimited IP addresses (or hostnames) of Zabbix servers. +# Incoming connections will be accepted only from the hosts listed here. +# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. +# +# Mandatory: no +# Default: +# Server= + +Server=127.0.0.1 + +### Option: ListenPort +# Agent will listen on this port for connections from the server. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ListenPort=10050 + +### Option: ListenIP +# List of comma delimited IP addresses that the agent should listen on. +# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +### Option: StartAgents +# Number of pre-forked instances of zabbix_agentd that process passive checks. +# If set to 0, disables passive checks and the agent will not listen on any TCP port. +# +# Mandatory: no +# Range: 0-100 +# Default: +# StartAgents=3 + +##### Active checks related + +### Option: ServerActive +# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. +# If port is not specified, default port is used. +# IPv6 addresses must be enclosed in square brackets if port for that host is specified. +# If port is not specified, square brackets for IPv6 addresses are optional. +# If this parameter is not specified, active checks are disabled. +# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] +# +# Mandatory: no +# Default: +# ServerActive= + +ServerActive=127.0.0.1 + +### Option: Hostname +# Unique, case sensitive hostname. +# Required for active checks and must match hostname as configured on the server. +# Value is acquired from HostnameItem if undefined. +# +# Mandatory: no +# Default: +# Hostname= + +Hostname= + +### Option: HostnameItem +# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. +# Does not support UserParameters or aliases. +# +# Mandatory: no +# Default: +# HostnameItem=system.hostname + +### Option: HostMetadata +# Optional parameter that defines host metadata. +# Host metadata is used at host auto-registration process. +# An agent will issue an error and not start if the value is over limit of 255 characters. +# If not defined, value will be acquired from HostMetadataItem. +# +# Mandatory: no +# Range: 0-255 characters +# Default: +# HostMetadata= + +### Option: HostMetadataItem +# Optional parameter that defines an item used for getting host metadata. +# Host metadata is used at host auto-registration process. +# During an auto-registration request an agent will log a warning message if +# the value returned by specified item is over limit of 255 characters. +# This option is only used when HostMetadata is not defined. +# +# Mandatory: no +# Default: +# HostMetadataItem= + +### Option: RefreshActiveChecks +# How often list of active checks is refreshed, in seconds. +# +# Mandatory: no +# Range: 60-3600 +# Default: +# RefreshActiveChecks=120 + +### Option: BufferSend +# Do not keep data longer than N seconds in buffer. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# BufferSend=5 + +### Option: BufferSize +# Maximum number of values in a memory buffer. The agent will send +# all collected data to Zabbix Server or Proxy if the buffer is full. +# +# Mandatory: no +# Range: 2-65535 +# Default: +# BufferSize=100 + +### Option: MaxLinesPerSecond +# Maximum number of new lines the agent will send per second to Zabbix Server +# or Proxy processing 'log' and 'logrt' active checks. +# The provided value will be overridden by the parameter 'maxlines', +# provided in 'log' or 'logrt' item keys. +# +# Mandatory: no +# Range: 1-1000 +# Default: +# MaxLinesPerSecond=100 + +############ ADVANCED PARAMETERS ################# + +### Option: Alias +# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one. +# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed. +# Different Alias keys may reference the same item key. +# For example, to retrieve the ID of user 'zabbix': +# Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1] +# Now shorthand key zabbix.userid may be used to retrieve data. +# Aliases can be used in HostMetadataItem but not in HostnameItem parameters. +# +# Mandatory: no +# Range: +# Default: + +### Option: Timeout +# Spend no more than Timeout seconds on processing +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: AllowRoot +# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent +# will try to switch to the user specified by the User configuration option instead. +# Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: User +# Drop privileges to a specific, existing user on the system. +# Only has effect if run as 'root' and AllowRoot is disabled. +# +# Mandatory: no +# Default: +# User=zabbix + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /etc/opt/csw, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/etc/opt/csw/zabbix_agentd.userparams.conf +# Include=/etc/opt/csw/zabbix_agentd.conf.d/ +# Include=/etc/opt/csw/zabbix_agentd.conf.d/*.conf + +####### USER-DEFINED MONITORED PARAMETERS ####### + +### Option: UnsafeUserParameters +# Allow all characters to be passed in arguments to user-defined parameters. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Range: 0-1 +# Default: +# UnsafeUserParameters=0 + +### Option: UserParameter +# User-defined parameter to monitor. There can be several user-defined parameters. +# Format: UserParameter=, +# See 'zabbix_agentd' directory for examples. +# +# Mandatory: no +# Default: +# UserParameter= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of agent modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at agent startup. Modules are used to extend functionality of the agent. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= Added: csw/mgar/pkg/zabbix/trunk/files/zabbix_proxy.conf =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/zabbix_proxy.conf (rev 0) +++ csw/mgar/pkg/zabbix/trunk/files/zabbix_proxy.conf 2015-11-10 13:16:41 UTC (rev 25368) @@ -0,0 +1,575 @@ +# This is a configuration file for Zabbix Proxy process +# To get more information about Zabbix, +# visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: ProxyMode +# Proxy operating mode +# 0 - proxy in the active mode +# 1 - proxy in the passive mode +# +# Mandatory: no +# Default: +# ProxyMode=0 + +### Option: Server +# IP address (or hostname) of Zabbix server. +# Active proxy will get configuration data from the server. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: yes (if ProxyMode is set to 0) +# Default: +# Server= + +Server=127.0.0.1 + +### Option: ServerPort +# Port of Zabbix trapper on Zabbix server. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ServerPort=10051 + +### Option: Hostname +# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! +# Value is acquired from HostnameItem if undefined. +# +# Mandatory: no +# Default: +# Hostname= + +Hostname= + +### Option: HostnameItem +# Item used for generating Hostname if it is undefined. +# Ignored if Hostname is defined. +# +# Mandatory: no +# Default: +# HostnameItem=system.hostname + +### Option: ListenPort +# Listen port for trapper. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ListenPort=10051 + +### Option: SourceIP +# Source IP address for outgoing connections. +# +# Mandatory: no +# Default: +# SourceIP= + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/var/adm/zabbix_proxy.log + +### Option: LogFileSize +# Maximum size of log file in MB. +# 0 - disable automatic log rotation. +# +# Mandatory: no +# Range: 0-1024 +# Default: +# LogFileSize=1 + +### Option: DebugLevel +# Specifies debug level +# 0 - basic information about starting and stopping of Zabbix processes +# 1 - critical information +# 2 - error information +# 3 - warnings +# 4 - for debugging (produces lots of information) +# +# Mandatory: no +# Range: 0-4 +# Default: +# DebugLevel=3 + +### Option: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +PidFile=/var/run/zabbix_proxy.pid + +### Option: DBHost +# Database host name. +# If set to localhost, socket is used for MySQL. +# If set to empty string, socket is used for PostgreSQL. +# +# Mandatory: no +# Default: +# DBHost=localhost + +### Option: DBName +# Database name. +# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. +# Warning: do not attempt to use the same database Zabbix server is using. +# +# Mandatory: yes +# Default: +# DBName= + +DBName=zabbix_proxy + +### Option: DBSchema +# Schema name. Used for IBM DB2 and PostgreSQL. +# +# Mandatory: no +# Default: +# DBSchema= + +### Option: DBUser +# Database user. Ignored for SQLite. +# +# Default: +# DBUser= + +DBUser=root + +### Option: DBPassword +# Database password. Ignored for SQLite. +# Comment this line if no password is used. +# +# Mandatory: no +# Default: +# DBPassword= + +### Option: DBSocket +# Path to MySQL socket. +# +# Mandatory: no +# Default: +# DBSocket=/tmp/mysql.sock + +# Option: DBPort +# Database port when not using local socket. Ignored for SQLite. +# +# Mandatory: no +# Default (for MySQL): +# DBPort=3306 + +######### PROXY SPECIFIC PARAMETERS ############# + +### Option: ProxyLocalBuffer +# Proxy will keep data locally for N hours, even if the data have already been synced with the server. +# This parameter may be used if local data will be used by third party applications. +# +# Mandatory: no +# Range: 0-720 +# Default: +# ProxyLocalBuffer=0 + +### Option: ProxyOfflineBuffer +# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. +# Older data will be lost. +# +# Mandatory: no +# Range: 1-720 +# Default: +# ProxyOfflineBuffer=1 + +### Option: HeartbeatFrequency +# Frequency of heartbeat messages in seconds. +# Used for monitoring availability of Proxy on server side. +# 0 - heartbeat messages disabled. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 0-3600 +# Default: +# HeartbeatFrequency=60 + +### Option: ConfigFrequency +# How often proxy retrieves configuration data from Zabbix Server in seconds. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1-3600*24*7 +# Default: +# ConfigFrequency=3600 + +### Option: DataSenderFrequency +# Proxy will send collected data to the Server every N seconds. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# DataSenderFrequency=1 + +############ ADVANCED PARAMETERS ################ + +### Option: StartPollers +# Number of pre-forked instances of pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollers=5 + +### Option: StartIPMIPollers +# Number of pre-forked instances of IPMI pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartIPMIPollers=0 + +### Option: StartPollersUnreachable +# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). +# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers +# are started. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollersUnreachable=1 + +### Option: StartTrappers +# Number of pre-forked instances of trappers. +# Trappers accept incoming connections from Zabbix sender and active agents. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartTrappers=5 + +### Option: StartPingers +# Number of pre-forked instances of ICMP pingers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPingers=1 + +### Option: StartDiscoverers +# Number of pre-forked instances of discoverers. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartDiscoverers=1 + +### Option: StartHTTPPollers +# Number of pre-forked instances of HTTP pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartHTTPPollers=1 + +### Option: JavaGateway +# IP address (or hostname) of Zabbix Java gateway. +# Only required if Java pollers are started. +# +# Mandatory: no +# Default: +# JavaGateway= + +### Option: JavaGatewayPort +# Port that Zabbix Java gateway listens on. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# JavaGatewayPort=10052 + +### Option: StartJavaPollers +# Number of pre-forked instances of Java pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartJavaPollers=0 + +### Option: StartVMwareCollectors +# Number of pre-forked vmware collector instances. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartVMwareCollectors=0 + +### Option: VMwareFrequency +# How often Zabbix will connect to VMware service to obtain a new data. +# +# Mandatory: no +# Range: 10-86400 +# Default: +# VMwareFrequency=60 + +### Option: VMwarePerfFrequency +# How often Zabbix will connect to VMware service to obtain performance data. +# +# Mandatory: no +# Range: 10-86400 +# Default: +# VMwarePerfFrequency=60 + +### Option: VMwareCacheSize +# Size of VMware cache, in bytes. +# Shared memory size for storing VMware data. +# Only used if VMware collectors are started. +# +# Mandatory: no +# Range: 256K-2G +# Default: +# VMwareCacheSize=8M + +### Option: VMwareTimeout +# Specifies how many seconds vmware collector waits for response from VMware service. +# +# Mandatory: no +# Range: 1-300 +# Default: +# VMwareTimeout=10 + +### Option: SNMPTrapperFile +# Temporary file used for passing data from SNMP trap daemon to the proxy. +# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. +# +# Mandatory: no +# Default: +# SNMPTrapperFile=/tmp/zabbix_traps.tmp + +### Option: StartSNMPTrapper +# If 1, SNMP trapper process is started. +# +# Mandatory: no +# Range: 0-1 +# Default: +# StartSNMPTrapper=0 + +### Option: ListenIP +# List of comma delimited IP addresses that the trapper should listen on. +# Trapper will listen on all network interfaces if this parameter is missing. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +### Option: HousekeepingFrequency +# How often Zabbix will perform housekeeping procedure (in hours). +# Housekeeping is removing outdated information from the database. +# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency +# hours of outdated information are deleted in one housekeeping cycle. +# To lower load on proxy startup housekeeping is postponed for 30 minutes after proxy start. +# +# Mandatory: no +# Range: 1-24 +# Default: +# HousekeepingFrequency=1 + +### Option: CacheSize +# Size of configuration cache, in bytes. +# Shared memory size, for storing hosts and items data. +# +# Mandatory: no +# Range: 128K-8G +# Default: +# CacheSize=8M + +### Option: StartDBSyncers +# Number of pre-forked instances of DB Syncers +# +# Mandatory: no +# Range: 1-100 +# Default: +# StartDBSyncers=4 + +### Option: HistoryCacheSize +# Size of history cache, in bytes. +# Shared memory size for storing history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryCacheSize=8M + +### Option: HistoryTextCacheSize +# Size of text history cache, in bytes. +# Shared memory size for storing character, text or log history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryTextCacheSize=16M + +### Option: Timeout +# Specifies how long we wait for agent, SNMP device or external check (in seconds). +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: TrapperTimeout +# Specifies how many seconds trapper may spend processing new data. +# +# Mandatory: no +# Range: 1-300 +# Default: +# TrapperTimeout=300 + +### Option: UnreachablePeriod +# After how many seconds of unreachability treat a host as unavailable. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachablePeriod=45 + +### Option: UnavailableDelay +# How often host is checked for availability during the unavailability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnavailableDelay=60 + +### Option: UnreachableDelay +# How often host is checked for availability during the unreachability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachableDelay=15 + +### Option: ExternalScripts +# Full path to location of external scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# ExternalScripts=${datadir}/zabbix/externalscripts + +### Option: FpingLocation +# Location of fping. +# Make sure that fping binary has root ownership and SUID flag set. +# +# Mandatory: no +# Default: +# FpingLocation=/usr/sbin/fping + +### Option: Fping6Location +# Location of fping6. +# Make sure that fping6 binary has root ownership and SUID flag set. +# Make empty if your fping utility is capable to process IPv6 addresses. +# +# Mandatory: no +# Default: +# Fping6Location=/usr/sbin/fping6 + +### Option: SSHKeyLocation +# Location of public and private keys for SSH checks and actions. +# +# Mandatory: no +# Default: +# SSHKeyLocation= + +### Option: LogSlowQueries +# How long a database query may take before being logged (in milliseconds). +# Only works if DebugLevel set to 3 or 4. +# 0 - don't log slow queries. +# +# Mandatory: no +# Range: 1-3600000 +# Default: +# LogSlowQueries=0 + +### Option: TmpDir +# Temporary directory. +# +# Mandatory: no +# Default: +# TmpDir=/tmp + +### Option: AllowRoot +# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy +# will try to switch to the user specified by the User configuration option instead. +# Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: User +# Drop privileges to a specific, existing user on the system. +# Only has effect if run as 'root' and AllowRoot is disabled. +# +# Mandatory: no +# Default: +# User=zabbix + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /etc/opt/csw, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/etc/opt/csw/zabbix_proxy.general.conf +# Include=/etc/opt/csw/zabbix_proxy.conf.d/ +# Include=/etc/opt/csw/zabbix_proxy.conf.d/*.conf + +### Option: SSLCertLocation +# Location of SSL client certificates. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLCertLocation=${datadir}/zabbix/ssl/certs + +### Option: SSLKeyLocation +# Location of private keys for SSL client certificates. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLKeyLocation=${datadir}/zabbix/ssl/keys + +### Option: SSLCALocation +# Location of certificate authority (CA) files for SSL server certificate verification. +# If not set, system-wide directory will be used. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLCALocation= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of proxy modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at proxy startup. Modules are used to extend functionality of the proxy. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= Added: csw/mgar/pkg/zabbix/trunk/files/zabbix_server.conf =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/zabbix_server.conf (rev 0) +++ csw/mgar/pkg/zabbix/trunk/files/zabbix_server.conf 2015-11-10 13:16:41 UTC (rev 25368) @@ -0,0 +1,576 @@ +# This is a configuration file for Zabbix Server process +# To get more information about Zabbix, +# visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: ListenPort +# Listen port for trapper. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ListenPort=10051 + +### Option: SourceIP +# Source IP address for outgoing connections. +# +# Mandatory: no +# Default: +# SourceIP= + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/var/adm/zabbix_server.log + +### Option: LogFileSize +# Maximum size of log file in MB. +# 0 - disable automatic log rotation. +# +# Mandatory: no +# Range: 0-1024 +# Default: +# LogFileSize=1 + +### Option: DebugLevel +# Specifies debug level +# 0 - basic information about starting and stopping of Zabbix processes +# 1 - critical information +# 2 - error information +# 3 - warnings +# 4 - for debugging (produces lots of information) +# +# Mandatory: no +# Range: 0-4 +# Default: +# DebugLevel=3 + +### Option: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +PidFile=/var/run/zabbix_server.pid + +### Option: DBHost +# Database host name. +# If set to localhost, socket is used for MySQL. +# If set to empty string, socket is used for PostgreSQL. +# +# Mandatory: no +# Default: +# DBHost=localhost + +### Option: DBName +# Database name. +# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. +# +# Mandatory: yes +# Default: +# DBName= + +DBName=zabbix + +### Option: DBSchema +# Schema name. Used for IBM DB2 and PostgreSQL. +# +# Mandatory: no +# Default: +# DBSchema= + +### Option: DBUser +# Database user. Ignored for SQLite. +# +# Mandatory: no +# Default: +# DBUser= + +DBUser=root + +### Option: DBPassword +# Database password. Ignored for SQLite. +# Comment this line if no password is used. +# +# Mandatory: no +# Default: +# DBPassword= + +### Option: DBSocket +# Path to MySQL socket. +# +# Mandatory: no +# Default: +# DBSocket=/tmp/mysql.sock + +### Option: DBPort +# Database port when not using local socket. Ignored for SQLite. +# +# Mandatory: no +# Range: 1024-65535 +# Default (for MySQL): +# DBPort=3306 + +############ ADVANCED PARAMETERS ################ + +### Option: StartPollers +# Number of pre-forked instances of pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollers=5 + +### Option: StartIPMIPollers +# Number of pre-forked instances of IPMI pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartIPMIPollers=0 + +### Option: StartPollersUnreachable +# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). +# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers +# are started. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollersUnreachable=1 + +### Option: StartTrappers +# Number of pre-forked instances of trappers. +# Trappers accept incoming connections from Zabbix sender, active agents and active proxies. +# At least one trapper process must be running to display server availability and view queue +# in the frontend. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartTrappers=5 + +### Option: StartPingers +# Number of pre-forked instances of ICMP pingers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPingers=1 + +### Option: StartDiscoverers +# Number of pre-forked instances of discoverers. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartDiscoverers=1 + +### Option: StartHTTPPollers +# Number of pre-forked instances of HTTP pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartHTTPPollers=1 + +### Option: StartTimers +# Number of pre-forked instances of timers. +# Timers process time-based trigger functions and maintenance periods. +# Only the first timer process handles the maintenance periods. +# +# Mandatory: no +# Range: 1-1000 +# Default: +# StartTimers=1 + +### Option: JavaGateway +# IP address (or hostname) of Zabbix Java gateway. +# Only required if Java pollers are started. +# +# Mandatory: no +# Default: +# JavaGateway= + +### Option: JavaGatewayPort +# Port that Zabbix Java gateway listens on. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# JavaGatewayPort=10052 + +### Option: StartJavaPollers +# Number of pre-forked instances of Java pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartJavaPollers=0 + +### Option: StartVMwareCollectors +# Number of pre-forked vmware collector instances. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartVMwareCollectors=0 + +### Option: VMwareFrequency +# How often Zabbix will connect to VMware service to obtain a new data. +# +# Mandatory: no +# Range: 10-86400 +# Default: +# VMwareFrequency=60 + +### Option: VMwarePerfFrequency +# How often Zabbix will connect to VMware service to obtain performance data. +# +# Mandatory: no +# Range: 10-86400 +# Default: +# VMwarePerfFrequency=60 + +### Option: VMwareCacheSize +# Size of VMware cache, in bytes. +# Shared memory size for storing VMware data. +# Only used if VMware collectors are started. +# +# Mandatory: no +# Range: 256K-2G +# Default: +# VMwareCacheSize=8M + +### Option: VMwareTimeout +# Specifies how many seconds vmware collector waits for response from VMware service. +# +# Mandatory: no +# Range: 1-300 +# Default: +# VMwareTimeout=10 + +### Option: SNMPTrapperFile +# Temporary file used for passing data from SNMP trap daemon to the server. +# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. +# +# Mandatory: no +# Default: +# SNMPTrapperFile=/tmp/zabbix_traps.tmp + +### Option: StartSNMPTrapper +# If 1, SNMP trapper process is started. +# +# Mandatory: no +# Range: 0-1 +# Default: +# StartSNMPTrapper=0 + +### Option: ListenIP +# List of comma delimited IP addresses that the trapper should listen on. +# Trapper will listen on all network interfaces if this parameter is missing. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +# ListenIP=127.0.0.1 + +### Option: HousekeepingFrequency +# How often Zabbix will perform housekeeping procedure (in hours). +# Housekeeping is removing outdated information from the database. +# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency +# hours of outdated information are deleted in one housekeeping cycle, for each item. +# To lower load on server startup housekeeping is postponed for 30 minutes after server start. +# +# Mandatory: no +# Range: 1-24 +# Default: +# HousekeepingFrequency=1 + +### Option: MaxHousekeeperDelete +# The table "housekeeper" contains "tasks" for housekeeping procedure in the format: +# [housekeeperid], [tablename], [field], [value]. +# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) +# will be deleted per one task in one housekeeping cycle. +# SQLite3 does not use this parameter, deletes all corresponding rows without a limit. +# If set to 0 then no limit is used at all. In this case you must know what you are doing! +# +# Mandatory: no +# Range: 0-1000000 +# Default: +# MaxHousekeeperDelete=500 + +### Option: SenderFrequency +# How often Zabbix will try to send unsent alerts (in seconds). +# +# Mandatory: no +# Range: 5-3600 +# Default: +# SenderFrequency=30 + +### Option: CacheSize +# Size of configuration cache, in bytes. +# Shared memory size for storing host, item and trigger data. +# +# Mandatory: no +# Range: 128K-8G +# Default: +# CacheSize=8M + +### Option: CacheUpdateFrequency +# How often Zabbix will perform update of configuration cache, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# CacheUpdateFrequency=60 + +### Option: StartDBSyncers +# Number of pre-forked instances of DB Syncers +# +# Mandatory: no +# Range: 1-100 +# Default: +# StartDBSyncers=4 + +### Option: HistoryCacheSize +# Size of history cache, in bytes. +# Shared memory size for storing history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryCacheSize=8M + +### Option: TrendCacheSize +# Size of trend cache, in bytes. +# Shared memory size for storing trends data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# TrendCacheSize=4M + +### Option: HistoryTextCacheSize +# Size of text history cache, in bytes. +# Shared memory size for storing character, text or log history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryTextCacheSize=16M + +### Option: ValueCacheSize +# Size of history value cache, in bytes. +# Shared memory size for caching item history data requests. +# Setting to 0 disables value cache. +# +# Mandatory: no +# Range: 0,128K-64G +# Default: +# ValueCacheSize=8M + +### Option: Timeout +# Specifies how long we wait for agent, SNMP device or external check (in seconds). +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: TrapperTimeout +# Specifies how many seconds trapper may spend processing new data. +# +# Mandatory: no +# Range: 1-300 +# Default: +# TrapperTimeout=300 + +### Option: UnreachablePeriod +# After how many seconds of unreachability treat a host as unavailable. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachablePeriod=45 + +### Option: UnavailableDelay +# How often host is checked for availability during the unavailability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnavailableDelay=60 + +### Option: UnreachableDelay +# How often host is checked for availability during the unreachability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachableDelay=15 + +### Option: AlertScriptsPath +# Full path to location of custom alert scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# AlertScriptsPath=${datadir}/zabbix/alertscripts + +### Option: ExternalScripts +# Full path to location of external scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# ExternalScripts=${datadir}/zabbix/externalscripts + +### Option: FpingLocation +# Location of fping. +# Make sure that fping binary has root ownership and SUID flag set. +# +# Mandatory: no +# Default: +# FpingLocation=/usr/sbin/fping + +### Option: Fping6Location +# Location of fping6. +# Make sure that fping6 binary has root ownership and SUID flag set. +# Make empty if your fping utility is capable to process IPv6 addresses. +# +# Mandatory: no +# Default: +# Fping6Location=/usr/sbin/fping6 + +### Option: SSHKeyLocation +# Location of public and private keys for SSH checks and actions. +# +# Mandatory: no +# Default: +# SSHKeyLocation= + +### Option: LogSlowQueries +# How long a database query may take before being logged (in milliseconds). +# Only works if DebugLevel set to 3 or 4. +# 0 - don't log slow queries. +# +# Mandatory: no +# Range: 1-3600000 +# Default: +# LogSlowQueries=0 + +### Option: TmpDir +# Temporary directory. +# +# Mandatory: no +# Default: +# TmpDir=/tmp + +### Option: StartProxyPollers +# Number of pre-forked instances of pollers for passive proxies. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartProxyPollers=1 + +### Option: ProxyConfigFrequency +# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds. +# This parameter is used only for proxies in the passive mode. +# +# Mandatory: no +# Range: 1-3600*24*7 +# Default: +# ProxyConfigFrequency=3600 + +### Option: ProxyDataFrequency +# How often Zabbix Server requests history data from a Zabbix Proxy in seconds. +# This parameter is used only for proxies in the passive mode. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# ProxyDataFrequency=1 + +### Option: AllowRoot +# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server +# will try to switch to the user specified by the User configuration option instead. +# Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: User +# Drop privileges to a specific, existing user on the system. +# Only has effect if run as 'root' and AllowRoot is disabled. +# +# Mandatory: no +# Default: +# User=zabbix + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /etc/opt/csw, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/etc/opt/csw/zabbix_server.general.conf +# Include=/etc/opt/csw/zabbix_server.conf.d/ +# Include=/etc/opt/csw/zabbix_server.conf.d/*.conf + +### Option: SSLCertLocation +# Location of SSL client certificates. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLCertLocation=${datadir}/zabbix/ssl/certs + +### Option: SSLKeyLocation +# Location of private keys for SSL client certificates. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLKeyLocation=${datadir}/zabbix/ssl/keys + +### Option: SSLCALocation +# Override the location of certificate authority (CA) files for SSL server certificate verification. +# If not set, system-wide directory will be used. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLCALocation= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of server modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at server startup. Modules are used to extend functionality of the server. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Nov 10 16:22:31 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 10 Nov 2015 15:22:31 +0000 Subject: SF.net SVN: gar:[25369] csw/mgar/pkg/zabbix/trunk Message-ID: <3nwCcL5HBXzCb@mail.opencsw.org> Revision: 25369 http://sourceforge.net/p/gar/code/25369 Author: janholzh Date: 2015-11-10 15:22:31 +0000 (Tue, 10 Nov 2015) Log Message: ----------- zabbix/trunk: fix config files Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/files/zabbix_agentd.conf csw/mgar/pkg/zabbix/trunk/files/zabbix_proxy.conf csw/mgar/pkg/zabbix/trunk/files/zabbix_server.conf Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 13:16:41 UTC (rev 25368) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 15:22:31 UTC (rev 25369) @@ -81,6 +81,8 @@ RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-mbstring RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-ctype RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-dom +#Postgres package +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-pgsql #For database connection CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-session Modified: csw/mgar/pkg/zabbix/trunk/files/zabbix_agentd.conf =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/zabbix_agentd.conf 2015-11-10 13:16:41 UTC (rev 25368) +++ csw/mgar/pkg/zabbix/trunk/files/zabbix_agentd.conf 2015-11-10 15:22:31 UTC (rev 25369) @@ -8,7 +8,7 @@ # # Mandatory: no # Default: -PidFile=/var/run/zabbix_agentd.pid +PidFile=/var/tmp/zabbix_agentd.pid ### Option: LogFile # Name of log file. @@ -18,7 +18,7 @@ # Default: # LogFile= -LogFile=/var/adm/zabbix_agentd.log +LogFile=/var/tmp/zabbix_agentd.log ### Option: LogFileSize # Maximum size of log file in MB. Modified: csw/mgar/pkg/zabbix/trunk/files/zabbix_proxy.conf =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/zabbix_proxy.conf 2015-11-10 13:16:41 UTC (rev 25368) +++ csw/mgar/pkg/zabbix/trunk/files/zabbix_proxy.conf 2015-11-10 15:22:31 UTC (rev 25369) @@ -74,7 +74,7 @@ # Default: # LogFile= -LogFile=/var/adm/zabbix_proxy.log +LogFile=/var/tmp/zabbix_proxy.log ### Option: LogFileSize # Maximum size of log file in MB. @@ -103,7 +103,7 @@ # # Mandatory: no # Default: -PidFile=/var/run/zabbix_proxy.pid +PidFile=/var/tmp/zabbix_proxy.pid ### Option: DBHost # Database host name. Modified: csw/mgar/pkg/zabbix/trunk/files/zabbix_server.conf =================================================================== --- csw/mgar/pkg/zabbix/trunk/files/zabbix_server.conf 2015-11-10 13:16:41 UTC (rev 25368) +++ csw/mgar/pkg/zabbix/trunk/files/zabbix_server.conf 2015-11-10 15:22:31 UTC (rev 25369) @@ -27,7 +27,7 @@ # Default: # LogFile= -LogFile=/var/adm/zabbix_server.log +LogFile=/var/tmp/zabbix_server.log ### Option: LogFileSize # Maximum size of log file in MB. @@ -56,7 +56,7 @@ # # Mandatory: no # Default: -PidFile=/var/run/zabbix_server.pid +PidFile=/var/tmp/zabbix_server.pid ### Option: DBHost # Database host name. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Nov 10 16:50:12 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 10 Nov 2015 15:50:12 +0000 Subject: SF.net SVN: gar:[25370] csw/mgar/pkg/gnupg2/trunk Message-ID: <3nwDDH0QzdzGf@mail.opencsw.org> Revision: 25370 http://sourceforge.net/p/gar/code/25370 Author: lblume Date: 2015-11-10 15:50:11 +0000 (Tue, 10 Nov 2015) Log Message: ----------- gnupg2/trunk: Bump to 2.0.29 Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile csw/mgar/pkg/gnupg2/trunk/checksums Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2015-11-10 15:22:31 UTC (rev 25369) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2015-11-10 15:50:11 UTC (rev 25370) @@ -3,7 +3,7 @@ # $Id$ NAME = gnupg -VERSION = 2.0.28 +VERSION = 2.0.29 GARTYPE = v2 DESCRIPTION = GnuPG is a complete and free replacement for PGP Modified: csw/mgar/pkg/gnupg2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg2/trunk/checksums 2015-11-10 15:22:31 UTC (rev 25369) +++ csw/mgar/pkg/gnupg2/trunk/checksums 2015-11-10 15:50:11 UTC (rev 25370) @@ -1 +1 @@ -d5cbb97673b99ca234507b74bfe8a29e gnupg-2.0.28.tar.bz2 +c98f0170ae81560f7e11ae1e2e439b41 gnupg-2.0.29.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Nov 10 16:55:31 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 10 Nov 2015 15:55:31 +0000 Subject: SF.net SVN: gar:[25371] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: <3nwDLN4NWZzK3@mail.opencsw.org> Revision: 25371 http://sourceforge.net/p/gar/code/25371 Author: janholzh Date: 2015-11-10 15:55:30 +0000 (Tue, 10 Nov 2015) Log Message: ----------- zabbix/trunk: add override Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 15:50:11 UTC (rev 25370) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 15:55:30 UTC (rev 25371) @@ -96,6 +96,7 @@ CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWzabbix-agent CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-mbstring CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-sockets +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-pgsql CHECKPKG_OVERRIDES_CSWzabbix-server += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswzabbix-server.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Nov 10 17:41:49 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 10 Nov 2015 16:41:49 +0000 Subject: SF.net SVN: gar:[25372] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: <3nwFMr07VCzNG@mail.opencsw.org> Revision: 25372 http://sourceforge.net/p/gar/code/25372 Author: janholzh Date: 2015-11-10 16:41:49 +0000 (Tue, 10 Nov 2015) Log Message: ----------- zabbix/trunk: add netsmnp dep to get mibs Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 15:55:30 UTC (rev 25371) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-10 16:41:49 UTC (rev 25372) @@ -83,8 +83,11 @@ RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-dom #Postgres package RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-pgsql -#For database connection +#For mibs +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWnetsnmp + +CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWnetsnmp CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-session CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-gd CHECKPKG_OVERRIDES_CSWzabbix-server += surplus-dependency|CSWphp5-xmlwriter This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From tosmi at users.sourceforge.net Wed Nov 11 13:08:00 2015 From: tosmi at users.sourceforge.net (tosmi at users.sourceforge.net) Date: Wed, 11 Nov 2015 12:08:00 +0000 Subject: SF.net SVN: gar:[25373] csw/mgar/pkg/puppet3/trunk Message-ID: <3nwlFX5rz7zf2@mail.opencsw.org> Revision: 25373 http://sourceforge.net/p/gar/code/25373 Author: tosmi Date: 2015-11-11 12:08:00 +0000 (Wed, 11 Nov 2015) Log Message: ----------- puppet3/trunk: bump puppet3 version to 3.8.4 Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile csw/mgar/pkg/puppet3/trunk/checksums Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2015-11-10 16:41:49 UTC (rev 25372) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2015-11-11 12:08:00 UTC (rev 25373) @@ -3,7 +3,7 @@ # $Id$ NAME = puppet3 -VERSION = 3.7.4 +VERSION = 3.8.4 GARTYPE = v2 define BLURB @@ -17,7 +17,7 @@ endef DISTNAME = puppet-${VERSION} -MASTER_SITES = http://puppetlabs.com/downloads/puppet/ +MASTER_SITES = https://downloads.puppetlabs.com/puppet/ DISTFILES = ${DISTNAME}.tar.gz DISTFILES += cswpuppetd DISTFILES += cswpuppetmasterd Modified: csw/mgar/pkg/puppet3/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet3/trunk/checksums 2015-11-10 16:41:49 UTC (rev 25372) +++ csw/mgar/pkg/puppet3/trunk/checksums 2015-11-11 12:08:00 UTC (rev 25373) @@ -1 +1 @@ -60868893d7e3e6f06d9cac581acb9ef9 puppet-3.7.4.tar.gz +b2dc9f24f1b2bd64429fc1944a796839 puppet-3.8.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Nov 11 16:54:28 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 11 Nov 2015 15:54:28 +0000 Subject: SF.net SVN: gar:[25374] csw/mgar/pkg/php5/branches/php-5.6.x Message-ID: <3nwrGs5NztzlM@mail.opencsw.org> Revision: 25374 http://sourceforge.net/p/gar/code/25374 Author: cgrzemba Date: 2015-11-11 15:54:28 +0000 (Wed, 11 Nov 2015) Log Message: ----------- php5/branches/php-5.6.x: update 5.6.15, add ap2_modphp Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile csw/mgar/pkg/php5/branches/php-5.6.x/checksums csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.CSW Added Paths: ----------- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-11 12:08:00 UTC (rev 25373) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-11 15:54:28 UTC (rev 25374) @@ -1,5 +1,5 @@ NAME = php -VERSION = 5.6.13 +VERSION = 5.6.15 GARTYPE = v2 DESCRIPTION = A high-level scripting language. @@ -18,9 +18,10 @@ EXTRA_MODULATORS = SAPI # MODULATIONS_SAPI = cgi ap2 -MODULATIONS_SAPI = ap2 +MODULATIONS_SAPI = ap24 ap2 MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all +MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all # turn on the build scripts to enable/disable modules PHP5_EXT = 1 @@ -46,6 +47,9 @@ DISTFILES += $(DISTNAME).tar.xz DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall DISTFILES += CSWphp5.cswreleasenotes +DISTFILES += CSWap24-modphp5.cswreleasenotes +DISTFILES += CSWap24-modphp5.postinstall +DISTFILES += CSWap24-modphp5.preremove DISTFILES += CSWap2-modphp5.cswreleasenotes DISTFILES += CSWap2-modphp5.postinstall DISTFILES += CSWap2-modphp5.preremove @@ -141,6 +145,9 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 +ifeq ($(SAPI),ap24) +EXTRA_MERGE_EXCLUDE += $(prefix)/apache2.* + PACKAGES += CSWap24-modphp5 SPKG_DESC_CSWap24-modphp5 = The apache 2.4.x php5 module RUNTIME_DEP_PKGS_CSWap24-modphp5 = CSWphp5 CSWapache24 CSWlibxml2-2 @@ -149,10 +156,23 @@ RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc55 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio55 PKGFILES_CSWap24-modphp5 += $(libdir)/apache2/modules.* +PKGFILES_CSWap24-modphp5 += $(sysconfdir_ap24).* CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWapache24 CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so +endif +ifeq ($(SAPI),ap2) +EXTRA_MERGE_EXCLUDE += $(sysconfdir_ap24).* + +PACKAGES += CSWap2-modphp5 +SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module +RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2 +PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* +CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWapache2 +endif + $(eval $(call php5_subpackage,bcmath,)) $(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0)) $(eval $(call php5_subpackage,calendar,)) @@ -283,7 +303,8 @@ #EXTRA_CPPFLAGS += -D_RWSTD_NO_NEW_HEADER sysconfdir = /etc$(prefix)/php5 -sysconfdir_ap2 = /etc$(prefix)/apache2 +sysconfdir_ap24 = /etc$(prefix)/apache2 +sysconfdir_ap2 = /opt/csw/apache2/etc CONFIGURE_ARGS += --prefix=$(prefix)/php5 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) @@ -380,10 +401,11 @@ CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --enable-cli +CONFIGURE_ARGS_fpm += --enable-fpm -ifeq ($(SAPI),ap2) -CONFIGURE_ARGS += --with-apxs2=$(prefix)/bin/apxs -endif +CONFIGURE_ARGS_ap24 += --with-apxs2=$(prefix)/bin/apxs +CONFIGURE_ARGS_ap2 += --with-apxs2=$(prefix)/bin/apxs +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(SAPI)) # Disable Tests (report submitted to PHP QA) # works, but takes a lot of time @@ -422,8 +444,8 @@ # @echo "LoadModule foo2_module libexec/mod_foo2.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf # @$(MAKECOOKIE) -post-install-modulated: AP2SYSCONF=$(sysconfdir_ap2)/httpd.conf -post-install-modulated: AP2EXTCONF=$(sysconfdir_ap2)/extra +post-install-modulated: AP2SYSCONF=$(sysconfdir_$(SAPI))/httpd.conf +post-install-modulated: AP2EXTCONF=$(sysconfdir_$(SAPI))/extra post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini post-install-modulated: @rm -f $(DESTDIR)$(AP2SYSCONF) Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2015-11-11 12:08:00 UTC (rev 25373) +++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2015-11-11 15:54:28 UTC (rev 25374) @@ -1 +1 @@ -de4a8ff544986d9e0da90522fa66f195 php-5.6.13.tar.xz +c726a86238017c2d9db0171b14d300e7 php-5.6.15.tar.xz Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build 2015-11-11 12:08:00 UTC (rev 25373) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build 2015-11-11 15:54:28 UTC (rev 25374) @@ -5,7 +5,7 @@ fi else - APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` -+ APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'forked:.*no'` ++ APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'forked:.*no' | echo "I don't want ZTS!` if test -n "$APACHE_THREADED_MPM"; then PHP_BUILD_THREAD_SAFE fi Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes (rev 0) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes 2015-11-11 15:54:28 UTC (rev 25374) @@ -0,0 +1,2 @@ +/usr/local references: + libexec/libphp5.so -> embeds 'magic' filetype info in the binary Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall (rev 0) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall 2015-11-11 15:54:28 UTC (rev 25374) @@ -0,0 +1,29 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_CONFIG=$CSW_PREFIX/apache2/etc/httpd.conf + +# Configure mod_php5 in httpd.conf +if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ] +then + echo "Existing mod_php5 configuration detected" +elif [ -n "`egrep '#Include etc/extra/httpd-php5.conf' $AP2_CONFIG`" ]; then + echo "Re-enabling existing config" + perl -i -plne 's,^#(Include etc/extra/httpd-php5.conf),$1,' $AP2_CONFIG +else + echo "Adding Include for extra/http-php5.conf to httpd.conf" + cat << END >> $AP2_CONFIG + +Include etc/extra/httpd-php5.conf +END +fi + +# Finito +cat < Revision: 25375 http://sourceforge.net/p/gar/code/25375 Author: cgrzemba Date: 2015-11-12 10:43:16 +0000 (Thu, 12 Nov 2015) Log Message: ----------- the extension genertate the postinstall/preremove scripts for enable/disable extensions Added Paths: ----------- csw/mgar/pkg/php5/branches/php-5.6.x/extensions/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Nov 12 16:02:23 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 12 Nov 2015 15:02:23 +0000 Subject: SF.net SVN: gar:[25376] csw/mgar/pkg/389-admin/trunk/Makefile Message-ID: <3nxR4N0kGBz1KG@mail.opencsw.org> Revision: 25376 http://sourceforge.net/p/gar/code/25376 Author: cgrzemba Date: 2015-11-12 15:02:23 +0000 (Thu, 12 Nov 2015) Log Message: ----------- 389-admin/trunk: switch ldap API Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2015-11-12 10:43:16 UTC (rev 25375) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2015-11-12 15:02:23 UTC (rev 25376) @@ -26,8 +26,8 @@ LICENSE = LICENSE # GARFLAVOR=DBG -# LDAP_API=mozldap -LDAP_API=openldap +LDAP_API=mozldap +# LDAP_API=openldap PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch @@ -61,33 +61,28 @@ SPKG_DESC_CSW389-admin-dev += $(DESCRIPTION), development files PKGFILES_CSW389-admin-dev += /opt/csw/lib/libds-admin-serv.so RUNTIME_DEP_PKGS_CSW389-admin-dev += CSWlibds-admin-serv0 +CHECKPKG_OVERRIDES_CSW389-admin-dev += surplus-dependency|CSWlibds-admin-serv0 PACKAGES += CSW389-admin -# OBSOLETED_BY_CSW389-admin = CSW389admin SPKG_DESC_CSW389-admin += $(DESCRIPTION) INITSMF = /etc/opt/csw/init.d/dirsrv-admin RUNTIME_DEP_PKGS_CSW389-admin += CSWap2modnss -# RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldif60 +RUNTIME_DEP_PKGS_CSW389-admin_mozldap += CSWlibldif60 RUNTIME_DEP_PKGS_CSW389-admin += CSWperl RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadmsslutil0 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplc4 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnspr4 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibds-admin-serv0 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadminutil0 -# RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap60 +RUNTIME_DEP_PKGS_CSW389-admin_mozldap += CSWlibldap60 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsmime3 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibssl3 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnss3 RUNTIME_DEP_PKGS_CSW389-admin += CSW389-admin-console RUNTIME_DEP_PKGS_CSW389-admin += CSW389-ds-console RUNTIME_DEP_PKGS_CSW389-admin += CSWpm-netaddr-ip -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicui18n52 -RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibplds4 -RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSW389-admin_openldap += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSW389-admin += $(RUNTIME_DEP_PKGS_CSW389-admin_$(LDAP_API)) RUNTIME_DEP_PKGS_CSW389-admin += $(RUNTIME_DEP_PKGS_CSW389-admin_$(GARCH)) CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2modnss @@ -120,7 +115,7 @@ CONFIGURE_ARGS_64 += --with-apxs=/opt/csw/bin/$(BUILD_ISAS)/apxs CONFIGURE_ARGS_32 += --with-httpd=/opt/csw/sbin/httpd CONFIGURE_ARGS_32 += --with-modnss-lib=/opt/csw/lib/apache2/modules -CONFIGURE_ARGS_64 += --with-httpd=/opt/csw/sbin/$(BUILD_ISAS)/httpd +CONFIGURE_ARGS_64 += --with-httpd=/opt/csw/sbin/$(BUILD_ISAS)/httpd -D 64bit CONFIGURE_ARGS_64 += --with-modnss-lib=/opt/csw/lib/$(BUILD_ISAS)/apache2/modules CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/sbin # CONFIGURE_ARGS += --with-adminutil=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Nov 12 16:45:05 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 12 Nov 2015 15:45:05 +0000 Subject: SF.net SVN: gar:[25377] csw/mgar/pkg/389-admin/trunk/Makefile Message-ID: <3nxS1S1GbWz1Np@mail.opencsw.org> Revision: 25377 http://sourceforge.net/p/gar/code/25377 Author: cgrzemba Date: 2015-11-12 15:45:05 +0000 (Thu, 12 Nov 2015) Log Message: ----------- 389-admin/trunk: switch ldap API Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2015-11-12 15:02:23 UTC (rev 25376) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2015-11-12 15:45:05 UTC (rev 25377) @@ -26,14 +26,19 @@ LICENSE = LICENSE # GARFLAVOR=DBG -LDAP_API=mozldap -# LDAP_API=openldap +# LDAP_API=mozldap +LDAP_API=openldap PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch PATCHFILES += 0004-change-include-preferences-in-Makefile.am.patch PATCHFILES += 0005-ctime_r-params-viewdata.c.patch +PRESERVECONF += $(sysconfdir)/dirsrv/admin/httpd.conf +PRESERVECONF += $(sysconfdir)/dirsrv/admin/console.conf +PRESERVECONF += $(sysconfdir)/dirsrv/admin/local.conf +PRESERVECONF += $(sysconfdir)/dirsrv/admin/adm.conf + BUILD_DEP_PKGS += CSWnspr-dev BUILD_DEP_PKGS += CSWlibnss-dev BUILD_DEP_PKGS += CSW389-adminutil-dev @@ -115,7 +120,7 @@ CONFIGURE_ARGS_64 += --with-apxs=/opt/csw/bin/$(BUILD_ISAS)/apxs CONFIGURE_ARGS_32 += --with-httpd=/opt/csw/sbin/httpd CONFIGURE_ARGS_32 += --with-modnss-lib=/opt/csw/lib/apache2/modules -CONFIGURE_ARGS_64 += --with-httpd=/opt/csw/sbin/$(BUILD_ISAS)/httpd -D 64bit +CONFIGURE_ARGS_64 += --with-httpd=/opt/csw/sbin/$(BUILD_ISAS)/httpd CONFIGURE_ARGS_64 += --with-modnss-lib=/opt/csw/lib/$(BUILD_ISAS)/apache2/modules CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/sbin # CONFIGURE_ARGS += --with-adminutil=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Nov 12 16:47:59 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 12 Nov 2015 15:47:59 +0000 Subject: SF.net SVN: gar:[25378] csw/mgar/pkg/389-adminutil/trunk/Makefile Message-ID: <3nxS4p0YNYz1RJ@mail.opencsw.org> Revision: 25378 http://sourceforge.net/p/gar/code/25378 Author: cgrzemba Date: 2015-11-12 15:47:59 +0000 (Thu, 12 Nov 2015) Log Message: ----------- 389-adminutil/trunk: set LDAPAPI Modified Paths: -------------- csw/mgar/pkg/389-adminutil/trunk/Makefile Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/Makefile 2015-11-12 15:45:05 UTC (rev 25377) +++ csw/mgar/pkg/389-adminutil/trunk/Makefile 2015-11-12 15:47:59 UTC (rev 25378) @@ -25,6 +25,9 @@ BUILD_DEPS += CSWnspr-dev BUILD_DEPS += CSWlibnss3-dev +# LDAPAPI=mozldap +LDAPAPI=openldap + PACKAGES += CSWlibadminutil0 CATALOGNAME_CSWlibadminutil0 = libadminutil0 SPKG_DESC_CSWlibadminutil0 += $(DESCRIPTION), libadminutil @@ -34,11 +37,8 @@ RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssl3 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc54 -RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibicui18n52 -RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibicudata52 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(GARCH)) +RUNTIME_DEP_PKGS_CSWlibadminutil0_openldap += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(LDAPAPI)) PACKAGES += CSWlibadmsslutil0 CATALOGNAME_CSWlibadmsslutil0 = libadmsslutil0 @@ -49,12 +49,8 @@ RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibadminutil0 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssl3 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicui18n52 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicudata52 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(GARCH)) +RUNTIME_DEP_PKGS_CSWlibadmsslutil0_openldap += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(LDAPAPI)) PACKAGES += CSW389-adminutil-dev CATALOGNAME_CSW389-adminutil-dev = 389_adminutil_dev @@ -68,9 +64,6 @@ TEST_SCRIPTS = EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -# LDAPAPI=mozldap -LDAPAPI=openldap - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS_mozldap += --with-ldapsdk-inc=$(includedir)/dirsrv CONFIGURE_ARGS_mozldap += --with-ldapsdk-lib=$(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Nov 12 16:59:39 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 12 Nov 2015 15:59:39 +0000 Subject: SF.net SVN: gar:[25379] csw/mgar/pkg/389-adminutil/trunk/Makefile Message-ID: <3nxSLF6HgQz1Tp@mail.opencsw.org> Revision: 25379 http://sourceforge.net/p/gar/code/25379 Author: cgrzemba Date: 2015-11-12 15:59:39 +0000 (Thu, 12 Nov 2015) Log Message: ----------- 389-adminutil/trunk: update runtime dependency Modified Paths: -------------- csw/mgar/pkg/389-adminutil/trunk/Makefile Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/Makefile 2015-11-12 15:47:59 UTC (rev 25378) +++ csw/mgar/pkg/389-adminutil/trunk/Makefile 2015-11-12 15:59:39 UTC (rev 25379) @@ -36,7 +36,7 @@ RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssl3 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc54 +RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc55 RUNTIME_DEP_PKGS_CSWlibadminutil0_openldap += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(LDAPAPI)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Nov 13 11:47:45 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 13 Nov 2015 10:47:45 +0000 Subject: SF.net SVN: gar:[25380] csw/mgar/pkg/zabbix/trunk Message-ID: <3nxxMw0clNzGf@mail.opencsw.org> Revision: 25380 http://sourceforge.net/p/gar/code/25380 Author: janholzh Date: 2015-11-13 10:47:45 +0000 (Fri, 13 Nov 2015) Log Message: ----------- zabbix/trunk: update to 2.4.7 Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/checksums Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-12 15:59:39 UTC (rev 25379) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-13 10:47:45 UTC (rev 25380) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = zabbix -VERSION = 2.4.6 +VERSION = 2.4.7 GARTYPE = v2 DESCRIPTION = Zabbix monitoring system Modified: csw/mgar/pkg/zabbix/trunk/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums 2015-11-12 15:59:39 UTC (rev 25379) +++ csw/mgar/pkg/zabbix/trunk/checksums 2015-11-13 10:47:45 UTC (rev 25380) @@ -1 +1 @@ -06ad8d5808a0eddf2b9f0a256b6a5fde zabbix-2.4.6.tar.gz +9f8aeb11d8415585f41c3f2f22566b78 zabbix-2.4.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Nov 17 08:30:46 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 17 Nov 2015 07:30:46 +0000 Subject: SF.net SVN: gar:[25381] csw/mgar/pkg/php5/branches/php-5.6.x Message-ID: <3p0Jqp195FzHf@mail.opencsw.org> Revision: 25381 http://sourceforge.net/p/gar/code/25381 Author: cgrzemba Date: 2015-11-17 07:30:46 +0000 (Tue, 17 Nov 2015) Log Message: ----------- - remove extension direcotry, its obsolete - add modulation ap24 and still build mod_php5 for apache22 - add some extension in php.ini - remove files/php.ini.CSW, obsolete - add in httpd-php5: AddHandler application/x-httpd-php Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile csw/mgar/pkg/php5/branches/php-5.6.x/files/httpd-php5.conf Added Paths: ----------- csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.patch Removed Paths: ------------- csw/mgar/pkg/php5/branches/php-5.6.x/extensions/ csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.CSW Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-13 10:47:45 UTC (rev 25380) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-17 07:30:46 UTC (rev 25381) @@ -17,17 +17,21 @@ endef EXTRA_MODULATORS = SAPI -# MODULATIONS_SAPI = cgi ap2 -MODULATIONS_SAPI = ap24 ap2 +MODULATIONS_SAPI += ap24 +MODULATIONS_SAPI += ap2 +# MODULATIONS_SAPI += cgi MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all # turn on the build scripts to enable/disable modules +# use the SVR4 class 'build' PHP5_EXT = 1 # this triggers /bin/ap2mod_build_scripts -# AP2_MODS = 1 -# AP2_MODFILES = *libphp5.so +AP2_MODS-ap2 = 1 +AP2_MODFILES-ap2 = *libphp5.so +AP2_MODS += $(AP2_MODS-$(SAPI)) +AP2_MODFILES += $(AP2_MODFILES-$(SAPI)) # at least for a decent echo used during build. PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) @@ -45,7 +49,9 @@ DISTNAME = $(NAME)-$(VERSION) DISTFILES += $(DISTNAME).tar.xz -DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall +DISTFILES += phpext +DISTFILES += pear.conf.CSW +DISTFILES += CSWphp5.postinstall DISTFILES += CSWphp5.cswreleasenotes DISTFILES += CSWap24-modphp5.cswreleasenotes DISTFILES += CSWap24-modphp5.postinstall @@ -55,6 +61,7 @@ DISTFILES += CSWap2-modphp5.preremove DISTFILES += httpd-php5.conf DISTFILES += map.solaris10 +DISTFILES += php.ini.patch PATCHFILES += 0001-Strip-usr-ucblib-references.patch PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch @@ -81,11 +88,11 @@ BUILD_DEP_PKGS += CSWlibxpm-dev BUILD_DEP_PKGS += CSWlibaspell-dev -PRESERVECONF = $(sysconfdir)/php.ini $(sysconfdir)/pear.conf -PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf -MIGRATE_FILES_CSWphp5 = "php.ini" -MIGRATE_SOURCE_DIR_CSWphp5 = /opt/csw/php5/lib -MIGRATE_DEST_DIR = $(sysconfdir) +PRESERVECONF += $(sysconfdir)/php.ini +PRESERVECONF += $(sysconfdir)/pear.conf +PRESERVECONF-ap2 += $(sysconfdir_ap2)/extra/httpd-php5.conf +PRESERVECONF-ap24 += $(sysconfdir_ap24)/extra/httpd-php5.conf +PRESERVECONF += $(PRESERVECONF-$(SAPI)) define php5_subpackage PACKAGES += CSWphp5-$(subst _,-,$(1)) @@ -97,7 +104,7 @@ # CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5 endef -PACKAGES = CSWphp5 +PACKAGES += CSWphp5 CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibexpat1 CSWlibz1 @@ -113,7 +120,10 @@ # verify these... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php.ini.CSW CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/php/man/man1/php-config.1 +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/doc/PEAR/README.rst + PACKAGES += CSWphp5-dev CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 @@ -145,33 +155,40 @@ CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 -ifeq ($(SAPI),ap24) -EXTRA_MERGE_EXCLUDE += $(prefix)/apache2.* +EXTRA_MERGE_EXCLUDE_FILES-ap24 += $(prefix)/apache2.* +EXTRA_MERGE_EXCLUDE_FILES-ap2 += $(sysconfdir_ap24).* +EXTRA_MERGE_EXCLUDE_FILES += $(EXTRA_MERGE_EXCLUDE_FILES-$(SAPI)) PACKAGES += CSWap24-modphp5 SPKG_DESC_CSWap24-modphp5 = The apache 2.4.x php5 module -RUNTIME_DEP_PKGS_CSWap24-modphp5 = CSWphp5 CSWapache24 CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibexpat1 CSWlibz1 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWapache24 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWphp5 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibz1 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicui18n55 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc55 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio55 PKGFILES_CSWap24-modphp5 += $(libdir)/apache2/modules.* PKGFILES_CSWap24-modphp5 += $(sysconfdir_ap24).* -CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWapache24 CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so -endif -ifeq ($(SAPI),ap2) -EXTRA_MERGE_EXCLUDE += $(sysconfdir_ap24).* - PACKAGES += CSWap2-modphp5 SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module -RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2 +CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWphp5 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWapache2 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWphp5 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n55 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuio55 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc55 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibz1 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWapache2 -endif +CHECKPKG_OVERRIDES_CSWap2-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so $(eval $(call php5_subpackage,bcmath,)) $(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0)) @@ -281,10 +298,10 @@ # We must not cut back on libc as we need current libmysql requiring getpagesizes2 LINKER_MAPS = -EXTRA_CONFIGURE_EXPORTS += IBM_DB_INCLUDE -EXTRA_CONFIGURE_EXPORTS += IBM_DB_LIB -EXTRA_CONFIGURE_EXPORTS += DB2INSTANCE -EXTRA_CONFIGURE_EXPORTS += DB2DIR +# EXTRA_CONFIGURE_EXPORTS += IBM_DB_INCLUDE +# EXTRA_CONFIGURE_EXPORTS += IBM_DB_LIB +# EXTRA_CONFIGURE_EXPORTS += DB2INSTANCE +# EXTRA_CONFIGURE_EXPORTS += DB2DIR # This is needed for DB2 module # CONFIGURE_ENV_IBM_DB_INCLUDE = /opt/IBM/db2/V8.1/include @@ -304,7 +321,7 @@ sysconfdir = /etc$(prefix)/php5 sysconfdir_ap24 = /etc$(prefix)/apache2 -sysconfdir_ap2 = /opt/csw/apache2/etc +sysconfdir_ap2 = $(prefix)/apache2/etc CONFIGURE_ARGS += --prefix=$(prefix)/php5 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) @@ -403,9 +420,9 @@ CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS_fpm += --enable-fpm -CONFIGURE_ARGS_ap24 += --with-apxs2=$(prefix)/bin/apxs -CONFIGURE_ARGS_ap2 += --with-apxs2=$(prefix)/bin/apxs -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(SAPI)) +CONFIGURE_ARGS-ap24 += --with-apxs2=$(prefix)/bin/apxs +CONFIGURE_ARGS-ap2 += --with-apxs2=$(prefix)/apache2/sbin/apxs +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(SAPI)) # Disable Tests (report submitted to PHP QA) # works, but takes a lot of time @@ -452,8 +469,8 @@ @ginstall -d -m 0755 $(DESTDIR)$(AP2EXTCONF) @ginstall -m 0644 $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF) @ginstall -m 0644 $(WORKSRC)/php.ini-production $(INIDEST) + @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ - @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) @rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f* @perl -pi -e 's!s:17:"http://proxy:3128!s:0:"!' $(DESTDIR)$(sysconfdir)/pear.conf* @mkdir -p $(DESTDIR)/opt/csw/bin @@ -464,10 +481,11 @@ @$(MAKECOOKIE) post-merge-all: - @echo " ==> Fixing php.ini: adding loadable session.so support" - @-( cd $(PKGROOT)/$(sysconfdir)/; \ - perl -pi -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini.CSW; ) - @-( cd $(PKGROOT)/$(sysconfdir)/; \ - perl -pi -e 's/extension=bz2.so/extension=ctype.so\n;extension=bz2.so/' php.ini.CSW; ) - @echo " ==> Fixing php.ini: adding loadable ctype.so support" + @echo " ==> Fixing php.ini: adding loadable session.so ctype.so phar.so support" + cat $(WORKDIR)/php.ini.patch | ed -s $(PKGROOT)/$(sysconfdir)/php.ini.CSW @$(MAKECOOKIE) + +post-merge-modulated: + @echo "merge for $(SAPI)" + @echo "preserve $(PRESERVECONF)" + @$(MAKECOOKIE) Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/httpd-php5.conf =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/httpd-php5.conf 2015-11-13 10:47:45 UTC (rev 25380) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/httpd-php5.conf 2015-11-17 07:30:46 UTC (rev 25381) @@ -1,4 +1,12 @@ + AddHandler application/x-httpd-php .php5 + AddHandler application/x-httpd-php .php + AddHandler application/x-httpd-php-source .php5s + AddHandler application/x-httpd-php-source .phps + + DirectoryIndex index.php + DirectoryIndex index.php5 + AddType application/x-httpd-php .php AddType application/x-httpd-php-source .phps Deleted: csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.CSW =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.CSW 2015-11-13 10:47:45 UTC (rev 25380) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.CSW 2015-11-17 07:30:46 UTC (rev 25381) @@ -1,1310 +0,0 @@ -[PHP] - -;;;;;;;;;;;;;;;;;;; -; About php.ini ; -;;;;;;;;;;;;;;;;;;; -; This file controls many aspects of PHP's behavior. In order for PHP to -; read it, it must be named 'php.ini'. PHP looks for it in the current -; working directory, in the path designated by the environment variable -; PHPRC, and in the path that was defined in compile time (in that order). -; Under Windows, the compile-time path is the Windows directory. The -; path in which the php.ini file is looked for can be overridden using -; the -c argument in command line mode. -; -; The syntax of the file is extremely simple. Whitespace and Lines -; beginning with a semicolon are silently ignored (as you probably guessed). -; Section headers (e.g. [Foo]) are also silently ignored, even though -; they might mean something in the future. -; -; Directives are specified using the following syntax: -; directive = value -; Directive names are *case sensitive* - foo=bar is different from FOO=bar. -; -; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one -; of the INI constants (On, Off, True, False, Yes, No and None) or an expression -; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo"). -; -; Expressions in the INI file are limited to bitwise operators and parentheses: -; | bitwise OR -; & bitwise AND -; ~ bitwise NOT -; ! boolean NOT -; -; Boolean flags can be turned on using the values 1, On, True or Yes. -; They can be turned off using the values 0, Off, False or No. -; -; An empty string can be denoted by simply not writing anything after the equal -; sign, or by using the None keyword: -; -; foo = ; sets foo to an empty string -; foo = none ; sets foo to an empty string -; foo = "none" ; sets foo to the string 'none' -; -; If you use constants in your value, and these constants belong to a -; dynamically loaded extension (either a PHP extension or a Zend extension), -; you may only use these constants *after* the line that loads the extension. -; -; -;;;;;;;;;;;;;;;;;;; -; About this file ; -;;;;;;;;;;;;;;;;;;; -; This is the recommended, PHP 5-style version of the php.ini-dist file. It -; sets some non standard settings, that make PHP more efficient, more secure, -; and encourage cleaner coding. -; -; The price is that with these settings, PHP may be incompatible with some -; applications, and sometimes, more difficult to develop with. Using this -; file is warmly recommended for production sites. As all of the changes from -; the standard settings are thoroughly documented, you can go over each one, -; and decide whether you want to use it or not. -; -; For general information about the php.ini file, please consult the php.ini-dist -; file, included in your PHP distribution. -; -; This file is different from the php.ini-dist file in the fact that it features -; different values for several directives, in order to improve performance, while -; possibly breaking compatibility with the standard out-of-the-box behavior of -; PHP. Please make sure you read what's different, and modify your scripts -; accordingly, if you decide to use this file instead. -; -; - register_long_arrays = Off [Performance] -; Disables registration of the older (and deprecated) long predefined array -; variables ($HTTP_*_VARS). Instead, use the superglobals that were -; introduced in PHP 4.1.0 -; - display_errors = Off [Security] -; With this directive set to off, errors that occur during the execution of -; scripts will no longer be displayed as a part of the script output, and thus, -; will no longer be exposed to remote users. With some errors, the error message -; content may expose information about your script, web server, or database -; server that may be exploitable for hacking. Production sites should have this -; directive set to off. -; - log_errors = On [Security] -; This directive complements the above one. Any errors that occur during the -; execution of your script will be logged (typically, to your server's error log, -; but can be configured in several ways). Along with setting display_errors to off, -; this setup gives you the ability to fully understand what may have gone wrong, -; without exposing any sensitive information to remote users. -; - output_buffering = 4096 [Performance] -; Set a 4KB output buffer. Enabling output buffering typically results in less -; writes, and sometimes less packets sent on the wire, which can often lead to -; better performance. The gain this directive actually yields greatly depends -; on which Web server you're working with, and what kind of scripts you're using. -; - register_argc_argv = Off [Performance] -; Disables registration of the somewhat redundant $argv and $argc global -; variables. -; - magic_quotes_gpc = Off [Performance] -; Input data is no longer escaped with slashes so that it can be sent into -; SQL databases without further manipulation. Instead, you should use the -; function addslashes() on each input element you wish to send to a database. -; - variables_order = "GPCS" [Performance] -; The environment variables are not hashed into the $_ENV. To access -; environment variables, you can use getenv() instead. -; - error_reporting = E_ALL [Code Cleanliness, Security(?)] -; By default, PHP suppresses errors of type E_NOTICE. These error messages -; are emitted for non-critical errors, but that could be a symptom of a bigger -; problem. Most notably, this will cause error messages about the use -; of uninitialized variables to be displayed. -; - allow_call_time_pass_reference = Off [Code cleanliness] -; It's not possible to decide to force a variable to be passed by reference -; when calling a function. The PHP 4 style to do this is by making the -; function require the relevant argument by reference. - -;;;;;;;;;;;;;;;;;;;; -; Language Options ; -;;;;;;;;;;;;;;;;;;;; - -; Enable the PHP scripting language engine under Apache. -engine = On - -; Enable compatibility mode with Zend Engine 1 (PHP 4.x) -zend.ze1_compatibility_mode = Off - -; Allow the tags are recognized. -; NOTE: Using short tags should be avoided when developing applications or -; libraries that are meant for redistribution, or deployment on PHP -; servers which are not under your control, because short tags may not -; be supported on the target server. For portable, redistributable code, -; be sure not to use short tags. -short_open_tag = Off - -; Allow ASP-style <% %> tags. -asp_tags = Off - -; The number of significant digits displayed in floating point numbers. -precision = 14 - -; Enforce year 2000 compliance (will cause problems with non-compliant browsers) -y2k_compliance = On - -; Output buffering allows you to send header lines (including cookies) even -; after you send body content, at the price of slowing PHP's output layer a -; bit. You can enable output buffering during runtime by calling the output -; buffering functions. You can also enable output buffering for all files by -; setting this directive to On. If you wish to limit the size of the buffer -; to a certain size - you can use a maximum number of bytes instead of 'On', as -; a value for this directive (e.g., output_buffering=4096). -output_buffering = 4096 - -; You can redirect all of the output of your scripts to a function. For -; example, if you set output_handler to "mb_output_handler", character -; encoding will be transparently converted to the specified encoding. -; Setting any output handler automatically turns on output buffering. -; Note: People who wrote portable scripts should not depend on this ini -; directive. Instead, explicitly set the output handler using ob_start(). -; Using this ini directive may cause problems unless you know what script -; is doing. -; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" -; and you cannot use both "ob_gzhandler" and "zlib.output_compression". -; Note: output_handler must be empty if this is set 'On' !!!! -; Instead you must use zlib.output_handler. -;output_handler = - -; Transparent output compression using the zlib library -; Valid values for this option are 'off', 'on', or a specific buffer size -; to be used for compression (default is 4KB) -; Note: Resulting chunk size may vary due to nature of compression. PHP -; outputs chunks that are few hundreds bytes each as a result of -; compression. If you prefer a larger chunk size for better -; performance, enable output_buffering in addition. -; Note: You need to use zlib.output_handler instead of the standard -; output_handler, or otherwise the output will be corrupted. -zlib.output_compression = Off -;zlib.output_compression_level = -1 - -; You cannot specify additional output handlers if zlib.output_compression -; is activated here. This setting does the same as output_handler but in -; a different order. -;zlib.output_handler = - -; Implicit flush tells PHP to tell the output layer to flush itself -; automatically after every output block. This is equivalent to calling the -; PHP function flush() after each and every call to print() or echo() and each -; and every HTML block. Turning this option on has serious performance -; implications and is generally recommended for debugging purposes only. -implicit_flush = Off - -; The unserialize callback function will be called (with the undefined class' -; name as parameter), if the unserializer finds an undefined class -; which should be instantiated. -; A warning appears if the specified function is not defined, or if the -; function doesn't include/implement the missing class. -; So only set this entry, if you really want to implement such a -; callback-function. -unserialize_callback_func= - -; When floats & doubles are serialized store serialize_precision significant -; digits after the floating point. The default value ensures that when floats -; are decoded with unserialize, the data will remain the same. -serialize_precision = 100 - -; Whether to enable the ability to force arguments to be passed by reference -; at function call time. This method is deprecated and is likely to be -; unsupported in future versions of PHP/Zend. The encouraged method of -; specifying which arguments should be passed by reference is in the function -; declaration. You're encouraged to try and turn this option Off and make -; sure your scripts work properly with it in order to ensure they will work -; with future versions of the language (you will receive a warning each time -; you use this feature, and the argument will be passed by value instead of by -; reference). -allow_call_time_pass_reference = Off - -; -; Safe Mode -; -safe_mode = Off - -; By default, Safe Mode does a UID compare check when -; opening files. If you want to relax this to a GID compare, -; then turn on safe_mode_gid. -safe_mode_gid = Off - -; When safe_mode is on, UID/GID checks are bypassed when -; including files from this directory and its subdirectories. -; (directory must also be in include_path or full path must -; be used when including) -safe_mode_include_dir = - -; When safe_mode is on, only executables located in the safe_mode_exec_dir -; will be allowed to be executed via the exec family of functions. -safe_mode_exec_dir = - -; Setting certain environment variables may be a potential security breach. -; This directive contains a comma-delimited list of prefixes. In Safe Mode, -; the user may only alter environment variables whose names begin with the -; prefixes supplied here. By default, users will only be able to set -; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR). -; -; Note: If this directive is empty, PHP will let the user modify ANY -; environment variable! -safe_mode_allowed_env_vars = PHP_ - -; This directive contains a comma-delimited list of environment variables that -; the end user won't be able to change using putenv(). These variables will be -; protected even if safe_mode_allowed_env_vars is set to allow to change them. -safe_mode_protected_env_vars = LD_LIBRARY_PATH - -; open_basedir, if set, limits all file operations to the defined directory -; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -;open_basedir = - -; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -disable_functions = - -; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -disable_classes = - -; Colors for Syntax Highlighting mode. Anything that's acceptable in -; would work. -;highlight.string = #DD0000 -;highlight.comment = #FF9900 -;highlight.keyword = #007700 -;highlight.bg = #FFFFFF -;highlight.default = #0000BB -;highlight.html = #000000 - -; If enabled, the request will be allowed to complete even if the user aborts -; the request. Consider enabling it if executing long request, which may end up -; being interrupted by the user or a browser timing out. -; ignore_user_abort = On - -; Determines the size of the realpath cache to be used by PHP. This value should -; be increased on systems where PHP opens many files to reflect the quantity of -; the file operations performed. -; realpath_cache_size=16k - -; Duration of time, in seconds for which to cache realpath information for a given -; file or directory. For systems with rarely changing files, consider increasing this -; value. -; realpath_cache_ttl=120 - -; -; Misc -; -; Decides whether PHP may expose the fact that it is installed on the server -; (e.g. by adding its signature to the Web server header). It is no security -; threat in any way, but it makes it possible to determine whether you use PHP -; on your server or not. -expose_php = On - - -;;;;;;;;;;;;;;;;;;; -; Resource Limits ; -;;;;;;;;;;;;;;;;;;; - -max_execution_time = 30 ; Maximum execution time of each script, in seconds -max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Error handling and logging ; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; error_reporting is a bit-field. Or each number up to get desired error -; reporting level -; E_ALL - All errors and warnings (doesn't include E_STRICT) -; E_ERROR - fatal run-time errors -; E_RECOVERABLE_ERROR - almost fatal run-time errors -; E_WARNING - run-time warnings (non-fatal errors) -; E_PARSE - compile-time parse errors -; E_NOTICE - run-time notices (these are warnings which often result -; from a bug in your code, but it's possible that it was -; intentional (e.g., using an uninitialized variable and -; relying on the fact it's automatically initialized to an -; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes -; to your code which will ensure the best interoperability -; and forward compatibility of your code -; E_CORE_ERROR - fatal errors that occur during PHP's initial startup -; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's -; initial startup -; E_COMPILE_ERROR - fatal compile-time errors -; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) -; E_USER_ERROR - user-generated error message -; E_USER_WARNING - user-generated warning message -; E_USER_NOTICE - user-generated notice message -; -; Examples: -; -; - Show all errors, except for notices and coding standards warnings -; -;error_reporting = E_ALL & ~E_NOTICE -; -; - Show all errors, except for notices -; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT -; -; - Show only errors -; -;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR -; -; - Show all errors, except coding standards warnings -; -error_reporting = E_ALL - -; Print out errors (as a part of the output). For production web sites, -; you're strongly encouraged to turn this feature off, and use error logging -; instead (see below). Keeping display_errors enabled on a production web site -; may reveal security information to end users, such as file paths on your Web -; server, your database schema or other information. -display_errors = Off - -; Even when display_errors is on, errors that occur during PHP's startup -; sequence are not displayed. It's strongly recommended to keep -; display_startup_errors off, except for when debugging. -display_startup_errors = Off - -; Log errors into a log file (server-specific log, stderr, or error_log (below)) -; As stated above, you're strongly advised to use error logging in place of -; error displaying on production web sites. -log_errors = On - -; Set maximum length of log_errors. In error_log information about the source is -; added. The default is 1024 and 0 allows to not apply any maximum length at all. -log_errors_max_len = 1024 - -; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. -ignore_repeated_errors = Off - -; Ignore source of message when ignoring repeated messages. When this setting -; is On you will not log errors with repeated messages from different files or -; source lines. -ignore_repeated_source = Off - -; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This has only effect in a debug compile, and if -; error reporting includes E_WARNING in the allowed list -report_memleaks = On - -;report_zend_debug = 0 - -; Store the last error/warning message in $php_errormsg (boolean). -track_errors = Off - -; Disable the inclusion of HTML tags in error messages. -; Note: Never use this feature for production boxes. -;html_errors = Off - -; If html_errors is set On PHP produces clickable error messages that direct -; to a page describing the error or function causing the error in detail. -; You can download a copy of the PHP manual from http://www.php.net/docs.php -; and change docref_root to the base URL of your local copy including the -; leading '/'. You must also specify the file extension being used including -; the dot. -; Note: Never use this feature for production boxes. -;docref_root = "/phpmanual/" -;docref_ext = .html - -; String to output before an error message. -;error_prepend_string = "" - -; String to output after an error message. -;error_append_string = "" - -; Log errors to specified file. -;error_log = filename - -; Log errors to syslog (Event Log on NT, not valid in Windows 95). -;error_log = syslog - - -;;;;;;;;;;;;;;;;; -; Data Handling ; -;;;;;;;;;;;;;;;;; -; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 - -; The separator used in PHP generated URLs to separate arguments. -; Default is "&". -;arg_separator.output = "&" - -; List of separator(s) used by PHP to parse input URLs into variables. -; Default is "&". -; NOTE: Every character in this directive is considered as separator! -;arg_separator.input = ";&" - -; This directive describes the order in which PHP registers GET, POST, Cookie, -; Environment and Built-in variables (G, P, C, E & S respectively, often -; referred to as EGPCS or GPC). Registration is done from left to right, newer -; values override older values. -variables_order = "GPCS" - -; Whether or not to register the EGPCS variables as global variables. You may -; want to turn this off if you don't want to clutter your scripts' global scope -; with user data. This makes most sense when coupled with track_vars - in which -; case you can access all of the GPC variables through the $HTTP_*_VARS[], -; variables. -; -; You should do your best to write your scripts so that they do not require -; register_globals to be on; Using form variables as globals can easily lead -; to possible security problems, if the code is not very well thought of. -register_globals = Off - -; Whether or not to register the old-style input arrays, HTTP_GET_VARS -; and friends. If you're not using them, it's recommended to turn them off, -; for performance reasons. -register_long_arrays = Off - -; This directive tells PHP whether to declare the argv&argc variables (that -; would contain the GET information). If you don't use these variables, you -; should turn it off for increased performance. -register_argc_argv = Off - -; When enabled, the SERVER and ENV variables are created when they're first -; used (Just In Time) instead of when the script starts. If these variables -; are not used within a script, having this directive on will result in a -; performance gain. The PHP directives register_globals, register_long_arrays, -; and register_argc_argv must be disabled for this directive to have any affect. -auto_globals_jit = On - -; Maximum size of POST data that PHP will accept. -post_max_size = 8M - -; Magic quotes -; - -; Magic quotes for incoming GET/POST/Cookie data. -magic_quotes_gpc = Off - -; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. -magic_quotes_runtime = Off - -; Use Sybase-style magic quotes (escape ' with '' instead of \'). -magic_quotes_sybase = Off - -; Automatically add files before or after any PHP document. -auto_prepend_file = -auto_append_file = - -; As of 4.0b4, PHP always outputs a character encoding by default in -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. -; -; PHP's built-in default is text/html -default_mimetype = "text/html" -;default_charset = "iso-8859-1" - -; Always populate the $HTTP_RAW_POST_DATA variable. -;always_populate_raw_post_data = On - - -;;;;;;;;;;;;;;;;;;;;;;;;; -; Paths and Directories ; -;;;;;;;;;;;;;;;;;;;;;;;;; - -; UNIX: "/path1:/path2" -;include_path = ".:/php/includes" -; -; Windows: "\path1;\path2" -;include_path = ".;c:\php\includes" - -; The root of the PHP pages, used only if nonempty. -; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -; if you are running php as a CGI under any web server (other than IIS) -; see documentation for security issues. The alternate is to use the -; cgi.force_redirect configuration below -doc_root = - -; The directory under which PHP opens the script using /~username used only -; if nonempty. -user_dir = - -; Directory in which the loadable extensions (modules) reside. -extension_dir = "x_PHPEXTDIR_x" - -; Whether or not to enable the dl() function. The dl() function does NOT work -; properly in multithreaded servers, such as IIS or Zeus, and is automatically -; disabled on them. -enable_dl = On - -; cgi.force_redirect is necessary to provide security running PHP as a CGI under -; most web servers. Left undefined, PHP turns this on by default. You can -; turn it off here AT YOUR OWN RISK -; **You CAN safely turn this off for IIS, in fact, you MUST.** -; cgi.force_redirect = 1 - -; if cgi.nph is enabled it will force cgi to always sent Status: 200 with -; every request. -; cgi.nph = 1 - -; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape -; (iPlanet) web servers, you MAY need to set an environment variable name that PHP -; will look for to know it is OK to continue execution. Setting this variable MAY -; cause security issues, KNOW WHAT YOU ARE DOING FIRST. -; cgi.redirect_status_env = ; - -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate -; security tokens of the calling client. This allows IIS to define the -; security context that the request runs under. mod_fastcgi under Apache -; does not currently support this feature (03/17/2002) -; Set to 1 if running under IIS. Default is zero. -; fastcgi.impersonate = 1; - -; Disable logging through FastCGI connection -; fastcgi.log = 0 - -; cgi.rfc2616_headers configuration option tells PHP what type of headers to -; use when sending HTTP response code. If it's set 0 PHP sends Status: header that -; is supported by Apache. When this option is set to 1 PHP will send -; RFC2616 compliant header. -; Default is zero. -;cgi.rfc2616_headers = 0 - - -;;;;;;;;;;;;;;;; -; File Uploads ; -;;;;;;;;;;;;;;;; - -; Whether to allow HTTP file uploads. -file_uploads = On - -; Temporary directory for HTTP uploaded files (will use system default if not -; specified). -;upload_tmp_dir = - -; Maximum allowed size for uploaded files. -upload_max_filesize = 2M - - -;;;;;;;;;;;;;;;;;; -; Fopen wrappers ; -;;;;;;;;;;;;;;;;;; - -; Whether to allow the treatment of URLs (like http:// or ftp://) as files. -allow_url_fopen = On - -; Whether to allow include/require to open URLs (like http:// or ftp://) as files. -allow_url_include = Off - -; Define the anonymous ftp password (your email address) -;from="john at doe.com" - -; Define the User-Agent string -; user_agent="PHP" - -; Default timeout for socket based streams (seconds) -default_socket_timeout = 60 - -; If your scripts have to deal with files from Macintosh systems, -; or you are running on a Mac and need to deal with files from -; unix or win32 systems, setting this flag will cause PHP to -; automatically detect the EOL character in those files so that -; fgets() and file() will work regardless of the source of the file. -; auto_detect_line_endings = Off - - -;;;;;;;;;;;;;;;;;;;;;; -; Dynamic Extensions ; -;;;;;;;;;;;;;;;;;;;;;; -; -; If you wish to have an extension loaded automatically, use the following -; syntax: -; -; extension=modulename.extension -; -; For example, on Windows: -; -; extension=msql.dll -; -; ... or under UNIX: -; -; extension=msql.so -; -; Note that it should be the name of the module only; no directory information -; needs to go here. Specify the location of the extension with the -; extension_dir directive above. - -; CSW Extensions -;extension=bcmath.so -;extension=bz2.so -;extension=calendar.so -;extension=ctype.so -;extension=curl.so -;extension=dba.so -;extension=dbase.so -;extension=dom.so -;extension=exif.so -;extension=ftp.so -;extension=gd.so -;extension=gettext.so -;extension=gmp.so -;extension=hash.so -;extension=iconv.so -;extension=imap.so -;extension=json.so -;extension=ldap.so -;extension=mbstring.so -;extension=mcrypt.so -;extension=mhash.so -;extension=mime_magic.so -;extension=mssql.so -;extension=mysql.so -;extension=mysqli.so -;extension=ncurses.so -;extension=odbc.so -;extension=openssl.so -;extension=pcntl.so -;extension=pdo.so -;extension=pdo_mysql.so -;extension=pdo_odbc.so -;extension=pdo_pgsql.so -;extension=pdo_sqlite.so -;extension=pgsql.so -;extension=phar.so -;extension=posix.so -;extension=pspell.so -;extension=readline.so -;extension=session.so -;extension=shmop.so -;extension=snmp.so -;extension=soap.so -;extension=sockets.so -;extension=sqlite.so -;extension=sysvsem.so -;extension=sysvmsg.so -;extension=sysvshm.so -;extension=tidy.so -;extension=tokenizer.so -;extension=wddx.so -;extension=xmlreader.so -;extension=xmlrpc.so -;extension=xmlwriter.so -;extension=xsl.so -;extension=zip.so - -;;;;;;;;;;;;;;;;;;; -; Module Settings ; -;;;;;;;;;;;;;;;;;;; - -[Date] -; Defines the default timezone used by the date functions -;date.timezone = - -;date.default_latitude = 31.7667 -;date.default_longitude = 35.2333 - -;date.sunrise_zenith = 90.583333 -;date.sunset_zenith = 90.583333 - -[filter] -;filter.default = unsafe_raw -;filter.default_flags = - -[iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 - -[sqlite] -;sqlite.assoc_case = 0 - -[xmlrpc] -;xmlrpc_error_number = 0 -;xmlrpc_errors = 0 - -[Pcre] -;pcre.recursion_limit=100000 -;pcre.backtrack_limit=100000 - -[Syslog] -; Whether or not to define the various syslog variables (e.g. $LOG_PID, -; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In -; runtime, you can define these variables by calling define_syslog_variables(). -define_syslog_variables = Off - -[mail function] -; For Win32 only. -SMTP = localhost -smtp_port = 25 - -; For Win32 only. -;sendmail_from = me at example.com - -; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). -sendmail_path = /usr/lib/sendmail -t -i - -; Force the addition of the specified parameters to be passed as extra parameters -; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. -;mail.force_extra_parameters = - -[SQL] -sql.safe_mode = Off - -[ODBC] -;odbc.default_db = Not yet implemented -;odbc.default_user = Not yet implemented -;odbc.default_pw = Not yet implemented - -; Allow or prevent persistent links. -odbc.allow_persistent = On - -; Check that a connection is still valid before reuse. -odbc.check_persistent = On - -; Maximum number of persistent links. -1 means no limit. -odbc.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -odbc.max_links = -1 - -; Handling of LONG fields. Returns number of bytes to variables. 0 means -; passthru. -odbc.defaultlrl = 4096 - -; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. -; See the documentation on odbc_binmode and odbc_longreadlen for an explanation -; of uodbc.defaultlrl and uodbc.defaultbinmode -odbc.defaultbinmode = 1 - -[MySQL] -; Allow or prevent persistent links. -mysql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mysql.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -mysql.max_links = -1 - -; Default port number for mysql_connect(). If unset, mysql_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. -mysql.default_port = - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysql.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysql.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysql.default_user = - -; Default password for mysql_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysql.default_password = - -; Maximum time (in seconds) for connect timeout. -1 means no limit -mysql.connect_timeout = 60 - -; Trace mode. When trace_mode is active (=On), warnings for table/index scans and -; SQL-Errors will be displayed. -mysql.trace_mode = Off - -[MySQLi] - -; Maximum number of links. -1 means no limit. -mysqli.max_links = -1 - -; Default port number for mysqli_connect(). If unset, mysqli_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. -mysqli.default_port = 3306 - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysqli.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysqli.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysqli.default_user = - -; Default password for mysqli_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysqli.default_pw = - -; Allow or prevent reconnect -mysqli.reconnect = Off - -[mSQL] -; Allow or prevent persistent links. -msql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -msql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -msql.max_links = -1 - -[OCI8] -; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) -;oci8.privileged_connect = Off - -; Connection: The maximum number of persistent OCI8 connections per -; process. Using -1 means no limit. -;oci8.max_persistent = -1 - -; Connection: The maximum number of seconds a process is allowed to -; maintain an idle persistent connection. Using -1 means idle -; persistent connections will be maintained forever. -;oci8.persistent_timeout = -1 - -; Connection: The number of seconds that must pass before issuing a -; ping during oci_pconnect() to check the connection validity. When -; set to 0, each oci_pconnect() will cause a ping. Using -1 disables -; pings completely. -;oci8.ping_interval = 60 - -; Tuning: This option enables statement caching, and specifies how -; many statements to cache. Using 0 disables statement caching. -;oci8.statement_cache_size = 20 - -; Tuning: Enables statement prefetching and sets the default number of -; rows that will be fetched automatically after statement execution. -;oci8.default_prefetch = 10 - -; Compatibility. Using On means oci_close() will not close -; oci_connect() and oci_new_connect() connections. -;oci8.old_oci_close_semantics = Off - -[PostgresSQL] -; Allow or prevent persistent links. -pgsql.allow_persistent = On - -; Detect broken persistent links always with pg_pconnect(). -; Auto reset feature requires a little overheads. -pgsql.auto_reset_persistent = Off - -; Maximum number of persistent links. -1 means no limit. -pgsql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -pgsql.max_links = -1 - -; Ignore PostgreSQL backends Notice message or not. -; Notice message logging require a little overheads. -pgsql.ignore_notice = 0 - -; Log PostgreSQL backends Noitce message or not. -; Unless pgsql.ignore_notice=0, module cannot log notice message. -pgsql.log_notice = 0 - -[Sybase] -; Allow or prevent persistent links. -sybase.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybase.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybase.max_links = -1 - -;sybase.interface_file = "/usr/sybase/interfaces" - -; Minimum error severity to display. -sybase.min_error_severity = 10 - -; Minimum message severity to display. -sybase.min_message_severity = 10 - -; Compatibility mode with old versions of PHP 3.0. -; If on, this will cause PHP to automatically assign types to results according -; to their Sybase type, instead of treating them all as strings. This -; compatibility mode will probably not stay around forever, so try applying -; whatever necessary changes to your code, and turn it off. -sybase.compatability_mode = Off - -[Sybase-CT] -; Allow or prevent persistent links. -sybct.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybct.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybct.max_links = -1 - -; Minimum server message severity to display. -sybct.min_server_severity = 10 - -; Minimum client message severity to display. -sybct.min_client_severity = 10 - -[bcmath] -; Number of decimal digits for all bcmath functions. -bcmath.scale = 0 - -[browscap] -;browscap = extra/browscap.ini - -[Informix] -; Default host for ifx_connect() (doesn't apply in safe mode). -ifx.default_host = - -; Default user for ifx_connect() (doesn't apply in safe mode). -ifx.default_user = - -; Default password for ifx_connect() (doesn't apply in safe mode). -ifx.default_password = - -; Allow or prevent persistent links. -ifx.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -ifx.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -ifx.max_links = -1 - -; If on, select statements return the contents of a text blob instead of its id. -ifx.textasvarchar = 0 - -; If on, select statements return the contents of a byte blob instead of its id. -ifx.byteasvarchar = 0 - -; Trailing blanks are stripped from fixed-length char columns. May help the -; life of Informix SE users. -ifx.charasvarchar = 0 - -; If on, the contents of text and byte blobs are dumped to a file instead of -; keeping them in memory. -ifx.blobinfile = 0 - -; NULL's are returned as empty strings, unless this is set to 1. In that case, -; NULL's are returned as string 'NULL'. -ifx.nullformat = 0 - -[Session] -; Handler used to store/retrieve data. -session.save_handler = files - -; Argument passed to save_handler. In the case of files, this is the path -; where data files are stored. Note: Windows users have to change this -; variable in order to use PHP's session functions. -; -; As of PHP 4.0.1, you can define the path as: -; -; session.save_path = "N;/path" -; -; where N is an integer. Instead of storing all the session files in -; /path, what this will do is use subdirectories N-levels deep, and -; store the session data in those directories. This is useful if you -; or your OS have problems with lots of files in one directory, and is -; a more efficient layout for servers that handle lots of sessions. -; -; NOTE 1: PHP will not create this directory structure automatically. -; You can use the script in the ext/session dir for that purpose. -; NOTE 2: See the section on garbage collection below if you choose to -; use subdirectories for session storage -; -; The file storage module creates files using mode 600 by default. -; You can change that by using -; -; session.save_path = "N;MODE;/path" -; -; where MODE is the octal representation of the mode. Note that this -; does not overwrite the process's umask. -session.save_path = "/tmp" - -; Whether to use cookies. -session.use_cookies = 1 - -;session.cookie_secure = - -; This option enables administrators to make their users invulnerable to -; attacks which involve passing session ids in URLs; defaults to 0. -; session.use_only_cookies = 1 - -; Name of the session (used as cookie name). -session.name = PHPSESSID - -; Initialize session on request startup. -session.auto_start = 0 - -; Lifetime in seconds of cookie or, if 0, until browser is restarted. -session.cookie_lifetime = 0 - -; The path for which the cookie is valid. -session.cookie_path = / - -; The domain for which the cookie is valid. -session.cookie_domain = - -; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. -session.cookie_httponly = - -; Handler used to serialize data. php is the standard serializer of PHP. -session.serialize_handler = php - -; Define the probability that the 'garbage collection' process is started -; on every session initialization. -; The probability is calculated by using gc_probability/gc_divisor, -; e.g. 1/100 means there is a 1% chance that the GC process starts -; on each request. - -session.gc_probability = 1 -session.gc_divisor = 1000 - -; After this number of seconds, stored data will be seen as 'garbage' and -; cleaned up by the garbage collection process. -session.gc_maxlifetime = 1440 - -; NOTE: If you are using the subdirectory option for storing session files -; (see session.save_path above), then garbage collection does *not* -; happen automatically. You will need to do your own garbage -; collection through a shell script, cron entry, or some other method. -; For example, the following script would is the equivalent of -; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): -; cd /path/to/sessions; find -cmin +24 | xargs rm - -; PHP 4.2 and less have an undocumented feature/bug that allows you to -; to initialize a session variable in the global scope, albeit register_globals -; is disabled. PHP 4.3 and later will warn you, if this feature is used. -; You can disable the feature and the warning separately. At this time, -; the warning is only displayed, if bug_compat_42 is enabled. - -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 - -; Check HTTP Referer to invalidate externally stored URLs containing ids. -; HTTP_REFERER has to contain this substring for the session to be -; considered as valid. -session.referer_check = - -; How many bytes to read from the file. -session.entropy_length = 0 - -; Specified here to create the session id. -session.entropy_file = - -;session.entropy_length = 16 - -;session.entropy_file = /dev/urandom - -; Set to {nocache,private,public,} to determine HTTP caching aspects -; or leave this empty to avoid sending anti-caching headers. -session.cache_limiter = nocache - -; Document expires after n minutes. -session.cache_expire = 180 - -; trans sid support is disabled by default. -; Use of trans sid may risk your users security. -; Use this option with caution. -; - User may send URL contains active session ID -; to other person via. email/irc/etc. -; - URL that contains active session ID may be stored -; in publically accessible computer. -; - User may access your site with the same session ID -; always using URL stored in browser's history or bookmarks. -session.use_trans_sid = 0 - -; Select a hash function -; 0: MD5 (128 bits) -; 1: SHA-1 (160 bits) -session.hash_function = 0 - -; Define how many bits are stored in each character when converting -; the binary hash data to something readable. -; -; 4 bits: 0-9, a-f -; 5 bits: 0-9, a-v -; 6 bits: 0-9, a-z, A-Z, "-", "," -session.hash_bits_per_character = 5 - -; The URL rewriter will look for URLs in a defined set of HTML tags. -; form/fieldset are special; if you include them here, the rewriter will -; add a hidden field with the info which is otherwise appended -; to URLs. If you want XHTML conformity, remove the form entry. -; Note that all valid entries require a "=", even if no value follows. -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -[MSSQL] -; Allow or prevent persistent links. -mssql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mssql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -mssql.max_links = -1 - -; Minimum error severity to display. -mssql.min_error_severity = 10 - -; Minimum message severity to display. -mssql.min_message_severity = 10 - -; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off - -; Connect timeout -;mssql.connect_timeout = 5 - -; Query timeout -;mssql.timeout = 60 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textlimit = 4096 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textsize = 4096 - -; Limits the number of records in each batch. 0 = all records in one batch. -;mssql.batchsize = 0 - -; Specify how datetime and datetim4 columns are returned -; On => Returns data converted to SQL server settings -; Off => Returns values as YYYY-MM-DD hh:mm:ss -;mssql.datetimeconvert = On - -; Use NT authentication when connecting to the server -mssql.secure_connection = Off - -; Specify max number of processes. -1 = library default -; msdlib defaults to 25 -; FreeTDS defaults to 4096 -;mssql.max_procs = -1 - -; Specify client character set. -; If empty or not set the client charset from freetds.comf is used -; This is only used when compiled with FreeTDS -;mssql.charset = "ISO-8859-1" - -[Assertion] -; Assert(expr); active by default. -;assert.active = On - -; Issue a PHP warning for each failed assertion. -;assert.warning = On - -; Don't bail out by default. -;assert.bail = Off - -; User-function to be called if an assertion fails. -;assert.callback = 0 - -; Eval the expression with current error_reporting(). Set to true if you want -; error_reporting(0) around the eval(). -;assert.quiet_eval = 0 - -[COM] -; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs -;com.typelib_file = -; allow Distributed-COM calls -;com.allow_dcom = true -; autoregister constants of a components typlib on com_load() -;com.autoregister_typelib = true -; register constants casesensitive -;com.autoregister_casesensitive = false -; show warnings on duplicate constant registrations -;com.autoregister_verbose = true - -[mbstring] -; language for internal character representation. -;mbstring.language = Japanese - -; internal/script encoding. -; Some encoding cannot work as internal encoding. -; (e.g. SJIS, BIG5, ISO-2022-*) -;mbstring.internal_encoding = EUC-JP - -; http input encoding. -;mbstring.http_input = auto - -; http output encoding. mb_output_handler must be -; registered as output buffer to function -;mbstring.http_output = SJIS - -; enable automatic encoding translation according to -; mbstring.internal_encoding setting. Input chars are -; converted to internal encoding by setting this to On. -; Note: Do _not_ use automatic encoding translation for -; portable libs/applications. -;mbstring.encoding_translation = Off - -; automatic encoding detection order. -; auto means -;mbstring.detect_order = auto - -; substitute_character used when character cannot be converted -; one from another -;mbstring.substitute_character = none; - -; overload(replace) single byte functions by mbstring functions. -; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), -; etc. Possible values are 0,1,2,4 or combination of them. -; For example, 7 for overload everything. -; 0: No overload -; 1: Overload mail() function -; 2: Overload str*() functions -; 4: Overload ereg*() functions -;mbstring.func_overload = 0 - -; enable strict encoding detection. -;mbstring.strict_encoding = Off - -[FrontBase] -;fbsql.allow_persistent = On -;fbsql.autocommit = On -;fbsql.show_timestamp_decimals = Off -;fbsql.default_database = -;fbsql.default_database_password = -;fbsql.default_host = -;fbsql.default_password = -;fbsql.default_user = "_SYSTEM" -;fbsql.generate_warnings = Off -;fbsql.max_connections = 128 -;fbsql.max_links = 128 -;fbsql.max_persistent = -1 -;fbsql.max_results = 128 - -[gd] -; Tell the jpeg decode to libjpeg warnings and try to create -; a gd image. The warning will then be displayed as notices -; disabled by default -;gd.jpeg_ignore_warning = 0 - -[exif] -; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. -; With mbstring support this will automatically be converted into the encoding -; given by corresponding encode setting. When empty mbstring.internal_encoding -; is used. For the decode settings you can distinguish between motorola and -; intel byte order. A decode setting cannot be empty. -;exif.encode_unicode = ISO-8859-15 -;exif.decode_unicode_motorola = UCS-2BE -;exif.decode_unicode_intel = UCS-2LE -;exif.encode_jis = -;exif.decode_jis_motorola = JIS -;exif.decode_jis_intel = JIS - -[Tidy] -; The path to a default tidy configuration file to use when using tidy -;tidy.default_config = /usr/local/lib/php/default.tcfg - -; Should tidy clean and repair output automatically? -; WARNING: Do not use this option if you are generating non-html content -; such as dynamic images -tidy.clean_output = Off - -[soap] -; Enables or disables WSDL caching feature. -soap.wsdl_cache_enabled=1 -; Sets the directory name where SOAP extension will put cache files. -soap.wsdl_cache_dir="/tmp" -; (time to live) Sets the number of second while cached file will be used -; instead of original one. -soap.wsdl_cache_ttl=86400 - -; Local Variables: -; tab-width: 4 -; End: Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.patch =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.patch (rev 0) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.patch 2015-11-17 07:30:46 UTC (rev 25381) @@ -0,0 +1,17 @@ +/extension=xsl.so/a +;extension=zip.so +;extension=json.so +;extension=apc.so +;extension=iconv.so +extension=phar.so +;extension=hash.so +. +/extension=xmlrpc.so/a +;extension=dom.so +. +/extension=bz2.so/i +;extension=session.so +;extension=ctype.so +. +w +q This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Nov 18 10:14:44 2015 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 18 Nov 2015 09:14:44 +0000 Subject: SF.net SVN: gar:[25382] csw/mgar/pkg/spamassassin/trunk Message-ID: <3p0z4P74H0zk2@mail.opencsw.org> Revision: 25382 http://sourceforge.net/p/gar/code/25382 Author: bonivart Date: 2015-11-18 09:14:44 +0000 (Wed, 18 Nov 2015) Log Message: ----------- spamassassin/trunk: update to 3.4.1 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2015-11-17 07:30:46 UTC (rev 25381) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2015-11-18 09:14:44 UTC (rev 25382) @@ -1,16 +1,14 @@ NAME = spamassassin SPKG_NAME = Mail-SpamAssassin -VERSION = 3.4.0 +VERSION = 3.4.1 GARTYPE = v2 DESCRIPTION = Mail filter with a wide range of tests define BLURB endef -MASTER_SITES = http://apache.dataphone.se/spamassassin/source/ -#MASTER_SITES = http://people.apache.org/~jm/devel/ +MASTER_SITES = http://apache.mirrors.spacedump.net/spamassassin/source/ DISTFILES = $(SPKG_NAME)-$(VERSION).tar.gz -#DISTFILES = $(SPKG_NAME)-$(VERSION)-rc3.tar.gz DISTFILES += COPYING WORKSRC = $(WORKDIR)/$(SPKG_NAME)-$(VERSION) @@ -112,7 +110,7 @@ test-custom: @echo " ==> Testing $(NAME) (custom)" - @( cd $(WORKSRC) ; \ + ( cd $(WORKSRC) ; \ $(BUILD_ENV) gmake test ) @$(MAKECOOKIE) @@ -142,6 +140,7 @@ mv v312.pre v312.pre.CSW ; \ mv v330.pre v330.pre.CSW ; \ mv v340.pre v340.pre.CSW ; \ + mv v341.pre v341.pre.CSW ; \ mv v320.pre v320.pre.CSW ) @rm -rf $(DESTDIR)/opt/csw/lib @$(MAKECOOKIE) Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2015-11-17 07:30:46 UTC (rev 25381) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2015-11-18 09:14:44 UTC (rev 25382) @@ -1 +1 @@ -5d0b50cee3bfa905cca35c33296c8c2a Mail-SpamAssassin-3.4.0.tar.gz +76eca1f38c11635d319e62c26d5b034b Mail-SpamAssassin-3.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Nov 18 11:49:13 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 18 Nov 2015 10:49:13 +0000 Subject: SF.net SVN: gar:[25383] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: <3p119R1mNSznp@mail.opencsw.org> Revision: 25383 http://sourceforge.net/p/gar/code/25383 Author: janholzh Date: 2015-11-18 10:49:12 +0000 (Wed, 18 Nov 2015) Log Message: ----------- samba/branches/samba4: fix cyclic dependency I hope Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-18 09:14:44 UTC (rev 25382) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-18 10:49:12 UTC (rev 25383) @@ -348,9 +348,9 @@ SPKG_DESC_CSWlibdcerpc-binding0 += $(DESCRIPTION), libdcerpc-binding.so.0 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_$(GAROSREL)) @@ -374,7 +374,6 @@ PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0(\.\d+)*) SPKG_DESC_CSWlibdcerpc-server0 += $(DESCRIPTION), libdcerpc-server.so.0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibssp0 @@ -387,6 +386,7 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamdb0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgensec0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibregistry0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr0 @@ -403,7 +403,6 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-credentials0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-nbt0 @@ -412,6 +411,7 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsmbclient-raw0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgensec0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibdcerpc-binding0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-hostconfig0 @@ -427,7 +427,6 @@ SPKG_DESC_CSWlibgensec0 += $(DESCRIPTION), libgensec.so.0 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-credentials0 @@ -436,6 +435,7 @@ RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamdb0 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibgensec0 += $(RUNTIME_DEP_PKGS_CSWlibgensec0_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += surplus-dependency|CSWsamba4-libs @@ -452,7 +452,6 @@ RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr-standard0 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += $(RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_$(GAROSREL)) PACKAGES += CSWlibndr-nbt0 @@ -462,7 +461,6 @@ RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += $(RUNTIME_DEP_PKGS_CSWlibndr-nbt0_$(GAROSREL)) @@ -476,7 +474,6 @@ RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWsamba4-libs PACKAGES += CSWlibndr0 PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1) @@ -487,7 +484,6 @@ RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibssp0 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibndr0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibndr0 += $(RUNTIME_DEP_PKGS_CSWlibndr0_$(GAROSREL)) PACKAGES += CSWlibnetapi0 @@ -504,7 +500,6 @@ RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsmbconf0 #RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibpdb0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += $(RUNTIME_DEP_PKGS_CSWlibnetapi0_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWlibnetapi0_5.11 += soname-unused @@ -557,7 +552,6 @@ RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_5.11 += soname-unused @@ -567,7 +561,6 @@ PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0\.0\.1) PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsamba-passdb0 += $(DESCRIPTION), libsamba-passdb.so.0 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-credentials0 @@ -577,6 +570,9 @@ RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibwbclient0 PACKAGES += CSWlibsamba-hostconfig0 PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0\.0\.1) @@ -585,7 +581,6 @@ RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_$(GAROSREL)) @@ -614,9 +609,9 @@ RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-util0_$(GAROSREL)) PACKAGES += CSWlibsamdb0 @@ -630,7 +625,6 @@ RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-credentials0 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibsamdb0 += $(RUNTIME_DEP_PKGS_CSWlibsamdb0_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWlibsamdb0_5.11 += soname-unused @@ -643,13 +637,13 @@ RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-credentials0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr-nbt0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgensec0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += $(RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += soname-unused @@ -664,7 +658,6 @@ RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr-standard0 @@ -674,6 +667,7 @@ RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += $(RUNTIME_DEP_PKGS_CSWlibsmbconf0_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += missing-dependency|CSWlibtevent0 @@ -688,11 +682,11 @@ RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += $(RUNTIME_DEP_PKGS_CSWlibsmbldap0_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += missing-dependency|CSWlibtevent0 @@ -705,8 +699,8 @@ SPKG_DESC_CSWlibtevent-util0 += $(DESCRIPTION), libtevent-util.so.0 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtevent0 #CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += missing-dependency|CSWlibtevent0 #CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += surplus-dependency|CSWsamba4-libs @@ -909,7 +903,27 @@ CHECKPKG_OVERRIDES_CSWlibtorture0 += surplus-dependency|CSWlibintl8 CHECKPKG_OVERRIDES_CSWlibndr0 += surplus-dependency|CSWlibintl8 +#Otherwise we get cyclic dependency +CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsamba-util0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibtevent-util0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibgensec0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsamba-hostconfig0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsmbldap0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsamdb0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsamba-passdb0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibndr-nbt0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsmbconf0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibnetapi0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibdcerpc0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibndr-standard0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibndr0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibndr-krb5pac0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += missing-dependency|CSWsamba4-libs + # For checking whether we're missing anything, enable and check when updating. # Should only catch SWAT stuff which is EOL upstream so we're not packaging it # PACKAGES += CSWsamba4-catchall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Nov 18 15:24:58 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 18 Nov 2015 14:24:58 +0000 Subject: SF.net SVN: gar:[25384] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: <3p15yG0lFpztp@mail.opencsw.org> Revision: 25384 http://sourceforge.net/p/gar/code/25384 Author: janholzh Date: 2015-11-18 14:24:58 +0000 (Wed, 18 Nov 2015) Log Message: ----------- samba/branches/samba4: fix another cyclic dependency Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-18 10:49:12 UTC (rev 25383) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-18 14:24:58 UTC (rev 25384) @@ -536,7 +536,6 @@ RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibdcerpc0 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibregistry0 += $(RUNTIME_DEP_PKGS_CSWlibregistry0_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWlibregistry0_5.11 += soname-unused @@ -922,6 +921,7 @@ CHECKPKG_OVERRIDES_CSWlibndr0 += missing-dependency|CSWsamba4-libs CHECKPKG_OVERRIDES_CSWlibndr-krb5pac0 += missing-dependency|CSWsamba4-libs CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += missing-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibregistry0 += missing-dependency|CSWsamba4-libs # For checking whether we're missing anything, enable and check when updating. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Nov 18 17:04:25 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 18 Nov 2015 16:04:25 +0000 Subject: SF.net SVN: gar:[25385] csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Message-ID: <3p18974v0xzy1@mail.opencsw.org> Revision: 25385 http://sourceforge.net/p/gar/code/25385 Author: cgrzemba Date: 2015-11-18 16:04:24 +0000 (Wed, 18 Nov 2015) Log Message: ----------- php5/branches/php-5.6.x: add some runtime dependencies for SPRAC Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-18 14:24:58 UTC (rev 25384) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-18 16:04:24 UTC (rev 25385) @@ -98,9 +98,9 @@ PACKAGES += CSWphp5-$(subst _,-,$(1)) CATALOGNAME_CSWphp5-$(subst _,-,$(1)) ?= php5_$(subst -,_,$(1)) SPKG_DESC_CSWphp5-$(subst _,-,$(1)) ?= The $(1) extention for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5 $(2) +RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) += CSWphp5 $(2) # OBSOLETED_BY_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5$(subst _,-,$(1)) -PKGFILES_CSWphp5-$(subst _,-,$(1)) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1) +PKGFILES_CSWphp5-$(subst _,-,$(1)) += .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1) # CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5 endef @@ -148,7 +148,6 @@ PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/xml.* PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/php-config.1 PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/phpize.1 -CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool @@ -194,12 +193,19 @@ $(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0)) $(eval $(call php5_subpackage,calendar,)) $(eval $(call php5_subpackage,ctype,)) +RUNTIME_DEP_PKGS_CSWphp5-curl_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWphp5-curl += $(RUNTIME_DEP_PKGS_CSWphp5-curl_$(GARCH)) $(eval $(call php5_subpackage,curl,CSWlibcurl4)) $(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42)) $(eval $(call php5_subpackage,dom,CSWlibxml2-2)) PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* $(eval $(call php5_subpackage,exif,)) $(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0)) +RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibpng16-16 +RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWphp5-gd += $(RUNTIME_DEP_PKGS_CSWphp5-gd_$(GARCH)) $(eval $(call php5_subpackage,gd,CSWlibgd3 CSWlibt1-5 CSWlibxpm4)) PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* $(eval $(call php5_subpackage,gettext,CSWlibintl8)) @@ -209,18 +215,21 @@ $(eval $(call php5_subpackage,iconv,CSWlibiconv2)) PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* $(eval $(call php5_subpackage,imap,CSWlibc-client-dev)) - $(eval $(call php5_subpackage,json,)) $(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2)) $(eval $(call php5_subpackage,mbstring,)) PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* +RUNTIME_DEP_PKGS_CSWphp5-mcrypt_sparc += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWphp5-mcrypt += $(RUNTIME_DEP_PKGS_CSWphp5-mcrypt_$(GARCH)) $(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4)) $(eval $(call php5_subpackage,mssql,CSWlibsybdb5)) $(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibssl1-0-0)) # likely a checkpkg glitch (uses sparcv8plus+vis path for the library) -CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibssl1-0-0 +CHECKPKG_OVERRIDES_CSWphp5-mysql_sparc += surplus-dependency|CSWlibssl1-0-0 $(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18)) $(eval $(call php5_subpackage,odbc,CSWlibodbc2)) +RUNTIME_DEP_PKGS_CSWphp5-openssl_sparc += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWphp5-openssl += $(RUNTIME_DEP_PKGS_CSWphp5-openssl_$(GARCH)) $(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0)) $(eval $(call php5_subpackage,pcntl,)) $(eval $(call php5_subpackage,pdo,)) @@ -229,25 +238,23 @@ PKGFILES_CSWphp5-pdomysql += .*/lib/php/extensions/.*/pdo_mysql.so PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo -CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdoodbc,CSWlibodbc2 CSWphp5-pdo)) PKGFILES_CSWphp5-pdoodbc += .*/lib/php/extensions/.*/pdo_odbc.so PKGFILES_CSWphp5-pdoodbc += .*extensions/pdo_odbc CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo -CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdopgsql,CSWlibpq5 CSWphp5-pdo)) PKGFILES_CSWphp5-pdopgsql += .*/lib/php/extensions/.*/pdo_pgsql.so PKGFILES_CSWphp5-pdopgsql += .*extensions/pdo_pgsql CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo -CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pdosqlite,CSWphp5-pdo CSWlibsqlite3-0)) PKGFILES_CSWphp5-pdosqlite += .*/lib/php/extensions/.*/pdo_sqlite.so PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo -CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 $(eval $(call php5_subpackage,pgsql,CSWlibpq5)) $(eval $(call php5_subpackage,posix,)) $(eval $(call php5_subpackage,pspell,CSWlibaspell15)) +RUNTIME_DEP_PKGS_CSWphp5-readline_sparc += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWphp5-readline += $(RUNTIME_DEP_PKGS_CSWphp5-readline_$(GARCH)) $(eval $(call php5_subpackage,readline,CSWlibreadline6)) $(eval $(call php5_subpackage,session,CSWlibmm)) PKGFILES_CSWphp5-session += .*/include/php/ext/session.* @@ -265,6 +272,8 @@ $(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2)) $(eval $(call php5_subpackage,xmlrpc,CSWlibiconv2 CSWlibexpat1)) $(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2)) +RUNTIME_DEP_PKGS_CSWphp5-xsl_sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWphp5-xsl += $(RUNTIME_DEP_PKGS_CSWphp5-xsl_$(GARCH)) $(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0)) $(eval $(call php5_subpackage,zip,CSWlibz1)) # $(eval $(call php5_subpackage,ibm_db2,)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 18 20:23:16 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Nov 2015 19:23:16 +0000 Subject: SF.net SVN: gar:[25386] csw/mgar/pkg/flex/trunk Message-ID: <3p1DZS2fSHz13b@mail.opencsw.org> Revision: 25386 http://sourceforge.net/p/gar/code/25386 Author: dmichelsen Date: 2015-11-18 19:23:16 +0000 (Wed, 18 Nov 2015) Log Message: ----------- flex/trunk: Update to 2.6.0 Modified Paths: -------------- csw/mgar/pkg/flex/trunk/Makefile csw/mgar/pkg/flex/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch Modified: csw/mgar/pkg/flex/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex/trunk/Makefile 2015-11-18 16:04:24 UTC (rev 25385) +++ csw/mgar/pkg/flex/trunk/Makefile 2015-11-18 19:23:16 UTC (rev 25386) @@ -1,7 +1,7 @@ # $Id$ NAME = flex -VERSION = 2.5.39 +VERSION = 2.6.0 GARTYPE = v2 DESCRIPTION = A tool for generating text-scanning programs @@ -16,10 +16,6 @@ MASTER_SITES += $(SF_MIRRORS) DISTFILES += $(DISTNAME).tar.xz -# This is probably the same cause as the bug reported here: -# https://sourceforge.net/p/flex/bugs/170/ -PATCHFILES += 0001-Allow-undefined-symbols-in-shared-libs.patch - VENDOR_URL = http://flex.sourceforge.net/ PACKAGES += CSWflex @@ -47,16 +43,6 @@ # Must use GNU diff for option '-q' or two tests fail due to bailing out Sun diff TEST_ENV_PATH = $(prefix)/gnu:$(PATH) -# There are two tests failing, this is a known issue: -# Executing test test-bison-yylloc -# Test test-bison-yylloc FAILED. See test-bison-yylloc/OUTPUT for details. -# Executing test test-bison-yylval -# Test test-bison-yylval FAILED. See test-bison-yylval/OUTPUT for details. -# See for details -# https://sourceforge.net/p/flex/bugs/144/ - -SKIPTEST ?= 1 - include gar/category.mk post-install: Modified: csw/mgar/pkg/flex/trunk/checksums =================================================================== --- csw/mgar/pkg/flex/trunk/checksums 2015-11-18 16:04:24 UTC (rev 25385) +++ csw/mgar/pkg/flex/trunk/checksums 2015-11-18 19:23:16 UTC (rev 25386) @@ -1 +1 @@ -477679c37ff8b28248a9b05f1da29a82 flex-2.5.39.tar.xz +3cbbfa1554d0b75fad9f8100732454de flex-2.6.0.tar.xz Deleted: csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch =================================================================== --- csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch 2015-11-18 16:04:24 UTC (rev 25385) +++ csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch 2015-11-18 19:23:16 UTC (rev 25386) @@ -1,31 +0,0 @@ -From a7dde1d6fa77d36ce1b6f87f48f5d0ed731a12be Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 5 May 2014 15:36:28 +0200 -Subject: [PATCH] Allow undefined symbols in shared libs - ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 86e31c1..ec16e01 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -435,12 +435,12 @@ libfl_la_SOURCES = \ - libmain.c \ - libyywrap.c - --libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ -+libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ - libfl_pic_la_SOURCES = \ - libmain.c \ - libyywrap.c - --libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ -+libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ - noinst_HEADERS = \ - flexdef.h \ - flexint.h \ --- -1.8.4.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Nov 19 09:35:02 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 19 Nov 2015 08:35:02 +0000 Subject: SF.net SVN: gar:[25387] csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Message-ID: <3p1Z814zNlz1FN@mail.opencsw.org> Revision: 25387 http://sourceforge.net/p/gar/code/25387 Author: cgrzemba Date: 2015-11-19 08:35:02 +0000 (Thu, 19 Nov 2015) Log Message: ----------- php5/branches/php-5.6.x: checkpkg cant resolve hard linked library i386/libssl.so.1.0.0? Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-18 19:23:16 UTC (rev 25386) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-19 08:35:02 UTC (rev 25387) @@ -225,7 +225,7 @@ $(eval $(call php5_subpackage,mssql,CSWlibsybdb5)) $(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibssl1-0-0)) # likely a checkpkg glitch (uses sparcv8plus+vis path for the library) -CHECKPKG_OVERRIDES_CSWphp5-mysql_sparc += surplus-dependency|CSWlibssl1-0-0 +CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibssl1-0-0 $(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18)) $(eval $(call php5_subpackage,odbc,CSWlibodbc2)) RUNTIME_DEP_PKGS_CSWphp5-openssl_sparc += CSWlibkrb5-3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Nov 19 10:55:14 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 19 Nov 2015 09:55:14 +0000 Subject: SF.net SVN: gar:[25388] csw/mgar/pkg/389-admin/trunk/Makefile Message-ID: <3p1bwf4b8Kz1JX@mail.opencsw.org> Revision: 25388 http://sourceforge.net/p/gar/code/25388 Author: cgrzemba Date: 2015-11-19 09:55:13 +0000 (Thu, 19 Nov 2015) Log Message: ----------- 389-admin/trunk: add runtime dependencies SPRAC Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2015-11-19 08:35:02 UTC (rev 25387) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2015-11-19 09:55:13 UTC (rev 25388) @@ -88,8 +88,12 @@ RUNTIME_DEP_PKGS_CSW389-admin += CSWpm-netaddr-ip RUNTIME_DEP_PKGS_CSW389-admin_openldap += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSW389-admin += $(RUNTIME_DEP_PKGS_CSW389-admin_$(LDAP_API)) +RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicui18n55 +RUNTIME_DEP_PKGS_CSW389-admin_sparc += CSWlibicuuc55 RUNTIME_DEP_PKGS_CSW389-admin += $(RUNTIME_DEP_PKGS_CSW389-admin_$(GARCH)) + CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2modnss CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSW389-admin-console CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSW389-ds-console This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Nov 19 11:15:53 2015 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 19 Nov 2015 10:15:53 +0000 Subject: SF.net SVN: gar:[25389] csw/mgar/pkg/spamassassin/trunk Message-ID: <3p1cNN1LLbz1M5@mail.opencsw.org> Revision: 25389 http://sourceforge.net/p/gar/code/25389 Author: bonivart Date: 2015-11-19 10:15:53 +0000 (Thu, 19 Nov 2015) Log Message: ----------- spamassassin/trunk: fix rc-script and add dep Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2015-11-19 09:55:13 UTC (rev 25388) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2015-11-19 10:15:53 UTC (rev 25389) @@ -27,6 +27,7 @@ RUNTIME_DEP_PKGS += CSWpmmailtools RUNTIME_DEP_PKGS += CSWpm-mime-base64 RUNTIME_DEP_PKGS += CSWpm-netaddr-ip +RUNTIME_DEP_PKGS += CSWpmnetcidrlite RUNTIME_DEP_PKGS += CSWpm-net-dns RUNTIME_DEP_PKGS += CSWpm-uri RUNTIME_DEP_PKGS += CSWrazor @@ -91,6 +92,7 @@ CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-io-zlib CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-uri CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-net-dns +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmnetcidrlite include gar/category.mk Modified: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2015-11-19 09:55:13 UTC (rev 25388) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2015-11-19 10:15:53 UTC (rev 25389) @@ -4,7 +4,7 @@ #RC_SLEV 3 # rc-script for CSW SpamAssassin -# Peter Bonivart, 2013-08-30 +# Peter Bonivart, 2015-11-19 # Source SMF includes [ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh @@ -21,7 +21,7 @@ case "$1" in start) if [ -x /opt/csw/bin/spamd ]; then - if [ -d /var/opt/csw/spamassassin/3.003002 ]; then + if [ -d /var/opt/csw/spamassassin/3.004001 ]; then echo "Starting $PROG." /opt/csw/bin/spamd -d $OPTIONS else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Nov 19 11:58:39 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 19 Nov 2015 10:58:39 +0000 Subject: SF.net SVN: gar:[25390] csw/mgar/pkg/samba/branches/samba4 Message-ID: <3p1dM14KHlz1SF@mail.opencsw.org> Revision: 25390 http://sourceforge.net/p/gar/code/25390 Author: janholzh Date: 2015-11-19 10:58:39 +0000 (Thu, 19 Nov 2015) Log Message: ----------- samba/branches/samba4: remove splitting needs more work Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Added Paths: ----------- csw/mgar/pkg/samba/branches/samba4/Makefile.split Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-19 10:15:53 UTC (rev 25389) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-19 10:58:39 UTC (rev 25390) @@ -98,7 +98,7 @@ SMB_MANPAGES += lmhosts\.5 smb.conf\.5 smbpasswd\.5 smbgetrc\.5 SMB_MANPAGES += samba\.7 SMB_MANPAGES += net\.8 pdbedit\.8 eventlogadm\.8 smbd\.8 nmbd\.8 samba\.8 samba-tool\.8 smbpasswd\.8 smbspool\.8 smbta-util\.8 -SMB_MANPAGES += tdbbackup\.8 tdbdump\.8 tdbrestore\.8 tdbtool\.8 +SMB_MANPAGES += tdbbackup\.8 tdbdump\.8 tdbrestore\.8 tdbtool\.8 samba-regedit\.8 PKGFILES_CSWsamba4 += $(call baseisadirs,$(sysconfdir),init\.d/cswsamba4) PKGFILES_CSWsamba4 += $(call baseisadirs,$(sysconfdir),openldap/schema/samba\.schema) PKGFILES_CSWsamba4 += $(foreach B,$(SMB_BINS),$(call baseisadirs,$(bindir),$B)) @@ -113,40 +113,21 @@ 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 += /etc/opt/csw/samba/.* +PKGFILES_CSWsamba4 += /var/opt/csw/samba/.* + +RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-python +RUNTIME_DEP_PKGS_CSWsamba4 += CSWpython27 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-client RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-passdb0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsamba4_5.11 += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWperl RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr-nbt0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbconf0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr-standard0 -#RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpdb0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbldap0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient-raw0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtorture0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibregistry0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibnetapi0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibdcerpc-server0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL)) # Silence conflicts with CSWsamba CHECKPKG_OVERRIDES_CSWsamba4 += file-collision @@ -154,6 +135,9 @@ CHECKPKG_OVERRIDES_CSWsamba4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/mit_samba.so|soname=mit_samba.so|pkgname=CSWsamba4|expected=CSWmit-samba CHECKPKG_OVERRIDES_CSWsamba4 += soname-equals-filename|file=/opt/csw/lib/mit_samba.so CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWpython27 +CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-python #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibwbclient0 #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibtevent0 @@ -172,31 +156,13 @@ SMB_CLIENT_BINS += ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(bindir),$C)) PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(mandir),man1/$C\.1)) -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-passdb0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbclient0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibndr-nbt0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbconf0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibndr-standard0 -#RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpdb0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibregistry0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbclient-raw0 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibform5 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel5 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += missing-dependency|CSWlibtevent0 @@ -238,32 +204,10 @@ PKGFILES_CSWsamba4-dev += $(libdir)/pkgconfig/.*\.pc PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3 PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3perl -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-passdb0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-atsvc0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibregistry0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtorture0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-nbt0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbclient-raw0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-policy0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamdb0 + RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-winbind -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-krb5pac0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr0 -#RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibpdb0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbconf0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-samr0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibnetapi0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbldap0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-standard0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-dev += $(RUNTIME_DEP_PKGS_CSWsamba4-dev_$(GAROSREL)) CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/smb_share_modes.h|CSWsamba-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/share/man/man3/talloc.3|CSWlibtalloc-dev|CSWsamba4-dev @@ -272,6 +216,8 @@ CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/netapi.h|CSWsamba-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/pytalloc.h|CSWpy-talloc-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/wbclient.h|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/libsmbclient.so|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/libwbclient.so|CSWsamba-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4-winbind CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4 INCOMPATIBLE_PKGS_CSWsamba4-dev += CSWsamba-dev @@ -283,13 +229,12 @@ 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 -# PKGFILES_CSWsamba4-libs += $(foreach L,$(SMB_LIBS),$(call pkgfiles_lib,$L)) +SMB_LIBS += libtorture.so.0 libsamba-passdb.so.0 libsmbclient.so.0 libwbclient.so.0 + +PKGFILES_CSWsamba4-libs += $(foreach L,$(SMB_LIBS),$(call pkgfiles_lib,$L)) PKGFILES_CSWsamba4-libs += $(SMBPRIVATELIB)/.* PKGFILES_CSWsamba4-libs += $(mandir)/man7/libsmbclient.7 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-passdb0 + RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibz1 @@ -298,30 +243,12 @@ RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibfam0 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr-nbt0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsmbconf0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr-standard0 -#RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpdb0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsmbldap0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdcerpc-server0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibnetapi0 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr0 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgnutls28 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsmbclient-raw0 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4-libs += $(RUNTIME_DEP_PKGS_CSWsamba4-libs_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/share/man/man7/libsmbclient.7|CSWlibsmbclient0|CSWsamba4-libs @@ -329,425 +256,50 @@ #CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibwbclient0 #CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibtevent0 CHECKPKG_OVERRIDES_CSWsamba4-libs += $(CHECKPKG_OVERRIDES_CSWsamba4-libs_$(GAROSREL)) -INCOMPATIBLE_PKGS_CSWsamba4-libs += CSWlibwbclient0 CSWlibsmbclient0 CSWlibnetapi0 CSWlibsmbsharemodes0 -PACKAGES += CSWlibdcerpc-atsvc0 -PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0\.0\.1) -PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibdcerpc-atsvc0 += $(DESCRIPTION), libdcerpc-atsvc.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0_(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0_5.11 += soname-unused -CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0_$(GAROSREL)) +#Needs splits: -PACKAGES += CSWlibdcerpc-binding0 -PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0\.0\.1) -PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibdcerpc-binding0 += $(DESCRIPTION), libdcerpc-binding.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += missing-dependency|CSWlibtevent0 -#CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += surplus-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc-atsvc.so.0.0.1|soname=libdcerpc-atsvc.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc-atsvc0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc-binding.so.0.0.1|soname=libdcerpc-binding.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc-binding0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc-samr.so.0.0.1|soname=libdcerpc-samr.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc-samr0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc-server.so.0.0.1|soname=libdcerpc-server.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc-server0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc.so.0.0.1|soname=libdcerpc.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgensec.so.0.0.1|soname=libgensec.so.0|pkgname=CSWsamba4-libs|expected=CSWlibgensec0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr-krb5pac.so.0.0.1|soname=libndr-krb5pac.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr-krb5pac0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr-nbt.so.0.0.1|soname=libndr-nbt.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr-nbt0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr-standard.so.0.0.1|soname=libndr-standard.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr-standard0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr.so.0.0.5|soname=libndr.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libnetapi.so.0|soname=libnetapi.so.0|pkgname=CSWsamba4-libs|expected=CSWlibnetapi0 +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-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 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbclient-raw.so.0.0.1|soname=libsmbclient-raw.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbclient-raw0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbclient.so.0.2.3|soname=libsmbclient.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbclient0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbconf.so.0|soname=libsmbconf.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbconf0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbldap.so.0|soname=libsmbldap.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbldap0 +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 -PACKAGES += CSWlibdcerpc-samr0 -PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0\.0\.1) -PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibdcerpc-samr0 += $(DESCRIPTION), libdcerpc-samr.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0_5.11 += soname-unused -CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0_$(GAROSREL)) +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 +CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/lib/libsmbclient.so.0|CSWlibsmbclient0|CSWsamba4-libs -PACKAGES += CSWlibdcerpc-server0 -PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0\.0\.1) -PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibdcerpc-server0 += $(DESCRIPTION), libdcerpc-server.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgnutls28 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr-standard0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibregistry0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += missing-dependency|CSWlibtevent0 -#CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += surplus-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_$(GAROSREL)) +INCOMPATIBLE_PKGS_CSWsamba4-libs += CSWlibwbclient0 CSWlibsmbclient0 CSWlibnetapi0 -PACKAGES += CSWlibdcerpc0 -PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0\.0\.1) -PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibdcerpc0 += $(DESCRIPTION), libdcerpc.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-nbt0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-standard0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsmbclient-raw0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += missing-dependency|CSWlibtevent0 -#CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += surplus-dependency|CSWsamba4-libs -#CHECKPKG_OVERRIDES_CSWlibdcerpc0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc0_$(GAROSREL)) -PACKAGES += CSWlibgensec0 -PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0\.0\.1) -PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibgensec0 += $(DESCRIPTION), libgensec.so.0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += $(RUNTIME_DEP_PKGS_CSWlibgensec0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += surplus-dependency|CSWsamba4-libs -#CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += missing-dependency|CSWlibtevent0 -#CHECKPKG_OVERRIDES_CSWlibgensec += $(CHECKPKG_OVERRIDES_CSWlibgensec_$(GAROSREL)) - -PACKAGES += CSWlibndr-krb5pac0 -PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0\.0\.1) -PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibndr-krb5pac0 += $(DESCRIPTION), libndr-krb5pac.so.0 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr-standard0 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += $(RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_$(GAROSREL)) - -PACKAGES += CSWlibndr-nbt0 -PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0\.0\.1) -PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibndr-nbt0 += $(DESCRIPTION), libndr-nbt.so.0 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += $(RUNTIME_DEP_PKGS_CSWlibndr-nbt0_$(GAROSREL)) - -PACKAGES += CSWlibndr-standard0 -PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0\.0\.1) -PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibndr-standard0 += $(DESCRIPTION), libndr-standard.so.0 -RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibndr0 - -PACKAGES += CSWlibndr0 -PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1) -PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibndr0 += $(DESCRIPTION), libndr.so.0 -RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibndr0 += $(RUNTIME_DEP_PKGS_CSWlibndr0_$(GAROSREL)) - -PACKAGES += CSWlibnetapi0 -PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0) -PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibnetapi0 += $(DESCRIPTION), libnetapi.so.0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-passdb0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr-standard0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsmbconf0 -#RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibpdb0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += $(RUNTIME_DEP_PKGS_CSWlibnetapi0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibnetapi0_5.11 += soname-unused -CHECKPKG_OVERRIDES_CSWlibnetapi0 += $(CHECKPKG_OVERRIDES_CSWlibnetapi0_$(GAROSREL)) - -#PACKAGES += CSWlibpdb0 -#PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0) -#PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0(\.\d+)*) -#SPKG_DESC_CSWlibpdb0 += $(DESCRIPTION), libpdb.so.0 -#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibgcc-s1 -#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2 -#RUNTIME_DEP_PKGS_CSWlibpdb0_5.11 += CSWlibintl8 -#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1 -#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-util0 -#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsmbconf0 -#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-hostconfig0 -#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamdb0 -#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWsamba4-libs -#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibndr0 -#RUNTIME_DEP_PKGS_CSWlibpdb0 += $(RUNTIME_DEP_PKGS_CSWlibpdb0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += missing-dependency|CSWlibwbclient0 -#CHECKPKG_OVERRIDES_CSWlibpdb0 += $(CHECKPKG_OVERRIDES_CSWlibpdb0_$(GAROSREL)) - -PACKAGES += CSWlibregistry0 -PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0\.0\.1) -PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibregistry0 += $(DESCRIPTION), libregistry.so.0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibndr-standard0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += $(RUNTIME_DEP_PKGS_CSWlibregistry0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibregistry0_5.11 += soname-unused -CHECKPKG_OVERRIDES_CSWlibregistry0 += $(CHECKPKG_OVERRIDES_CSWlibregistry0_$(GAROSREL)) - -PACKAGES += CSWlibsamba-credentials0 -PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0\.0\.1) -PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibsamba-credentials0 += $(DESCRIPTION), libsamba-credentials.so.0 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += $(CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_$(GAROSREL)) - -PACKAGES += CSWlibsamba-passdb0 -PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0\.0\.1) -PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibsamba-passdb0 += $(DESCRIPTION), libsamba-passdb.so.0 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsmbconf0 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibwbclient0 - -PACKAGES += CSWlibsamba-hostconfig0 -PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0\.0\.1) -PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibsamba-hostconfig0 += $(DESCRIPTION), libsamba-hostconfig.so.0 -RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_$(GAROSREL)) - -PACKAGES += CSWlibsamba-policy0 -PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0\.0\.1) -PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibsamba-policy0 += $(DESCRIPTION), libsamba-policy.so.0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsmbclient-raw0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-policy0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibsamba-policy0_5.11 += soname-unused -CHECKPKG_OVERRIDES_CSWlibsamba-policy0 += $(CHECKPKG_OVERRIDES_CSWlibsamba-policy0_$(GAROSREL)) - -PACKAGES += CSWlibsamba-util0 -PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0\.0\.1) -PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibsamba-util0 += $(DESCRIPTION), libsamba-util.so.0 -RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibsamba-util0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-util0_$(GAROSREL)) - -PACKAGES += CSWlibsamdb0 -PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0\.0\.1) -PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibsamdb0 += $(DESCRIPTION), libsamdb.so.0 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += $(RUNTIME_DEP_PKGS_CSWlibsamdb0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibsamdb0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibsamdb0 += $(CHECKPKG_OVERRIDES_CSWlibsamdb0_$(GAROSREL)) - -PACKAGES += CSWlibsmbclient-raw0 -PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0\.0\.1) -PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibsmbclient-raw0 += $(DESCRIPTION), libsmbclient-raw.so.0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr-nbt0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += $(RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += missing-dependency|CSWlibtevent0 -#CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += surplus-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += $(CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_$(GAROSREL)) - -PACKAGES += CSWlibsmbconf0 -PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0) -PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibsmbconf0 += $(DESCRIPTION), libsmbconf.so.0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr-standard0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += $(RUNTIME_DEP_PKGS_CSWlibsmbconf0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += missing-dependency|CSWlibtevent0 -#CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += surplus-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibsmbconf0 += $(CHECKPKG_OVERRIDES_CSWlibsmbconf0_$(GAROSREL)) - -PACKAGES += CSWlibsmbldap0 -PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0) -PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibsmbldap0 += $(DESCRIPTION), libsmbldap.so.0 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += $(RUNTIME_DEP_PKGS_CSWlibsmbldap0_$(GAROSREL)) -#CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += missing-dependency|CSWlibtevent0 -#CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += surplus-dependency|CSWsamba4-libs -#CHECKPKG_OVERRIDES_CSWlibsmbldap0 += $(CHECKPKG_OVERRIDES_CSWlibsmbldap0_$(GAROSREL)) - -PACKAGES += CSWlibtevent-util0 -PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0\.0\.1) -PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibtevent-util0 += $(DESCRIPTION), libtevent-util.so.0 -RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtevent0 -#CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += soname-unused -#CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += missing-dependency|CSWlibtevent0 -#CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += surplus-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibtevent-util0 += $(CHECKPKG_OVERRIDES_CSWlibtevent-util0_$(GAROSREL)) - -PACKAGES += CSWlibtorture0 -PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0\.0\.1) -PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibtorture0 += $(DESCRIPTION), libtorture.so.0 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibtorture0 += $(RUNTIME_DEP_PKGS_CSWlibtorture0_$(GAROSREL)) - # Python package PACKAGES += CSWsamba4-python SPKG_DESC_CSWsamba4-python = Samba 4 python files PKGFILES_CSWsamba4-python += $(call baseisadirs,$(libdir),python2.7/site-packages/.*) -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-passdb0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-7-1-0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpytalloc-util2 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr-standard0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr-nbt0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsmbconf0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-credentials0 -#RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpdb0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-policy0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibregistry0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsmbclient-raw0 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/provision/backend.py @@ -783,25 +335,12 @@ PKGFILES_CSWsamba4-winbind += $(sysconfdir)/init.d/cswwinbind4 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-passdb0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibndr-standard0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-util0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsmbconf0 -#RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpdb0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibndr0 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWnss-winbind1 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWwinbind-krb5locator +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4-winbind += $(RUNTIME_DEP_PKGS_CSWsamba4-winbind_$(GAROSREL)) CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWnss-winbind1 CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWwinbind-krb5locator @@ -819,7 +358,6 @@ PKGFILES_CSWnss-winbind1 += $(call baseisadirs,$(libdir),nss_winbind\.so\.1) PKGFILES_CSWnss-winbind1 += $(call baseisadirs,$(libdir),nss_winbind\.so\.1(\.\d+)*) SPKG_DESC_CSWnss-winbind1 += $(DESCRIPTION), nss_winbind.so.1 -RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibssp0 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWsamba4-libs @@ -832,7 +370,6 @@ PKGFILES_CSWwinbind-krb5locator += $(call baseisadirs,$(libdir),winbind_krb5_locator\.so(\.\d+)*) SPKG_DESC_CSWwinbind-krb5locator += $(DESCRIPTION), winbind_krb5_locator.so RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibintl8 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWwinbind-krb5locator += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so @@ -871,59 +408,8 @@ CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4 CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_$(GAROSREL)) -#Add more overrides. These should only apply to x86 and should be put in the right place in the future. -CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += surplus-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibndr-krb5pac0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibregistry0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibsamdb0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibsamba-hostconfig0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibsamba-policy0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibgensec0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibnetapi0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibndr-nbt0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibsamba-passdb0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibsmbldap0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0 += surplus-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibsamba-util0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibtevent-util0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWsamba4-client += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWnss-winbind1 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWsamba4-python += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWwinbind-krb5locator += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibsmbconf0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibndr-standard0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibdcerpc0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibtorture0 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibndr0 += surplus-dependency|CSWlibintl8 -#Otherwise we get cyclic dependency -CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibsamba-util0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibtevent-util0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibgensec0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibsamba-hostconfig0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibsmbldap0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibsamdb0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibsamba-passdb0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibndr-nbt0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibsmbconf0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibnetapi0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibdcerpc0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibndr-standard0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibndr0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibndr-krb5pac0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += missing-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibregistry0 += missing-dependency|CSWsamba4-libs - # For checking whether we're missing anything, enable and check when updating. # Should only catch SWAT stuff which is EOL upstream so we're not packaging it # PACKAGES += CSWsamba4-catchall @@ -971,8 +457,9 @@ CONFIGURE_ARGS += --with-modulesdir=$(SMBPRIVATELIB) CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR) # to stay with the one build with samba 3 build these are private -CONFIGURE_ARGS += --private-libraries=smbclient,smbsharemodes,wbclient -CONFIGURE_ARGS += --bundled-libraries=heimdal,!zlib,!popt,talloc,pytalloc,pytalloc-util,tevent,pytevent,tdb,pytdb,ldb,pyldb +# Disabled for now needs more work +#CONFIGURE_ARGS += --private-libraries=smbclient,smbsharemodes,wbclient,tevent +#CONFIGURE_ARGS += --bundled-libraries=heimdal,!zlib,!popt,talloc,pytalloc,pytalloc-util,tevent,pytevent,tdb,pytdb,ldb,pyldb TEST_TARGET = test Copied: csw/mgar/pkg/samba/branches/samba4/Makefile.split (from rev 25384, csw/mgar/pkg/samba/branches/samba4/Makefile) =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile.split (rev 0) +++ csw/mgar/pkg/samba/branches/samba4/Makefile.split 2015-11-19 10:58:39 UTC (rev 25390) @@ -0,0 +1,1043 @@ +# Work torwards libary split. Need more work so it does not pull in old samba3 libs etc +NAME = samba +VERSION = 4.3.1 +GARTYPE = v2 + +DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) +define BLURB + Tools to access a servers filespace and printers via SMB (server) +endef + +MASTER_SITES = http://samba.org/samba/ftp/stable/ +DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += cswsamba +DISTFILES += cswwinbind +# From http://www.reallylinux.com/docs/smb.conf +DISTFILES += smb.conf +# This is taken from the old Samba package +DISTFILES += cswkrb5.conf +EXPANDVARS += cswsamba +EXPANDVARS += cswwinbind +EXPANDVARS += smb.conf + +GARCOMPILER = GNU +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +BUILD_DEP_PKGS += CSWlibtalloc-dev +BUILD_DEP_PKGS += CSWlibpopt-dev +BUILD_DEP_PKGS += CSWlibgamin-dev +BUILD_DEP_PKGS += CSWlibintl8 +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWdocbookxsl +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev + +PATCHFILES += 0001-fix-xml.patch +# From https://bugzilla.samba.org/show_bug.cgi?id=7588 +PATCHFILES += nss_winbind.patch +PATCHFILES += smbd_patch_for_setgroups.patch + +# From https://bugzilla.samba.org/show_bug.cgi?id=10112 +#PATCHFILES += 0003-Use-R-linker-flag-instead-of-rpath.patch +# Help the script to find the username +#PATCHFILES += 0004-solaris-id-is-not-xpg4.patch + +#From https://bugzilla.samba.org/show_bug.cgi?id=11359 +#PATCHFILES += fix_bugid_11359 + +#From https://bugzilla.samba.org/show_bug.cgi?id=10877 +#PATCHFILES +=fix_bugid_10877 + +#From https://bugzilla.samba.org/show_bug.cgi?id=11053 +#PATCHFILES +=fix_bugid_11053 + +#From https://bugzilla.samba.org/show_bug.cgi?id=11508 +#PATCHFILES +=fix_bugid_11508 + +#From https://bugzilla.samba.org/show_bug.cgi?id=11511 +PATCHFILES +=fix_bugid_11511 + +#From https://bugzilla.samba.org/show_bug.cgi?id=11512 +PATCHFILES +=fix_bugid_11512 + +#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 + +NOGITPATCH += 1 + +# Filesystem layout +SMBLOCKDIR = $(localstatedir)/samba/locks +SMBLOGDIR = $(localstatedir)/samba/log +SMBPRIVATEDIR = $(sysconfdir)/samba/private +SMBCONFIGDIR = $(sysconfdir)/samba +SMBPRIVATELIB = $(libdir)/samba4 + +# List of modules and libraries +SMB_VFS_MODULES_A = vfs_audit,vfs_extd_audit,vfs_full_audit,vfs_fake_perms,vfs_fake_acls +SMB_VFS_MODULES_B = vfs_recycle,vfs_netatalk,vfs_readonly,vfs_cap,vfs_expand_msdfs,vfs_shadow_copy,vfs_shadow_copy2 +#Solaris_acl needs to be linked static +#SMB_VFS_MODULES_C = vfs_xattr_tdb,vfs_posix_eadb,vfs_solarisacl,vfs_zfsacl,vfs_catia +SMB_VFS_MODULES_C = vfs_xattr_tdb,vfs_posix_eadb,vfs_zfsacl,vfs_catia +SMB_VFS_MODULES_D = vfs_streams_xattr,vfs_streams_depot,vfs_cacheprime,vfs_prealloc,vfs_commit,vfs_notify_fam +SMB_VFS_MODULES_E = vfs_readahead,vfs_aio_pthread,vfs_aio_posix,vfs_preopen,vfs_syncops +SMB_VFS_MODULES_F = vfs_acl_xattr,vfs_acl_tdb,vfs_smb_traffic_analyzer,vfs_dirsort,vfs_scannedonly,vfs_crossrename +SMB_VFS_MODULES_G = vfs_time_audit,vfs_media_harmony,vfs_dfs_samba4 +SMB_VFS_MODULES = $(SMB_VFS_MODULES_A),$(SMB_VFS_MODULES_B),$(SMB_VFS_MODULES_C),$(SMB_VFS_MODULES_D),$(SMB_VFS_MODULES_E),$(SMB_VFS_MODULES_F),$(SMB_VFS_MODULES_G) +SMB_IDMAP_MODULES = idmap_ad,idmap_adex,idmap_autorid,idmap_hash,idmap_ldap,idmap_nss,idmap_rid,idmap_tdb,idmap_tdb2 +SMB_PDB_MODULES = pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 +SMB_AUTH_MODULES = auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 +SMB_MODULES = $(SMB_VFS_MODULES),$(SMB_IDMAP_MODULES),$(SMB_PDB_MODULES),$(SMB_AUTH_MODULES) + +# Main package CSWsamba4 +PACKAGES += CSWsamba4 +SPKG_DESC_CSWsamba4 = $(DESCRIPTION) +SMB_BINS = eventlogadm gentest locktest masktest ndrdump net ntlm_auth pdbedit pidl +SMB_BINS += profiles samba-tool smbcontrol smbstatus smbtorture testparm +SMB_SBINS = smbd nmbd samba samba_dnsupdate samba_kcc samba_spnupdate samba_upgradedns +SMB_MANPAGES = findsmb\.1 log2pcap\.1 vfstest\.1 +SMB_MANPAGES += lmhosts\.5 smb.conf\.5 smbpasswd\.5 smbgetrc\.5 +SMB_MANPAGES += samba\.7 +SMB_MANPAGES += net\.8 pdbedit\.8 eventlogadm\.8 smbd\.8 nmbd\.8 samba\.8 samba-tool\.8 smbpasswd\.8 smbspool\.8 smbta-util\.8 +SMB_MANPAGES += tdbbackup\.8 tdbdump\.8 tdbrestore\.8 tdbtool\.8 +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sysconfdir),init\.d/cswsamba4) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sysconfdir),openldap/schema/samba\.schema) +PKGFILES_CSWsamba4 += $(foreach B,$(SMB_BINS),$(call baseisadirs,$(bindir),$B)) +PKGFILES_CSWsamba4 += $(foreach B,$(SMB_BINS),$(call baseisadirs,$(mandir),man1/$B\.1)) +PKGFILES_CSWsamba4 += $(foreach B,$(SMB_SBINS),$(call baseisadirs,$(sbindir),$B)) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sharedstatedir),codepages/.*) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sharedstatedir),setup/.*) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sharedstatedir),perl5/.*) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(SMBCONFIGDIR),smb.conf.CSW) +PKGFILES_CSWsamba4 += $(foreach M,$(SMB_MANPAGES),$(call baseisadirs,$(mandir),man./$M)) +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) +RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-passdb0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4_5.11 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWperl +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr-standard0 +#RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbldap0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtorture0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibnetapi0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibdcerpc-server0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL)) +# Silence conflicts with CSWsamba +CHECKPKG_OVERRIDES_CSWsamba4 += file-collision +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/share|root/opt/csw/bin/smbtorture +CHECKPKG_OVERRIDES_CSWsamba4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/mit_samba.so|soname=mit_samba.so|pkgname=CSWsamba4|expected=CSWmit-samba +CHECKPKG_OVERRIDES_CSWsamba4 += soname-equals-filename|file=/opt/csw/lib/mit_samba.so +CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibwbclient0 +#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWsamba +#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4 += $(CHECKPKG_OVERRIDES_CSWsamba4_$(GAROSREL)) + +INCOMPATIBLE_PKGS_CSWsamba4 += CSWsamba + +# Package with clients, finished +PACKAGES += CSWsamba4-client +SPKG_DESC_CSWsamba4-client = Samba 4 clients +SMB_CLIENT_BINS = cifsdd dbwrap_tool nmblookup nmblookup4 oLschema2ldif regdiff regpatch regshell regtree rpcclient +SMB_CLIENT_BINS += samba-regedit sharesec smbcacls smbclient smbclient4 smbcquotas smbget smbpasswd smbprint +SMB_CLIENT_BINS += smbspool smbta-util smbtar smbtree tdbbackup tdbdump tdbrestore tdbtool +SMB_CLIENT_BINS += ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch +PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(bindir),$C)) +PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(mandir),man1/$C\.1)) +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-passdb0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbclient0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibndr-standard0 +#RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibform5 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel5 +RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbtree.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbget|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbtar.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbcquotas|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/nmblookup.1|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/rpcclient.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbcacls.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbclient|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/nmblookup|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbrestore|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/sharesec.1|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbta-util|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbtool|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/rpcclient|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbpasswd|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbclient.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbcacls|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbspool|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbdump|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbcquotas.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/sharesec|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbtar|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/dbwrap_tool.1|CSWsamba|CSWsamba4-client +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 += $(CHECKPKG_OVERRIDES_CSWsamba4-client_$(GAROSREL)) +INCOMPATIBLE_PKGS_CSWsamba4-client += CSWsamba-client + +# Development package +PACKAGES += CSWsamba4-dev +SPKG_DESC_CSWsamba4-dev = Development files for Samba 4 +PKGFILES_CSWsamba4-dev += $(includedir)/.*\.h +PKGFILES_CSWsamba4-dev += $(libdir)/lib.*\.so +PKGFILES_CSWsamba4-dev += $(libdir)/pkgconfig/.*\.pc +PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3 +PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3perl +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-passdb0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-atsvc0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtorture0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-policy0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-winbind +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr0 +#RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-samr0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibnetapi0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbldap0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4 +RUNTIME_DEP_PKGS_CSWsamba4-dev += $(RUNTIME_DEP_PKGS_CSWsamba4-dev_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/smb_share_modes.h|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/share/man/man3/talloc.3|CSWlibtalloc-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/libnetapi.so|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/libsmbclient.h|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/netapi.h|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/pytalloc.h|CSWpy-talloc-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/wbclient.h|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4 +INCOMPATIBLE_PKGS_CSWsamba4-dev += CSWsamba-dev + +# Package CSWsamba4 libraries +PACKAGES += CSWsamba4-libs +SPKG_DESC_CSWsamba4-libs = Samba 4 libraries +SMB_LIBS = libdcerpc-atsvc.so.0 libdcerpc-binding.so.0 libdcerpc-samr.so.0 libdcerpc-server.so.0 libdcerpc.so.0 libgensec.so.0 +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 +# PKGFILES_CSWsamba4-libs += $(foreach L,$(SMB_LIBS),$(call pkgfiles_lib,$L)) +PKGFILES_CSWsamba4-libs += $(SMBPRIVATELIB)/.* +PKGFILES_CSWsamba4-libs += $(mandir)/man7/libsmbclient.7 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-passdb0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibfam0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr-standard0 +#RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsmbldap0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdcerpc-server0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibnetapi0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += $(RUNTIME_DEP_PKGS_CSWsamba4-libs_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/share/man/man7/libsmbclient.7|CSWlibsmbclient0|CSWsamba4-libs +#CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += no-direct-binding|/opt/csw/lib/samba4/libtdb_compat.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +#CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibwbclient0 +#CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += $(CHECKPKG_OVERRIDES_CSWsamba4-libs_$(GAROSREL)) +INCOMPATIBLE_PKGS_CSWsamba4-libs += CSWlibwbclient0 CSWlibsmbclient0 CSWlibnetapi0 CSWlibsmbsharemodes0 + +PACKAGES += CSWlibdcerpc-atsvc0 +PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc-atsvc0 += $(DESCRIPTION), libdcerpc-atsvc.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0_(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0_$(GAROSREL)) + +PACKAGES += CSWlibdcerpc-binding0 +PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc-binding0 += $(DESCRIPTION), libdcerpc-binding.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_$(GAROSREL)) + +PACKAGES += CSWlibdcerpc-samr0 +PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc-samr0 += $(DESCRIPTION), libdcerpc-samr.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0_$(GAROSREL)) + +PACKAGES += CSWlibdcerpc-server0 +PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc-server0 += $(DESCRIPTION), libdcerpc-server.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_$(GAROSREL)) + +PACKAGES += CSWlibdcerpc0 +PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc0 += $(DESCRIPTION), libdcerpc.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += surplus-dependency|CSWsamba4-libs +#CHECKPKG_OVERRIDES_CSWlibdcerpc0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc0_$(GAROSREL)) + +PACKAGES += CSWlibgensec0 +PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0\.0\.1) +PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgensec0 += $(DESCRIPTION), libgensec.so.0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += $(RUNTIME_DEP_PKGS_CSWlibgensec0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += surplus-dependency|CSWsamba4-libs +#CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWlibgensec += $(CHECKPKG_OVERRIDES_CSWlibgensec_$(GAROSREL)) + +PACKAGES += CSWlibndr-krb5pac0 +PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0\.0\.1) +PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibndr-krb5pac0 += $(DESCRIPTION), libndr-krb5pac.so.0 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += $(RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_$(GAROSREL)) + +PACKAGES += CSWlibndr-nbt0 +PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0\.0\.1) +PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibndr-nbt0 += $(DESCRIPTION), libndr-nbt.so.0 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += $(RUNTIME_DEP_PKGS_CSWlibndr-nbt0_$(GAROSREL)) + +PACKAGES += CSWlibndr-standard0 +PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0\.0\.1) +PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibndr-standard0 += $(DESCRIPTION), libndr-standard.so.0 +RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibndr0 + +PACKAGES += CSWlibndr0 +PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1) +PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibndr0 += $(DESCRIPTION), libndr.so.0 +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibndr0 += $(RUNTIME_DEP_PKGS_CSWlibndr0_$(GAROSREL)) + +PACKAGES += CSWlibnetapi0 +PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0) +PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibnetapi0 += $(DESCRIPTION), libnetapi.so.0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-passdb0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsmbconf0 +#RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += $(RUNTIME_DEP_PKGS_CSWlibnetapi0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibnetapi0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibnetapi0 += $(CHECKPKG_OVERRIDES_CSWlibnetapi0_$(GAROSREL)) + +#PACKAGES += CSWlibpdb0 +#PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0) +#PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0(\.\d+)*) +#SPKG_DESC_CSWlibpdb0 += $(DESCRIPTION), libpdb.so.0 +#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibgcc-s1 +#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2 +#RUNTIME_DEP_PKGS_CSWlibpdb0_5.11 += CSWlibintl8 +#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1 +#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-util0 +#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsmbconf0 +#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-hostconfig0 +#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamdb0 +#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWsamba4-libs +#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibndr0 +#RUNTIME_DEP_PKGS_CSWlibpdb0 += $(RUNTIME_DEP_PKGS_CSWlibpdb0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += missing-dependency|CSWlibwbclient0 +#CHECKPKG_OVERRIDES_CSWlibpdb0 += $(CHECKPKG_OVERRIDES_CSWlibpdb0_$(GAROSREL)) + +PACKAGES += CSWlibregistry0 +PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0\.0\.1) +PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibregistry0 += $(DESCRIPTION), libregistry.so.0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += $(RUNTIME_DEP_PKGS_CSWlibregistry0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibregistry0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibregistry0 += $(CHECKPKG_OVERRIDES_CSWlibregistry0_$(GAROSREL)) + +PACKAGES += CSWlibsamba-credentials0 +PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0\.0\.1) +PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamba-credentials0 += $(DESCRIPTION), libsamba-credentials.so.0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += $(CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_$(GAROSREL)) + +PACKAGES += CSWlibsamba-passdb0 +PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0\.0\.1) +PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamba-passdb0 += $(DESCRIPTION), libsamba-passdb.so.0 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibwbclient0 + +PACKAGES += CSWlibsamba-hostconfig0 +PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0\.0\.1) +PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamba-hostconfig0 += $(DESCRIPTION), libsamba-hostconfig.so.0 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_$(GAROSREL)) + +PACKAGES += CSWlibsamba-policy0 +PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0\.0\.1) +PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamba-policy0 += $(DESCRIPTION), libsamba-policy.so.0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-policy0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibsamba-policy0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsamba-policy0 += $(CHECKPKG_OVERRIDES_CSWlibsamba-policy0_$(GAROSREL)) + +PACKAGES += CSWlibsamba-util0 +PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0\.0\.1) +PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamba-util0 += $(DESCRIPTION), libsamba-util.so.0 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-util0_$(GAROSREL)) + +PACKAGES += CSWlibsamdb0 +PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0\.0\.1) +PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamdb0 += $(DESCRIPTION), libsamdb.so.0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += $(RUNTIME_DEP_PKGS_CSWlibsamdb0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibsamdb0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibsamdb0 += $(CHECKPKG_OVERRIDES_CSWlibsamdb0_$(GAROSREL)) + +PACKAGES += CSWlibsmbclient-raw0 +PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0\.0\.1) +PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsmbclient-raw0 += $(DESCRIPTION), libsmbclient-raw.so.0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += $(RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += $(CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_$(GAROSREL)) + +PACKAGES += CSWlibsmbconf0 +PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0) +PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsmbconf0 += $(DESCRIPTION), libsmbconf.so.0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += $(RUNTIME_DEP_PKGS_CSWlibsmbconf0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsmbconf0 += $(CHECKPKG_OVERRIDES_CSWlibsmbconf0_$(GAROSREL)) + +PACKAGES += CSWlibsmbldap0 +PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0) +PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsmbldap0 += $(DESCRIPTION), libsmbldap.so.0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += $(RUNTIME_DEP_PKGS_CSWlibsmbldap0_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += surplus-dependency|CSWsamba4-libs +#CHECKPKG_OVERRIDES_CSWlibsmbldap0 += $(CHECKPKG_OVERRIDES_CSWlibsmbldap0_$(GAROSREL)) + +PACKAGES += CSWlibtevent-util0 +PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0\.0\.1) +PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibtevent-util0 += $(DESCRIPTION), libtevent-util.so.0 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += soname-unused +#CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibtevent-util0 += $(CHECKPKG_OVERRIDES_CSWlibtevent-util0_$(GAROSREL)) + +PACKAGES += CSWlibtorture0 +PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0\.0\.1) +PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibtorture0 += $(DESCRIPTION), libtorture.so.0 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibtorture0 += $(RUNTIME_DEP_PKGS_CSWlibtorture0_$(GAROSREL)) + +# Python package +PACKAGES += CSWsamba4-python +SPKG_DESC_CSWsamba4-python = Samba 4 python files +PKGFILES_CSWsamba4-python += $(call baseisadirs,$(libdir),python2.7/site-packages/.*) +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-passdb0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpytalloc-util2 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-credentials0 +#RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-policy0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GAROSREL)) +#CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/provision/backend.py +CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/external/testtools/tests/test_compat.py +CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/netcmd/domain.py +CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/external/testtools/tests/test_compat.py +CHECKPKG_OVERRIDES_CSWsamba4-python += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWsamba4-python += soname-not-found|libsamba-passdb.so.0|is|needed|by|opt/csw/lib/python2.7/site-packages/samba/samba3/passdb.so +CHECKPKG_OVERRIDES_CSWsamba4-python += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWsamba4-python += soname-not-part-of-filename +#needs some fix +CHECKPKG_OVERRIDES_CSWsamba4-python += file-collision|/opt/csw/lib/python2.7/site-packages/talloc.so|CSWpy-talloc|CSWsamba4-python +#CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4-python += $(CHECKPKG_OVERRIDES_CSWsamba4-python_$(GAROSREL)) + +# winbind daemon, NSS and PAM modules +PACKAGES += CSWsamba4-winbind +SPKG_DESC_CSWsamba4-winbind = Tools to authenticate users from active directory using winbind +INCOMPATIBLE_PKGS_CSWsamba4-winbind += CSWsamba-nss CSWsamba-winbind +PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(bindir),wbinfo) +PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(libdir),security/pam_winbind\.so) +#PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,nss_winbind.so.1) +#PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,libnss_wins.so.2) +#PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,winbind_krb5_locator.so) +PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(sbindir),winbindd) +PKGFILES_CSWsamba4-winbind += $(sharedstatedir)/locale/.*/pam_winbind\.mo +PKGFILES_CSWsamba4-winbind += $(mandir)/man5/pam_winbind\.conf\.5 +PKGFILES_CSWsamba4-winbind += $(mandir)/man7/winbind_krb5_locator\.7 +PKGFILES_CSWsamba4-winbind += $(mandir)/man8/pam_winbind\.8 +PKGFILES_CSWsamba4-winbind += $(mandir)/man1/wbinfo\.1 +PKGFILES_CSWsamba4-winbind += $(mandir)/man8/winbindd\.8 +PKGFILES_CSWsamba4-winbind += $(sysconfdir)/init.d/cswwinbind4 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-passdb0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsmbconf0 +#RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWnss-winbind1 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWwinbind-krb5locator +RUNTIME_DEP_PKGS_CSWsamba4-winbind += $(RUNTIME_DEP_PKGS_CSWsamba4-winbind_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWnss-winbind1 +CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWwinbind-krb5locator +#CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4-winbind += file-collision +#CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibtevent0 +#CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibwbclient0 +#CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += surplus-dependency|CSWsamba4-libs +#CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWliblber2-4-2 +CHECKPKG_OVERRIDES_CSWsamba4-winbind += $(CHECKPKG_OVERRIDES_CSWsamba4-winbind_$(GAROSREL)) + + +PACKAGES += CSWnss-winbind1 +CATALOGNAME_CSWnss-winbind1 = nss_winbind1 +PKGFILES_CSWnss-winbind1 += $(call baseisadirs,$(libdir),nss_winbind\.so\.1) +PKGFILES_CSWnss-winbind1 += $(call baseisadirs,$(libdir),nss_winbind\.so\.1(\.\d+)*) +SPKG_DESC_CSWnss-winbind1 += $(DESCRIPTION), nss_winbind.so.1 +RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWnss-winbind1 += file-collision|/opt/csw/lib/nss_winbind.so.1|CSWnss-winbind1|CSWsamba-nss + + +PACKAGES += CSWwinbind-krb5locator +CATALOGNAME_CSWwinbind-krb5locator = winbind_krb5locator +PKGFILES_CSWwinbind-krb5locator += $(call baseisadirs,$(libdir),winbind_krb5_locator\.so) +PKGFILES_CSWwinbind-krb5locator += $(call baseisadirs,$(libdir),winbind_krb5_locator\.so(\.\d+)*) +SPKG_DESC_CSWwinbind-krb5locator += $(DESCRIPTION), winbind_krb5_locator.so +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWwinbind-krb5locator += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so + +PACKAGES += CSWsamba4-nss-system-links +ARCHALL_CSWsamba4-nss-system-links = 1 +CATALOGNAME_CSWsamba4-nss-system-links = samba4_nss_system_links +INCOMPATIBLE_PKGS_CSWsamba4-nss-system-links += CSWsamba-nss-system-links +PKGFILES_CSWsamba4-nss-system-links = /usr/lib/nss_winbind_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/amd64/nss_winbind_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/sparcv9/nss_winbind_csw.so.1 +SPKG_DESC_CSWsamba4-nss-system-links += Samba 4 nss modules links for the system +RUNTIME_DEP_PKGS_CSWsamba4-nss-system-links += CSWsamba4-winbind +RUNTIME_DEP_PKGS_CSWsamba4-nss-system-links += CSWnss-winbind1 +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += bad-location-of-file +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += file-collision +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += surplus-dependency|CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_$(GAROSREL)) + +PACKAGES += CSWsamba4-pam-system-links +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_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_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_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 +RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += bad-location-of-file +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_winbind_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_smbpass_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links +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)) + +#Add more overrides. These should only apply to x86 and should be put in the right place in the future. +CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += surplus-dependency|CSWlibintl8 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 19 14:51:22 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 19 Nov 2015 13:51:22 +0000 Subject: SF.net SVN: gar:[25391] csw/mgar/pkg/libgpg_error/trunk Message-ID: <3p1j9033mdz1Xq@mail.opencsw.org> Revision: 25391 http://sourceforge.net/p/gar/code/25391 Author: lblume Date: 2015-11-19 13:51:21 +0000 (Thu, 19 Nov 2015) Log Message: ----------- libgpg_error/trunk: Bump to 1.20 Modified Paths: -------------- csw/mgar/pkg/libgpg_error/trunk/Makefile csw/mgar/pkg/libgpg_error/trunk/checksums Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/Makefile 2015-11-19 10:58:39 UTC (rev 25390) +++ csw/mgar/pkg/libgpg_error/trunk/Makefile 2015-11-19 13:51:21 UTC (rev 25391) @@ -1,5 +1,5 @@ NAME = libgpg-error -VERSION = 1.17 +VERSION = 1.20 GARTYPE = v2 DESCRIPTION = GNU gpg related library Modified: csw/mgar/pkg/libgpg_error/trunk/checksums =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/checksums 2015-11-19 10:58:39 UTC (rev 25390) +++ csw/mgar/pkg/libgpg_error/trunk/checksums 2015-11-19 13:51:21 UTC (rev 25391) @@ -1 +1 @@ -b4f8d8b9ff14aed41f279aa844563539 libgpg-error-1.17.tar.bz2 +9997d9203b672402a04760176811589d libgpg-error-1.20.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 19 21:10:19 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 19 Nov 2015 20:10:19 +0000 Subject: SF.net SVN: gar:[25392] csw/mgar/pkg/libgpg_error/trunk/Makefile Message-ID: <3p1sZF5SK4z8D@mail.opencsw.org> Revision: 25392 http://sourceforge.net/p/gar/code/25392 Author: lblume Date: 2015-11-19 20:10:19 +0000 (Thu, 19 Nov 2015) Log Message: ----------- libgpg_error/trunk: Try with Studio Modified Paths: -------------- csw/mgar/pkg/libgpg_error/trunk/Makefile Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/Makefile 2015-11-19 13:51:21 UTC (rev 25391) +++ csw/mgar/pkg/libgpg_error/trunk/Makefile 2015-11-19 20:10:19 UTC (rev 25392) @@ -8,7 +8,7 @@ shared by most GnuPG related software. endef -GARCOMPILER = GCC4 +GARCOMPILER = SOS12U4 MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libgpg-error/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Nov 20 08:10:03 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 20 Nov 2015 07:10:03 +0000 Subject: SF.net SVN: gar:[25393] csw/mgar/pkg/389-adminutil/trunk Message-ID: <3p28CX5gkPzJ6@mail.opencsw.org> Revision: 25393 http://sourceforge.net/p/gar/code/25393 Author: cgrzemba Date: 2015-11-20 07:10:03 +0000 (Fri, 20 Nov 2015) Log Message: ----------- 389-adminutil/trunk: add patch for removal of SPARc special linking Modified Paths: -------------- csw/mgar/pkg/389-adminutil/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/389-adminutil/trunk/files/0001-remove-sparc-cxx-link-options Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/Makefile 2015-11-19 20:10:19 UTC (rev 25392) +++ csw/mgar/pkg/389-adminutil/trunk/Makefile 2015-11-20 07:10:03 UTC (rev 25393) @@ -17,7 +17,7 @@ DISTNAME = adminutil-$(NAME)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -BUILD64 = 1 +BUILD64_ONLY = 1 PACKAGING_PLATFORMS += solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 GARCOMPILER = SOS12U4 @@ -28,6 +28,8 @@ # LDAPAPI=mozldap LDAPAPI=openldap +PATCHFILES += 0001-remove-sparc-cxx-link-options + PACKAGES += CSWlibadminutil0 CATALOGNAME_CSWlibadminutil0 = libadminutil0 SPKG_DESC_CSWlibadminutil0 += $(DESCRIPTION), libadminutil @@ -37,8 +39,11 @@ RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssl3 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc55 +RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibicudata55 +RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibicui18n55 RUNTIME_DEP_PKGS_CSWlibadminutil0_openldap += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(LDAPAPI)) +RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(GARCH)) PACKAGES += CSWlibadmsslutil0 CATALOGNAME_CSWlibadmsslutil0 = libadmsslutil0 @@ -49,8 +54,12 @@ RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibadminutil0 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssl3 +RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicudata55 +RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicui18n55 +RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicuuc55 RUNTIME_DEP_PKGS_CSWlibadmsslutil0_openldap += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(LDAPAPI)) +RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(GARCH)) PACKAGES += CSW389-adminutil-dev CATALOGNAME_CSW389-adminutil-dev = 389_adminutil_dev @@ -62,7 +71,9 @@ TEST_SCRIPTS = -EXTRA_LINKER_FLAGS = -xnorunpath -norunpath +# EXTRA_LINKER_FLAGS = -xnorunpath -norunpath +EXTRA_CFLAGS = -xnorunpath +# EXTRA_CXXFLAGS = -norunpath CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS_mozldap += --with-ldapsdk-inc=$(includedir)/dirsrv @@ -82,10 +93,9 @@ include gar/category.mk -# pre-configure-modulated: -# cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force -# cd $(WORKSRC) && aclocal -# cd $(WORKSRC) && autoconf --force -# cd $(WORKSRC) && automake -a -c -f -# @$(MAKECOOKIE) - +pre-configure: + cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force + cd $(WORKSRC) && aclocal + cd $(WORKSRC) && autoconf --force + cd $(WORKSRC) && automake -a -c -f + @$(MAKECOOKIE) Added: csw/mgar/pkg/389-adminutil/trunk/files/0001-remove-sparc-cxx-link-options =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/files/0001-remove-sparc-cxx-link-options (rev 0) +++ csw/mgar/pkg/389-adminutil/trunk/files/0001-remove-sparc-cxx-link-options 2015-11-20 07:10:03 UTC (rev 25393) @@ -0,0 +1,29 @@ +# revert changes for bug 245208, obsolete +# https://fedorahosted.org/389/ticket/48352 +--- a/configure.ac ++++ b/configure.ac +@@ -63,12 +63,6 @@ case $host in + sparc-sun-solaris*) + platform_defs="-DXP_UNIX" + platform="solaris" +-dnl Cstd and Crun are required to link any C++ related code (ICU) +- LIBCSTD=-lCstd +- AC_SUBST([LIBCSTD], [$LIBCSTD]) +- LIBCRUN=-lCrun +- AC_SUBST([LIBCRUN], [$LIBCRUN]) +- CXXLINK_REQUIRED=1 + ;; + *) + platform_defs="" +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,9 +1,6 @@ + # look for included m4 files in the ./m4/ directory + ACLOCAL_AMFLAGS = -I m4 + +-LIBCSTD=@LIBCSTD@ +-LIBCRUN=@LIBCRUN@ +- + #------------------------ + # Compiler Flags + #------------------------ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Nov 20 09:48:32 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 20 Nov 2015 08:48:32 +0000 Subject: SF.net SVN: gar:[25394] csw/mgar/pkg/libgpg_error/trunk/Makefile Message-ID: <3p2BP628CLzQv@mail.opencsw.org> Revision: 25394 http://sourceforge.net/p/gar/code/25394 Author: lblume Date: 2015-11-20 08:48:32 +0000 (Fri, 20 Nov 2015) Log Message: ----------- libgpg_error/trunk: Remove libgcc dep Modified Paths: -------------- csw/mgar/pkg/libgpg_error/trunk/Makefile Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/Makefile 2015-11-20 07:10:03 UTC (rev 25393) +++ csw/mgar/pkg/libgpg_error/trunk/Makefile 2015-11-20 08:48:32 UTC (rev 25394) @@ -27,7 +27,7 @@ PKGFILES_CSWlibgpg-error0 += $(call pkgfiles_lib,libgpg-error.so.0) PKGFILES_CSWlibgpg-error0 += .*/libgpg-error.mo RUNTIME_DEP_PKGS_CSWlibgpg-error0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgpg-error0 += CSWlibgcc-s1 +#RUNTIME_DEP_PKGS_CSWlibgpg-error0 += CSWlibgcc-s1 OBSOLETED_BY_libgpg-error0 = CSWgpgerr PACKAGES += CSWlibgpg-error-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Nov 20 10:10:43 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 20 Nov 2015 09:10:43 +0000 Subject: SF.net SVN: gar:[25395] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: <3p2Btm2VkkzTc@mail.opencsw.org> Revision: 25395 http://sourceforge.net/p/gar/code/25395 Author: janholzh Date: 2015-11-20 09:10:43 +0000 (Fri, 20 Nov 2015) Log Message: ----------- samba/branches/samba4: Solaris 11 build Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-20 08:48:32 UTC (rev 25394) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-20 09:10:43 UTC (rev 25395) @@ -20,7 +20,7 @@ EXPANDVARS += smb.conf GARCOMPILER = GNU -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386 BUILD_DEP_PKGS += CSWlibtalloc-dev BUILD_DEP_PKGS += CSWlibpopt-dev BUILD_DEP_PKGS += CSWlibgamin-dev @@ -142,7 +142,8 @@ #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibwbclient0 #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibtevent0 #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWsamba -#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4_5.11 += surplus-dependency|CSWlibgcrypt11 +CHECKPKG_OVERRIDES_CSWsamba4_5.11 += forbidden-version-interface-dependencies|/opt/csw/bin/smbtorture|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 CHECKPKG_OVERRIDES_CSWsamba4 += $(CHECKPKG_OVERRIDES_CSWsamba4_$(GAROSREL)) INCOMPATIBLE_PKGS_CSWsamba4 += CSWsamba @@ -163,6 +164,7 @@ RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel5 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += missing-dependency|CSWlibtevent0 @@ -255,6 +257,9 @@ #CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += no-direct-binding|/opt/csw/lib/samba4/libtdb_compat.so|is|not|directly|bound|to|soname|libgcc_s.so.1 #CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibwbclient0 #CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += soname-not-found|libavahi-common.so.3|is|needed|by|opt/csw/lib/samba4/libsmbd-base-samba4.so +CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += soname-not-found|libavahi-client.so.3|is|needed|by|opt/csw/lib/samba4/libsmbd-base-samba4.so +CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/libsmbconf.so.0|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 CHECKPKG_OVERRIDES_CSWsamba4-libs += $(CHECKPKG_OVERRIDES_CSWsamba4-libs_$(GAROSREL)) #Needs splits: @@ -300,6 +305,7 @@ RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/provision/backend.py @@ -361,6 +367,8 @@ RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibssp0 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWnss-winbind1_5.11 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWnss-winbind1 += $(RUNTIME_DEP_PKGS_CSWnss-winbind1_$(GAROSREL)) CHECKPKG_OVERRIDES_CSWnss-winbind1 += file-collision|/opt/csw/lib/nss_winbind.so.1|CSWnss-winbind1|CSWsamba-nss @@ -371,6 +379,8 @@ SPKG_DESC_CSWwinbind-krb5locator += $(DESCRIPTION), winbind_krb5_locator.so RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_5.11 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += $(RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_$(GAROSREL)) CHECKPKG_OVERRIDES_CSWwinbind-krb5locator += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so PACKAGES += CSWsamba4-nss-system-links This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Nov 20 11:39:05 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 20 Nov 2015 10:39:05 +0000 Subject: SF.net SVN: gar:[25396] csw/mgar/pkg/389-admin/trunk Message-ID: <3p2Drq31vlzYG@mail.opencsw.org> Revision: 25396 http://sourceforge.net/p/gar/code/25396 Author: cgrzemba Date: 2015-11-20 10:39:05 +0000 (Fri, 20 Nov 2015) Log Message: ----------- - use more PRESERVECONF instead of postinstall - remove special linking for SPARC Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2015-11-20 09:10:43 UTC (rev 25395) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2015-11-20 10:39:05 UTC (rev 25396) @@ -15,7 +15,7 @@ MASTER_SITES = https://git.fedorahosted.org/cgit/389/admin.git/snapshot/ DISTNAME = admin-$(NAME)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -DISTFILES += CSW389-admin.preremove +# DISTFILES += CSW389-admin.preremove BUILD64_ONLY = 1 PACKAGING_PLATFORMS += solaris10-sparc @@ -38,6 +38,8 @@ PRESERVECONF += $(sysconfdir)/dirsrv/admin/console.conf PRESERVECONF += $(sysconfdir)/dirsrv/admin/local.conf PRESERVECONF += $(sysconfdir)/dirsrv/admin/adm.conf +PRESERVECONF += $(sysconfdir)/dirsrv/admin/admserv.conf +PRESERVECONF += $(sysconfdir)/dirsrv/admin/nss.conf BUILD_DEP_PKGS += CSWnspr-dev BUILD_DEP_PKGS += CSWlibnss-dev Modified: csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch =================================================================== --- csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch 2015-11-20 09:10:43 UTC (rev 25395) +++ csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch 2015-11-20 10:39:05 UTC (rev 25396) @@ -8,10 +8,10 @@ 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 1a438e3..d9850f2 100644 +index e16b7d8..3edfb56 100644 --- a/configure.ac +++ b/configure.ac -@@ -192,13 +192,12 @@ case $host in +@@ -192,16 +192,14 @@ case $host in # HPUX doesn't use /etc for this initdir=/init.d ;; @@ -25,10 +25,19 @@ - AC_DEFINE([CPU_sparc], [], [cpu type sparc]) AC_DEFINE([OS_solaris], [1], [OS SOLARIS]) AC_DEFINE([sunos5], [1], [SunOS5]) - AC_DEFINE([OSVERSION], [509], [OS version]) -@@ -215,8 +214,6 @@ dnl Cstd and Crun are required to link any C++ related code (ICU) +- AC_DEFINE([OSVERSION], [509], [OS version]) + AC_DEFINE([_REENTRANT], [1], [_REENTRANT]) + dnl socket nsl and dl are required to link several programs + LIBSOCKET=-lsocket +@@ -209,14 +207,9 @@ dnl socket nsl and dl are required to link several programs + LIBNSL=-lnsl + AC_SUBST([LIBNSL], [$LIBNSL]) + dnl Cstd and Crun are required to link any C++ related code (ICU) +- LIBCSTD=-lCstd + AC_SUBST([LIBCSTD], [$LIBCSTD]) +- LIBCRUN=-lCrun AC_SUBST([LIBCRUN], [$LIBCRUN]) - CXXLINK_REQUIRED=1 +- CXXLINK_REQUIRED=1 platform="solaris" - # assume 64 bit - perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Nov 20 13:14:20 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 20 Nov 2015 12:14:20 +0000 Subject: SF.net SVN: gar:[25397] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: <3p2GyZ6M9QzdC@mail.opencsw.org> Revision: 25397 http://sourceforge.net/p/gar/code/25397 Author: janholzh Date: 2015-11-20 12:14:20 +0000 (Fri, 20 Nov 2015) Log Message: ----------- samba/branches/samba4: add one more dep Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-20 10:39:05 UTC (rev 25396) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-20 12:14:20 UTC (rev 25397) @@ -118,6 +118,7 @@ RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-python RUNTIME_DEP_PKGS_CSWsamba4 += CSWpython27 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWpy-dnspython RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-client RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Nov 20 14:50:52 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 20 Nov 2015 13:50:52 +0000 Subject: SF.net SVN: gar:[25398] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: <3p2K631yNbzhg@mail.opencsw.org> Revision: 25398 http://sourceforge.net/p/gar/code/25398 Author: janholzh Date: 2015-11-20 13:50:52 +0000 (Fri, 20 Nov 2015) Log Message: ----------- samba/branches/samba4: add override Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-20 12:14:20 UTC (rev 25397) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-20 13:50:52 UTC (rev 25398) @@ -139,6 +139,7 @@ CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWpython27 CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-client CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-python +CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWpy-dnspython #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibwbclient0 #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibtevent0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Nov 23 05:47:57 2015 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 23 Nov 2015 04:47:57 +0000 Subject: SF.net SVN: gar:[25399] csw/mgar/pkg/tor/trunk Message-ID: <3p3wwG5H6lz1Px@mail.opencsw.org> Revision: 25399 http://sourceforge.net/p/gar/code/25399 Author: jake_goerzen Date: 2015-11-23 04:47:57 +0000 (Mon, 23 Nov 2015) Log Message: ----------- tor: update to 0.2.7.5 Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile csw/mgar/pkg/tor/trunk/checksums Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2015-11-20 13:50:52 UTC (rev 25398) +++ csw/mgar/pkg/tor/trunk/Makefile 2015-11-23 04:47:57 UTC (rev 25399) @@ -1,6 +1,6 @@ # $Id$ NAME = tor -VERSION = 0.2.6.10 +VERSION = 0.2.7.5 GARTYPE = v2 DESCRIPTION = Secure network traffic router Modified: csw/mgar/pkg/tor/trunk/checksums =================================================================== --- csw/mgar/pkg/tor/trunk/checksums 2015-11-20 13:50:52 UTC (rev 25398) +++ csw/mgar/pkg/tor/trunk/checksums 2015-11-23 04:47:57 UTC (rev 25399) @@ -1 +1 @@ -04f919e7882d1ca80f835545af562bad tor-0.2.6.10.tar.gz +2fa650d387eb2ce08ad65ac1f182d3cc tor-0.2.7.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aironskin at users.sourceforge.net Mon Nov 23 11:28:35 2015 From: aironskin at users.sourceforge.net (aironskin at users.sourceforge.net) Date: Mon, 23 Nov 2015 10:28:35 +0000 Subject: SF.net SVN: gar:[25400] csw/mgar/pkg/iozone/trunk Message-ID: <3p44TB3DRvz1Wj@mail.opencsw.org> Revision: 25400 http://sourceforge.net/p/gar/code/25400 Author: aironskin Date: 2015-11-23 10:28:35 +0000 (Mon, 23 Nov 2015) Log Message: ----------- Upgrade to most recent version (3.434) Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/Makefile csw/mgar/pkg/iozone/trunk/checksums Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2015-11-23 04:47:57 UTC (rev 25399) +++ csw/mgar/pkg/iozone/trunk/Makefile 2015-11-23 10:28:35 UTC (rev 25400) @@ -1,5 +1,5 @@ NAME = iozone -VERSION = 3.430 +VERSION = 3.434 DISTVERSION = $(subst .,_,$(VERSION)) GARTYPE = v2 Modified: csw/mgar/pkg/iozone/trunk/checksums =================================================================== --- csw/mgar/pkg/iozone/trunk/checksums 2015-11-23 04:47:57 UTC (rev 25399) +++ csw/mgar/pkg/iozone/trunk/checksums 2015-11-23 10:28:35 UTC (rev 25400) @@ -1 +1 @@ -bc8031b184467150a8eae59dcadb6376 iozone3_430.tar +3e8f4213581407225065b91774e970ed iozone3_434.tar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 23 14:40:01 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Nov 2015 13:40:01 +0000 Subject: SF.net SVN: gar:[25401] csw/mgar/pkg/pcre/trunk Message-ID: <3p48k80Nnvz43@mail.opencsw.org> Revision: 25401 http://sourceforge.net/p/gar/code/25401 Author: dmichelsen Date: 2015-11-23 13:40:01 +0000 (Mon, 23 Nov 2015) Log Message: ----------- pcre/trunk: Update to 8.38 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2015-11-23 10:28:35 UTC (rev 25400) +++ csw/mgar/pkg/pcre/trunk/Makefile 2015-11-23 13:40:01 UTC (rev 25401) @@ -1,5 +1,5 @@ NAME = pcre -VERSION = 8.37 +VERSION = 8.38 GARTYPE = v2 DESCRIPTION = Perl-compatible regular expression tools Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2015-11-23 10:28:35 UTC (rev 25400) +++ csw/mgar/pkg/pcre/trunk/checksums 2015-11-23 13:40:01 UTC (rev 25401) @@ -1 +1 @@ -ed91be292cb01d21bc7e526816c26981 pcre-8.37.tar.bz2 +00aabbfe56d5a48b270f999b508c5ad2 pcre-8.38.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Nov 24 09:58:47 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 24 Nov 2015 08:58:47 +0000 Subject: SF.net SVN: gar:[25402] csw/mgar/pkg/libassuan/trunk Message-ID: <3p4fRF0mh1zLr@mail.opencsw.org> Revision: 25402 http://sourceforge.net/p/gar/code/25402 Author: lblume Date: 2015-11-24 08:58:47 +0000 (Tue, 24 Nov 2015) Log Message: ----------- libassuan/trunk: Bump to 2.4.1; switch to GCC4; remove old patch Modified Paths: -------------- csw/mgar/pkg/libassuan/trunk/Makefile csw/mgar/pkg/libassuan/trunk/checksums Modified: csw/mgar/pkg/libassuan/trunk/Makefile =================================================================== --- csw/mgar/pkg/libassuan/trunk/Makefile 2015-11-23 13:40:01 UTC (rev 25401) +++ csw/mgar/pkg/libassuan/trunk/Makefile 2015-11-24 08:58:47 UTC (rev 25402) @@ -1,5 +1,5 @@ NAME = libassuan -VERSION = 2.1.2 +VERSION = 2.4.1 GARTYPE = v2 DESCRIPTION = IPC library used by some GnuPG related software @@ -11,14 +11,10 @@ VENDOR_URL = http://www.gnupg.org/download/#libassuan +GARCOMPILER = GCC4 + BUILD_DEP_PKGS += CSWlibgpg-error-dev -# Related to: -# https://bugs.g10code.com/gnupg/msg4081 -# http://bugs.g10code.com/gnupg/issue1477 -# http://bugs.g10code.com/gnupg/issue1350 -PATCHFILES += 0001-Fix-usage-of-variadic-arguments.patch - PACKAGES += CSWlibassuan0 SPKG_DESC_CSWlibassuan0 = IPC library used by some GnuPG related software, libassuan.so.0 PKGFILES_CSWlibassuan0 += $(call pkgfiles_lib,libassuan.so.0) Modified: csw/mgar/pkg/libassuan/trunk/checksums =================================================================== --- csw/mgar/pkg/libassuan/trunk/checksums 2015-11-23 13:40:01 UTC (rev 25401) +++ csw/mgar/pkg/libassuan/trunk/checksums 2015-11-24 08:58:47 UTC (rev 25402) @@ -1 +1 @@ -1dc4c3e1dbfb3939bfa2d72db8e136ba libassuan-2.1.2.tar.bz2 +e1e8b6e6493d4cdfc0f6e2de2fb74830 libassuan-2.4.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Nov 24 11:01:41 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 24 Nov 2015 10:01:41 +0000 Subject: SF.net SVN: gar:[25403] csw/mgar/pkg/libassuan/trunk/Makefile Message-ID: <3p4gqj0dwNzRL@mail.opencsw.org> Revision: 25403 http://sourceforge.net/p/gar/code/25403 Author: lblume Date: 2015-11-24 10:01:41 +0000 (Tue, 24 Nov 2015) Log Message: ----------- libassuan/trunk: Disable check; Add dep Modified Paths: -------------- csw/mgar/pkg/libassuan/trunk/Makefile Modified: csw/mgar/pkg/libassuan/trunk/Makefile =================================================================== --- csw/mgar/pkg/libassuan/trunk/Makefile 2015-11-24 08:58:47 UTC (rev 25402) +++ csw/mgar/pkg/libassuan/trunk/Makefile 2015-11-24 10:01:41 UTC (rev 25403) @@ -13,12 +13,17 @@ GARCOMPILER = GCC4 +# As of 2.4.1, the version check fails because it pics the installed lib +# instead of the one just built +SKIPTEST = 1 + BUILD_DEP_PKGS += CSWlibgpg-error-dev PACKAGES += CSWlibassuan0 SPKG_DESC_CSWlibassuan0 = IPC library used by some GnuPG related software, libassuan.so.0 PKGFILES_CSWlibassuan0 += $(call pkgfiles_lib,libassuan.so.0) RUNTIME_DEP_PKGS_CSWlibassuan0 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibassuan0 += CSWlibgcc-s1 PACKAGES += CSWlibassuan-dev SPKG_DESC_CSWlibassuan-dev = Development files for libassuan.so.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Nov 24 12:47:57 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 24 Nov 2015 11:47:57 +0000 Subject: SF.net SVN: gar:[25404] csw/mgar/pkg/php5/branches/php-5.6.x/files Message-ID: <3p4kBK1BbvzW2@mail.opencsw.org> Revision: 25404 http://sourceforge.net/p/gar/code/25404 Author: cgrzemba Date: 2015-11-24 11:47:57 +0000 (Tue, 24 Nov 2015) Log Message: ----------- php5/branches/php-5.6.x: extend postinstall|preremove scripts for replace apxs because this can't manage file extra/modules.load Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-24 10:01:41 UTC (rev 25403) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-24 11:47:57 UTC (rev 25404) @@ -2,6 +2,7 @@ CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf +AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load # Configure mod_php5 in httpd.conf if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ] @@ -10,18 +11,22 @@ elif [ -n "`egrep '#Include extra/httpd-php5.conf' $AP2_CONFIG`" ]; then echo "Re-enabling existing config" perl -i -plne 's,^#(Include extra/httpd-php5.conf),$1,' $AP2_CONFIG + perl -i -plne 's,^#(LoadModule php5.*),$1,' $AP2_MODULE else echo "Adding Include for extra/http-php5.conf to httpd.conf" cat << END >> $AP2_CONFIG Include extra/httpd-php5.conf END + cat << END >> $AP2_MODULE +LoadModule php5_module lib/apache2/modules/libphp5.so +END fi # Finito cat < Revision: 25405 http://sourceforge.net/p/gar/code/25405 Author: cgrzemba Date: 2015-11-24 14:27:43 +0000 (Tue, 24 Nov 2015) Log Message: ----------- update zend api path Modified Paths: -------------- csw/mgar/gar/v2/bin/php5ext_build_scripts Modified: csw/mgar/gar/v2/bin/php5ext_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/php5ext_build_scripts 2015-11-24 11:47:57 UTC (rev 25404) +++ csw/mgar/gar/v2/bin/php5ext_build_scripts 2015-11-24 14:27:43 UTC (rev 25405) @@ -2,7 +2,7 @@ MERGEDIR=$1; shift PHP5MODS=opt/csw/php5/extensions -PHP5EXTDIR=opt/csw/php5/lib/php/extensions/no-debug-non-zts-20090626 +PHP5EXTDIR=opt/csw/php5/lib/php/extensions/no-debug-non-zts-* cd $MERGEDIR/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Nov 24 16:53:03 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 24 Nov 2015 15:53:03 +0000 Subject: SF.net SVN: gar:[25406] csw/mgar/pkg/php5/branches/php-5.6.x/files/ CSWap24-modphp5.postinstall Message-ID: <3p4qd72QDzzfX@mail.opencsw.org> Revision: 25406 http://sourceforge.net/p/gar/code/25406 Author: cgrzemba Date: 2015-11-24 15:53:03 +0000 (Tue, 24 Nov 2015) Log Message: ----------- php5/branches/php-5.6.x: make postinstall more tough Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-24 14:27:43 UTC (rev 25405) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-24 15:53:03 UTC (rev 25406) @@ -1,23 +1,25 @@ -#!/bin/sh - CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load -# Configure mod_php5 in httpd.conf -if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ] -then - echo "Existing mod_php5 configuration detected" +Configure mod_php5 in httpd.conf +if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ] ; then + echo "Existing mod_php5 configuration detected" elif [ -n "`egrep '#Include extra/httpd-php5.conf' $AP2_CONFIG`" ]; then - echo "Re-enabling existing config" - perl -i -plne 's,^#(Include extra/httpd-php5.conf),$1,' $AP2_CONFIG - perl -i -plne 's,^#(LoadModule php5.*),$1,' $AP2_MODULE + echo "Re-enabling existing config" + perl -i -plne 's,^#(Include extra/httpd-php5.conf),$1,' $AP2_CONFIG else - echo "Adding Include for extra/http-php5.conf to httpd.conf" - cat << END >> $AP2_CONFIG - + echo "Adding Include for extra/http-php5.conf to httpd.conf" + cat << END >> $AP2_CONFIG + Include extra/httpd-php5.conf END +fi + +if [ -n "`egrep 'LoadModule php5_module' $AP2_MODULE`" ] ; then + perl -i -plne 's,^#(LoadModule php5.*),$1,' $AP2_MODULE +else + echo "Adding LoadModule php5_module for extra/modules.load" cat << END >> $AP2_MODULE LoadModule php5_module lib/apache2/modules/libphp5.so END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Nov 24 19:26:15 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 24 Nov 2015 18:26:15 +0000 Subject: SF.net SVN: gar:[25407] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: <3p4v1s1j1szqy@mail.opencsw.org> Revision: 25407 http://sourceforge.net/p/gar/code/25407 Author: lblume Date: 2015-11-24 18:26:15 +0000 (Tue, 24 Nov 2015) Log Message: ----------- gnupg2/trunk: Add build dep Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2015-11-24 15:53:03 UTC (rev 25406) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2015-11-24 18:26:15 UTC (rev 25407) @@ -30,6 +30,7 @@ BUILD_DEP_PKGS += CSWlibreadline-dev BUILD_DEP_PKGS += CSWopenldap-dev BUILD_DEP_PKGS += CSWlibpth-dev +BUILD_DEP_PKGS += CSWlibz-dev PACKAGES += CSWgnupg2 SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Nov 24 23:21:54 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 24 Nov 2015 22:21:54 +0000 Subject: SF.net SVN: gar:[25408] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: <3p50Fm6Pv6z14B@mail.opencsw.org> Revision: 25408 http://sourceforge.net/p/gar/code/25408 Author: lblume Date: 2015-11-24 22:21:54 +0000 (Tue, 24 Nov 2015) Log Message: ----------- gnupg2/trunk: Add build deps; fix configure option for curl Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2015-11-24 18:26:15 UTC (rev 25407) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2015-11-24 22:21:54 UTC (rev 25408) @@ -31,6 +31,8 @@ BUILD_DEP_PKGS += CSWopenldap-dev BUILD_DEP_PKGS += CSWlibpth-dev BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibrtmp-dev +BUILD_DEP_PKGS += CSWlibssh2-dev PACKAGES += CSWgnupg2 SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP @@ -59,7 +61,9 @@ ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-libcurl=$(prefix) +# IF this one is used, it forces the use of /opt/csw/bin/curl-config +# Better to let it find the one in the PATH, which is arch-dependent +#CONFIGURE_ARGS += --with-libcurl=$(prefix) CONFIGURE_ARGS += --with-ldap=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-bzip2=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Nov 25 14:03:47 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 25 Nov 2015 13:03:47 +0000 Subject: SF.net SVN: gar:[25409] csw/mgar/pkg/php5/branches/php-5.6.x/files Message-ID: <3p5MqS5pjxz1Lp@mail.opencsw.org> Revision: 25409 http://sourceforge.net/p/gar/code/25409 Author: cgrzemba Date: 2015-11-25 13:03:46 +0000 (Wed, 25 Nov 2015) Log Message: ----------- php5/branches/php-5.6.x: make postinstall more tough 2nd Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-24 22:21:54 UTC (rev 25408) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-25 13:03:46 UTC (rev 25409) @@ -12,7 +12,7 @@ echo "Adding Include for extra/http-php5.conf to httpd.conf" cat << END >> $AP2_CONFIG -Include extra/httpd-php5.conf +Include $CSW_PREFIX/apache2/extra/httpd-php5.conf END fi Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove 2015-11-24 22:21:54 UTC (rev 25408) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove 2015-11-25 13:03:46 UTC (rev 25409) @@ -5,7 +5,7 @@ AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load echo "Disabling httpd-php5.conf in httpd.conf" -perl -i -plne 's,(? Revision: 25410 http://sourceforge.net/p/gar/code/25410 Author: janholzh Date: 2015-11-25 13:44:53 +0000 (Wed, 25 Nov 2015) Log Message: ----------- samba/branches/samba4: add dep Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-25 13:03:46 UTC (rev 25409) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-25 13:44:53 UTC (rev 25410) @@ -121,6 +121,7 @@ RUNTIME_DEP_PKGS_CSWsamba4 += CSWpy-dnspython RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-client RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-winbind RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsamba4_5.11 += CSWlibgcrypt11 @@ -140,6 +141,7 @@ CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-client CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-python CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWpy-dnspython +CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-winbind #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibwbclient0 #CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibtevent0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 25 15:54:15 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2015 14:54:15 +0000 Subject: SF.net SVN: gar:[25411] csw/mgar/gar/v2/gar.pkg.mk Message-ID: <3p5QGx080vz1XX@mail.opencsw.org> Revision: 25411 http://sourceforge.net/p/gar/code/25411 Author: dmichelsen Date: 2015-11-25 14:54:14 +0000 (Wed, 25 Nov 2015) Log Message: ----------- mGAR v2: Add intermediate IPS progress Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2015-11-25 13:44:53 UTC (rev 25410) +++ csw/mgar/gar/v2/gar.pkg.mk 2015-11-25 14:54:14 UTC (rev 25411) @@ -103,6 +103,8 @@ _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) $(if $(_PKG_SPECS),,$(error No packages for building defined)) +_PKG_SPECS_IPS = $(filter-out $(NOPACKAGE),$(or $(PACKAGES_IPS),$(NAME))) + # The is the name of the package containing the sourcefiles for all packages generated from this GAR recipe. # It defaults to the first defined package name or gspec. SRCPACKAGE_BASE is guaranteed # to be one of the real packages built. @@ -225,6 +227,7 @@ else SPKG_EXPORT := $(HOME)/staging/build-$(shell date '+%d.%b.%Y') endif +SPKG_EXPORT_IPS ?= $(HOME)/staging/ips SPKG_PKGROOT ?= $(PKGROOT) SPKG_PKGBASE ?= $(PKGROOT) SPKG_WORKDIR ?= $(CURDIR)/$(WORKDIR) @@ -741,7 +744,6 @@ ) >$@ $(if $(ALLOW_RELOCATE),echo "BASEDIR=$(RELOCATE_PREFIX)" >>$@) - # findlicensefile - Find an existing file for a given relative license file name # Arguments: # $(1) A filename to be used for licenses @@ -936,11 +938,17 @@ PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC)) +PACKAGE_TARGETS_IPS = $(foreach SPEC,$(_PKG_SPECS_IPS),packageips-$(SPEC)) + SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT) $(SPKG_DESTDIRS): ginstall -d $@ +$(SPKG_EXPORT_IPS): + pkgrepo create -s $(SPKG_EXPORT_IPS) + pkgrepo set -s $(SPKG_EXPORT_IPS) publisher/prefix=opencsw + # This is a target used to generate all prototypes for debugging purposes. # On a normal packaging workflow this is not used. prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH)) @@ -976,10 +984,19 @@ done)),) _buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) +_buildpackage-ips: pre-package $(PACKAGE_TARGETS_IPS) post-package + _package: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage @$(MAKECOOKIE) -package: _package +PKGFORMAT-5.8 = svr4 +PKGFORMAT-5.9 = svr4 +PKGFORMAT-5.10 = svr4 +PKGFORMAT-5.11 = ips + +package: package-$(PKGFORMAT-$(GAROSREL)) + +package-svr4: _package @echo @echo "The following packages have been built:" @echo @@ -987,6 +1004,14 @@ @echo @$(DONADA) +package-ips: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage-ips + @echo + @echo "The following packages have been built:" + @echo + @$(MAKE) -s $(_PASS_GAR_ENV) GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow-ips + @echo + @$(DONADA) + dirpackage: _DIRPACKAGE=1 dirpackage: ENABLE_CHECK= dirpackage: _package @@ -1002,6 +1027,9 @@ _pkgshow: @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile)$(COMPRESSION_SUFFIX) ;) +_pkgshow-ips: + @pkgrepo list -s $(SPKG_EXPORT_IPS) $(_PKG_SPECS_IPS) + # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) @echo " ==> Processing $*.gspec" @@ -1022,6 +1050,33 @@ package-p: @$(foreach COOKIEFILE,$(PACKAGE_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) +# -- IPS Packaging -- + +.PRECIOUS: $(WORKDIR)/%.proto +$(WORKDIR)/%.proto: $(WORKDIR) + $(_DBG)(cd $(PKGROOT) && pkgsend generate .) >$@ + +IPS_META_CLASSIFICATION ?= Applications/Accessories +IPS_META_SUMMARY ?= $(DESCRIPTION) +IPS_META_DESCRIPTION ?= $(DESCRIPTION) + +.PRECIOUS: $(WORKDIR)/%.meta +$(WORKDIR)/%.meta: $(WORKDIR) + $(_DBG)(echo "set name=pkg.fmri value=$*@$(VERSION)"; \ + echo "set name=pkg.summary value=\"$(IPS_META_SUMMARY)\""; \ + echo "set name=pkg.description value=\"$(IPS_META_DESCRIPTION)\""; \ + echo "set name=variant.arch value=$(GARCH)"; \ + echo "set name=info.classification value=org.opensolaris.category.2008:$(IPS_META_CLASSIFICATION)"; \ + $(_CATEGORY_IPS_META) \ + ) >$@ + +packageips-%: $(WORKDIR)/%.proto $(WORKDIR)/%.meta $(SPKG_EXPORT_IPS) + cd $(WORKDIR) && pkgmogrify $*.proto $*.meta > $*.p5m + cd $(WORKDIR) && pkglint $*.p5m + pkgsend publish -s $(SPKG_EXPORT_IPS) -d $(SPKG_PKGROOT) $(WORKDIR)/$*.p5m + +# --- + # pkgcheck - check if the package is compliant # pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC)) @@ -1048,7 +1103,7 @@ # will not be copied to WORKDIR again. pkgreset-%: @echo " ==> Reset packaging state for $* ($(DESTIMG))" - $(_DBG)rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) + $(_DBG)rm -rf $(foreach T,extract checksum package package-ips pkgcheck,$(COOKIEDIR)/*$(T)-$**) $(_DBG)rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package $(_DBG)rm -rf $(addprefix $(WORKDIR)/,$(filter-out $(DISTFILES),$(patsubst $(WORKDIR)/%,%,$(wildcard $(WORKDIR)/$*.*)) prototype copyright $*.copyright)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Nov 25 17:21:45 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 25 Nov 2015 16:21:45 +0000 Subject: SF.net SVN: gar:[25412] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: <3p5SCm5NJZzFR@mail.opencsw.org> Revision: 25412 http://sourceforge.net/p/gar/code/25412 Author: janholzh Date: 2015-11-25 16:21:45 +0000 (Wed, 25 Nov 2015) Log Message: ----------- samba/branches/samba4: fix deps again Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-25 14:54:14 UTC (rev 25411) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-11-25 16:21:45 UTC (rev 25412) @@ -169,7 +169,9 @@ RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel5 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-client_5.11 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-client_sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GAROSREL)) +RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GARCH)) #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += missing-dependency|CSWlibtevent0 #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += surplus-dependency|CSWsamba4-libs @@ -310,7 +312,9 @@ RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4-python_5.11 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-python_sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GAROSREL)) +RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GARCH)) #CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/provision/backend.py CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/external/testtools/tests/test_compat.py @@ -372,7 +376,9 @@ RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWnss-winbind1_5.11 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWnss-winbind1_sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWnss-winbind1 += $(RUNTIME_DEP_PKGS_CSWnss-winbind1_$(GAROSREL)) +RUNTIME_DEP_PKGS_CSWnss-winbind1 += $(RUNTIME_DEP_PKGS_CSWnss-winbind1_$(GARCH)) CHECKPKG_OVERRIDES_CSWnss-winbind1 += file-collision|/opt/csw/lib/nss_winbind.so.1|CSWnss-winbind1|CSWsamba-nss @@ -384,7 +390,9 @@ RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_5.11 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += $(RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_$(GAROSREL)) +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += $(RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_$(GARCH)) CHECKPKG_OVERRIDES_CSWwinbind-krb5locator += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so PACKAGES += CSWsamba4-nss-system-links This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 26 10:52:14 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 26 Nov 2015 09:52:14 +0000 Subject: SF.net SVN: gar:[25413] csw/mgar/pkg/libgcrypt/trunk Message-ID: <3p5vWr0pDmzRR@mail.opencsw.org> Revision: 25413 http://sourceforge.net/p/gar/code/25413 Author: lblume Date: 2015-11-26 09:52:13 +0000 (Thu, 26 Nov 2015) Log Message: ----------- libgcrypt/trunk: Bump to 1.6.4 Modified Paths: -------------- csw/mgar/pkg/libgcrypt/trunk/Makefile csw/mgar/pkg/libgcrypt/trunk/checksums Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/Makefile 2015-11-25 16:21:45 UTC (rev 25412) +++ csw/mgar/pkg/libgcrypt/trunk/Makefile 2015-11-26 09:52:13 UTC (rev 25413) @@ -1,5 +1,5 @@ NAME = libgcrypt -VERSION = 1.6.1 +VERSION = 1.6.4 GARTYPE = v2 DESCRIPTION = GNU libgcrypt Modified: csw/mgar/pkg/libgcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/checksums 2015-11-25 16:21:45 UTC (rev 25412) +++ csw/mgar/pkg/libgcrypt/trunk/checksums 2015-11-26 09:52:13 UTC (rev 25413) @@ -1 +1 @@ -a5a5060dc2f80bcac700ab0236ea47dc libgcrypt-1.6.1.tar.bz2 +4c13c5fa43147866f993d73ee62af176 libgcrypt-1.6.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 26 11:01:11 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 26 Nov 2015 10:01:11 +0000 Subject: SF.net SVN: gar:[25414] csw/mgar/pkg/gnupg/trunk Message-ID: <3p5vk91Fp8zTp@mail.opencsw.org> Revision: 25414 http://sourceforge.net/p/gar/code/25414 Author: lblume Date: 2015-11-26 10:01:11 +0000 (Thu, 26 Nov 2015) Log Message: ----------- gnupg/trunk: Bump to 1.4.19 Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2015-11-26 09:52:13 UTC (rev 25413) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2015-11-26 10:01:11 UTC (rev 25414) @@ -1,5 +1,5 @@ NAME = gnupg -VERSION = 1.4.18 +VERSION = 1.4.19 GARTYPE = v2 DESCRIPTION = GnuPG is a complete and free replacement for PGP @@ -22,6 +22,8 @@ RUNTIME_DEP_PKGS_CSWgnupg += CSWlibz1 RUNTIME_DEP_PKGS_CSWgnupg += CSWlibldap2-4-2 +# configure incorrectly uses grep directly instead of $GREP, which leads to +# (so far) harmless GNUisms CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libcurl=$(prefix) CONFIGURE_ARGS += --with-ldap=$(prefix) Modified: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums 2015-11-26 09:52:13 UTC (rev 25413) +++ csw/mgar/pkg/gnupg/trunk/checksums 2015-11-26 10:01:11 UTC (rev 25414) @@ -1 +1 @@ -54db1be9588b11afbbdd8b82d4ea883a gnupg-1.4.18.tar.bz2 +3af4ab5b3113b3e28d3551ecf9600785 gnupg-1.4.19.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 26 11:07:42 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 26 Nov 2015 10:07:42 +0000 Subject: SF.net SVN: gar:[25415] csw/mgar/pkg/pinentry/trunk Message-ID: <3p5vsh4YRHzX9@mail.opencsw.org> Revision: 25415 http://sourceforge.net/p/gar/code/25415 Author: lblume Date: 2015-11-26 10:07:42 +0000 (Thu, 26 Nov 2015) Log Message: ----------- pinentry/trunk: Bump to 0.9.6 Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile csw/mgar/pkg/pinentry/trunk/checksums Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2015-11-26 10:01:11 UTC (rev 25414) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2015-11-26 10:07:42 UTC (rev 25415) @@ -3,7 +3,7 @@ # $Id$ NAME = pinentry -VERSION = 0.8.1 +VERSION = 0.9.6 GARTYPE = v2 DESCRIPTION = Allows entering passwords into gpg-agent @@ -11,17 +11,17 @@ endef MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ -DISTFILES = $(DISTNAME).tar.gz +DISTFILES = $(DISTNAME).tar.bz2 VENDOR_URL = http://www.gnupg.org/related_software/pinentry/ BUILD_DEP_PKGS += CSWlibgnugetopt-dev BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWlibncurses-dev -BUILD_DEP_PKGS += CSWglib2devel -BUILD_DEP_PKGS += CSWgtk2devel -BUILD_DEP_PKGS += CSWlibatkdevel -BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibatk-dev +BUILD_DEP_PKGS += CSWlibpango-dev BUILD_DEP_PKGS += CSWlibcairo-dev PACKAGES += CSWpinentry Modified: csw/mgar/pkg/pinentry/trunk/checksums =================================================================== --- csw/mgar/pkg/pinentry/trunk/checksums 2015-11-26 10:01:11 UTC (rev 25414) +++ csw/mgar/pkg/pinentry/trunk/checksums 2015-11-26 10:07:42 UTC (rev 25415) @@ -1 +1 @@ -81f99904daee5331eb6738408bb024b6 pinentry-0.8.1.tar.gz +ab27ee5f9c3079842a9becd7ef7605cc pinentry-0.9.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 26 11:28:13 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 26 Nov 2015 10:28:13 +0000 Subject: SF.net SVN: gar:[25416] csw/mgar/pkg/libgcrypt/trunk/Makefile Message-ID: <3p5wKM1MdqzZg@mail.opencsw.org> Revision: 25416 http://sourceforge.net/p/gar/code/25416 Author: lblume Date: 2015-11-26 10:28:13 +0000 (Thu, 26 Nov 2015) Log Message: ----------- libgcrypt/trunk: Disable checks, as it is broken by their use of RPATH Modified Paths: -------------- csw/mgar/pkg/libgcrypt/trunk/Makefile Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/Makefile 2015-11-26 10:07:42 UTC (rev 25415) +++ csw/mgar/pkg/libgcrypt/trunk/Makefile 2015-11-26 10:28:13 UTC (rev 25416) @@ -14,6 +14,10 @@ GARCOMPILER = GCC4 +# As of 1.6.4 the version check fails because it pics the installed lib +# instead of the one just built +SKIPTEST = 1 + BUILD_DEP_PKGS = CSWlibgpg-error-dev PACKAGES += CSWlibgcrypt-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 26 11:46:51 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 26 Nov 2015 10:46:51 +0000 Subject: SF.net SVN: gar:[25417] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: <3p5wkt59y6zd6@mail.opencsw.org> Revision: 25417 http://sourceforge.net/p/gar/code/25417 Author: lblume Date: 2015-11-26 10:46:51 +0000 (Thu, 26 Nov 2015) Log Message: ----------- pinentry/trunk: Disable build for Qt that doesn't work; update dependencies Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2015-11-26 10:28:13 UTC (rev 25416) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2015-11-26 10:46:51 UTC (rev 25417) @@ -27,25 +27,24 @@ PACKAGES += CSWpinentry SPKG_DESC_CSWpinentry = Allows entering passwords into gpg-agent (ncurses version) # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWpinentry += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSWpinentry += CSWiconv -RUNTIME_DEP_PKGS_CSWpinentry += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibassuan0 +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibncursesw5 PACKAGES += CSWpinentry-gtk2 SPKG_DESC_CSWpinentry-gtk2 = Allows entering passwords into gpg-agent (gtk2 version) PKGFILES_CSWpinentry-gtk2 += $(bindir)/pinentry-gtk-2 -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWiconv -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWfconfig -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWftype2 -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibatk -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWpango -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWglib2 -RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibassuan0 + # This is passed to curses/, but not pinentry/ EXTRA_CPPFLAGS += -I$(includedir)/ncurses @@ -55,6 +54,7 @@ CONFIGURE_ARGS += --enable-pinentry-curses CONFIGURE_ARGS += --disable-pinentry-gtk CONFIGURE_ARGS += --enable-pinentry-gtk2 +CONFIGURE_ARGS += --disable-pinentry-qt # This is a symlink, we replace that by alternatives EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/pinentry This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 26 14:51:07 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 26 Nov 2015 13:51:07 +0000 Subject: SF.net SVN: gar:[25418] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: <3p60qc0gbWzmX@mail.opencsw.org> Revision: 25418 http://sourceforge.net/p/gar/code/25418 Author: lblume Date: 2015-11-26 13:51:07 +0000 (Thu, 26 Nov 2015) Log Message: ----------- pinentry/trunk: Adjust deps for ld bug Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2015-11-26 10:46:51 UTC (rev 25417) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2015-11-26 13:51:07 UTC (rev 25418) @@ -44,6 +44,15 @@ RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibassuan0 +### +# Needed for the Solaris ld bug +ifeq ($(shell /usr/bin/uname -p),sparc) +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibfreetype6 +endif +### # This is passed to curses/, but not pinentry/ EXTRA_CPPFLAGS += -I$(includedir)/ncurses This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Nov 26 16:20:25 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 26 Nov 2015 15:20:25 +0000 Subject: SF.net SVN: gar:[25419] csw/mgar/pkg/gnupg/trunk/Makefile Message-ID: <3p62pV5gqFzqW@mail.opencsw.org> Revision: 25419 http://sourceforge.net/p/gar/code/25419 Author: lblume Date: 2015-11-26 15:20:24 +0000 (Thu, 26 Nov 2015) Log Message: ----------- gnupg/trunk: Skip the tests because they fail on the buildfarm Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2015-11-26 13:51:07 UTC (rev 25418) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2015-11-26 15:20:24 UTC (rev 25419) @@ -45,6 +45,11 @@ PROTOTYPE_FILES_suid = .*/gpg PROTOTYPE_PERMS_suid = 4755 +# The implementation of tests from gnupg.org software is increasingly +# hostile to Solaris, and I'm not willing to take on that hassle. +# They do pass so far on my personal build box -- laurent +SKIPTEST = 1 + BUILD64 = 1 ISAEXEC = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Nov 29 23:51:39 2015 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 29 Nov 2015 22:51:39 +0000 Subject: SF.net SVN: gar:[25420] csw/mgar/pkg/mercurial/trunk Message-ID: <3p84gw2DvRz7y@mail.opencsw.org> Revision: 25420 http://sourceforge.net/p/gar/code/25420 Author: rthurner Date: 2015-11-29 22:51:39 +0000 (Sun, 29 Nov 2015) Log Message: ----------- mercurial/trunk: update to hg-3.6.1. Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2015-11-26 15:20:24 UTC (rev 25419) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2015-11-29 22:51:39 UTC (rev 25420) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 3.5.1 +VERSION = 3.6.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2015-11-26 15:20:24 UTC (rev 25419) +++ csw/mgar/pkg/mercurial/trunk/checksums 2015-11-29 22:51:39 UTC (rev 25420) @@ -1 +1 @@ -796a778075ec6358235e9258f9a54224 mercurial-3.5.1.tar.gz +4c43a232f82bd4df3a10cc90c5c954a8 mercurial-3.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Nov 30 11:26:34 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 30 Nov 2015 10:26:34 +0000 Subject: SF.net SVN: gar:[25421] csw/mgar/pkg/php5/branches/php-5.6.x/files/ CSWap24-modphp5.postinstall Message-ID: <3p8N5d3yByzK8@mail.opencsw.org> Revision: 25421 http://sourceforge.net/p/gar/code/25421 Author: cgrzemba Date: 2015-11-30 10:26:33 +0000 (Mon, 30 Nov 2015) Log Message: ----------- php5/branches/php-5.6.x: add prefork MPM selection in CSWap24_modphp5.postinstall Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-29 22:51:39 UTC (rev 25420) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-30 10:26:33 UTC (rev 25421) @@ -2,7 +2,7 @@ AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load -Configure mod_php5 in httpd.conf +# Configure mod_php5 in httpd.conf if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ] ; then echo "Existing mod_php5 configuration detected" elif [ -n "`egrep '#Include extra/httpd-php5.conf' $AP2_CONFIG`" ]; then @@ -17,18 +17,22 @@ fi if [ -n "`egrep 'LoadModule php5_module' $AP2_MODULE`" ] ; then - perl -i -plne 's,^#(LoadModule php5.*),$1,' $AP2_MODULE + perl -i -plne 's,^#[ ]*(LoadModule php5.*),$1,' $AP2_MODULE else echo "Adding LoadModule php5_module for extra/modules.load" cat << END >> $AP2_MODULE LoadModule php5_module lib/apache2/modules/libphp5.so END fi +# PHP5 needs prefork MPM +perl -i -plne 's,^#[ ]*(LoadModule mpm_prefork_module*),$1,' $AP2_MODULE +perl -i -plne 's,^(LoadModule mpm_event_module*),#$1,' $AP2_MODULE +perl -i -plne 's,^(LoadModule mpm_worker_module*),#$1,' $AP2_MODULE # Finito cat < Revision: 25422 http://sourceforge.net/p/gar/code/25422 Author: cgrzemba Date: 2015-11-30 12:43:40 +0000 (Mon, 30 Nov 2015) Log Message: ----------- php5/branches/php-5.6.x: fix CSWap24-modphp5.preremovecd Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-30 10:26:33 UTC (rev 25421) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-11-30 12:43:40 UTC (rev 25422) @@ -3,11 +3,11 @@ AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load # Configure mod_php5 in httpd.conf -if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ] ; then +if [ -n "`egrep 'Include .*extra/httpd-php5.conf' $AP2_CONFIG`" ] ; then echo "Existing mod_php5 configuration detected" -elif [ -n "`egrep '#Include extra/httpd-php5.conf' $AP2_CONFIG`" ]; then +elif [ -n "`egrep '#Include .*extra/httpd-php5.conf' $AP2_CONFIG`" ]; then echo "Re-enabling existing config" - perl -i -plne 's,^#(Include extra/httpd-php5.conf),$1,' $AP2_CONFIG + perl -i -plne 's,^#(Include .*extra/httpd-php5.conf),$1,' $AP2_CONFIG else echo "Adding Include for extra/http-php5.conf to httpd.conf" cat << END >> $AP2_CONFIG Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove 2015-11-30 10:26:33 UTC (rev 25421) +++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove 2015-11-30 12:43:40 UTC (rev 25422) @@ -5,7 +5,7 @@ AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load echo "Disabling httpd-php5.conf in httpd.conf" -perl -i -plne 's,(?