From wahwah at users.sourceforge.net Sun Feb 1 12:03:29 2015 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 1 Feb 2015 11:03:29 +0000 Subject: SF.net SVN: gar:[24608] csw/mgar/pkg/fossil/trunk Message-ID: <3kZqCm3bWYzWK@mail.opencsw.org> Revision: 24608 http://sourceforge.net/p/gar/code/24608 Author: wahwah Date: 2015-02-01 11:03:28 +0000 (Sun, 01 Feb 2015) Log Message: ----------- fossil/trunk: Version bump to 1.30; patch from Freddy http://lists.opencsw.org/pipermail/users/2015-February/009961.html Modified Paths: -------------- csw/mgar/pkg/fossil/trunk/Makefile csw/mgar/pkg/fossil/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/fossil/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch Modified: csw/mgar/pkg/fossil/trunk/Makefile =================================================================== --- csw/mgar/pkg/fossil/trunk/Makefile 2015-01-31 15:43:26 UTC (rev 24607) +++ csw/mgar/pkg/fossil/trunk/Makefile 2015-02-01 11:03:28 UTC (rev 24608) @@ -2,10 +2,10 @@ # TODO (release-critical prefixed with !, non release-critical with *) # Recipe sent in by Freddy DISSAUX freddy.dsx free.fr NAME = fossil -VERSION = 1.29 +VERSION = 1.30 GARTYPE = v2 GARCOMPILER = GNU -DISTVERSION = 20140612172556 +DISTVERSION = 20150119112900 DESCRIPTION = DSCM with built-in wiki, http interface and server, tickets database define BLURB Fossil is an easy-to-use Distributed Source Control Management system (DSCM) @@ -18,7 +18,6 @@ DISTFILES = $(NAME)-src-$(DISTVERSION).tar.gz WORKSRC = $(WORKDIR)/$(NAME)-src-$(DISTVERSION) PATCHDIR = $(WORKSRC) -PATCHFILES += 0001-Include-string.h-to-mitigate-warnings.patch BUILD_DEP_PKGS = CSWlibssl-dev @@ -32,5 +31,6 @@ RUNTIME_DEP_PKGS_CSWfossil = CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWfossil += CSWlibz1 +RUNTIME_DEP_PKGS_CSWfossil += CSWlibreadline6 include gar/category.mk Modified: csw/mgar/pkg/fossil/trunk/checksums =================================================================== --- csw/mgar/pkg/fossil/trunk/checksums 2015-01-31 15:43:26 UTC (rev 24607) +++ csw/mgar/pkg/fossil/trunk/checksums 2015-02-01 11:03:28 UTC (rev 24608) @@ -1 +1 @@ -dd8e7392e1a0ea69eb391f8b13ee34bf fossil-src-20140612172556.tar.gz +dd7cf91c2725ea8aaa0913330fffa0ff fossil-src-20150119112900.tar.gz Deleted: csw/mgar/pkg/fossil/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch =================================================================== --- csw/mgar/pkg/fossil/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch 2015-01-31 15:43:26 UTC (rev 24607) +++ csw/mgar/pkg/fossil/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch 2015-02-01 11:03:28 UTC (rev 24608) @@ -1,25 +0,0 @@ -From 3e7862a7efa384b5957a864c1b809afe480d3e51 Mon Sep 17 00:00:00 2001 -From: Freddy DISSAUX -Date: Sat, 20 Sep 2014 17:31:33 +0200 -Subject: [PATCH] Include string.h to mitigate warnings - ---- - src/makeheaders.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/makeheaders.c b/src/makeheaders.c -index 858426f..087af9b 100644 ---- a/src/makeheaders.c -+++ b/src/makeheaders.c -@@ -44,6 +44,8 @@ - # define WIN32 - # endif - # include -+#elif defined(__sun) && defined(__SVR4) -+# include - #else - # include - #endif --- -2.0.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Feb 1 21:51:49 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 1 Feb 2015 20:51:49 +0000 Subject: SF.net SVN: gar:[24610] csw/mgar/pkg Message-ID: <3kb4GR3qNvzt1@mail.opencsw.org> Revision: 24610 http://sourceforge.net/p/gar/code/24610 Author: dmichelsen Date: 2015-02-01 20:51:49 +0000 (Sun, 01 Feb 2015) Log Message: ----------- lang-python/twitter: Move to lang-python/ and update to 1.15.0 and add 2.6/2.7 modulated build Modified Paths: -------------- csw/mgar/pkg/lang-python/twitter/trunk/Makefile csw/mgar/pkg/lang-python/twitter/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/twitter/ Removed Paths: ------------- csw/mgar/pkg/twitter/ Modified: csw/mgar/pkg/lang-python/twitter/trunk/Makefile =================================================================== --- csw/mgar/pkg/twitter/trunk/Makefile 2014-11-19 15:00:40 UTC (rev 24362) +++ csw/mgar/pkg/lang-python/twitter/trunk/Makefile 2015-02-01 20:51:49 UTC (rev 24610) @@ -2,18 +2,17 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = twitter -VERSION = 1.6.1 +VERSION = 1.15.0 GARTYPE = v2 CATEGORIES = python DESCRIPTION = Twitter API, command-line tool, and IRC bot -define BLURB - Long description -endef -DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWpy-twittertools -CATALOGNAME = py_twittertools +DISTFILES += $(DISTNAME).tar.gz + +PACKAGES += CSWpy-twittertools +SPKG_DESC_CSWpy-twittertools = Twitter API, command-line tool, and IRC bot +# PKGFILES is catchall ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/twitter/trunk/checksums =================================================================== --- csw/mgar/pkg/twitter/trunk/checksums 2014-11-19 15:00:40 UTC (rev 24362) +++ csw/mgar/pkg/lang-python/twitter/trunk/checksums 2015-02-01 20:51:49 UTC (rev 24610) @@ -1 +1 @@ -f662b29747b3f18b824d4f9f07cfe1bf twitter-1.6.1.tar.gz +ba530230d1687a2a8bfd720a963f13c0 twitter-1.15.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Feb 2 11:06:56 2015 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 2 Feb 2015 10:06:56 +0000 Subject: SF.net SVN: gar:[24613] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/about-documentation.rst Message-ID: <3kbPvv6szFz1VP@mail.opencsw.org> Revision: 24613 http://sourceforge.net/p/gar/code/24613 Author: wahwah Date: 2015-02-02 10:06:56 +0000 (Mon, 02 Feb 2015) Log Message: ----------- opencsw-manual/trunk: Add bare URLs, and non-documentation sites. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/about-documentation.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/about-documentation.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/about-documentation.rst 2015-02-02 09:56:43 UTC (rev 24612) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/about-documentation.rst 2015-02-02 10:06:56 UTC (rev 24613) @@ -7,21 +7,24 @@ Introduction ------------ -There are 5 places for documentation at OpenCSW: +There are 6 places for documentation at OpenCSW: * `OpenCSW wiki`_ .a.k.a. wikidot + * http://wiki.opencsw.org/buildfarm * Optimized for frequent changes. * Used for ongoing issues, such as projects in progress. * Powered by Wikidot, has own user name space, separate sign-up and login. * `OpenCSW manual`_ (you are here) + * http://www.opencsw.org/manual/ * Less frequently changing, but more reviewed and polished documentation. * Part of the source code repository. -* `GAR documentation`_ a.k.a. Trac wiki +* `GAR documentation`_ a.k.a. Trac wiki (account for 2 places) + * http://gar.opencsw.org/ * Used for GAR / build system specific documentation. * Lives in the GAR project SourceForge area. * Uses SourceForge credentials. @@ -30,18 +33,26 @@ * `Main OpenCSW website`_ a.k.a. wordpress + * http://www.opencsw.org/ * Used for general project information * Lives in the project Wordpress site * Own user name space, separate sign-up and login * `Community Q&A`_ a.k.a. OSQA + * http://www.opencsw.org/community/ * Used for questions from users. * Own user name space, separate sign-up and login, but accepts Google accounts, Facebook and Twitter. * Receives spam, and needs to be cleaned up manually. +Additionally, there are places where we are on the web: +* Twitter: https://twitter.com/opencsw +* Google+: https://plus.google.com/+OpenCSWorg +* Facebook: https://www.facebook.com/opencsw +* LinkedIn: https://www.linkedin.com/groups/OpenCSW-1693847 + Editing documentation --------------------- @@ -93,7 +104,7 @@ to be incorrect. -.. _OpenCSW wiki: http://wiki.opencsw.org/buildfarm +.. _OpenCSW wiki: http://wiki.opencsw.org/ .. _OpenCSW manual: http://www.opencsw.org/manual/ .. _GAR documentation: http://gar.opencsw.org/ .. _Main OpenCSW website: http://www.opencsw.org/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Feb 4 10:10:31 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 4 Feb 2015 09:10:31 +0000 Subject: SF.net SVN: gar:[24614] csw/mgar/pkg/mysql5/branches Message-ID: <3kccYz6b77znl@mail.opencsw.org> Revision: 24614 http://sourceforge.net/p/gar/code/24614 Author: lblume Date: 2015-02-04 09:10:30 +0000 (Wed, 04 Feb 2015) Log Message: ----------- mysql5/branches/mysql-5.6.x: Bump to 5.6.23 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 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.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2015-02-02 10:06:56 UTC (rev 24613) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2015-02-04 09:10:30 UTC (rev 24614) @@ -14,7 +14,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 41 +PATCHLEVEL = 42 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 2015-02-02 10:06:56 UTC (rev 24613) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2015-02-04 09:10:30 UTC (rev 24614) @@ -1 +1 @@ -211ace59652eed6fb0e5cfd76834afab mysql-5.5.41.tar.gz +c4d946e6c9f54c386aacb8d3ea957cf8 mysql-5.5.42.tar.gz Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2015-02-02 10:06:56 UTC (rev 24613) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2015-02-04 09:10:30 UTC (rev 24614) @@ -20,7 +20,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)56 BASE_VERSION = 5.6 -PATCHLEVEL = 22 +PATCHLEVEL = 23 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 2015-02-02 10:06:56 UTC (rev 24613) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2015-02-04 09:10:30 UTC (rev 24614) @@ -1 +1 @@ -3985b634294482363f3d87e0d67f2262 mysql-5.6.22.tar.gz +60344f26eae136a267a0277407926e79 mysql-5.6.23.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 Thu Feb 5 16:30:28 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 5 Feb 2015 15:30:28 +0000 Subject: SF.net SVN: gar:[24618] csw/mgar/pkg/libtool/trunk Message-ID: <3kdNy65Ckmz12Q@mail.opencsw.org> Revision: 24618 http://sourceforge.net/p/gar/code/24618 Author: dmichelsen Date: 2015-02-05 15:30:27 +0000 (Thu, 05 Feb 2015) Log Message: ----------- libtool/trunk: Update to 2.4.5, forward-port patches Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums csw/mgar/pkg/libtool/trunk/files/0001-Preserve-norunpath.patch csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2015-02-04 16:29:01 UTC (rev 24617) +++ csw/mgar/pkg/libtool/trunk/Makefile 2015-02-05 15:30:27 UTC (rev 24618) @@ -1,5 +1,5 @@ NAME = libtool -VERSION = 2.4.2 +VERSION = 2.4.5 GARTYPE = v2 EXTRA_MODULATORS = GARCOMPILER @@ -51,16 +51,10 @@ # auto-enable this as a simple replacement. CHECKPKG_OVERRIDES_CSWlibtool += file-with-bad-content -# This is built from pkgs/libltdl3 -FOREIGN_PACKAGES += CSWlibltdl3 -OBSOLETED_BY_CSWlibltdl3 += CSWlibtoolrt -CATALOGNAME_CSWlibtoolrt = libtool_rt_stub - PACKAGES += CSWlibltdl7 CATALOGNAME_CSWlibltdl7 = libltdl7 SPKG_DESC_CSWlibltdl7 = Libtool libltdl.so.7 from libtool 2.x -PKGFILES_CSWlibltdl7 += $(PKGFILES_RT) -OBSOLETED_BY_CSWlibltdl7 += CSWlibtoolrt +PKGFILES_CSWlibltdl7 += $(call pkgfiles_lib,libltdl.so.7) # To get around __sync_fetch_and_add_4 either the buildlevel could be raised to Solaris 10 # which is not acceptable for libtool or the base ISA could be raised to pentium_pro allowing @@ -71,8 +65,8 @@ BUILD64 = 1 -# Some Fortran-specific tests fail which is probably not that important -#SKIPTEST ?= 1 +# For SOS12 the following tests fail: 137 138 143 153 154 156 157 169 +SKIPTEST ?= 1 MERGE_SCRIPTS_isa-default-garcompiler-SOS12 = copy-all MERGE_SCRIPTS_isa-default64-garcompiler-SOS12 = copy-relocated-only @@ -83,8 +77,8 @@ include gar/category.mk -post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool) -post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER))) +post-install: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool) +post-install: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER))) ginstall -d $(DESTDIR)$(docdir)/libtool ginstall $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/libtool/README.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2015-02-04 16:29:01 UTC (rev 24617) +++ csw/mgar/pkg/libtool/trunk/checksums 2015-02-05 15:30:27 UTC (rev 24618) @@ -1 +1 @@ -2ec8997e0c07249eb4cbd072417d70fe libtool-2.4.2.tar.xz +ee9c087775aeb98ce53a9c69da865a55 libtool-2.4.5.tar.xz Modified: csw/mgar/pkg/libtool/trunk/files/0001-Preserve-norunpath.patch =================================================================== --- csw/mgar/pkg/libtool/trunk/files/0001-Preserve-norunpath.patch 2015-02-04 16:29:01 UTC (rev 24617) +++ csw/mgar/pkg/libtool/trunk/files/0001-Preserve-norunpath.patch 2015-02-05 15:30:27 UTC (rev 24618) @@ -1,17 +1,17 @@ -From 61f2e8e198520e36e898b2c52e06abfa1f2e0f3b Mon Sep 17 00:00:00 2001 +From 525582d45e936cdbbcf6dc4b6e0413661771d264 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Wed, 24 Nov 2010 10:45:07 +0100 +Date: Tue, 20 Jan 2015 11:51:20 +0100 Subject: [PATCH] Preserve -norunpath --- - libltdl/config/ltmain.m4sh | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + build-aux/ltmain.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh -index 0418007..9792193 100644 ---- a/libltdl/config/ltmain.m4sh -+++ b/libltdl/config/ltmain.m4sh -@@ -5040,6 +5040,7 @@ func_mode_link () +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +index 46a0bb5..f02e9fe 100644 +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -5343,6 +5343,7 @@ func_mode_link () # -64, -mips[0-9] enable 64-bit mode for the SGI compiler # -r[0-9][0-9]* specify processor for the SGI compiler # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler @@ -19,15 +19,15 @@ # +DA*, +DD* enable 64-bit mode for the HP compiler # -q* compiler args for the IBM compiler # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -@@ -5051,7 +5052,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization +@@ -5356,7 +5357,7 @@ func_mode_link () + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath|-xnorunpath) +- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-norunpath|-xnorunpath) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" -- -1.7.1 +2.2.1 Modified: csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch =================================================================== --- csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch 2015-02-04 16:29:01 UTC (rev 24617) +++ csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch 2015-02-05 15:30:27 UTC (rev 24618) @@ -1,15 +1,15 @@ ---- libtool 2013-11-18 14:15:21.212825370 +0100 -+++ libtool.new 2013-11-18 14:18:36.734017047 +0100 -@@ -576,6 +576,8 @@ +--- libtool 2015-01-21 10:15:39.000000000 +0100 ++++ libtool.new 2015-02-05 16:06:43.026764861 +0100 +@@ -915,6 +915,8 @@ # positional parameter $0, within a function call, is the name of the # function. - progpath="$0" + progpath=$0 +confpath="$0" +tagspath="$0" - - -@@ -1342,11 +1344,11 @@ + # The name of this program. + progname=`$ECHO "$progpath" |$SED "$sed_basename"` +@@ -2641,11 +2643,11 @@ re_endcf='^# ### END LIBTOOL' # Default configuration. @@ -23,45 +23,45 @@ done exit $? -@@ -1396,14 +1398,14 @@ - case $tagname in - CC) ;; +@@ -2699,14 +2701,14 @@ + case $tagname in + CC) ;; *) -- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then -+ if $GREP "$re_begincf" "$tagspath" >/dev/null 2>&1; then - taglist="$taglist $tagname" +- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then ++ if $GREP "$re_begincf" "$tagspath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: -- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` -+ extractedcf=`$SED -n -e "$sed_extractcf" < "$tagspath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" -@@ -1609,6 +1611,12 @@ - - # save first non-option argument - if test "$#" -gt 0; then -+ case `which "$opt"` in -+ /opt/csw/gcc4/bin/*|/opt/csw/bin/gcc|/opt/csw/bin/g++|/opt/csw/bin/gcc-4.8|/opt/csw/bin/g++-4.8) -+ . /opt/csw/share/libtool/gcc4.conf -+ tagspath=/opt/csw/share/libtool/gcc4.tags -+ ;; -+ esac - nonopt="$opt" - shift - fi -@@ -1828,9 +1836,9 @@ + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: +- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` ++ extractedcf=`$SED -n -e "$sed_extractcf" < "$tagspath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" +@@ -2910,6 +2912,12 @@ + { + # save first non-option argument + if test 0 -lt $#; then ++ case `which "$opt"` in ++ /opt/csw/gcc4/bin/*|/opt/csw/bin/gcc|/opt/csw/bin/g++|/opt/csw/bin/gcc-4.*|/opt/csw/bin/g++-4.*) ++ . /opt/csw/share/libtool/gcc4.conf ++ tagspath=/opt/csw/share/libtool/gcc4.tags ++ ;; ++ esac + nonopt=$1 + shift + fi +@@ -3170,9 +3178,9 @@ # if we don't check for them as well. *) for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$tagspath" > /dev/null; then # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`" +- eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hjb001 at users.sourceforge.net Fri Feb 6 10:14:40 2015 From: hjb001 at users.sourceforge.net (hjb001 at users.sourceforge.net) Date: Fri, 6 Feb 2015 09:14:40 +0000 Subject: SF.net SVN: gar:[24619] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: <3kdrYk0Yhnz1QC@mail.opencsw.org> Revision: 24619 http://sourceforge.net/p/gar/code/24619 Author: hjb001 Date: 2015-02-06 09:14:40 +0000 (Fri, 06 Feb 2015) Log Message: ----------- netsnmp/trunk: added missing BUILD_DEP_PKGS Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2015-02-05 15:30:27 UTC (rev 24618) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2015-02-06 09:14:40 UTC (rev 24619) @@ -53,7 +53,15 @@ # GARCOMPILER = SOS12U3 GARCOMPILER = GCC4 + BUILD_DEP_PKGS = CSWpy-setuptools +BUILD_DEP_PKGS += CSWautomake +BUILD_DEP_PKGS += CSWautoconf +BUILD_DEP_PKGS += CSWlibtool +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWpython27-dev + PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386 INITSMF = $(sysconfdir)/init.d/netsnmpd 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 6 15:53:29 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 6 Feb 2015 14:53:29 +0000 Subject: SF.net SVN: gar:[24622] csw/mgar/pkg/ansible/trunk/Makefile Message-ID: <3kf04g3Yqsz1W1@mail.opencsw.org> Revision: 24622 http://sourceforge.net/p/gar/code/24622 Author: dmichelsen Date: 2015-02-06 14:53:29 +0000 (Fri, 06 Feb 2015) Log Message: ----------- ansible/trunk: Add override Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2015-02-06 14:47:01 UTC (rev 24621) +++ csw/mgar/pkg/ansible/trunk/Makefile 2015-02-06 14:53:29 UTC (rev 24622) @@ -26,6 +26,8 @@ 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 +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpython RUNTIME_DEP_PKGS_CSWansible += CSWpy-jinja2 RUNTIME_DEP_PKGS_CSWansible += CSWpy-markupsafe RUNTIME_DEP_PKGS_CSWansible += CSWpy-yaml 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 7 19:59:11 2015 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 7 Feb 2015 18:59:11 +0000 Subject: SF.net SVN: gar:[24623] csw/mgar/pkg/mercurial/trunk Message-ID: <3kfjTq0pZQz1PN@mail.opencsw.org> Revision: 24623 http://sourceforge.net/p/gar/code/24623 Author: rthurner Date: 2015-02-07 18:59:11 +0000 (Sat, 07 Feb 2015) Log Message: ----------- mercurial, update to hg-3.3 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2015-02-06 14:53:29 UTC (rev 24622) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2015-02-07 18:59:11 UTC (rev 24623) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 3.2.3 +VERSION = 3.3 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2015-02-06 14:53:29 UTC (rev 24622) +++ csw/mgar/pkg/mercurial/trunk/checksums 2015-02-07 18:59:11 UTC (rev 24623) @@ -1 +1 @@ -ca6d1a0b0fd255fb1b9fb3fa46a856b8 mercurial-3.2.3.tar.gz +9d158d96aef4ad02cc3c15509257d13b mercurial-3.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Feb 8 22:07:10 2015 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 8 Feb 2015 21:07:10 +0000 Subject: SF.net SVN: gar:[24624] csw/mgar/pkg/openssl/trunk Message-ID: <3kgNH16ryrz1BQ@mail.opencsw.org> Revision: 24624 http://sourceforge.net/p/gar/code/24624 Author: chninkel Date: 2015-02-08 21:07:10 +0000 (Sun, 08 Feb 2015) Log Message: ----------- openssl/trunk: updated to 0.9.9ze Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2015-02-07 18:59:11 UTC (rev 24623) +++ csw/mgar/pkg/openssl/trunk/Makefile 2015-02-08 21:07:10 UTC (rev 24624) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = openssl -VERSION = 0.9.8zd +VERSION = 0.9.8ze GARTYPE = v2 DESCRIPTION = The Open Source toolkit for SSL and TLS Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2015-02-07 18:59:11 UTC (rev 24623) +++ csw/mgar/pkg/openssl/trunk/checksums 2015-02-08 21:07:10 UTC (rev 24624) @@ -1 +1 @@ -e9b9ee12f2911e1a378e2458d9bfff77 openssl-0.9.8zd.tar.gz +edcca64ac2fbf2b03461936d5e42a262 openssl-0.9.8ze.tar.gz Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2015-02-07 18:59:11 UTC (rev 24623) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2015-02-08 21:07:10 UTC (rev 24624) @@ -1,3 +1,9 @@ +openssl (0.9.8ze,REV=2015.02.08) unstable + + * New upstream release. + + -- Yann Rouillard Sun, 08 Feb 2015 21:20:42 +0100 + openssl (0.9.8zc,REV=2014.10.15) unstable * New upstream release. 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 9 11:18:40 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 9 Feb 2015 10:18:40 +0000 Subject: SF.net SVN: gar:[24626] csw/mgar/gar/v2/gar.lib.mk Message-ID: <3kgjrC4ykdz2r@mail.opencsw.org> Revision: 24626 http://sourceforge.net/p/gar/code/24626 Author: dmichelsen Date: 2015-02-09 10:18:39 +0000 (Mon, 09 Feb 2015) Log Message: ----------- mGAR v2: Skip DESTDIR if it is in NO_CONFIGURE_EXPORTS Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2015-02-09 09:39:29 UTC (rev 24625) +++ csw/mgar/gar/v2/gar.lib.mk 2015-02-09 10:18:39 UTC (rev 24626) @@ -1002,17 +1002,17 @@ # just run make install and hope for the best. install-%/Makefile: @echo " ==> Running make install in $*" - @cd $* && /usr/bin/env -i $(INSTALL_ENV) MAKEFLAGS= $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install + @cd $* && /usr/bin/env -i $(INSTALL_ENV) MAKEFLAGS= $(MAKE) $(foreach TTT,$(filter-out $(NO_CONFIGURE_EXPORTS),DESTDIR $(INSTALL_OVERRIDE_VARS)),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/makefile: @echo " ==> Running make install in $*" - @cd $* && $(INSTALL_ENV) MAKEFLAGS= $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install + @cd $* && $(INSTALL_ENV) MAKEFLAGS= $(MAKE) $(foreach TTT,$(filter-out $(NO_CONFIGURE_EXPORTS),DESTDIR $(INSTALL_OVERRIDE_VARS)),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/GNUmakefile: @echo " ==> Running make install in $*" - @cd $* && $(INSTALL_ENV) MAKEFLAGS= $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install + @cd $* && $(INSTALL_ENV) MAKEFLAGS= $(MAKE) $(foreach TTT,$(filter-out $(NO_CONFIGURE_EXPORTS),DESTDIR $(INSTALL_OVERRIDE_VARS)),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install @$(MAKECOOKIE) # Ruby makefiles 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 9 19:19:47 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 9 Feb 2015 18:19:47 +0000 Subject: SF.net SVN: gar:[24628] csw/mgar/pkg/ruby21/trunk/Makefile Message-ID: <3kgwWL1RB0zCd@mail.opencsw.org> Revision: 24628 http://sourceforge.net/p/gar/code/24628 Author: dmichelsen Date: 2015-02-09 18:19:47 +0000 (Mon, 09 Feb 2015) Log Message: ----------- ruby21/trunk: Skip Solaris 11 for now Modified Paths: -------------- csw/mgar/pkg/ruby21/trunk/Makefile Modified: csw/mgar/pkg/ruby21/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby21/trunk/Makefile 2015-02-09 14:18:13 UTC (rev 24627) +++ csw/mgar/pkg/ruby21/trunk/Makefile 2015-02-09 18:19:47 UTC (rev 24628) @@ -21,7 +21,8 @@ DISTFILES += $(DISTNAME).tar.gz PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 +# Solaris 11 has build problems, skip for now +# PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 # Use patch until this is fixed: # https://bugs.ruby-lang.org/issues/10830 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 10 11:04:42 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Feb 2015 10:04:42 +0000 Subject: SF.net SVN: gar:[24633] csw/mgar/pkg/apache24/trunk Message-ID: <3khKTk3BPbzV7@mail.opencsw.org> Revision: 24633 http://sourceforge.net/p/gar/code/24633 Author: dmichelsen Date: 2015-02-10 10:04:42 +0000 (Tue, 10 Feb 2015) Log Message: ----------- apache24/trunk: Update to 2.4.12, rework postinstall Modified Paths: -------------- csw/mgar/pkg/apache24/trunk/Makefile csw/mgar/pkg/apache24/trunk/checksums Modified: csw/mgar/pkg/apache24/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache24/trunk/Makefile 2015-02-10 10:04:14 UTC (rev 24632) +++ csw/mgar/pkg/apache24/trunk/Makefile 2015-02-10 10:04:42 UTC (rev 24633) @@ -1,7 +1,7 @@ # $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $ NAME = httpd -VERSION = 2.4.10 +VERSION = 2.4.12 GARTYPE = v2 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc @@ -95,6 +95,8 @@ # As requested in https://www.opencsw.org/mantis/view.php?id=5152 CONFIGURE_ARGS += --enable-proxy-html +EXTRA_CFLAGS += -DSSL_EXPERIMENTAL -DSSL_ENGINE + # Fixup target variables APACHE_ROOT = $(DESTDIR)$(prefix) LIBTOOL_LADIR = $(APACHE_ROOT)/lib @@ -104,26 +106,16 @@ include gar/category.mk -CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS) - -post-install-modulated: - @(cd $(DESTDIR)/$(sbindir); \ +post-install: + (cd $(DESTDIR)$(sbindir); \ for f in envvars*; do \ - mv $$f $(DESTDIR)/$(sysconfdir)/apache2/; \ + mv $$f $(DESTDIR)$(sysconfdir)/apache2/; \ ln -s $(sysconfdir)/apache2/$$f $$f; \ done ) + rm -rf $(DESTDIR)$(sysconfdir)/apache2/original + perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' $(DESTDIR)$(sysconfdir)/apache2/httpd.conf + perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache2|g' $(DESTDIR)$(mandir)/man1/* + perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' $(DESTDIR)$(mandir)/man8/* + ginstall -D -m 0755 $(WORKDIR)/cswapache24 $(DESTDIR)/etc/opt/csw/init.d/cswapache24 + echo "# create server.(crt|csr)/server.key" > $(DESTDIR)$(sysconfdir)/apache2/server @$(MAKECOOKIE) - -post-merge: - @(cd $(PKGROOT)/$(sysconfdir)/apache2; \ - rm -rf original; \ - perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' httpd.conf.CSW ; \ - cd $(PKGROOT)/$(mandir); \ - perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache2|g' man1/*; \ - perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* ) - @( ginstall -d $(PKGROOT)/etc/opt/csw/init.d; \ - ginstall $(WORKSRC_FIRSTMOD)/../cswapache24 $(PKGROOT)/etc/opt/csw/init.d ) - - @(cd $(PKGROOT)/$(sysconfdir)/apache2; \ - echo "# create server.(crt|csr)/server.key" > server ) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/apache24/trunk/checksums =================================================================== --- csw/mgar/pkg/apache24/trunk/checksums 2015-02-10 10:04:14 UTC (rev 24632) +++ csw/mgar/pkg/apache24/trunk/checksums 2015-02-10 10:04:42 UTC (rev 24633) @@ -1 +1 @@ -9b5f9342f73a6b1ad4e8c4b0f3f5a159 httpd-2.4.10.tar.gz +ec8676a7fe62433883868b8341da6734 httpd-2.4.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Feb 10 11:16:35 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 10 Feb 2015 10:16:35 +0000 Subject: SF.net SVN: gar:[24634] csw/mgar/pkg/gvim/trunk Message-ID: <3khKlQ4ynhzXc@mail.opencsw.org> Revision: 24634 http://sourceforge.net/p/gar/code/24634 Author: lblume Date: 2015-02-10 10:16:35 +0000 (Tue, 10 Feb 2015) Log Message: ----------- gvim/trunk: Bump tp 7.4.622 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2015-02-10 10:04:42 UTC (rev 24633) +++ csw/mgar/pkg/gvim/trunk/Makefile 2015-02-10 10:16:35 UTC (rev 24634) @@ -1,6 +1,6 @@ NAME = vim DISTVERSION = 7.4 -PATCHREV = 453 +PATCHREV = 622 VERSION = $(DISTVERSION).$(PATCHREV) GARTYPE = v2 SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2015-02-10 10:04:42 UTC (rev 24633) +++ csw/mgar/pkg/gvim/trunk/checksums 2015-02-10 10:16:35 UTC (rev 24634) @@ -451,4 +451,173 @@ 167005e12ff531637fbc19b5c8beea81 7.4.451 76596c3657ac05ab6cf1f04bad757a0f 7.4.452 32f1a419dd29d7cec173c22685080488 7.4.453 +957e246a0581691d4f6c02830bd6767c 7.4.454 +a1f9bd109bb42f77f607dd3cd51f0a96 7.4.455 +0dc5e8ca20062e5dffa28dd65daa03f9 7.4.456 +ac951b3f2073e38c88bc26c1bebc97da 7.4.457 +aa11ef9102b10a90125a55e4ec40e9e3 7.4.458 +19210b5e0e4845a8308227ec2753d101 7.4.459 +ca46f134d5456c37bb3a42433dc2d92e 7.4.460 +17dc9a683c61aaa55e4a82e9fe8f563b 7.4.461 +54ac516f60a5b7dcde4381e3fad46e1d 7.4.462 +7e716d0eac751bd07bb0a66bc3c3ef67 7.4.463 +cdd1ece14e48ea88b3c4b6e277f8097f 7.4.464 +d3d85c6570841e48f7db37e006930bb3 7.4.465 +472b9cdefdb369b53420cf506aa785fa 7.4.466 +f068b6f2f3749c31c808bd127ad69a20 7.4.467 +a732bf05480de97c11f612774bc70ebe 7.4.468 +4bfb7018aca9b868ebc17142ad4fed07 7.4.469 +42d62f855bc8587f2d7e2fa538b34895 7.4.470 +8f41943c508cf52086a96a064e52698c 7.4.471 +12f30dc6139a8cf3f26448aeaf16b04f 7.4.472 +9bfdadb9d5075884fc5210329a759755 7.4.473 +eafd9a3d004f70a4df1c3a4bab76765c 7.4.474 +d8f96f6b14970a3b14432cafdcb5b211 7.4.475 +c7010f1022a5ae1c8501a74983324d4f 7.4.476 +5e9f4d3bdd306902a98c4387e17bd6ed 7.4.477 +25d2441fe02d5eab715d33de644d81cb 7.4.478 +8186805eaafe3ec964d9c4338d95b716 7.4.479 +559ccafd40109dcafaf933e089b78773 7.4.480 +ff8cddad2b912b454f89f9bfc860de60 7.4.481 +680873c78f3b80324184b95e06956a01 7.4.482 +93fee48db87274b58005161316d01df0 7.4.483 +ff6af8e77ab6532fb6196adf58dc6492 7.4.484 +e48178be5ec895e1c2b92ae71efb63af 7.4.485 +b99170d8f098180b44f9c313399612fe 7.4.486 +f80146ca30aefa695280ddb5240ce950 7.4.487 +cc16330bc73f4e29c27a42f7bc153656 7.4.488 +e13ce9421c65af6f05b68419109d0e99 7.4.489 +b3ffef9729086367f9767b79fa811a6f 7.4.490 +fe050a262ef432b107d4caf6b28d4932 7.4.491 +775f9d2f517f1ecdf676677e972c9e97 7.4.492 +182639358fd7a9f470cadbb4d852402b 7.4.493 +4283702d281c08bd183fd5d44efc3b3c 7.4.494 +b0d3e2996fb4a14e68de51108492a18b 7.4.495 +15e58352813b967a34a9ae16f0cbcb44 7.4.496 +14b0f06059de5e6e992137657795b650 7.4.497 +69036c327bb5bd852e038411588ac2d0 7.4.498 +f774972f8caa19d76d825e83e2f1fb61 7.4.499 +29cc50b076a440b01e191fd6d643031a 7.4.500 +b93c53e9ba887eb090f6860f44c6cbf1 7.4.501 +21174ec36df7fa88ba033fa127dcfd59 7.4.502 +0adcad3429745d79c1df220141e81680 7.4.503 +84eab0a568611d4ff59e6bf11f639210 7.4.504 +2304283c166523115d2d4836fc43054b 7.4.505 +25b3131d9f8056f60974c2c94b7e7df1 7.4.506 +b1e1e8c84e68d1dfeabef0cee29dd328 7.4.507 +0137d1f544ed32596b5e87b7d292f846 7.4.508 +081e2d8b138eeb4f1dc94fd1fe6b44e4 7.4.509 +e1def35d3924d15016a183de885d227a 7.4.510 +e64398c78faaf901ada93c61d9fb047b 7.4.511 +28fbdb68b18aed00d9104edffa858d3a 7.4.512 +e16c4c596f630c14236ebf8082d9ac59 7.4.513 +044c8bc2d9e2d591c3c2921ac489028c 7.4.514 +4ace8d0f63f7a60066363a93d6f14df0 7.4.515 +36b659c6945ec5fd4ad70ced8724e29d 7.4.516 +8e839c144d93a08c01d392666f6a8313 7.4.517 +d48182515d3311cc0cd4e1204304d872 7.4.518 +7d0e446a862b02914ef268d427eb555a 7.4.519 +af1813649636c1ebd6a04969bfd193e1 7.4.520 +4664a3875152d85cf8815b6bd30ce896 7.4.521 +f2fe7fcfe3611e88ac7f06ca0c684960 7.4.522 +a99c03edf220a410ee07b0292c0e9438 7.4.523 +c920fd1c2dcbe5110681c0229bb72615 7.4.524 +774e59a013d8f30fb8083e1aa5e0df9d 7.4.525 +5e6ad85332e8affc7c3d133fd5d39360 7.4.526 +3a187715dcd142fc5fd719336589ce5b 7.4.527 +24f9168b9094179c20e988b85a2c425b 7.4.528 +e6bf287f95e99e97fd72756a6b9a3e7e 7.4.529 +e1378057587fbfd7813764cf349d6e5a 7.4.530 +73a4ece87b8b625663439c72098492a6 7.4.531 +479bada0a101dff43d419ee3dad8b191 7.4.532 +907554283ab1cf219451f2d470c22f8f 7.4.533 +a54ccb2731c5e402b9dd9d22b2fa1ba0 7.4.534 +9a6a4d372b613e48bd9ca20f4d364124 7.4.535 +35265a51a1f845003f3d383aaa78a41d 7.4.536 +ad72b439c0818dc96d84485b10ccf6d5 7.4.537 +89145a2afb7445d0fa27b5443915c8fc 7.4.538 +0d45f9ba58015be8db9a1e25194508bb 7.4.539 +a7d002ff318ff7f891fbce0b4b786294 7.4.540 +32ebf9804789d61c25035c7a862916b4 7.4.541 +d1188b1f4432348f72483b739459af74 7.4.542 +67afbf8596dd84916a0798ed29a3b937 7.4.543 +7e4ff82db15a3add5f2181ef2665a2b2 7.4.544 +ede30b6380c40ccea14b0c451b256241 7.4.545 +81eff49206d56d37cede07efa7008fa9 7.4.546 +9ba61b62470671e98b715a8d6e89e373 7.4.547 +908c4b2c4496b5d875129eb4030fa375 7.4.548 +3a5a25c22ea7badebf7155861e11a53d 7.4.549 +f587fdf0a4ab839f4138b02befebe02a 7.4.550 +f436ddf3b7694e020c37406aa67b4e08 7.4.551 +3482d0e10b332fdd04970f948164456a 7.4.552 +317551905db4e0e3d00f86e54a11231f 7.4.553 +e164bb738545f369ba5d55287a351c7f 7.4.554 +05e3fbcc33e9f347ffaadd3a621a062a 7.4.555 +ddc3c2f0cffd60c7ecf243dfad7de3cf 7.4.556 +18565b87a98632d6c4ca128890f00eee 7.4.557 +52b12aa54c331858d1851eba6870c60a 7.4.558 +38021eb692764f0f29b4013eba50b63b 7.4.559 +7c4ae18c1a920a45e91531d43580839f 7.4.560 +2bc2844950bf81f3ba4c8c3a7905d73f 7.4.561 +8c1e9b9ac21d613b47fe3f0cb7176def 7.4.562 +019a4954c89f54aeb60980fdff10dfa0 7.4.563 +27c1d5915117ffe4827bee99854c8173 7.4.564 +e9a7e76005928b8e7b27bec13e17b035 7.4.565 +428a91b82b419f0ae7cb2994f382bb7c 7.4.566 +3486b3ee0ed2a93bf6360707947c629e 7.4.567 +2c9518474b1b4278b1cdd97ab4f77436 7.4.568 +9f9fb6294c49d635a20f03497eba981b 7.4.569 +9d59369e2c677a667418344bff993f0a 7.4.570 +356a45a43dc6286d6409fbac1fd2b062 7.4.571 +f8553e496f32812515d76265fdbe068a 7.4.572 +dca12cba380588b5018b77f6f8282052 7.4.573 +5cbc38e876e2ce454c4bd12d1b5a39f8 7.4.574 +a81aef545baab2be28b873bff1e31409 7.4.575 +1b97ce7bf227e76742c116b545a573ea 7.4.576 +81ca6e7ff95193462ddba556aa5afa82 7.4.577 +f23195ee94d1cd80d172439ff53f57f3 7.4.578 +5f186a95383f83c7160bc9f88fdbf686 7.4.579 +98cefaec8cf710f9ed17e1298a639f78 7.4.580 +e32ed4c6a0362e8d565069bb34fa25ed 7.4.581 +3272170bd50e5227227d7a3b6e1a1b57 7.4.582 +4b030c8a953e1d0adb97f705286bc07f 7.4.583 +c0452918087582f0d249bfc6268b8169 7.4.584 +8e5c87df01042b97778d6c7450dc9d96 7.4.585 +f573f2805a892d1042ef14dca4f6b634 7.4.586 +17370cdbc3c2ff105fb6bd3c3332995d 7.4.587 +ba8be43560bf75b4e761a12887d72220 7.4.588 +a55eb85c0522a008bb10fbff3e043cb3 7.4.589 +bbea4ec0a454758fe62530f865f9d93b 7.4.590 +25feea68c2ff4e00b9d47d8c050af5ee 7.4.591 +f411bd0a168e21bd897ec32edcd12b49 7.4.592 +5eb2abe1bd9dbedec877703e12fc1dbb 7.4.593 +8bacc54ea36e544243146ef5a8ecc196 7.4.594 +ce67848ffe288f2bd038db70f8c223c1 7.4.595 +a138d1af67bbd7dba55b02f98dd3a726 7.4.596 +87a9b58db2be13ce5df779458ba87ced 7.4.597 +033204a15116244c47fb98c1a242c1c2 7.4.598 +194491afdd2586a3ca11b382f3196031 7.4.599 +2ca5df83cab0df86391a7cd11f34066e 7.4.600 +918970048d16fa85cdd56652d3214e6f 7.4.601 +86c3a78648925ff06e4db5cf49ebdb01 7.4.602 +f169643653ce40545d40b1d6b04ebecc 7.4.603 +2b7e24dd5a614aa388dd1fe6b582dbe5 7.4.604 +fe651e4adc8e40699f3ba24482215f95 7.4.605 +94fda19cecd5fe65558a1d202c0120e0 7.4.606 +36af9fef9a14fe24184f33f5fdd718b1 7.4.607 +03fc55c0007fe6aa1adc948a5348bebb 7.4.608 +9a2bc114b4930004f1f6e741dc66e23d 7.4.609 +4efcdd093bd53b79fa4c3d0ac85d0fa9 7.4.610 +a4d25899ecf5d8f75ea99a2c9785477f 7.4.611 +a78454b35b92b6ea257faceb11ba97dd 7.4.612 +517405a8baa6ecdd1eb79427247c3c0e 7.4.613 +bf8b4c7f393e6848e40fb76261e38724 7.4.614 +0c4c459d6debf05eca77da0d052a676a 7.4.615 +8a39ab82bac2b06e5890de03c53a76da 7.4.616 +eef77728c9f947cb4aa433bb30351b40 7.4.617 +065b9b2806bf01bf45f5a5f1b4064a1c 7.4.618 +e5661a5b27d393312f8e92bf113cf75d 7.4.619 +8d58db3208bd101308c9b9ac1075add8 7.4.620 +f8e5fd38631666c3ece59f083a21578e 7.4.621 +7b46a64a84a0b78582f7bd74a2cc986a 7.4.622 607e135c559be642f210094ad023dc65 vim-7.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Feb 10 11:17:24 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 10 Feb 2015 10:17:24 +0000 Subject: SF.net SVN: gar:[24635] csw/mgar/pkg/vim/trunk Message-ID: <3khKmK39RWzb0@mail.opencsw.org> Revision: 24635 http://sourceforge.net/p/gar/code/24635 Author: lblume Date: 2015-02-10 10:17:24 +0000 (Tue, 10 Feb 2015) Log Message: ----------- vim/trunk: Bump to 7.4.622 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2015-02-10 10:16:35 UTC (rev 24634) +++ csw/mgar/pkg/vim/trunk/Makefile 2015-02-10 10:17:24 UTC (rev 24635) @@ -1,6 +1,6 @@ NAME = vim DISTVERSION = 7.4 -PATCHREV = 453 +PATCHREV = 622 VERSION = $(DISTVERSION).$(PATCHREV) GARTYPE = v2 SPKG_SOURCEURL = http://www.vim.org/download.php @@ -14,7 +14,7 @@ endef # Let's build a CLI vim for those stuck with S9 -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 ifneq ($(shell /usr/bin/uname -r),5.9) Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2015-02-10 10:16:35 UTC (rev 24634) +++ csw/mgar/pkg/vim/trunk/checksums 2015-02-10 10:17:24 UTC (rev 24635) @@ -451,4 +451,173 @@ 167005e12ff531637fbc19b5c8beea81 7.4.451 76596c3657ac05ab6cf1f04bad757a0f 7.4.452 32f1a419dd29d7cec173c22685080488 7.4.453 +957e246a0581691d4f6c02830bd6767c 7.4.454 +a1f9bd109bb42f77f607dd3cd51f0a96 7.4.455 +0dc5e8ca20062e5dffa28dd65daa03f9 7.4.456 +ac951b3f2073e38c88bc26c1bebc97da 7.4.457 +aa11ef9102b10a90125a55e4ec40e9e3 7.4.458 +19210b5e0e4845a8308227ec2753d101 7.4.459 +ca46f134d5456c37bb3a42433dc2d92e 7.4.460 +17dc9a683c61aaa55e4a82e9fe8f563b 7.4.461 +54ac516f60a5b7dcde4381e3fad46e1d 7.4.462 +7e716d0eac751bd07bb0a66bc3c3ef67 7.4.463 +cdd1ece14e48ea88b3c4b6e277f8097f 7.4.464 +d3d85c6570841e48f7db37e006930bb3 7.4.465 +472b9cdefdb369b53420cf506aa785fa 7.4.466 +f068b6f2f3749c31c808bd127ad69a20 7.4.467 +a732bf05480de97c11f612774bc70ebe 7.4.468 +4bfb7018aca9b868ebc17142ad4fed07 7.4.469 +42d62f855bc8587f2d7e2fa538b34895 7.4.470 +8f41943c508cf52086a96a064e52698c 7.4.471 +12f30dc6139a8cf3f26448aeaf16b04f 7.4.472 +9bfdadb9d5075884fc5210329a759755 7.4.473 +eafd9a3d004f70a4df1c3a4bab76765c 7.4.474 +d8f96f6b14970a3b14432cafdcb5b211 7.4.475 +c7010f1022a5ae1c8501a74983324d4f 7.4.476 +5e9f4d3bdd306902a98c4387e17bd6ed 7.4.477 +25d2441fe02d5eab715d33de644d81cb 7.4.478 +8186805eaafe3ec964d9c4338d95b716 7.4.479 +559ccafd40109dcafaf933e089b78773 7.4.480 +ff8cddad2b912b454f89f9bfc860de60 7.4.481 +680873c78f3b80324184b95e06956a01 7.4.482 +93fee48db87274b58005161316d01df0 7.4.483 +ff6af8e77ab6532fb6196adf58dc6492 7.4.484 +e48178be5ec895e1c2b92ae71efb63af 7.4.485 +b99170d8f098180b44f9c313399612fe 7.4.486 +f80146ca30aefa695280ddb5240ce950 7.4.487 +cc16330bc73f4e29c27a42f7bc153656 7.4.488 +e13ce9421c65af6f05b68419109d0e99 7.4.489 +b3ffef9729086367f9767b79fa811a6f 7.4.490 +fe050a262ef432b107d4caf6b28d4932 7.4.491 +775f9d2f517f1ecdf676677e972c9e97 7.4.492 +182639358fd7a9f470cadbb4d852402b 7.4.493 +4283702d281c08bd183fd5d44efc3b3c 7.4.494 +b0d3e2996fb4a14e68de51108492a18b 7.4.495 +15e58352813b967a34a9ae16f0cbcb44 7.4.496 +14b0f06059de5e6e992137657795b650 7.4.497 +69036c327bb5bd852e038411588ac2d0 7.4.498 +f774972f8caa19d76d825e83e2f1fb61 7.4.499 +29cc50b076a440b01e191fd6d643031a 7.4.500 +b93c53e9ba887eb090f6860f44c6cbf1 7.4.501 +21174ec36df7fa88ba033fa127dcfd59 7.4.502 +0adcad3429745d79c1df220141e81680 7.4.503 +84eab0a568611d4ff59e6bf11f639210 7.4.504 +2304283c166523115d2d4836fc43054b 7.4.505 +25b3131d9f8056f60974c2c94b7e7df1 7.4.506 +b1e1e8c84e68d1dfeabef0cee29dd328 7.4.507 +0137d1f544ed32596b5e87b7d292f846 7.4.508 +081e2d8b138eeb4f1dc94fd1fe6b44e4 7.4.509 +e1def35d3924d15016a183de885d227a 7.4.510 +e64398c78faaf901ada93c61d9fb047b 7.4.511 +28fbdb68b18aed00d9104edffa858d3a 7.4.512 +e16c4c596f630c14236ebf8082d9ac59 7.4.513 +044c8bc2d9e2d591c3c2921ac489028c 7.4.514 +4ace8d0f63f7a60066363a93d6f14df0 7.4.515 +36b659c6945ec5fd4ad70ced8724e29d 7.4.516 +8e839c144d93a08c01d392666f6a8313 7.4.517 +d48182515d3311cc0cd4e1204304d872 7.4.518 +7d0e446a862b02914ef268d427eb555a 7.4.519 +af1813649636c1ebd6a04969bfd193e1 7.4.520 +4664a3875152d85cf8815b6bd30ce896 7.4.521 +f2fe7fcfe3611e88ac7f06ca0c684960 7.4.522 +a99c03edf220a410ee07b0292c0e9438 7.4.523 +c920fd1c2dcbe5110681c0229bb72615 7.4.524 +774e59a013d8f30fb8083e1aa5e0df9d 7.4.525 +5e6ad85332e8affc7c3d133fd5d39360 7.4.526 +3a187715dcd142fc5fd719336589ce5b 7.4.527 +24f9168b9094179c20e988b85a2c425b 7.4.528 +e6bf287f95e99e97fd72756a6b9a3e7e 7.4.529 +e1378057587fbfd7813764cf349d6e5a 7.4.530 +73a4ece87b8b625663439c72098492a6 7.4.531 +479bada0a101dff43d419ee3dad8b191 7.4.532 +907554283ab1cf219451f2d470c22f8f 7.4.533 +a54ccb2731c5e402b9dd9d22b2fa1ba0 7.4.534 +9a6a4d372b613e48bd9ca20f4d364124 7.4.535 +35265a51a1f845003f3d383aaa78a41d 7.4.536 +ad72b439c0818dc96d84485b10ccf6d5 7.4.537 +89145a2afb7445d0fa27b5443915c8fc 7.4.538 +0d45f9ba58015be8db9a1e25194508bb 7.4.539 +a7d002ff318ff7f891fbce0b4b786294 7.4.540 +32ebf9804789d61c25035c7a862916b4 7.4.541 +d1188b1f4432348f72483b739459af74 7.4.542 +67afbf8596dd84916a0798ed29a3b937 7.4.543 +7e4ff82db15a3add5f2181ef2665a2b2 7.4.544 +ede30b6380c40ccea14b0c451b256241 7.4.545 +81eff49206d56d37cede07efa7008fa9 7.4.546 +9ba61b62470671e98b715a8d6e89e373 7.4.547 +908c4b2c4496b5d875129eb4030fa375 7.4.548 +3a5a25c22ea7badebf7155861e11a53d 7.4.549 +f587fdf0a4ab839f4138b02befebe02a 7.4.550 +f436ddf3b7694e020c37406aa67b4e08 7.4.551 +3482d0e10b332fdd04970f948164456a 7.4.552 +317551905db4e0e3d00f86e54a11231f 7.4.553 +e164bb738545f369ba5d55287a351c7f 7.4.554 +05e3fbcc33e9f347ffaadd3a621a062a 7.4.555 +ddc3c2f0cffd60c7ecf243dfad7de3cf 7.4.556 +18565b87a98632d6c4ca128890f00eee 7.4.557 +52b12aa54c331858d1851eba6870c60a 7.4.558 +38021eb692764f0f29b4013eba50b63b 7.4.559 +7c4ae18c1a920a45e91531d43580839f 7.4.560 +2bc2844950bf81f3ba4c8c3a7905d73f 7.4.561 +8c1e9b9ac21d613b47fe3f0cb7176def 7.4.562 +019a4954c89f54aeb60980fdff10dfa0 7.4.563 +27c1d5915117ffe4827bee99854c8173 7.4.564 +e9a7e76005928b8e7b27bec13e17b035 7.4.565 +428a91b82b419f0ae7cb2994f382bb7c 7.4.566 +3486b3ee0ed2a93bf6360707947c629e 7.4.567 +2c9518474b1b4278b1cdd97ab4f77436 7.4.568 +9f9fb6294c49d635a20f03497eba981b 7.4.569 +9d59369e2c677a667418344bff993f0a 7.4.570 +356a45a43dc6286d6409fbac1fd2b062 7.4.571 +f8553e496f32812515d76265fdbe068a 7.4.572 +dca12cba380588b5018b77f6f8282052 7.4.573 +5cbc38e876e2ce454c4bd12d1b5a39f8 7.4.574 +a81aef545baab2be28b873bff1e31409 7.4.575 +1b97ce7bf227e76742c116b545a573ea 7.4.576 +81ca6e7ff95193462ddba556aa5afa82 7.4.577 +f23195ee94d1cd80d172439ff53f57f3 7.4.578 +5f186a95383f83c7160bc9f88fdbf686 7.4.579 +98cefaec8cf710f9ed17e1298a639f78 7.4.580 +e32ed4c6a0362e8d565069bb34fa25ed 7.4.581 +3272170bd50e5227227d7a3b6e1a1b57 7.4.582 +4b030c8a953e1d0adb97f705286bc07f 7.4.583 +c0452918087582f0d249bfc6268b8169 7.4.584 +8e5c87df01042b97778d6c7450dc9d96 7.4.585 +f573f2805a892d1042ef14dca4f6b634 7.4.586 +17370cdbc3c2ff105fb6bd3c3332995d 7.4.587 +ba8be43560bf75b4e761a12887d72220 7.4.588 +a55eb85c0522a008bb10fbff3e043cb3 7.4.589 +bbea4ec0a454758fe62530f865f9d93b 7.4.590 +25feea68c2ff4e00b9d47d8c050af5ee 7.4.591 +f411bd0a168e21bd897ec32edcd12b49 7.4.592 +5eb2abe1bd9dbedec877703e12fc1dbb 7.4.593 +8bacc54ea36e544243146ef5a8ecc196 7.4.594 +ce67848ffe288f2bd038db70f8c223c1 7.4.595 +a138d1af67bbd7dba55b02f98dd3a726 7.4.596 +87a9b58db2be13ce5df779458ba87ced 7.4.597 +033204a15116244c47fb98c1a242c1c2 7.4.598 +194491afdd2586a3ca11b382f3196031 7.4.599 +2ca5df83cab0df86391a7cd11f34066e 7.4.600 +918970048d16fa85cdd56652d3214e6f 7.4.601 +86c3a78648925ff06e4db5cf49ebdb01 7.4.602 +f169643653ce40545d40b1d6b04ebecc 7.4.603 +2b7e24dd5a614aa388dd1fe6b582dbe5 7.4.604 +fe651e4adc8e40699f3ba24482215f95 7.4.605 +94fda19cecd5fe65558a1d202c0120e0 7.4.606 +36af9fef9a14fe24184f33f5fdd718b1 7.4.607 +03fc55c0007fe6aa1adc948a5348bebb 7.4.608 +9a2bc114b4930004f1f6e741dc66e23d 7.4.609 +4efcdd093bd53b79fa4c3d0ac85d0fa9 7.4.610 +a4d25899ecf5d8f75ea99a2c9785477f 7.4.611 +a78454b35b92b6ea257faceb11ba97dd 7.4.612 +517405a8baa6ecdd1eb79427247c3c0e 7.4.613 +bf8b4c7f393e6848e40fb76261e38724 7.4.614 +0c4c459d6debf05eca77da0d052a676a 7.4.615 +8a39ab82bac2b06e5890de03c53a76da 7.4.616 +eef77728c9f947cb4aa433bb30351b40 7.4.617 +065b9b2806bf01bf45f5a5f1b4064a1c 7.4.618 +e5661a5b27d393312f8e92bf113cf75d 7.4.619 +8d58db3208bd101308c9b9ac1075add8 7.4.620 +f8e5fd38631666c3ece59f083a21578e 7.4.621 +7b46a64a84a0b78582f7bd74a2cc986a 7.4.622 607e135c559be642f210094ad023dc65 vim-7.4.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 11 11:32:04 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Feb 2015 10:32:04 +0000 Subject: SF.net SVN: gar:[24640] csw/mgar/pkg/sudo/trunk Message-ID: <3khy2v0tDJz7P@mail.opencsw.org> Revision: 24640 http://sourceforge.net/p/gar/code/24640 Author: dmichelsen Date: 2015-02-11 10:32:04 +0000 (Wed, 11 Feb 2015) Log Message: ----------- sudo/trunk: Update to 1.8.12, adjust overrides, skip obsoleted packages Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2015-02-11 10:14:46 UTC (rev 24639) +++ csw/mgar/pkg/sudo/trunk/Makefile 2015-02-11 10:32:04 UTC (rev 24640) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.11p2 +VERSION = 1.8.12 GARTYPE = v2 EXTRA_MODULATORS = LDAP @@ -30,26 +30,20 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 #PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 -#Use custom map for solaris 10 +# Use custom map for Solaris 10 +LINKER_MAPS-5.10 += -M "$(abspath $(WORKDIR)/map.sudo)" +LINKER_MAPS += $(LINKER_MAPS-$(GAROSREL)) -ifneq ($(shell /usr/bin/uname -r),5.9) - LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.sudo)" -endif - - PACKAGES += CSWsudo SPKG_DESC_CSWsudo = Provides limited super user privileges # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsudo += CSWlibz1 -OBSOLETED_BY_CSWsudo = CSWsudo-common +#OBSOLETED_BY_CSWsudo = CSWsudo-common # These are just docs CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/etc/opt/csw/sudoers.CSW -# This is a private library -CHECKPKG_OVERRIDES_CSWsudo += soname-not-part-of-filename|soname=libsudo_noexec.so|filename=sudo_noexec.so - LDAP_DOCFILES += $(docdir)/sudo/README.LDAP LDAP_DOCFILES += $(docdir)/sudo/schema.ActiveDirectory LDAP_DOCFILES += $(docdir)/sudo/schema.OpenLDAP @@ -68,24 +62,21 @@ RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibz1 # This logical dependency can not be tracked via checkpkg RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWsudo -CHECKPKG_OVERRIDES_CSWsudo-ldap += surplus-dependency|CSWsudo -OBSOLETED_BY_CSWsudo-ldap += CSWsudoldap +#OBSOLETED_BY_CSWsudo-ldap += CSWsudoldap CATALOGNAME_CSWsudoldap = sudo_ldap_stub -#on solaris9 this is still a dep. Should be checked -CHECKPKG_OVERRIDES_CSWsudo-ldap += surplus-dependency|CSWliblber2-4-2 +# This is for /usr/share/lib/zoneinfo +CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/share|root/opt/csw/libexec/sudo/sudoers.so +CHECKPKG_OVERRIDES_CSWsudo-ldap += file-with-bad-content|/usr/share|root/opt/csw/libexec/sudo/sudoers-ldap.so + # This is a private library CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-not-part-of-filename|soname=sudoers.so|filename=sudoers-ldap.so -# This is needed AFAIK due to libtool +# This is needed AFAIK due to libtool and dlopen CHECKPKG_OVERRIDES_CSWsudo += discouraged-path-in-pkgmap|/opt/csw/libexec/sudo/libsudo_util.la -# Looks like these are still needed -CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/sbin/visudo|but|never|used -CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudo/sudoers.so|but|never|used -CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudo/sudo_noexec.so|but|never|used -CHECKPKG_OVERRIDES_CSWsudo += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/bin/sudoreplay|but|never|used -CHECKPKG_OVERRIDES_CSWsudo-ldap += soname-unused|s9_preload.so.1|is|needed|by|/opt/csw/libexec/sudo/sudoers-ldap.so|but|never|used +CHECKPKG_OVERRIDES_CSWsudo += $(CHECKPKG_OVERRIDES_CSWsudo-$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsudo-ldap += $(CHECKPKG_OVERRIDES_CSWsudo-ldap-$(GAROSREL)) LOGPATH = $(localstatedir)/log/sudo VARDIR = $(localstatedir)/sudo @@ -164,10 +155,9 @@ include gar/category.mk -post-install-modulated: +post-install: ginstall -d $(DESTDIR)$(IOLOGPATH) ginstall -d $(DESTDIR)$(TIMEPATH) - ginstall -d $(DESTDIR)$(sysconfdir) - ginstall $(WORKDIR)/sudo.conf.CSW $(DESTDIR)$(sysconfdir) + ginstall -D $(WORKDIR)/sudo.conf.CSW $(DESTDIR)$(sysconfdir)/sudo.conf.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2015-02-11 10:14:46 UTC (rev 24639) +++ csw/mgar/pkg/sudo/trunk/checksums 2015-02-11 10:32:04 UTC (rev 24640) @@ -1 +1 @@ -84012b4871b6c775c957cd310d5bad87 sudo-1.8.11p2.tar.gz +87558f3a55c62bc9244b19594f103ffa sudo-1.8.12.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 11 16:06:34 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Feb 2015 15:06:34 +0000 Subject: SF.net SVN: gar:[24644] csw/mgar/pkg/nginx/trunk Message-ID: <3kj47Q3ztDzKG@mail.opencsw.org> Revision: 24644 http://sourceforge.net/p/gar/code/24644 Author: dmichelsen Date: 2015-02-11 15:06:33 +0000 (Wed, 11 Feb 2015) Log Message: ----------- nginx/trunk: Update to 1.7.9 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2015-02-11 12:12:19 UTC (rev 24643) +++ csw/mgar/pkg/nginx/trunk/Makefile 2015-02-11 15:06:33 UTC (rev 24644) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.7.8 +VERSION = 1.7.9 GARTYPE = v2 DESCRIPTION = HTTP server and mail proxy server Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2015-02-11 12:12:19 UTC (rev 24643) +++ csw/mgar/pkg/nginx/trunk/checksums 2015-02-11 15:06:33 UTC (rev 24644) @@ -1 +1 @@ -fd5ab813fc1853cd8efe580ead577c3e nginx-1.7.8.tar.gz +a4debbe0ce0dd12b9c8f520bc3b66355 nginx-1.7.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Feb 11 17:20:39 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 11 Feb 2015 16:20:39 +0000 Subject: SF.net SVN: gar:[24646] csw/mgar/pkg/libev/trunk/Makefile Message-ID: <3kj5mw4mL8zZT@mail.opencsw.org> Revision: 24646 http://sourceforge.net/p/gar/code/24646 Author: janholzh Date: 2015-02-11 16:20:39 +0000 (Wed, 11 Feb 2015) Log Message: ----------- libev/trunk: no headers in dev package Modified Paths: -------------- csw/mgar/pkg/libev/trunk/Makefile Modified: csw/mgar/pkg/libev/trunk/Makefile =================================================================== --- csw/mgar/pkg/libev/trunk/Makefile 2015-02-11 15:21:18 UTC (rev 24645) +++ csw/mgar/pkg/libev/trunk/Makefile 2015-02-11 16:20:39 UTC (rev 24646) @@ -34,6 +34,7 @@ CATALOGNAME_CSWlibev-dev = libev_dev SPKG_DESC_CSWlibev-dev += $(DESCRIPTION), development files PKGFILES_CSWlibev-dev += /opt/csw/lib/sparcv9/libev.so +PKGFILES_CSWlibev-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibev-dev += CSWlibev4 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Feb 12 16:43:02 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 12 Feb 2015 15:43:02 +0000 Subject: SF.net SVN: gar:[24648] csw/mgar/pkg Message-ID: <3kjhvG2Mt2z1Jn@mail.opencsw.org> Revision: 24648 http://sourceforge.net/p/gar/code/24648 Author: janholzh Date: 2015-02-12 15:43:02 +0000 (Thu, 12 Feb 2015) Log Message: ----------- stud/trunk: add stud Added Paths: ----------- csw/mgar/pkg/stud/ csw/mgar/pkg/stud/Makefile csw/mgar/pkg/stud/branches/ csw/mgar/pkg/stud/tags/ csw/mgar/pkg/stud/trunk/ csw/mgar/pkg/stud/trunk/Makefile csw/mgar/pkg/stud/trunk/checksums csw/mgar/pkg/stud/trunk/files/ csw/mgar/pkg/stud/trunk/files/0001-solaris-fix.patch csw/mgar/pkg/stud/trunk/files/0002-fix-makefile.patch Added: csw/mgar/pkg/stud/Makefile =================================================================== --- csw/mgar/pkg/stud/Makefile (rev 0) +++ csw/mgar/pkg/stud/Makefile 2015-02-12 15:43:02 UTC (rev 24648) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/stud/trunk =================================================================== --- csw/mgar/pkg/stud/trunk 2015-02-12 09:54:02 UTC (rev 24647) +++ csw/mgar/pkg/stud/trunk 2015-02-12 15:43:02 UTC (rev 24648) Property changes on: csw/mgar/pkg/stud/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/stud/trunk/Makefile =================================================================== --- csw/mgar/pkg/stud/trunk/Makefile (rev 0) +++ csw/mgar/pkg/stud/trunk/Makefile 2015-02-12 15:43:02 UTC (rev 24648) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = stud +VERSION = 0.3p53 +GARTYPE = v2 + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://rohara.fedorapeople.org/stud/ +DISTFILES = bumptech-stud-0.3-51-g0b88039.tar.gz +PATCHFILES += 0001-solaris-fix.patch +PATCHFILES += 0002-fix-makefile.patch + +GARCOMPILER = GCC4 + +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_SCRIPTS = +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk + +post-extract: + mv $(WORKDIR)/bumptech-stud-0b88039 $(WORKDIR)/stud-0.3p53 + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/stud/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/stud/trunk/checksums =================================================================== --- csw/mgar/pkg/stud/trunk/checksums (rev 0) +++ csw/mgar/pkg/stud/trunk/checksums 2015-02-12 15:43:02 UTC (rev 24648) @@ -0,0 +1 @@ +b06f9ae3d6a36d60b11c876189124eba bumptech-stud-0.3-51-g0b88039.tar.gz Added: csw/mgar/pkg/stud/trunk/files/0001-solaris-fix.patch =================================================================== --- csw/mgar/pkg/stud/trunk/files/0001-solaris-fix.patch (rev 0) +++ csw/mgar/pkg/stud/trunk/files/0001-solaris-fix.patch 2015-02-12 15:43:02 UTC (rev 24648) @@ -0,0 +1,159 @@ +From a364c6cbb2a7462867f8de50be39f33bdd0dc2a8 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Thu, 12 Feb 2015 16:21:02 +0100 +Subject: [PATCH] solaris-fix + +--- + Makefile | 20 +++++++++++++++----- + configuration.c | 13 +++++++++++++ + stud.c | 30 +++++++++++++++--------------- + 3 files changed, 43 insertions(+), 20 deletions(-) + +diff --git a/Makefile b/Makefile +index eba3e9c..75e6402 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,15 +2,25 @@ + # + # USE_SHARED_CACHE : enable/disable a shared session cache (disabled by default) + +-DESTDIR = +-PREFIX = /usr/local ++DESTDIR?= ++PREFIX = /opt/csw + BINDIR = $(PREFIX)/bin +-MANDIR = $(PREFIX)/share/man ++MANDIR = $(PREFIX)/$(PKGMANDIR) + +-CFLAGS = -O2 -g -std=c99 -fno-strict-aliasing -Wall -W -D_GNU_SOURCE -I/usr/local/include +-LDFLAGS = -lssl -lcrypto -lev -L/usr/local/lib ++CFLAGS += -O2 -g -std=c99 -fno-strict-aliasing -Wall -W -D_GNU_SOURCE -I$(PREFIX)/include ++LDFLAGS+= -lssl -lcrypto -lev -L$(PREFIX)/lib + OBJS = stud.o ringbuffer.o configuration.o + ++UNAME := $(shell uname) ++ ++ifeq ($(UNAME),SunOS) ++ # need __EXTENSIONS__ to get signal handling and getopt ++ CFLAGS += -D__EXTENSIONS__ ++ LDFLAGS += -lnsl -lsocket ++else ++ CFLAGS += -DUSE_KEEPIDLE ++endif ++ + all: realall + + # Shared cache feature +diff --git a/configuration.c b/configuration.c +index 0e3fd4c..9b5b103 100644 +--- a/configuration.c ++++ b/configuration.c +@@ -637,13 +637,19 @@ void config_param_validate (char *k, char *v, stud_config *cfg, char *file, int + else if (strcmp(k, CFG_SYSLOG_FACILITY) == 0) { + r = 1; + if (!strcmp(v, "auth") || !strcmp(v, "authpriv")) ++#ifdef LOG_AUTHPRIV + cfg->SYSLOG_FACILITY = LOG_AUTHPRIV; ++#else ++ cfg->SYSLOG_FACILITY = LOG_AUTH; ++#endif + else if (!strcmp(v, "cron")) + cfg->SYSLOG_FACILITY = LOG_CRON; + else if (!strcmp(v, "daemon")) + cfg->SYSLOG_FACILITY = LOG_DAEMON; ++#ifdef LOG_FTP + else if (!strcmp(v, "ftp")) + cfg->SYSLOG_FACILITY = LOG_FTP; ++#endif + else if (!strcmp(v, "local0")) + cfg->SYSLOG_FACILITY = LOG_LOCAL0; + else if (!strcmp(v, "local1")) +@@ -813,14 +819,21 @@ char * config_disp_hostport (char *host, char *port) { + const char * config_disp_log_facility (int facility) { + switch (facility) + { ++#ifdef LOG_AUTHPRIV + case LOG_AUTHPRIV: + return "authpriv"; ++#else ++ case LOG_AUTH: ++ return "auth"; ++#endif + case LOG_CRON: + return "cron"; + case LOG_DAEMON: + return "daemon"; ++#ifdef LOG_FTP + case LOG_FTP: + return "ftp"; ++#endif + case LOG_LOCAL0: + return "local0"; + case LOG_LOCAL1: +diff --git a/stud.c b/stud.c +index 1e83617..8c7fd08 100644 +--- a/stud.c ++++ b/stud.c +@@ -189,9 +189,17 @@ typedef struct proxystate { + + /* Set a file descriptor (socket) to non-blocking mode */ + static void setnonblocking(int fd) { +- int flag = 1; +- +- assert(ioctl(fd, FIONBIO, &flag) == 0); ++ int flag; ++#if defined(O_NONBLOCK) ++ /* O_NONBLOCK is more portable and POSIX-standard */ ++ flag = O_NONBLOCK; ++ assert (fcntl(fd, F_SETFL, flag) == 0); ++#elif defined(FIONBIO) ++ flag = 1; ++ assert (ioctl(fd, FIONBIO, &flag) == 0); ++#else ++# error O_NONBLOCK and FIONBIO are both undefined for this platform ++#endif + } + + /* set a tcp socket to use TCP Keepalive */ +@@ -203,9 +211,9 @@ static void settcpkeepalive(int fd) { + ERR("Error activating SO_KEEPALIVE on client socket: %s", strerror(errno)); + } + ++#ifdef TCP_KEEPIDLE + optval = CONFIG->TCP_KEEPALIVE_TIME; + optlen = sizeof(optval); +-#ifdef TCP_KEEPIDLE + if(setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) { + ERR("Error setting TCP_KEEPIDLE on client socket: %s", strerror(errno)); + } +@@ -1751,24 +1759,16 @@ void daemonize () { + exit(0); + } + +- /* close standard streams */ +- fclose(stdin); +- fclose(stdout); +- fclose(stderr); +- + /* reopen standard streams to null device */ +- stdin = fopen(NULL_DEV, "r"); +- if (stdin == NULL) { ++ if (freopen(NULL_DEV, "r", stdin) == NULL) { + ERR("Unable to reopen stdin to %s: %s\n", NULL_DEV, strerror(errno)); + exit(1); + } +- stdout = fopen(NULL_DEV, "w"); +- if (stdout == NULL) { ++ if (freopen(NULL_DEV, "w", stdout) == NULL) { + ERR("Unable to reopen stdout to %s: %s\n", NULL_DEV, strerror(errno)); + exit(1); + } +- stderr = fopen(NULL_DEV, "w"); +- if (stderr == NULL) { ++ if (freopen(NULL_DEV, "w", stderr) == NULL) { + ERR("Unable to reopen stderr to %s: %s\n", NULL_DEV, strerror(errno)); + exit(1); + } +-- +2.2.1 + Added: csw/mgar/pkg/stud/trunk/files/0002-fix-makefile.patch =================================================================== --- csw/mgar/pkg/stud/trunk/files/0002-fix-makefile.patch (rev 0) +++ csw/mgar/pkg/stud/trunk/files/0002-fix-makefile.patch 2015-02-12 15:43:02 UTC (rev 24648) @@ -0,0 +1,31 @@ +From 1b32d9bec0d1851f5d5e9c57123f309ba43ed6ed Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Thu, 12 Feb 2015 16:31:56 +0100 +Subject: [PATCH] fix-makefile + +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 7b2c322..dc599a1 100644 +--- a/Makefile ++++ b/Makefile +@@ -50,10 +50,10 @@ stud: $(OBJS) + $(CC) -o $@ $^ $(LDFLAGS) + + install: $(ALL) +- install -d $(DESTDIR)$(BINDIR) +- install stud $(DESTDIR)$(BINDIR) +- install -d $(DESTDIR)$(MANDIR)/man8 +- install -m 644 stud.8 $(DESTDIR)$(MANDIR)/man8 ++ ginstall -d $(DESTDIR)$(BINDIR) ++ ginstall stud $(DESTDIR)$(BINDIR) ++ ginstall -d $(DESTDIR)$(MANDIR)/man8 ++ ginstall -m 644 stud.8 $(DESTDIR)$(MANDIR)/man8 + + clean: + rm -f stud $(OBJS) +-- +2.2.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 Tue Feb 17 13:40:38 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Feb 2015 12:40:38 +0000 Subject: SF.net SVN: gar:[24655] csw/mgar/pkg Message-ID: <3kmhcW6LfMzYP@mail.opencsw.org> Revision: 24655 http://sourceforge.net/p/gar/code/24655 Author: dmichelsen Date: 2015-02-17 12:40:38 +0000 (Tue, 17 Feb 2015) Log Message: ----------- nagios-plugin-check_mk/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/nagios-plugin-check_mk/ csw/mgar/pkg/nagios-plugin-check_mk/Makefile csw/mgar/pkg/nagios-plugin-check_mk/branches/ csw/mgar/pkg/nagios-plugin-check_mk/tags/ csw/mgar/pkg/nagios-plugin-check_mk/trunk/ csw/mgar/pkg/nagios-plugin-check_mk/trunk/Makefile csw/mgar/pkg/nagios-plugin-check_mk/trunk/checksums csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/ csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Solaris-header-fixes.patch Added: csw/mgar/pkg/nagios-plugin-check_mk/Makefile =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/Makefile (rev 0) +++ csw/mgar/pkg/nagios-plugin-check_mk/Makefile 2015-02-17 12:40:38 UTC (rev 24655) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/nagios-plugin-check_mk/trunk =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk 2015-02-17 12:28:35 UTC (rev 24654) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk 2015-02-17 12:40:38 UTC (rev 24655) Property changes on: csw/mgar/pkg/nagios-plugin-check_mk/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/nagios-plugin-check_mk/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/Makefile 2015-02-17 12:40:38 UTC (rev 24655) @@ -0,0 +1,73 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = check_mk +#VERSION = 1.2.0p3 +VERSION = 1.2.1i3 +GARTYPE = v2 + +DESCRIPTION = A new general purpose Nagios-plugin for retrieving data + +MASTER_SITES = http://mathias-kettner.de/download/ +DISTFILES += $(DISTNAME).tar.gz + +PATCHFILES += 0001-Solaris-header-fixes.patch + +VENDOR_URL = http://mathias-kettner.de/check_mk.html + +PACKAGES += CSWnagios-plugin-mk-livestatus +SPKG_DESC_CSWnagios-plugin-mk-livestatus = A new general purpose Nagios-plugin for retrieving data +# PKGFILES is catchall + +# ~/.check_mk_setup.conf + +# VARNAME=$1 +# DEF_ROOT=$2 +# DEF_USER=$3 +# DEF_OMD=$4 +# SHORT=$5 +# DESCR=$6 + +# ask_dir bindir /usr/bin $HOMEBASEDIR/bin $OMD_ROOT/local/bin "Executable programs" \ +# ask_dir confdir /etc/$NAME $HOMEBASEDIR $OMD_ROOT/etc/check_mk "Check_MK configuration" \ +# ask_dir sharedir /usr/share/$NAME $HOMEBASEDIR $OMD_ROOT/local/share/check_mk "Check_MK software" \ +# ask_dir docdir /usr/share/doc/$NAME $HOMEBASEDIR/doc $OMD_ROOT/local/share/check_mk/doc "documentation" \ +# ask_dir checkmandir /usr/share/doc/$NAME/checks $HOMEBASEDIR/doc/checks $OMD_ROOT/local/share/check_mk/checkman "check manuals" \ +# ask_dir vardir /var/lib/$NAME $HOMEBASEDIR/var $OMD_ROOT/var/check_mk "working directory of check_mk" \ +# ask_dir agentslibdir /usr/lib/check_mk_agent $HOMEBASEDIR/check_mk_agent /usr/lib/check_mk_agent "extensions for agents" \ +# ask_dir agentsconfdir /etc/check_mk $HOMEBASEDIR /etc/check_mk "configuration dir for agents" \ +# ask_dir -d nagiosuser nagios $(id -un) "$OMD_SITE" "Name of Nagios user" \ +# ask_dir -d wwwuser www-data www-data "$OMD_SITE" "User of Apache process" \ +# ask_dir -d wwwgroup nagios $(id -un) "$OMD_SITE" "Common group of Nagios+Apache" \ +# ask_dir nagios_binary /usr/sbin/nagios $HOMEBASEDIR/nagios/bin/nagios $OMD_ROOT/bin/nagios "Nagios binary" \ +# ask_dir nagios_config_file /etc/nagios/nagios.cfg $HOMEBASEDIR/nagios/etc/nagios.cfg $OMD_ROOT/tmp/nagios/nagios.cfg "Nagios main configuration file" \ +# ask_dir nagconfdir /etc/nagios/objects $HOMEBASEDIR/nagios/etc $OMD_ROOT/etc/nagios/conf.d "Nagios object directory" \ +# ask_dir nagios_startscript /etc/init.d/nagios /etc/init.d/nagios $OMD_ROOT/etc/init.d/nagios "Nagios startskript" \ +# ask_dir nagpipe /var/log/nagios/rw/nagios.cmd $HOMEBASEDIR/var/nagios/rw/nagios.cmd $OMD_ROOT/tmp/run/nagios.cmd "Nagios command pipe" \ +# ask_dir check_result_path /usr/local/nagios/var/spool/checkresults $HOMEBASEDIR/var/nagios/checkresults $OMD_ROOT/tmp/nagios/checkresults "Check results directory" \ +# ask_dir nagios_status_file /var/log/nagios/status.dat /var/log/nagios/status.dat $OMD_ROOT/tmp/nagios/status.dat "Nagios status file" \ +# ask_dir check_icmp_path /usr/lib/nagios/plugins/check_icmp $HOMEBASEDIR/libexec/check_icmp $OMD_ROOT/lib/nagios/plugins/check_icmp "Path to check_icmp" \ +# ask_dir -d url_prefix / / /$OMD_SITE/ "URL Prefix for Web addons" \ +# ask_dir apache_config_dir /etc/apache2/conf.d /etc/apache2/conf.d $OMD_ROOT/etc/apache/conf.d "Apache config dir" \ +# ask_dir htpasswd_file /etc/nagios/htpasswd.users $HOMEBASEDIR/etc/htpasswd.users $OMD_ROOT/etc/htpasswd "HTTP authentication file" \ +# ask_dir -d nagios_auth_name "Nagios Access" "Nagios Access" "OMD Monitoring Site $OMD_SITE" "HTTP AuthName" \ +# ask_dir pnptemplates /usr/share/$NAME/pnp-templates $HOMEBASEDIR/pnp-templates $OMD_ROOT/local/share/check_mk/pnp-templates "PNP4Nagios templates" \ +# ask_dir -d enable_livestatus yes yes yes "compile livestatus module" \ +# ask_dir libdir /usr/lib/$NAME $HOMEBASEDIR/lib $OMD_ROOT/local/lib/mk-livestatus "check_mk's binary modules" \ +# ask_dir livesock ${nagpipe%/*}/live ${nagpipe%/*}/live $OMD_ROOT/tmp/run/live "Unix socket for Livestatus" \ +# ask_dir livebackendsdir /usr/share/$NAME/livestatus $HOMEBASEDIR/livestatus $OMD_ROOT/local/share/mk-livestatus "Backends for other systems" \ + +GARCOMPILER = GCC4 + +EXTRA_LDFLAGS += -lsocket -lnsl + +# The issued command "which diet" is on Solaris /usr/bin/diet which always returns 0 and therefore always enable diet mode +REINPLACE_MATCH = .*diet.* +REINPLACE_WITH = if false; then +REINPLACE_FILES += configure + +include gar/category.mk + +post-extract-modulated: + -cd $(WORKSRC) && gtar zxvf livestatus.tar.gz + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/nagios-plugin-check_mk/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/nagios-plugin-check_mk/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/checksums (rev 0) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/checksums 2015-02-17 12:40:38 UTC (rev 24655) @@ -0,0 +1 @@ +45713ac5bf81e750e115bf36d9732eec check_mk-1.2.1i3.tar.gz Added: csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Solaris-header-fixes.patch =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Solaris-header-fixes.patch (rev 0) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Solaris-header-fixes.patch 2015-02-17 12:40:38 UTC (rev 24655) @@ -0,0 +1,44 @@ +From 61afd99627dbf87c98ac3df4cbd336ed01642e92 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 6 Dec 2012 16:06:56 +0100 +Subject: [PATCH] Solaris header fixes + +--- + src/check_icmp.c | 4 ++-- + src/livecheck.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/check_icmp.c b/src/check_icmp.c +index bb53fef..353cec5 100644 +--- a/src/check_icmp.c ++++ b/src/check_icmp.c +@@ -65,11 +65,11 @@ typedef unsigned short u_short; + #include + #include + #include +-#include "/usr/include/netinet/ip_icmp.h" +-// #include ++// #include "/usr/include/netinet/ip_icmp.h" + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/livecheck.c b/src/livecheck.c +index 019613a..dae61cd 100644 +--- a/src/livecheck.c ++++ b/src/livecheck.c +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +-- +1.8.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 Wed Feb 18 13:47:52 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Feb 2015 12:47:52 +0000 Subject: SF.net SVN: gar:[24658] csw/mgar/pkg/lsof/trunk Message-ID: <3knJkK1ZDNzsr@mail.opencsw.org> Revision: 24658 http://sourceforge.net/p/gar/code/24658 Author: dmichelsen Date: 2015-02-18 12:47:51 +0000 (Wed, 18 Feb 2015) Log Message: ----------- lsof/trunk: Update to 4.88, cleanup install, use more recent compiler Modified Paths: -------------- csw/mgar/pkg/lsof/trunk/Makefile csw/mgar/pkg/lsof/trunk/checksums Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2015-02-18 12:47:39 UTC (rev 24657) +++ csw/mgar/pkg/lsof/trunk/Makefile 2015-02-18 12:47:51 UTC (rev 24658) @@ -1,7 +1,7 @@ # TBD: NAME = lsof -VERSION = 4.87 +VERSION = 4.88 GARTYPE = v2 DESCRIPTION = List open files @@ -44,6 +44,11 @@ BUILD64-i386-5.11 = 1 BUILD64 = $(BUILD64-$(GARCH)-$(GAROSREL)) +GARCOMPILER-5.9 = SOS12 +GARCOMPILER-5.10 = SOS12U3 +GARCOMPILER-5.11 = SOS12U3 +GARCOMPILER = $(GARCOMPILER-$(GAROSREL)) + EXTRA_BUILD_ISAS = sparcv8plus ISAEXEC = 1 @@ -128,10 +133,6 @@ install-custom: @echo " ==> Installing $(NAME) $(VERSION) for $(MODULATION)" - echo DESTDIR: $(DESTDIR) - @( cd $(WORKSRC) ; \ - ginstall -d $(DESTDIR)$(bindir) ; \ - ginstall -m 755 lsof $(DESTDIR)$(bindir) ; \ - ginstall -d $(DESTDIR)$(mandir)/man8 ; \ - ginstall -m 444 lsof.8 $(DESTDIR)$(mandir)/man8 ) + ginstall -D -m 755 $(WORKSRC)/lsof $(DESTDIR)$(bindir)/lsof + ginstall -D -m 444 $(WORKSRC)/lsof.8 $(DESTDIR)$(mandir)/man8/lsof.8 @$(MAKECOOKIE) Modified: csw/mgar/pkg/lsof/trunk/checksums =================================================================== --- csw/mgar/pkg/lsof/trunk/checksums 2015-02-18 12:47:39 UTC (rev 24657) +++ csw/mgar/pkg/lsof/trunk/checksums 2015-02-18 12:47:51 UTC (rev 24658) @@ -1 +1 @@ -80e2a76d0e05826db910ec88e631296c lsof_4.87.tar.bz2 +1b29c10db4aa88afcaeeaabeef6790db lsof_4.88.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 Wed Feb 18 18:30:56 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 18 Feb 2015 17:30:56 +0000 Subject: SF.net SVN: gar:[24660] csw/mgar/pkg/gnupg2/trunk Message-ID: <3knR0n41jdz16k@mail.opencsw.org> Revision: 24660 http://sourceforge.net/p/gar/code/24660 Author: lblume Date: 2015-02-18 17:30:55 +0000 (Wed, 18 Feb 2015) Log Message: ----------- gnupg2/trunk: Bump to 2.0.27 Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile csw/mgar/pkg/gnupg2/trunk/checksums Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2015-02-18 14:11:38 UTC (rev 24659) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2015-02-18 17:30:55 UTC (rev 24660) @@ -3,7 +3,7 @@ # $Id$ NAME = gnupg -VERSION = 2.0.26 +VERSION = 2.0.27 GARTYPE = v2 DESCRIPTION = GnuPG is a complete and free replacement for PGP Modified: csw/mgar/pkg/gnupg2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg2/trunk/checksums 2015-02-18 14:11:38 UTC (rev 24659) +++ csw/mgar/pkg/gnupg2/trunk/checksums 2015-02-18 17:30:55 UTC (rev 24660) @@ -1 +1 @@ -fa7e704aad33eb114d1840164455aec1 gnupg-2.0.26.tar.bz2 +b35df68881a5ae432b0391b73773c698 gnupg-2.0.27.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 Thu Feb 19 10:55:04 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Feb 2015 09:55:04 +0000 Subject: SF.net SVN: opencsw:[680] buildfarm/bin/cleanup-experimental Message-ID: <3knrrL15Zgz1Y7@mail.opencsw.org> Revision: 680 http://sourceforge.net/p/opencsw/code/680 Author: dmichelsen Date: 2015-02-19 09:55:04 +0000 (Thu, 19 Feb 2015) Log Message: ----------- cleanup-experimental: Do not remove files when there is a .nocleanup in the project directory Modified Paths: -------------- buildfarm/bin/cleanup-experimental Modified: buildfarm/bin/cleanup-experimental =================================================================== --- buildfarm/bin/cleanup-experimental 2014-10-31 12:30:45 UTC (rev 679) +++ buildfarm/bin/cleanup-experimental 2015-02-19 09:55:04 UTC (rev 680) @@ -41,31 +41,36 @@ } closedir D; - opendir D, $experimentaldir; -my @projects = grep { !/^\.\.?$/ } readdir D; +my @projects = grep { !/^\.zfs$/ && !/^\.\.?$/ } readdir D; closedir D; +# If there is /.nocleanup then do nothing here - someone may use this to build catalogs for downgraded packages + at projects = grep { ! -e "${experimentaldir}/$_/.nocleanup" } @projects; + foreach my $p (sort @projects) { + my $deleted_something = 0; opendir D, "$experimentaldir/$p"; my @files = grep { !/^\.\.?$/ } readdir D; closedir D; + my @keep; # These are the remaining files after deletion foreach my $f (sort @files) { - # Ignore artifact from submitpkg - next if( $f eq "newpkgs.mail" ); - # Check for package files with identical names if( exists $allpkgfiles{$f} ) { system( "cmp -s $experimentaldir/$p/$f $allpkgsdir/$f" ); if( $? >> 8 == 0 ) { print "Deleting released pkg $p/$f\n"; unlink( "$experimentaldir/$p/$f" ); + $deleted_something = 1; + next; } else { # Contents is different. print STDERR " Contents differs: $p/$f\n"; print "Deleting anyway $p/$f\n"; unlink( "$experimentaldir/$p/$f" ); + $deleted_something = 1; + next; } } @@ -73,6 +78,7 @@ my ($name, $rev) = ($f =~ /^([^-]+).*,REV=(\d\d\d\d\.\d\d\.\d\d)/); if( !defined $rev ) { print STDERR " No REV in pkgname: $p/$f\n"; + push @keep, $f; next; } if( exists $latestpkgrev{$name} ) { @@ -81,9 +87,17 @@ print STDERR " Released: $latestpkgname{$name}\n"; print "Deleting anyway $p/$f\n"; unlink( "$experimentaldir/$p/$f" ); + $deleted_something = 1; + next; } } + push @keep, $f; } + + # If we deleted all files from the directory, then also delete the directory itself + if( $deleted_something && @keep == 0 ) { + rmdir "$experimentaldir/$p"; + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 19 11:07:52 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Feb 2015 10:07:52 +0000 Subject: SF.net SVN: gar:[24662] csw/mgar/pkg/lang-python/pyelftools/trunk Message-ID: <3kns750jR5z3Z@mail.opencsw.org> Revision: 24662 http://sourceforge.net/p/gar/code/24662 Author: dmichelsen Date: 2015-02-19 10:07:52 +0000 (Thu, 19 Feb 2015) Log Message: ----------- lang-python/pyelftools/trunk: Downgrade again to 0.22 as checkpkg is not 2.7-capable Modified Paths: -------------- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile csw/mgar/pkg/lang-python/pyelftools/trunk/checksums Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2015-02-19 08:50:11 UTC (rev 24661) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2015-02-19 10:07:52 UTC (rev 24662) @@ -2,7 +2,8 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = pyelftools -VERSION = 0.23 +# In 0.23 minimal Python support is raised to 2.7, stick at 0.22 until checkpkg is updated to use 2.7 +VERSION = 0.22 GARTYPE = v2 DESCRIPTION = Library for analyzing ELF files and DWARF debugging information Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/checksums 2015-02-19 08:50:11 UTC (rev 24661) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/checksums 2015-02-19 10:07:52 UTC (rev 24662) @@ -1 +1 @@ -aa7cefa8bd2f63d7b017440c9084f310 pyelftools-0.23.tar.gz +e01fe8bb455b472ebe26ab9ccff26fcf pyelftools-0.22.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 Thu Feb 19 11:29:11 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Feb 2015 10:29:11 +0000 Subject: SF.net SVN: gar:[24664] csw/mgar/pkg/nagios-plugin-check_mk/trunk Message-ID: <3knsbt376tz6T@mail.opencsw.org> Revision: 24664 http://sourceforge.net/p/gar/code/24664 Author: dmichelsen Date: 2015-02-19 10:29:11 +0000 (Thu, 19 Feb 2015) Log Message: ----------- nagios-plugin-check_mk/trunk: Complete rework, first working version Modified Paths: -------------- csw/mgar/pkg/nagios-plugin-check_mk/trunk/Makefile csw/mgar/pkg/nagios-plugin-check_mk/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Allow-setting-SETUPCONF-externally.patch csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Do-not-chown-during-package-building.patch csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Honour-SETUPCONF-even-when-DESTDIR-is-set.patch csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/check_mk_setup.conf Removed Paths: ------------- csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Solaris-header-fixes.patch Modified: csw/mgar/pkg/nagios-plugin-check_mk/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/Makefile 2015-02-19 10:25:33 UTC (rev 24663) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/Makefile 2015-02-19 10:29:11 UTC (rev 24664) @@ -2,72 +2,57 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = check_mk -#VERSION = 1.2.0p3 -VERSION = 1.2.1i3 +VERSION = 1.2.4p5 GARTYPE = v2 DESCRIPTION = A new general purpose Nagios-plugin for retrieving data MASTER_SITES = http://mathias-kettner.de/download/ DISTFILES += $(DISTNAME).tar.gz +DISTFILES += check_mk_setup.conf -PATCHFILES += 0001-Solaris-header-fixes.patch +PATCHFILES += 0001-Do-not-chown-during-package-building.patch +PATCHFILES += 0001-Allow-setting-SETUPCONF-externally.patch +PATCHFILES += 0001-Honour-SETUPCONF-even-when-DESTDIR-is-set.patch VENDOR_URL = http://mathias-kettner.de/check_mk.html -PACKAGES += CSWnagios-plugin-mk-livestatus -SPKG_DESC_CSWnagios-plugin-mk-livestatus = A new general purpose Nagios-plugin for retrieving data +PACKAGES += CSWnagios-plugin-checkmk +SPKG_DESC_CSWnagios-plugin-checkmk = A new general purpose Nagios-plugin for retrieving data # PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWnagios-plugin-checkmk += CSWapache2 +RUNTIME_DEP_PKGS_CSWnagios-plugin-checkmk += CSWperl -# ~/.check_mk_setup.conf +# This is a comment +CHECKPKG_OVERRIDES_CSWnagios-plugin-checkmk += file-with-bad-content|/usr/share|root/etc/opt/csw/check_mk/multisite.mk.CSW -# VARNAME=$1 -# DEF_ROOT=$2 -# DEF_USER=$3 -# DEF_OMD=$4 -# SHORT=$5 -# DESCR=$6 - -# ask_dir bindir /usr/bin $HOMEBASEDIR/bin $OMD_ROOT/local/bin "Executable programs" \ -# ask_dir confdir /etc/$NAME $HOMEBASEDIR $OMD_ROOT/etc/check_mk "Check_MK configuration" \ -# ask_dir sharedir /usr/share/$NAME $HOMEBASEDIR $OMD_ROOT/local/share/check_mk "Check_MK software" \ -# ask_dir docdir /usr/share/doc/$NAME $HOMEBASEDIR/doc $OMD_ROOT/local/share/check_mk/doc "documentation" \ -# ask_dir checkmandir /usr/share/doc/$NAME/checks $HOMEBASEDIR/doc/checks $OMD_ROOT/local/share/check_mk/checkman "check manuals" \ -# ask_dir vardir /var/lib/$NAME $HOMEBASEDIR/var $OMD_ROOT/var/check_mk "working directory of check_mk" \ -# ask_dir agentslibdir /usr/lib/check_mk_agent $HOMEBASEDIR/check_mk_agent /usr/lib/check_mk_agent "extensions for agents" \ -# ask_dir agentsconfdir /etc/check_mk $HOMEBASEDIR /etc/check_mk "configuration dir for agents" \ -# ask_dir -d nagiosuser nagios $(id -un) "$OMD_SITE" "Name of Nagios user" \ -# ask_dir -d wwwuser www-data www-data "$OMD_SITE" "User of Apache process" \ -# ask_dir -d wwwgroup nagios $(id -un) "$OMD_SITE" "Common group of Nagios+Apache" \ -# ask_dir nagios_binary /usr/sbin/nagios $HOMEBASEDIR/nagios/bin/nagios $OMD_ROOT/bin/nagios "Nagios binary" \ -# ask_dir nagios_config_file /etc/nagios/nagios.cfg $HOMEBASEDIR/nagios/etc/nagios.cfg $OMD_ROOT/tmp/nagios/nagios.cfg "Nagios main configuration file" \ -# ask_dir nagconfdir /etc/nagios/objects $HOMEBASEDIR/nagios/etc $OMD_ROOT/etc/nagios/conf.d "Nagios object directory" \ -# ask_dir nagios_startscript /etc/init.d/nagios /etc/init.d/nagios $OMD_ROOT/etc/init.d/nagios "Nagios startskript" \ -# ask_dir nagpipe /var/log/nagios/rw/nagios.cmd $HOMEBASEDIR/var/nagios/rw/nagios.cmd $OMD_ROOT/tmp/run/nagios.cmd "Nagios command pipe" \ -# ask_dir check_result_path /usr/local/nagios/var/spool/checkresults $HOMEBASEDIR/var/nagios/checkresults $OMD_ROOT/tmp/nagios/checkresults "Check results directory" \ -# ask_dir nagios_status_file /var/log/nagios/status.dat /var/log/nagios/status.dat $OMD_ROOT/tmp/nagios/status.dat "Nagios status file" \ -# ask_dir check_icmp_path /usr/lib/nagios/plugins/check_icmp $HOMEBASEDIR/libexec/check_icmp $OMD_ROOT/lib/nagios/plugins/check_icmp "Path to check_icmp" \ -# ask_dir -d url_prefix / / /$OMD_SITE/ "URL Prefix for Web addons" \ -# ask_dir apache_config_dir /etc/apache2/conf.d /etc/apache2/conf.d $OMD_ROOT/etc/apache/conf.d "Apache config dir" \ -# ask_dir htpasswd_file /etc/nagios/htpasswd.users $HOMEBASEDIR/etc/htpasswd.users $OMD_ROOT/etc/htpasswd "HTTP authentication file" \ -# ask_dir -d nagios_auth_name "Nagios Access" "Nagios Access" "OMD Monitoring Site $OMD_SITE" "HTTP AuthName" \ -# ask_dir pnptemplates /usr/share/$NAME/pnp-templates $HOMEBASEDIR/pnp-templates $OMD_ROOT/local/share/check_mk/pnp-templates "PNP4Nagios templates" \ -# ask_dir -d enable_livestatus yes yes yes "compile livestatus module" \ -# ask_dir libdir /usr/lib/$NAME $HOMEBASEDIR/lib $OMD_ROOT/local/lib/mk-livestatus "check_mk's binary modules" \ -# ask_dir livesock ${nagpipe%/*}/live ${nagpipe%/*}/live $OMD_ROOT/tmp/run/live "Unix socket for Livestatus" \ -# ask_dir livebackendsdir /usr/share/$NAME/livestatus $HOMEBASEDIR/livestatus $OMD_ROOT/local/share/mk-livestatus "Backends for other systems" \ - GARCOMPILER = GCC4 -EXTRA_LDFLAGS += -lsocket -lnsl +# The configure/build/install phase is combined in setup.sh +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom -# The issued command "which diet" is on Solaris /usr/bin/diet which always returns 0 and therefore always enable diet mode -REINPLACE_MATCH = .*diet.* -REINPLACE_WITH = if false; then -REINPLACE_FILES += configure +PRESERVECONF += $(sysconfdir)/check_mk/main.mk +PRESERVECONF += $(sysconfdir)/check_mk/multisite.mk include gar/category.mk -post-extract-modulated: - -cd $(WORKSRC) && gtar zxvf livestatus.tar.gz +#post-extract: +# -cd $(WORKSRC) && gtar zxvf livestatus.tar.gz +# @$(MAKECOOKIE) + +install-custom: + cd $(WORKSRC) && DESTDIR=$(DESTDIR) PATH=/opt/csw/gnu:/usr/xpg4/bin:$(PATH) SETUPCONF=$(abspath $(WORKDIR)/check_mk_setup.conf) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LD_OPTIONS="$(LD_OPTIONS)" CC="$(CC)" ./setup.sh + @# This crashes the python code around elfdump + rm -f $(DESTDIR)/opt/csw/libexec/check_mk/livestatus.o + @# WTF? Mixed binaries just deployed?!? + @# CHECKPKG_OVERRIDES_CSWnagios-plugin-mk-livestatus += binary-architecture-does-not-match-placement|file=opt/csw/share/doc/check_mk/treasures/modbus/agent_modbus|arch_id=62|arch_name=amd64 + @# CHECKPKG_OVERRIDES_CSWnagios-plugin-mk-livestatus += binary-architecture-does-not-match-placement|file=opt/csw/share/check_mk/agents/waitmax|arch_id=3|arch_name=i386 + rm -f $(DESTDIR)/opt/csw/share/doc/check_mk/treasures/modbus/agent_modbus + rm -f $(DESTDIR)/opt/csw/share/check_mk/agents/waitmax + @# This is also present as multisite.mk, delete the versioned one as we use PRESERVECONF anyway + rm -f $(DESTDIR)/etc/opt/csw/check_mk/multisite.mk-$(VERSION) + rm -f $(DESTDIR)/etc/opt/csw/check_mk/main.mk-$(VERSION) @$(MAKECOOKIE) Modified: csw/mgar/pkg/nagios-plugin-check_mk/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/checksums 2015-02-19 10:25:33 UTC (rev 24663) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/checksums 2015-02-19 10:29:11 UTC (rev 24664) @@ -1 +1 @@ -45713ac5bf81e750e115bf36d9732eec check_mk-1.2.1i3.tar.gz +ef3055d191bd38295d1716b3f7824115 check_mk-1.2.4p5.tar.gz Added: csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Allow-setting-SETUPCONF-externally.patch =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Allow-setting-SETUPCONF-externally.patch (rev 0) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Allow-setting-SETUPCONF-externally.patch 2015-02-19 10:29:11 UTC (rev 24664) @@ -0,0 +1,24 @@ +From 436df63038d14f85986c8464743a41b97d9d52f0 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 18 Feb 2015 15:55:45 +0100 +Subject: [PATCH] Allow setting SETUPCONF externally + +--- + setup.sh | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.sh b/setup.sh +index 288be33..7e576b3 100755 +--- a/setup.sh ++++ b/setup.sh +@@ -28,7 +28,6 @@ VERSION=1.2.4p5 + NAME=check_mk + LANG= + LC_ALL= +-SETUPCONF=~/.check_mk_setup.conf + + # Find path to ourselves + SRCDIR=${0%/*} +-- +2.2.1 + Added: csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Do-not-chown-during-package-building.patch =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Do-not-chown-during-package-building.patch (rev 0) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Do-not-chown-during-package-building.patch 2015-02-19 10:29:11 UTC (rev 24664) @@ -0,0 +1,34 @@ +From bbf70e55a25bb4aa32f51bb22d2c0e8fbd0a39ce Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 18 Feb 2015 15:15:28 +0100 +Subject: [PATCH] Do not chown during package building + +--- + setup.sh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/setup.sh b/setup.sh +index 201511b..288be33 100755 +--- a/setup.sh ++++ b/setup.sh +@@ -778,7 +778,7 @@ do + if [ "$enable_livestatus" = yes ] + then + if [ -z "$YES" ] ; then echo -n "(Compiling MK Livestatus..." ; fi +- compile_livestatus 2>&1 | propeller > $SRCDIR/livestatus.log ++ compile_livestatus + if [ "${PIPESTATUS[0]}" = 0 ] + then + +@@ -1018,8 +1018,6 @@ EOF + # WATO. Also create an empty and Apache-writable auth.serials + serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials && + touch "$serials_file" && +- (chown $wwwuser "$serials_file" || true) && +- (chown $wwwuser "$htpasswd_file" || true) && + create_sudo_configuration && + if [ "$enable_mkeventd" = yes ] + then +-- +2.2.1 + Added: csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Honour-SETUPCONF-even-when-DESTDIR-is-set.patch =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Honour-SETUPCONF-even-when-DESTDIR-is-set.patch (rev 0) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Honour-SETUPCONF-even-when-DESTDIR-is-set.patch 2015-02-19 10:29:11 UTC (rev 24664) @@ -0,0 +1,25 @@ +From e4e4801a34084964a908298990ad0ea0addadf8f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 18 Feb 2015 17:32:07 +0100 +Subject: [PATCH] Honour SETUPCONF even when DESTDIR is set + +--- + setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.sh b/setup.sh +index 7e576b3..c64a03b 100755 +--- a/setup.sh ++++ b/setup.sh +@@ -212,7 +212,7 @@ then + fi + fi + +-if [ -z "$DESTDIR" -a -e "$SETUPCONF" ] && . $SETUPCONF ++if [ -f "$SETUPCONF" ] && . $SETUPCONF + then + if [ -z "$YES" ] ; then + printf " %-71s \n" "* Read $(grep = $SETUPCONF | wc -l) settings from previous setup from $SETUPCONF." +-- +2.2.1 + Deleted: csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Solaris-header-fixes.patch =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Solaris-header-fixes.patch 2015-02-19 10:25:33 UTC (rev 24663) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/0001-Solaris-header-fixes.patch 2015-02-19 10:29:11 UTC (rev 24664) @@ -1,44 +0,0 @@ -From 61afd99627dbf87c98ac3df4cbd336ed01642e92 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 6 Dec 2012 16:06:56 +0100 -Subject: [PATCH] Solaris header fixes - ---- - src/check_icmp.c | 4 ++-- - src/livecheck.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/check_icmp.c b/src/check_icmp.c -index bb53fef..353cec5 100644 ---- a/src/check_icmp.c -+++ b/src/check_icmp.c -@@ -65,11 +65,11 @@ typedef unsigned short u_short; - #include - #include - #include --#include "/usr/include/netinet/ip_icmp.h" --// #include -+// #include "/usr/include/netinet/ip_icmp.h" - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/livecheck.c b/src/livecheck.c -index 019613a..dae61cd 100644 ---- a/src/livecheck.c -+++ b/src/livecheck.c -@@ -26,7 +26,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include --- -1.8.0 - Added: csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/check_mk_setup.conf =================================================================== --- csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/check_mk_setup.conf (rev 0) +++ csw/mgar/pkg/nagios-plugin-check_mk/trunk/files/check_mk_setup.conf 2015-02-19 10:29:11 UTC (rev 24664) @@ -0,0 +1,33 @@ +# Written by setup of check_mk 1.2.4p5 at Tue Feb 17 14:46:11 CET 2015 +bindir='/opt/csw/bin' +confdir='/etc/opt/csw/check_mk' +sharedir='/opt/csw/share/check_mk' +docdir='/opt/csw/share/doc/check_mk' +checkmandir='/opt/csw/share/doc/check_mk/checks' +vardir='/var/opt/csw/check_mk' +agentslibdir='/opt/csw/lib/check_mk_agent' +agentsconfdir='/etc/opt/csw/check_mk' +nagiosuser='nagios' +wwwuser='www' +wwwgroup='www' +nagios_binary='/opt/csw/nagios/bin/nagios' +nagios_config_file='/etc/opt/csw/nagios/nagios.cfg' +nagconfdir='/etc/opt/csw/nagios/objects' +nagios_startscript='/etc/opt/csw/init.d/cswnagios' +nagpipe='/var/opt/csw/nagios/rw/nagios.cmd' +check_result_path='/var/opt/csw/nagios/spool/checkresults' +nagios_status_file='/var/opt/csw/nagios/status.dat' +check_icmp_path='/opt/csw/libexec/nagios-plugins/check_icmp' +url_prefix='/' +apache_config_dir='/opt/csw/apache2/etc' +htpasswd_file='/etc/opt/csw/nagios/htpasswd.users' +nagios_auth_name='Nagios Access' +pnptemplates='/opt/csw/share/check_mk/pnp-templates' +rrd_path='/var/opt/csw/nagios/rrd' +rrdcached_socket='/var/opt/csw/nagios/rrdcached.sock' +enable_livestatus='yes' +nagios_version='3.5.0' +libdir='/opt/csw/libexec/check_mk' +livesock='/var/opt/csw/nagios/rw/live' +livebackendsdir='/opt/csw/share/check_mk/livestatus' +enable_mkeventd='no' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Feb 19 11:51:51 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Feb 2015 10:51:51 +0000 Subject: SF.net SVN: gar:[24665] csw/mgar/pkg Message-ID: <3knt5q0vZNz97@mail.opencsw.org> Revision: 24665 http://sourceforge.net/p/gar/code/24665 Author: dmichelsen Date: 2015-02-19 10:51:51 +0000 (Thu, 19 Feb 2015) Log Message: ----------- pnp: Move to tags/pnp4nagios-0.4.14,REV=2009.05.21 Added Paths: ----------- csw/mgar/pkg/pnp4nagios/tags/pnp-0.4.14,REV=2009.05.21/ Removed Paths: ------------- csw/mgar/pkg/pnp/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Feb 19 13:25:09 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 19 Feb 2015 12:25:09 +0000 Subject: SF.net SVN: gar:[24666] csw/mgar/pkg/ImageMagick/trunk Message-ID: <3knw9W085fzDj@mail.opencsw.org> Revision: 24666 http://sourceforge.net/p/gar/code/24666 Author: lblume Date: 2015-02-19 12:25:08 +0000 (Thu, 19 Feb 2015) Log Message: ----------- ImageMagick/trunk: Bump to 6.9.0-6 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2015-02-19 10:51:51 UTC (rev 24665) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2015-02-19 12:25:08 UTC (rev 24666) @@ -1,6 +1,6 @@ NAME = imagemagick VERSION = 6.9.0 -GARSUBREV = 3 +GARSUBREV = 6 #BETAREV = beta20140518 GARTYPE = v2 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2015-02-19 10:51:51 UTC (rev 24665) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2015-02-19 12:25:08 UTC (rev 24666) @@ -1 +1 @@ -353201b0f5d8c86a50303769bbca6c9e ImageMagick-6.9.0-3.tar.xz +fd481f9fdee33ab218184a1412bae93d ImageMagick-6.9.0-6.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 Thu Feb 19 21:24:53 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Feb 2015 20:24:53 +0000 Subject: SF.net SVN: gar:[24668] csw/mgar/pkg/squid/trunk Message-ID: <3kp6q63Z1dzRl@mail.opencsw.org> Revision: 24668 http://sourceforge.net/p/gar/code/24668 Author: dmichelsen Date: 2015-02-19 20:24:53 +0000 (Thu, 19 Feb 2015) Log Message: ----------- squid/trunk: Update to 3.5.2 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 2015-02-19 15:01:35 UTC (rev 24667) +++ csw/mgar/pkg/squid/trunk/Makefile 2015-02-19 20:24:53 UTC (rev 24668) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 3.4.12 +VERSION = 3.5.2 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache @@ -43,6 +43,7 @@ RUNTIME_DEP_PKGS_CSWsquid += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWsquid += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWsquid += CSWlibnettle4 +RUNTIME_DEP_PKGS_CSWsquid += CSWlibgnutls28 # Linker anomaly CHECKPKG_OVERRIDES_CSWsquid += surplus-dependency|CSWlibintl8 Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2015-02-19 15:01:35 UTC (rev 24667) +++ csw/mgar/pkg/squid/trunk/checksums 2015-02-19 20:24:53 UTC (rev 24668) @@ -1 +1 @@ -12bc5b9a34713cf6ca2ce5abe46fc339 squid-3.4.12.tar.bz2 +b9a14da6e2ab3ea294efeb346486a7fc squid-3.5.2.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 Sat Feb 21 15:45:53 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 21 Feb 2015 14:45:53 +0000 Subject: SF.net SVN: gar:[24671] csw/mgar/pkg/buildbot/trunk Message-ID: <3kqCC06jj2zrv@mail.opencsw.org> Revision: 24671 http://sourceforge.net/p/gar/code/24671 Author: dmichelsen Date: 2015-02-21 14:45:52 +0000 (Sat, 21 Feb 2015) Log Message: ----------- buildbot/trunk: Update to 0.8.10, add SMF manifest Modified Paths: -------------- csw/mgar/pkg/buildbot/trunk/Makefile csw/mgar/pkg/buildbot/trunk/checksums Added Paths: ----------- csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml Removed Paths: ------------- csw/mgar/pkg/buildbot/trunk/files/buildbot Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2015-02-21 14:41:58 UTC (rev 24670) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2015-02-21 14:45:52 UTC (rev 24671) @@ -3,7 +3,7 @@ # $Id$ NAME = buildbot -VERSION = 0.8.8 +VERSION = 0.8.10 CATEGORIES = python GARTYPE = v2 @@ -24,9 +24,9 @@ MASTER_SITES = $(PYPI_MIRROR) DISTFILES += $(DISTNAME).tar.gz -# Wrapper -DISTFILES += buildbot +DISTFILES += cswbuildbot.xml + # Buildbot is 2.7 only and the server is Solaris 10 only MODULATIONS_PYTHON_VERSION = 2_7 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -40,10 +40,6 @@ RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-tempita RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-decorator RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-openssl -# This is in fact an old 0.7.10 version private to buildbot. The documentation says -# "The requirement to install SQLAlchemy-0.7.10 is due to a conflict between newer -# versions of SQLAlchemy and SQLAlchemy-Migrate." -RUNTIME_DEP_PKGS_CSWbuildbot += CSWbuildbot-sqlalchemy CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-zope-interface @@ -53,26 +49,21 @@ CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-openssl CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWbuildbot-sqlalchemy +# That is the URI for the DTD +CHECKPKG_OVERRIDES_CSWbuildbot += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswbuildbot.xml + # This is more like an application than a python module CHECKPKG_OVERRIDES_CSWbuildbot += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWbuildbot += catalogname-does-not-start-with-py_ ARCHALL_CSWbuildbot = 1 -# logwatcher uses 'tail -f -n 0' only available on XPG4 tail or GNU tail, let's prefer XPG4 -REINPLACEMENTS += tail -REINPLACE_MATCH_tail = /usr/bin/tail -REINPLACE_WITH_tail = /usr/xpg4/bin/tail -REINPLACE_FILES_tail += buildbot/scripts/logwatcher.py +PROTOTYPE_MODIFIERS += smf +PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswbuildbot.xml +PROTOTYPE_CLASS_smf = manifest -# There seems to be 'trial' missing -SKIPTEST ?= 1 - include gar/category.mk post-install: - ginstall -d $(DESTDIR)$(libexecdir) - mv $(DESTDIR)$(bindir)/buildbot $(DESTDIR)$(libexecdir)/buildbot - ginstall -m 0755 $(WORKDIR)/buildbot $(DESTDIR)$(bindir)/buildbot + ginstall -D -m 0644 $(WORKDIR)/cswbuildbot.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswbuildbot.xml @$(MAKECOOKIE) - Modified: csw/mgar/pkg/buildbot/trunk/checksums =================================================================== --- csw/mgar/pkg/buildbot/trunk/checksums 2015-02-21 14:41:58 UTC (rev 24670) +++ csw/mgar/pkg/buildbot/trunk/checksums 2015-02-21 14:45:52 UTC (rev 24671) @@ -1 +1 @@ -472f512584bbb18cc677ca2ec3b3a905 buildbot-0.8.8.tar.gz +3201aaecf32df7810f4e23c14d20a544 buildbot-0.8.10.tar.gz Deleted: csw/mgar/pkg/buildbot/trunk/files/buildbot =================================================================== --- csw/mgar/pkg/buildbot/trunk/files/buildbot 2015-02-21 14:41:58 UTC (rev 24670) +++ csw/mgar/pkg/buildbot/trunk/files/buildbot 2015-02-21 14:45:52 UTC (rev 24671) @@ -1,5 +0,0 @@ -#!/bin/sh - -PYTHONPATH=/opt/csw/share/buildbot/lib/python2.7/site-packages -export PYTHONPATH -exec /opt/csw/libexec/buildbot "$@" Added: csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml =================================================================== (Binary files differ) Index: csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml =================================================================== --- csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml 2015-02-21 14:41:58 UTC (rev 24670) +++ csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml 2015-02-21 14:45:52 UTC (rev 24671) Property changes on: csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/xml \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Feb 21 16:06:16 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 21 Feb 2015 15:06:16 +0000 Subject: SF.net SVN: gar:[24672] csw/mgar/pkg/buildbot-slave/trunk Message-ID: <3kqCfW1f2Mzvf@mail.opencsw.org> Revision: 24672 http://sourceforge.net/p/gar/code/24672 Author: dmichelsen Date: 2015-02-21 15:06:16 +0000 (Sat, 21 Feb 2015) Log Message: ----------- buildbot-slave/trunk: Update to 0.8.10, add SMF manifest Modified Paths: -------------- csw/mgar/pkg/buildbot-slave/trunk/Makefile csw/mgar/pkg/buildbot-slave/trunk/checksums Added Paths: ----------- csw/mgar/pkg/buildbot-slave/trunk/files/cswbuildslave.xml Modified: csw/mgar/pkg/buildbot-slave/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot-slave/trunk/Makefile 2015-02-21 14:45:52 UTC (rev 24671) +++ csw/mgar/pkg/buildbot-slave/trunk/Makefile 2015-02-21 15:06:16 UTC (rev 24672) @@ -3,7 +3,7 @@ # $Id$ NAME = buildbot-slave -VERSION = 0.8.8 +VERSION = 0.8.10 CATEGORIES = python GARTYPE = v2 @@ -11,6 +11,7 @@ MASTER_SITES = $(PYPI_MIRROR) DISTFILES += $(DISTNAME).tar.gz +DISTFILES += cswbuildslave.xml # Buildbot is 2.7 only and the server is Solaris 10 only MODULATIONS_PYTHON_VERSION = 2_7 @@ -23,17 +24,23 @@ ARCHALL_CSWbuildbot-slave = 1 +# That is the URI for the DTD +CHECKPKG_OVERRIDES_CSWbuildbot-slave += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswbuildslave.xml + # This is more like an application than a python module CHECKPKG_OVERRIDES_CSWbuildbot-slave += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWbuildbot-slave += catalogname-does-not-start-with-py_ -# logwatcher uses 'tail -f -n 0' only available on XPG4 tail or GNU tail, let's prefer XPG4 -REINPLACEMENTS += tail -REINPLACE_MATCH_tail = /usr/bin/tail -REINPLACE_WITH_tail = /usr/xpg4/bin/tail -REINPLACE_FILES_tail += buildslave/scripts/logwatcher.py - # There seems to be 'trial' missing -SKIPTEST ?= 1 +# SKIPTEST ?= 1 +PROTOTYPE_MODIFIERS += smf +PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswbuildslave.xml +PROTOTYPE_CLASS_smf = manifest + include gar/category.mk + +post-install: + ginstall -D -m 0644 $(WORKDIR)/cswbuildslave.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswbuildslave.xml + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/buildbot-slave/trunk/checksums =================================================================== --- csw/mgar/pkg/buildbot-slave/trunk/checksums 2015-02-21 14:45:52 UTC (rev 24671) +++ csw/mgar/pkg/buildbot-slave/trunk/checksums 2015-02-21 15:06:16 UTC (rev 24672) @@ -1 +1 @@ -9854d1df35cb09a5320b30b76eefd9ba buildbot-slave-0.8.8.tar.gz +da7b078f58b63076b2b312b573720283 buildbot-slave-0.8.10.tar.gz Copied: csw/mgar/pkg/buildbot-slave/trunk/files/cswbuildslave.xml (from rev 24671, csw/mgar/pkg/buildbot/trunk/files/cswbuildbot.xml) =================================================================== (Binary files differ) 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 23 17:19:00 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Feb 2015 16:19:00 +0000 Subject: SF.net SVN: gar:[24676] csw/mgar/pkg/openldap/trunk Message-ID: <3krT9W1wMDzF@mail.opencsw.org> Revision: 24676 http://sourceforge.net/p/gar/code/24676 Author: dmichelsen Date: 2015-02-23 16:18:59 +0000 (Mon, 23 Feb 2015) Log Message: ----------- openldap/trunk: Update to 2.4.40, enable mdb Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/openldap/trunk/files/0001-Do-not-hardcode-name-of-make.patch Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2015-02-23 11:10:34 UTC (rev 24675) +++ csw/mgar/pkg/openldap/trunk/Makefile 2015-02-23 16:18:59 UTC (rev 24676) @@ -1,7 +1,7 @@ # $Id$ NAME = openldap -VERSION = 2.4.38 +VERSION = 2.4.40 GARTYPE = v2 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol @@ -33,8 +33,6 @@ DISTFILES += patch-oldap-2.4.16-ntlm.diff -#PATCHFILES += 0001-Do-not-hardcode-name-of-make.patch - PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 # Maybe in @@ -203,7 +201,12 @@ CONFIGURE_ARGS += --enable-overlays=mod CONFIGURE_ARGS += --enable-spasswd CONFIGURE_ARGS += --with-cyrus-sasl +CONFIGURE_ARGS += --enable-mdb=mod +# Legacy backends +CONFIGURE_ARGS += --enable-bdb=mod +CONFIGURE_ARGS += --enable-hdb=mod + # Is the absence of this arg causing https://www.opencsw.org/mantis/view.php?id=4468 ? CONFIGURE_ARGS += --enable-dynamic Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2015-02-23 11:10:34 UTC (rev 24675) +++ csw/mgar/pkg/openldap/trunk/checksums 2015-02-23 16:18:59 UTC (rev 24676) @@ -1 +1 @@ -39831848c731bcaef235a04e0d14412f openldap-2.4.38.tgz +423c1f23d2a0cb96b3e9baf7e9d7dda7 openldap-2.4.40.tgz Deleted: csw/mgar/pkg/openldap/trunk/files/0001-Do-not-hardcode-name-of-make.patch =================================================================== --- csw/mgar/pkg/openldap/trunk/files/0001-Do-not-hardcode-name-of-make.patch 2015-02-23 11:10:34 UTC (rev 24675) +++ csw/mgar/pkg/openldap/trunk/files/0001-Do-not-hardcode-name-of-make.patch 2015-02-23 16:18:59 UTC (rev 24676) @@ -1,22 +0,0 @@ -From c93d8f4a68b9f9e38651b2c5e82532bbbf1f00ed Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 26 Nov 2013 15:34:55 +0100 -Subject: [PATCH] Do not hardcode name of make - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index b566233..0e9da64 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -35,4 +35,4 @@ distclean: veryclean FORCE - - check: test - test: FORCE -- cd tests; make test -+ cd tests; $(MAKE) test --- -1.8.3.4 - 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 23 19:22:26 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Feb 2015 18:22:26 +0000 Subject: SF.net SVN: gar:[24679] csw/mgar/gar/v2/gar.conf.mk Message-ID: <3krWvv2fMzz67@mail.opencsw.org> Revision: 24679 http://sourceforge.net/p/gar/code/24679 Author: dmichelsen Date: 2015-02-23 18:22:25 +0000 (Mon, 23 Feb 2015) Log Message: ----------- mGAR v2: Use os-specific default compilers Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2015-02-23 17:23:56 UTC (rev 24678) +++ csw/mgar/gar/v2/gar.conf.mk 2015-02-23 18:22:25 UTC (rev 24679) @@ -82,6 +82,11 @@ # Space separated list of paths to search for DISTFILES. GARCHIVEPATH ?= $(GARCHIVEDIR) +# Architecture +GARCHLIST ?= sparc i386 +GARCH := $(if $(GARCH),$(GARCH),$(shell /usr/bin/uname -p)) +GAROSREL := $(if $(GAROSREL),$(GAROSREL),$(shell /usr/bin/uname -r)) + # Select compiler # GARCOMPILER can be either GNU/SUN which selects the default # Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/SOS12U2/SOS12U3/GCC3/GCC4 @@ -91,26 +96,25 @@ # We have parameters for the following compilers GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1 SOS12U2 SOS12U3 +GARCOMPILER-SUN-5.9 = SOS12 +GARCOMPILER-SUN-5.10 = SOS12 +GARCOMPILER-SUN-5.11 = SOS12U3 + ifeq ($(GARCOMPILER),SUN) - GARCOMPILER = SOS12 + GARCOMPILER = $(GARCOMPILER-SUN-$(GAROSREL)) endif ifeq ($(GARCOMPILER),GNU) GARCOMPILER = GCC4 endif -# Build flavor (OPT/DBG) -GARFLAVOR ?= OPT - -# Architecture -GARCHLIST ?= sparc i386 -GARCH := $(if $(GARCH),$(GARCH),$(shell /usr/bin/uname -p)) -GAROSREL := $(if $(GAROSREL),$(GAROSREL),$(shell /usr/bin/uname -r)) - ifeq (,$(filter $(GARCOMPILER),$(GARCOMPILERS))) $(error The compiler '$(GARCOMPILER)' is unknown. Please select one of $(GARCOMPILERS)) endif +# Build flavor (OPT/DBG) +GARFLAVOR ?= OPT + # These are the standard directory name variables from all GNU # makefiles. They're also used by autoconf, and can be adapted # for a variety of build systems. 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 24 11:07:24 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Feb 2015 10:07:24 +0000 Subject: SF.net SVN: gar:[24680] csw/mgar/pkg Message-ID: <3krwtQ5GKKzRX@mail.opencsw.org> Revision: 24680 http://sourceforge.net/p/gar/code/24680 Author: dmichelsen Date: 2015-02-24 10:07:24 +0000 (Tue, 24 Feb 2015) Log Message: ----------- Rename rbgems to lang-ruby according to the other langauges Added Paths: ----------- csw/mgar/pkg/lang-ruby/ Removed Paths: ------------- csw/mgar/pkg/rbgems/ 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 25 13:18:33 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Feb 2015 12:18:33 +0000 Subject: SF.net SVN: gar:[24685] csw/mgar/pkg/curl/trunk Message-ID: <3ksblH5hmfz13D@mail.opencsw.org> Revision: 24685 http://sourceforge.net/p/gar/code/24685 Author: dmichelsen Date: 2015-02-25 12:18:33 +0000 (Wed, 25 Feb 2015) Log Message: ----------- curl/trunk: Update to 7.41.0, fix kerberos for 64 bit Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/curl/trunk/files/0001-Use-KRB5CONFIG.patch Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2015-02-25 09:09:57 UTC (rev 24684) +++ csw/mgar/pkg/curl/trunk/Makefile 2015-02-25 12:18:33 UTC (rev 24685) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.39.0 +VERSION = 7.41.0 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers @@ -18,6 +18,8 @@ VENDOR_URL = http://curl.haxx.se +PATCHFILES += 0001-Use-KRB5CONFIG.patch + # Because of OpenSSL 1.0 update PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -68,6 +70,10 @@ CHECKPKG_OVERRIDES_CSWlibcurl4-feature += shared-lib-pkgname-mismatch CHECKPKG_OVERRIDES_CSWlibcurl4-feature += soname-not-part-of-filename +# Linker anomaly +CHECKPKG_OVERRIDES_CSWcurl-feature-i386 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWcurl-feature += $(CHECKPKG_OVERRIDES_CSWcurl-feature-$(GARCH)) + PACKAGES += CSWlibcurl-dev CATALOGNAME_CSWlibcurl-dev = libcurl_dev SPKG_DESC_CSWlibcurl-dev = Development files for libcurl.so.4 @@ -88,6 +94,10 @@ RUNTIME_DEP_PKGS_CSWcurl += CSWlibmetalink3 RUNTIME_DEP_PKGS_CSWcurl += CSWlibintl8 +# Linker anomaly +CHECKPKG_OVERRIDES_CSWcurl-i386 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWcurl += $(CHECKPKG_OVERRIDES_CSWcurl-$(GARCH)) + EXTRA_MODULATORS = FEATURES MODULATIONS_FEATURES = minimal full @@ -101,9 +111,13 @@ EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap EXTRA_CONFIGURE_ARGS_features-full += --enable-ldaps EXTRA_CONFIGURE_ARGS_features-full += --with-libmetalink -EXTRA_CONFIGURE_ARGS_features-full += --with-gssapi-includes=$(includedir) -#EXTRA_CONFIGURE_ARGS_features-full += --with-gssapi-libs=$(libdir) +# The problem is that krb5-config is taken from $GSSAPI_ROOT/bin/krb5-config which does not take +# the isa-specific /opt/csw/bin/(sparcv9|amd64)/krb5-config into account. Use workaround until this is fixed: +# https://sourceforge.net/p/curl/bugs/1486/ EXTRA_CONFIGURE_ARGS_features-full += --with-gssapi=$(prefix) +EXTRA_CONFIGURE_EXPORTS_features-full += KRB5CONFIG +EXTRA_CONFIGURE_EXPORTS += $(EXTRA_CONFIGURE_EXPORTS_features-$(FEATURES)) +CONFIGURE_ENV_KRB5CONFIG = $(bindir)/krb5-config # Make sure to link to the new libnet. See for details http://wiki.opencsw.org/project-libnet EXTRA_LDFLAGS = -L$(libdir)/libnet-new Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2015-02-25 09:09:57 UTC (rev 24684) +++ csw/mgar/pkg/curl/trunk/checksums 2015-02-25 12:18:33 UTC (rev 24685) @@ -1 +1 @@ -e9aa6dec29920eba8ef706ea5823bad7 curl-7.39.0.tar.lzma +3d75ba516673ddc441dac8d519d2634d curl-7.41.0.tar.lzma Added: csw/mgar/pkg/curl/trunk/files/0001-Use-KRB5CONFIG.patch =================================================================== --- csw/mgar/pkg/curl/trunk/files/0001-Use-KRB5CONFIG.patch (rev 0) +++ csw/mgar/pkg/curl/trunk/files/0001-Use-KRB5CONFIG.patch 2015-02-25 12:18:33 UTC (rev 24685) @@ -0,0 +1,46 @@ +From c2b3c5aedbb4f94554a69a6936aed67d10ae30b6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 25 Feb 2015 10:57:44 +0100 +Subject: [PATCH] Use KRB5CONFIG + +--- + configure | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 1616b1d..906ad4a 100755 +--- a/configure ++++ b/configure +@@ -21116,6 +21118,7 @@ if test "${with_gssapi+set}" = set; then : + + fi + ++: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"} + + save_CPPFLAGS="$CPPFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GSS-API support is requested" >&5 +@@ -21127,8 +21130,8 @@ $as_echo "yes" >&6; } + if test -z "$GSSAPI_INCS"; then + if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then + GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` +- elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then +- GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi` ++ elif test -f "$KRB5CONFIG"; then ++ GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` + elif test "$GSSAPI_ROOT" != "yes"; then + GSSAPI_INCS="-I$GSSAPI_ROOT/include" + fi +@@ -21272,8 +21275,8 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h + if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then + gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi` + LIBS="$gss_libs $LIBS" +- elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then +- gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` ++ elif test -f "$KRB5CONFIG"; then ++ gss_libs=`$KRB5CONFIG --libs gssapi` + LIBS="$gss_libs $LIBS" + else + case $host in +-- +2.2.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 25 13:31:39 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Feb 2015 12:31:39 +0000 Subject: SF.net SVN: gar:[24686] csw/mgar/pkg/curl/trunk/Makefile Message-ID: <3ksc2D0XFcz15j@mail.opencsw.org> Revision: 24686 http://sourceforge.net/p/gar/code/24686 Author: dmichelsen Date: 2015-02-25 12:31:39 +0000 (Wed, 25 Feb 2015) Log Message: ----------- curl/trunk: Fix tyo Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2015-02-25 12:18:33 UTC (rev 24685) +++ csw/mgar/pkg/curl/trunk/Makefile 2015-02-25 12:31:39 UTC (rev 24686) @@ -71,8 +71,8 @@ CHECKPKG_OVERRIDES_CSWlibcurl4-feature += soname-not-part-of-filename # Linker anomaly -CHECKPKG_OVERRIDES_CSWcurl-feature-i386 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWcurl-feature += $(CHECKPKG_OVERRIDES_CSWcurl-feature-$(GARCH)) +CHECKPKG_OVERRIDES_CSWlibcurl4-feature-i386 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibcurl4-feature += $(CHECKPKG_OVERRIDES_CSWlibcurl4-feature-$(GARCH)) PACKAGES += CSWlibcurl-dev CATALOGNAME_CSWlibcurl-dev = libcurl_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Feb 26 23:56:00 2015 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 26 Feb 2015 22:56:00 +0000 Subject: SF.net SVN: gar:[24689] csw/mgar/pkg/bind/trunk Message-ID: <3ktTrF1xknzbZ@mail.opencsw.org> Revision: 24689 http://sourceforge.net/p/gar/code/24689 Author: bonivart Date: 2015-02-26 22:55:58 +0000 (Thu, 26 Feb 2015) Log Message: ----------- bind/trunk: update to 9.9.7 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2015-02-26 19:47:30 UTC (rev 24688) +++ csw/mgar/pkg/bind/trunk/Makefile 2015-02-26 22:55:58 UTC (rev 24689) @@ -3,27 +3,27 @@ # dlz extensions problematic, remove source: /bin/tests/system, rm -rf dlzexternal NAME = bind -VERSION = 9.9.6 +VERSION = 9.9.7 GARTYPE = v2 # Enable these for Px-releases -RELEASE = P2 -DISTVERSION = $(VERSION)-$(RELEASE) -SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) +#RELEASE = P2 +#DISTVERSION = $(VERSION)-$(RELEASE) +#SPKG_VERSION = $(VERSION)$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB endef # Enable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -DISTFILES = $(DISTNAME).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +#DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -#DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall @@ -120,11 +120,11 @@ CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot # Will not split out all these libs -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.11|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.104.1.1|soname=libdns.so.104|pkgname=CSWlibbind|expected=CSWlibdns104 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.95.8.0|soname=libisc.so.95|pkgname=CSWlibbind|expected=CSWlibisc95 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.2.3|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.91.0.0|soname=liblwres.so.91|pkgname=CSWlibbind|expected=CSWliblwres91 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.13|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.106.1.0|soname=libdns.so.106|pkgname=CSWlibbind|expected=CSWlibdns106 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.104.0.2|soname=libisc.so.104|pkgname=CSWlibbind|expected=CSWlibisc104 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.2.4|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.91.0.2|soname=liblwres.so.91|pkgname=CSWlibbind|expected=CSWliblwres91 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.90.0.6|soname=libisccc.so.90|pkgname=CSWlibbind|expected=CSWlibisccc90 # Some new checks, have no idea about their relevance Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2015-02-26 19:47:30 UTC (rev 24688) +++ csw/mgar/pkg/bind/trunk/checksums 2015-02-26 22:55:58 UTC (rev 24689) @@ -1 +1 @@ -fa36a4ca56dc92815dbf4fe6bcd55855 bind-9.9.6-P2.tar.gz +5aa989e0f46240316c0b96d1cc78bcbb bind-9.9.7.tar.gz 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 27 04:34:28 2015 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 27 Feb 2015 03:34:28 +0000 Subject: SF.net SVN: gar:[24691] csw/mgar/pkg/tor/branches/alpha/Makefile Message-ID: <3ktc1T25bszgt@mail.opencsw.org> Revision: 24691 http://sourceforge.net/p/gar/code/24691 Author: jake_goerzen Date: 2015-02-27 03:34:28 +0000 (Fri, 27 Feb 2015) Log Message: ----------- tor-alpha: add runtime dependency CSWlibssp0 Modified Paths: -------------- csw/mgar/pkg/tor/branches/alpha/Makefile Modified: csw/mgar/pkg/tor/branches/alpha/Makefile =================================================================== --- csw/mgar/pkg/tor/branches/alpha/Makefile 2015-02-27 03:29:06 UTC (rev 24690) +++ csw/mgar/pkg/tor/branches/alpha/Makefile 2015-02-27 03:34:28 UTC (rev 24691) @@ -26,6 +26,7 @@ RUNTIME_DEP_PKGS_CSWtor += CSWlibevent2-0-5 RUNTIME_DEP_PKGS_CSWtor += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWtor += CSWlibz1 +RUNTIME_DEP_PKGS_CSWtor += CSWlibssp0 sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) 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 27 13:14:17 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 27 Feb 2015 12:14:17 +0000 Subject: SF.net SVN: gar:[24692] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: <3ktqYG0qHYznv@mail.opencsw.org> Revision: 24692 http://sourceforge.net/p/gar/code/24692 Author: lblume Date: 2015-02-27 12:14:16 +0000 (Fri, 27 Feb 2015) Log Message: ----------- samba/branches/samba3: Add an override Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2015-02-27 03:34:28 UTC (rev 24691) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2015-02-27 12:14:16 UTC (rev 24692) @@ -336,8 +336,13 @@ # Needed as the configure script doesn't add it EXTRA_LINKER_FLAGS += -lintl -EXTRA_LINKER_FLAGS += -z ignore -z nolazyload +EXTRA_LINKER_FLAGS += -Bdirect -z ignore -z nolazyload +EXTRA_LD_OPTIONS += -z nolazyload -B direct +# I have no clue what is going on exclusively on S10 sparc, and at this point, +# I don't care anymore, I'll just ignore all -- lblume +CHECKPKG_OVERRIDES_CSWsamba += no-direct-binding + # 32 bit only on Solaris 9 - just to save build time BUILD64-5.9 = BUILD64-5.10 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.