From rmottola at users.sourceforge.net Tue Feb 2 18:14:40 2016 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Tue, 2 Feb 2016 17:14:40 +0000 Subject: SF.net SVN: gar:[25540] csw/mgar/pkg/freetype/trunk Message-ID: <3pvt7B17dnz1D9@mail.opencsw.org> Revision: 25540 http://sourceforge.net/p/gar/code/25540 Author: rmottola Date: 2016-02-02 17:14:40 +0000 (Tue, 02 Feb 2016) Log Message: ----------- freetype/trunk: update to current version and add new dependency Modified Paths: -------------- csw/mgar/pkg/freetype/trunk/Makefile csw/mgar/pkg/freetype/trunk/checksums Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2016-01-29 10:07:51 UTC (rev 25539) +++ csw/mgar/pkg/freetype/trunk/Makefile 2016-02-02 17:14:40 UTC (rev 25540) @@ -1,5 +1,5 @@ NAME = freetype -VERSION = 2.4.12 +VERSION = 2.6.2 GARTYPE = v2 DESCRIPTION = A free and portable TrueType font rendering engine @@ -26,6 +26,7 @@ PKGFILES_CSWlibfreetype6 += $(call pkgfiles_lib,libfreetype.so.6) RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibpng16-16 OBSOLETED_BY_CSWlibfreetype6 += CSWftype2 CATALOGNAME_CSWftype2 = freetype2_stub Modified: csw/mgar/pkg/freetype/trunk/checksums =================================================================== --- csw/mgar/pkg/freetype/trunk/checksums 2016-01-29 10:07:51 UTC (rev 25539) +++ csw/mgar/pkg/freetype/trunk/checksums 2016-02-02 17:14:40 UTC (rev 25540) @@ -1 +1 @@ -3463102764315eb86c0d3c2e1f3ffb7d freetype-2.4.12.tar.bz2 +86109d0c998787d81ac582bad9adf82e freetype-2.6.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Feb 3 06:40:39 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 3 Feb 2016 05:40:39 +0000 Subject: SF.net SVN: gar:[25541] csw/mgar/pkg/lang-python/pysetuptools/trunk Message-ID: <3pwBgr6Mxwz1QW@mail.opencsw.org> Revision: 25541 http://sourceforge.net/p/gar/code/25541 Author: rthurner Date: 2016-02-03 05:40:38 +0000 (Wed, 03 Feb 2016) Log Message: ----------- lang-python/pysetuptools/trunk: pysetuptools, 3.8.1 seems to work. Modified Paths: -------------- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2016-02-02 17:14:40 UTC (rev 25540) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2016-02-03 05:40:38 UTC (rev 25541) @@ -1,7 +1,7 @@ # $Id$ NAME = setuptools -VERSION = 3.6 +VERSION = 3.8.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums 2016-02-02 17:14:40 UTC (rev 25540) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums 2016-02-03 05:40:38 UTC (rev 25541) @@ -1 +1 @@ -8f3a1dcdc14313c8334eb6af4f66ea0a setuptools-3.6.tar.gz +f2219937a17d4311499a52e82cba681e setuptools-3.8.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 Thu Feb 4 12:01:43 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 4 Feb 2016 11:01:43 +0000 Subject: SF.net SVN: gar:[25542] csw/mgar/gar/v2 Message-ID: <3pwxmT3X6tzK8@mail.opencsw.org> Revision: 25542 http://sourceforge.net/p/gar/code/25542 Author: cgrzemba Date: 2016-02-04 11:01:43 +0000 (Thu, 04 Feb 2016) Log Message: ----------- add IPS package build and some basic package checks Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk csw/mgar/gar/v2/lib/python/makeStdLibDb.py csw/mgar/gar/v2/lib/python/rest.py Added Paths: ----------- csw/mgar/gar/v2/bin/pathfilter.py csw/mgar/gar/v2/bin/pkg_resolve csw/mgar/gar/v2/lib/python/pkg_resolve.py csw/mgar/gar/v2/transforms/ csw/mgar/gar/v2/transforms/README csw/mgar/gar/v2/transforms/defaults csw/mgar/gar/v2/transforms/unneeded-deps Property Changed: ---------------- csw/mgar/gar/v2/ csw/mgar/gar/v2/lib/ csw/mgar/gar/v2/lib/python/ Index: csw/mgar/gar/v2 =================================================================== --- csw/mgar/gar/v2 2016-02-03 05:40:38 UTC (rev 25541) +++ csw/mgar/gar/v2 2016-02-04 11:01:43 UTC (rev 25542) Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +gar.pkg.mk.patch Added: csw/mgar/gar/v2/bin/pathfilter.py =================================================================== --- csw/mgar/gar/v2/bin/pathfilter.py (rev 0) +++ csw/mgar/gar/v2/bin/pathfilter.py 2016-02-04 11:01:43 UTC (rev 25542) @@ -0,0 +1,87 @@ +#!/usr/bin/env python + +import logging +import argparse +import os +import sys +import re + +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) +from lib.python import common_constants +from lib.python import configuration + +USAGE = '''%prog [-i path][-x path][-I path][-X path] + + pathfilter will read a prototype(4) file from stdin, filter + it as specified by the include/exclude options and writes + the result to stdout. If no include/exclude options are + given the input is copied verbatim to stdout. + + Empty directories are implicitly excluded by default. +''' + + +def main(): + parser = argparse.ArgumentParser(USAGE) + parser.add_argument("-x", dest="exclude_meta", nargs="*", action='append', + help='''Excludes the path from the resulting prototype where + all meta characters are quoted.''') + parser.add_argument("-X", "--exclude", dest="exclude", nargs="*", action='append', + help='''Excludes the path from the resulting prototype''') + parser.add_argument("-i", dest="include_meta", nargs="*", action='append', + help='''Includes the path in the resulting prototype where + all meta characters are quoted. All pathes are + implicitly excluded by default if -i is used.''') + parser.add_argument("-I", "--include", dest="include", nargs="*", action='append', + help='''Includes the path in the resulting prototype. All pathes are + implicitly excluded by default if -i is used.''') + parser.add_argument("-f", "--file", dest="infile", + help='''prototype file''') + parser.add_argument("--debug", dest="debug", action="store_true") + options = parser.parse_args() + logging_level = logging.INFO + if options.debug: + logging_level = logging.DEBUG + fmt = '%(levelname)s %(asctime)s %(filename)s:%(lineno)d %(message)s' + logging.basicConfig(format=fmt, level=logging_level) + if not options.infile: + inf = sys.stdin + else: + inf = open(options.infile) + # paths = {} + # paths = dict( re.match(".*path=([^\s]*).*",line).groups()[0],[line,False] for line in inf.readlines() ) + for line in inf.readlines(): + printed = False + line = line.strip() + path = re.match(".*path=([^\s]*).*",line).groups()[0] + # import pdb; pdb.set_trace() + if options.include: + for inc in options.include: + if re.match(inc[0].lstrip('/'), path): + print line + printed = True + break + if not printed and options.include_meta: + for inc_pattern in options.include_meta: + if re.match("^"+inc_pattern[0].lstrip('/')+"$", path): + print line + printed = True + break + if not printed: + notprint = False + for excl_pattern in options.exclude_meta: + if re.match("^"+excl_pattern[0].lstrip('/')+"$", path): + notprint = True + if not notprint: + for excl_pattern in options.exclude: + if re.match("^"+excl_pattern[0].lstrip('/')+"$", path): + notprint = True + if not notprint: + print line + if not inf is sys.stdin: + inf.close() + + # import pdb; pdb.set_trace() + +if __name__ == '__main__': + main() Added: csw/mgar/gar/v2/bin/pkg_resolve =================================================================== --- csw/mgar/gar/v2/bin/pkg_resolve (rev 0) +++ csw/mgar/gar/v2/bin/pkg_resolve 2016-02-04 11:01:43 UTC (rev 25542) @@ -0,0 +1,8 @@ +#!/opt/csw/bin/bash + +set -e +set -u + +basedir=$(dirname $0)/.. +export PYTHONPATH=$basedir +exec /opt/csw/bin/python2.6 "$basedir/lib/python/pkg_resolve.py" "$@" Property changes on: csw/mgar/gar/v2/bin/pkg_resolve ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2016-02-03 05:40:38 UTC (rev 25541) +++ csw/mgar/gar/v2/gar.mk 2016-02-04 11:01:43 UTC (rev 25542) @@ -853,7 +853,8 @@ # $(libdir) has the memorymodel-directory appended, whereas $(libdir_install) # has not, so we use this one for appending. - +# Make sure the configuration files always have a .CSW suffix and rename the +# configuration files to this if necessary during merge. _PAX_ARGS = $(_INC_EXT_RULE) $(_EXTRA_PAX_ARGS) $(call modulationvalue,EXTRA_PAX_ARGS) $(EXTRA_PAX_ARGS) define killprocandparent Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2016-02-03 05:40:38 UTC (rev 25541) +++ csw/mgar/gar/v2/gar.pkg.mk 2016-02-04 11:01:43 UTC (rev 25542) @@ -13,6 +13,11 @@ # # +# use opencsw pakckage db for resolve dependencies for IPS packages +IPS_USE_PKG_DB = +# prepend this to the package name +IPS_PACKAGE_PREFIX ?= opencsw/ + ifeq ($(DEBUG_PACKAGING),) _DBG=@ DEBUG_FLAG = @@ -103,7 +108,9 @@ _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))) +# dev and doc represented as facet in IPS +NOPACKAGE_IPS = %-dev %-doc +_PKG_SPECS_IPS = $(filter-out $(NOPACKAGE) $(NOPACKAGE_IPS),$(or $(PACKAGES_IPS),$(patsubst CSW%,%,$(SPKG_SPECS)),$(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 @@ -328,9 +335,17 @@ _CSWCLASSES += cswtexhash _CSWCLASSES += cswdictconf +PKGFORMAT-5.8 = svr4 +PKGFORMAT-5.9 = svr4 +PKGFORMAT-5.10 = svr4 +PKGFORMAT-5.11 = ips +PKGFORMAT := $(PKGFORMAT-$(GAROSREL)) + # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. +ifneq ($(GAROSREL),5.11) _EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") +endif PKGGET_DESTDIR ?= @@ -397,6 +412,7 @@ # Use PKGFILES_CSWlibfoo1 = $(call pkgfiles_lib,libfoo.so.1) pkgfiles_lib += $(call baseisadirs,$(libdir),$(subst .,\.,$(subst +,\+,$(1)))(\.\d+)*) +IPS_PKGFILES_DEVEL := $(PKGFILES_DEVEL) # PKGFILES_DEVEL selects files belonging to a developer package PKGFILES_DEVEL_CONFIG ?= $(call baseisadirs,$(bindir),[^/]*-config) PKGFILES_DEVEL += $(PKGFILES_DEVEL_CONFIG) @@ -984,16 +1000,31 @@ done)),) _buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) -_buildpackage-ips: pre-package $(PACKAGE_TARGETS_IPS) post-package +# _buildpackage-ips: pre-package $(PACKAGE_TARGETS_IPS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) +_buildpackage-ips: pre-package $(PACKAGE_TARGETS_IPS) post-package package-publish +# generates p5m from proto and publishs +package-publish: + $(if $(IPS_USE_PKG_DB), \ + $(foreach SPEC,$(_PKG_SPECS_IPS),\ + $(GARBIN)/pkg_resolve $(DEBUG_FLAG) \ + --arch "$(GARCH)" \ + --os-release "$(SPKG_OSNAME)" \ + --catalog-release "$(CATALOG_RELEASE)" \ + --pkg-root "$(PKGROOT)" $(SPEC).proto > $(SPEC).p5p, \ + cp $@.proto $@.p5p)) + $(if $(IPS_RM_SAME_VERS),\ + $(foreach SPEC,$(_PKG_SPECS_IPS),\ + pkgrepo remove -s $(SPKG_EXPORT_IPS) $(IPS_PACKAGE_PREFIX)$(SPEC)@$(IPS_VERSION) || true;)) + $(_DBG)cd $(WORKDIR) && pkgdepend resolve -m $(foreach SPEC,$(_PKG_SPECS_IPS),$(SPEC).p5p ) + $(foreach SPEC,$(_PKG_SPECS_IPS),\ + ( cd $(WORKDIR) && cp $(SPEC).p5p.res $(SPEC).p5m && \ + pkglint -c /var/tmp/build_$(LOGNAME)/lint-cache -r $(SPKG_EXPORT_IPS) $(SPEC).p5m ); \ + pkgsend publish -s $(SPKG_EXPORT_IPS) -d $(SPKG_PKGROOT) $(WORKDIR)/$(SPEC).p5m; ) + _package: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage @$(MAKECOOKIE) -PKGFORMAT-5.8 = svr4 -PKGFORMAT-5.9 = svr4 -PKGFORMAT-5.10 = svr4 -PKGFORMAT-5.11 = ips - package: package-$(PKGFORMAT-$(GAROSREL)) package-svr4: _package @@ -1053,28 +1084,83 @@ # -- IPS Packaging -- .PRECIOUS: $(WORKDIR)/%.proto +$(WORKDIR)/%.proto: _PKGFILES_EXCLUDE=$(call _pkgfiles_exclude,CSW$*) +$(WORKDIR)/%.proto: _PKGFILES_INCLUDE=$(call _pkgfiles_include,CSW$*) $(WORKDIR)/%.proto: $(WORKDIR) - $(_DBG)(cd $(PKGROOT) && pkgsend generate .) >$@ + $(_DBG) @echo "PKG: $(IPS_PACKAGE_PREFIX)$*" + $(_DBG) pkgsend generate $(PKGROOT) >$@.gen + $(_DBG)if [ -n "$(PKGFILES_CSW$*_SHARED)" -o \ + -n "$(PKGFILES_CSW$*)" -o \ + -n "$(_PKGFILES_EXCLUDE)" -o \ + -n "$(ISAEXEC_FILES_CSW$*)" -o \ + -n "$(ISAEXEC_FILES)" ]; then \ + ($(GARBIN)/pathfilter.py $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),\ + -I $(call licensedir,CSW$*)/license \ + -I /etc/opt/csw/pkg/CSW$*/cswmigrateconf \ + -I /opt/csw/share/alternatives/$(call catalogname,CSW$*) \ + )\ + $(foreach S,$(filter-out CSW$*,$(SPKG_SPECS)),\ + -X $(call licensedir,$S)/license \ + -X /etc/opt/csw/pkg/$S/cswmigrateconf \ + -X /opt/csw/share/alternatives/$(call catalogname,$S) \ + ) \ + $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_CSW$*),-i '$I') \ + $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_CSW$*),-x '$X') \ + $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ + $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ + $(foreach IE,$(abspath $(ISAEXEC_FILES_CSW$*) $(ISAEXEC_FILES)), \ + -e '$(IE)=$(dir $(IE))$(ISA_DEFAULT)/$(notdir $(IE))' \ + ) \ + -f $@.gen; \ + if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)"; fi \ + ) >$@.filtered; \ + else \ + cp $@.gen $@.filtered; \ + fi + $(if $(and $(INITSMF),$(filter $(shell cat $(WORKDIR)/$@.filtered),$(patsubst /%,%,$(INITSMF)))), \ + ginstall -d $(PKGROOT)/var/svc/manifest/site; \ + svcbundle -o $(PKGROOT)/var/svc/manifest/$(notdir $(INITSMF)).xml -s service-name=$(notdir $(INITSMF)) -s model=daemon -s start-method="$(INITSMF) start" -s stop-method="$(INITSMF) stop"; \ + echo " emit file owner=root group=sys mode=755 path=var/svc/manifest/site/$(notdir $(INITSMF)).xml>" >> $@.filtered; ) + $(_DBG)$(foreach DFILE,$(IPS_PKGFILES_DEVEL), echo " default facet.devel true>" >> $@.filtered; ) + $(foreach BIT,$(IPS_BYPASS_GENERATE_DEP), echo " default pkg.depend.bypass-generate .*>" >> $@.filtered; ) + $(foreach BIT,$(PKGFILES_CSW$*_SHARED), \ + echo " default overlay allow>" >> $@.filtered; \ + echo " default preserve legacy>" >> $@.filtered ) + $(foreach PKG,$(filter-out $(_PKG_SPECS),$(RUNTIME_DEP_PKGS_CSW$*)), echo " emit depend fmri=pkg:/$(patsubst CSW%,%,$(PKG)) type=require>" >> $@.filtered; ) + $(foreach CONF,$(PRESERVECONF), echo " default preserve renamenew>" >> $@.filtered; ) + mv $@.filtered $@ + + IPS_META_CLASSIFICATION ?= Applications/Accessories -IPS_META_SUMMARY ?= $(DESCRIPTION) +IPS_META_SUMMARY ?= $(if $(SPKG_DESC_CSW$*),$(SPKG_DESC_CSW$*),$(DESCRIPTION)) IPS_META_DESCRIPTION ?= $(DESCRIPTION) +IPS_VERSION ?= $(VERSION) .PRECIOUS: $(WORKDIR)/%.meta +$(WORKDIR)/%.meta: cswpkgname = CSW$(subst _,-,$*) $(WORKDIR)/%.meta: $(WORKDIR) - $(_DBG)(echo "set name=pkg.fmri value=$*@$(VERSION)"; \ + $(if $(filter %/,$(IPS_PACKAGE_PREFIX)),,$(error IPS_PACKAGE_PREFIX must ending in a / wheres this did not: $(IPS_PACKAGE_PREFIX))) + $(_DBG)(echo "set name=pkg.fmri value=$(IPS_PACKAGE_PREFIX)$*@$(IPS_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) \ + echo " emit legacy arch=$(GARCH) category=\"$(if $(CATEGORY),$(CATEGORY),application)\" desc=\"$(SPKG_DESC_$(cswpkgname))\" name=\"$(cswpkgname)\" pkg=$(cswpkgname) variant.arch=$(GARCH) vendor=\"$(call pkgvar,SPKG_VENDOR,$(cswpkgname))\" version=$(call pkgvar,SPKG_VERSION,$(cswpkgname)),$(call pkgvar,SPKG_REVSTAMP,$(cswpkgname)) hotline=\"http://www.opencsw.org/bugtrack/\">"; \ + echo " emit license $(call licensedir,CSW$(subst _,-,$*))/license license=\"see license file\">"; \ + $(_CATEGORY_IPS_META) ; \ ) >$@ - + $(if $(or $(ARCHALL_$(cswpkgname)),$(ARCHALL)), echo "set name=variant.arch value=sparc value=i386", echo "set name=variant.arch value=$(GARCH)") >> $@; + $(if $(findstring $(cswpkgname)/,$(USERGROUP)), (cat $(WORKDIR)/cswusergroup | while read line; do \ + echo $$line | awk -F':' '{ print "group groupname="$$2; }'; \ + echo $$line | awk -F':' '{ print "user username="$$1" group="$$2" gecos-filed=\""$$3"\" home-dir="$$4" login-shell="$$5; }'; \ + done ) >> $@ ) + + 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 - + cd $(WORKDIR) && cat $*.meta $*.proto > $*.premog + pkgmogrify -I $(GARDIR)transforms -I $(WORKDIR) $*.premog defaults | pkgfmt > $(WORKDIR)/$*.mogrified + pkgdepend generate $(foreach I,$(shell isainfo),-D ISALIST=$I) -md $(PKGROOT) $(WORKDIR)/$*.mogrified > $(WORKDIR)/$*.depend + pkgmogrify -I $(GARDIR)transforms -I $(WORKDIR) $*.depend unneeded-deps | pkgfmt > $(WORKDIR)/$*.p5p # --- # pkgcheck - check if the package is compliant @@ -1106,6 +1192,7 @@ $(_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)) + $(_DBG)rm -rf $(WORKDIR)/$(patsubst CSW%,%,$*).* repackage: pkgreset package Index: csw/mgar/gar/v2/lib =================================================================== --- csw/mgar/gar/v2/lib 2016-02-03 05:40:38 UTC (rev 25541) +++ csw/mgar/gar/v2/lib 2016-02-04 11:01:43 UTC (rev 25542) Property changes on: csw/mgar/gar/v2/lib ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +map.solaris10-0 Index: csw/mgar/gar/v2/lib/python =================================================================== --- csw/mgar/gar/v2/lib/python 2016-02-03 05:40:38 UTC (rev 25541) +++ csw/mgar/gar/v2/lib/python 2016-02-04 11:01:43 UTC (rev 25542) Property changes on: csw/mgar/gar/v2/lib/python ___________________________________________________________________ Modified: svn:ignore ## -1 +1 ## -stdlib.json +stdlibs.json Modified: csw/mgar/gar/v2/lib/python/makeStdLibDb.py =================================================================== --- csw/mgar/gar/v2/lib/python/makeStdLibDb.py 2016-02-03 05:40:38 UTC (rev 25541) +++ csw/mgar/gar/v2/lib/python/makeStdLibDb.py 2016-02-04 11:01:43 UTC (rev 25542) @@ -10,24 +10,25 @@ import cjson fnLiblst = "stdlibs.json" +# list of OS libs for which we do not take into account the dependencies +liblst = ['libjawt.so'] def buildStdlibList(): - liblst = ['libjawt.so'] - cwd_save = os.getcwd() - std_locations = ( + cwd_save = os.getcwd() + std_locations = ( '/usr/lib', '/usr/dt/lib', '/usr/openwin/lib', '/usr/X11/lib', '/usr/ucblib', '/usr/sfw/lib', - ) - for libdir in std_locations: - os.chdir(libdir) - for lib in os.listdir('.'): - if re.match('lib[a-zA-Z0-9_-]*.so.[0-9]+$',lib): - liblst.append(lib) - os.chdir(cwd_save) - with open(fnLiblst, 'w') as fd: - fd.write(cjson.encode(liblst)) - fd.close() + ) + for libdir in std_locations: + if os.path.isdir(libdir): + os.chdir(libdir) + for lib in os.listdir('.'): + if re.match('lib[a-zA-Z0-9_-]*.so.[0-9]+$',lib): + liblst.append(lib) + os.chdir(cwd_save) + with open(fnLiblst, 'w') as fd: + fd.write(cjson.encode(liblst)) Added: csw/mgar/gar/v2/lib/python/pkg_resolve.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkg_resolve.py (rev 0) +++ csw/mgar/gar/v2/lib/python/pkg_resolve.py 2016-02-04 11:01:43 UTC (rev 25542) @@ -0,0 +1,174 @@ +#!/usr/bin/env python2.6 -t + +""" +gets all depended catalog names +usage: get_dependencies + +search rest: r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname', +pkgdepend genertate creates entries like: +depend fmri=__TBD + pkg.debug.depend.file=libpcre.so.1 + pkg.debug.depend.path=lib + pkg.debug.depend.path=opt/csw/lib + pkg.debug.depend.path=opt/csw/lib + pkg.debug.depend.path=opt/csw/lib/amd64 + pkg.debug.depend.path=opt/csw/lib/i386 + pkg.debug.depend.path=usr/lib + pkg.debug.depend.reason=opt/csw/bin/swig + pkg.debug.depend.type=elf + type=require +""" + +from __future__ import print_function + +import optparse +import rest +import common_constants +import pprint +import gdbm +import logging +import sys +import os +import cjson +from lib.python.shell import ShellCommand +import makeStdLibDb +import platform +import re +from lib.python import configuration +from lib.python import representations + +from Cheetah.Template import Template + +fn_stdlibs = 'work/stdlibs.json' +fn_pkgstats = 'work/pkgstats' +LDD_CMD = '/usr/bin/ldd' + +FileRE = '.*pkg.debug.depend.file=([^\s]*)\s.*' +PathRE = 'pkg.debug.depend.path=([^\s]*)' +ReasonRE = '.*pkg.debug.depend.reason=([^\s]*)\s.*' + +# strict +# depend_tmpl = 'depend fmri=pkg://opencsw/$catalogname@$version,$rel-$revision type=require' +# lazzy +depend_tmpl = 'depend fmri=pkg:/opencsw/$catalogname@$version type=require' +manifest_tmpl = ''' +set name=pkg.fmri value=pkg:/opencsw/$category/$catalogname@$version,$osrel-$revision:$pstamp +set name=pkg.summary value="$summary" +set name=pkg.human-version value=$version +set name=publisher value=$email +''' + +catrel = 'unstable' +arch = platform.processor() +osrel = platform.system()+platform.release() +pkgroot = '../pkgroot' + +def char2dotvers(version): + newversion = '' + converted = False + for c in version: + try: + n = int(c) + if converted: newversion +='.'; converted = False + newversion += c + except ValueError: + if c == '.': + newversion += c + else: + newversion += ".%d" % (ord(c.upper())-0x40) + converted = True + return newversion + +class GetPackage(object): + def __init__(self): + self.cached_catalogs_bins = {} + self.cached_catalogs_links = {} + self.cached_catalogs_needed_bins = {} + config = configuration.GetConfig() + username, password = rest.GetUsernameAndPassword() + self.rest_client = rest.RestClient( + pkgdb_url=config.get('rest', 'pkgdb'), + releases_url=config.get('rest', 'releases'), + username=username, + password=password) + self.cp = rest.CachedPkgstats(fn_pkgstats, self.rest_client) + + + def resolveDeps(self, p5m): + def getResolvedPath(bin, lib): + ret_code, cstdout, cstderr = ShellCommand([LDD_CMD,os.path.join(pkgroot,bin)]) + for line in cstdout.split('\n'): + if lib in line: + return os.path.dirname(line.split('=>')[1]).strip() + with open( p5m ) as pf: + for line in pf.readlines(): + line = line.strip() + if line.startswith('depend fmri=__TBD') and'pkg.debug.depend.type=elf' in line: + basename = re.match(FileRE, line).group(1) + reason = re.match(ReasonRE, line).group(1) + # these path are useless because its sorted alphabetically + paths = re.findall(PathRE, line) + # thats why we get the used path + deppath = getResolvedPath(reason, basename) + logging.debug("getPathsAndCatnames: %s %s %s %s" % (catrel,arch,osrel,basename)) + pkg = self.rest_client.GetPathsAndCatnamesByBasename(catrel, arch, osrel, basename) + if deppath: + if not deppath in pkg.keys(): + if os.path.islink(deppath): + deppath = os.path.realpath(deppath) + catalogname = pkg[deppath][0][0] + # import pdb; pdb.set_trace() + version = pkg[deppath][0][1].split(',')[0] + if not version.startswith('fakeversion'): + version = char2dotvers(version) + print (Template(depend_tmpl,searchList=[ + {'catalogname': catalogname,'version': version }])) + else: + print (line) + else: + print (line) + +def main(): + global pkgroot, catrel, arch, osrel + + parser = optparse.OptionParser() + parser.add_option("--debug", dest="debug", action="store_true") + parser.add_option("-r", "--os-release", dest="osrel", + default='system', + help="E.g. SunOS5.10") + parser.add_option("-a", "--arch", dest="arch", default='system', + help="'i386' or 'sparc'") + parser.add_option("-c", "--catalog-release", dest="catrel", + default="unstable", + help="E.g. unstable, dublin") + parser.add_option("-R", "--pkg-root", dest="pkgroot", + default="../pkgroot", + help="E.g. unstable, dublin") + options, args = parser.parse_args() + if not args: + logging.error("need argument: package_prototype after pkgdepend generate") + sys.exit(1) + if options.debug: + logging.basicConfig(level=logging.DEBUG) + if options.osrel: + osrel = options.osrel + if options.arch: + arch = options.arch + if options.catrel: + catrel = options.catrel + if options.pkgroot: + pkgroot = options.pkgroot + logging.debug("use options: %s %s %s %s" % (catrel, arch, osrel, pkgroot)) + logging.debug("use arg: %s" % args) + if not os.path.exists(fn_stdlibs): + print ("needed file %s not found, will create this" % fn_stdlibs, file=sys.stderr) + makeStdLibDb.buildStdlibList() + + Pkg = GetPackage() + for p5m in args: + Pkg.resolveDeps(p5m) + print ("") + + +if __name__ == '__main__': + main() Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2016-02-03 05:40:38 UTC (rev 25541) +++ csw/mgar/gar/v2/lib/python/rest.py 2016-02-04 11:01:43 UTC (rev 25542) @@ -422,6 +422,14 @@ data = urllib2.urlopen(url).read() return cjson.decode(data) + def GetPathsAndCatnamesByBasename(self, catrel, arch, osrel, basename): + url = ( + self.pkgdb_url + + "/catalogs/%s/%s/%s/catnames-and-paths-by-basename?%s" + % (catrel, arch, osrel, urllib.urlencode({'basename': basename}))) + data = urllib2.urlopen(url).read() + return cjson.decode(data) + def GetCatalogTimingInformation(self, catrel, arch, osrel): url = ( self.pkgdb_url Added: csw/mgar/gar/v2/transforms/README =================================================================== --- csw/mgar/gar/v2/transforms/README (rev 0) +++ csw/mgar/gar/v2/transforms/README 2016-02-04 11:01:43 UTC (rev 25542) @@ -0,0 +1 @@ +see also at /usr/share/pkg/transform Added: csw/mgar/gar/v2/transforms/defaults =================================================================== --- csw/mgar/gar/v2/transforms/defaults (rev 0) +++ csw/mgar/gar/v2/transforms/defaults 2016-02-04 11:01:43 UTC (rev 25542) @@ -0,0 +1,26 @@ + default facet.doc.man true> + default facet.doc true> + add restart_fmri svc:/application/man-index:default> + drop> + drop> + drop> + drop> + drop> + drop> + drop> + drop> + drop> + add restart_fmri \ + svc:/application/pycompile> + emit depend fmri=pkg:/opencsw/cswpycomile type=require> + default restart_fmri svc:/system/manifest-import:default> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + Added: csw/mgar/gar/v2/transforms/unneeded-deps =================================================================== --- csw/mgar/gar/v2/transforms/unneeded-deps (rev 0) +++ csw/mgar/gar/v2/transforms/unneeded-deps 2016-02-04 11:01:43 UTC (rev 25542) @@ -0,0 +1,3 @@ + drop > + drop > + 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 Feb 5 11:06:00 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 5 Feb 2016 10:06:00 +0000 Subject: SF.net SVN: gar:[25543] csw/mgar/pkg/ansible/trunk Message-ID: <3pxXTC0xQmzps@mail.opencsw.org> Revision: 25543 http://sourceforge.net/p/gar/code/25543 Author: dmichelsen Date: 2016-02-05 10:05:59 +0000 (Fri, 05 Feb 2016) Log Message: ----------- ansible/trunk: Update to 2.0.0.2, not finished yet Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile csw/mgar/pkg/ansible/trunk/checksums Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2016-02-04 11:01:43 UTC (rev 25542) +++ csw/mgar/pkg/ansible/trunk/Makefile 2016-02-05 10:05:59 UTC (rev 25543) @@ -1,5 +1,5 @@ NAME = ansible -VERSION = 1.9.1 +VERSION = 2.0.0.2 GARTYPE = v2 CATEGORIES = python @@ -14,8 +14,8 @@ # The .git makes the build system think we have a checkout out repo and not a tarball NOGITPATCH = 1 -PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch -PATCHFILES += 0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch +# PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch +# PATCHFILES += 0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch PACKAGES += CSWansible # Stick with upstream naming @@ -39,10 +39,6 @@ CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2 # There are many OS specific (Linux, FreeBSD, etc.) paths stored in those files. -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/callbacks.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/playbook/__init__.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/runner/__init__.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/runner/__init__.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/basic.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py @@ -59,32 +55,36 @@ CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/cloud/google/gc_storage.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/files/unarchive.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/system/service.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/alternatives.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/os/rhn_register.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/svc.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/dnf.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/locale_gen.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/osx_defaults.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/facts.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/utils/display.py -REINPLACEMENTS += etc -REINPLACE_MATCH_etc = /etc/ansible -REINPLACE_WITH_etc = $(sysconfdir)/ansible +#REINPLACEMENTS += etc +#REINPLACE_MATCH_etc = /etc/ansible +#REINPLACE_WITH_etc = $(sysconfdir)/ansible -REINPLACE_FILES_etc += bin/ansible-galaxy -REINPLACE_FILES_etc += lib/ansible/constants.py -REINPLACE_FILES_etc += lib/ansible/module_utils/urls.py -REINPLACE_FILES_etc += lib/ansible/modules/core/system/setup.py -REINPLACE_FILES_etc += lib/ansible/playbook/__init__.py -REINPLACE_FILES_etc += plugins/inventory/nova.py -REINPLACE_FILES_etc += plugins/inventory/openstack.py -REINPLACE_FILES_etc += docs/man/man1/ansible.1.asciidoc.in -REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1 -REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1.asciidoc.in -REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1 -REINPLACE_FILES_etc += docs/man/man1/ansible.1 -REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1.asciidoc.in -REINPLACE_FILES_etc += examples/ansible.cfg +#REINPLACE_FILES_etc += bin/ansible-galaxy +#REINPLACE_FILES_etc += lib/ansible/constants.py +#REINPLACE_FILES_etc += lib/ansible/module_utils/urls.py +#REINPLACE_FILES_etc += lib/ansible/modules/core/system/setup.py +#REINPLACE_FILES_etc += lib/ansible/playbook/__init__.py +#REINPLACE_FILES_etc += plugins/inventory/nova.py +#REINPLACE_FILES_etc += plugins/inventory/openstack.py +#REINPLACE_FILES_etc += docs/man/man1/ansible.1.asciidoc.in +#REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1 +#REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1.asciidoc.in +#REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1 +#REINPLACE_FILES_etc += docs/man/man1/ansible.1 +#REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1.asciidoc.in +#REINPLACE_FILES_etc += examples/ansible.cfg REINPLACE_USRSHARE += lib/ansible/constants.py +REINPLACE_USRSHARE += lib/ansible/modules/extras/packaging/elasticsearch_plugin.py REINPLACE_USRSHARE += examples/ansible.cfg ARCHALL = 1 @@ -97,11 +97,14 @@ PRESERVECONF += $(sysconfdir)/ansible/hosts PRESERVECONF += $(sysconfdir)/ansible/ansible.cfg +#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/utils/display.py +#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/facts.py +#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py +#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/osx_defaults.py + include gar/category.mk post-install: ginstall -D -m 0644 $(WORKDIR)/hosts.CSW $(DESTDIR)$(sysconfdir)/ansible/hosts.CSW ginstall -D -m 0644 $(WORKSRC)/examples/ansible.cfg $(DESTDIR)/$(sysconfdir)/ansible/ansible.cfg.CSW - ginstall -d -m 0755 $(DESTDIR)$(sharedstatedir)/ansible - cp -rp $(WORKSRC)/plugins $(DESTDIR)$(sharedstatedir)/ansible/plugins @$(MAKECOOKIE) Modified: csw/mgar/pkg/ansible/trunk/checksums =================================================================== --- csw/mgar/pkg/ansible/trunk/checksums 2016-02-04 11:01:43 UTC (rev 25542) +++ csw/mgar/pkg/ansible/trunk/checksums 2016-02-05 10:05:59 UTC (rev 25543) @@ -1 +1 @@ -3c0f0ecc8b5d60831b10045dba64bbbb ansible-1.9.1.tar.gz +816d0c49e084383e47a725c761a0e413 ansible-2.0.0.2.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 Feb 5 11:58:17 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 5 Feb 2016 10:58:17 +0000 Subject: SF.net SVN: gar:[25544] csw/mgar/pkg/apache24/trunk Message-ID: <3pxYdT4v12zsZ@mail.opencsw.org> Revision: 25544 http://sourceforge.net/p/gar/code/25544 Author: dmichelsen Date: 2016-02-05 10:58:17 +0000 (Fri, 05 Feb 2016) Log Message: ----------- apache24/trunk: Switch to explicit manifest, enable nghttp Modified Paths: -------------- csw/mgar/pkg/apache24/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/apache24/trunk/files/cswapache24.xml Removed Paths: ------------- csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall Modified: csw/mgar/pkg/apache24/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache24/trunk/Makefile 2016-02-05 10:05:59 UTC (rev 25543) +++ csw/mgar/pkg/apache24/trunk/Makefile 2016-02-05 10:58:17 UTC (rev 25544) @@ -15,9 +15,10 @@ MASTER_SITES = http://www.eu.apache.org/dist/httpd/ DISTFILES += $(DISTNAME).tar.gz DISTFILES += cswapache24 -DISTFILES += CSWapache24.postinstall EXPANDVARS += cswapache24 +DISTFILES += cswapache24.xml + PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch PATCHFILES += 0003-fix-43561-apxs.patch PATCHFILES-64 += 0004-64bit-apachectl.in.patch @@ -35,6 +36,9 @@ GARCOMPILER = SOS12U4 +# More build deps missing +BUILD_DEP_PKGS += CSWlibnghttp2-dev + PACKAGES = CSWapache24 SPKG_DESC_CSWapache24 = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWapache24 += CSWliblber2-4-2 @@ -46,12 +50,17 @@ RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibnghttp2-14 EXTRA_MERGE_SCRIPTS_isa-default64 += copy-apache-modules -# This is because /opt/csw/sbin/sparcv9 is missing, most certainly an checkpkg issue -# CHECKPKG_OVERRIDES_CSWapache24 += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server +PROTOTYPE_MODIFIERS += smf +PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswapache24.xml +PROTOTYPE_CLASS_smf = manifest +# This is the DTD location +CHECKPKG_OVERRIDES_CSWapache24 += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswapache24.xml + PACKAGES += CSWapache24-manual ARCHALL_CSWapache24-manual = 1 SPKG_DESC_CSWapache24-manual = The Apache 2.4 Manual @@ -132,8 +141,10 @@ CONFIGURE_ARGS += --with-ssl # As requested in https://www.opencsw.org/mantis/view.php?id=5152 CONFIGURE_ARGS += --enable-proxy-html +CONFIGURE_ARGS += --enable-http2 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + EXTRA_CFLAGS += -DSSL_EXPERIMENTAL -DSSL_ENGINE # Fixup target variables @@ -170,6 +181,7 @@ ginstall -D -m 0755 $(WORKDIR)/cswapache24 $(DESTDIR)/etc/opt/csw/init.d/cswapache24 gsed -e '/APACHECTL=/s/sbin/sbin\$${MM}/' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24 echo "# create server.(crt|csr)/server.key" > $(DESTDIR)$(sysconfdir)/apache2/server + ginstall -D -m 0644 $(WORKDIR)/cswapache24.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswapache24.xml @$(MAKECOOKIE) merge-copy-apache-modules: Deleted: csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall =================================================================== --- csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall 2016-02-05 10:05:59 UTC (rev 25543) +++ csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall 2016-02-05 10:58:17 UTC (rev 25544) @@ -1,3 +0,0 @@ -[ -x /usr/sbin/svccfg ] && \ - /usr/sbin/svccfg -s cswapache24 'setprop general/enable_64bit = boolean: false' && \ - /usr/sbin/svcadm refresh cswapache24 Added: csw/mgar/pkg/apache24/trunk/files/cswapache24.xml =================================================================== --- csw/mgar/pkg/apache24/trunk/files/cswapache24.xml (rev 0) +++ csw/mgar/pkg/apache24/trunk/files/cswapache24.xml 2016-02-05 10:58:17 UTC (rev 25544) @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: csw/mgar/pkg/apache24/trunk/files/cswapache24.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ 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 lblume at users.sourceforge.net Fri Feb 5 13:20:40 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 5 Feb 2016 12:20:40 +0000 Subject: SF.net SVN: gar:[25545] csw/mgar/pkg/gnupg/trunk Message-ID: <3pxbSZ4Tlbzwq@mail.opencsw.org> Revision: 25545 http://sourceforge.net/p/gar/code/25545 Author: lblume Date: 2016-02-05 12:20:40 +0000 (Fri, 05 Feb 2016) Log Message: ----------- gnupg/trunk: Bump to 1.4.20 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 2016-02-05 10:58:17 UTC (rev 25544) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2016-02-05 12:20:40 UTC (rev 25545) @@ -1,5 +1,5 @@ NAME = gnupg -VERSION = 1.4.19 +VERSION = 1.4.20 GARTYPE = v2 DESCRIPTION = GnuPG is a complete and free replacement for PGP Modified: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums 2016-02-05 10:58:17 UTC (rev 25544) +++ csw/mgar/pkg/gnupg/trunk/checksums 2016-02-05 12:20:40 UTC (rev 25545) @@ -1 +1 @@ -3af4ab5b3113b3e28d3551ecf9600785 gnupg-1.4.19.tar.bz2 +b7af897a041c03c8ad1c7c466b54d10d gnupg-1.4.20.tar.bz2 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 Feb 5 14:39:56 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 5 Feb 2016 13:39:56 +0000 Subject: SF.net SVN: gar:[25546] csw/mgar/pkg Message-ID: <3pxdCw3pz9z117@mail.opencsw.org> Revision: 25546 http://sourceforge.net/p/gar/code/25546 Author: dmichelsen Date: 2016-02-05 13:39:56 +0000 (Fri, 05 Feb 2016) Log Message: ----------- sshpass/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/sshpass/ csw/mgar/pkg/sshpass/Makefile csw/mgar/pkg/sshpass/branches/ csw/mgar/pkg/sshpass/tags/ csw/mgar/pkg/sshpass/trunk/ csw/mgar/pkg/sshpass/trunk/Makefile csw/mgar/pkg/sshpass/trunk/checksums csw/mgar/pkg/sshpass/trunk/files/ Added: csw/mgar/pkg/sshpass/Makefile =================================================================== --- csw/mgar/pkg/sshpass/Makefile (rev 0) +++ csw/mgar/pkg/sshpass/Makefile 2016-02-05 13:39:56 UTC (rev 25546) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/sshpass/trunk =================================================================== --- csw/mgar/pkg/sshpass/trunk 2016-02-05 12:20:40 UTC (rev 25545) +++ csw/mgar/pkg/sshpass/trunk 2016-02-05 13:39:56 UTC (rev 25546) Property changes on: csw/mgar/pkg/sshpass/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/sshpass/trunk/Makefile =================================================================== --- csw/mgar/pkg/sshpass/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sshpass/trunk/Makefile 2016-02-05 13:39:56 UTC (rev 25546) @@ -0,0 +1,16 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = sshpass +VERSION = 1.05 +GARTYPE = v2 + +DESCRIPTION = Non-interactive ssh password auth + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/sshpass/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/sshpass/trunk/checksums =================================================================== --- csw/mgar/pkg/sshpass/trunk/checksums (rev 0) +++ csw/mgar/pkg/sshpass/trunk/checksums 2016-02-05 13:39:56 UTC (rev 25546) @@ -0,0 +1 @@ +c52d65fdee0712af6f77eb2b60974ac7 sshpass-1.05.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 Feb 5 17:34:40 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 5 Feb 2016 16:34:40 +0000 Subject: SF.net SVN: gar:[25547] csw/mgar/pkg/ansible/trunk/Makefile Message-ID: <3pxj5l0bhYz1DR@mail.opencsw.org> Revision: 25547 http://sourceforge.net/p/gar/code/25547 Author: dmichelsen Date: 2016-02-05 16:34:39 +0000 (Fri, 05 Feb 2016) Log Message: ----------- ansible/trunk: Update to Python 2.7 as ECDSA is no longer supported in 2.6 Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2016-02-05 13:39:56 UTC (rev 25546) +++ csw/mgar/pkg/ansible/trunk/Makefile 2016-02-05 16:34:39 UTC (rev 25547) @@ -24,7 +24,7 @@ SPKG_DESC_CSWansible = Deploy, manage, and orchestrate computer systems # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWansible += CSWpython -# We really want Python 2.6 which checkpkg cannot detect +# We really want Python 2.7 which checkpkg cannot detect CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpython RUNTIME_DEP_PKGS_CSWansible += CSWpy-jinja2 RUNTIME_DEP_PKGS_CSWansible += CSWpy-markupsafe @@ -39,30 +39,30 @@ CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2 # There are many OS specific (Linux, FreeBSD, etc.) paths stored in those files. -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/basic.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/homebrew_tap.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/homebrew_cask.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/pkgng.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/homebrew.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/language/composer.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/monitoring/nagios.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/monitoring/logentries.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/language/pip.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/os/yum.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/cloud/amazon/s3.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/cloud/google/gc_storage.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/files/unarchive.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/system/service.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/os/rhn_register.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/svc.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/dnf.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/locale_gen.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/osx_defaults.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/facts.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/utils/display.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/basic.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/urls.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/urls.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/packaging/os/homebrew_tap.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/packaging/os/homebrew_cask.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/packaging/os/pkgng.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/packaging/os/homebrew.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/packaging/language/composer.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/monitoring/nagios.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/monitoring/logentries.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/core/packaging/language/pip.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/core/packaging/os/yum.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/core/cloud/amazon/s3.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/core/cloud/google/gc_storage.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/core/files/unarchive.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/core/system/service.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/ansible/modules/core/packaging/os/rhn_register.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/system/svc.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/packaging/os/dnf.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/system/locale_gen.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/system/osx_defaults.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/facts.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/utils/display.py #REINPLACEMENTS += etc #REINPLACE_MATCH_etc = /etc/ansible @@ -92,15 +92,15 @@ TEST_SCRIPTS = LICENSE = COPYING -MODULATIONS_PYTHON_VERSION = 2_6 +MODULATIONS_PYTHON_VERSION = 2_7 PRESERVECONF += $(sysconfdir)/ansible/hosts PRESERVECONF += $(sysconfdir)/ansible/ansible.cfg -#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/utils/display.py -#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/facts.py -#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py -#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/osx_defaults.py +#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/utils/display.py +#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/facts.py +#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py +#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/system/osx_defaults.py include gar/category.mk 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 Fri Feb 5 17:55:18 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 5 Feb 2016 16:55:18 +0000 Subject: SF.net SVN: gar:[25548] csw/mgar/pkg/tor/branches/alpha Message-ID: <3pxjYM26kYz1H8@mail.opencsw.org> Revision: 25548 http://sourceforge.net/p/gar/code/25548 Author: jake_goerzen Date: 2016-02-05 16:55:18 +0000 (Fri, 05 Feb 2016) Log Message: ----------- tor-alpha: update to 0.2.8.1-alpha Modified Paths: -------------- csw/mgar/pkg/tor/branches/alpha/Makefile csw/mgar/pkg/tor/branches/alpha/checksums Modified: csw/mgar/pkg/tor/branches/alpha/Makefile =================================================================== --- csw/mgar/pkg/tor/branches/alpha/Makefile 2016-02-05 16:34:39 UTC (rev 25547) +++ csw/mgar/pkg/tor/branches/alpha/Makefile 2016-02-05 16:55:18 UTC (rev 25548) @@ -1,6 +1,6 @@ # $Id$ NAME = tor -VERSION = 0.2.7.2-alpha +VERSION = 0.2.8.1-alpha GARTYPE = v2 DESCRIPTION = Secure network traffic router @@ -11,7 +11,7 @@ MASTER_SITES = http://www.torproject.org/dist/ DISTFILES = $(DISTNAME).tar.gz -GARCOMPILER = GCC4 +GARCOMPILER = GNU # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/tor/branches/alpha/checksums =================================================================== --- csw/mgar/pkg/tor/branches/alpha/checksums 2016-02-05 16:34:39 UTC (rev 25547) +++ csw/mgar/pkg/tor/branches/alpha/checksums 2016-02-05 16:55:18 UTC (rev 25548) @@ -1 +1 @@ -f102c23727ce9fbbb5c58495bdfdba64 tor-0.2.7.2-alpha.tar.gz +e3563ea519bfee250ae50e099635872b tor-0.2.8.1-alpha.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 Feb 5 17:59:06 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 5 Feb 2016 16:59:06 +0000 Subject: SF.net SVN: gar:[25549] csw/mgar/pkg/lang-python Message-ID: <3pxjdk5wGLz1KW@mail.opencsw.org> Revision: 25549 http://sourceforge.net/p/gar/code/25549 Author: dmichelsen Date: 2016-02-05 16:59:05 +0000 (Fri, 05 Feb 2016) Log Message: ----------- lang-python/ecdsa: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/ecdsa/trunk/Makefile csw/mgar/pkg/lang-python/ecdsa/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/ecdsa/ Modified: csw/mgar/pkg/lang-python/ecdsa/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2015-10-19 12:51:46 UTC (rev 25302) +++ csw/mgar/pkg/lang-python/ecdsa/trunk/Makefile 2016-02-05 16:59:05 UTC (rev 25549) @@ -1,28 +1,21 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = pyOpenSSL -VERSION = 0.13.1 +NAME = ecdsa +VERSION = 0.13 GARTYPE = v2 CATEGORIES = python -DESCRIPTION = OpenSSL bindings for Python +DESCRIPTION = ECDSA cryptographic signature library MASTER_SITES = $(PYPI_MIRROR) DISTFILES += $(DISTNAME).tar.gz -BUILD_DEP_PKGS_CSWpy-openssl += CSWpython_dev -BUILD_DEP_PKGS_CSWpy-openssl += CSWpython27_dev - -PACKAGES += CSWpy-openssl -SPKG_DESC_CSWpy-openssl = OpenSSL bindings for Python +PACKAGES += CSWpy-ecdsa +SPKG_DESC_CSWpy-ecdsa = ECDSA cryptographic signature library # 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 +# This is pure Python +ARCHALL_CSWpy-ecdsa = 1 -TEST_SCRIPTS = - include gar/category.mk Modified: csw/mgar/pkg/lang-python/ecdsa/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums 2015-10-19 12:51:46 UTC (rev 25302) +++ csw/mgar/pkg/lang-python/ecdsa/trunk/checksums 2016-02-05 16:59:05 UTC (rev 25549) @@ -1 +1 @@ -e27a3b76734c39ea03952ca94cc56715 pyOpenSSL-0.13.1.tar.gz +1f60eda9cb5c46722856db41a3ae6670 ecdsa-0.13.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 Feb 5 18:04:31 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 5 Feb 2016 17:04:31 +0000 Subject: SF.net SVN: gar:[25550] csw/mgar/pkg/ansible/trunk/Makefile Message-ID: <3pxjly5GS4z1My@mail.opencsw.org> Revision: 25550 http://sourceforge.net/p/gar/code/25550 Author: dmichelsen Date: 2016-02-05 17:04:31 +0000 (Fri, 05 Feb 2016) Log Message: ----------- ansible/trunk: Add deps to ECDSA and sshpass Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2016-02-05 16:59:05 UTC (rev 25549) +++ csw/mgar/pkg/ansible/trunk/Makefile 2016-02-05 17:04:31 UTC (rev 25550) @@ -29,8 +29,9 @@ RUNTIME_DEP_PKGS_CSWansible += CSWpy-jinja2 RUNTIME_DEP_PKGS_CSWansible += CSWpy-markupsafe RUNTIME_DEP_PKGS_CSWansible += CSWpy-yaml -RUNTIME_DEP_PKGS_CSWansible += CSWpy-paramiko RUNTIME_DEP_PKGS_CSWansible += CSWopenssh-client +RUNTIME_DEP_PKGS_CSWansible += CSWpy-ecdsa +RUNTIME_DEP_PKGS_CSWansible += CSWsshpass # checkpkg cannot detect these CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-markupsafe CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-yaml 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 Feb 5 20:30:51 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 5 Feb 2016 19:30:51 +0000 Subject: SF.net SVN: gar:[25551] csw/mgar/pkg/ansible/trunk Message-ID: <3pxn111jG6z1Tk@mail.opencsw.org> Revision: 25551 http://sourceforge.net/p/gar/code/25551 Author: dmichelsen Date: 2016-02-05 19:30:50 +0000 (Fri, 05 Feb 2016) Log Message: ----------- ansible/trunk: Make the patches apply again Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ansible/trunk/files/0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch csw/mgar/pkg/ansible/trunk/files/0002-Extended-sbin_paths-by-opt-csw-sbin.patch Removed Paths: ------------- csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/ansible/trunk/Makefile 2016-02-05 19:30:50 UTC (rev 25551) @@ -4,19 +4,14 @@ CATEGORIES = python DESCRIPTION = Deploy, manage, and orchestrate computer systems -define BLURB -endef MASTER_SITES += http://releases.ansible.com/ansible/ DISTFILES += $(DISTNAME).tar.gz DISTFILES += hosts.CSW -# The .git makes the build system think we have a checkout out repo and not a tarball -NOGITPATCH = 1 +PATCHFILES += 0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch +PATCHFILES += 0002-Extended-sbin_paths-by-opt-csw-sbin.patch -# PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch -# PATCHFILES += 0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch - PACKAGES += CSWansible # Stick with upstream naming CHECKPKG_OVERRIDES_CSWansible += pkgname-does-not-start-with-CSWpy- @@ -33,11 +28,12 @@ RUNTIME_DEP_PKGS_CSWansible += CSWpy-ecdsa RUNTIME_DEP_PKGS_CSWansible += CSWsshpass # checkpkg cannot detect these +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2 CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-markupsafe CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-yaml -CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-paramiko CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWopenssh-client -CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2 +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-ecdsa +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWsshpass # There are many OS specific (Linux, FreeBSD, etc.) paths stored in those files. CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/basic.py @@ -65,24 +61,22 @@ CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/facts.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/utils/display.py -#REINPLACEMENTS += etc -#REINPLACE_MATCH_etc = /etc/ansible -#REINPLACE_WITH_etc = $(sysconfdir)/ansible +REINPLACEMENTS += etc +REINPLACE_MATCH_etc = /etc/ansible +REINPLACE_WITH_etc = $(sysconfdir)/ansible -#REINPLACE_FILES_etc += bin/ansible-galaxy -#REINPLACE_FILES_etc += lib/ansible/constants.py -#REINPLACE_FILES_etc += lib/ansible/module_utils/urls.py -#REINPLACE_FILES_etc += lib/ansible/modules/core/system/setup.py -#REINPLACE_FILES_etc += lib/ansible/playbook/__init__.py -#REINPLACE_FILES_etc += plugins/inventory/nova.py -#REINPLACE_FILES_etc += plugins/inventory/openstack.py -#REINPLACE_FILES_etc += docs/man/man1/ansible.1.asciidoc.in -#REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1 -#REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1.asciidoc.in -#REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1 -#REINPLACE_FILES_etc += docs/man/man1/ansible.1 -#REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1.asciidoc.in -#REINPLACE_FILES_etc += examples/ansible.cfg +REINPLACE_FILES_etc += lib/ansible/constants.py +REINPLACE_FILES_etc += lib/ansible/modules/core/files/replace.py +REINPLACE_FILES_etc += lib/ansible/modules/core/files/lineinfile.py +REINPLACE_FILES_etc += lib/ansible/plugins/callback/log_plays.py +REINPLACE_FILES_etc += contrib/inventory/collins.py +REINPLACE_FILES_etc += contrib/inventory/spacewalk.py +REINPLACE_FILES_etc += contrib/inventory/linode.py +REINPLACE_FILES_etc += contrib/inventory/cobbler.py +REINPLACE_FILES_etc += docs/man/man1/ansible.1.asciidoc.in +REINPLACE_FILES_etc += docs/man/man1/ansible-playbook.1.asciidoc.in +REINPLACE_FILES_etc += docs/man/man1/ansible-galaxy.1.asciidoc.in +REINPLACE_FILES_etc += examples/ansible.cfg REINPLACE_USRSHARE += lib/ansible/constants.py REINPLACE_USRSHARE += lib/ansible/modules/extras/packaging/elasticsearch_plugin.py @@ -98,11 +92,6 @@ PRESERVECONF += $(sysconfdir)/ansible/hosts PRESERVECONF += $(sysconfdir)/ansible/ansible.cfg -#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/utils/display.py -#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_utils/facts.py -#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py -#CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/modules/extras/system/osx_defaults.py - include gar/category.mk post-install: Copied: csw/mgar/pkg/ansible/trunk/files/0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch (from rev 25550, csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch) =================================================================== --- csw/mgar/pkg/ansible/trunk/files/0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch (rev 0) +++ csw/mgar/pkg/ansible/trunk/files/0001-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch 2016-02-05 19:30:50 UTC (rev 25551) @@ -0,0 +1,25 @@ +From 41e1ab8efa20dcf7fd7d4ed7f9b41faa726ea58c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 5 Feb 2016 20:08:46 +0100 +Subject: [PATCH] Add /etc/opt/csw/ssl/certs to the path searched for + .crt./.pem files. + +--- + lib/ansible/module_utils/urls.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py +index 41613f6..a6786cc 100644 +--- a/lib/ansible/module_utils/urls.py ++++ b/lib/ansible/module_utils/urls.py +@@ -463,6 +463,7 @@ class SSLValidationHandler(urllib2.BaseHandler): + elif system == 'NetBSD': + ca_certs.append('/etc/openssl/certs') + elif system == 'SunOS': ++ paths_checked.append('/etc/opt/csw/ssl/certs') + paths_checked.append('/opt/local/etc/openssl/certs') + + # fall back to a user-deployed cert in a standard +-- +2.4.0 + Copied: csw/mgar/pkg/ansible/trunk/files/0002-Extended-sbin_paths-by-opt-csw-sbin.patch (from rev 25302, csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch) =================================================================== --- csw/mgar/pkg/ansible/trunk/files/0002-Extended-sbin_paths-by-opt-csw-sbin.patch (rev 0) +++ csw/mgar/pkg/ansible/trunk/files/0002-Extended-sbin_paths-by-opt-csw-sbin.patch 2016-02-05 19:30:50 UTC (rev 25551) @@ -0,0 +1,25 @@ +From 5665941f9f67a754f5201b1fa4d7a7d45305f65a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 5 Feb 2016 20:12:20 +0100 +Subject: [PATCH] Extended sbin_paths by '/opt/csw/sbin'. + +--- + lib/ansible/module_utils/basic.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py +index e21930b..f653980 100644 +--- a/lib/ansible/module_utils/basic.py ++++ b/lib/ansible/module_utils/basic.py +@@ -1466,7 +1466,7 @@ class AnsibleModule(object): + - opt_dirs: optional list of directories to search in addition to PATH + if found return full path; otherwise return None + ''' +- sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin'] ++ sbin_paths = ['/sbin', '/usr/sbin', '/opt/csw/sbin', '/usr/local/sbin'] + paths = [] + for d in opt_dirs: + if d is not None and os.path.exists(d): +-- +2.4.0 + Deleted: csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch =================================================================== --- csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/ansible/trunk/files/0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch 2016-02-05 19:30:50 UTC (rev 25551) @@ -1,28 +0,0 @@ -From ccdf5dd16bf0ba322e33db0bd23ea885aebd023d Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 16 Mar 2014 09:44:48 +0100 -Subject: [PATCH] Add /etc/opt/csw/ssl/certs to the path searched for - .crt./.pem files. - ---- - lib/ansible/module_utils/urls.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py -index 053dfc0..049e14a 100644 ---- a/lib/ansible/module_utils/urls.py -+++ b/lib/ansible/module_utils/urls.py -@@ -95,7 +95,9 @@ class SSLValidationHandler(urllib2.BaseHandler): - # build a list of paths to check for .crt/.pem files - # based on the platform type - paths_checked.append('/etc/ssl/certs') -- if platform == 'Linux': -+ if platform == 'SunOS': -+ paths_checked.append('/etc/opt/csw/ssl/certs') -+ elif platform == 'Linux': - paths_checked.append('/etc/pki/ca-trust/extracted/pem') - paths_checked.append('/etc/pki/tls/certs') - paths_checked.append('/usr/share/ca-certificates/cacert.org') --- -1.8.4.1 - Deleted: csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch =================================================================== --- csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch 2016-02-05 19:30:50 UTC (rev 25551) @@ -1,25 +0,0 @@ -From a5f642e373bf88ed834feb7cc8f2d9f91ab8a247 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 16 Mar 2014 09:34:08 +0100 -Subject: [PATCH] Extended sbin_paths by '/opt/csw/sbin'. - ---- - lib/ansible/module_utils/basic.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py -index be59185..abf0370 100644 ---- a/lib/ansible/module_utils/basic.py -+++ b/lib/ansible/module_utils/basic.py -@@ -831,7 +831,7 @@ class AnsibleModule(object): - - opt_dirs: optional list of directories to search in addition to PATH - if found return full path; otherwise return None - ''' -- sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin'] -+ sbin_paths = ['/sbin', '/usr/sbin', '/opt/csw/sbin', '/usr/local/sbin'] - paths = [] - for d in opt_dirs: - if d is not None and os.path.exists(d): --- -1.8.4.1 - 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 Feb 5 20:32:18 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 5 Feb 2016 19:32:18 +0000 Subject: SF.net SVN: gar:[25552] csw/mgar/pkg Message-ID: <3pxn2T6ygTz1X8@mail.opencsw.org> Revision: 25552 http://sourceforge.net/p/gar/code/25552 Author: dmichelsen Date: 2016-02-05 19:32:18 +0000 (Fri, 05 Feb 2016) Log Message: ----------- mGAR v2: Remove svn:externals which should long be gone Property Changed: ---------------- csw/mgar/pkg/sdlnet/trunk/ csw/mgar/pkg/sdlttf/trunk/ Index: csw/mgar/pkg/sdlnet/trunk =================================================================== --- csw/mgar/pkg/sdlnet/trunk 2016-02-05 19:30:50 UTC (rev 25551) +++ csw/mgar/pkg/sdlnet/trunk 2016-02-05 19:32:18 UTC (rev 25552) Property changes on: csw/mgar/pkg/sdlnet/trunk ___________________________________________________________________ Deleted: svn:externals ## -1 +0,0 ## -gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 \ No newline at end of property Index: csw/mgar/pkg/sdlttf/trunk =================================================================== --- csw/mgar/pkg/sdlttf/trunk 2016-02-05 19:30:50 UTC (rev 25551) +++ csw/mgar/pkg/sdlttf/trunk 2016-02-05 19:32:18 UTC (rev 25552) Property changes on: csw/mgar/pkg/sdlttf/trunk ___________________________________________________________________ Deleted: svn:externals ## -1 +0,0 ## -gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 \ 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 rthurner at users.sourceforge.net Sat Feb 6 20:14:02 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 6 Feb 2016 19:14:02 +0000 Subject: SF.net SVN: gar:[25553] csw/mgar/pkg/lang-python/python/branches/python-3.4 Message-ID: <3pyNb52QfczKp@mail.opencsw.org> Revision: 25553 http://sourceforge.net/p/gar/code/25553 Author: rthurner Date: 2016-02-06 19:14:01 +0000 (Sat, 06 Feb 2016) Log Message: ----------- lang-python/python/branches/python-3.4: python-3.4, update to python-3.4.4 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums Modified: csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile 2016-02-05 19:32:18 UTC (rev 25552) +++ csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile 2016-02-06 19:14:01 UTC (rev 25553) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 3.4.0 +VERSION = 3.4.4 VER = 3.4 DVER = 3-4 UVER = 3_4 Modified: csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums 2016-02-05 19:32:18 UTC (rev 25552) +++ csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums 2016-02-06 19:14:01 UTC (rev 25553) @@ -1 +1 @@ -77c22725e14af3d71022cbfdebff4903 Python-3.4.0.tar.xz +8d526b7128affed5fbe72ceac8d2fc63 Python-3.4.4.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Feb 8 10:55:37 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 8 Feb 2016 09:55:37 +0000 Subject: SF.net SVN: gar:[25554] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: <3pzN5r6Qbhzt7@mail.opencsw.org> Revision: 25554 http://sourceforge.net/p/gar/code/25554 Author: lblume Date: 2016-02-08 09:55:36 +0000 (Mon, 08 Feb 2016) Log Message: ----------- mysql5/branches/mysql-5.5.x: Bump to 5.5.48 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2016-02-06 19:14:01 UTC (rev 25553) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2016-02-08 09:55:36 UTC (rev 25554) @@ -14,7 +14,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 47 +PATCHLEVEL = 48 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2016-02-06 19:14:01 UTC (rev 25553) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2016-02-08 09:55:36 UTC (rev 25554) @@ -1 +1 @@ -cdeaa30303bca9c8361137b719ba7f3c mysql-5.5.47.tar.gz +53c9b1e5058183ac64c71455ae4dfc51 mysql-5.5.48.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 Feb 8 13:26:58 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 8 Feb 2016 12:26:58 +0000 Subject: SF.net SVN: gar:[25555] csw/mgar/pkg/curl/trunk Message-ID: <3pzRSM055vzyY@mail.opencsw.org> Revision: 25555 http://sourceforge.net/p/gar/code/25555 Author: dmichelsen Date: 2016-02-08 12:26:57 +0000 (Mon, 08 Feb 2016) Log Message: ----------- curl/trunk: Update to 4.47.1 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2016-02-08 09:55:36 UTC (rev 25554) +++ csw/mgar/pkg/curl/trunk/Makefile 2016-02-08 12:26:57 UTC (rev 25555) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.47.0 +VERSION = 7.47.1 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2016-02-08 09:55:36 UTC (rev 25554) +++ csw/mgar/pkg/curl/trunk/checksums 2016-02-08 12:26:57 UTC (rev 25555) @@ -1 +1 @@ -a6a400c4d6de843d13ffbbb39f4d8173 curl-7.47.0.tar.lzma +8242c073d8e5fc1c2a1aa946f1e903a4 curl-7.47.1.tar.lzma This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Feb 8 14:13:46 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 8 Feb 2016 13:13:46 +0000 Subject: SF.net SVN: gar:[25556] csw/mgar/pkg/mysql5/branches/mysql-5.6.x Message-ID: <3pzSVM1pN0z12H@mail.opencsw.org> Revision: 25556 http://sourceforge.net/p/gar/code/25556 Author: lblume Date: 2016-02-08 13:13:46 +0000 (Mon, 08 Feb 2016) Log Message: ----------- mysql5/branches/mysql-5.6.x: Bump to 5.6.29 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2016-02-08 12:26:57 UTC (rev 25555) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2016-02-08 13:13:46 UTC (rev 25556) @@ -20,7 +20,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)56 BASE_VERSION = 5.6 -PATCHLEVEL = 28 +PATCHLEVEL = 29 ALTS_PRIO = 56 VERSION = $(BASE_VERSION).$(PATCHLEVEL) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2016-02-08 12:26:57 UTC (rev 25555) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2016-02-08 13:13:46 UTC (rev 25556) @@ -1 +1 @@ -4bc8fde6d04fb7104df1ba8a4025b156 mysql-5.6.28.tar.gz +aaa21c6450adee3a1894fd1710f02bf5 mysql-5.6.29.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 Feb 8 15:31:57 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 8 Feb 2016 14:31:57 +0000 Subject: SF.net SVN: gar:[25557] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: <3pzVDf4z7zz1DM@mail.opencsw.org> Revision: 25557 http://sourceforge.net/p/gar/code/25557 Author: dmichelsen Date: 2016-02-08 14:31:57 +0000 (Mon, 08 Feb 2016) Log Message: ----------- samba/branches/samba3: Adjust 64 bit dirs in /usr/lib to work with merging. This was broken in r23841 Revision Links: -------------- http://sourceforge.net/p/gar/code/23841 Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2016-02-08 13:13:46 UTC (rev 25556) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2016-02-08 14:31:57 UTC (rev 25557) @@ -423,14 +423,9 @@ GARCOMPILER = $(GARCOMPILER_$(GAROSREL)) # Set the target dir for modules with the proper arch -NSS_MODULE_DIR = /usr/lib -PAM_MODULE_DIR = /usr/lib/security +NSS_MODULE_DIR = /usr/lib/$(MM_LIBDIR) +PAM_MODULE_DIR = /usr/lib/security/$(MM_LIBDIR) -ifeq ($(MEMORYMODEL),64) - NSS_MODULE_DIR = /usr/lib/$(ISA) - PAM_MODULE_DIR = /usr/lib/security/$(ISA) -endif - # Define the targets for the links NSS_WINBIND_32 = ../..$(libdir)/nss_winbind.so.1 NSS_WINS_32 = ../..$(libdir)/nss_wins.so.1 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 Feb 10 11:26:20 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2016 10:26:20 +0000 Subject: SF.net SVN: gar:[25558] csw/mgar/pkg/jdk8/trunk Message-ID: <3q0chM2jJTzXp@mail.opencsw.org> Revision: 25558 http://sourceforge.net/p/gar/code/25558 Author: dmichelsen Date: 2016-02-10 10:26:19 +0000 (Wed, 10 Feb 2016) Log Message: ----------- jdk8/trunk: Update to 8u74 Modified Paths: -------------- csw/mgar/pkg/jdk8/trunk/Makefile csw/mgar/pkg/jdk8/trunk/checksums Modified: csw/mgar/pkg/jdk8/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk8/trunk/Makefile 2016-02-08 14:31:57 UTC (rev 25557) +++ csw/mgar/pkg/jdk8/trunk/Makefile 2016-02-10 10:26:19 UTC (rev 25558) @@ -1,6 +1,6 @@ NAME = jre8 -SPKG_VERSION = 1.8.0_60 -VERSION = 8u60 +SPKG_VERSION = 1.8.0_74 +VERSION = 8u74 GARTYPE = v2 DESCRIPTION = Java Development Kit 8 Modified: csw/mgar/pkg/jdk8/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk8/trunk/checksums 2016-02-08 14:31:57 UTC (rev 25557) +++ csw/mgar/pkg/jdk8/trunk/checksums 2016-02-10 10:26:19 UTC (rev 25558) @@ -1,2 +1,2 @@ -0e5279b1f295c3834826ba9dd1d231b0 jdk-8u60-solaris-sparcv9.tar.gz -2c7a070f4a0c3248e084626c25b27557 jdk-8u60-solaris-x64.tar.gz +92b6c3e2358146a215417dc48439a75f jdk-8u74-solaris-sparcv9.tar.gz +e1e472e994e608be8dce526b3fa7c62e jdk-8u74-solaris-x64.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 Wed Feb 10 13:08:03 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2016 12:08:03 +0000 Subject: SF.net SVN: gar:[25559] csw/mgar/pkg/texinfo/trunk Message-ID: <3q0fxc2M6szd3@mail.opencsw.org> Revision: 25559 http://sourceforge.net/p/gar/code/25559 Author: dmichelsen Date: 2016-02-10 12:08:03 +0000 (Wed, 10 Feb 2016) Log Message: ----------- texinfo/trunk: Update to 6.1 Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/Makefile csw/mgar/pkg/texinfo/trunk/checksums Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2016-02-10 10:26:19 UTC (rev 25558) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2016-02-10 12:08:03 UTC (rev 25559) @@ -1,5 +1,5 @@ NAME = texinfo -VERSION = 5.2 +VERSION = 6.1 GARTYPE = v2 DESCRIPTION = The GNU Documentation System @@ -9,7 +9,7 @@ endef MASTER_SITES += $(GNU_MIRROR) -DISTFILES += $(DISTNAME).tar.gz +DISTFILES += $(DISTNAME).tar.xz DISTFILES += CSWtexinfo.postinstall DISTFILES += mkdirentries @@ -24,6 +24,7 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWtexinfo += CSWbash RUNTIME_DEP_PKGS_CSWtexinfo += CSWgsed +RUNTIME_DEP_PKGS_CSWtexinfo += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWtexinfo += CSWlibintl8 RUNTIME_DEP_PKGS_CSWtexinfo += CSWlibncurses5 # Are these really needed? May investigate deeply later. @@ -41,6 +42,9 @@ BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) BUILD_DEP_PKGS += CSWgzip +# We neeed 'id -u' to work +CONFIGURE_ENV_PATH = /usr/xpg4/bin:$(PATH) + CONFIGURE_ARGS = $(DIRPATHS) # /opt/csw/lib is added automatically during the build and the Modified: csw/mgar/pkg/texinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/texinfo/trunk/checksums 2016-02-10 10:26:19 UTC (rev 25558) +++ csw/mgar/pkg/texinfo/trunk/checksums 2016-02-10 12:08:03 UTC (rev 25559) @@ -1 +1 @@ -1b8f98b80a8e6c50422125e07522e8db texinfo-5.2.tar.gz +1d7ec1888fae00730693597852b00cde texinfo-6.1.tar.xz 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 Feb 10 15:53:59 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Feb 2016 14:53:59 +0000 Subject: SF.net SVN: gar:[25560] csw/mgar/pkg/texinfo/trunk/Makefile Message-ID: <3q0kd52gt8zjF@mail.opencsw.org> Revision: 25560 http://sourceforge.net/p/gar/code/25560 Author: dmichelsen Date: 2016-02-10 14:53:59 +0000 (Wed, 10 Feb 2016) Log Message: ----------- texinfo/trunk: Add environment settings for the Perl module Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/Makefile Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2016-02-10 12:08:03 UTC (rev 25559) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2016-02-10 14:53:59 UTC (rev 25560) @@ -45,6 +45,14 @@ # We neeed 'id -u' to work CONFIGURE_ENV_PATH = /usr/xpg4/bin:$(PATH) +# This is needed for tp/Texinfo/Convert/XSParagraph +EXTRA_CONFIGURE_EXPORTS += PERL_EXT_CFLAGS +EXTRA_CONFIGURE_EXPORTS += PERL_EXT_CPPFLAGS +EXTRA_CONFIGURE_EXPORTS += PERL_EXT_LDFLAGS +CONFIGURE_ENV_PERL_EXT_CFLAGS = $(CFLAGS) +CONFIGURE_ENV_PERL_EXT_CPPFLAGS = $(CPPFLAGS) +CONFIGURE_ENV_PERL_EXT_LDFLAGS = $(LDFLAGS) + CONFIGURE_ARGS = $(DIRPATHS) # /opt/csw/lib is added automatically during the build and the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Feb 11 12:32:25 2016 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Feb 2016 11:32:25 +0000 Subject: SF.net SVN: gar:[25561] csw/mgar/pkg/git/trunk Message-ID: <3q1G675dnyz13R@mail.opencsw.org> Revision: 25561 http://sourceforge.net/p/gar/code/25561 Author: bdwalton Date: 2016-02-11 11:32:25 +0000 (Thu, 11 Feb 2016) Log Message: ----------- git/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2016-02-10 14:53:59 UTC (rev 25560) +++ csw/mgar/pkg/git/trunk/Makefile 2016-02-11 11:32:25 UTC (rev 25561) @@ -1,5 +1,5 @@ NAME = git -VERSION = 2.4.0 +VERSION = 2.7.1 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) GARTYPE = v2 Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2016-02-10 14:53:59 UTC (rev 25560) +++ csw/mgar/pkg/git/trunk/checksums 2016-02-11 11:32:25 UTC (rev 25561) @@ -1 +1 @@ -544d3f18ccef6479149490a4c34d53ff git-2.4.0.tar.gz +846ac45a1638e9a6ff3a9b790f6c8d99 git-2.7.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 Fri Feb 12 16:54:35 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 12 Feb 2016 15:54:35 +0000 Subject: SF.net SVN: gar:[25562] csw/mgar/pkg/lang-python/acme/trunk Message-ID: <3q1ztC0HVLz40@mail.opencsw.org> Revision: 25562 http://sourceforge.net/p/gar/code/25562 Author: janholzh Date: 2016-02-12 15:54:35 +0000 (Fri, 12 Feb 2016) Log Message: ----------- lang-python/acme/trunk: update to 0.4.0 Modified Paths: -------------- csw/mgar/pkg/lang-python/acme/trunk/Makefile csw/mgar/pkg/lang-python/acme/trunk/checksums Modified: csw/mgar/pkg/lang-python/acme/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/acme/trunk/Makefile 2016-02-11 11:32:25 UTC (rev 25561) +++ csw/mgar/pkg/lang-python/acme/trunk/Makefile 2016-02-12 15:54:35 UTC (rev 25562) @@ -3,7 +3,7 @@ # $Id$ NAME = acme -VERSION = 0.1.0 +VERSION = 0.4.0 CATEGORIES = python GARTYPE = v2 SPKG_DESC_CSWpy-acme = ACME protocol implementation in Python Modified: csw/mgar/pkg/lang-python/acme/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/acme/trunk/checksums 2016-02-11 11:32:25 UTC (rev 25561) +++ csw/mgar/pkg/lang-python/acme/trunk/checksums 2016-02-12 15:54:35 UTC (rev 25562) @@ -1 +1 @@ -7115ba77709b281ffaa59d853cd5337a acme-0.1.0.tar.gz +e62145e1d068e7c074110b87f81bd6f9 acme-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 Fri Feb 12 16:57:17 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 12 Feb 2016 15:57:17 +0000 Subject: SF.net SVN: gar:[25563] csw/mgar/pkg/lang-python/letsencrypt/trunk Message-ID: <3q1zxB1QZWz6L@mail.opencsw.org> Revision: 25563 http://sourceforge.net/p/gar/code/25563 Author: janholzh Date: 2016-02-12 15:57:17 +0000 (Fri, 12 Feb 2016) Log Message: ----------- lang-python/letsencrypt/trunk: update to 0.4.0 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 2016-02-12 15:54:35 UTC (rev 25562) +++ csw/mgar/pkg/lang-python/letsencrypt/trunk/Makefile 2016-02-12 15:57:17 UTC (rev 25563) @@ -3,7 +3,7 @@ # $Id$ NAME = letsencrypt -VERSION = 0.1.0 +VERSION = 0.4.0 CATEGORIES = python GARTYPE = v2 SPKG_DESC_CSWletsencrypt = Let's Encrypt client Modified: csw/mgar/pkg/lang-python/letsencrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/letsencrypt/trunk/checksums 2016-02-12 15:54:35 UTC (rev 25562) +++ csw/mgar/pkg/lang-python/letsencrypt/trunk/checksums 2016-02-12 15:57:17 UTC (rev 25563) @@ -1 +1 @@ -b3bc1f8a49e4953771d2fa77bf0fe9d2 letsencrypt-0.1.0.tar.gz +dfa7c9e9f1d2cb2a1cda6d861a16c7f5 letsencrypt-0.4.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 Fri Feb 12 21:32:47 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Feb 2016 20:32:47 +0000 Subject: SF.net SVN: gar:[25564] csw/mgar/pkg/java/ecj/trunk Message-ID: <3q2635541xzHw@mail.opencsw.org> Revision: 25564 http://sourceforge.net/p/gar/code/25564 Author: dmichelsen Date: 2016-02-12 20:32:47 +0000 (Fri, 12 Feb 2016) Log Message: ----------- java/ecj/trunk: Use correct version of ecj.jar this time Modified Paths: -------------- csw/mgar/pkg/java/ecj/trunk/Makefile csw/mgar/pkg/java/ecj/trunk/checksums Modified: csw/mgar/pkg/java/ecj/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ecj/trunk/Makefile 2016-02-12 15:57:17 UTC (rev 25563) +++ csw/mgar/pkg/java/ecj/trunk/Makefile 2016-02-12 20:32:47 UTC (rev 25564) @@ -1,12 +1,14 @@ NAME = ecj -VERSION = 4.3M4 +VERSION = 4.5 CATEGORIES = java GARTYPE = v2 DESCRIPTION = JDT Core Batch Compiler -# There seems to be some issue with the download code which breaks on & in the URL, download manually for now and put into /home/src -MASTER_SITES += http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downloads/drops4/S-4.3M4-201212140730/ +# The download location is described at the the unpacked gcc tarball in contrib/download_ecj +# The file should be named ecj-latest.jar which happens to be 4.5, not the latest 4.9. +# It is advisable from time to time to check if this still holds. +MASTER_SITES += ftp://sourceware.org/pub/java/ DISTFILES += $(DISTNAME).jar DISTFILES += ecj1 DISTFILES += README.CSW Modified: csw/mgar/pkg/java/ecj/trunk/checksums =================================================================== --- csw/mgar/pkg/java/ecj/trunk/checksums 2016-02-12 15:57:17 UTC (rev 25563) +++ csw/mgar/pkg/java/ecj/trunk/checksums 2016-02-12 20:32:47 UTC (rev 25564) @@ -1 +1 @@ -a8bcbea304cb13bd78780e690955e9a1 ecj-4.3M4.jar +d7cd6a27c8801e66cbaa964a039ecfdb ecj-4.5.jar 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 Feb 15 21:18:58 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Feb 2016 20:18:58 +0000 Subject: SF.net SVN: gar:[25565] csw/mgar/pkg/tmpwatch/trunk Message-ID: <3q3xbs3Gqtz1L1@mail.opencsw.org> Revision: 25565 http://sourceforge.net/p/gar/code/25565 Author: dmichelsen Date: 2016-02-15 20:18:57 +0000 (Mon, 15 Feb 2016) Log Message: ----------- tmpwatch/trunk: Update to 2.11 Modified Paths: -------------- csw/mgar/pkg/tmpwatch/trunk/Makefile csw/mgar/pkg/tmpwatch/trunk/checksums Modified: csw/mgar/pkg/tmpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/Makefile 2016-02-12 20:32:47 UTC (rev 25564) +++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2016-02-15 20:18:57 UTC (rev 25565) @@ -1,5 +1,5 @@ NAME = tmpwatch -VERSION = 2.10.1 +VERSION = 2.11 GARTYPE = v2 DESCRIPTION = Removes files which haven't been accessed for a period of time @@ -12,14 +12,10 @@ VENDOR_URL = https://fedorahosted.org/tmpwatch/ MASTER_SITES = https://fedorahosted.org/releases/t/m/tmpwatch/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += $(DISTNAME).tar.bz2 -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = +EXTRA_CFLAGS += -xc99=all -NORUNPATH = 1 - include gar/category.mk # Install changelog.CSW Modified: csw/mgar/pkg/tmpwatch/trunk/checksums =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/checksums 2016-02-12 20:32:47 UTC (rev 25564) +++ csw/mgar/pkg/tmpwatch/trunk/checksums 2016-02-15 20:18:57 UTC (rev 25565) @@ -1 +1 @@ -c26ac6aef91e230f748b08b066c406d9 tmpwatch-2.10.1.tar.bz2 +9ea7e169296eb1196b80fe05bba1cbd0 tmpwatch-2.11.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 Feb 16 10:55:40 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 16 Feb 2016 09:55:40 +0000 Subject: SF.net SVN: gar:[25566] csw/mgar/pkg/zabbix/trunk Message-ID: <3q4Hk422Qcz7S@mail.opencsw.org> Revision: 25566 http://sourceforge.net/p/gar/code/25566 Author: janholzh Date: 2016-02-16 09:55:39 +0000 (Tue, 16 Feb 2016) Log Message: ----------- zabbix/trunk: update to 3.0.0 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 2016-02-15 20:18:57 UTC (rev 25565) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2016-02-16 09:55:39 UTC (rev 25566) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = zabbix -VERSION = 2.4.7 +VERSION = 3.0.0 GARTYPE = v2 DESCRIPTION = Zabbix monitoring system Modified: csw/mgar/pkg/zabbix/trunk/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums 2016-02-15 20:18:57 UTC (rev 25565) +++ csw/mgar/pkg/zabbix/trunk/checksums 2016-02-16 09:55:39 UTC (rev 25566) @@ -1 +1 @@ -9f8aeb11d8415585f41c3f2f22566b78 zabbix-2.4.7.tar.gz +fd4032444711ebb45e92b4cd54a354c6 zabbix-3.0.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 Tue Feb 16 15:21:52 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 16 Feb 2016 14:21:52 +0000 Subject: SF.net SVN: gar:[25567] csw/mgar/pkg/zabbix/branches Message-ID: <3q4Pf03nqNzLB@mail.opencsw.org> Revision: 25567 http://sourceforge.net/p/gar/code/25567 Author: janholzh Date: 2016-02-16 14:21:51 +0000 (Tue, 16 Feb 2016) Log Message: ----------- zabbix/branches/zabbix24: branch 2.4x Added Paths: ----------- csw/mgar/pkg/zabbix/branches/zabbix24/ csw/mgar/pkg/zabbix/branches/zabbix24/Makefile csw/mgar/pkg/zabbix/branches/zabbix24/checksums csw/mgar/pkg/zabbix/branches/zabbix24/files/CSWzabbix-agent.cswusergroup csw/mgar/pkg/zabbix/branches/zabbix24/files/cswzabbix-agent.xml csw/mgar/pkg/zabbix/branches/zabbix24/files/cswzabbix-proxy.xml csw/mgar/pkg/zabbix/branches/zabbix24/files/cswzabbix-server.xml csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_agentd.conf csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_proxy.conf csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_server.conf Removed Paths: ------------- csw/mgar/pkg/zabbix/branches/zabbix24/Makefile csw/mgar/pkg/zabbix/branches/zabbix24/checksums Deleted: csw/mgar/pkg/zabbix/branches/zabbix24/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-11-06 11:47:59 UTC (rev 25363) +++ csw/mgar/pkg/zabbix/branches/zabbix24/Makefile 2016-02-16 14:21:51 UTC (rev 25567) @@ -1,112 +0,0 @@ -# $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# -NAME = zabbix -VERSION = 2.4.6 -GARTYPE = v2 - -DESCRIPTION = Zabbix monitoring system -define BLURB -endef - -MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(DISTNAME).tar.gz - -# PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 - -REINPLACEMENTS += etc -REINPLACE_MATCH_etc = /usr/local/etc -REINPLACE_WITH_etc = $(sysconfdir) -REINPLACE_FILES_etc += conf/zabbix_proxy.conf - -# This is just for the server which is in 64 bit only on Solars 10 -BUILD64-5.9 = -BUILD64-5.10 = 1 -BUILD64 = $(BUILD64-$(GAROSREL)) -ISAEXEC = 1 - -BUILD_DEP_PKGS += CSWlibiksemel-dev - -PACKAGES += CSWzabbix-agent -SPKG_DESC_CSWzabbix-agent = Zabbix monitoring system agent -# 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 - -# 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 - -PACKAGES-5.10 += CSWzabbix-server -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 += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibnetsnmp30 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssh2-1 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiksemel3 - -# 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 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config -CONFIGURE_ARGS += --with-libcurl -CONFIGURE_ARGS += --enable-agent -CONFIGURE_ARGS += --enable-ipv6 - -# We build the server only on Solaris 10 and only on 64 bit -CONFIGURE_ARGS-5.9-32 += --disable-server -CONFIGURE_ARGS-5.10-32 += --disable-server -CONFIGURE_ARGS-5.10-64 += --enable-server -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-$(MEMORYMODEL)) - -CONFIGURE_ARGS += --enable-proxy - -CONFIGURE_ARGS += --with-net-snmp -# This searches libssh2 in $(prefix)/lib regardless if we are building 64 bit or not -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 - -# 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 -PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf - -include gar/category.mk - Copied: csw/mgar/pkg/zabbix/branches/zabbix24/Makefile (from rev 25566, csw/mgar/pkg/zabbix/trunk/Makefile) =================================================================== --- csw/mgar/pkg/zabbix/branches/zabbix24/Makefile (rev 0) +++ csw/mgar/pkg/zabbix/branches/zabbix24/Makefile 2016-02-16 14:21:51 UTC (rev 25567) @@ -0,0 +1,201 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = zabbix +VERSION = 2.4.7 +GARTYPE = v2 + +DESCRIPTION = Zabbix monitoring system +define BLURB +endef + +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 + + +# PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +REINPLACEMENTS += etc +REINPLACE_MATCH_etc = /usr/local/etc +REINPLACE_WITH_etc = $(sysconfdir) +REINPLACE_FILES_etc += conf/zabbix_agent.conf + +# This is just for the server which is in 64 bit only on Solars 10 +BUILD64-5.9 = +BUILD64-5.10 = 1 +BUILD64 = $(BUILD64-$(GAROSREL)) +ISAEXEC = 1 + +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 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2 + +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)) +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/.* +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 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibnetsnmp30 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssh2-1 +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 +#Postgres package +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-pgsql + +#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 +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 +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 + + + +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 +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 + +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 + +# 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 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config +CONFIGURE_ARGS += --with-libcurl +CONFIGURE_ARGS += --enable-agent +CONFIGURE_ARGS += --enable-ipv6 + +# We build the server only on Solaris 10 and only on 64 bit +CONFIGURE_ARGS-5.9-32 += --disable-server +CONFIGURE_ARGS-5.10-32 += --disable-server +CONFIGURE_ARGS-5.10-64 += --enable-server +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-$(MEMORYMODEL)) + +CONFIGURE_ARGS += --enable-proxy + +CONFIGURE_ARGS += --with-net-snmp +# This searches libssh2 in $(prefix)/lib regardless if we are building 64 bit or not +CONFIGURE_ARGS += --with-ssh2=$(prefix) +CONFIGURE_ARGS += --with-ldap + + +# CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config +# CONFIGURE_ARGS += --with-sqlite3 + +# 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 +PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf +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_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 + 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) Deleted: csw/mgar/pkg/zabbix/branches/zabbix24/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums 2015-11-06 11:47:59 UTC (rev 25363) +++ csw/mgar/pkg/zabbix/branches/zabbix24/checksums 2016-02-16 14:21:51 UTC (rev 25567) @@ -1 +0,0 @@ -06ad8d5808a0eddf2b9f0a256b6a5fde zabbix-2.4.6.tar.gz Copied: csw/mgar/pkg/zabbix/branches/zabbix24/checksums (from rev 25566, csw/mgar/pkg/zabbix/trunk/checksums) =================================================================== --- csw/mgar/pkg/zabbix/branches/zabbix24/checksums (rev 0) +++ csw/mgar/pkg/zabbix/branches/zabbix24/checksums 2016-02-16 14:21:51 UTC (rev 25567) @@ -0,0 +1 @@ +9f8aeb11d8415585f41c3f2f22566b78 zabbix-2.4.7.tar.gz Copied: csw/mgar/pkg/zabbix/branches/zabbix24/files/CSWzabbix-agent.cswusergroup (from rev 25368, csw/mgar/pkg/zabbix/trunk/files/CSWzabbix-agent.cswusergroup) =================================================================== --- csw/mgar/pkg/zabbix/branches/zabbix24/files/CSWzabbix-agent.cswusergroup (rev 0) +++ csw/mgar/pkg/zabbix/branches/zabbix24/files/CSWzabbix-agent.cswusergroup 2016-02-16 14:21:51 UTC (rev 25567) @@ -0,0 +1 @@ +zabbix:zabbix:CSW zabbix User:/:/bin/false:::NP Copied: csw/mgar/pkg/zabbix/branches/zabbix24/files/cswzabbix-agent.xml (from rev 25366, csw/mgar/pkg/zabbix/trunk/files/cswzabbix-agent.xml) =================================================================== (Binary files differ) Copied: csw/mgar/pkg/zabbix/branches/zabbix24/files/cswzabbix-proxy.xml (from rev 25368, csw/mgar/pkg/zabbix/trunk/files/cswzabbix-proxy.xml) =================================================================== (Binary files differ) Copied: csw/mgar/pkg/zabbix/branches/zabbix24/files/cswzabbix-server.xml (from rev 25368, csw/mgar/pkg/zabbix/trunk/files/cswzabbix-server.xml) =================================================================== (Binary files differ) Copied: csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_agentd.conf (from rev 25369, csw/mgar/pkg/zabbix/trunk/files/zabbix_agentd.conf) =================================================================== --- csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_agentd.conf (rev 0) +++ csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_agentd.conf 2016-02-16 14:21:51 UTC (rev 25567) @@ -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/tmp/zabbix_agentd.pid + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/var/tmp/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= Copied: csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_proxy.conf (from rev 25369, csw/mgar/pkg/zabbix/trunk/files/zabbix_proxy.conf) =================================================================== --- csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_proxy.conf (rev 0) +++ csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_proxy.conf 2016-02-16 14:21:51 UTC (rev 25567) @@ -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/tmp/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/tmp/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= Copied: csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_server.conf (from rev 25369, csw/mgar/pkg/zabbix/trunk/files/zabbix_server.conf) =================================================================== --- csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_server.conf (rev 0) +++ csw/mgar/pkg/zabbix/branches/zabbix24/files/zabbix_server.conf 2016-02-16 14:21:51 UTC (rev 25567) @@ -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/tmp/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/tmp/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 Feb 16 17:31:26 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 16 Feb 2016 16:31:26 +0000 Subject: SF.net SVN: gar:[25568] csw/mgar/pkg/zabbix/trunk/Makefile Message-ID: <3q4SVr0XGJzQR@mail.opencsw.org> Revision: 25568 http://sourceforge.net/p/gar/code/25568 Author: janholzh Date: 2016-02-16 16:31:26 +0000 (Tue, 16 Feb 2016) Log Message: ----------- zabbix/trunk: turn on more features Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2016-02-16 14:21:51 UTC (rev 25567) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2016-02-16 16:31:26 UTC (rev 25568) @@ -46,6 +46,10 @@ 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 += CSWlibssl1-0-0 +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 @@ -69,6 +73,8 @@ 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 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibxml2-2 #PHP for frontend RUNTIME_DEP_PKGS_CSWzabbix-server += CSWphp5-session @@ -118,6 +124,8 @@ 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 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWzabbix-proxy += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWzabbix-proxy_sparc += CSWlibintl8 # Linker anomaly @@ -172,6 +180,8 @@ CONFIGURE_ARGS += --with-net-snmp=$(bindir)/net-snmp-config CONFIGURE_ARGS += --with-jabber +CONFIGURE_ARGS += --with-openssl=/opt/csw/ +CONFIGURE_ARGS += --with-libxml2 PRESERVECONF += $(sysconfdir)/zabbix_agent.conf PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf 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 Feb 16 21:24:41 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2016 20:24:41 +0000 Subject: SF.net SVN: gar:[25569] csw/mgar/pkg/xmlstarlet/trunk Message-ID: <3q4Ygz6DGHzWs@mail.opencsw.org> Revision: 25569 http://sourceforge.net/p/gar/code/25569 Author: dmichelsen Date: 2016-02-16 20:24:41 +0000 (Tue, 16 Feb 2016) Log Message: ----------- xmlstarlet/trunk: Update to 1.6.1 Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile csw/mgar/pkg/xmlstarlet/trunk/checksums Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2016-02-16 16:31:26 UTC (rev 25568) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2016-02-16 20:24:41 UTC (rev 25569) @@ -1,5 +1,5 @@ NAME = xmlstarlet -VERSION = 1.5.0 +VERSION = 1.6.1 DESCRIPTION = XML transformation utility define BLURB Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/checksums 2016-02-16 16:31:26 UTC (rev 25568) +++ csw/mgar/pkg/xmlstarlet/trunk/checksums 2016-02-16 20:24:41 UTC (rev 25569) @@ -1 +1 @@ -0c6db295d0cf9ff0d439edb755b7e8f6 xmlstarlet-1.5.0.tar.gz +f3c5dfa3b1a2ee06cd57c255cc8b70a0 xmlstarlet-1.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Tue Feb 16 21:40:26 2016 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 16 Feb 2016 20:40:26 +0000 Subject: SF.net SVN: gar:[25570] csw/mgar/pkg/perl5/trunk/Makefile Message-ID: <3q4Z230PSHzZV@mail.opencsw.org> Revision: 25570 http://sourceforge.net/p/gar/code/25570 Author: claudio_sf Date: 2016-02-16 20:40:26 +0000 (Tue, 16 Feb 2016) Log Message: ----------- perl5/trunk: Add sparc Modified Paths: -------------- csw/mgar/pkg/perl5/trunk/Makefile Modified: csw/mgar/pkg/perl5/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl5/trunk/Makefile 2016-02-16 20:24:41 UTC (rev 25569) +++ csw/mgar/pkg/perl5/trunk/Makefile 2016-02-16 20:40:26 UTC (rev 25570) @@ -20,7 +20,7 @@ MASTER_SITES = http://www.cpan.org/src/5.0/ VENDOR_URL = http://www.perl.org DISTFILES = perl-$(VERSION_FULL).tar.bz2 -PACKAGING_PLATFORMS += solaris10-i386 +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc PACKAGES = CSWperl5 PKG_DESC_CSWperl = $(DESCRIPTION) SPKG_DESC_CSWperl = $(DESCRIPTION) 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 Feb 16 21:56:01 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Feb 2016 20:56:01 +0000 Subject: SF.net SVN: gar:[25571] csw/mgar/pkg/libxml2/trunk Message-ID: <3q4ZN22Kk2zd1@mail.opencsw.org> Revision: 25571 http://sourceforge.net/p/gar/code/25571 Author: dmichelsen Date: 2016-02-16 20:56:01 +0000 (Tue, 16 Feb 2016) Log Message: ----------- libxml2/trunk: Update to 2.9.3 Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/checksums Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2016-02-16 20:40:26 UTC (rev 25570) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2016-02-16 20:56:01 UTC (rev 25571) @@ -3,7 +3,7 @@ # ! There are test failures, unfortunately. NAME = libxml2 -VERSION = 2.9.2 +VERSION = 2.9.3 GARTYPE = v2 DESCRIPTION = XML Parser Library @@ -61,6 +61,7 @@ # RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWliblzma5 RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWliblzma5 PACKAGES += CSWlibxml2-dev OBSOLETED_BY_CSWlibxml2-dev = CSWlibxml2devel Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2016-02-16 20:40:26 UTC (rev 25570) +++ csw/mgar/pkg/libxml2/trunk/checksums 2016-02-16 20:56:01 UTC (rev 25571) @@ -1 +1 @@ -9e6a9aca9d155737868b3dc5fd82f788 libxml2-2.9.2.tar.gz +daece17e045f1c107610e137ab50c179 libxml2-2.9.3.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 Wed Feb 17 17:11:34 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Feb 2016 16:11:34 +0000 Subject: SF.net SVN: gar:[25572] csw/mgar/pkg/squid/trunk Message-ID: <3q541L5c3ZzvR@mail.opencsw.org> Revision: 25572 http://sourceforge.net/p/gar/code/25572 Author: dmichelsen Date: 2016-02-17 16:11:34 +0000 (Wed, 17 Feb 2016) Log Message: ----------- squid/trunk: Update to 3.5.14 Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2016-02-16 20:56:01 UTC (rev 25571) +++ csw/mgar/pkg/squid/trunk/Makefile 2016-02-17 16:11:34 UTC (rev 25572) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 3.5.13 +VERSION = 3.5.14 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2016-02-16 20:56:01 UTC (rev 25571) +++ csw/mgar/pkg/squid/trunk/checksums 2016-02-17 16:11:34 UTC (rev 25572) @@ -1 +1 @@ -3fccd1c072433bb896374a832f608b7d squid-3.5.13.tar.bz2 +d589a2dd8ea8867170cef582e7334442 squid-3.5.14.tar.bz2 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 Feb 17 17:12:20 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Feb 2016 16:12:20 +0000 Subject: SF.net SVN: gar:[25573] csw/mgar/pkg Message-ID: <3q542Q56NCzxn@mail.opencsw.org> Revision: 25573 http://sourceforge.net/p/gar/code/25573 Author: dmichelsen Date: 2016-02-17 16:12:20 +0000 (Wed, 17 Feb 2016) Log Message: ----------- libfastjson: Initial commit Modified Paths: -------------- csw/mgar/pkg/libfastjson/trunk/Makefile csw/mgar/pkg/libfastjson/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libfastjson/ Removed Paths: ------------- csw/mgar/pkg/libfastjson/trunk/files/0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch csw/mgar/pkg/libfastjson/trunk/files/0001-allow-to-use-public-vasprintf-symbol.patch csw/mgar/pkg/libfastjson/trunk/files/0002-Use-GCC-flags-only-when-compiling-with-GCC.patch Modified: csw/mgar/pkg/libfastjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/json-c/trunk/Makefile 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/libfastjson/trunk/Makefile 2016-02-17 16:12:20 UTC (rev 25573) @@ -1,43 +1,24 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = json-c -VERSION = 0.12 +NAME = libfastjson +VERSION = 0.99.0 GARTYPE = v2 -DESCRIPTION = JSON objects in C -define BLURB - JSON-C implements a reference counting object model that allows you to easily construct JSON - objects in C, output them as JSON formatted strings and parse JSON formatted strings back - into the C representation of JSON objects. -endef +DESCRIPTION = A fork of the json-c library optimized for liblognorm -MASTER_SITES += https://s3.amazonaws.com/json-c_releases/releases/ -#DISTFILES += $(DISTNAME).tar.gz -DISTNAME = json-c-solaris -DISTFILES += $(DISTNAME)-branch.zip +MASTER_SITES += http://download.rsyslog.com/libfastjson/ +DISTFILES += $(DISTNAME).tar.gz -# PATCHFILES = 0001-allow-to-use-public-vasprintf-symbol.patch +PACKAGES += CSWlibfastjson3 +PKGFILES_CSWlibfastjson3 += $(call pkgfiles_lib,libfastjson.so.3) +SPKG_DESC_CSWlibfastjson3 += $(DESCRIPTION), libfastjson.so.3 -# Use these patches until this is merged: -# https://github.com/json-c/json-c/pull/184 -#PATCHFILES += 0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch -#PATCHFILES += 0002-Use-GCC-flags-only-when-compiling-with-GCC.patch - -PACKAGES += CSWlibjson-c3 -PKGFILES_CSWlibjson-c3 += $(call pkgfiles_lib,libjson-c.so.3) -SPKG_DESC_CSWlibjson-c3 += $(DESCRIPTION), libjson-c.so.3 - -PACKAGES += CSWlibjson-c-dev -SPKG_DESC_CSWlibjson-c-dev += $(DESCRIPTION), development files -# PKGFILES_CSWlibjson-c-dev += $(PKGFILES_DEVEL) +PACKAGES += CSWlibfastjson-dev +SPKG_DESC_CSWlibfastjson-dev += Development files for libfastjson.so.3 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibjson-c-dev += CSWlibjson-c3 +RUNTIME_DEP_PKGS_CSWlibfastjson-dev += CSWlibfastjson3 BUILD64 = 1 include gar/category.mk - -post-patch: - cd $(WORKSRC) && ./autogen.sh - @$(MAKECOOKIE) Modified: csw/mgar/pkg/libfastjson/trunk/checksums =================================================================== --- csw/mgar/pkg/json-c/trunk/checksums 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/libfastjson/trunk/checksums 2016-02-17 16:12:20 UTC (rev 25573) @@ -1 +1 @@ -ed4454c1288495a1bc88c4854759a44f json-c-solaris-branch.zip +5d90d00265674696401297e04f08eda5 libfastjson-0.99.0.tar.gz Deleted: csw/mgar/pkg/libfastjson/trunk/files/0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch =================================================================== --- csw/mgar/pkg/json-c/trunk/files/0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/libfastjson/trunk/files/0001-Solaris-does-not-allow-POSIX-compliant-evaluation-in.patch 2016-02-17 16:12:20 UTC (rev 25573) @@ -1,34 +0,0 @@ -From f569cf434198371211f411659f828c5d06c71e4d Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 20 May 2015 11:08:48 +0200 -Subject: [PATCH 1/2] Solaris does not allow POSIX-compliant evaluation in sh - ---- - tests/test-defs.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test-defs.sh b/tests/test-defs.sh -index 658a75d..09368ae 100755 ---- a/tests/test-defs.sh -+++ b/tests/test-defs.sh -@@ -41,7 +41,7 @@ esac - - rm -rf "$testsubdir" > /dev/null 2>&1 - mkdir -p "$testsubdir" --CURDIR=$(pwd) -+CURDIR=`pwd` - cd "$testsubdir" \ - || { echo "Cannot make or change into $testsubdir"; exit 1; } - -@@ -50,7 +50,7 @@ echo "=== Running test $progname" - CMP="${CMP-cmp}" - - use_valgrind=${USE_VALGRIND-1} --valgrind_path=$(which valgrind 2> /dev/null) -+valgrind_path=`which valgrind 2> /dev/null` - if [ -z "${valgrind_path}" -o ! -x "${valgrind_path}" ] ; then - use_valgrind=0 - fi --- -2.3.3 - Deleted: csw/mgar/pkg/libfastjson/trunk/files/0001-allow-to-use-public-vasprintf-symbol.patch =================================================================== --- csw/mgar/pkg/json-c/trunk/files/0001-allow-to-use-public-vasprintf-symbol.patch 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/libfastjson/trunk/files/0001-allow-to-use-public-vasprintf-symbol.patch 2016-02-17 16:12:20 UTC (rev 25573) @@ -1,25 +0,0 @@ -From c73861996d5b4bb9202c42aa2d6700f11b3026b3 Mon Sep 17 00:00:00 2001 -From: Carsten Grzemba -Date: Fri, 28 Jun 2013 12:33:28 +0200 -Subject: [PATCH] allow to use publiv vasprintf symbol - ---- - printbuf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/printbuf.c b/printbuf.c -index b951c7b..50fe208 100644 ---- a/printbuf.c -+++ b/printbuf.c -@@ -116,7 +116,7 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len) - - #if !HAVE_VASPRINTF - /* CAW: compliant version of vasprintf */ --static int vasprintf(char **buf, const char *fmt, va_list ap) -+int vasprintf(char **buf, const char *fmt, va_list ap) - { - #ifndef WIN32 - static char _T_emptybuffer = '\0'; --- -1.8.3.1 - Deleted: csw/mgar/pkg/libfastjson/trunk/files/0002-Use-GCC-flags-only-when-compiling-with-GCC.patch =================================================================== --- csw/mgar/pkg/json-c/trunk/files/0002-Use-GCC-flags-only-when-compiling-with-GCC.patch 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/libfastjson/trunk/files/0002-Use-GCC-flags-only-when-compiling-with-GCC.patch 2016-02-17 16:12:20 UTC (rev 25573) @@ -1,118 +0,0 @@ -From 3f0a36362d8b429dcb6795e7b80db6a8f78ee0ca Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 20 May 2015 11:22:42 +0200 -Subject: [PATCH 2/2] Use GCC flags only when compiling with GCC - ---- - Makefile.am | 2 -- - Makefile.am.inc | 2 -- - config.h.in | 6 +----- - configure.ac | 32 +++++++++++++++++++++++++++----- - tests/Makefile.am | 2 -- - 5 files changed, 28 insertions(+), 16 deletions(-) - delete mode 100644 Makefile.am.inc - -diff --git a/Makefile.am b/Makefile.am -index 63781c0..451cb08 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,3 @@ --include Makefile.am.inc -- - EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj - SUBDIRS = . tests - -diff --git a/Makefile.am.inc b/Makefile.am.inc -deleted file mode 100644 -index fec591b..0000000 ---- a/Makefile.am.inc -+++ /dev/null -@@ -1,2 +0,0 @@ --AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT -- -diff --git a/config.h.in b/config.h.in -index af2e5fc..933594f 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -130,13 +130,9 @@ - /* Public define for json_inttypes.h */ - #undef JSON_C_HAVE_INTTYPES_H - --/* Define to the sub-directory in which libtool stores uninstalled libraries. -- */ -+/* Define to the sub-directory where libtool stores uninstalled libraries. */ - #undef LT_OBJDIR - --/* Define to 1 if your C compiler doesn't accept -c and -o together. */ --#undef NO_MINUS_C_MINUS_O -- - /* Name of package */ - #undef PACKAGE - -diff --git a/configure.ac b/configure.ac -index 37f9657..77bf4be 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,22 +24,44 @@ fi - # enable silent build by default - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes]])) - -+# Checks for typedefs, structures, and compiler characteristics. -+AC_PROG_CC -+AM_PROG_CC_C_O -+ -+dnl Try to detect/use GNU features -+CFLAGS="$CFLAGS -D_GNU_SOURCE" -+ -+dnl which flags does the compiler support? -+if test "x$GCC" = "xyes"; then -+ for flag in -Wall -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -Werror; do -+ oCFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $flag" -+ cachename=rd_cv_gcc_flag_`echo $flag|sed 's/[[^A-Za-z]]/_/g'` -+ AC_CACHE_CHECK([if gcc likes the $flag flag], $cachename, -+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0 ]])],[eval $cachename=yes],[eval $cachename=no])]) -+ if eval test \$$cachename = no; then -+ CFLAGS="$oCFLAGS" -+ fi -+ done -+fi -+ -+dnl We need the definition, probably detect by testing the required function -+CFLAGS="$CFLAGS -D_REENTRANT" -+ -+AC_C_CONST -+AC_TYPE_SIZE_T -+ - # Checks for programs. - - # Checks for libraries. - - # Checks for header files. --AM_PROG_CC_C_O - AC_CONFIG_HEADER(config.h) - AC_CONFIG_HEADER(json_config.h) - AC_HEADER_STDC - AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/cdefs.h] [sys/param.h] stdarg.h locale.h endian.h) - AC_CHECK_HEADER(inttypes.h,[AC_DEFINE([JSON_C_HAVE_INTTYPES_H],[1],[Public define for json_inttypes.h])]) - --# Checks for typedefs, structures, and compiler characteristics. --AC_C_CONST --AC_TYPE_SIZE_T -- - # Checks for library functions. - AC_FUNC_VPRINTF - AC_FUNC_MEMCMP -diff --git a/tests/Makefile.am b/tests/Makefile.am -index a388eeb..aef7c29 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,5 +1,3 @@ -- --include ../Makefile.am.inc - LDADD= $(LIBJSON_LA) - - LIBJSON_LA=$(top_builddir)/libjson-c.la --- -2.3.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Feb 17 22:25:56 2016 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 17 Feb 2016 21:25:56 +0000 Subject: SF.net SVN: gar:[25574] csw/mgar/pkg/netatalk/trunk Message-ID: <3q5C0S1STlz15H@mail.opencsw.org> Revision: 25574 http://sourceforge.net/p/gar/code/25574 Author: slowfranklin Date: 2016-02-17 21:25:55 +0000 (Wed, 17 Feb 2016) Log Message: ----------- netatalk/trunk: Update to 3.1.8 Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile csw/mgar/pkg/netatalk/trunk/checksums Added Paths: ----------- csw/mgar/pkg/netatalk/trunk/files/0001-Force-mdns-Avahi-detection-is-broken.patch Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-17 16:12:20 UTC (rev 25573) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-17 21:25:55 UTC (rev 25574) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = netatalk -VERSION = 3.1.7 +VERSION = 3.1.8 GARTYPE = v2 DESCRIPTION = Open Source AFP fileserver @@ -55,6 +55,7 @@ PATCHFILES += 0001-Disable-noinst-binary-fails-to-link-on-SPARC.patch PATCHFILES += 0002-Ensure-gsettings-is-called-from-opt-csw-bin.patch PATCHFILES += 0003-Disable-dbus-start-by-default.patch +PATCHFILES += 0001-Force-mdns-Avahi-detection-is-broken.patch PRESERVECONF += $(sysconfdir)/afp.conf PRESERVECONF += $(sysconfdir)/extmap.conf Modified: csw/mgar/pkg/netatalk/trunk/checksums =================================================================== --- csw/mgar/pkg/netatalk/trunk/checksums 2016-02-17 16:12:20 UTC (rev 25573) +++ csw/mgar/pkg/netatalk/trunk/checksums 2016-02-17 21:25:55 UTC (rev 25574) @@ -1 +1 @@ -d70ede01ac2411f9eac378096143b130 netatalk-3.1.7.tar.gz +02fd5254f83fe852bc25776ffeef3902 netatalk-3.1.8.tar.gz Added: csw/mgar/pkg/netatalk/trunk/files/0001-Force-mdns-Avahi-detection-is-broken.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0001-Force-mdns-Avahi-detection-is-broken.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0001-Force-mdns-Avahi-detection-is-broken.patch 2016-02-17 21:25:55 UTC (rev 25574) @@ -0,0 +1,252 @@ +From 38e531d752aabdb46dadac02b50612cf35b0ba07 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 17 Feb 2016 16:44:44 +0100 +Subject: [PATCH] Force mdns, Avahi detection is broken + +--- + configure | 229 -------------------------------------------------------------- + 1 file changed, 229 deletions(-) + +diff --git a/configure b/configure +index 245ccbd..2c64697 100755 +--- a/configure ++++ b/configure +@@ -16088,235 +16088,6 @@ fi + zeroconf_dir="$zeroconf" + fi + +- # mDNS support using Avahi +- ac_fn_c_check_header_mongrel "$LINENO" "avahi-client/client.h" "ac_cv_header_avahi_client_client_h" "$ac_includes_default" +-if test "x$ac_cv_header_avahi_client_client_h" = xyes; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5 +-$as_echo_n "checking for avahi_client_new in -lavahi-client... " >&6; } +-if ${ac_cv_lib_avahi_client_avahi_client_new+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lavahi-client $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char avahi_client_new (); +-int +-main () +-{ +-return avahi_client_new (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_avahi_client_avahi_client_new=yes +-else +- ac_cv_lib_avahi_client_avahi_client_new=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avahi_client_avahi_client_new" >&5 +-$as_echo "$ac_cv_lib_avahi_client_avahi_client_new" >&6; } +-if test "x$ac_cv_lib_avahi_client_avahi_client_new" = xyes; then : +- +-$as_echo "#define USE_ZEROCONF 1" >>confdefs.h +- +-fi +- +- +-fi +- +- +- +- case "$ac_cv_lib_avahi_client_avahi_client_new" in +- yes) +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5 +-$as_echo_n "checking for AVAHI... " >&6; } +- +-if test -n "$AVAHI_CFLAGS"; then +- pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6 ") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6 " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$AVAHI_LIBS"; then +- pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6 ") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6 " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " avahi-client >= 0.6 " 2>&1` +- else +- AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " avahi-client >= 0.6 " 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$AVAHI_PKG_ERRORS" >&5 +- +- as_fn_error $? "Package requirements ( avahi-client >= 0.6 ) were not met: +- +-$AVAHI_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables AVAHI_CFLAGS +-and AVAHI_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details." "$LINENO" 5 +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables AVAHI_CFLAGS +-and AVAHI_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details" "$LINENO" 5; } +-else +- AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS +- AVAHI_LIBS=$pkg_cv_AVAHI_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-fi +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI_TPOLL" >&5 +-$as_echo_n "checking for AVAHI_TPOLL... " >&6; } +- +-if test -n "$AVAHI_TPOLL_CFLAGS"; then +- pkg_cv_AVAHI_TPOLL_CFLAGS="$AVAHI_TPOLL_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.4 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.4 ") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_AVAHI_TPOLL_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.4 " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$AVAHI_TPOLL_LIBS"; then +- pkg_cv_AVAHI_TPOLL_LIBS="$AVAHI_TPOLL_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.4 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.4 ") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_AVAHI_TPOLL_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.4 " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- AVAHI_TPOLL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " avahi-client >= 0.6.4 " 2>&1` +- else +- AVAHI_TPOLL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " avahi-client >= 0.6.4 " 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$AVAHI_TPOLL_PKG_ERRORS" >&5 +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want." >&5 +-$as_echo "$as_me: WARNING: This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want." >&2;} +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want." >&5 +-$as_echo "$as_me: WARNING: This Avahi implementation is not supporting threaded poll objects. Maybe this is not what you want." >&2;} +-else +- AVAHI_TPOLL_CFLAGS=$pkg_cv_AVAHI_TPOLL_CFLAGS +- AVAHI_TPOLL_LIBS=$pkg_cv_AVAHI_TPOLL_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define HAVE_AVAHI_THREADED_POLL 1" >>confdefs.h +- +-fi +- ZEROCONF_LIBS="$AVAHI_LIBS" +- ZEROCONF_CFLAGS="$AVAHI_CFLAGS" +- +-$as_echo "#define HAVE_AVAHI 1" >>confdefs.h +- +- found_zeroconf=yes +- ;; +- esac +- CPPFLAGS="$savedcppflags" +- LDFLAGS="$savedldflags" +- + # mDNS support using mDNSResponder + if test x"$found_zeroconf" != x"yes" ; then + ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default" +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu Feb 18 22:14:01 2016 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 18 Feb 2016 21:14:01 +0000 Subject: SF.net SVN: gar:[25575] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: <3q5ph31GTfzJX@mail.opencsw.org> Revision: 25575 http://sourceforge.net/p/gar/code/25575 Author: slowfranklin Date: 2016-02-18 21:14:01 +0000 (Thu, 18 Feb 2016) Log Message: ----------- netatalk/trunk: Add CSWlibintl8 for all platforms Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-17 21:25:55 UTC (rev 25574) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-18 21:14:01 UTC (rev 25575) @@ -48,8 +48,9 @@ RUNTIME_DEP_PKGS += CSWlibldap2-4-2 RUNTIME_DEP_PKGS += CSWlibssl1-0-0 RUNTIME_DEP_PKGS += CSWtracker +RUNTIME_DEP_PKGS += CSWlibintl8 -RUNTIME_DEP_PKGS_sparc_5.10 = CSWlibgmodule2-0-0 CSWlibintl8 CSWlibk5crypto3 CSWlibcom-err3 CSWlibgpg-error0 +RUNTIME_DEP_PKGS_sparc_5.10 = CSWlibgmodule2-0-0 CSWlibk5crypto3 CSWlibcom-err3 CSWlibgpg-error0 RUNTIME_DEP_PKGS += $(RUNTIME_DEP_PKGS_$(GARCH)_$(GAROSREL)) $(RUNTIME_DEP_PKGS_$(GARCH)) PATCHFILES += 0001-Disable-noinst-binary-fails-to-link-on-SPARC.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Feb 19 09:47:50 2016 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 19 Feb 2016 08:47:50 +0000 Subject: SF.net SVN: gar:[25576] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: <3q664Y5gD3zTw@mail.opencsw.org> Revision: 25576 http://sourceforge.net/p/gar/code/25576 Author: slowfranklin Date: 2016-02-19 08:47:50 +0000 (Fri, 19 Feb 2016) Log Message: ----------- netatalk/trunk: Override unneeded libintl for s10-sparc Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-18 21:14:01 UTC (rev 25575) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-19 08:47:50 UTC (rev 25576) @@ -90,6 +90,7 @@ CHECKPKG_OVERRIDES_CSWnetatalk_sparc_5.10 += surplus-dependency|CSWlibk5crypto3 CHECKPKG_OVERRIDES_CSWnetatalk_sparc_5.10 += surplus-dependency|CSWlibgpg-error0 CHECKPKG_OVERRIDES_CSWnetatalk_sparc_5.10 += surplus-dependency|CSWlibgmodule2-0-0 +CHECKPKG_OVERRIDES_CSWnetatalk_sparc_5.10 += surplus-dependency|CSWlibintl8 CHECKPKG_OVERRIDES_CSWnetatalk += $(CHECKPKG_OVERRIDES_CSWnetatalk_$(GARCH)_$(GAROSREL)) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Feb 19 09:50:41 2016 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 19 Feb 2016 08:50:41 +0000 Subject: SF.net SVN: gar:[25577] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: <3q667j2cS8zXL@mail.opencsw.org> Revision: 25577 http://sourceforge.net/p/gar/code/25577 Author: slowfranklin Date: 2016-02-19 08:50:41 +0000 (Fri, 19 Feb 2016) Log Message: ----------- FIX: Override unneeded libintl for s10-i386, not sparc Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-19 08:47:50 UTC (rev 25576) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2016-02-19 08:50:41 UTC (rev 25577) @@ -90,7 +90,7 @@ CHECKPKG_OVERRIDES_CSWnetatalk_sparc_5.10 += surplus-dependency|CSWlibk5crypto3 CHECKPKG_OVERRIDES_CSWnetatalk_sparc_5.10 += surplus-dependency|CSWlibgpg-error0 CHECKPKG_OVERRIDES_CSWnetatalk_sparc_5.10 += surplus-dependency|CSWlibgmodule2-0-0 -CHECKPKG_OVERRIDES_CSWnetatalk_sparc_5.10 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWnetatalk_i386_5.10 += surplus-dependency|CSWlibintl8 CHECKPKG_OVERRIDES_CSWnetatalk += $(CHECKPKG_OVERRIDES_CSWnetatalk_$(GARCH)_$(GAROSREL)) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Feb 21 19:12:35 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 21 Feb 2016 18:12:35 +0000 Subject: SF.net SVN: gar:[25578] csw/mgar/pkg/pidgin/trunk Message-ID: <3q7ZWF0Ghnz1K4@mail.opencsw.org> Revision: 25578 http://sourceforge.net/p/gar/code/25578 Author: lblume Date: 2016-02-21 18:12:35 +0000 (Sun, 21 Feb 2016) Log Message: ----------- pidgin/trunk: Bump to 2.10.12 Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2016-02-19 08:50:41 UTC (rev 25577) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2016-02-21 18:12:35 UTC (rev 25578) @@ -1,7 +1,7 @@ # $Id$ NAME = pidgin -VERSION = 2.10.11 +VERSION = 2.10.12 GARTYPE = v2 DESCRIPTION = Multi-protocol IM client Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2016-02-19 08:50:41 UTC (rev 25577) +++ csw/mgar/pkg/pidgin/trunk/checksums 2016-02-21 18:12:35 UTC (rev 25578) @@ -1 +1 @@ -7c8bb6f997e05e7929104439872c2844 pidgin-2.10.11.tar.bz2 +14e0f5cfb2ed065e4dc80391a806ac76 pidgin-2.10.12.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 Mon Feb 22 18:59:39 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 22 Feb 2016 17:59:39 +0000 Subject: SF.net SVN: gar:[25579] csw/mgar/pkg/pidgin/trunk/Makefile Message-ID: <3q8B9n2Fshz9Z@mail.opencsw.org> Revision: 25579 http://sourceforge.net/p/gar/code/25579 Author: lblume Date: 2016-02-22 17:59:39 +0000 (Mon, 22 Feb 2016) Log Message: ----------- pidgin/trunk: Adjust versions of sonames Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2016-02-21 18:12:35 UTC (rev 25578) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2016-02-22 17:59:39 UTC (rev 25579) @@ -130,8 +130,8 @@ CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/purple-2/liboscar.so CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/purple-2/libymsg.so CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgnt.so.0.8.10|soname=libgnt.so.0|pkgname=CSWpidgin|expected=CSWlibgnt0 -CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple-client.so.0.10.11|soname=libpurple-client.so.0|pkgname=CSWpidgin|expected=CSWlibpurple-client0 -CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple.so.0.10.11|soname=libpurple.so.0|pkgname=CSWpidgin|expected=CSWlibpurple0 +CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple-client.so.0.10.12|soname=libpurple-client.so.0|pkgname=CSWpidgin|expected=CSWlibpurple-client0 +CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple.so.0.10.12|soname=libpurple.so.0|pkgname=CSWpidgin|expected=CSWlibpurple0 CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWaspell CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWtcl 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 Feb 24 08:46:30 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2016 07:46:30 +0000 Subject: SF.net SVN: gar:[25580] csw/mgar/pkg/subversion/trunk Message-ID: <3q98Tf3lqlzt7@mail.opencsw.org> Revision: 25580 http://sourceforge.net/p/gar/code/25580 Author: dmichelsen Date: 2016-02-24 07:46:29 +0000 (Wed, 24 Feb 2016) Log Message: ----------- subversion/trunk: Update to 1.9.3, disable Solaris 9 java for now Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2016-02-22 17:59:39 UTC (rev 25579) +++ csw/mgar/pkg/subversion/trunk/Makefile 2016-02-24 07:46:29 UTC (rev 25580) @@ -20,7 +20,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.8.15 +VERSION = 1.9.3 GARTYPE = v2 DESCRIPTION = Version control rethought @@ -29,7 +29,7 @@ that is a compelling replacement for CVS in the open source community. endef -MASTER_SITES = http://archive.apache.org/dist/subversion/ +MASTER_SITES = http://mirror.serversupportforum.de/apache/subversion/ DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW @@ -38,11 +38,8 @@ # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html PATCHFILES += javahl_headers_for_nested_classes.diff -# Hardcode location of system wide configuration to /etc/opt/csw/subversion -PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch - # Relocate locations of foreign language bindings -PATCHFILES += 0002-Fix-location-of-bindings.patch +###PATCHFILES += 0002-Fix-location-of-bindings.patch VENDOR_URL = http://subversion.apache.org LICENSE = LICENSE @@ -99,7 +96,8 @@ RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibiconv2 -PACKAGES += CSWjavasvn +PACKAGES-5.10 += CSWjavasvn +PACKAGES += $(PACKAGES-$(GAROSREL)) SPKG_DESC_CSWjavasvn = Subversion Java Language Binding PKGFILES_CSWjavasvn += $(SVNLIB)/.*java.* PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW @@ -123,6 +121,8 @@ CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/solarisstudio12.3/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/solarisstudio12.3/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 PACKAGES += CSWpmsvn SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding @@ -130,7 +130,9 @@ CHECKPKG_OVERRIDES_CSWpmsvn += catalogname-does-not-match-pkgname|pkgname=CSWpmsvn|catalogname=pm_subversion|expected-catalogname=pmsvn PKGFILES_CSWpmsvn += $(libdir)/perl.* PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* -PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* +# Put .3* manpages in this package, not *-dev +PKGFILES_CSWpmsvn += $(mandir)/.*\.3perl +PKGFILES_DEVEL_MAN3_MANPAGE = PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn @@ -149,10 +151,11 @@ PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* PKGFILES_CSWrbsvn += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn -RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWrbsvn-5.9 += CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWrbsvn-5.10 += CSWruby20 +RUNTIME_DEP_PKGS_CSWrbsvn += $(RUNTIME_DEP_PKGS_CSWrbsvn-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibmagic1 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibexpat1 @@ -163,10 +166,13 @@ RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibserf1-1 +# We do depend on CSWruby20, this is an artifact of checkpkg lack of following symlinks +CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 + PACKAGES += CSWpythonsvn SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding -PKGFILES_CSWpythonsvn += $(libdir)/python.* -PKGFILES_CSWpythonsvn += $(SVNLIB)/python.* +PKGFILES_CSWpythonsvn += $(libdir)/.*python.* +PKGFILES_CSWpythonsvn += $(SVNLIB)/.*python.* PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibapr1-0 @@ -192,7 +198,7 @@ CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibmagic1 CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibsqlite3-0 -HECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1 +CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsasl2-2 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibaprutil1-0 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWbdb48 @@ -231,6 +237,17 @@ CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibserf1-1 CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibiconv2 +# This is for /usr/share/lib/zoneinfo +CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_delta.so +CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_ra.so +CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_fs.so +CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_diff.so +CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_client.so +CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_core.so +CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_wc.so +CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_repos.so +CHECKPKG_OVERRIDES_CSWpythonsvn += $(CHECKPKG_OVERRIDES_CSWpythonsvn-$(GAROSREL)) + # should be in lib ... put something below to at least make it compile. # on the svn mailing list people say we should not build the package # with svn installed, and here it seems basic that we build with svn @@ -239,7 +256,7 @@ SVNLIB = $(prefix)/lib/svn JAVA_HOME-5.9 = /usr/jdk1.6.0_20/ -JAVA_HOME-5.10 = /usr/jdk/latest +JAVA_HOME-5.10 = $(prefix)/java/jdk/jdk8 JAVA_HOME = $(JAVA_HOME-$(GAROSREL)) #EXTRA_INC += $(prefix)/apache2/include @@ -257,23 +274,41 @@ # This is an example for a hook REINPLACE_USRLOCAL += subversion/libsvn_repos/repos.c +# This replaces 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch +REINPLACEMENTS += conf +REINPLACE_MATCH_conf = /etc/subversion +REINPLACE_WITH_conf = $(sysconfdir)/subversion +REINPLACE_FILES_conf += subversion/libsvn_subr/config_file.c + PYCOMPILE = 1 EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal\.pod +# Relocate from /opt/csw/man to /opt/csw/share/man +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/man,.$(mandir),' + STRIP_LIBTOOL = 1 +# This is now the default and makes building the language integrations for Perl etc. easier +#GARCOMPILER = GCC4 +GARCOMPILER-5.9 = SOS12 +GARCOMPILER-5.10 = SOS12U3 +GARCOMPILER += $(GARCOMPILER-$(GAROSREL)) + NODIRPATHS = --libdir --libexecdir CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME) -CONFIGURE_ARGS += --enable-javahl +# Solaris 9 has issues with JDK 1.6.0 and Sun Studio 12: +# Error: Could not find a match for EditorProxy::EditorProxy +CONFIGURE_ARGS_5.10 += --enable-javahl CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-serf=$(prefix) -CONFIGURE_ARGS += --with-ssl=$(prefix) +# XXX: configure: WARNING: unrecognized options: --with-ssl +# CONFIGURE_ARGS += --with-ssl=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec @@ -282,6 +317,10 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL)) +# XXX: Where does this come from? +# cc: Warning: illegal option -d=c90 +# The original option is -std=c90, where is it added? + # Once you have verified that a new upstream release passes the tests, you can use # "SKIPTEST=1 gmake " to skip the tests for simple repackaging tasks. # @@ -302,21 +341,22 @@ include gar/category.mk # pygthon bindings do not link since svn-1.6.5 ... -BINDING_LANGS = java perl python ruby -BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS)) +BINDING_LANGS-5.9 = perl python ruby +BINDING_LANGS-5.10 = java perl python ruby +BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS-$(GAROSREL))) PI_DEPENDS += copy-templates -PI_DEPENDS += create-ra_dav-symlinks +#PI_DEPENDS += create-ra_dav-symlinks PI_DEPENDS += $(BINDING_TARGETS) -post-install-modulated: $(PI_DEPENDS) +post-install: $(PI_DEPENDS) $(MAKECOOKIE) # The whole subversion build is done with Sun's cc. Ruby language bindings # need to be built with gcc. Hack (!) together Makefile.gcc/libtool.gcc which # are then used in the "svn-ruby" target. # See http://lists.opencsw.org/pipermail/maintainers/2009-May/002325.html -post-configure-modulated: +post-configure: @echo "~~~ Creating GCC Makefile and libtool for ruby ~~~" gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc @@ -353,20 +393,31 @@ # libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* in the new versions # of subversion (starting with?), we need to link for backward compatability -create-ra_dav-symlinks: - ( cd $(DESTDIR)$(SVNLIB); \ - ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so.0; \ - ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; ) - @$(MAKECOOKIE) +#create-ra_dav-symlinks: +# ( cd $(DESTDIR)$(SVNLIB); \ +# ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so.0; \ +# ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; ) +# @$(MAKECOOKIE) svn-python: @echo " ==> Building Python bindings" touch \ $(WORKSRC)/subversion/bindings/swig/python/*.c \ $(WORKSRC)/subversion/bindings/swig/python/*.py - @/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-py - @/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR) + @# Switch from Sun Studio PIC to GCC PIC + cd $(WORKSRC) && cp libtool libtool.suncc && perl -i.orig -npe 's/-KPIC -DPIC/-fPIC/g; s/-xarch=pentium_pro -xchip=pentium_pro/-march=pentiumpro/g' libtool + cd $(WORKSRC) && perl -i.orig -np \ + -e 's,(SWIG_PY_COMPILE = .*) -xO3 (.*) -xarch=pentium_pro -xchip=pentium_pro,$$1 -O2 -pipe $$2 -march=pentiumpro,g;' \ + -e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=sparc (.*)!$$1 -mcpu=v9 -Wa,-xarch=v8plus $$2!;' \ + -e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=386 +-mt(.*)!$$1 -m32 -march=i386 $$2!;' \ + -e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=v8 +-mt(.*)!$$1 -mcpu=v8 $$2!;' \ + -e 's,/opt/solarisstudio12.3/bin/cc,/opt/csw/bin/gcc-5.2,g;' \ + -e 's,(SWIG_PY_LINK = .*) -march=pentiumpro (.*),$$1 $$2,;' \ + Makefile + /usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-py + /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR) #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py + cd $(WORKSRC) && cp libtool.suncc libtool @$(MAKECOOKIE) svn-perl: @@ -423,5 +474,5 @@ post-merge: - @(cd $(PKGROOT)/opt/csw/lib/svn/python; find . -name '*pyc' -exec rm {} \;) + find $(PKGROOT) -name '*\.pyc' -exec rm {} \; @$(MAKECOOKIE) Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2016-02-22 17:59:39 UTC (rev 25579) +++ csw/mgar/pkg/subversion/trunk/checksums 2016-02-24 07:46:29 UTC (rev 25580) @@ -1 +1 @@ -42f2ff8194b52e6287faec29f5775edf subversion-1.8.15.tar.bz2 +243036eb28b50ce517fc228eb3250add subversion-1.9.3.tar.bz2 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 Feb 24 19:13:18 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Feb 2016 18:13:18 +0000 Subject: SF.net SVN: gar:[25581] csw/mgar/pkg/squid/trunk Message-ID: <3q9QNZ1mtGz17S@mail.opencsw.org> Revision: 25581 http://sourceforge.net/p/gar/code/25581 Author: dmichelsen Date: 2016-02-24 18:13:18 +0000 (Wed, 24 Feb 2016) Log Message: ----------- squid/trunk: Update to 3.5.15 Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2016-02-24 07:46:29 UTC (rev 25580) +++ csw/mgar/pkg/squid/trunk/Makefile 2016-02-24 18:13:18 UTC (rev 25581) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 3.5.14 +VERSION = 3.5.15 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2016-02-24 07:46:29 UTC (rev 25580) +++ csw/mgar/pkg/squid/trunk/checksums 2016-02-24 18:13:18 UTC (rev 25581) @@ -1 +1 @@ -d589a2dd8ea8867170cef582e7334442 squid-3.5.14.tar.bz2 +59d6732a4ebd3f63e2164d9847dc37c0 squid-3.5.15.tar.bz2 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 Feb 26 14:26:15 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2016 13:26:15 +0000 Subject: SF.net SVN: gar:[25582] csw/mgar/pkg/freeipmi/trunk Message-ID: <3qBWwj2kq0zK7@mail.opencsw.org> Revision: 25582 http://sourceforge.net/p/gar/code/25582 Author: dmichelsen Date: 2016-02-26 13:26:15 +0000 (Fri, 26 Feb 2016) Log Message: ----------- freeipmi/trunk: Update to 1.5.1 Modified Paths: -------------- csw/mgar/pkg/freeipmi/trunk/Makefile csw/mgar/pkg/freeipmi/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freeipmi/trunk/files/0001-Disable-optimization-for-now.patch Removed Paths: ------------- csw/mgar/pkg/freeipmi/trunk/files/0001-Add-missing-sighandler_t-on-Solaris.patch Modified: csw/mgar/pkg/freeipmi/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeipmi/trunk/Makefile 2016-02-24 18:13:18 UTC (rev 25581) +++ csw/mgar/pkg/freeipmi/trunk/Makefile 2016-02-26 13:26:15 UTC (rev 25582) @@ -2,43 +2,68 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = freeipmi -VERSION = 1.2.5 +VERSION = 1.5.1 DESCRIPTION = IPMI software based on the IPMI v1.5/2.0 specification MASTER_SITES = $(GNU_MIRROR) DISTFILES += $(DISTNAME).tar.gz -# This should better be detected during autoconf time -PATCHFILES += 0001-Add-missing-sighandler_t-on-Solaris.patch +PATCHFILES += 0001-Disable-optimization-for-now.patch VENDOR_URL = http://www.gnu.org/software/freeipmi/index.html PACKAGES += CSWfreeipmi SPKG_DESC_CSWfreeipmi = IPMI software based on the IPMI v1.5/2.0 specification -RUNTIME_DEP_PKGS_CSWfreeipmi += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWfreeipmi += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWfreeipmi += CSWlibipmiconsole2 +RUNTIME_DEP_PKGS_CSWfreeipmi += CSWlibipmidetect0 +RUNTIME_DEP_PKGS_CSWfreeipmi += CSWlibfreeipmi17 RUNTIME_DEP_PKGS_CSWfreeipmi += CSWperl -# I don't care for now -CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeipmi/README.build -CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeipmi/INSTALL -CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeipmi/ChangeLog -CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/share|root/opt/csw/share/doc/freeipmi/README.build -CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/share|root/opt/csw/share/doc/freeipmi/contrib/pet/README -CHECKPKG_OVERRIDES_CSWfreeipmi += shared-lib-pkgname-mismatch -CHECKPKG_OVERRIDES_CSWfreeipmi += shared-lib-package-contains-so-symlink -CHECKPKG_OVERRIDES_CSWfreeipmi += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/bmc-watchdog|class=none -CHECKPKG_OVERRIDES_CSWfreeipmi += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/ipmidetectd|class=none -CHECKPKG_OVERRIDES_CSWfreeipmi += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/ipmiseld|class=none +PACKAGES += CSWlibfreeipmi17 +SPKG_DESC_CSWlibfreeipmi17 = FreeIPMI library, libfreeipmi.so.17 +PKGFILES_CSWlibfreeipmi17 += $(call pkgfiles_lib,libfreeipmi.so.17) +RUNTIME_DEP_PKGS_CSWlibfreeipmi17 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibfreeipmi17 += CSWlibgcrypt20 -GARCOMPILER = GCC4 +PACKAGES += CSWlibipmiconsole2 +SPKG_DESC_CSWlibipmiconsole2 = FreeIPMI library, libipmiconsole.so.2 +PKGFILES_CSWlibipmiconsole2 += $(call pkgfiles_lib,libipmiconsole.so.2) +RUNTIME_DEP_PKGS_CSWlibipmiconsole2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibipmiconsole2 += CSWlibfreeipmi17 +PACKAGES += CSWlibipmidetect0 +SPKG_DESC_CSWlibipmidetect0 = FreeIPMI library, libipmidetect.so.0 +PKGFILES_CSWlibipmidetect0 += $(call pkgfiles_lib,libipmidetect.so.0) +RUNTIME_DEP_PKGS_CSWlibipmidetect0 += CSWlibgcc-s1 + +PACKAGES += CSWlibipmimonitoring5 +SPKG_DESC_CSWlibipmimonitoring5 = FreeIPMI library, libipmimonitoring.so.5 +PKGFILES_CSWlibipmimonitoring5 += $(call pkgfiles_lib,libipmimonitoring.so.5) +RUNTIME_DEP_PKGS_CSWlibipmimonitoring5 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibipmimonitoring5 += CSWlibfreeipmi17 + +PACKAGES += CSWlibfreeipmi-dev +SPKG_DESC_CSWlibfreeipmi-dev = Development files for libfreeipmi.so.17 and assorted libs +PKGFILES_CSWlibfreeipmi-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibfreeipmi-dev += CSWlibfreeipmi17 +RUNTIME_DEP_PKGS_CSWlibfreeipmi-dev += CSWlibipmiconsole2 +RUNTIME_DEP_PKGS_CSWlibfreeipmi-dev += CSWlibipmidetect0 +RUNTIME_DEP_PKGS_CSWlibfreeipmi-dev += CSWlibipmimonitoring5 + +GARCOMPILER = GNU + +BUILD64_LIBS_ONLY = 1 + CONFIGURE_ARGS = $(DIRPATHS) # Otherwise it falls back to gcc which interprets the manpage as C code EXTRA_CONFIGURE_EXPORTS += CPP -CONFIGURE_ENV_CPP = $(bindir)/cpp +CONFIGURE_ENV_CPP = $(bindir_install)/cpp +INITSMF += $(sysconfdir)/init.d/bmc-watchdog +INITSMF += $(sysconfdir)/init.d/ipmidetectd +INITSMF += $(sysconfdir)/init.d/ipmiseld + include gar/category.mk Modified: csw/mgar/pkg/freeipmi/trunk/checksums =================================================================== --- csw/mgar/pkg/freeipmi/trunk/checksums 2016-02-24 18:13:18 UTC (rev 25581) +++ csw/mgar/pkg/freeipmi/trunk/checksums 2016-02-26 13:26:15 UTC (rev 25582) @@ -1 +1 @@ -d8441fe365b631c61c7b78a96242763c freeipmi-1.2.5.tar.gz +19794bf257820dd2ef33520f75d51d35 freeipmi-1.5.1.tar.gz Deleted: csw/mgar/pkg/freeipmi/trunk/files/0001-Add-missing-sighandler_t-on-Solaris.patch =================================================================== --- csw/mgar/pkg/freeipmi/trunk/files/0001-Add-missing-sighandler_t-on-Solaris.patch 2016-02-24 18:13:18 UTC (rev 25581) +++ csw/mgar/pkg/freeipmi/trunk/files/0001-Add-missing-sighandler_t-on-Solaris.patch 2016-02-26 13:26:15 UTC (rev 25582) @@ -1,25 +0,0 @@ -From 914449712a08ff8797249162e2e32e8ffaa71d93 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Sat, 6 Apr 2013 19:32:26 +0200 -Subject: [PATCH] Add missing sighandler_t on Solaris - ---- - common/toolcommon/tool-daemon-common.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/common/toolcommon/tool-daemon-common.h b/common/toolcommon/tool-daemon-common.h -index a436bcb..eaaf4fa 100644 ---- a/common/toolcommon/tool-daemon-common.h -+++ b/common/toolcommon/tool-daemon-common.h -@@ -24,6 +24,8 @@ - - int daemonize_common (const char *pidfile); - -+typedef void (*sighandler_t)(int); -+ - /* can pass NULL for no callback */ - int daemon_signal_handler_setup (sighandler_t cb); - --- -1.8.1.4 - Added: csw/mgar/pkg/freeipmi/trunk/files/0001-Disable-optimization-for-now.patch =================================================================== --- csw/mgar/pkg/freeipmi/trunk/files/0001-Disable-optimization-for-now.patch (rev 0) +++ csw/mgar/pkg/freeipmi/trunk/files/0001-Disable-optimization-for-now.patch 2016-02-26 13:26:15 UTC (rev 25582) @@ -0,0 +1,28 @@ +From a527851d2d69a8ee05e5eb0c40682341cc731be8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 26 Feb 2016 11:18:31 +0100 +Subject: [PATCH] Disable optimization for now + +--- + common/portability/freeipmi-argp-fmtstream.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/common/portability/freeipmi-argp-fmtstream.h b/common/portability/freeipmi-argp-fmtstream.h +index 62a1152..1b1a44b 100644 +--- a/common/portability/freeipmi-argp-fmtstream.h ++++ b/common/portability/freeipmi-argp-fmtstream.h +@@ -192,7 +192,10 @@ extern void __argp_fmtstream_update (argp_fmtstream_t __fs); + extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); + extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); + +-#ifdef __OPTIMIZE__ ++/* Disable optimization as suggested in ++ * https://dev.openwrt.org/browser/trunk/package/libs/argp-standalone/patches/002-no_optimize.patch?rev=46813 ++ */ ++#if 0 + /* Inline versions of above routines. */ + + #if !_LIBC +-- +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 Fri Feb 26 14:36:57 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Feb 2016 13:36:57 +0000 Subject: SF.net SVN: gar:[25583] csw/mgar/pkg/conserver/trunk Message-ID: <3qBX8s3lZ3zMY@mail.opencsw.org> Revision: 25583 http://sourceforge.net/p/gar/code/25583 Author: dmichelsen Date: 2016-02-26 13:36:56 +0000 (Fri, 26 Feb 2016) Log Message: ----------- conserver/trunk: Update to 8.2.1 Modified Paths: -------------- csw/mgar/pkg/conserver/trunk/Makefile csw/mgar/pkg/conserver/trunk/checksums Modified: csw/mgar/pkg/conserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/conserver/trunk/Makefile 2016-02-26 13:26:15 UTC (rev 25582) +++ csw/mgar/pkg/conserver/trunk/Makefile 2016-02-26 13:36:56 UTC (rev 25583) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = conserver -VERSION = 8.1.11 +VERSION = 8.2.1 GARTYPE = v2 DESCRIPTION = Client/Server console server software @@ -21,44 +21,36 @@ endef MASTER_SITES = http://www.conserver.com/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += cswconserver -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +LICENSE = LICENSE -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +PACKAGES += CSWconserver +SPKG_DESC_CSWconserver = Client/Server console server software +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWconserver = CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWconserver += CSWlibipmiconsole2 +RUNTIME_DEP_PKGS_CSWconserver += CSWlibgssglue0 -RUNTIME_DEP_PKGS = CSWlibssl1-0-0 - -CHECKPKG_OVERRIDES = file-with-bad-content|/usr/local|root/opt/csw/share/examples/conserver/conserver.rc -CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/examples/conserver/conserver.cf - -# Temporary override and conf path for the next package release which is just rebuilt against libssl 1.0 -CHECKPKG_OVERRIDES += discouraged-path-in-pkgmap|/opt/csw/var/log -sysconfdir = $(prefix)/etc -localstatedir = $(prefix)/var - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-uds CONFIGURE_ARGS += --with-libwrap CONFIGURE_ARGS += --with-openssl +CONFIGURE_ARGS += --with-gssapi=$(prefix) +CONFIGURE_ARGS += --with-striprealm +CONFIGURE_ARGS += --with-freeipmi CONFIGURE_ARGS += --with-pam +# This throws errors on Solaris 10, disable for now +#CONFIGURE_ARGS += --with-ipv6 -LICENSE = LICENSE +INITSMF += $(sysconfdir)/init.d/cswconserver -DISTFILES += cswconserver -INITSMF = /etc$(prefix)/init.d/cswconserver - TEST_SCRIPTS = include gar/category.mk -post-merge: merge-init-script - -merge-init-script: - ginstall -m 755 -d $(PKGROOT)/etc/$(prefix)/init.d/ - ginstall -m 755 -d $(PKGROOT)/$(localstatedir)/log - ginstall -m 755 $(FILEDIR)/cswconserver $(PKGROOT)/etc/$(prefix)/init.d/cswconserver - +post-install: + ginstall -m 755 -d $(DESTDIR)$(localstatedir)/log + ginstall -D -m 755 $(WORKDIR)/cswconserver $(DESTDIR)$(sysconfdir)/init.d/cswconserver + @$(MAKECOOKIE) Modified: csw/mgar/pkg/conserver/trunk/checksums =================================================================== --- csw/mgar/pkg/conserver/trunk/checksums 2016-02-26 13:26:15 UTC (rev 25582) +++ csw/mgar/pkg/conserver/trunk/checksums 2016-02-26 13:36:56 UTC (rev 25583) @@ -1 +1 @@ -94259cd71f38e94b3f247768e3bc731f conserver-8.1.11.tar.gz +44dd9109e59bccc4c9942648fc05481a conserver-8.2.1.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 Sat Feb 27 11:16:42 2016 From: sfbsdsx at users.sourceforge.net (sfbsdsx at users.sourceforge.net) Date: Sat, 27 Feb 2016 10:16:42 +0000 Subject: SF.net SVN: gar:[25584] csw/mgar/pkg Message-ID: <3qC3gK6L3GzmV@mail.opencsw.org> Revision: 25584 http://sourceforge.net/p/gar/code/25584 Author: sfbsdsx Date: 2016-02-27 10:16:42 +0000 (Sat, 27 Feb 2016) Log Message: ----------- initial import Added Paths: ----------- csw/mgar/pkg/musl-fts/ csw/mgar/pkg/musl-fts/Makefile csw/mgar/pkg/musl-fts/branches/ csw/mgar/pkg/musl-fts/tags/ csw/mgar/pkg/musl-fts/trunk/ csw/mgar/pkg/musl-fts/trunk/Makefile csw/mgar/pkg/musl-fts/trunk/checksums csw/mgar/pkg/musl-fts/trunk/files/ Added: csw/mgar/pkg/musl-fts/Makefile =================================================================== --- csw/mgar/pkg/musl-fts/Makefile (rev 0) +++ csw/mgar/pkg/musl-fts/Makefile 2016-02-27 10:16:42 UTC (rev 25584) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/musl-fts/trunk =================================================================== --- csw/mgar/pkg/musl-fts/trunk 2016-02-26 13:36:56 UTC (rev 25583) +++ csw/mgar/pkg/musl-fts/trunk 2016-02-27 10:16:42 UTC (rev 25584) Property changes on: csw/mgar/pkg/musl-fts/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/musl-fts/trunk/Makefile =================================================================== --- csw/mgar/pkg/musl-fts/trunk/Makefile (rev 0) +++ csw/mgar/pkg/musl-fts/trunk/Makefile 2016-02-27 10:16:42 UTC (rev 25584) @@ -0,0 +1,33 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = musl-fts +VERSION = 1.2.4 +GARTYPE = v2 + +DESCRIPTION = Implementation of fts(3) +define BLURB + Port of musl-fts (https://github.com/pullmoll/musl-fts) + Implements the fts(3) functions fts_open, fts_read, fts_children, fts_set and fts_close + It uses the NetBSD implementation of fts(3) +endef + +MASTER_SITES = https://github.com/pullmoll/musl-fts/archive/ +DISTFILES = v$(VERSION).tar.gz + +PACKAGES += CSWlibfts0 +PKGFILES_CSWlibfts0 += $(call pkgfiles_lib,libfts.so.0) +SPKG_DESC_CSWlibfts0 += $(DESCRIPTION), libfts.so.0 + +PACKAGES += CSWlibfts-dev +SPKG_DESC_CSWlibfts-dev += Development files for libfts.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibfts-dev += CSWlibfts0 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-configure: + cd $(WORKSRC) && sh bootstrap.sh + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/musl-fts/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/musl-fts/trunk/checksums =================================================================== --- csw/mgar/pkg/musl-fts/trunk/checksums (rev 0) +++ csw/mgar/pkg/musl-fts/trunk/checksums 2016-02-27 10:16:42 UTC (rev 25584) @@ -0,0 +1 @@ +74992302abc6b28deece703dd7b11d3b v1.2.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 Mon Feb 29 13:38:22 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 29 Feb 2016 12:38:22 +0000 Subject: SF.net SVN: gar:[25585] csw/mgar/pkg/nrpe/trunk Message-ID: <3qDLjy72Xyz1XL@mail.opencsw.org> Revision: 25585 http://sourceforge.net/p/gar/code/25585 Author: cgrzemba Date: 2016-02-29 12:38:22 +0000 (Mon, 29 Feb 2016) Log Message: ----------- nrpe/trunk: update for build IPS package Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2016-02-27 10:16:42 UTC (rev 25584) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2016-02-29 12:38:22 UTC (rev 25585) @@ -25,7 +25,7 @@ PATCHFILES_isa-sparcv8plus-size-8k = 0002-changing-packetbuffer-length-to-8k.patch PATCHFILES_isa-pentium_pro-size-8k = 0002-changing-packetbuffer-length-to-8k.patch # needs autoconf! -# PATCHFILES += 0003-remove-chown-on-install.patch +PATCHFILES += 0003-remove-chown-on-install.patch # # replace /usr/local @@ -53,6 +53,7 @@ # files for CSWnrpe # +IPS_PACKAGE_PREFIX = diagnostic/ PACKAGES += CSWnrpe SPKG_DESC_CSWnrpe = Nagios remote plugin executor # PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_1k @@ -65,7 +66,7 @@ # PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/LEGAL # PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/license # PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README -# PKGFILES_CSWnrpe_SHARED += /opt/csw/share/doc/nrpe/README_8k +PKGFILES_CSWnrpe_SHARED += /opt/csw/share/doc/nrpe/README_8k # PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README.SSL # PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/SECURITY # PKGFILES_CSWnrpe += /opt/csw/nagios @@ -92,6 +93,7 @@ PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin/license RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWnrpe # # migrate configuration @@ -151,9 +153,9 @@ LIBEXECDIR=$(libexecdir) BINDIR=$(bindir) -# pre-configure: -# cd $(WORKSRC) && autoconf -# @$(MAKECOOKIE) +pre-configure: + cd $(WORKSRC) && autoconf + @$(MAKECOOKIE) install-custom: @ginstall -m 775 -d $(DESTDIR)$(DOCDIR) Added: csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch (rev 0) +++ csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch 2016-02-29 12:38:22 UTC (rev 25585) @@ -0,0 +1,20 @@ +--- a/configure.in ++++ b/configure.in +@@ -392,7 +392,7 @@ AC_ARG_WITH([nrpe_port], + [nrpe_port=5666]) + AC_SUBST(nrpe_user) + AC_SUBST(nrpe_group) +-NRPE_INSTALL_OPTS="-o $nrpe_user -g $nrpe_group" ++NRPE_INSTALL_OPTS= + AC_SUBST(NRPE_INSTALL_OPTS) + AC_SUBST(nrpe_port) + AC_DEFINE_UNQUOTED(DEFAULT_SERVER_PORT,$nrpe_port,[Default port for NRPE daemon]) +@@ -409,7 +409,7 @@ AC_ARG_WITH([nagios_group], + [nagios_group=nagios]) + AC_SUBST(nagios_user) + AC_SUBST(nagios_group) +-NAGIOS_INSTALL_OPTS="-o $nagios_user -g $nagios_group" ++NAGIOS_INSTALL_OPTS= + AC_SUBST(NAGIOS_INSTALL_OPTS) + + # Determine target OS, version and architecture for package build macros This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.