From wahwah at users.sourceforge.net Wed May 1 00:09:46 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Apr 2013 22:09:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[20922] csw/mgar/pkg/examples/from-svn-repo/ Message-ID: Revision: 20922 http://gar.svn.sourceforge.net/gar/?rev=20922&view=rev Author: wahwah Date: 2013-04-30 22:09:46 +0000 (Tue, 30 Apr 2013) Log Message: ----------- examples: from-svn-repo Added Paths: ----------- csw/mgar/pkg/examples/from-svn-repo/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed May 1 00:27:46 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Apr 2013 22:27:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[20923] csw/mgar/pkg/examples/users-and-groups/trunk Message-ID: Revision: 20923 http://gar.svn.sourceforge.net/gar/?rev=20923&view=rev Author: wahwah Date: 2013-04-30 22:27:45 +0000 (Tue, 30 Apr 2013) Log Message: ----------- examples/users and groups Modified Paths: -------------- csw/mgar/pkg/examples/users-and-groups/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/examples/users-and-groups/trunk/files/cswusergroup Modified: csw/mgar/pkg/examples/users-and-groups/trunk/Makefile =================================================================== --- csw/mgar/pkg/examples/users-and-groups/trunk/Makefile 2013-04-30 22:09:46 UTC (rev 20922) +++ csw/mgar/pkg/examples/users-and-groups/trunk/Makefile 2013-04-30 22:27:45 UTC (rev 20923) @@ -39,7 +39,7 @@ PROTOTYPE_PERMS_example = 0700 PROTOTYPE_CLASS_example = ugfiles -SPKG_CLASSES = none ugfiles +# SPKG_CLASSES = none ugfiles include gar/category.mk Added: csw/mgar/pkg/examples/users-and-groups/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/examples/users-and-groups/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/examples/users-and-groups/trunk/files/cswusergroup 2013-04-30 22:27:45 UTC (rev 20923) @@ -0,0 +1 @@ +cswuser:cswgroup:CSW example user:/home/cswuser:/bin/bash:: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed May 1 01:18:57 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Apr 2013 23:18:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[20924] csw/mgar/pkg/examples/from-svn-repo/trunk/Makefile Message-ID: Revision: 20924 http://gar.svn.sourceforge.net/gar/?rev=20924&view=rev Author: wahwah Date: 2013-04-30 23:18:57 +0000 (Tue, 30 Apr 2013) Log Message: ----------- examples/from-svn-repo/trunk: An example of a package built from Subversion Modified Paths: -------------- csw/mgar/pkg/examples/from-svn-repo/trunk/Makefile Modified: csw/mgar/pkg/examples/from-svn-repo/trunk/Makefile =================================================================== --- csw/mgar/pkg/examples/from-svn-repo/trunk/Makefile 2013-04-30 22:27:45 UTC (rev 20923) +++ csw/mgar/pkg/examples/from-svn-repo/trunk/Makefile 2013-04-30 23:18:57 UTC (rev 20924) @@ -2,34 +2,40 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = loose-files-example +NAME = from-svn-repo VERSION = 1.0 GARTYPE = v2 -DESCRIPTION = An example of a package created from loose files. +DESCRIPTION = An example of a package created from a Subversion repository VENDOR_URL = http://www.opencsw.org/manual/ -# The directory where all the sources are kept. The slash at the end is -# necessary. -LOCAL_SRC = /usr/xpg4/ +SVN_REPO = http://usable-solaris.googlecode.com/svn/trunk/docs/ +SVN_REV = HEAD -# The list of files to include, relative to LOCAL_SRC -FILES = bin/grep -FILES += include/curses.h - -MASTER_SITES = $(sort $(addprefix file://$(LOCAL_SRC),$(dir $(FILES)))) -DISTFILES = $(notdir $(FILES)) - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = custom TEST_SCRIPTS = +# Otherwise there's a .git directory in $(WORKSRC) +NOGITPATCH = 1 + +# There are no architecture-specific files in this package. +ARCHALL_CSWfrom-svn-repo = 1 + include gar/category.mk +# In this case, we're checking out into the $(prefix)/share directory, because +# this repository only contains documentation. You'll have to plan where you +# want to put the files. +post-extract-modulated: + mkdir -p $(WORKSRC)$(prefix)/share + svn export -r $(SVN_REV) $(SVN_REPO) $(WORKSRC)$(prefix)/share/usable-solaris + @$(MAKECOOKIE) + +# We're not doing any processing, or copying files into specific locations. +# Our installation is simply copying files from $(WORKSRC). Note the trailing +# slash -- it's necessary. install-custom: - $(foreach F,$(FILES),ginstall \ - -d $(DESTDIR)$(prefix)/$(dir $F) \ - && ginstall $(WORKDIR)/$(notdir $F) \ - $(DESTDIR)$(prefix)/$(dir $F);) + rsync -a "$(WORKSRC)/" "$(DESTDIR)" @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed May 1 15:29:26 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 01 May 2013 13:29:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20925] csw/mgar/pkg/vala/trunk/Makefile Message-ID: Revision: 20925 http://gar.svn.sourceforge.net/gar/?rev=20925&view=rev Author: slowfranklin Date: 2013-05-01 13:29:25 +0000 (Wed, 01 May 2013) Log Message: ----------- vala/trunk: Use gcc Modified Paths: -------------- csw/mgar/pkg/vala/trunk/Makefile Modified: csw/mgar/pkg/vala/trunk/Makefile =================================================================== --- csw/mgar/pkg/vala/trunk/Makefile 2013-04-30 23:18:57 UTC (rev 20924) +++ csw/mgar/pkg/vala/trunk/Makefile 2013-05-01 13:29:25 UTC (rev 20925) @@ -15,6 +15,7 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.xz +GARCOMPILER = GNU BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWlibiconv-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed May 1 16:27:55 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 01 May 2013 14:27:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[20926] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 20926 http://gar.svn.sourceforge.net/gar/?rev=20926&view=rev Author: idogan23 Date: 2013-05-01 14:27:52 +0000 (Wed, 01 May 2013) Log Message: ----------- unbound: ISA cleanup Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2013-05-01 13:29:25 UTC (rev 20925) +++ csw/mgar/pkg/unbound/trunk/Makefile 2013-05-01 14:27:52 UTC (rev 20926) @@ -34,6 +34,7 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw +CONFIGURE_ARGS += --enable-shared STRIP_LIBTOOL = 0 @@ -42,13 +43,13 @@ LICENSE = LICENSE -EXTRA_BUILD_ISAS_i386 = pentium_pro -EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis +EXTRA_BUILD_ISAS_i386 = amd64 +EXTRA_BUILD_ISAS_sparc = sparcv9 -MERGE_DIRS_isa-sparcv8plus = $(libdir) -MERGE_DIRS_isa-sparcv8plus += $(sbindir) -MERGE_DIRS_isa-pentium_pro = $(libdir) -MERGE_DIRS_isa-pentium_pro += $(sbindir) +MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-sparcv9 += $(sbindir) +MERGE_DIRS_isa-amd64 = $(libdir) +MERGE_DIRS_isa-amd64 += $(sbindir) ISAXEC_DIRS = $(sbindir) EXTRA_ISAEXEC_EXCLUDE_FILES = $(sbindir)/unbound-anchor @@ -57,24 +58,18 @@ EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host -EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro = $(prefix)/sbin/unbound-anchor -EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-checkconf -EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-control -EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-control-setup -EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-host +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(prefix)/sbin/unbound-anchor +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-checkconf +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-control +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-control-setup +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-host -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus = $(prefix)/sbin/unbound-anchor -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-checkconf -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control-setup -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-host +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/sbin/unbound-anchor +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-checkconf +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-control +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-control-setup +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-host -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis = $(prefix)/sbin/unbound-anchor -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-checkconf -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-control -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-control-setup -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-host - SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf INITSMF = /etc/opt/csw/init.d/cswunbound USERGROUP = /etc/opt/csw/CSWunbound/cswusergroup @@ -87,12 +82,14 @@ RUNTIME_DEP_PKGS_CSWunbound += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWunbound += CSWlibldns1 RUNTIME_DEP_PKGS_CSWunbound += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWunbound += CSWlibevent2-0-5 CATALOGNAME_CSWlibunbound2 = libunbound2 SPKG_DESC_CSWlibunbound2 = Library implementing DNS resolution and validation PKGFILES_CSWlibunbound2 += $(PKGFILES_RT) RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibldns1 RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibevent2-0-5 CATALOGNAME_CSWunbound-devel = unbound_devel SPKG_DESC_CSWunbound-devel = $(DESCRIPTION) development package @@ -104,9 +101,7 @@ PKGFILES_CSWunbound-host += $(sbindir)/unbound-host PKGFILES_CSWunbound-host += $(mandir)/man1/unbound-host.1 RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibldns1 -RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibunbound2 -RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibevent2-0-5 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed May 1 20:46:47 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 May 2013 18:46:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20927] csw/mgar/pkg Message-ID: Revision: 20927 http://gar.svn.sourceforge.net/gar/?rev=20927&view=rev Author: wahwah Date: 2013-05-01 18:46:47 +0000 (Wed, 01 May 2013) Log Message: ----------- cassandra/trunk: figured out what the right JAVA_HOME and ANT_HOME settings are Added Paths: ----------- csw/mgar/pkg/cassandra/ csw/mgar/pkg/cassandra/Makefile csw/mgar/pkg/cassandra/branches/ csw/mgar/pkg/cassandra/tags/ csw/mgar/pkg/cassandra/trunk/ csw/mgar/pkg/cassandra/trunk/Makefile csw/mgar/pkg/cassandra/trunk/checksums csw/mgar/pkg/cassandra/trunk/files/ Added: csw/mgar/pkg/cassandra/Makefile =================================================================== --- csw/mgar/pkg/cassandra/Makefile (rev 0) +++ csw/mgar/pkg/cassandra/Makefile 2013-05-01 18:46:47 UTC (rev 20927) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/cassandra/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cassandra/trunk/Makefile =================================================================== --- csw/mgar/pkg/cassandra/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cassandra/trunk/Makefile 2013-05-01 18:46:47 UTC (rev 20927) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = apache-cassandra +VERSION = 1.2.4 +GARTYPE = v2 + +DESCRIPTION = NoSQL database + +MASTER_SITES = http://ftp.heanet.ie/mirrors/www.apache.org/dist/cassandra/$(VERSION)/ +DISTNAME = $(NAME)-$(VERSION)-src +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = foo + +JAVA_HOME = /usr/j2se +ANT_HOME = /opt/csw + +EXTRA_BUILD_EXPORTS = JAVA_HOME ANT_HOME + +include gar/category.mk + +build-custom: + (cd $(WORKSRC); \ + $(BUILD_ENV) \ + /opt/csw/share/java/ant/bin/ant -autoproxy) + false + +PATH := $(ANT_HOME)/bin:$(PATH) Property changes on: csw/mgar/pkg/cassandra/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cassandra/trunk/checksums =================================================================== --- csw/mgar/pkg/cassandra/trunk/checksums (rev 0) +++ csw/mgar/pkg/cassandra/trunk/checksums 2013-05-01 18:46:47 UTC (rev 20927) @@ -0,0 +1 @@ +eff3c455ac73ac482a6fcf5cec111abc apache-cassandra-1.2.4-src.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 Wed May 1 21:07:10 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 May 2013 19:07:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[20928] csw/mgar/pkg/cassandra/trunk/Makefile Message-ID: Revision: 20928 http://gar.svn.sourceforge.net/gar/?rev=20928&view=rev Author: wahwah Date: 2013-05-01 19:07:10 +0000 (Wed, 01 May 2013) Log Message: ----------- cassandra/trunk: It wouldn't accept any proxy settings Modified Paths: -------------- csw/mgar/pkg/cassandra/trunk/Makefile Modified: csw/mgar/pkg/cassandra/trunk/Makefile =================================================================== --- csw/mgar/pkg/cassandra/trunk/Makefile 2013-05-01 18:46:47 UTC (rev 20927) +++ csw/mgar/pkg/cassandra/trunk/Makefile 2013-05-01 19:07:10 UTC (rev 20928) @@ -1,6 +1,8 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # +# Current problem: ant is unable to download dependencies. I tried to give it +# proxy setting in various ways, but nothing seems to work. NAME = apache-cassandra VERSION = 1.2.4 GARTYPE = v2 @@ -16,17 +18,24 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = foo -JAVA_HOME = /usr/j2se +# http://docs.oracle.com/javase/6/docs/technotes/guides/net/proxies.html +proxy_host=web.bo.opencsw.org +proxy_host=proxy + +JAVA_HOME = /usr/jdk1.6.0_20 ANT_HOME = /opt/csw +ANT_OPTS = -Dhttp.proxyHost=$(proxy_host) -Dhttp.proxyPort=3128 +ANT_OPTS += -Dhttps.proxyHost=$(proxy_host) -Dhttps.proxyPort=3128 -EXTRA_BUILD_EXPORTS = JAVA_HOME ANT_HOME +EXTRA_BUILD_EXPORTS = JAVA_HOME ANT_HOME ANT_OPTS http_proxy + include gar/category.mk build-custom: (cd $(WORKSRC); \ $(BUILD_ENV) \ - /opt/csw/share/java/ant/bin/ant -autoproxy) + /opt/csw/share/java/ant/bin/ant --execdebug -autoproxy) false PATH := $(ANT_HOME)/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 2 01:12:04 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 May 2013 23:12:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[20929] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 20929 http://gar.svn.sourceforge.net/gar/?rev=20929&view=rev Author: wahwah Date: 2013-05-01 23:12:03 +0000 (Wed, 01 May 2013) Log Message: ----------- checkpkg: Display expected 64-bit bin locations Just to make it a little clearer what is checkpkg thinking. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2013-05-01 19:07:10 UTC (rev 20928) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2013-05-01 23:12:03 UTC (rev 20929) @@ -1240,19 +1240,20 @@ if binaries: paths_64 = { - 'i386': common_constants.AMD64_PATHS, + 'i386': common_constants.AMD64_PATHS, 'sparc': common_constants.SPARCV9_PATHS, } - paths_64_re = re.compile(r"opt/csw/(%s)/(%s)" % - (binaries_path, - '|'.join(paths_64[pkginfo['ARCH']]))) + paths_64_str = ( + r"opt/csw/(%s)/(%s)" + % (binaries_path, '|'.join(paths_64[pkginfo['ARCH']]))) + paths_64_re = re.compile(paths_64_str) for binary_info in binaries: if paths_64_re.search(binary_info['path']): - return + return error_mgr.ReportError('64bits-binaries-missing') messenger.Message( "The package is supposed to contains 64 bits binaries " "but it doesn't contain any in the usual 64 bits " - "binaries locations.") + "binaries locations. Locations checked: %s." % paths_64_str) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 2 01:22:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 01 May 2013 23:22:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[20930] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20930 http://gar.svn.sourceforge.net/gar/?rev=20930&view=rev Author: wahwah Date: 2013-05-01 23:22:41 +0000 (Wed, 01 May 2013) Log Message: ----------- checkpkg: Tests data fixes Fixes for testing data changes missed in previous commits. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_stats_test.py csw/mgar/gar/v2/lib/python/testdata/neon_stats.py csw/mgar/gar/v2/lib/python/testdata/tree_stats.py Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-05-01 23:12:03 UTC (rev 20929) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-05-01 23:22:41 UTC (rev 20930) @@ -54,6 +54,7 @@ mock_dirpkg.GetParsedPkginfo().AndReturn({ "ARCH": "sparc", "EMAIL": "maintainer at example.com", + "NAME": "foo - Package of foo", }) mock_dirpkg.GetPkgmap().AndReturn(mock_pkgmap) mock_pkgmap.entries = [] Modified: csw/mgar/gar/v2/lib/python/testdata/neon_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-05-01 23:12:03 UTC (rev 20929) +++ csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-05-01 23:22:41 UTC (rev 20930) @@ -211,6 +211,7 @@ 'VENDOR': 'http://www.webdav.org/neon/ packaged for CSW by Dagobert Michelsen', 'VERSION': '0.29.0,REV=2009.09.14', 'WORKDIR_FIRSTMOD': '../build-isa-i386-garversion-0.26.4'}, + 'i_depends': [], 'pkgmap': [{'class': None, 'group': None, 'line': ': 1 1763', Modified: csw/mgar/gar/v2/lib/python/testdata/tree_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/tree_stats.py 2013-05-01 23:12:03 UTC (rev 20929) +++ csw/mgar/gar/v2/lib/python/testdata/tree_stats.py 2013-05-01 23:22:41 UTC (rev 20930) @@ -47,16 +47,19 @@ 'sparcv9+vis', 'sparcv9+vis2']), 'ldd_info': {'opt/csw/bin/tree': [] }, - 'binaries_elf_info': { 'opt/csw/bin/tree': { 'version definition': [], - 'version needed': [], - 'symbol table': [ { 'flags': 'DBL', - 'soname': 'libc.so.1', - 'symbol': 'environ', - 'shndx': 'UNDEF', - 'version': None - } ] - } - }, + 'binaries_elf_info': { + 'opt/csw/bin/tree': { + 'version definition': [], 'version needed': [], + 'symbol table': [ + { 'flags': 'DBL', + 'soname': 'libc.so.1', + 'symbol': 'environ', + 'shndx': 'UNDEF', + 'version': None, + } + ] + } + }, 'mtime': '2010-07-05T23:48:10', 'overrides': [], 'pkgchk': {'return_code': 0, @@ -79,6 +82,7 @@ 'VENDOR': 'http://mama.indstate.edu/users/ice/tree/ packaged for CSW by Maciej Blizinski', 'VERSION': '1.5.3,REV=2010.07.05', 'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'}, + 'i_depends': [], 'pkgmap': [{'class': None, 'group': None, 'line': ': 1 0', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 2 09:22:03 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 02 May 2013 07:22:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[20931] csw/mgar/pkg/lang-python/mox/trunk/Makefile Message-ID: Revision: 20931 http://gar.svn.sourceforge.net/gar/?rev=20931&view=rev Author: wahwah Date: 2013-05-02 07:21:52 +0000 (Thu, 02 May 2013) Log Message: ----------- lang-python/mox/trunk: recipe cleanup Modified Paths: -------------- csw/mgar/pkg/lang-python/mox/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mox/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mox/trunk/Makefile 2013-05-01 23:22:41 UTC (rev 20930) +++ csw/mgar/pkg/lang-python/mox/trunk/Makefile 2013-05-02 07:21:52 UTC (rev 20931) @@ -2,20 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = mox +NAME = pymox VERSION = 0.5.3 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Mock object framework for Python ARCHALL = 1 -define BLURB -endef -SPKG_SOURCEURL = http://code.google.com/p/pymox/ -MASTER_SITES = http://pymox.googlecode.com/files/ +VENDOR_URL = https://code.google.com/p/pymox/ +MASTER_SITES = $(GOOGLE_MIRROR) PACKAGES = CSWpy-mox -CATALOGNAME_CSWpy-mox = py_mox -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +DISTNAME = mox-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz TEST_SCRIPTS = -# Remove the following rules and uncomment the include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 2 09:46:59 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 02 May 2013 07:46:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[20932] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: Revision: 20932 http://gar.svn.sourceforge.net/gar/?rev=20932&view=rev Author: wahwah Date: 2013-05-02 07:46:58 +0000 (Thu, 02 May 2013) Log Message: ----------- releases-web: Do not read whole file into memory Do it in chunks instead: less RAM usage. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-02 07:21:52 UTC (rev 20931) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-02 07:46:58 UTC (rev 20932) @@ -58,9 +58,14 @@ web.header( 'Content-type', 'application/x-vnd.opencsw.pkg;type=upload-results') - hash = hashlib.md5() - hash.update(x['srv4_file'].value) - data_md5_sum = hash.hexdigest() + file_hash = hashlib.md5() + # Don't read the whole file into memory at once, do it in small chunks. + chunk_size = 2 * 1024 * 1024 + data = x['srv4_file'].file.read(chunk_size) + while data: + file_hash.update(data) + data = x['srv4_file'].file.read(chunk_size) + data_md5_sum = file_hash.hexdigest() declared_md5_sum = x['md5_sum'] basename = x['basename'] save_attempt = False This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 2 09:47:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 02 May 2013 07:47:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[20933] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: Revision: 20933 http://gar.svn.sourceforge.net/gar/?rev=20933&view=rev Author: wahwah Date: 2013-05-02 07:47:16 +0000 (Thu, 02 May 2013) Log Message: ----------- releases-web: Save the file in small chunks Avoids reading the whole file into memory. Also fixes a race condition between unlink() and open() by using os.rename() instead. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-02 07:46:58 UTC (rev 20932) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-02 07:47:16 UTC (rev 20933) @@ -19,6 +19,7 @@ import datetime import hashlib import logging +import tempfile urls = ( @@ -74,7 +75,18 @@ try: srv4 = models.Srv4FileStats.selectBy(md5_sum=data_md5_sum).getOne() if srv4.use_to_generate_catalogs: - SaveToAllpkgs(basename, x['srv4_file'].value) + # FieldStorage by default unlinks the temporary local file as soon as + # it's been opened. Therefore, we have to take care of writing data + # to the target location in an atomic way. + fd, tmp_filename = tempfile.mkstemp(dir=ALLPKGS_DIR) + x['srv4_file'].file.seek(0) + data = x['srv4_file'].file.read(chunk_size) + while data: + os.write(fd, data) + data = x['srv4_file'].file.read(chunk_size) + os.close(fd) + target_path = os.path.join(ALLPKGS_DIR, basename) + os.rename(tmp_filename, target_path) except sqlobject.main.SQLObjectNotFound, e: messages.append("File %s not found in the db." % data_md5_sum) else: @@ -254,23 +266,6 @@ raise web.notacceptable(data=response) -def SaveToAllpkgs(basename, data): - """Saves a file to allpkgs.""" - target_path = os.path.join(ALLPKGS_DIR, basename) - fd = None - try: - try: - os.unlink(target_path) - except OSError, e: - # It's okay if we can't unlink the file - pass - fd = os.open(target_path, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0644) - os.write(fd, data) - except IOError, e: - if fd: - os.close(fd) - - web.webapi.internalerror = web.debugerror app = web.application(urls, globals()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu May 2 12:04:34 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 02 May 2013 10:04:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[20934] csw/mgar/pkg/netatalk/trunk Message-ID: Revision: 20934 http://gar.svn.sourceforge.net/gar/?rev=20934&view=rev Author: slowfranklin Date: 2013-05-02 10:04:33 +0000 (Thu, 02 May 2013) Log Message: ----------- Bump to version 3.0.3 and fix the package Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile csw/mgar/pkg/netatalk/trunk/checksums Added Paths: ----------- csw/mgar/pkg/netatalk/trunk/files/0001-Fix-use-of-unnamed-union-inside-struct.patch csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-02 07:47:16 UTC (rev 20933) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-02 10:04:33 UTC (rev 20934) @@ -2,45 +2,50 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = netatalk -VERSION = 3.0.1 +VERSION = 3.0.3 GARTYPE = v2 -DESCRIPTION = Brief description +DESCRIPTION = Open Source AFP fileserver define BLURB - Long description + Netatalk is a freely-available Open Source AFP fileserver. A *NIX/*BSD system + running Netatalk is capable of serving many Macintosh clients simultaneously + as an AppleShare file server (AFP). endef MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz +DISTFILES += CSWnetatalk.postinstall CSWnetatalk.preremove PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -GARCOMPILER = GNU -PACKAGES += CSWlibatalk1 -CATALOGNAME_CSWlibatalk1 = libatalk1 -PKGFILES_CSWlibatalk1 += $(call baseisadirs,$(libdir),libatalk\.so\.1\.0\.0) -PKGFILES_CSWlibatalk1 += $(call baseisadirs,$(libdir),libatalk\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibatalk1 += $(DESCRIPTION), libatalk.so.1 -RUNTIME_DEP_PKGS_CSWlibatalk1 += CSWlibiconv2 +BUILD_DEP_PKGS += CSWlibgcrypt-dev +BUILD_DEP_PKGS += CSWbdb48devel +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibkrb5-dev +BUILD_DEP_PKGS += CSWlibdbus-dev +BUILD_DEP_PKGS += CSWlibdbus-glib-dev -PACKAGES += CSWetatalk -SPKG_DESC_CSWetatalk = $(DESCRIPTION) -# PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWnetatalk += CSWlibatalk1 +RUNTIME_DEP_PKGS += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS += CSWlibgcrypt11 +RUNTIME_DEP_PKGS += CSWbdb48 +RUNTIME_DEP_PKGS += CSWlibiconv2 +RUNTIME_DEP_PKGS += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS += CSWkrb5lib +RUNTIME_DEP_PKGS += CSWlibdbus +RUNTIME_DEP_PKGS += CSWdbusglib +# Both patched are in upstream and will be in 3.0.4 +PATCHFILES += 0001-Fix-use-of-unnamed-union-inside-struct.patch +PATCHFILES += 0003-Fix-misspelled-compiler-variable.patch -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --disable-tcp-wrappers +CONFIGURE_ARGS += --with-bdb=/opt/csw/bdb48 +CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/run/netatalk +CONFIGURE_ARGS += --with-init-style=solaris +CONFIGURE_ARGS += --with-init-dir=/var/opt/csw/svc/manifest/network/ -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - -CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-ssl-dir=/opt/csw --with-bdb=/opt/csw/bdb47 --with-libiconv=/opt/csw --disable-tcp-wrappers --disable-silent-rules --with-libevent-header=/opt/csw/include --with-libevent-lib=/opt/csw/lib - -#EXTRA_LINKER_FLAGS = -levent - include gar/category.mk Modified: csw/mgar/pkg/netatalk/trunk/checksums =================================================================== --- csw/mgar/pkg/netatalk/trunk/checksums 2013-05-02 07:47:16 UTC (rev 20933) +++ csw/mgar/pkg/netatalk/trunk/checksums 2013-05-02 10:04:33 UTC (rev 20934) @@ -1 +1 @@ -0d9446247e1eb260bf4205ea075958c0 netatalk-3.0.1.tar.gz +cbecbb09a390126d1c74bcfbce3b32c5 netatalk-3.0.3.tar.gz Added: csw/mgar/pkg/netatalk/trunk/files/0001-Fix-use-of-unnamed-union-inside-struct.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0001-Fix-use-of-unnamed-union-inside-struct.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0001-Fix-use-of-unnamed-union-inside-struct.patch 2013-05-02 10:04:33 UTC (rev 20934) @@ -0,0 +1,181 @@ +From fa8a635cd0894ee40d05d41482608707b5b2419c Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Thu, 2 May 2013 10:23:02 +0200 +Subject: [PATCH] Fix use of unnamed union inside struct + +--- + include/atalk/dsi.h | 2 +- + libatalk/dsi/dsi_close.c | 2 +- + libatalk/dsi/dsi_cmdreply.c | 2 +- + libatalk/dsi/dsi_getsess.c | 6 +++--- + libatalk/dsi/dsi_getstat.c | 2 +- + libatalk/dsi/dsi_opensess.c | 2 +- + libatalk/dsi/dsi_read.c | 2 +- + libatalk/dsi/dsi_stream.c | 6 +++--- + libatalk/dsi/dsi_tcp.c | 2 +- + libatalk/dsi/dsi_write.c | 2 +- + 10 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h +index fc1af46..c31b522 100644 +--- a/include/atalk/dsi.h ++++ b/include/atalk/dsi.h +@@ -48,7 +48,7 @@ struct dsi_block { + union { + uint32_t dsi_code; /* error code */ + uint32_t dsi_doff; /* data offset */ +- }; ++ } dsi_data; + uint32_t dsi_len; /* total data length */ + uint32_t dsi_reserved; /* reserved field */ + }; +diff --git a/libatalk/dsi/dsi_close.c b/libatalk/dsi/dsi_close.c +index 892b982..199954f 100644 +--- a/libatalk/dsi/dsi_close.c ++++ b/libatalk/dsi/dsi_close.c +@@ -21,7 +21,7 @@ void dsi_close(DSI *dsi) + dsi->header.dsi_flags = DSIFL_REQUEST; + dsi->header.dsi_command = DSIFUNC_CLOSE; + dsi->header.dsi_requestID = htons(dsi_serverID(dsi)); +- dsi->header.dsi_code = dsi->header.dsi_reserved = htonl(0); ++ dsi->header.dsi_data.dsi_code = dsi->header.dsi_reserved = htonl(0); + dsi->cmdlen = 0; + dsi_send(dsi); + dsi->proto_close(dsi); +diff --git a/libatalk/dsi/dsi_cmdreply.c b/libatalk/dsi/dsi_cmdreply.c +index 5b0d627..04d1708 100644 +--- a/libatalk/dsi/dsi_cmdreply.c ++++ b/libatalk/dsi/dsi_cmdreply.c +@@ -25,7 +25,7 @@ int dsi_cmdreply(DSI *dsi, const int err) + + dsi->header.dsi_flags = DSIFL_REPLY; + dsi->header.dsi_len = htonl(dsi->datalen); +- dsi->header.dsi_code = htonl(err); ++ dsi->header.dsi_data.dsi_code = htonl(err); + + ret = dsi_stream_send(dsi, dsi->data, dsi->datalen); + +diff --git a/libatalk/dsi/dsi_getsess.c b/libatalk/dsi/dsi_getsess.c +index 38477be..a928d34 100644 +--- a/libatalk/dsi/dsi_getsess.c ++++ b/libatalk/dsi/dsi_getsess.c +@@ -65,9 +65,9 @@ int dsi_getsession(DSI *dsi, server_child_t *serv_children, int tickleval, afp_c + LOG(log_error, logtype_dsi, "dsi_getsess: %s", strerror(errno)); + close(ipc_fds[0]); + dsi->header.dsi_flags = DSIFL_REPLY; +- dsi->header.dsi_code = DSIERR_SERVBUSY; ++ dsi->header.dsi_data.dsi_code = DSIERR_SERVBUSY; + dsi_send(dsi); +- dsi->header.dsi_code = DSIERR_OK; ++ dsi->header.dsi_data.dsi_code = DSIERR_OK; + kill(pid, SIGKILL); + } + dsi->proto_close(dsi); +@@ -81,7 +81,7 @@ int dsi_getsession(DSI *dsi, server_child_t *serv_children, int tickleval, afp_c + (dsi->header.dsi_command == DSIFUNC_OPEN)) { + LOG(log_info, logtype_dsi, "dsi_getsess: too many connections"); + dsi->header.dsi_flags = DSIFL_REPLY; +- dsi->header.dsi_code = DSIERR_TOOMANY; ++ dsi->header.dsi_data.dsi_code = DSIERR_TOOMANY; + dsi_send(dsi); + exit(EXITERR_CLNT); + } +diff --git a/libatalk/dsi/dsi_getstat.c b/libatalk/dsi/dsi_getstat.c +index dac4f76..4be9b80 100644 +--- a/libatalk/dsi/dsi_getstat.c ++++ b/libatalk/dsi/dsi_getstat.c +@@ -20,7 +20,7 @@ void dsi_getstatus(DSI *dsi) + { + dsi->header.dsi_flags = DSIFL_REPLY; + /*dsi->header.dsi_command = DSIFUNC_STAT;*/ +- dsi->header.dsi_code = dsi->header.dsi_reserved = 0; ++ dsi->header.dsi_data.dsi_code = dsi->header.dsi_reserved = 0; + + memcpy(dsi->commands, dsi->status, dsi->statuslen); + dsi->cmdlen = dsi->statuslen; +diff --git a/libatalk/dsi/dsi_opensess.c b/libatalk/dsi/dsi_opensess.c +index a2dcb4c..2945f9b 100644 +--- a/libatalk/dsi/dsi_opensess.c ++++ b/libatalk/dsi/dsi_opensess.c +@@ -44,7 +44,7 @@ void dsi_opensession(DSI *dsi) + /* let the client know the server quantum. we don't use the + * max server quantum due to a bug in appleshare client 3.8.6. */ + dsi->header.dsi_flags = DSIFL_REPLY; +- dsi->header.dsi_code = 0; ++ dsi->header.dsi_data.dsi_code = 0; + /* dsi->header.dsi_command = DSIFUNC_OPEN;*/ + + dsi->cmdlen = 2 * (2 + sizeof(i)); /* length of data. dsi_send uses it. */ +diff --git a/libatalk/dsi/dsi_read.c b/libatalk/dsi/dsi_read.c +index a0cbd87..31ee3bd 100644 +--- a/libatalk/dsi/dsi_read.c ++++ b/libatalk/dsi/dsi_read.c +@@ -31,7 +31,7 @@ ssize_t dsi_readinit(DSI *dsi, void *buf, const size_t buflen, const size_t size + dsi->flags |= DSI_NOREPLY; /* we will handle our own replies */ + dsi->header.dsi_flags = DSIFL_REPLY; + dsi->header.dsi_len = htonl(size); +- dsi->header.dsi_code = htonl(err); ++ dsi->header.dsi_data.dsi_code = htonl(err); + + dsi->in_write++; + if (dsi_stream_send(dsi, buf, buflen)) { +diff --git a/libatalk/dsi/dsi_stream.c b/libatalk/dsi/dsi_stream.c +index 05c36fc..afce54e 100644 +--- a/libatalk/dsi/dsi_stream.c ++++ b/libatalk/dsi/dsi_stream.c +@@ -45,7 +45,7 @@ static void dsi_header_pack_reply(const DSI *dsi, char *buf) + buf[0] = dsi->header.dsi_flags; + buf[1] = dsi->header.dsi_command; + memcpy(buf + 2, &dsi->header.dsi_requestID, sizeof(dsi->header.dsi_requestID)); +- memcpy(buf + 4, &dsi->header.dsi_code, sizeof(dsi->header.dsi_code)); ++ memcpy(buf + 4, &dsi->header.dsi_data.dsi_code, sizeof(dsi->header.dsi_data.dsi_code)); + memcpy(buf + 8, &dsi->header.dsi_len, sizeof(dsi->header.dsi_len)); + memcpy(buf + 12, &dsi->header.dsi_reserved, sizeof(dsi->header.dsi_reserved)); + } +@@ -366,7 +366,7 @@ ssize_t dsi_stream_read_file(DSI *dsi, const int fromfd, off_t offset, const siz + dsi->flags |= DSI_NOREPLY; + dsi->header.dsi_flags = DSIFL_REPLY; + dsi->header.dsi_len = htonl(length); +- dsi->header.dsi_code = htonl(err); ++ dsi->header.dsi_data.dsi_code = htonl(err); + dsi_header_pack_reply(dsi, block); + + #ifdef HAVE_SENDFILEV +@@ -615,7 +615,7 @@ int dsi_stream_receive(DSI *dsi) + return 0; + + memcpy(&dsi->header.dsi_requestID, block + 2, sizeof(dsi->header.dsi_requestID)); +- memcpy(&dsi->header.dsi_code, block + 4, sizeof(dsi->header.dsi_code)); ++ memcpy(&dsi->header.dsi_data.dsi_code, block + 4, sizeof(dsi->header.dsi_data.dsi_code)); + memcpy(&dsi->header.dsi_len, block + 8, sizeof(dsi->header.dsi_len)); + memcpy(&dsi->header.dsi_reserved, block + 12, sizeof(dsi->header.dsi_reserved)); + dsi->clientID = ntohs(dsi->header.dsi_requestID); +diff --git a/libatalk/dsi/dsi_tcp.c b/libatalk/dsi/dsi_tcp.c +index f73147a..731252e 100644 +--- a/libatalk/dsi/dsi_tcp.c ++++ b/libatalk/dsi/dsi_tcp.c +@@ -209,7 +209,7 @@ static pid_t dsi_tcp_open(DSI *dsi) + dsi->header.dsi_command = block[1]; + memcpy(&dsi->header.dsi_requestID, block + 2, + sizeof(dsi->header.dsi_requestID)); +- memcpy(&dsi->header.dsi_code, block + 4, sizeof(dsi->header.dsi_code)); ++ memcpy(&dsi->header.dsi_data.dsi_code, block + 4, sizeof(dsi->header.dsi_data.dsi_code)); + memcpy(&dsi->header.dsi_len, block + 8, sizeof(dsi->header.dsi_len)); + memcpy(&dsi->header.dsi_reserved, block + 12, + sizeof(dsi->header.dsi_reserved)); +diff --git a/libatalk/dsi/dsi_write.c b/libatalk/dsi/dsi_write.c +index 65a479e..dc35caf 100644 +--- a/libatalk/dsi/dsi_write.c ++++ b/libatalk/dsi/dsi_write.c +@@ -32,7 +32,7 @@ size_t dsi_writeinit(DSI *dsi, void *buf, const size_t buflen _U_) + + /* figure out how much data we have. do a couple checks for 0 + * data */ +- header = ntohl(dsi->header.dsi_doff); ++ header = ntohl(dsi->header.dsi_data.dsi_doff); + dsi->datasize = header ? ntohl(dsi->header.dsi_len) - header : 0; + + if (dsi->datasize > 0) { +-- +1.8.1.4 + Added: csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch 2013-05-02 10:04:33 UTC (rev 20934) @@ -0,0 +1,36 @@ +From a03430e9e6b9f9a83902e652cad6d06d3931ce3e Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Thu, 2 May 2013 10:28:11 +0200 +Subject: [PATCH 3/3] Fix misspelled compiler variable + +--- + configure | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index f34f304..3bbb206 100755 +--- a/configure ++++ b/configure +@@ -17413,7 +17413,7 @@ fi + + + CFLAGS="$save_CFLAGS" +-LDLFLAGS="$save_LDLFLAGS" ++LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + + +@@ -21818,8 +21818,8 @@ $as_echo " CFLAGS = $ZEROCONF_CFLAGS" >&6; } + if test x"$netatalk_cv_ldap" = x"yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: LDAP:" >&5 + $as_echo " LDAP:" >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: LIBS = $LDAP_LDLFLAGS $LDAP_LIBS" >&5 +-$as_echo " LIBS = $LDAP_LDLFLAGS $LDAP_LIBS" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: LIBS = $LDAP_LDFLAGS $LDAP_LIBS" >&5 ++$as_echo " LIBS = $LDAP_LDFLAGS $LDAP_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: CFLAGS = $LDAP_CFLAGS" >&5 + $as_echo " CFLAGS = $LDAP_CFLAGS" >&6; } + fi +-- +1.8.1.4 + Added: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2013-05-02 10:04:33 UTC (rev 20934) @@ -0,0 +1,2 @@ +#!/bin/sh +svccfg import /var/opt/csw/svc/manifest/network/netatalk.xml Added: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2013-05-02 10:04:33 UTC (rev 20934) @@ -0,0 +1,2 @@ +#!/bin/sh +svccfg delete netatalk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu May 2 12:54:56 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 02 May 2013 10:54:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20935] csw/mgar/pkg/xdg-utils/trunk/Makefile Message-ID: Revision: 20935 http://gar.svn.sourceforge.net/gar/?rev=20935&view=rev Author: pfelecan Date: 2013-05-02 10:54:55 +0000 (Thu, 02 May 2013) Log Message: ----------- xdg-utils/trunk: make it architecture neutral Modified Paths: -------------- csw/mgar/pkg/xdg-utils/trunk/Makefile Modified: csw/mgar/pkg/xdg-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/xdg-utils/trunk/Makefile 2013-05-02 10:04:33 UTC (rev 20934) +++ csw/mgar/pkg/xdg-utils/trunk/Makefile 2013-05-02 10:54:55 UTC (rev 20935) @@ -22,6 +22,8 @@ TEST_SCRIPTS = custom +ARCHALL = 1 + include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu May 2 13:11:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 02 May 2013 11:11:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[20936] csw/mgar/pkg/xdg-utils/trunk/Makefile Message-ID: Revision: 20936 http://gar.svn.sourceforge.net/gar/?rev=20936&view=rev Author: pfelecan Date: 2013-05-02 11:11:07 +0000 (Thu, 02 May 2013) Log Message: ----------- xdg-utils/trunk: scrub references to unwelcome paths Modified Paths: -------------- csw/mgar/pkg/xdg-utils/trunk/Makefile Modified: csw/mgar/pkg/xdg-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/xdg-utils/trunk/Makefile 2013-05-02 10:54:55 UTC (rev 20935) +++ csw/mgar/pkg/xdg-utils/trunk/Makefile 2013-05-02 11:11:07 UTC (rev 20936) @@ -24,6 +24,15 @@ ARCHALL = 1 +REINPLACE_WHEN_USRLOCAL = postinstall +REINPLACE_USRLOCAL += /opt/csw/bin/xdg-mime +REINPLACE_USRLOCAL += /opt/csw/bin/xdg-desktop-menu +REINPLACE_USRLOCAL += /opt/csw/bin/xdg-icon-resource +REINPLACE_WHEN_USRSHARE = postinstall +REINPLACE_USRSHARE += /opt/csw/bin/xdg-mime +REINPLACE_USRSHARE += /opt/csw/bin/xdg-desktop-menu +REINPLACE_USRSHARE += /opt/csw/bin/xdg-icon-resource + include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu May 2 15:04:11 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 02 May 2013 13:04:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[20937] csw/mgar/pkg/lang-python Message-ID: Revision: 20937 http://gar.svn.sourceforge.net/gar/?rev=20937&view=rev Author: pfelecan Date: 2013-05-02 13:04:09 +0000 (Thu, 02 May 2013) Log Message: ----------- lang-python/netifaces: instantiate Added Paths: ----------- csw/mgar/pkg/lang-python/netifaces/ csw/mgar/pkg/lang-python/netifaces/Makefile csw/mgar/pkg/lang-python/netifaces/branches/ csw/mgar/pkg/lang-python/netifaces/tags/ csw/mgar/pkg/lang-python/netifaces/trunk/ csw/mgar/pkg/lang-python/netifaces/trunk/Makefile csw/mgar/pkg/lang-python/netifaces/trunk/checksums csw/mgar/pkg/lang-python/netifaces/trunk/files/ Added: csw/mgar/pkg/lang-python/netifaces/Makefile =================================================================== --- csw/mgar/pkg/lang-python/netifaces/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/netifaces/Makefile 2013-05-02 13:04:09 UTC (rev 20937) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/netifaces/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/netifaces/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/netifaces/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/netifaces/trunk/Makefile 2013-05-02 13:04:09 UTC (rev 20937) @@ -0,0 +1,23 @@ +# $Id$ + +NAME = netifaces +VERSION = 0.8 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Portable network interface information +define BLURB + netifaces provides a (hopefully portable-ish) way for Python programmers to + get access to a list of the network interfaces on the local machine, and to + obtain the addresses of those network interfaces. +endef + +MASTER_SITES = http://alastairs-place.net/projects/netifaces/ +DISTFILES = $(DISTNAME).tar.gz + +BUILD_DEP_PKGS = CSWpysetuptools + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/lang-python/netifaces/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/netifaces/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/netifaces/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/netifaces/trunk/checksums 2013-05-02 13:04:09 UTC (rev 20937) @@ -0,0 +1 @@ +e57e5983f4c286fac5f8068fbfc5c873 netifaces-0.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu May 2 15:14:58 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 02 May 2013 13:14:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[20938] csw/mgar/pkg/lang-python/netifaces/trunk/Makefile Message-ID: Revision: 20938 http://gar.svn.sourceforge.net/gar/?rev=20938&view=rev Author: pfelecan Date: 2013-05-02 13:14:57 +0000 (Thu, 02 May 2013) Log Message: ----------- lang-python/netifaces: addition of run-time dependency Modified Paths: -------------- csw/mgar/pkg/lang-python/netifaces/trunk/Makefile Modified: csw/mgar/pkg/lang-python/netifaces/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/netifaces/trunk/Makefile 2013-05-02 13:04:09 UTC (rev 20937) +++ csw/mgar/pkg/lang-python/netifaces/trunk/Makefile 2013-05-02 13:14:57 UTC (rev 20938) @@ -19,5 +19,7 @@ CONFIGURE_ARGS = $(DIRPATHS) +RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu May 2 15:20:21 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 02 May 2013 13:20:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20939] csw/mgar/pkg/lang-python/netifaces/trunk/Makefile Message-ID: Revision: 20939 http://gar.svn.sourceforge.net/gar/?rev=20939&view=rev Author: pfelecan Date: 2013-05-02 13:20:21 +0000 (Thu, 02 May 2013) Log Message: ----------- lang-python/netifaces: why the heck python is not a dependency for a Python package? Modified Paths: -------------- csw/mgar/pkg/lang-python/netifaces/trunk/Makefile Modified: csw/mgar/pkg/lang-python/netifaces/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/netifaces/trunk/Makefile 2013-05-02 13:14:57 UTC (rev 20938) +++ csw/mgar/pkg/lang-python/netifaces/trunk/Makefile 2013-05-02 13:20:21 UTC (rev 20939) @@ -20,6 +20,7 @@ CONFIGURE_ARGS = $(DIRPATHS) RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 +CHECKPKG_OVERRIDES_CSWpy-netifaces += surplus-dependency|CSWpython include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu May 2 16:02:14 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 02 May 2013 14:02:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[20940] csw/mgar/pkg/lang-python Message-ID: Revision: 20940 http://gar.svn.sourceforge.net/gar/?rev=20940&view=rev Author: pfelecan Date: 2013-05-02 14:02:13 +0000 (Thu, 02 May 2013) Log Message: ----------- lang-python/cssutils: instatiate Added Paths: ----------- csw/mgar/pkg/lang-python/cssutils/ csw/mgar/pkg/lang-python/cssutils/Makefile csw/mgar/pkg/lang-python/cssutils/branches/ csw/mgar/pkg/lang-python/cssutils/tags/ csw/mgar/pkg/lang-python/cssutils/trunk/ csw/mgar/pkg/lang-python/cssutils/trunk/Makefile csw/mgar/pkg/lang-python/cssutils/trunk/checksums csw/mgar/pkg/lang-python/cssutils/trunk/files/ Added: csw/mgar/pkg/lang-python/cssutils/Makefile =================================================================== --- csw/mgar/pkg/lang-python/cssutils/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/cssutils/Makefile 2013-05-02 14:02:13 UTC (rev 20940) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/cssutils/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/cssutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/cssutils/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/cssutils/trunk/Makefile 2013-05-02 14:02:13 UTC (rev 20940) @@ -0,0 +1,22 @@ +# $Id$ + +NAME = cssutils +VERSION = 0.9.10b1 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = CSS Cascading Style Sheets parser and builder +define BLURB + A Python package to parse and build CSS Cascading Style Sheets. + DOM only, not any rendering facilities! +endef + +MASTER_SITES = https://bitbucket.org/cthedot/cssutils/downloads/ +DISTFILES = $(DISTNAME).zip + +BUILD_DEP_PKGS = CSWpysetuptools + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/lang-python/cssutils/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/cssutils/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/cssutils/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/cssutils/trunk/checksums 2013-05-02 14:02:13 UTC (rev 20940) @@ -0,0 +1 @@ +02ec401aeed5ba6253b739e919eba6d1 cssutils-0.9.10b1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu May 2 16:16:27 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 02 May 2013 14:16:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[20941] csw/mgar/pkg/netatalk/trunk/files Message-ID: Revision: 20941 http://gar.svn.sourceforge.net/gar/?rev=20941&view=rev Author: slowfranklin Date: 2013-05-02 14:16:27 +0000 (Thu, 02 May 2013) Log Message: ----------- Fix package scripts for alt-root installs Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2013-05-02 14:02:13 UTC (rev 20940) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2013-05-02 14:16:27 UTC (rev 20941) @@ -1,2 +1,2 @@ #!/bin/sh -svccfg import /var/opt/csw/svc/manifest/network/netatalk.xml +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/netatalk.xml > /dev/null 2>&1 Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2013-05-02 14:02:13 UTC (rev 20940) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2013-05-02 14:16:27 UTC (rev 20941) @@ -1,2 +1,2 @@ #!/bin/sh -svccfg delete netatalk +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f netatalk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu May 2 19:41:22 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 02 May 2013 17:41:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[20942] csw/mgar/pkg Message-ID: Revision: 20942 http://gar.svn.sourceforge.net/gar/?rev=20942&view=rev Author: slowfranklin Date: 2013-05-02 17:41:21 +0000 (Thu, 02 May 2013) Log Message: ----------- New package Gnome Tracker Added Paths: ----------- csw/mgar/pkg/tracker/ csw/mgar/pkg/tracker/Makefile csw/mgar/pkg/tracker/branches/ csw/mgar/pkg/tracker/tags/ csw/mgar/pkg/tracker/trunk/ csw/mgar/pkg/tracker/trunk/Makefile csw/mgar/pkg/tracker/trunk/checksums csw/mgar/pkg/tracker/trunk/files/ csw/mgar/pkg/tracker/trunk/files/0001-Force-linking-with-CC-not-CXX.patch csw/mgar/pkg/tracker/trunk/files/0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch csw/mgar/pkg/tracker/trunk/files/0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch Added: csw/mgar/pkg/tracker/Makefile =================================================================== --- csw/mgar/pkg/tracker/Makefile (rev 0) +++ csw/mgar/pkg/tracker/Makefile 2013-05-02 17:41:21 UTC (rev 20942) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/tracker/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-05-02 17:41:21 UTC (rev 20942) @@ -0,0 +1,104 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = tracker +# Tracker version after this require glib2 >= 2.35.1 +VERSION = 0.15.2 +GARTYPE = v2 + +DESCRIPTION = semantic data storage for desktop and mobile devices +define BLURB + Tracker is a semantic data storage for desktop and mobile devices. + Tracker uses W3C standards for RDF ontologies using Nepomuk with + SPARQL to query and update the data. + Tracker is a central repository of user information, that provides + two big benefits for the user; shared data between applications + and information which is relational to other information (for + example mixing contacts with files, locations, activities and etc.). +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(NAME)-$(VERSION).tar.xz +GARCOMPILER = GNU + +BUILD_DEP_PKGS += CSWlibgsf-dev +BUILD_DEP_PKGS += CSWvala +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWglib2devel +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibsqlite3-dev +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibpopplerdev +BUILD_DEP_PKGS += CSWlibgif-dev +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWlibtiff-dev +BUILD_DEP_PKGS += CSWlibicu-devel +BUILD_DEP_PKGS += CSWpkgconfig +BUILD_DEP_PKGS += CSWlibpng-dev + +RUNTIME_DEP_PKGS += CSWlibuuid +RUNTIME_DEP_PKGS += CSWlibgsf +RUNTIME_DEP_PKGS += CSWzlib +RUNTIME_DEP_PKGS += CSWvala +RUNTIME_DEP_PKGS += CSWggettext +RUNTIME_DEP_PKGS += CSWglib2 +RUNTIME_DEP_PKGS += CSWgio-fam-backend +RUNTIME_DEP_PKGS += CSWlibiconv2 +RUNTIME_DEP_PKGS += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS += CSWlibxml2 +RUNTIME_DEP_PKGS += CSWlibz1 +RUNTIME_DEP_PKGS += CSWlibpoppler +RUNTIME_DEP_PKGS += CSWlibgif4 +RUNTIME_DEP_PKGS += CSWlibjpeg7 +RUNTIME_DEP_PKGS += CSWlibtiff3 +RUNTIME_DEP_PKGS += CSWlibicu46 +RUNTIME_DEP_PKGS += CSWlibpng15-15 + +PATCHFILES += 0001-Force-linking-with-CC-not-CXX.patch +PATCHFILES += 0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch +PATCHFILES += 0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch + +# Packages +PACKAGES += CSWlibtracker0-16 +PACKAGES += CSWlibtracker-dev +PACKAGES += CSWtracker + +# Catalog names +CATALOGNAME_CSWlibtracker0-16 = libtracker0_16 +CATALOGNAME_CSWlibtracker-dev = libtracker_dev + +# Package descriptions +SPKG_DESC_CSWlibtracker0-16 = Gnome Tracker, libraries +SPKG_DESC_CSWlibtracker-dev = Gnome Tracker, development files +SPKG_DESC_CSWtracker = Gnome Tracker + +# Package payload +PKGFILES_CSWlibtracker0-16 += $(call pkgfiles_lib,libtracker-extract-0.16.so) +PKGFILES_CSWlibtracker0-16 += $(call pkgfiles_lib,libtracker-miner-0.16.so) +PKGFILES_CSWlibtracker0-16 += $(call pkgfiles_lib,libtracker-sparql-0.16.so) +PKGFILES_CSWlibtracker0-16 += $(call baseisadirs,$(libdir),tracker-0\.16/extract-modules/libextract-.*\.so) +PKGFILES_CSWlibtracker0-16 += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so.*) +PKGFILES_CSWlibtracker0-16 += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so.*) + +PKGFILES_CSWlibtracker-dev += $(PKGFILES_DEVEL) + +# Inter-package deps +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker0-16 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker0-16 + +# For gettext +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-tracker-fts +CONFIGURE_ARGS += --disable-unit-tests +CONFIGURE_ARGS += --disable-hal +CONFIGURE_ARGS += --disable-introspection +CONFIGURE_ARGS += --disable-playlist +CONFIGURE_ARGS += --disable-nautilus-extension + +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/tracker/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tracker/trunk/checksums =================================================================== --- csw/mgar/pkg/tracker/trunk/checksums (rev 0) +++ csw/mgar/pkg/tracker/trunk/checksums 2013-05-02 17:41:21 UTC (rev 20942) @@ -0,0 +1 @@ +dc28cac7eb36b5755cf7b4209b363956 tracker-0.15.2.tar.xz Added: csw/mgar/pkg/tracker/trunk/files/0001-Force-linking-with-CC-not-CXX.patch =================================================================== --- csw/mgar/pkg/tracker/trunk/files/0001-Force-linking-with-CC-not-CXX.patch (rev 0) +++ csw/mgar/pkg/tracker/trunk/files/0001-Force-linking-with-CC-not-CXX.patch 2013-05-02 17:41:21 UTC (rev 20942) @@ -0,0 +1,57 @@ +From 418c1723f87ae488294d9744657ce5a34e49c4f1 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 29 Apr 2013 07:39:43 +0200 +Subject: [PATCH] Force linking with CC, not CXX + +Linking with CXX introduces bizarre linker errors where dependent +libs are linked with their relative sourcetree path even in the final +installed libarary. +--- + src/libtracker-extract/Makefile.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/libtracker-extract/Makefile.in b/src/libtracker-extract/Makefile.in +index 0ce7b1d..3d046e9 100644 +--- a/src/libtracker-extract/Makefile.in ++++ b/src/libtracker-extract/Makefile.in +@@ -74,7 +74,7 @@ DIST_COMMON = $(libtracker_extractinclude_HEADERS) $(noinst_HEADERS) \ + @HAVE_MEEGOTOUCH_TRUE@ tracker-encoding-meegotouch.cpp \ + @HAVE_MEEGOTOUCH_TRUE@ tracker-encoding-meegotouch.h + +- at HAVE_INTROSPECTION_TRUE@am__append_3 = $(AM_CPPFLAGS) ++ at HAVE_INTROSPECTION_TRUE@am__append_3 = $(AM_CFLAGS) + @HAVE_INTROSPECTION_TRUE at am__append_4 = TrackerExtract-$(TRACKER_API_VERSION).gir + subdir = src/libtracker-extract + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -152,8 +152,8 @@ AM_V_lt = $(am__v_lt_ at AM_V@) + am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@) + am__v_lt_0 = --silent + libtracker_extract_ at TRACKER_API_VERSION@_la_LINK = $(LIBTOOL) \ +- $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ++ $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libtracker_extract_ at TRACKER_API_VERSION@_la_LDFLAGS) \ + $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) +@@ -531,7 +531,7 @@ GTESTER_REPORT = gtester-report + + # initialize variables for unconditional += appending + TEST_PROGS = +-AM_CPPFLAGS = \ ++AM_CFLAGS = \ + $(BUILD_CFLAGS) \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ +@@ -662,7 +662,7 @@ clean-libLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libtracker-extract- at TRACKER_API_VERSION@.la: $(libtracker_extract_ at TRACKER_API_VERSION@_la_OBJECTS) $(libtracker_extract_ at TRACKER_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libtracker_extract_ at TRACKER_API_VERSION@_la_DEPENDENCIES) +- $(AM_V_CXXLD)$(libtracker_extract_ at TRACKER_API_VERSION@_la_LINK) -rpath $(libdir) $(libtracker_extract_ at TRACKER_API_VERSION@_la_OBJECTS) $(libtracker_extract_ at TRACKER_API_VERSION@_la_LIBADD) $(LIBS) ++ $(AM_V_CCLD)$(libtracker_extract_ at TRACKER_API_VERSION@_la_LINK) -rpath $(libdir) $(libtracker_extract_ at TRACKER_API_VERSION@_la_OBJECTS) $(libtracker_extract_ at TRACKER_API_VERSION@_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +-- +1.7.9.2 + Added: csw/mgar/pkg/tracker/trunk/files/0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch =================================================================== --- csw/mgar/pkg/tracker/trunk/files/0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch (rev 0) +++ csw/mgar/pkg/tracker/trunk/files/0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch 2013-05-02 17:41:21 UTC (rev 20942) @@ -0,0 +1,36 @@ +From 6c8d1ff8a1e0e938aa3433661de558eadb5e75f5 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 9 Jan 2013 15:37:43 +0100 +Subject: [PATCH 4/6] Replace uuid_unparse_lower() with uuid_unparse() + +--- + src/libtracker-sparql/tracker-utils.vala | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/libtracker-sparql/tracker-utils.vala b/src/libtracker-sparql/tracker-utils.vala +index 9b62dce..e23a59c 100644 +--- a/src/libtracker-sparql/tracker-utils.vala ++++ b/src/libtracker-sparql/tracker-utils.vala +@@ -89,8 +89,8 @@ namespace Tracker.Sparql { + [CCode (cname = "uuid_generate")] + private extern static void uuid_generate ([CCode (array_length = false)] uchar[] uuid); + +- [CCode (cname = "uuid_unparse_lower")] +- private extern static void uuid_unparse_lower ([CCode (array_length = false)] uchar[] uuid, char* out); ++ [CCode (cname = "uuid_unparse")] ++ private extern static void uuid_unparse ([CCode (array_length = false)] uchar[] uuid, char* out); + + /** + * tracker_sparql_get_uuid_urn: +@@ -110,7 +110,7 @@ namespace Tracker.Sparql { + string lower = (string) new char[37]; + + uuid_generate (base_uuid); +- uuid_unparse_lower (base_uuid, (char *) lower); ++ uuid_unparse (base_uuid, (char *) lower); + + // generate uuid + return "urn:uuid:%s".printf (lower); +-- +1.7.9.2 + Added: csw/mgar/pkg/tracker/trunk/files/0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch =================================================================== --- csw/mgar/pkg/tracker/trunk/files/0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch (rev 0) +++ csw/mgar/pkg/tracker/trunk/files/0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch 2013-05-02 17:41:21 UTC (rev 20942) @@ -0,0 +1,27 @@ +From 4e73d080ec9bb36465a37e91ff7f9a67aa497f03 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 9 Jan 2013 15:38:32 +0100 +Subject: [PATCH 5/6] _XOPEN_SOURCE hides non-standard stuff, __EXTENSIONS__ + brings them back + +--- + src/tracker-extract/tracker-main.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c +index 7773ebe..3cecd32 100644 +--- a/src/tracker-extract/tracker-main.c ++++ b/src/tracker-extract/tracker-main.c +@@ -21,6 +21,9 @@ + #include "config.h" + + #define _XOPEN_SOURCE ++#ifndef __EXTENSIONS__ ++#define __EXTENSIONS__ ++#endif + #include + #include + #include +-- +1.7.9.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu May 2 19:51:41 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 02 May 2013 17:51:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[20943] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 20943 http://gar.svn.sourceforge.net/gar/?rev=20943&view=rev Author: chninkel Date: 2013-05-02 17:51:39 +0000 (Thu, 02 May 2013) Log Message: ----------- openssh/trunk: updated to 6.2p1 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-05-02 17:41:21 UTC (rev 20942) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-05-02 17:51:39 UTC (rev 20943) @@ -12,7 +12,7 @@ ###### Package information ####### NAME = openssh -VERSION = 6.1p1 +VERSION = 6.2p1 GSSKEX_PATCH_VERSION = 6.1p1 GSSKEX_PATCH_DATE = 20130109 GARTYPE = v2 Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2013-05-02 17:41:21 UTC (rev 20942) +++ csw/mgar/pkg/openssh/trunk/checksums 2013-05-02 17:51:39 UTC (rev 20943) @@ -1 +1 @@ -3345cbf4efe90ffb06a78670ab2d05d5 openssh-6.1p1.tar.gz +7b2d9dd75b5cf267ea1737ec75500316 openssh-6.2p1.tar.gz Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2013-05-02 17:41:21 UTC (rev 20942) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2013-05-02 17:51:39 UTC (rev 20943) @@ -1,3 +1,9 @@ +openssh (6.2p1,REV=2013.05.02) unstable + + * New upstream release. + + -- Yann Rouillard Thu, 02 May 2013 19:48:33 +0200 + openssh (6.1p1,REV=2013.01.08) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu May 2 20:31:29 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 02 May 2013 18:31:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20944] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 20944 http://gar.svn.sourceforge.net/gar/?rev=20944&view=rev Author: chninkel Date: 2013-05-02 18:31:28 +0000 (Thu, 02 May 2013) Log Message: ----------- openssh/trunk: update GSSAPI key exchange patch for 6.2 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/openssh-6.2p1-gsskex-all-20130502.patch Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/openssh-6.1p1-gsskex-all-20130109.patch Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-05-02 17:51:39 UTC (rev 20943) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-05-02 18:31:28 UTC (rev 20944) @@ -13,8 +13,8 @@ NAME = openssh VERSION = 6.2p1 -GSSKEX_PATCH_VERSION = 6.1p1 -GSSKEX_PATCH_DATE = 20130109 +GSSKEX_PATCH_VERSION = 6.2p1 +GSSKEX_PATCH_DATE = 20130502 GARTYPE = v2 DESCRIPTION = OpenSSH Secure Shell Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-6.1p1-gsskex-all-20130109.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-6.1p1-gsskex-all-20130109.patch 2013-05-02 17:51:39 UTC (rev 20943) +++ csw/mgar/pkg/openssh/trunk/files/openssh-6.1p1-gsskex-all-20130109.patch 2013-05-02 18:31:28 UTC (rev 20944) @@ -1,2951 +0,0 @@ -diff --speed-large-files --minimal -Nru openssh-5.8p1/ChangeLog.gssapi openssh-5.8p1.new/ChangeLog.gssapi ---- openssh-5.8p1/ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.8p1.new/ChangeLog.gssapi 2011-02-12 18:07:10.948345760 +0100 -@@ -0,0 +1,113 @@ -+20110101 -+ - Finally update for OpenSSH 5.6p1 -+ - Add GSSAPIServerIdentity option from Jim Basney -+ -+20100308 -+ - [ Makefile.in, key.c, key.h ] -+ Updates for OpenSSH 5.4p1 -+ - [ servconf.c ] -+ Include GSSAPI options in the sshd -T configuration dump, and flag -+ some older configuration options as being unsupported. Thanks to Colin -+ Watson. -+ - -+ -+20100124 -+ - [ sshconnect2.c ] -+ Adapt to deal with additional element in Authmethod structure. Thanks to -+ Colin Watson -+ -+20090615 -+ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c -+ sshd.c ] -+ Fix issues identified by Greg Hudson following a code review -+ Check return value of gss_indicate_mechs -+ Protect GSSAPI calls in monitor, so they can only be used if enabled -+ Check return values of bignum functions in key exchange -+ Use BN_clear_free to clear other side's DH value -+ Make ssh_gssapi_id_kex more robust -+ Only configure kex table pointers if GSSAPI is enabled -+ Don't leak mechanism list, or gss mechanism list -+ Cast data.length before printing -+ If serverkey isn't provided, use an empty string, rather than NULL -+ -+20090201 -+ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h -+ ssh_config.5 sshconnet2.c ] -+ Add support for the GSSAPIClientIdentity option, which allows the user -+ to specify which GSSAPI identity to use to contact a given server -+ -+20080404 -+ - [ gss-serv.c ] -+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow -+ been omitted from a previous version of this patch. Reported by Borislav -+ Stoichkov -+ -+20070317 -+ - [ gss-serv-krb5.c ] -+ Remove C99ism, where new_ccname was being declared in the middle of a -+ function -+ -+20061220 -+ - [ servconf.c ] -+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and -+ documented, behaviour. Reported by Dan Watson. -+ -+20060910 -+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c -+ ssh-gss.h ] -+ add support for gss-group14-sha1 key exchange mechanisms -+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] -+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of -+ acceptor principal checking on multi-homed machines. -+ -+ - [ sshd_config ssh_config ] -+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample -+ configuration files -+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] -+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() -+ Limit length of error messages displayed by client -+ -+20060909 -+ - [ gss-genr.c gss-serv.c ] -+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server -+ only, where they belong -+ -+ -+20060829 -+ - [ gss-serv-krb5.c ] -+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment -+ variable -+ -+20060828 -+ - [ gss-genr.c ] -+ Avoid Heimdal context freeing problem -+ -+ -+20060818 -+ - [ gss-genr.c ssh-gss.h sshconnect2.c ] -+ Make sure that SPENGO is disabled -+ -+ -+20060421 -+ - [ gssgenr.c, sshconnect2.c ] -+ a few type changes (signed versus unsigned, int versus size_t) to -+ fix compiler errors/warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ kexgssc.c, sshconnect2.c ] -+ fix uninitialized variable warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ gssgenr.c ] -+ pass oid to gss_display_status (helpful when using GSSAPI mechglue) -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ gss-serv-krb5.c ] -+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c -+ add client-side GssapiKeyExchange option -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ sshconnect2.c ] -+ add support for GssapiTrustDns option for gssapi-with-mic -+ (from jbasney AT ncsa.uiuc.edu) -+ -diff --speed-large-files --minimal -Nru openssh-5.8p1/Makefile.in openssh-5.8p1.new/Makefile.in ---- openssh-5.8p1/Makefile.in 2011-02-04 01:42:13.000000000 +0100 -+++ openssh-5.8p1.new/Makefile.in 2011-02-12 18:07:10.990611445 +0100 -@@ -75,6 +75,7 @@ - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ - kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ -+ kexgssc.o \ - msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \ - schnorr.o ssh-pkcs11.o - -@@ -91,7 +92,7 @@ - auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ - monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \ - auth-krb5.o \ -- auth2-gss.o gss-serv.o gss-serv-krb5.o \ -+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - sftp-server.o sftp-common.o \ - roaming_common.o roaming_serv.o -diff --speed-large-files --minimal -Nru openssh-5.8p1/auth-krb5.c openssh-5.8p1.new/auth-krb5.c ---- openssh-5.8p1/auth-krb5.c 2009-12-21 00:49:22.000000000 +0100 -+++ openssh-5.8p1.new/auth-krb5.c 2011-02-12 18:07:11.002529804 +0100 -@@ -170,8 +170,13 @@ - - len = strlen(authctxt->krb5_ticket_file) + 6; - authctxt->krb5_ccname = xmalloc(len); -+#ifdef USE_CCAPI -+ snprintf(authctxt->krb5_ccname, len, "API:%s", -+ authctxt->krb5_ticket_file); -+#else - snprintf(authctxt->krb5_ccname, len, "FILE:%s", - authctxt->krb5_ticket_file); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -226,15 +231,22 @@ - #ifndef HEIMDAL - krb5_error_code - ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { -- int tmpfd, ret, oerrno; -+ int ret; - char ccname[40]; - mode_t old_umask; -+#ifdef USE_CCAPI -+ char cctemplate[] = "API:krb5cc_%d"; -+#else -+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; -+ int tmpfd, oerrno; -+#endif - - ret = snprintf(ccname, sizeof(ccname), -- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); -+ cctemplate, geteuid()); - if (ret < 0 || (size_t)ret >= sizeof(ccname)) - return ENOMEM; - -+#ifndef USE_CCAPI - old_umask = umask(0177); - tmpfd = mkstemp(ccname + strlen("FILE:")); - oerrno = errno; -@@ -249,6 +261,7 @@ - return oerrno; - } - close(tmpfd); -+#endif - - return (krb5_cc_resolve(ctx, ccname, ccache)); - } -diff --speed-large-files --minimal -Nru openssh-5.8p1/auth2-gss.c openssh-5.8p1.new/auth2-gss.c ---- openssh-5.8p1/auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 -+++ openssh-5.8p1.new/auth2-gss.c 2011-02-12 18:07:11.030761708 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -52,6 +52,40 @@ - static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_errtok(int, u_int32_t, void *); - -+/* -+ * The 'gssapi_keyex' userauth mechanism. -+ */ -+static int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ int authenticated = 0; -+ Buffer b; -+ gss_buffer_desc mic, gssbuf; -+ u_int len; -+ -+ mic.value = packet_get_string(&len); -+ mic.length = len; -+ -+ packet_check_eom(); -+ -+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ /* gss_kex_context is NULL with privsep, so we can't check it here */ -+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, -+ &gssbuf, &mic)))) -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); -+ -+ buffer_free(&b); -+ xfree(mic.value); -+ -+ return (authenticated); -+} -+ - /* - * We only support those mechanisms that we know about (ie ones that we know - * how to check local user kuserok and the like) -@@ -242,7 +278,8 @@ - - packet_check_eom(); - -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); - - authctxt->postponed = 0; - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); -@@ -277,7 +314,8 @@ - gssbuf.length = buffer_len(&b); - - if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = -+ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)); - else - logit("GSSAPI MIC check failed"); - -@@ -292,6 +330,12 @@ - userauth_finish(authctxt, authenticated, "gssapi-with-mic"); - } - -+Authmethod method_gsskeyex = { -+ "gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication -+}; -+ - Authmethod method_gssapi = { - "gssapi-with-mic", - userauth_gssapi, -diff --speed-large-files --minimal -Nru openssh-5.8p1/auth2.c openssh-5.8p1.new/auth2.c ---- openssh-5.8p1/auth2.c 2010-08-31 14:36:39.000000000 +0200 -+++ openssh-5.8p1.new/auth2.c 2011-02-12 18:07:11.043418162 +0100 -@@ -69,6 +69,7 @@ - extern Authmethod method_kbdint; - extern Authmethod method_hostbased; - #ifdef GSSAPI -+extern Authmethod method_gsskeyex; - extern Authmethod method_gssapi; - #endif - #ifdef JPAKE -@@ -79,6 +80,7 @@ - &method_none, - &method_pubkey, - #ifdef GSSAPI -+ &method_gsskeyex, - &method_gssapi, - #endif - #ifdef JPAKE -diff --speed-large-files --minimal -Nru openssh-5.8p1/clientloop.c openssh-5.8p1.new/clientloop.c ---- openssh-5.8p1/clientloop.c 2011-01-16 13:18:35.000000000 +0100 -+++ openssh-5.8p1.new/clientloop.c 2011-02-12 18:07:11.063578136 +0100 -@@ -111,6 +111,10 @@ - #include "msg.h" - #include "roaming.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - /* import options */ - extern Options options; - -@@ -1483,6 +1487,15 @@ - /* Do channel operations unless rekeying in progress. */ - if (!rekeying) { - channel_after_select(readset, writeset); -+ -+#ifdef GSSAPI -+ if (options.gss_renewal_rekey && -+ ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) { -+ debug("credentials updated - forcing rekey"); -+ need_rekeying = 1; -+ } -+#endif -+ - if (need_rekeying || packet_need_rekeying()) { - debug("need rekeying"); - xxx_kex->done = 0; -diff --speed-large-files --minimal -Nru openssh-5.8p1/configure.ac openssh-5.8p1.new/configure.ac ---- openssh-5.8p1/configure.ac 2011-02-04 01:42:14.000000000 +0100 -+++ openssh-5.8p1.new/configure.ac 2011-02-12 18:07:11.092748915 +0100 -@@ -514,6 +514,30 @@ - [Use tunnel device compatibility to OpenBSD]) - AC_DEFINE([SSH_TUN_PREPEND_AF], [1], - [Prepend the address family to IP tunnel traffic]) -+ AC_MSG_CHECKING(if we have the Security Authorization Session API) -+ AC_TRY_COMPILE([#include ], -+ [SessionCreate(0, 0);], -+ [ac_cv_use_security_session_api="yes" -+ AC_DEFINE(USE_SECURITY_SESSION_API, 1, -+ [platform has the Security Authorization Session API]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes)], -+ [ac_cv_use_security_session_api="no" -+ AC_MSG_RESULT(no)]) -+ AC_MSG_CHECKING(if we have an in-memory credentials cache) -+ AC_TRY_COMPILE( -+ [#include ], -+ [cc_context_t c; -+ (void) cc_initialize (&c, 0, NULL, NULL);], -+ [AC_DEFINE(USE_CCAPI, 1, -+ [platform uses an in-memory credentials cache]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes) -+ if test "x$ac_cv_use_security_session_api" = "xno"; then -+ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) -+ fi], -+ [AC_MSG_RESULT(no)] -+ ) - m4_pattern_allow([AU_IPv]) - AC_CHECK_DECL([AU_IPv4], [], - AC_DEFINE([AU_IPv4], 0, [System only supports IPv4 audit records]) -diff --speed-large-files --minimal -Nru openssh-5.8p1/gss-genr.c openssh-5.8p1.new/gss-genr.c ---- openssh-5.8p1/gss-genr.c 2009-06-22 08:11:07.000000000 +0200 -+++ openssh-5.8p1.new/gss-genr.c 2011-02-12 18:07:11.108432434 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-genr.c,v 1.20 2009/06/22 05:39:28 dtucker Exp $ */ - - /* -- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -39,12 +39,167 @@ - #include "buffer.h" - #include "log.h" - #include "ssh2.h" -+#include "cipher.h" -+#include "key.h" -+#include "kex.h" -+#include - - #include "ssh-gss.h" - - extern u_char *session_id2; - extern u_int session_id2_len; - -+typedef struct { -+ char *encoded; -+ gss_OID oid; -+} ssh_gss_kex_mapping; -+ -+/* -+ * XXX - It would be nice to find a more elegant way of handling the -+ * XXX passing of the key exchange context to the userauth routines -+ */ -+ -+Gssctxt *gss_kex_context = NULL; -+ -+static ssh_gss_kex_mapping *gss_enc2oid = NULL; -+ -+int -+ssh_gssapi_oid_table_ok() { -+ return (gss_enc2oid != NULL); -+} -+ -+/* -+ * Return a list of the gss-group1-sha1 mechanisms supported by this program -+ * -+ * We test mechanisms to ensure that we can use them, to avoid starting -+ * a key exchange with a bad mechanism -+ */ -+ -+char * -+ssh_gssapi_client_mechanisms(const char *host, const char *client) { -+ gss_OID_set gss_supported; -+ OM_uint32 min_status; -+ -+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported))) -+ return NULL; -+ -+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, -+ host, client)); -+} -+ -+char * -+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, -+ const char *host, const char *client) { -+ Buffer buf; -+ size_t i; -+ int oidpos, enclen; -+ char *mechs, *encoded; -+ u_char digest[EVP_MAX_MD_SIZE]; -+ char deroid[2]; -+ const EVP_MD *evp_md = EVP_md5(); -+ EVP_MD_CTX md; -+ -+ if (gss_enc2oid != NULL) { -+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) -+ xfree(gss_enc2oid[i].encoded); -+ xfree(gss_enc2oid); -+ } -+ -+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * -+ (gss_supported->count + 1)); -+ -+ buffer_init(&buf); -+ -+ oidpos = 0; -+ for (i = 0; i < gss_supported->count; i++) { -+ if (gss_supported->elements[i].length < 128 && -+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) { -+ -+ deroid[0] = SSH_GSS_OIDTYPE; -+ deroid[1] = gss_supported->elements[i].length; -+ -+ EVP_DigestInit(&md, evp_md); -+ EVP_DigestUpdate(&md, deroid, 2); -+ EVP_DigestUpdate(&md, -+ gss_supported->elements[i].elements, -+ gss_supported->elements[i].length); -+ EVP_DigestFinal(&md, digest, NULL); -+ -+ encoded = xmalloc(EVP_MD_size(evp_md) * 2); -+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), -+ encoded, EVP_MD_size(evp_md) * 2); -+ -+ if (oidpos != 0) -+ buffer_put_char(&buf, ','); -+ -+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ -+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); -+ gss_enc2oid[oidpos].encoded = encoded; -+ oidpos++; -+ } -+ } -+ gss_enc2oid[oidpos].oid = NULL; -+ gss_enc2oid[oidpos].encoded = NULL; -+ -+ buffer_put_char(&buf, '\0'); -+ -+ mechs = xmalloc(buffer_len(&buf)); -+ buffer_get(&buf, mechs, buffer_len(&buf)); -+ buffer_free(&buf); -+ -+ if (strlen(mechs) == 0) { -+ xfree(mechs); -+ mechs = NULL; -+ } -+ -+ return (mechs); -+} -+ -+gss_OID -+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { -+ int i = 0; -+ -+ switch (kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GEX_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; -+ break; -+ default: -+ return GSS_C_NO_OID; -+ } -+ -+ while (gss_enc2oid[i].encoded != NULL && -+ strcmp(name, gss_enc2oid[i].encoded) != 0) -+ i++; -+ -+ if (gss_enc2oid[i].oid != NULL && ctx != NULL) -+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); -+ -+ return gss_enc2oid[i].oid; -+} -+ - /* Check that the OID in a data stream matches that in the context */ - int - ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) -@@ -197,7 +352,7 @@ - } - - ctx->major = gss_init_sec_context(&ctx->minor, -- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid, -+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid, - GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag, - 0, NULL, recv_tok, NULL, send_tok, flags, NULL); - -@@ -227,8 +382,42 @@ - } - - OM_uint32 -+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name) -+{ -+ gss_buffer_desc gssbuf; -+ gss_name_t gssname; -+ OM_uint32 status; -+ gss_OID_set oidset; -+ -+ gssbuf.value = (void *) name; -+ gssbuf.length = strlen(gssbuf.value); -+ -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ -+ ctx->major = gss_import_name(&ctx->minor, &gssbuf, -+ GSS_C_NT_USER_NAME, &gssname); -+ -+ if (!ctx->major) -+ ctx->major = gss_acquire_cred(&ctx->minor, -+ gssname, 0, oidset, GSS_C_INITIATE, -+ &ctx->client_creds, NULL, NULL); -+ -+ gss_release_name(&status, &gssname); -+ gss_release_oid_set(&status, &oidset); -+ -+ if (ctx->major) -+ ssh_gssapi_error(ctx); -+ -+ return(ctx->major); -+} -+ -+OM_uint32 - ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) - { -+ if (ctx == NULL) -+ return -1; -+ - if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, - GSS_C_QOP_DEFAULT, buffer, hash))) - ssh_gssapi_error(ctx); -@@ -236,6 +425,19 @@ - return (ctx->major); - } - -+/* Priviledged when used by server */ -+OM_uint32 -+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+{ -+ if (ctx == NULL) -+ return -1; -+ -+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -+ gssbuf, gssmic, NULL); -+ -+ return (ctx->major); -+} -+ - void - ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, - const char *context) -@@ -249,11 +451,16 @@ - } - - int --ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) -+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, -+ const char *client) - { - gss_buffer_desc token = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; -+ Gssctxt *intctx = NULL; -+ -+ if (ctx == NULL) -+ ctx = &intctx; - - /* RFC 4462 says we MUST NOT do SPNEGO */ - if (oid->length == spnego_oid.length && -@@ -263,6 +470,10 @@ - ssh_gssapi_build_ctx(ctx); - ssh_gssapi_set_oid(*ctx, oid); - major = ssh_gssapi_import_name(*ctx, host); -+ -+ if (!GSS_ERROR(major) && client) -+ major = ssh_gssapi_client_identity(*ctx, client); -+ - if (!GSS_ERROR(major)) { - major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, - NULL); -@@ -272,10 +483,67 @@ - GSS_C_NO_BUFFER); - } - -- if (GSS_ERROR(major)) -+ if (GSS_ERROR(major) || intctx != NULL) - ssh_gssapi_delete_ctx(ctx); - - return (!GSS_ERROR(major)); - } - -+int -+ssh_gssapi_credentials_updated(Gssctxt *ctxt) { -+ static gss_name_t saved_name = GSS_C_NO_NAME; -+ static OM_uint32 saved_lifetime = 0; -+ static gss_OID saved_mech = GSS_C_NO_OID; -+ static gss_name_t name; -+ static OM_uint32 last_call = 0; -+ OM_uint32 lifetime, now, major, minor; -+ int equal; -+ gss_cred_usage_t usage = GSS_C_INITIATE; -+ -+ now = time(NULL); -+ -+ if (ctxt) { -+ debug("Rekey has happened - updating saved versions"); -+ -+ if (saved_name != GSS_C_NO_NAME) -+ gss_release_name(&minor, &saved_name); -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &saved_name, &saved_lifetime, NULL, NULL); -+ -+ if (!GSS_ERROR(major)) { -+ saved_mech = ctxt->oid; -+ saved_lifetime+= now; -+ } else { -+ /* Handle the error */ -+ } -+ return 0; -+ } -+ -+ if (now - last_call < 10) -+ return 0; -+ -+ last_call = now; -+ -+ if (saved_mech == GSS_C_NO_OID) -+ return 0; -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &name, &lifetime, NULL, NULL); -+ if (major == GSS_S_CREDENTIALS_EXPIRED) -+ return 0; -+ else if (GSS_ERROR(major)) -+ return 0; -+ -+ major = gss_compare_name(&minor, saved_name, name, &equal); -+ gss_release_name(&minor, &name); -+ if (GSS_ERROR(major)) -+ return 0; -+ -+ if (equal && (saved_lifetime < lifetime + now - 10)) -+ return 1; -+ -+ return 0; -+} -+ - #endif /* GSSAPI */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/gss-serv-krb5.c openssh-5.8p1.new/gss-serv-krb5.c ---- openssh-5.8p1/gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200 -+++ openssh-5.8p1.new/gss-serv-krb5.c 2011-02-12 18:07:11.123072516 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -120,6 +120,7 @@ - krb5_principal princ; - OM_uint32 maj_status, min_status; - int len; -+ const char *new_ccname; - - if (client->creds == NULL) { - debug("No credentials stored"); -@@ -168,11 +169,16 @@ - return; - } - -- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); -+ new_ccname = krb5_cc_get_name(krb_context, ccache); -+ - client->store.envvar = "KRB5CCNAME"; -- len = strlen(client->store.filename) + 6; -- client->store.envval = xmalloc(len); -- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); -+#ifdef USE_CCAPI -+ xasprintf(&client->store.envval, "API:%s", new_ccname); -+ client->store.filename = NULL; -+#else -+ xasprintf(&client->store.envval, "FILE:%s", new_ccname); -+ client->store.filename = xstrdup(new_ccname); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -184,6 +190,71 @@ - return; - } - -+int -+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, -+ ssh_gssapi_client *client) -+{ -+ krb5_ccache ccache = NULL; -+ krb5_principal principal = NULL; -+ char *name = NULL; -+ krb5_error_code problem; -+ OM_uint32 maj_status, min_status; -+ -+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) { -+ logit("krb5_cc_resolve(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ return 0; -+ } -+ -+ /* Find out who the principal in this cache is */ -+ if ((problem = krb5_cc_get_principal(krb_context, ccache, -+ &principal))) { -+ logit("krb5_cc_get_principal(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) { -+ logit("krb5_unparse_name(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ -+ if (strcmp(name,client->exportedname.value)!=0) { -+ debug("Name in local credentials cache differs. Not storing"); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ krb5_free_unparsed_name(krb_context, name); -+ return 0; -+ } -+ krb5_free_unparsed_name(krb_context, name); -+ -+ /* Name matches, so lets get on with it! */ -+ -+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) { -+ logit("krb5_cc_initialize(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ krb5_free_principal(krb_context, principal); -+ -+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds, -+ ccache))) { -+ logit("gss_krb5_copy_ccache() failed. Sorry!"); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ return 1; -+} -+ - ssh_gssapi_mech gssapi_kerberos_mech = { - "toWM5Slw5Ew8Mqkay+al2g==", - "Kerberos", -@@ -191,7 +262,8 @@ - NULL, - &ssh_gssapi_krb5_userok, - NULL, -- &ssh_gssapi_krb5_storecreds -+ &ssh_gssapi_krb5_storecreds, -+ &ssh_gssapi_krb5_updatecreds - }; - - #endif /* KRB5 */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/gss-serv.c openssh-5.8p1.new/gss-serv.c ---- openssh-5.8p1/gss-serv.c 2008-05-19 07:05:07.000000000 +0200 -+++ openssh-5.8p1.new/gss-serv.c 2011-02-12 18:07:11.135178913 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -45,15 +45,20 @@ - #include "channels.h" - #include "session.h" - #include "misc.h" -+#include "servconf.h" -+#include "uidswap.h" - - #include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+extern ServerOptions options; - - static ssh_gssapi_client gssapi_client = - { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, -- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}}; -+ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL, {NULL, NULL, NULL}, 0, 0}; - - ssh_gssapi_mech gssapi_null_mech = -- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL}; -+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL}; - - #ifdef KRB5 - extern ssh_gssapi_mech gssapi_kerberos_mech; -@@ -81,25 +86,32 @@ - char lname[MAXHOSTNAMELEN]; - gss_OID_set oidset; - -- gss_create_empty_oid_set(&status, &oidset); -- gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ if (options.gss_strict_acceptor) { -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -- gss_release_oid_set(&status, &oidset); -- return (-1); -- } -+ if (gethostname(lname, MAXHOSTNAMELEN)) { -+ gss_release_oid_set(&status, &oidset); -+ return (-1); -+ } -+ -+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { -+ gss_release_oid_set(&status, &oidset); -+ return (ctx->major); -+ } -+ -+ if ((ctx->major = gss_acquire_cred(&ctx->minor, -+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, -+ NULL, NULL))) -+ ssh_gssapi_error(ctx); - -- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { - gss_release_oid_set(&status, &oidset); - return (ctx->major); -+ } else { -+ ctx->name = GSS_C_NO_NAME; -+ ctx->creds = GSS_C_NO_CREDENTIAL; - } -- -- if ((ctx->major = gss_acquire_cred(&ctx->minor, -- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) -- ssh_gssapi_error(ctx); -- -- gss_release_oid_set(&status, &oidset); -- return (ctx->major); -+ return GSS_S_COMPLETE; - } - - /* Privileged */ -@@ -114,6 +126,29 @@ - } - - /* Unprivileged */ -+char * -+ssh_gssapi_server_mechanisms() { -+ gss_OID_set supported; -+ -+ ssh_gssapi_supported_oids(&supported); -+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, -+ NULL, NULL)); -+} -+ -+/* Unprivileged */ -+int -+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data, -+ const char *dummy) { -+ Gssctxt *ctx = NULL; -+ int res; -+ -+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); -+ ssh_gssapi_delete_ctx(&ctx); -+ -+ return (res); -+} -+ -+/* Unprivileged */ - void - ssh_gssapi_supported_oids(gss_OID_set *oidset) - { -@@ -123,7 +158,9 @@ - gss_OID_set supported; - - gss_create_empty_oid_set(&min_status, oidset); -- gss_indicate_mechs(&min_status, &supported); -+ -+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported))) -+ return; - - while (supported_mechs[i]->name != NULL) { - if (GSS_ERROR(gss_test_oid_set_member(&min_status, -@@ -247,8 +284,48 @@ - ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client) - { - int i = 0; -+ int equal = 0; -+ gss_name_t new_name = GSS_C_NO_NAME; -+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER; - -- gss_buffer_desc ename; -+ if (options.gss_store_rekey && client->used && ctx->client_creds) { -+ if (client->mech->oid.length != ctx->oid->length || -+ (memcmp(client->mech->oid.elements, -+ ctx->oid->elements, ctx->oid->length) !=0)) { -+ debug("Rekeyed credentials have different mechanism"); -+ return GSS_S_COMPLETE; -+ } -+ -+ if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor, -+ ctx->client_creds, ctx->oid, &new_name, -+ NULL, NULL, NULL))) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ -+ ctx->major = gss_compare_name(&ctx->minor, client->name, -+ new_name, &equal); -+ -+ if (GSS_ERROR(ctx->major)) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ -+ if (!equal) { -+ debug("Rekeyed credentials have different name"); -+ return GSS_S_COMPLETE; -+ } -+ -+ debug("Marking rekeyed credentials for export"); -+ -+ gss_release_name(&ctx->minor, &client->name); -+ gss_release_cred(&ctx->minor, &client->creds); -+ client->name = new_name; -+ client->creds = ctx->client_creds; -+ ctx->client_creds = GSS_C_NO_CREDENTIAL; -+ client->updated = 1; -+ return GSS_S_COMPLETE; -+ } - - client->mech = NULL; - -@@ -263,6 +340,13 @@ - if (client->mech == NULL) - return GSS_S_FAILURE; - -+ if (ctx->client_creds && -+ (ctx->major = gss_inquire_cred_by_mech(&ctx->minor, -+ ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ - if ((ctx->major = gss_display_name(&ctx->minor, ctx->client, - &client->displayname, NULL))) { - ssh_gssapi_error(ctx); -@@ -280,6 +364,8 @@ - return (ctx->major); - } - -+ gss_release_buffer(&ctx->minor, &ename); -+ - /* We can't copy this structure, so we just move the pointer to it */ - client->creds = ctx->client_creds; - ctx->client_creds = GSS_C_NO_CREDENTIAL; -@@ -327,7 +413,7 @@ - - /* Privileged */ - int --ssh_gssapi_userok(char *user) -+ssh_gssapi_userok(char *user, struct passwd *pw) - { - OM_uint32 lmin; - -@@ -337,9 +423,11 @@ - return 0; - } - if (gssapi_client.mech && gssapi_client.mech->userok) -- if ((*gssapi_client.mech->userok)(&gssapi_client, user)) -+ if ((*gssapi_client.mech->userok)(&gssapi_client, user)) { -+ gssapi_client.used = 1; -+ gssapi_client.store.owner = pw; - return 1; -- else { -+ } else { - /* Destroy delegated credentials if userok fails */ - gss_release_buffer(&lmin, &gssapi_client.displayname); - gss_release_buffer(&lmin, &gssapi_client.exportedname); -@@ -352,14 +440,90 @@ - return (0); - } - --/* Privileged */ --OM_uint32 --ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+/* These bits are only used for rekeying. The unpriviledged child is running -+ * as the user, the monitor is root. -+ * -+ * In the child, we want to : -+ * *) Ask the monitor to store our credentials into the store we specify -+ * *) If it succeeds, maybe do a PAM update -+ */ -+ -+/* Stuff for PAM */ -+ -+#ifdef USE_PAM -+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg, -+ struct pam_response **resp, void *data) - { -- ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -- gssbuf, gssmic, NULL); -+ return (PAM_CONV_ERR); -+} -+#endif - -- return (ctx->major); -+void -+ssh_gssapi_rekey_creds() { -+ int ok; -+ int ret; -+#ifdef USE_PAM -+ pam_handle_t *pamh = NULL; -+ struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL}; -+ char *envstr; -+#endif -+ -+ if (gssapi_client.store.filename == NULL && -+ gssapi_client.store.envval == NULL && -+ gssapi_client.store.envvar == NULL) -+ return; -+ -+ ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store)); -+ -+ if (!ok) -+ return; -+ -+ debug("Rekeyed credentials stored successfully"); -+ -+ /* Actually managing to play with the ssh pam stack from here will -+ * be next to impossible. In any case, we may want different options -+ * for rekeying. So, use our own :) -+ */ -+#ifdef USE_PAM -+ if (!use_privsep) { -+ debug("Not even going to try and do PAM with privsep disabled"); -+ return; -+ } -+ -+ ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name, -+ &pamconv, &pamh); -+ if (ret) -+ return; -+ -+ xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar, -+ gssapi_client.store.envval); -+ -+ ret = pam_putenv(pamh, envstr); -+ if (!ret) -+ pam_setcred(pamh, PAM_REINITIALIZE_CRED); -+ pam_end(pamh, PAM_SUCCESS); -+#endif -+} -+ -+int -+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) { -+ int ok = 0; -+ -+ /* Check we've got credentials to store */ -+ if (!gssapi_client.updated) -+ return 0; -+ -+ gssapi_client.updated = 0; -+ -+ temporarily_use_uid(gssapi_client.store.owner); -+ if (gssapi_client.mech && gssapi_client.mech->updatecreds) -+ ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client); -+ else -+ debug("No update function for this mechanism"); -+ -+ restore_uid(); -+ -+ return ok; - } - - #endif -diff --speed-large-files --minimal -Nru openssh-5.8p1/kex.c openssh-5.8p1.new/kex.c ---- openssh-5.8p1/kex.c 2010-09-24 14:11:14.000000000 +0200 -+++ openssh-5.8p1.new/kex.c 2011-02-12 18:07:11.149564726 +0100 -@@ -50,6 +50,10 @@ - #include "monitor.h" - #include "roaming.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - #if OPENSSL_VERSION_NUMBER >= 0x00907000L - # if defined(HAVE_EVP_SHA256) - # define evp_ssh_sha256 EVP_sha256 -@@ -358,6 +362,20 @@ - k->kex_type = KEX_ECDH_SHA2; - k->evp_md = kex_ecdh_name_to_evpmd(k->name); - #endif -+#ifdef GSSAPI -+ } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GEX_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP1_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP14_SHA1; -+ k->evp_md = EVP_sha1(); -+#endif - } else - fatal("bad kex alg %s", k->name); - } -diff --speed-large-files --minimal -Nru openssh-5.8p1/kex.h openssh-5.8p1.new/kex.h ---- openssh-5.8p1/kex.h 2010-09-24 14:11:14.000000000 +0200 -+++ openssh-5.8p1.new/kex.h 2011-02-12 18:07:11.161650596 +0100 -@@ -73,6 +73,9 @@ - KEX_DH_GEX_SHA1, - KEX_DH_GEX_SHA256, - KEX_ECDH_SHA2, -+ KEX_GSS_GRP1_SHA1, -+ KEX_GSS_GRP14_SHA1, -+ KEX_GSS_GEX_SHA1, - KEX_MAX - }; - -@@ -129,6 +132,12 @@ - sig_atomic_t done; - int flags; - const EVP_MD *evp_md; -+#ifdef GSSAPI -+ int gss_deleg_creds; -+ int gss_trust_dns; -+ char *gss_host; -+ char *gss_client; -+#endif - char *client_version_string; - char *server_version_string; - int (*verify_host_key)(Key *); -@@ -156,6 +165,11 @@ - void kexecdh_client(Kex *); - void kexecdh_server(Kex *); - -+#ifdef GSSAPI -+void kexgss_client(Kex *); -+void kexgss_server(Kex *); -+#endif -+ - void - kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, - BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); -diff --speed-large-files --minimal -Nru openssh-5.8p1/kexgssc.c openssh-5.8p1.new/kexgssc.c ---- openssh-5.8p1/kexgssc.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.8p1.new/kexgssc.c 2011-02-12 18:07:11.176741991 +0100 -@@ -0,0 +1,334 @@ -+/* -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include "includes.h" -+ -+#include -+#include -+ -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+ -+#include "ssh-gss.h" -+ -+void -+kexgss_client(Kex *kex) { -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr; -+ Gssctxt *ctxt; -+ OM_uint32 maj_status, min_status, ret_flags; -+ u_int klen, kout, slen = 0, hashlen, strlen; -+ DH *dh; -+ BIGNUM *dh_server_pub = NULL; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *p = NULL; -+ BIGNUM *g = NULL; -+ u_char *kbuf, *hash; -+ u_char *serverhostkey = NULL; -+ u_char *empty = ""; -+ char *msg; -+ char *lang; -+ int type = 0; -+ int first = 1; -+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX; -+ -+ /* Initialise our GSSAPI world */ -+ ssh_gssapi_build_ctx(&ctxt); -+ if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) -+ == GSS_C_NO_OID) -+ fatal("Couldn't identify host exchange"); -+ -+ if (ssh_gssapi_import_name(ctxt, kex->gss_host)) -+ fatal("Couldn't import hostname"); -+ -+ if (kex->gss_client && -+ ssh_gssapi_client_identity(ctxt, kex->gss_client)) -+ fatal("Couldn't acquire client credentials"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange\n"); -+ nbits = dh_estimate(kex->we_need * 8); -+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ); -+ packet_put_int(min); -+ packet_put_int(nbits); -+ packet_put_int(max); -+ -+ packet_send(); -+ -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP); -+ -+ if ((p = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(p); -+ if ((g = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(g); -+ packet_check_eom(); -+ -+ if (BN_num_bits(p) < min || BN_num_bits(p) > max) -+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d", -+ min, BN_num_bits(p), max); -+ -+ dh = dh_new_group(g, p); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ /* Step 1 - e is dh->pub_key */ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ /* This is f, we initialise it now to make life easier */ -+ dh_server_pub = BN_new(); -+ if (dh_server_pub == NULL) -+ fatal("dh_server_pub == NULL"); -+ -+ token_ptr = GSS_C_NO_BUFFER; -+ -+ do { -+ debug("Calling gss_init_sec_context"); -+ -+ maj_status = ssh_gssapi_init_ctx(ctxt, -+ kex->gss_deleg_creds, token_ptr, &send_tok, -+ &ret_flags); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length != 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ fatal("gss_init_context failed"); -+ } -+ -+ /* If we've got an old receive buffer get rid of it */ -+ if (token_ptr != GSS_C_NO_BUFFER) -+ xfree(recv_tok.value); -+ -+ if (maj_status == GSS_S_COMPLETE) { -+ /* If mutual state flag is not true, kex fails */ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual authentication failed"); -+ -+ /* If integ avail flag is not true kex fails */ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity check failed"); -+ } -+ -+ /* -+ * If we have data to send, then the last message that we -+ * received cannot have been a 'complete'. -+ */ -+ if (send_tok.length != 0) { -+ if (first) { -+ packet_start(SSH2_MSG_KEXGSS_INIT); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ packet_put_bignum2(dh->pub_key); -+ first = 0; -+ } else { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ -+ /* If we've sent them data, they should reply */ -+ do { -+ type = packet_read(); -+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) { -+ debug("Received KEXGSS_HOSTKEY"); -+ if (serverhostkey) -+ fatal("Server host key received more than once"); -+ serverhostkey = -+ packet_get_string(&slen); -+ } -+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY); -+ -+ switch (type) { -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ debug("Received GSSAPI_CONTINUE"); -+ if (maj_status == GSS_S_COMPLETE) -+ fatal("GSSAPI Continue received from server when complete"); -+ recv_tok.value = packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ break; -+ case SSH2_MSG_KEXGSS_COMPLETE: -+ debug("Received GSSAPI_COMPLETE"); -+ packet_get_bignum2(dh_server_pub); -+ msg_tok.value = packet_get_string(&strlen); -+ msg_tok.length = strlen; -+ -+ /* Is there a token included? */ -+ if (packet_get_char()) { -+ recv_tok.value= -+ packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ /* If we're already complete - protocol error */ -+ if (maj_status == GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: received token when complete"); -+ } else { -+ /* No token included */ -+ if (maj_status != GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: did not receive final token"); -+ } -+ break; -+ case SSH2_MSG_KEXGSS_ERROR: -+ debug("Received Error"); -+ maj_status = packet_get_int(); -+ min_status = packet_get_int(); -+ msg = packet_get_string(NULL); -+ lang = packet_get_string(NULL); -+ fatal("GSSAPI Error: \n%.400s",msg); -+ default: -+ packet_disconnect("Protocol error: didn't expect packet type %d", -+ type); -+ } -+ token_ptr = &recv_tok; -+ } else { -+ /* No data, and not complete */ -+ if (maj_status != GSS_S_COMPLETE) -+ fatal("Not complete, and no token output"); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ /* -+ * We _must_ have received a COMPLETE message in reply from the -+ * server, which will have set dh_server_pub and msg_tok -+ */ -+ -+ if (type != SSH2_MSG_KEXGSS_COMPLETE) -+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); -+ -+ /* Check f in range [1, p-1] */ -+ if (!dh_pub_is_valid(dh, dh_server_pub)) -+ packet_disconnect("bad server public DH value"); -+ -+ /* compute K=f^x mod p */ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_server_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_client: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexdh_client: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ dh->pub_key, /* e */ -+ dh_server_pub, /* f */ -+ shared_secret, /* K */ -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh->pub_key, -+ dh_server_pub, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ /* Verify that the hash matches the MIC we just got. */ -+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) -+ packet_disconnect("Hash's MIC didn't verify"); -+ -+ xfree(msg_tok.value); -+ -+ DH_free(dh); -+ if (serverhostkey) -+ xfree(serverhostkey); -+ BN_clear_free(dh_server_pub); -+ -+ /* save session id */ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ if (kex->gss_deleg_creds) -+ ssh_gssapi_credentials_updated(ctxt); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+ -+#endif /* GSSAPI */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/kexgsss.c openssh-5.8p1.new/kexgsss.c ---- openssh-5.8p1/kexgsss.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.8p1.new/kexgsss.c 2011-02-12 18:07:11.186584789 +0100 -@@ -0,0 +1,288 @@ -+/* -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include -+ -+#include -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+#include "ssh-gss.h" -+#include "monitor_wrap.h" -+#include "servconf.h" -+ -+extern ServerOptions options; -+ -+void -+kexgss_server(Kex *kex) -+{ -+ OM_uint32 maj_status, min_status; -+ -+ /* -+ * Some GSSAPI implementations use the input value of ret_flags (an -+ * output variable) as a means of triggering mechanism specific -+ * features. Initializing it to zero avoids inadvertently -+ * activating this non-standard behaviour. -+ */ -+ -+ OM_uint32 ret_flags = 0; -+ gss_buffer_desc gssbuf, recv_tok, msg_tok; -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ Gssctxt *ctxt = NULL; -+ u_int slen, klen, kout, hashlen; -+ u_char *kbuf, *hash; -+ DH *dh; -+ int min = -1, max = -1, nbits = -1; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *dh_client_pub = NULL; -+ int type = 0; -+ gss_OID oid; -+ char *mechs; -+ -+ /* Initialise GSSAPI */ -+ -+ /* If we're rekeying, privsep means that some of the private structures -+ * in the GSSAPI code are no longer available. This kludges them back -+ * into life -+ */ -+ if (!ssh_gssapi_oid_table_ok()) -+ if ((mechs = ssh_gssapi_server_mechanisms())) -+ xfree(mechs); -+ -+ debug2("%s: Identifying %s", __func__, kex->name); -+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); -+ if (oid == GSS_C_NO_OID) -+ fatal("Unknown gssapi mechanism"); -+ -+ debug2("%s: Acquiring credentials", __func__); -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid)))) -+ fatal("Unable to acquire credentials for the server"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange"); -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ); -+ min = packet_get_int(); -+ nbits = packet_get_int(); -+ max = packet_get_int(); -+ min = MAX(DH_GRP_MIN, min); -+ max = MIN(DH_GRP_MAX, max); -+ packet_check_eom(); -+ if (max < min || nbits < min || max < nbits) -+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d", -+ min, nbits, max); -+ dh = PRIVSEP(choose_dh(min, nbits, max)); -+ if (dh == NULL) -+ packet_disconnect("Protocol error: no matching group found"); -+ -+ packet_start(SSH2_MSG_KEXGSS_GROUP); -+ packet_put_bignum2(dh->p); -+ packet_put_bignum2(dh->g); -+ packet_send(); -+ -+ packet_write_wait(); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ do { -+ debug("Wait SSH2_MSG_GSSAPI_INIT"); -+ type = packet_read(); -+ switch(type) { -+ case SSH2_MSG_KEXGSS_INIT: -+ if (dh_client_pub != NULL) -+ fatal("Received KEXGSS_INIT after initialising"); -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ -+ if ((dh_client_pub = BN_new()) == NULL) -+ fatal("dh_client_pub == NULL"); -+ -+ packet_get_bignum2(dh_client_pub); -+ -+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ -+ break; -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ break; -+ default: -+ packet_disconnect( -+ "Protocol error: didn't expect packet type %d", -+ type); -+ } -+ -+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, -+ &send_tok, &ret_flags)); -+ -+ xfree(recv_tok.value); -+ -+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) -+ fatal("Zero length token output when incomplete"); -+ -+ if (dh_client_pub == NULL) -+ fatal("No client public key"); -+ -+ if (maj_status & GSS_S_CONTINUE_NEEDED) { -+ debug("Sending GSSAPI_CONTINUE"); -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length > 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ } -+ fatal("accept_ctx died"); -+ } -+ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual Authentication flag wasn't set"); -+ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity flag wasn't set"); -+ -+ if (!dh_pub_is_valid(dh, dh_client_pub)) -+ packet_disconnect("bad client public DH value"); -+ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_client_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_server: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexgss_server: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, /* Change this if we start sending host keys */ -+ dh_client_pub, dh->pub_key, shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh_client_pub, -+ dh->pub_key, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ BN_clear_free(dh_client_pub); -+ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) -+ fatal("Couldn't get MIC"); -+ -+ packet_start(SSH2_MSG_KEXGSS_COMPLETE); -+ packet_put_bignum2(dh->pub_key); -+ packet_put_string(msg_tok.value,msg_tok.length); -+ -+ if (send_tok.length != 0) { -+ packet_put_char(1); /* true */ -+ packet_put_string(send_tok.value, send_tok.length); -+ } else { -+ packet_put_char(0); /* false */ -+ } -+ packet_send(); -+ -+ gss_release_buffer(&min_status, &send_tok); -+ gss_release_buffer(&min_status, &msg_tok); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ DH_free(dh); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+ -+ /* If this was a rekey, then save out any delegated credentials we -+ * just exchanged. */ -+ if (options.gss_store_rekey) -+ ssh_gssapi_rekey_creds(); -+} -+#endif /* GSSAPI */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/key.c openssh-5.8p1.new/key.c ---- openssh-5.8p1/key.c 2011-02-04 01:48:34.000000000 +0100 -+++ openssh-5.8p1.new/key.c 2011-02-12 18:07:11.202089386 +0100 -@@ -971,6 +971,8 @@ - } - break; - #endif /* OPENSSL_HAS_ECC */ -+ case KEY_NULL: -+ return "null"; - } - return "ssh-unknown"; - } -@@ -1276,6 +1278,8 @@ - strcmp(name, "ecdsa-sha2-nistp521-cert-v01 at openssh.com") == 0) { - return KEY_ECDSA_CERT; - #endif -+ } else if (strcmp(name, "null") == 0) { -+ return KEY_NULL; - } - - debug2("key_type_from_name: unknown key type '%s'", name); -diff --speed-large-files --minimal -Nru openssh-5.8p1/key.h openssh-5.8p1.new/key.h ---- openssh-5.8p1/key.h 2010-11-05 00:19:49.000000000 +0100 -+++ openssh-5.8p1.new/key.h 2011-02-12 18:07:11.216270794 +0100 -@@ -44,6 +44,7 @@ - KEY_ECDSA_CERT, - KEY_RSA_CERT_V00, - KEY_DSA_CERT_V00, -+ KEY_NULL, - KEY_UNSPEC - }; - enum fp_type { -diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor.c openssh-5.8p1.new/monitor.c ---- openssh-5.8p1/monitor.c 2010-09-10 03:23:34.000000000 +0200 -+++ openssh-5.8p1.new/monitor.c 2011-02-12 18:07:11.241713537 +0100 -@@ -172,6 +172,8 @@ - int mm_answer_gss_accept_ctx(int, Buffer *); - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); -+int mm_answer_gss_sign(int, Buffer *); -+int mm_answer_gss_updatecreds(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS -@@ -241,6 +243,7 @@ - {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, - {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, - {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, -+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, - #endif - #ifdef JPAKE - {MONITOR_REQ_JPAKE_GET_PWDATA, MON_ONCE, mm_answer_jpake_get_pwdata}, -@@ -253,6 +256,12 @@ - }; - - struct mon_table mon_dispatch_postauth20[] = { -+#ifdef GSSAPI -+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, -+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, -+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, -+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds}, -+#endif - {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, -@@ -357,6 +366,10 @@ - /* Permit requests for moduli and signatures */ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_proto15; - -@@ -443,6 +456,10 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_postauth15; - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -@@ -1692,6 +1709,13 @@ - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; - kex->kex[KEX_ECDH_SHA2] = kexecdh_server; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->hostkey_type = buffer_get_int(m); - kex->kex_type = buffer_get_int(m); -@@ -1898,6 +1922,9 @@ - OM_uint32 major; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - goid.elements = buffer_get_string(m, &len); - goid.length = len; - -@@ -1925,6 +1952,9 @@ - OM_uint32 flags = 0; /* GSI needs this */ - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - in.value = buffer_get_string(m, &len); - in.length = len; - major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags); -@@ -1942,6 +1972,7 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); - } - return (0); - } -@@ -1953,6 +1984,9 @@ - OM_uint32 ret; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - gssbuf.value = buffer_get_string(m, &len); - gssbuf.length = len; - mic.value = buffer_get_string(m, &len); -@@ -1979,7 +2013,11 @@ - { - int authenticated; - -- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user); -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ authenticated = authctxt->valid && -+ ssh_gssapi_userok(authctxt->user, authctxt->pw); - - buffer_clear(m); - buffer_put_int(m, authenticated); -@@ -1992,6 +2030,74 @@ - /* Monitor loop will terminate if authenticated */ - return (authenticated); - } -+ -+int -+mm_answer_gss_sign(int socket, Buffer *m) -+{ -+ gss_buffer_desc data; -+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; -+ OM_uint32 major, minor; -+ u_int len; -+ -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ data.value = buffer_get_string(m, &len); -+ data.length = len; -+ if (data.length != 20) -+ fatal("%s: data length incorrect: %d", __func__, -+ (int) data.length); -+ -+ /* Save the session ID on the first time around */ -+ if (session_id2_len == 0) { -+ session_id2_len = data.length; -+ session_id2 = xmalloc(session_id2_len); -+ memcpy(session_id2, data.value, session_id2_len); -+ } -+ major = ssh_gssapi_sign(gsscontext, &data, &hash); -+ -+ xfree(data.value); -+ -+ buffer_clear(m); -+ buffer_put_int(m, major); -+ buffer_put_string(m, hash.value, hash.length); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m); -+ -+ gss_release_buffer(&minor, &hash); -+ -+ /* Turn on getpwnam permissions */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); -+ -+ /* And credential updating, for when rekeying */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1); -+ -+ return (0); -+} -+ -+int -+mm_answer_gss_updatecreds(int socket, Buffer *m) { -+ ssh_gssapi_ccache store; -+ int ok; -+ -+ store.filename = buffer_get_string(m, NULL); -+ store.envvar = buffer_get_string(m, NULL); -+ store.envval = buffer_get_string(m, NULL); -+ -+ ok = ssh_gssapi_update_creds(&store); -+ -+ xfree(store.filename); -+ xfree(store.envvar); -+ xfree(store.envval); -+ -+ buffer_clear(m); -+ buffer_put_int(m, ok); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m); -+ -+ return(0); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor.h openssh-5.8p1.new/monitor.h ---- openssh-5.8p1/monitor.h 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.8p1.new/monitor.h 2011-02-12 18:07:11.311728071 +0100 -@@ -53,6 +53,8 @@ - MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP, - MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK, - MONITOR_REQ_GSSCHECKMIC, MONITOR_ANS_GSSCHECKMIC, -+ MONITOR_REQ_GSSSIGN, MONITOR_ANS_GSSSIGN, -+ MONITOR_REQ_GSSUPCREDS, MONITOR_ANS_GSSUPCREDS, - MONITOR_REQ_PAM_START, - MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT, - MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX, -diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor_wrap.c openssh-5.8p1.new/monitor_wrap.c ---- openssh-5.8p1/monitor_wrap.c 2010-08-31 14:41:14.000000000 +0200 -+++ openssh-5.8p1.new/monitor_wrap.c 2011-02-12 18:07:11.359631731 +0100 -@@ -1232,7 +1232,7 @@ - } - - int --mm_ssh_gssapi_userok(char *user) -+mm_ssh_gssapi_userok(char *user, struct passwd *pw) - { - Buffer m; - int authenticated = 0; -@@ -1249,6 +1249,51 @@ - debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); - return (authenticated); - } -+ -+OM_uint32 -+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) -+{ -+ Buffer m; -+ OM_uint32 major; -+ u_int len; -+ -+ buffer_init(&m); -+ buffer_put_string(&m, data->value, data->length); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); -+ -+ major = buffer_get_int(&m); -+ hash->value = buffer_get_string(&m, &len); -+ hash->length = len; -+ -+ buffer_free(&m); -+ -+ return(major); -+} -+ -+int -+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store) -+{ -+ Buffer m; -+ int ok; -+ -+ buffer_init(&m); -+ -+ buffer_put_cstring(&m, store->filename ? store->filename : ""); -+ buffer_put_cstring(&m, store->envvar ? store->envvar : ""); -+ buffer_put_cstring(&m, store->envval ? store->envval : ""); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m); -+ -+ ok = buffer_get_int(&m); -+ -+ buffer_free(&m); -+ -+ return (ok); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor_wrap.h openssh-5.8p1.new/monitor_wrap.h ---- openssh-5.8p1/monitor_wrap.h 2009-03-05 14:58:22.000000000 +0100 -+++ openssh-5.8p1.new/monitor_wrap.h 2011-02-12 18:07:11.407619296 +0100 -@@ -57,8 +57,10 @@ - OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); - OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); --int mm_ssh_gssapi_userok(char *user); -+int mm_ssh_gssapi_userok(char *user, struct passwd *); - OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); -+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *); - #endif - - #ifdef USE_PAM -diff --speed-large-files --minimal -Nru openssh-5.8p1/readconf.c openssh-5.8p1.new/readconf.c ---- openssh-5.8p1/readconf.c 2010-11-20 05:19:38.000000000 +0100 -+++ openssh-5.8p1.new/readconf.c 2011-02-12 18:07:11.460306621 +0100 -@@ -129,6 +129,8 @@ - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey, -+ oGssServerIdentity, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oControlPersist, - oHashKnownHosts, -@@ -169,10 +171,19 @@ - { "afstokenpassing", oUnsupported }, - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, -+ { "gssapikeyexchange", oGssKeyEx }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, -+ { "gssapiclientidentity", oGssClientIdentity }, -+ { "gssapiserveridentity", oGssServerIdentity }, -+ { "gssapirenewalforcesrekey", oGssRenewalRekey }, - #else - { "gssapiauthentication", oUnsupported }, -+ { "gssapikeyexchange", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, -+ { "gssapiclientidentity", oUnsupported }, -+ { "gssapirenewalforcesrekey", oUnsupported }, - #endif - { "fallbacktorsh", oDeprecated }, - { "usersh", oDeprecated }, -@@ -479,10 +490,30 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case oGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ -+ case oGssClientIdentity: -+ charptr = &options->gss_client_identity; -+ goto parse_string; -+ -+ case oGssServerIdentity: -+ charptr = &options->gss_server_identity; -+ goto parse_string; -+ -+ case oGssRenewalRekey: -+ intptr = &options->gss_renewal_rekey; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -1092,7 +1123,12 @@ - options->pubkey_authentication = -1; - options->challenge_response_authentication = -1; - options->gss_authentication = -1; -+ options->gss_keyex = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; -+ options->gss_renewal_rekey = -1; -+ options->gss_client_identity = NULL; -+ options->gss_server_identity = NULL; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -1193,8 +1229,14 @@ - options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; -+ if (options->gss_renewal_rekey == -1) -+ options->gss_renewal_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -diff --speed-large-files --minimal -Nru openssh-5.8p1/readconf.h openssh-5.8p1.new/readconf.h ---- openssh-5.8p1/readconf.h 2010-11-20 05:19:38.000000000 +0100 -+++ openssh-5.8p1.new/readconf.h 2011-02-12 18:07:11.507187275 +0100 -@@ -46,7 +46,12 @@ - int challenge_response_authentication; - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ -+ int gss_keyex; /* Try GSS key exchange */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ -+ int gss_renewal_rekey; /* Credential renewal forces rekey */ -+ char *gss_client_identity; /* Principal to initiate GSSAPI with */ -+ char *gss_server_identity; /* GSSAPI target principal */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/servconf.c openssh-5.8p1.new/servconf.c ---- openssh-5.8p1/servconf.c 2010-11-20 05:19:38.000000000 +0100 -+++ openssh-5.8p1.new/servconf.c 2011-02-12 18:07:11.533252334 +0100 -@@ -97,7 +97,10 @@ - options->kerberos_ticket_cleanup = -1; - options->kerberos_get_afs_token = -1; - options->gss_authentication=-1; -+ options->gss_keyex = -1; - options->gss_cleanup_creds = -1; -+ options->gss_strict_acceptor = -1; -+ options->gss_store_rekey = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->challenge_response_authentication = -1; -@@ -226,8 +229,14 @@ - options->kerberos_get_afs_token = 0; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_cleanup_creds == -1) - options->gss_cleanup_creds = 1; -+ if (options->gss_strict_acceptor == -1) -+ options->gss_strict_acceptor = 1; -+ if (options->gss_store_rekey == -1) -+ options->gss_store_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -@@ -322,7 +331,9 @@ - sBanner, sUseDNS, sHostbasedAuthentication, - sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, - sClientAliveCountMax, sAuthorizedKeysFile, -- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, -+ sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor, -+ sGssKeyEx, sGssStoreRekey, -+ sAcceptEnv, sPermitTunnel, - sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, - sZeroKnowledgePasswordAuthentication, sHostCertificate, -@@ -386,10 +397,20 @@ - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL }, - #endif -+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL }, - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, - { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, -@@ -944,10 +965,22 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case sGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case sGssCleanupCreds: - intptr = &options->gss_cleanup_creds; - goto parse_flag; - -+ case sGssStrictAcceptor: -+ intptr = &options->gss_strict_acceptor; -+ goto parse_flag; -+ -+ case sGssStoreRekey: -+ intptr = &options->gss_store_rekey; -+ goto parse_flag; -+ - case sPasswordAuthentication: - intptr = &options->password_authentication; - goto parse_flag; -@@ -1704,7 +1737,10 @@ - #endif - #ifdef GSSAPI - dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); -+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex); - dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); -+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); -+ dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey); - #endif - #ifdef JPAKE - dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication, -diff --speed-large-files --minimal -Nru openssh-5.8p1/servconf.h openssh-5.8p1.new/servconf.h ---- openssh-5.8p1/servconf.h 2010-11-20 05:19:38.000000000 +0100 -+++ openssh-5.8p1.new/servconf.h 2011-02-12 18:07:11.548572408 +0100 -@@ -97,7 +97,10 @@ - int kerberos_get_afs_token; /* If true, try to get AFS token if - * authenticated with Kerberos. */ - int gss_authentication; /* If true, permit GSSAPI authentication */ -+ int gss_keyex; /* If true, permit GSSAPI key exchange */ - int gss_cleanup_creds; /* If true, destroy cred cache on logout */ -+ int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ -+ int gss_store_rekey; - int password_authentication; /* If true, permit password - * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/ssh-gss.h openssh-5.8p1.new/ssh-gss.h ---- openssh-5.8p1/ssh-gss.h 2007-06-12 15:40:39.000000000 +0200 -+++ openssh-5.8p1.new/ssh-gss.h 2011-02-12 18:07:11.567306608 +0100 -@@ -1,6 +1,6 @@ - /* $OpenBSD: ssh-gss.h,v 1.10 2007/06/12 08:20:00 djm Exp $ */ - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -60,10 +60,22 @@ - - #define SSH_GSS_OIDTYPE 0x06 - -+#define SSH2_MSG_KEXGSS_INIT 30 -+#define SSH2_MSG_KEXGSS_CONTINUE 31 -+#define SSH2_MSG_KEXGSS_COMPLETE 32 -+#define SSH2_MSG_KEXGSS_HOSTKEY 33 -+#define SSH2_MSG_KEXGSS_ERROR 34 -+#define SSH2_MSG_KEXGSS_GROUPREQ 40 -+#define SSH2_MSG_KEXGSS_GROUP 41 -+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" -+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" -+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" -+ - typedef struct { - char *filename; - char *envvar; - char *envval; -+ struct passwd *owner; - void *data; - } ssh_gssapi_ccache; - -@@ -71,8 +83,11 @@ - gss_buffer_desc displayname; - gss_buffer_desc exportedname; - gss_cred_id_t creds; -+ gss_name_t name; - struct ssh_gssapi_mech_struct *mech; - ssh_gssapi_ccache store; -+ int used; -+ int updated; - } ssh_gssapi_client; - - typedef struct ssh_gssapi_mech_struct { -@@ -83,6 +98,7 @@ - int (*userok) (ssh_gssapi_client *, char *); - int (*localname) (ssh_gssapi_client *, char **); - void (*storecreds) (ssh_gssapi_client *); -+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *); - } ssh_gssapi_mech; - - typedef struct { -@@ -93,10 +109,11 @@ - gss_OID oid; /* client */ - gss_cred_id_t creds; /* server */ - gss_name_t client; /* server */ -- gss_cred_id_t client_creds; /* server */ -+ gss_cred_id_t client_creds; /* both */ - } Gssctxt; - - extern ssh_gssapi_mech *supported_mechs[]; -+extern Gssctxt *gss_kex_context; - - int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); - void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); -@@ -116,16 +133,30 @@ - void ssh_gssapi_delete_ctx(Gssctxt **); - OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); --int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); -+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *); -+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *); -+int ssh_gssapi_credentials_updated(Gssctxt *); - - /* In the server */ -+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, -+ const char *); -+char *ssh_gssapi_client_mechanisms(const char *, const char *); -+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *, -+ const char *); -+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); -+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, -+ const char *); - OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); --int ssh_gssapi_userok(char *name); -+int ssh_gssapi_userok(char *name, struct passwd *); - OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_do_child(char ***, u_int *); - void ssh_gssapi_cleanup_creds(void); - void ssh_gssapi_storecreds(void); - -+char *ssh_gssapi_server_mechanisms(void); -+int ssh_gssapi_oid_table_ok(); -+ -+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store); - #endif /* GSSAPI */ - - #endif /* _SSH_GSS_H */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/ssh_config openssh-5.8p1.new/ssh_config ---- openssh-5.8p1/ssh_config 2010-01-12 09:40:27.000000000 +0100 -+++ openssh-5.8p1.new/ssh_config 2011-02-12 18:07:11.580240516 +0100 -@@ -26,6 +26,8 @@ - # HostbasedAuthentication no - # GSSAPIAuthentication no - # GSSAPIDelegateCredentials no -+# GSSAPIKeyExchange no -+# GSSAPITrustDNS no - # BatchMode no - # CheckHostIP yes - # AddressFamily any -diff --speed-large-files --minimal -Nru openssh-5.8p1/ssh_config.5 openssh-5.8p1.new/ssh_config.5 ---- openssh-5.8p1/ssh_config.5 2010-12-26 04:26:48.000000000 +0100 -+++ openssh-5.8p1.new/ssh_config.5 2011-02-12 18:07:11.600266821 +0100 -@@ -508,11 +508,43 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI may be used. When using -+GSSAPI key exchange the server need not have a host key. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIClientIdentity -+If set, specifies the GSSAPI client identity that ssh should use when -+connecting to the server. The default is unset, which means that the default -+identity will be used. -+.It Cm GSSAPIServerIdentity -+If set, specifies the GSSAPI server identity that ssh should expect when -+connecting to the server. The default is unset, which means that the -+expected GSSAPI server identity will be determined from the target -+hostname. - .It Cm GSSAPIDelegateCredentials - Forward (delegate) credentials to the server. - The default is - .Dq no . --Note that this option applies to protocol version 2 only. -+Note that this option applies to protocol version 2 connections using GSSAPI. -+.It Cm GSSAPIRenewalForcesRekey -+If set to -+.Dq yes -+then renewal of the client's GSSAPI credentials will force the rekeying of the -+ssh connection. With a compatible server, this can delegate the renewed -+credentials to a session on the server. -+The default is -+.Dq no . -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no, the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 -diff --speed-large-files --minimal -Nru openssh-5.8p1/sshconnect2.c openssh-5.8p1.new/sshconnect2.c ---- openssh-5.8p1/sshconnect2.c 2010-12-01 02:21:51.000000000 +0100 -+++ openssh-5.8p1.new/sshconnect2.c 2011-02-12 18:07:11.623078773 +0100 -@@ -159,9 +159,34 @@ - { - Kex *kex; - -+#ifdef GSSAPI -+ char *orig = NULL, *gss = NULL; -+ char *gss_host = NULL; -+#endif -+ - xxx_host = host; - xxx_hostaddr = hostaddr; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ /* Add the GSSAPI mechanisms currently supported on this -+ * client to the key exchange algorithm proposal */ -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = host; -+ -+ gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity); -+ if (gss) { -+ debug("Offering GSSAPI proposal: %s", gss); -+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS], -+ "%s,%s", gss, orig); -+ } -+ } -+#endif -+ - if (options.ciphers == (char *)-1) { - logit("No valid ciphers for protocol version 2 given, using defaults."); - options.ciphers = NULL; -@@ -196,6 +221,17 @@ - if (options.kex_algorithms != NULL) - myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; - -+#ifdef GSSAPI -+ /* If we've got GSSAPI algorithms, then we also support the -+ * 'null' hostkey, as a last resort */ -+ if (options.gss_keyex && gss) { -+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; -+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], -+ "%s,null", orig); -+ xfree(gss); -+ } -+#endif -+ - if (options.rekey_limit) - packet_set_rekey_limit((u_int32_t)options.rekey_limit); - -@@ -206,10 +242,30 @@ - kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; - kex->kex[KEX_ECDH_SHA2] = kexecdh_client; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client; -+ } -+#endif - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; - kex->verify_host_key=&verify_host_key_callback; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->gss_deleg_creds = options.gss_deleg_creds; -+ kex->gss_trust_dns = options.gss_trust_dns; -+ kex->gss_client = options.gss_client_identity; -+ if (options.gss_server_identity) { -+ kex->gss_host = options.gss_server_identity; -+ } else { -+ kex->gss_host = gss_host; -+ } -+ } -+#endif -+ - xxx_kex = kex; - - dispatch_run(DISPATCH_BLOCK, &kex->done, kex); -@@ -304,6 +360,7 @@ - void input_gssapi_hash(int type, u_int32_t, void *); - void input_gssapi_error(int, u_int32_t, void *); - void input_gssapi_errtok(int, u_int32_t, void *); -+int userauth_gsskeyex(Authctxt *authctxt); - #endif - - void userauth(Authctxt *, char *); -@@ -319,6 +376,11 @@ - - Authmethod authmethods[] = { - #ifdef GSSAPI -+ {"gssapi-keyex", -+ userauth_gsskeyex, -+ NULL, -+ &options.gss_authentication, -+ NULL}, - {"gssapi-with-mic", - userauth_gssapi, - NULL, -@@ -625,19 +687,31 @@ - static u_int mech = 0; - OM_uint32 min; - int ok = 0; -+ const char *gss_host; -+ -+ if (options.gss_server_identity) -+ gss_host = options.gss_server_identity; -+ else if (options.gss_trust_dns) -+ gss_host = get_canonical_hostname(1); -+ else -+ gss_host = authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ - - if (gss_supported == NULL) -- gss_indicate_mechs(&min, &gss_supported); -+ if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) { -+ gss_supported = NULL; -+ return 0; -+ } - - /* Check to see if the mechanism is usable before we offer it */ - while (mech < gss_supported->count && !ok) { - /* My DER encoding requires length<128 */ - if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, -- &gss_supported->elements[mech], authctxt->host)) { -+ &gss_supported->elements[mech], gss_host, -+ options.gss_client_identity)) { - ok = 1; /* Mechanism works */ - } else { - mech++; -@@ -734,8 +808,8 @@ - { - Authctxt *authctxt = ctxt; - Gssctxt *gssctxt; -- int oidlen; -- char *oidv; -+ u_int oidlen; -+ u_char *oidv; - - if (authctxt == NULL) - fatal("input_gssapi_response: no authentication context"); -@@ -845,6 +919,48 @@ - xfree(msg); - xfree(lang); - } -+ -+int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ Buffer b; -+ gss_buffer_desc gssbuf; -+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; -+ OM_uint32 ms; -+ -+ static int attempt = 0; -+ if (attempt++ >= 1) -+ return (0); -+ -+ if (gss_kex_context == NULL) { -+ debug("No valid Key exchange context"); -+ return (0); -+ } -+ -+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) { -+ buffer_free(&b); -+ return (0); -+ } -+ -+ packet_start(SSH2_MSG_USERAUTH_REQUEST); -+ packet_put_cstring(authctxt->server_user); -+ packet_put_cstring(authctxt->service); -+ packet_put_cstring(authctxt->method->name); -+ packet_put_string(mic.value, mic.length); -+ packet_send(); -+ -+ buffer_free(&b); -+ gss_release_buffer(&ms, &mic); -+ -+ return (1); -+} -+ - #endif /* GSSAPI */ - - int -diff --speed-large-files --minimal -Nru openssh-5.8p1/sshd.c openssh-5.8p1.new/sshd.c ---- openssh-5.8p1/sshd.c 2011-01-11 07:20:31.000000000 +0100 -+++ openssh-5.8p1.new/sshd.c 2011-02-12 18:07:11.656005267 +0100 -@@ -120,6 +120,10 @@ - #include "roaming.h" - #include "version.h" - -+#ifdef USE_SECURITY_SESSION_API -+#include -+#endif -+ - #ifdef LIBWRAP - #include - #include -@@ -1590,10 +1594,13 @@ - logit("Disabling protocol version 1. Could not load host key"); - options.protocol &= ~SSH_PROTO_1; - } -+#ifndef GSSAPI -+ /* The GSSAPI key exchange can run without a host key */ - if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { - logit("Disabling protocol version 2. Could not load host key"); - options.protocol &= ~SSH_PROTO_2; - } -+#endif - if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { - logit("sshd: no hostkeys available -- exiting."); - exit(1); -@@ -1922,6 +1929,60 @@ - /* Log the connection. */ - verbose("Connection from %.500s port %d", remote_ip, remote_port); - -+#ifdef USE_SECURITY_SESSION_API -+ /* -+ * Create a new security session for use by the new user login if -+ * the current session is the root session or we are not launched -+ * by inetd (eg: debugging mode or server mode). We do not -+ * necessarily need to create a session if we are launched from -+ * inetd because Panther xinetd will create a session for us. -+ * -+ * The only case where this logic will fail is if there is an -+ * inetd running in a non-root session which is not creating -+ * new sessions for us. Then all the users will end up in the -+ * same session (bad). -+ * -+ * When the client exits, the session will be destroyed for us -+ * automatically. -+ * -+ * We must create the session before any credentials are stored -+ * (including AFS pags, which happens a few lines below). -+ */ -+ { -+ OSStatus err = 0; -+ SecuritySessionId sid = 0; -+ SessionAttributeBits sattrs = 0; -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("Current Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ -+ if (inetd_flag && !(sattrs & sessionIsRoot)) -+ debug("Running in inetd mode in a non-root session... " -+ "assuming inetd created the session for us."); -+ else { -+ debug("Creating new security session..."); -+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote); -+ if (err) -+ error("SessionCreate() failed with error %.8X", -+ (unsigned) err); -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, -+ &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("New Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ } -+ } -+#endif -+ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is -@@ -2303,6 +2364,48 @@ - - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); - -+#ifdef GSSAPI -+ { -+ char *orig; -+ char *gss = NULL; -+ char *newstr = NULL; -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ /* -+ * If we don't have a host key, then there's no point advertising -+ * the other key exchange algorithms -+ */ -+ -+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0) -+ orig = NULL; -+ -+ if (options.gss_keyex) -+ gss = ssh_gssapi_server_mechanisms(); -+ else -+ gss = NULL; -+ -+ if (gss && orig) -+ xasprintf(&newstr, "%s,%s", gss, orig); -+ else if (gss) -+ newstr = gss; -+ else if (orig) -+ newstr = orig; -+ -+ /* -+ * If we've got GSSAPI mechanisms, then we've got the 'null' host -+ * key alg, but we can't tell people about it unless its the only -+ * host key algorithm we support -+ */ -+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0) -+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null"; -+ -+ if (newstr) -+ myproposal[PROPOSAL_KEX_ALGS] = newstr; -+ else -+ fatal("No supported key exchange algorithms"); -+ } -+#endif -+ - /* start key exchange */ - kex = kex_setup(myproposal); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; -@@ -2310,6 +2413,13 @@ - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; - kex->kex[KEX_ECDH_SHA2] = kexecdh_server; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; -diff --speed-large-files --minimal -Nru openssh-5.8p1/sshd_config openssh-5.8p1.new/sshd_config ---- openssh-5.8p1/sshd_config 2010-09-10 03:20:12.000000000 +0200 -+++ openssh-5.8p1.new/sshd_config 2011-02-12 18:07:11.668077725 +0100 -@@ -72,6 +72,8 @@ - # GSSAPI options - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes -+#GSSAPIStrictAcceptorCheck yes -+#GSSAPIKeyExchange no - - # Set this to 'yes' to enable PAM authentication, account processing, - # and session processing. If this is enabled, PAM authentication will -diff --speed-large-files --minimal -Nru openssh-5.8p1/sshd_config.5 openssh-5.8p1.new/sshd_config.5 ---- openssh-5.8p1/sshd_config.5 2010-12-26 04:26:48.000000000 +0100 -+++ openssh-5.8p1.new/sshd_config.5 2011-02-12 18:07:11.685676774 +0100 -@@ -423,12 +423,40 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange -+doesn't rely on ssh keys to verify host identity. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPICleanupCredentials - Specifies whether to automatically destroy the user's credentials cache - on logout. - The default is - .Dq yes . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIStrictAcceptorCheck -+Determines whether to be strict about the identity of the GSSAPI acceptor -+a client authenticates against. If -+.Dq yes -+then the client must authenticate against the -+.Pa host -+service on the current hostname. If -+.Dq no -+then the client may authenticate against any service key stored in the -+machine's default store. This facility is provided to assist with operation -+on multi homed machines. -+The default is -+.Dq yes . -+Note that this option applies only to protocol version 2 GSSAPI connections, -+and setting it to -+.Dq no -+may only work with recent Kerberos GSSAPI libraries. -+.It Cm GSSAPIStoreCredentialsOnRekey -+Controls whether the user's GSSAPI credentials should be updated following a -+successful connection rekeying. This option can be used to accepted renewed -+or updated credentials from a compatible client. The default is -+.Dq no . - .It Cm HostbasedAuthentication - Specifies whether rhosts or /etc/hosts.equiv authentication together - with successful public key client host authentication is allowed Added: csw/mgar/pkg/openssh/trunk/files/openssh-6.2p1-gsskex-all-20130502.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-6.2p1-gsskex-all-20130502.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/openssh-6.2p1-gsskex-all-20130502.patch 2013-05-02 18:31:28 UTC (rev 20944) @@ -0,0 +1,2953 @@ +diff --speed-large-files --minimal -Nru openssh-5.8p1/ChangeLog.gssapi openssh-5.8p1.new/ChangeLog.gssapi +--- openssh-5.8p1/ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 ++++ openssh-5.8p1.new/ChangeLog.gssapi 2011-02-12 18:07:10.948345760 +0100 +@@ -0,0 +1,113 @@ ++20110101 ++ - Finally update for OpenSSH 5.6p1 ++ - Add GSSAPIServerIdentity option from Jim Basney ++ ++20100308 ++ - [ Makefile.in, key.c, key.h ] ++ Updates for OpenSSH 5.4p1 ++ - [ servconf.c ] ++ Include GSSAPI options in the sshd -T configuration dump, and flag ++ some older configuration options as being unsupported. Thanks to Colin ++ Watson. ++ - ++ ++20100124 ++ - [ sshconnect2.c ] ++ Adapt to deal with additional element in Authmethod structure. Thanks to ++ Colin Watson ++ ++20090615 ++ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c ++ sshd.c ] ++ Fix issues identified by Greg Hudson following a code review ++ Check return value of gss_indicate_mechs ++ Protect GSSAPI calls in monitor, so they can only be used if enabled ++ Check return values of bignum functions in key exchange ++ Use BN_clear_free to clear other side's DH value ++ Make ssh_gssapi_id_kex more robust ++ Only configure kex table pointers if GSSAPI is enabled ++ Don't leak mechanism list, or gss mechanism list ++ Cast data.length before printing ++ If serverkey isn't provided, use an empty string, rather than NULL ++ ++20090201 ++ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h ++ ssh_config.5 sshconnet2.c ] ++ Add support for the GSSAPIClientIdentity option, which allows the user ++ to specify which GSSAPI identity to use to contact a given server ++ ++20080404 ++ - [ gss-serv.c ] ++ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow ++ been omitted from a previous version of this patch. Reported by Borislav ++ Stoichkov ++ ++20070317 ++ - [ gss-serv-krb5.c ] ++ Remove C99ism, where new_ccname was being declared in the middle of a ++ function ++ ++20061220 ++ - [ servconf.c ] ++ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and ++ documented, behaviour. Reported by Dan Watson. ++ ++20060910 ++ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c ++ ssh-gss.h ] ++ add support for gss-group14-sha1 key exchange mechanisms ++ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] ++ Add GSSAPIStrictAcceptorCheck option to allow the disabling of ++ acceptor principal checking on multi-homed machines. ++ ++ - [ sshd_config ssh_config ] ++ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample ++ configuration files ++ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] ++ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() ++ Limit length of error messages displayed by client ++ ++20060909 ++ - [ gss-genr.c gss-serv.c ] ++ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server ++ only, where they belong ++ ++ ++20060829 ++ - [ gss-serv-krb5.c ] ++ Fix CCAPI credentials cache name when creating KRB5CCNAME environment ++ variable ++ ++20060828 ++ - [ gss-genr.c ] ++ Avoid Heimdal context freeing problem ++ ++ ++20060818 ++ - [ gss-genr.c ssh-gss.h sshconnect2.c ] ++ Make sure that SPENGO is disabled ++ ++ ++20060421 ++ - [ gssgenr.c, sshconnect2.c ] ++ a few type changes (signed versus unsigned, int versus size_t) to ++ fix compiler errors/warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ kexgssc.c, sshconnect2.c ] ++ fix uninitialized variable warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ gssgenr.c ] ++ pass oid to gss_display_status (helpful when using GSSAPI mechglue) ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ gss-serv-krb5.c ] ++ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c ++ add client-side GssapiKeyExchange option ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ sshconnect2.c ] ++ add support for GssapiTrustDns option for gssapi-with-mic ++ (from jbasney AT ncsa.uiuc.edu) ++ +diff --speed-large-files --minimal -Nru openssh-5.8p1/Makefile.in openssh-5.8p1.new/Makefile.in +--- openssh-5.8p1/Makefile.in 2011-02-04 01:42:13.000000000 +0100 ++++ openssh-5.8p1.new/Makefile.in 2011-02-12 18:07:10.990611445 +0100 +@@ -75,6 +75,7 @@ + atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ + monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ + kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ ++ kexgssc.o \ + msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ + jpake.o schnorr.o ssh-pkcs11.o kr1.o + +@@ -91,7 +92,7 @@ + auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ + monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \ + auth-krb5.o \ +- auth2-gss.o gss-serv.o gss-serv-krb5.o \ ++ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ + loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ + sftp-server.o sftp-common.o \ + roaming_common.o roaming_serv.o +diff --speed-large-files --minimal -Nru openssh-5.8p1/auth-krb5.c openssh-5.8p1.new/auth-krb5.c +--- openssh-5.8p1/auth-krb5.c 2009-12-21 00:49:22.000000000 +0100 ++++ openssh-5.8p1.new/auth-krb5.c 2011-02-12 18:07:11.002529804 +0100 +@@ -170,8 +170,13 @@ + + len = strlen(authctxt->krb5_ticket_file) + 6; + authctxt->krb5_ccname = xmalloc(len); ++#ifdef USE_CCAPI ++ snprintf(authctxt->krb5_ccname, len, "API:%s", ++ authctxt->krb5_ticket_file); ++#else + snprintf(authctxt->krb5_ccname, len, "FILE:%s", + authctxt->krb5_ticket_file); ++#endif + + #ifdef USE_PAM + if (options.use_pam) +@@ -226,15 +231,22 @@ + #ifndef HEIMDAL + krb5_error_code + ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { +- int tmpfd, ret, oerrno; ++ int ret; + char ccname[40]; + mode_t old_umask; ++#ifdef USE_CCAPI ++ char cctemplate[] = "API:krb5cc_%d"; ++#else ++ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; ++ int tmpfd, oerrno; ++#endif + + ret = snprintf(ccname, sizeof(ccname), +- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); ++ cctemplate, geteuid()); + if (ret < 0 || (size_t)ret >= sizeof(ccname)) + return ENOMEM; + ++#ifndef USE_CCAPI + old_umask = umask(0177); + tmpfd = mkstemp(ccname + strlen("FILE:")); + oerrno = errno; +@@ -249,6 +261,7 @@ + return oerrno; + } + close(tmpfd); ++#endif + + return (krb5_cc_resolve(ctx, ccname, ccache)); + } +diff --speed-large-files --minimal -Nru openssh-5.8p1/auth2-gss.c openssh-5.8p1.new/auth2-gss.c +--- openssh-5.8p1/auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 ++++ openssh-5.8p1.new/auth2-gss.c 2011-02-12 18:07:11.030761708 +0100 +@@ -1,7 +1,7 @@ + /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ + + /* +- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -52,6 +52,40 @@ + static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); + static void input_gssapi_errtok(int, u_int32_t, void *); + ++/* ++ * The 'gssapi_keyex' userauth mechanism. ++ */ ++static int ++userauth_gsskeyex(Authctxt *authctxt) ++{ ++ int authenticated = 0; ++ Buffer b; ++ gss_buffer_desc mic, gssbuf; ++ u_int len; ++ ++ mic.value = packet_get_string(&len); ++ mic.length = len; ++ ++ packet_check_eom(); ++ ++ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, ++ "gssapi-keyex"); ++ ++ gssbuf.value = buffer_ptr(&b); ++ gssbuf.length = buffer_len(&b); ++ ++ /* gss_kex_context is NULL with privsep, so we can't check it here */ ++ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, ++ &gssbuf, &mic)))) ++ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu May 2 20:33:21 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 02 May 2013 18:33:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20945] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 20945 http://gar.svn.sourceforge.net/gar/?rev=20945&view=rev Author: slowfranklin Date: 2013-05-02 18:33:21 +0000 (Thu, 02 May 2013) Log Message: ----------- Fix DEP_PKGS names Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-05-02 18:31:28 UTC (rev 20944) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-05-02 18:33:21 UTC (rev 20945) @@ -29,18 +29,18 @@ BUILD_DEP_PKGS += CSWlibsqlite3-dev BUILD_DEP_PKGS += CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibz-dev -BUILD_DEP_PKGS += CSWlibpopplerdev +BUILD_DEP_PKGS += CSWpoppler-dev BUILD_DEP_PKGS += CSWlibgif-dev BUILD_DEP_PKGS += CSWlibjpeg-dev BUILD_DEP_PKGS += CSWlibtiff-dev -BUILD_DEP_PKGS += CSWlibicu-devel +BUILD_DEP_PKGS += CSWlibicu-dev BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibuuid-dev -RUNTIME_DEP_PKGS += CSWlibuuid +RUNTIME_DEP_PKGS += CSWlibuuid1 RUNTIME_DEP_PKGS += CSWlibgsf RUNTIME_DEP_PKGS += CSWzlib -RUNTIME_DEP_PKGS += CSWvala RUNTIME_DEP_PKGS += CSWggettext RUNTIME_DEP_PKGS += CSWglib2 RUNTIME_DEP_PKGS += CSWgio-fam-backend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu May 2 20:38:01 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 02 May 2013 18:38:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[20946] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 20946 http://gar.svn.sourceforge.net/gar/?rev=20946&view=rev Author: chninkel Date: 2013-05-02 18:38:00 +0000 (Thu, 02 May 2013) Log Message: ----------- openssh/trunk: add build dependencies Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-05-02 18:33:21 UTC (rev 20945) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-05-02 18:38:00 UTC (rev 20946) @@ -34,6 +34,7 @@ CATALOGNAME_CSWopenssh = openssh SPKG_DESC_CSWopenssh = OpenSSH Secure Shell server +BUILD_DEP_PKGS = CSWautoconf CSWlibssl-dev CSWlibz-dev RUNTIME_DEP_PKGS_CSWopenssh = CSWlibssl1-0-0 CSWlibwrap1 CSWlibz1 CSWlibkrb5-3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWopenssh-client OBSOLETED_BY_CSWopenssh = CSWossh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu May 2 20:39:34 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 02 May 2013 18:39:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[20947] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 20947 http://gar.svn.sourceforge.net/gar/?rev=20947&view=rev Author: chninkel Date: 2013-05-02 18:39:34 +0000 (Thu, 02 May 2013) Log Message: ----------- openssh/trunk: remove lpk recipe Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-05-02 18:38:00 UTC (rev 20946) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-05-02 18:39:34 UTC (rev 20947) @@ -159,28 +159,6 @@ TEST_SCRIPTS = - -## Optional addition to add Ldap Public Key support -## see http://code.google.com/p/openssh-lpk/ - -# we always register the lpk related files so checksum -# is the same with LPK enabled or not -DISTFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch -ifdef LPK - PACKAGES = CSWopensshlpk - CATALOGNAME_CSWopensshlpk = openssh_lpk - SPKG_DESC_CSWopensshlpk = $(SPKG_DESC_CSWopenssh) with ldap public key support - RUNTIME_DEP_PKGS_CSWopensshlpk = $(RUNTIME_DEP_PKGS_CSWopenssh) CSWoldaprt - MASTER_SITES += http://openssh-lpk.googlecode.com/svn/trunk/patch/contrib/ - PATCHFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch - CONFIGURE_ARGS += --with-ldap - DOCFILES += openssh-lpk_openldap.schema openssh-lpk_sun.schema lpk-user-example.txt README.lpk - - # we must reset the CSWopenssh-client description to avoid a bug in the automatic dependancy generation - SPKG_DESC_CSWopenssh-client = -endif - - include gar/category.mk 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 May 2 21:09:29 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 02 May 2013 19:09:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20948] csw/mgar/pkg/cpan/Carp-Assert-More/trunk Message-ID: Revision: 20948 http://gar.svn.sourceforge.net/gar/?rev=20948&view=rev Author: bonivart Date: 2013-05-02 19:09:28 +0000 (Thu, 02 May 2013) Log Message: ----------- cpan/Carp-Assert-More/trunk: update to 1.14, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile csw/mgar/pkg/cpan/Carp-Assert-More/trunk/checksums Modified: csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile 2013-05-02 18:39:34 UTC (rev 20947) +++ csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile 2013-05-02 19:09:28 UTC (rev 20948) @@ -1,18 +1,23 @@ NAME = Carp-Assert-More -VERSION = 1.12 +VERSION = 1.14 CATEGORIES = cpan GARTYPE = v2 AUTHOR = PETDANCE DESCRIPTION = Convenience wrappers around Carp::Assert define BLURB - Convenience wrappers around Carp::Assert endef DISTFILES += COPYING -PACKAGES = CSWpmcarpassertmore -CATALOGNAME = pm_carpassertmore +PACKAGES = CSWpm-carp-assert-more +CATALOGNAME = pm_carp_assert_more +SPKG_DESC_CSWpm-carp-assert-more = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-carp-assert-more = CSWpmcarpassertmore +CATALOGNAME_CSWpmcarpassertmore = pm_carpassertmore + ARCHALL = 1 +RUNTIME_DEP_PKGS += CSWpm-carp-assert + include gar/category.mk Modified: csw/mgar/pkg/cpan/Carp-Assert-More/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Carp-Assert-More/trunk/checksums 2013-05-02 18:39:34 UTC (rev 20947) +++ csw/mgar/pkg/cpan/Carp-Assert-More/trunk/checksums 2013-05-02 19:09:28 UTC (rev 20948) @@ -1 +1 @@ -dbd6a0fcbff5f00d2e39b77322036d3f Carp-Assert-More-1.12.tar.gz +78d85249929273259e0a519925b80cd9 Carp-Assert-More-1.14.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 Thu May 2 22:03:25 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 02 May 2013 20:03:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[20949] csw/mgar/pkg/otr/ Message-ID: Revision: 20949 http://gar.svn.sourceforge.net/gar/?rev=20949&view=rev Author: lblume Date: 2013-05-02 20:03:24 +0000 (Thu, 02 May 2013) Log Message: ----------- Reorganization of otr using the Way of the Maciej to replace the lib by the latest while keeping the old version in a branch. Removed Paths: ------------- csw/mgar/pkg/otr/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri May 3 00:32:42 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 02 May 2013 22:32:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20950] csw/mgar/pkg/lang-python/python-cjson/trunk Message-ID: Revision: 20950 http://gar.svn.sourceforge.net/gar/?rev=20950&view=rev Author: wahwah Date: 2013-05-02 22:32:42 +0000 (Thu, 02 May 2013) Log Message: ----------- lang-python/python-cjson/trunk: switching to the fork which had an update in 2013 Modified Paths: -------------- csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile csw/mgar/pkg/lang-python/python-cjson/trunk/checksums Modified: csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile 2013-05-02 20:03:24 UTC (rev 20949) +++ csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile 2013-05-02 22:32:42 UTC (rev 20950) @@ -3,7 +3,7 @@ # $Id$ NAME = python-cjson -VERSION = 1.0.5 +VERSION = 1.0.3x7 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Very fast JSON encoder/decoder @@ -14,8 +14,8 @@ google-gflags, or for a Python app that, via swig or some other means, is linked with a C++ app that uses google-gflags. endef -SPKG_SOURCEURL = http://code.google.com/p/python-gflags/ -DISTNAME = $(NAME)-$(VERSION) +VENDOR_URL = http://python.cx.hu/python-cjson/ +MASTER_SITES = http://python.cx.hu/python-cjson/ DISTFILES = $(DISTNAME).tar.gz TEST_SCRIPTS = Modified: csw/mgar/pkg/lang-python/python-cjson/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-cjson/trunk/checksums 2013-05-02 20:03:24 UTC (rev 20949) +++ csw/mgar/pkg/lang-python/python-cjson/trunk/checksums 2013-05-02 22:32:42 UTC (rev 20950) @@ -1 +1 @@ -4d55b66ecdf0300313af9d030d9644a3 python-cjson-1.0.5.tar.gz +f4f8d01b1462ce185e333f9f2e464fc2 python-cjson-1.0.3x7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri May 3 08:30:04 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 03 May 2013 06:30:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[20951] csw/mgar/pkg/libuuid/trunk Message-ID: Revision: 20951 http://gar.svn.sourceforge.net/gar/?rev=20951&view=rev Author: slowfranklin Date: 2013-05-03 06:30:02 +0000 (Fri, 03 May 2013) Log Message: ----------- Bump version to 1.0.2, drop patch Modified Paths: -------------- csw/mgar/pkg/libuuid/trunk/Makefile csw/mgar/pkg/libuuid/trunk/checksums Modified: csw/mgar/pkg/libuuid/trunk/Makefile =================================================================== --- csw/mgar/pkg/libuuid/trunk/Makefile 2013-05-02 22:32:42 UTC (rev 20950) +++ csw/mgar/pkg/libuuid/trunk/Makefile 2013-05-03 06:30:02 UTC (rev 20951) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = libuuid -VERSION = 1.0.1 +VERSION = 1.0.2 GARTYPE = v2 DESCRIPTION = Portable uuid C library @@ -10,9 +10,6 @@ MASTER_SITES += $(SF_MIRROR) DISTFILES += $(DISTNAME).tar.gz -# This is done via fcntl later on anyway -PATCHFILES += 0001-Do-not-use-O_CLOEXEC-which-does-not-exist-on-Solaris.patch - PACKAGES += CSWlibuuid1 SPKG_DESC_CSWlibuuid1 = Portable uuid C library, libuuid.so.1 PKGFILES_CSWlibuuid1 += $(call pkgfiles_lib,libuuid.so.1) Modified: csw/mgar/pkg/libuuid/trunk/checksums =================================================================== --- csw/mgar/pkg/libuuid/trunk/checksums 2013-05-02 22:32:42 UTC (rev 20950) +++ csw/mgar/pkg/libuuid/trunk/checksums 2013-05-03 06:30:02 UTC (rev 20951) @@ -1 +1 @@ -12d7a99e08781d2cf55e8c754fedfbcf libuuid-1.0.1.tar.gz +c06f49871e9d964d6bbf8688f57aa124 libuuid-1.0.2.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 Fri May 3 08:53:14 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 03 May 2013 06:53:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[20952] csw/mgar/pkg/lang-python/python-cjson/trunk/ Makefile Message-ID: Revision: 20952 http://gar.svn.sourceforge.net/gar/?rev=20952&view=rev Author: wahwah Date: 2013-05-03 06:53:13 +0000 (Fri, 03 May 2013) Log Message: ----------- lang-python/python-cjson/trunk: We need this on Solaris 9 too. Modified Paths: -------------- csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile 2013-05-03 06:30:02 UTC (rev 20951) +++ csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile 2013-05-03 06:53:13 UTC (rev 20952) @@ -19,6 +19,11 @@ DISTFILES = $(DISTNAME).tar.gz TEST_SCRIPTS = +# This package is used for package building, therefore must be packaged for +# all platforms where we build packages. +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc + RUNTIME_DEP_PKGS_CSWpy-cjson += CSWlibpython2-6-1-0 CHECKPKG_OVERRIDES_CSWpy-cjson += surplus-dependency|CSWpython This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri May 3 09:39:45 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 03 May 2013 07:39:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[20953] csw/mgar/pkg/lang-python/cssutils/trunk/Makefile Message-ID: Revision: 20953 http://gar.svn.sourceforge.net/gar/?rev=20953&view=rev Author: pfelecan Date: 2013-05-03 07:39:44 +0000 (Fri, 03 May 2013) Log Message: ----------- lang-python/cssutils: - make it architecture neutral - don't stop on possible tests (quite a bit of oscillations) Modified Paths: -------------- csw/mgar/pkg/lang-python/cssutils/trunk/Makefile Modified: csw/mgar/pkg/lang-python/cssutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/cssutils/trunk/Makefile 2013-05-03 06:53:13 UTC (rev 20952) +++ csw/mgar/pkg/lang-python/cssutils/trunk/Makefile 2013-05-03 07:39:44 UTC (rev 20953) @@ -18,5 +18,12 @@ CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = non-stop + +ARCHALL = 1 + include gar/category.mk +test-non-stop: + -( cd $(WORKSRC) && $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) + $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri May 3 09:54:41 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 03 May 2013 07:54:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[20954] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 20954 http://gar.svn.sourceforge.net/gar/?rev=20954&view=rev Author: idogan23 Date: 2013-05-03 07:54:41 +0000 (Fri, 03 May 2013) Log Message: ----------- unbound: disable 64-bit build Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2013-05-03 07:39:44 UTC (rev 20953) +++ csw/mgar/pkg/unbound/trunk/Makefile 2013-05-03 07:54:41 UTC (rev 20954) @@ -43,32 +43,33 @@ LICENSE = LICENSE -EXTRA_BUILD_ISAS_i386 = amd64 -EXTRA_BUILD_ISAS_sparc = sparcv9 +# 64-Bit build disabled +#EXTRA_BUILD_ISAS_i386 = amd64 +#EXTRA_BUILD_ISAS_sparc = sparcv9 -MERGE_DIRS_isa-sparcv9 = $(libdir) -MERGE_DIRS_isa-sparcv9 += $(sbindir) -MERGE_DIRS_isa-amd64 = $(libdir) -MERGE_DIRS_isa-amd64 += $(sbindir) +#MERGE_DIRS_isa-sparcv9 = $(libdir) +#MERGE_DIRS_isa-sparcv9 += $(sbindir) +#MERGE_DIRS_isa-amd64 = $(libdir) +#MERGE_DIRS_isa-amd64 += $(sbindir) -ISAXEC_DIRS = $(sbindir) -EXTRA_ISAEXEC_EXCLUDE_FILES = $(sbindir)/unbound-anchor -EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf -EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control -EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup -EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host +#ISAXEC_DIRS = $(sbindir) +#EXTRA_ISAEXEC_EXCLUDE_FILES = $(sbindir)/unbound-anchor +#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf +#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control +#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup +#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(prefix)/sbin/unbound-anchor -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-checkconf -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-control -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-control-setup -EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-host +#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(prefix)/sbin/unbound-anchor +#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-checkconf +#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-control +#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-control-setup +#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-host -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/sbin/unbound-anchor -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-checkconf -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-control -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-control-setup -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-host +#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/sbin/unbound-anchor +#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-checkconf +#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-control +#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-control-setup +#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-host SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf INITSMF = /etc/opt/csw/init.d/cswunbound This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri May 3 10:36:42 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 03 May 2013 08:36:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20955] csw/mgar/pkg/lang-python/cssutils/trunk/Makefile Message-ID: Revision: 20955 http://gar.svn.sourceforge.net/gar/?rev=20955&view=rev Author: pfelecan Date: 2013-05-03 08:36:42 +0000 (Fri, 03 May 2013) Log Message: ----------- lang-python/cssutils/trunk: exclude the tests from the delivered components set. Modified Paths: -------------- csw/mgar/pkg/lang-python/cssutils/trunk/Makefile Modified: csw/mgar/pkg/lang-python/cssutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/cssutils/trunk/Makefile 2013-05-03 07:54:41 UTC (rev 20954) +++ csw/mgar/pkg/lang-python/cssutils/trunk/Makefile 2013-05-03 08:36:42 UTC (rev 20955) @@ -22,6 +22,8 @@ ARCHALL = 1 +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/lib/python/site-packages/tests.* + include gar/category.mk test-non-stop: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri May 3 11:26:19 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 03 May 2013 09:26:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[20956] csw/mgar/pkg Message-ID: Revision: 20956 http://gar.svn.sourceforge.net/gar/?rev=20956&view=rev Author: guengel Date: 2013-05-03 09:26:18 +0000 (Fri, 03 May 2013) Log Message: ----------- qdbm/trunk: New QDBM package (GARified). Added Paths: ----------- csw/mgar/pkg/qdbm/ csw/mgar/pkg/qdbm/Makefile csw/mgar/pkg/qdbm/branches/ csw/mgar/pkg/qdbm/tags/ csw/mgar/pkg/qdbm/trunk/ csw/mgar/pkg/qdbm/trunk/Makefile csw/mgar/pkg/qdbm/trunk/checksums csw/mgar/pkg/qdbm/trunk/files/ csw/mgar/pkg/qdbm/trunk/files/0000-Adjusting-compiler-flags-for-C-C-libs.patch Added: csw/mgar/pkg/qdbm/Makefile =================================================================== --- csw/mgar/pkg/qdbm/Makefile (rev 0) +++ csw/mgar/pkg/qdbm/Makefile 2013-05-03 09:26:18 UTC (rev 20956) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/qdbm/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/qdbm/trunk/Makefile =================================================================== --- csw/mgar/pkg/qdbm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/qdbm/trunk/Makefile 2013-05-03 09:26:18 UTC (rev 20956) @@ -0,0 +1,77 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = qdbm +VERSION = 1.8.78 +GARTYPE = v2 +GARCOMPILER = SUN + +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 + +DESCRIPTION = QDBM is a library of routines for managing a database. +define BLURB + QDBM is a library of routines for managing a database. The database + is a simple data file containing records, each is a pair of a key + and a value. Every key and value is serial bytes with variable + length. Both binary dat a and character string can be used as a key + and a value. There is neither concept of data tables nor data + types. Records are organized in hash table or B+ tree. +endef + +MASTER_SITES = http://fallabs.com/qdbm/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES = 0000-Adjusting-compiler-flags-for-C-C-libs.patch + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +PACKAGES = CSWqdbm-bin +SPKG_DESC_CSWqdbm-bin = QDBM - utilities +PKGFILES_CSWqdbm-bin = .*/bin/.* +PKGFILES_CSWqdbm-bin += .*/man/man1/.* +RUNTIME_DEP_PKGS_CSWqdbm-bin = CSWlibqdbm14 + +PACKAGES += CSWlibqdbm14 +SPKG_DESC_CSWlibqdbm14 = QDBM - library +PKGFILES_CSWlibqdbm14 = $(call baseisadirs,$(libdir),libqdbm\.so\.14(\.\d+)*) +OBSOLETED_BY_CSWlibqdbm14 = CSWqdbm +CHECKPKG_OVERRIDES_CSWlibqdbm14 += file-with-bad-content|/usr/local|root/opt/csw/lib/libqdbm.so.14.14.0 +CHECKPKG_OVERRIDES_CSWlibqdbm14 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libqdbm.so.14.14.0 + +PACKAGES += CSWlibqdbm-dev +SPKG_DESC_CSWlibqdbm-dev = QDBM - development files +RUNTIME_DEP_PKGS_CSWlibqdbm-dev = CSWlibqdbm14 + +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-pthread + + + +include gar/category.mk + +post-install-modulated: + rm $(DESTDIR)$(libdir)/libqdbm.so + rm $(DESTDIR)$(libdir)/libqdbm.so.14 + cd $(DESTDIR)$(libdir) ; \ + ln -s libqdbm.so.14.14.0 libqdbm.so.14 ; \ + ln -s libqdbm.so.14 libqdbm.so + @$(MAKECOOKIE) + +post-merge: merge-doc + +merge-doc: + if [ -d $(PKGROOT)$(prefix)/share/qdbm ] ; then\ + [ ! -d $(PKGROOT)$(docdir)/qdbm ] && mkdir -p $(PKGROOT)$(docdir)/qdbm ; \ + mv $(PKGROOT)$(prefix)/share/qdbm/* $(PKGROOT)/$(docdir)/qdbm/ ; \ + rmdir $(PKGROOT)$(prefix)/share/qdbm ; \ + fi + @$(MAKECOOKIE) \ No newline at end of file Property changes on: csw/mgar/pkg/qdbm/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/qdbm/trunk/checksums =================================================================== --- csw/mgar/pkg/qdbm/trunk/checksums (rev 0) +++ csw/mgar/pkg/qdbm/trunk/checksums 2013-05-03 09:26:18 UTC (rev 20956) @@ -0,0 +1 @@ +66b3bd69a651316b8d6adc2f21cf3225 qdbm-1.8.78.tar.gz Added: csw/mgar/pkg/qdbm/trunk/files/0000-Adjusting-compiler-flags-for-C-C-libs.patch =================================================================== --- csw/mgar/pkg/qdbm/trunk/files/0000-Adjusting-compiler-flags-for-C-C-libs.patch (rev 0) +++ csw/mgar/pkg/qdbm/trunk/files/0000-Adjusting-compiler-flags-for-C-C-libs.patch 2013-05-03 09:26:18 UTC (rev 20956) @@ -0,0 +1,39 @@ +From f53fa00b45802e0cb073a96e870d83605ceb001a Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Thu, 2 May 2013 13:07:20 +0200 +Subject: [PATCH] Adjusting compiler flags for C/C++ libs. + +--- + Makefile.in | 2 +- + plus/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 384146b..5232058 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -56,7 +56,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \ + -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ + -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ + -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG +-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@ ++CFLAGS = -KPIC -O3 @CFLAGS@ + LD = @LD@ + LIBS = -lqdbm @LIBS@ + LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ +diff --git a/plus/Makefile.in b/plus/Makefile.in +index a5fb9a2..edc2764 100644 +--- a/plus/Makefile.in ++++ b/plus/Makefile.in +@@ -44,7 +44,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(srcdir)/.. -I$(MYHEADDIR) \ + -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ + -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ + -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG +-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@ ++CXXFLAGS = -KPIC @MYOPTS@ + LD = @LD@ + LIBS = -lqdbm @LIBS@ + LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \ +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri May 3 14:58:35 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 03 May 2013 12:58:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[20957] csw/mgar/pkg/cpan/BerkeleyDB/trunk Message-ID: Revision: 20957 http://gar.svn.sourceforge.net/gar/?rev=20957&view=rev Author: idogan23 Date: 2013-05-03 12:58:34 +0000 (Fri, 03 May 2013) Log Message: ----------- pm_berkeleydb: Bump version to 0.51 Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/0001-scan.pl-path.patch Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2013-05-03 09:26:18 UTC (rev 20956) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2013-05-03 12:58:34 UTC (rev 20957) @@ -1,10 +1,10 @@ NAME = BerkeleyDB -VERSION = 0.43 +VERSION = 0.51 CATEGORIES = cpan GARTYPE = v2 AUTHOR = PMQS -DESCRIPTION = BerkeleyDB module +DESCRIPTION = BerkeleyDB Module define BLURB Includes BerkeleyDB, BerkeleyDB::Btree, BerkeleyDB::Hash endef @@ -14,11 +14,15 @@ PACKAGES = CSWpmberkeleydb CATALOGNAME = pm_berkeleydb -PATCHFILES = CSWpmberkeleydb.config.in.diff +PATCHFILES = CSWpmberkeleydb.config.in.diff +PATCHFILES += 0001-scan.pl-path.patch NOISALIST = 1 EXTRA_LIB = /opt/csw/bdb48/lib RUNTIME_DEP_PKGS = CSWbdb48 +# Catalog name correct for Perl module. +CHECKPKG_OVERRIDES_CSWpmberkeleydb += catalogname-does-not-match-pkgname|pkgname=CSWpmberkeleydb|catalogname=pm_berkeleydb|expected-catalogname=pmberkeleydb + include gar/category.mk Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2013-05-03 09:26:18 UTC (rev 20956) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2013-05-03 12:58:34 UTC (rev 20957) @@ -1 +1 @@ -3d0cf0651ed8cd3fc36e328d5924a1e9 BerkeleyDB-0.43.tar.gz +50d0d18227a6568e2557a1b1b33f8f55 BerkeleyDB-0.51.tar.gz Added: csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/0001-scan.pl-path.patch =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/0001-scan.pl-path.patch (rev 0) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/0001-scan.pl-path.patch 2013-05-03 12:58:34 UTC (rev 20957) @@ -0,0 +1,22 @@ +From c4615bdabe5d9f1cf8457130cdcdd50cf49e814e Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Fri, 3 May 2013 14:37:07 +0200 +Subject: [PATCH] scan.pl-path + +--- + scan.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scan.pl b/scan.pl +index 3fce7a8..085be2e 100644 +--- a/scan.pl ++++ b/scan.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/opt/csw/bin/perl + + my $ignore_re = '^(' . join("|", + qw( +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri May 3 15:09:47 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 03 May 2013 13:09:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20958] csw/mgar/pkg/lang-python Message-ID: Revision: 20958 http://gar.svn.sourceforge.net/gar/?rev=20958&view=rev Author: pfelecan Date: 2013-05-03 13:09:47 +0000 (Fri, 03 May 2013) Log Message: ----------- lang-python/sip/trunk: instantiate Added Paths: ----------- csw/mgar/pkg/lang-python/sip/ csw/mgar/pkg/lang-python/sip/Makefile csw/mgar/pkg/lang-python/sip/branches/ csw/mgar/pkg/lang-python/sip/tags/ csw/mgar/pkg/lang-python/sip/trunk/ csw/mgar/pkg/lang-python/sip/trunk/Makefile csw/mgar/pkg/lang-python/sip/trunk/checksums csw/mgar/pkg/lang-python/sip/trunk/files/ Added: csw/mgar/pkg/lang-python/sip/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sip/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/sip/Makefile 2013-05-03 13:09:47 UTC (rev 20958) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/sip/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/sip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/sip/trunk/Makefile 2013-05-03 13:09:47 UTC (rev 20958) @@ -0,0 +1,63 @@ +# $Id$ + +NAME = sip +VERSION = 4.14.6 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Tool for creating Python bindings for C and C++ +define BLURB + SIP is a tool that makes it very easy to create Python bindings for + C and C++ libraries. It was originally developed to create PyQt, + the Python bindings for the Qt toolkit, but can be used to create + bindings for any C or C++ library. +endef + +MASTER_SITES = $(SF_MIRRORS) +SF_PROJECT = pyqt +SPKG_SOURCEURL = $(MASTER_SITES) +DISTFILES = $(DISTNAME).tar.gz + +LICENSE = LICENSE-GPL3 + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_SCRIPTS = custom + +BUILD_SCRIPTS = custom + +TEST_SCRIPTS = + +INSTALL_SCRIPTS = custom + +include gar/category.mk + +PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) + +configure-custom: + cd $(WORKSRC) && \ + /usr/bin/env -i \ + $(CONFIGURE_ENV) \ + bash -c 'python configure.py \ + --platform=solaris-g++ \ + CC="$${CC}" \ + CFLAGS="$${CFLAGS}" \ + CXX="$${CXX}" \ + CXXFLAGS="$${CXXFLAGS}" \ + INCDIR="$${includedir}" \ + ' + @$(MAKECOOKIE) + +build-custom: + cd $(WORKSRC) && \ + /usr/bin/env -i \ + $(BUILD_ENV) \ + $(MAKE) + @$(MAKECOOKIE) + +install-custom: + cd $(WORKSRC) && \ + /usr/bin/env -i \ + $(INSTALL_ENV) \ + $(MAKE) install + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/lang-python/sip/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/sip/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sip/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/sip/trunk/checksums 2013-05-03 13:09:47 UTC (rev 20958) @@ -0,0 +1 @@ +d6493b9f0a7911566545f694327314c4 sip-4.14.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri May 3 15:16:54 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 03 May 2013 13:16:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[20959] csw/mgar/pkg Message-ID: Revision: 20959 http://gar.svn.sourceforge.net/gar/?rev=20959&view=rev Author: slowfranklin Date: 2013-05-03 13:16:53 +0000 (Fri, 03 May 2013) Log Message: ----------- New package Gnome libgee Added Paths: ----------- csw/mgar/pkg/libgee/ csw/mgar/pkg/libgee/Makefile csw/mgar/pkg/libgee/branches/ csw/mgar/pkg/libgee/tags/ csw/mgar/pkg/libgee/trunk/ csw/mgar/pkg/libgee/trunk/Makefile csw/mgar/pkg/libgee/trunk/checksums csw/mgar/pkg/libgee/trunk/files/ Added: csw/mgar/pkg/libgee/Makefile =================================================================== --- csw/mgar/pkg/libgee/Makefile (rev 0) +++ csw/mgar/pkg/libgee/Makefile 2013-05-03 13:16:53 UTC (rev 20959) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libgee/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libgee/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgee/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgee/trunk/Makefile 2013-05-03 13:16:53 UTC (rev 20959) @@ -0,0 +1,35 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libgee +# 0.6.8 is the latest version who's pkg-config name is gee-1.0, dconf depends on gee-1.0 +VERSION = 0.6.8 +GARTYPE = v2 + +DESCRIPTION = GObject collection library +define BLURB + GObject collection library +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(NAME)-$(VERSION).tar.xz +GARCOMPILER = GNU + +BUILD_DEP_PKGS += CSWvala CSWpkgconfig CSWglib2devel +RUNTIME_DEP_PKGS += CSWglib2 + +PACKAGES += CSWlibgee2 +SPKG_DESC_CSWlibgee2 = $(DESCRIPTION), library +PKGFILES_CSWlibgee2 += $(call pkgfiles_lib,libgee.so) + +PACKAGES += CSWlibgee-dev +SPKG_DESC_CSWlibgee-dev = $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWlibgee-dev += CSWlibgee2 +PKGFILES_CSWlibgee-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibgee-dev += $(call baseisadirs,$(datadir),vala/vapi/gee-1\.0\.vapi) +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/libgee/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libgee/trunk/checksums =================================================================== --- csw/mgar/pkg/libgee/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgee/trunk/checksums 2013-05-03 13:16:53 UTC (rev 20959) @@ -0,0 +1 @@ +2688c24f9a12e7616ee808f9092d0afe libgee-0.6.8.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri May 3 15:18:21 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 03 May 2013 13:18:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20960] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: Revision: 20960 http://gar.svn.sourceforge.net/gar/?rev=20960&view=rev Author: wahwah Date: 2013-05-03 13:18:21 +0000 (Fri, 03 May 2013) Log Message: ----------- releases-web: Uploaded files have to be 0644 tempfile.mkstemp creates wiles with mode 0600 by default, but these files must be world readable when in the catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-03 13:16:53 UTC (rev 20959) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-03 13:18:21 UTC (rev 20960) @@ -87,6 +87,8 @@ os.close(fd) target_path = os.path.join(ALLPKGS_DIR, basename) os.rename(tmp_filename, target_path) + # Since mkstemp creates files with mode 0600 by default: + os.chmod(target_path, 0644) except sqlobject.main.SQLObjectNotFound, e: messages.append("File %s not found in the db." % data_md5_sum) else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri May 3 15:24:27 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 03 May 2013 13:24:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[20961] csw/mgar/pkg/lang-python/sip/trunk/Makefile Message-ID: Revision: 20961 http://gar.svn.sourceforge.net/gar/?rev=20961&view=rev Author: pfelecan Date: 2013-05-03 13:24:27 +0000 (Fri, 03 May 2013) Log Message: ----------- lang-python/sip/trunk: addition of the dependency on the C run-time Modified Paths: -------------- csw/mgar/pkg/lang-python/sip/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sip/trunk/Makefile 2013-05-03 13:18:21 UTC (rev 20960) +++ csw/mgar/pkg/lang-python/sip/trunk/Makefile 2013-05-03 13:24:27 UTC (rev 20961) @@ -30,6 +30,8 @@ INSTALL_SCRIPTS = custom +RUNTIME_DEP_PKGS += CSWlibgcc-s1 + include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri May 3 15:38:17 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 03 May 2013 13:38:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[20962] csw/mgar/pkg/libgee/trunk/Makefile Message-ID: Revision: 20962 http://gar.svn.sourceforge.net/gar/?rev=20962&view=rev Author: slowfranklin Date: 2013-05-03 13:38:17 +0000 (Fri, 03 May 2013) Log Message: ----------- One build-dep per line, use DISTNAME instead of NAME-VERSION, make CSWlibgee-dev catchall, enable tests Modified Paths: -------------- csw/mgar/pkg/libgee/trunk/Makefile Modified: csw/mgar/pkg/libgee/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgee/trunk/Makefile 2013-05-03 13:24:27 UTC (rev 20961) +++ csw/mgar/pkg/libgee/trunk/Makefile 2013-05-03 13:38:17 UTC (rev 20962) @@ -12,10 +12,13 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.xz +DISTFILES = $(DISTNAME).tar.xz GARCOMPILER = GNU -BUILD_DEP_PKGS += CSWvala CSWpkgconfig CSWglib2devel +BUILD_DEP_PKGS += CSWvala +BUILD_DEP_PKGS += CSWpkgconfig +BUILD_DEP_PKGS += CSWglib2devel + RUNTIME_DEP_PKGS += CSWglib2 PACKAGES += CSWlibgee2 @@ -25,11 +28,10 @@ PACKAGES += CSWlibgee-dev SPKG_DESC_CSWlibgee-dev = $(DESCRIPTION), development files RUNTIME_DEP_PKGS_CSWlibgee-dev += CSWlibgee2 -PKGFILES_CSWlibgee-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibgee-dev += $(call baseisadirs,$(datadir),vala/vapi/gee-1\.0\.vapi) +# PKGFILES is catchall + CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = +# Testsuite runs 10 mins, please SKIPTEST as needed include gar/category.mk - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri May 3 18:18:06 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 03 May 2013 16:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[20963] csw/mgar/pkg/qdbm/trunk/Makefile Message-ID: Revision: 20963 http://gar.svn.sourceforge.net/gar/?rev=20963&view=rev Author: guengel Date: 2013-05-03 16:18:06 +0000 (Fri, 03 May 2013) Log Message: ----------- qdbm/trunk: Build with libbz2, libz and liblzo. Modified Paths: -------------- csw/mgar/pkg/qdbm/trunk/Makefile Modified: csw/mgar/pkg/qdbm/trunk/Makefile =================================================================== --- csw/mgar/pkg/qdbm/trunk/Makefile 2013-05-03 13:38:17 UTC (rev 20962) +++ csw/mgar/pkg/qdbm/trunk/Makefile 2013-05-03 16:18:06 UTC (rev 20963) @@ -41,21 +41,30 @@ PACKAGES += CSWlibqdbm14 SPKG_DESC_CSWlibqdbm14 = QDBM - library PKGFILES_CSWlibqdbm14 = $(call baseisadirs,$(libdir),libqdbm\.so\.14(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibqdbm14 = CSWliblzo2-2 +RUNTIME_DEP_PKGS_CSWlibqdbm14 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibqdbm14 += CSWlibz1 OBSOLETED_BY_CSWlibqdbm14 = CSWqdbm CHECKPKG_OVERRIDES_CSWlibqdbm14 += file-with-bad-content|/usr/local|root/opt/csw/lib/libqdbm.so.14.14.0 CHECKPKG_OVERRIDES_CSWlibqdbm14 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libqdbm.so.14.14.0 +CHECKPKG_OVERRIDES_CSWlibqdbm14 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libqdbm.so.14.14.0 PACKAGES += CSWlibqdbm-dev SPKG_DESC_CSWlibqdbm-dev = QDBM - development files RUNTIME_DEP_PKGS_CSWlibqdbm-dev = CSWlibqdbm14 +BUILD_DEP_PKGS = CSWlibbz2-dev +BUILD_DEP_PKGS += CSWliblzo-dev +BUILD_DEP_PKGS += CSWlibz-dev + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pthread +CONFIGURE_ARGS += --enable-zlib +CONFIGURE_ARGS += --enable-lzo +CONFIGURE_ARGS += --enable-bzip - - include gar/category.mk post-install-modulated: @@ -74,4 +83,4 @@ mv $(PKGROOT)$(prefix)/share/qdbm/* $(PKGROOT)/$(docdir)/qdbm/ ; \ rmdir $(PKGROOT)$(prefix)/share/qdbm ; \ fi - @$(MAKECOOKIE) \ No newline at end of file + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri May 3 18:54:03 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 03 May 2013 16:54:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[20964] csw/mgar/pkg/vala/trunk/Makefile Message-ID: Revision: 20964 http://gar.svn.sourceforge.net/gar/?rev=20964&view=rev Author: slowfranklin Date: 2013-05-03 16:54:03 +0000 (Fri, 03 May 2013) Log Message: ----------- Add several runtime deps and add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/vala/trunk/Makefile Modified: csw/mgar/pkg/vala/trunk/Makefile =================================================================== --- csw/mgar/pkg/vala/trunk/Makefile 2013-05-03 16:18:06 UTC (rev 20963) +++ csw/mgar/pkg/vala/trunk/Makefile 2013-05-03 16:54:03 UTC (rev 20964) @@ -24,15 +24,21 @@ BUILD_DEP_PKGS += CSWlibxslt-dev BUILD_DEP_PKGS += CSWpkgconfig -RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWlibiconv2 +RUNTIME_DEP_PKGS += CSWlibglib2-0-0 RUNTIME_DEP_PKGS += CSWpcre -RUNTIME_DEP_PKGS += CSWlibffi -RUNTIME_DEP_PKGS += CSWintltool RUNTIME_DEP_PKGS += CSWlibxslt +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS += CSWlibgobject2-0-0 CONFIGURE_ARGS = $(DIRPATHS) + +# Will fail with "error: Package `GLib-2.0' not found in specified Vala API directories or GObject-Introspection GIR directories" TEST_SCRIPTS = +CHECKPKG_OVERRIDES_CSWvala += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libvala-0.20.so +CHECKPKG_OVERRIDES_CSWvala += shared-lib-pkgname-mismatch|file=opt/csw/lib/libvala-0.20.so.0.0.0|soname=libvala-0.20.so.0|pkgname=CSWvala|expected=CSWlibvala0-20-0 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri May 3 20:30:19 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 18:30:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[20965] csw/mgar/pkg Message-ID: Revision: 20965 http://gar.svn.sourceforge.net/gar/?rev=20965&view=rev Author: lblume Date: 2013-05-03 18:30:15 +0000 (Fri, 03 May 2013) Log Message: ----------- otr/trunk: New clean otr project for 4.0.0 Added Paths: ----------- csw/mgar/pkg/otr/ csw/mgar/pkg/otr/branches/ csw/mgar/pkg/otr/tags/ csw/mgar/pkg/otr/trunk/ csw/mgar/pkg/otr/trunk/Makefile csw/mgar/pkg/otr/trunk/checksums csw/mgar/pkg/otr/trunk/files/ csw/mgar/pkg/otr/trunk/work/ Added: csw/mgar/pkg/otr/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/trunk/Makefile (rev 0) +++ csw/mgar/pkg/otr/trunk/Makefile 2013-05-03 18:30:15 UTC (rev 20965) @@ -0,0 +1,46 @@ +NAME = libotr +VERSION = 4.0.0 +GARTYPE = v2 + +DESCRIPTION = Off-The-Record Messaging plugin for pidgin +define BLURB + Off-the-Record (OTR) Messaging allows you to have private conversations over instant messaging. +endef + +MASTER_SITES = http://www.cypherpunks.ca/otr/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + +PACKAGES += CSWlibotr5 +CATALOGNAME_CSWlibotr5 = libotr5 +PKGFILES_CSWlibotr5 += $(call baseisadirs,$(libdir),libotr\.so\.5\.0\.0) +PKGFILES_CSWlibotr5 += $(call baseisadirs,$(libdir),libotr\.so\.5(\.\d+)*) +PKGFILES_CSWlibotr5 += $(bindir)/.* +PKGFILES_CSWlibotr5 += $(mandir)/man.* +SPKG_DESC_CSWlibotr5 += $(DESCRIPTION), libotr.so.5 + +OBSOLETED_BY_CSWlibotr5 += CSWotr + +PACKAGES += CSWotr-dev +CATALOGNAME_CSWotr-dev = otr_dev +SPKG_DESC_CSWotr-dev += $(DESCRIPTION), development files +# PKGFILES is catchall + +OBSOLETED_BY_CSWotr-dev += CSWotrdevel + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-static + +BUILD64_LIBS_ONLY = 1 + +RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibotr2 + +CHECKPKG_OVERRIDES_CSWlibotr5 += surplus-dependency|CSWlibotr2 + +RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr5 + +BUILD_DEP_PKGS += CSWlibgcrypt-dev +BUILD_DEP_PKGS += CSWlibgpg-error-dev + +include gar/category.mk Added: csw/mgar/pkg/otr/trunk/checksums =================================================================== --- csw/mgar/pkg/otr/trunk/checksums (rev 0) +++ csw/mgar/pkg/otr/trunk/checksums 2013-05-03 18:30:15 UTC (rev 20965) @@ -0,0 +1 @@ +00979dca82d70383fcd1b01f3974363c libotr-4.0.0.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 Fri May 3 20:42:36 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 18:42:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20966] csw/mgar/pkg/otr/branches Message-ID: Revision: 20966 http://gar.svn.sourceforge.net/gar/?rev=20966&view=rev Author: lblume Date: 2013-05-03 18:42:35 +0000 (Fri, 03 May 2013) Log Message: ----------- otr/branches/libotr2/trunk: Add legacy otr 3.2.1 as a branch Added Paths: ----------- csw/mgar/pkg/otr/branches/libotr2/ csw/mgar/pkg/otr/branches/libotr2/Makefile csw/mgar/pkg/otr/branches/libotr2/branches/ csw/mgar/pkg/otr/branches/libotr2/tags/ csw/mgar/pkg/otr/branches/libotr2/trunk/ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile csw/mgar/pkg/otr/branches/libotr2/trunk/checksums csw/mgar/pkg/otr/branches/libotr2/trunk/files/ csw/mgar/pkg/otr/branches/libotr2/trunk/files/heartbeat.patch csw/mgar/pkg/otr/branches/libotr2/trunk/work/ Added: csw/mgar/pkg/otr/branches/libotr2/Makefile =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/Makefile (rev 0) +++ csw/mgar/pkg/otr/branches/libotr2/Makefile 2013-05-03 18:42:35 UTC (rev 20966) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 18:42:35 UTC (rev 20966) @@ -0,0 +1,45 @@ +NAME = libotr +VERSION = 3.2.1 +GARTYPE = v2 + +DESCRIPTION = Off-The-Record Messaging plugin for pidgin +define BLURB + Off-the-Record (OTR) Messaging allows you to have private conversations over instant messaging. +endef + +MASTER_SITES = http://www.cypherpunks.ca/otr/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + +PATCHFILES += heartbeat.patch + +PACKAGES += CSWlibotr2 +CATALOGNAME_CSWlibotr2 = libotr2 +PKGFILES_CSWlibotr2 += $(call baseisadirs,$(libdir),libotr\.so\.2\.2\.1) +PKGFILES_CSWlibotr2 += $(call baseisadirs,$(libdir),libotr\.so\.2(\.\d+)*) +PKGFILES_CSWlibotr2 += $(bindir)/.* +PKGFILES_CSWlibotr2 += $(sharedir)/man/.* +SPKG_DESC_CSWlibotr2 += $(DESCRIPTION), libotr.so.5 + +OBSOLETED_BY_CSWlibotr2 += CSWotr + +PACKAGES += CSWotr-dev +CATALOGNAME_CSWotr-dev = otr_dev +SPKG_DESC_CSWotr-dev += $(DESCRIPTION), development files +# PKGFILES is catchall + +OBSOLETED_BY_CSWotr-dev += CSWotrdevel + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-static + +BUILD64_LIBS_ONLY = 1 + +RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgpg-error0 + +RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr2 + +BUILD_DEP_PKGS += CSWlibgcrypt-dev +BUILD_DEP_PKGS += CSWlibgpg-error-dev + +include gar/category.mk Added: csw/mgar/pkg/otr/branches/libotr2/trunk/checksums =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/trunk/checksums (rev 0) +++ csw/mgar/pkg/otr/branches/libotr2/trunk/checksums 2013-05-03 18:42:35 UTC (rev 20966) @@ -0,0 +1 @@ +974acf937d2ce0ee89b27a9815c17a3f libotr-3.2.1.tar.gz Added: csw/mgar/pkg/otr/branches/libotr2/trunk/files/heartbeat.patch =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/trunk/files/heartbeat.patch (rev 0) +++ csw/mgar/pkg/otr/branches/libotr2/trunk/files/heartbeat.patch 2013-05-03 18:42:35 UTC (rev 20966) @@ -0,0 +1,11 @@ +--- libotr-3.2.0/src/message.c.o 2009-02-02 20:51:01.531472266 -0600 ++++ libotr-3.2.0/src/message.c 2009-02-02 20:54:53.149261672 -0600 +@@ -1135,7 +1135,7 @@ + free(buf); + } + edata.ignore_message = 1; +- } else if (edata.ignore_message == 0 && ++ } else if (edata.ignore_message != 1 && + context->their_keyid > 0) { + /* If it's *not* a heartbeat, and we haven't + * sent anything in a while, also send a 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 May 3 21:12:40 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 19:12:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20967] csw/mgar/pkg/otr/trunk Message-ID: Revision: 20967 http://gar.svn.sourceforge.net/gar/?rev=20967&view=rev Author: lblume Date: 2013-05-03 19:12:39 +0000 (Fri, 03 May 2013) Log Message: ----------- otr/trunk: Clean incorrect newpkg action Removed Paths: ------------- csw/mgar/pkg/otr/trunk/work/ Property Changed: ---------------- csw/mgar/pkg/otr/trunk/ csw/mgar/pkg/otr/trunk/Makefile Property changes on: csw/mgar/pkg/otr/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Property changes on: csw/mgar/pkg/otr/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id 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 May 3 21:14:36 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 19:14:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20968] csw/mgar/pkg/otr/branches/libotr2/trunk Message-ID: Revision: 20968 http://gar.svn.sourceforge.net/gar/?rev=20968&view=rev Author: lblume Date: 2013-05-03 19:14:35 +0000 (Fri, 03 May 2013) Log Message: ----------- otr/branches/libotr2/trunk: Clean incorrect newpkg action Modified Paths: -------------- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/otr/branches/libotr2/trunk/work/ Property Changed: ---------------- csw/mgar/pkg/otr/branches/libotr2/trunk/ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Property changes on: csw/mgar/pkg/otr/branches/libotr2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Modified: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 19:12:39 UTC (rev 20967) +++ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 19:14:35 UTC (rev 20968) @@ -17,8 +17,8 @@ PKGFILES_CSWlibotr2 += $(call baseisadirs,$(libdir),libotr\.so\.2\.2\.1) PKGFILES_CSWlibotr2 += $(call baseisadirs,$(libdir),libotr\.so\.2(\.\d+)*) PKGFILES_CSWlibotr2 += $(bindir)/.* -PKGFILES_CSWlibotr2 += $(sharedir)/man/.* -SPKG_DESC_CSWlibotr2 += $(DESCRIPTION), libotr.so.5 +PKGFILES_CSWlibotr2 += $(mandir)/man.* +SPKG_DESC_CSWlibotr2 += $(DESCRIPTION), libotr.so.2 OBSOLETED_BY_CSWlibotr2 += CSWotr Property changes on: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id 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 May 3 21:38:39 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 19:38:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20969] csw/mgar/pkg/otr/branches/libotr2/trunk Message-ID: Revision: 20969 http://gar.svn.sourceforge.net/gar/?rev=20969&view=rev Author: lblume Date: 2013-05-03 19:38:39 +0000 (Fri, 03 May 2013) Log Message: ----------- otr/branches/libotr2/trunk: Create a separate CSWotr package for the tools and man Modified Paths: -------------- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/otr/branches/libotr2/trunk/ Property changes on: csw/mgar/pkg/otr/branches/libotr2/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work Modified: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 19:14:35 UTC (rev 20968) +++ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 19:38:39 UTC (rev 20969) @@ -14,21 +14,22 @@ PACKAGES += CSWlibotr2 CATALOGNAME_CSWlibotr2 = libotr2 +SPKG_DESC_CSWlibotr2 += $(DESCRIPTION), libotr.so.2 PKGFILES_CSWlibotr2 += $(call baseisadirs,$(libdir),libotr\.so\.2\.2\.1) PKGFILES_CSWlibotr2 += $(call baseisadirs,$(libdir),libotr\.so\.2(\.\d+)*) -PKGFILES_CSWlibotr2 += $(bindir)/.* -PKGFILES_CSWlibotr2 += $(mandir)/man.* -SPKG_DESC_CSWlibotr2 += $(DESCRIPTION), libotr.so.2 -OBSOLETED_BY_CSWlibotr2 += CSWotr - PACKAGES += CSWotr-dev CATALOGNAME_CSWotr-dev = otr_dev -SPKG_DESC_CSWotr-dev += $(DESCRIPTION), development files -# PKGFILES is catchall +SPKG_DESC_CSWotr-dev += $(DESCRIPTION), development files +PKGFILES_CSWotr-dev += $(PKGFILES_DEVEL) OBSOLETED_BY_CSWotr-dev += CSWotrdevel +PACKAGES += CSWotr +CATALOGNAME_CSWotr = otr +SPKG_DESC_CSWotr += $(DESCRIPTION), utilities +# PKGFILES is catchall + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static @@ -39,6 +40,10 @@ RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr2 +RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWotr += CSWlibotr2 + BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri May 3 21:58:23 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 19:58:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20970] csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Message-ID: Revision: 20970 http://gar.svn.sourceforge.net/gar/?rev=20970&view=rev Author: lblume Date: 2013-05-03 19:58:22 +0000 (Fri, 03 May 2013) Log Message: ----------- otr/branches/libotr2/trunk: Adjustments to the recipe Modified Paths: -------------- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Modified: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 19:38:39 UTC (rev 20969) +++ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 19:58:22 UTC (rev 20970) @@ -40,9 +40,9 @@ RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr2 +RUNTIME_DEP_PKGS_CSWotr += CSWlibotr2 RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11 -RUNTIME_DEP_PKGS_CSWotr += CSWlibotr2 BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri May 3 22:05:15 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 20:05:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[20971] csw/mgar/pkg/otr/trunk Message-ID: Revision: 20971 http://gar.svn.sourceforge.net/gar/?rev=20971&view=rev Author: lblume Date: 2013-05-03 20:05:14 +0000 (Fri, 03 May 2013) Log Message: ----------- otr/trunk: Add a CSWotr package for tools Modified Paths: -------------- csw/mgar/pkg/otr/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/otr/trunk/ Property changes on: csw/mgar/pkg/otr/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work Modified: csw/mgar/pkg/otr/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/trunk/Makefile 2013-05-03 19:58:22 UTC (rev 20970) +++ csw/mgar/pkg/otr/trunk/Makefile 2013-05-03 20:05:14 UTC (rev 20971) @@ -18,8 +18,6 @@ PKGFILES_CSWlibotr5 += $(mandir)/man.* SPKG_DESC_CSWlibotr5 += $(DESCRIPTION), libotr.so.5 -OBSOLETED_BY_CSWlibotr5 += CSWotr - PACKAGES += CSWotr-dev CATALOGNAME_CSWotr-dev = otr_dev SPKG_DESC_CSWotr-dev += $(DESCRIPTION), development files @@ -27,6 +25,11 @@ OBSOLETED_BY_CSWotr-dev += CSWotrdevel +PACKAGES += CSWotr +CATALOGNAME_CSWotr = otr +SPKG_DESC_CSWotr += $(DESCRIPTION), utilities +# PKGFILES is catchall + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static @@ -40,7 +43,14 @@ RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr5 +RUNTIME_DEP_PKGS_CSWotr += CSWlibotr5 +RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11 + BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev +# Remove after pushing to catalog +CHECKPKG_OVERRIDES_CSWlibotr5 += dependency-on-nonexistent-package|CSWlibotr2 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri May 3 23:26:59 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 21:26:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[20972] csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Message-ID: Revision: 20972 http://gar.svn.sourceforge.net/gar/?rev=20972&view=rev Author: lblume Date: 2013-05-03 21:26:58 +0000 (Fri, 03 May 2013) Log Message: ----------- otr/branches/libotr2/trunk: Some overrides appear necessary for now Modified Paths: -------------- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Modified: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 20:05:14 UTC (rev 20971) +++ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 21:26:58 UTC (rev 20972) @@ -47,4 +47,8 @@ BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev +# Strange issue with checkpkg makes it require those... +CHECKPKG_OVERRIDES_CSWotr += surplus-dependency|CSWlibgpg-error0 +CHECKPKG_OVERRIDES_CSWlibotr2 += surplus-dependency|CSWlibgpg-error0 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri May 3 23:43:23 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 21:43:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20973] csw/mgar/pkg/pidginotr/trunk/Makefile Message-ID: Revision: 20973 http://gar.svn.sourceforge.net/gar/?rev=20973&view=rev Author: lblume Date: 2013-05-03 21:43:23 +0000 (Fri, 03 May 2013) Log Message: ----------- pidginotr/trunk: Bump to version 4.0.0, remove patch for testing Modified Paths: -------------- csw/mgar/pkg/pidginotr/trunk/Makefile Modified: csw/mgar/pkg/pidginotr/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidginotr/trunk/Makefile 2013-05-03 21:26:58 UTC (rev 20972) +++ csw/mgar/pkg/pidginotr/trunk/Makefile 2013-05-03 21:43:23 UTC (rev 20973) @@ -1,5 +1,5 @@ -NAME = pidgin-otr -VERSION = 3.2.0 +NAME = pidgin-otr +VERSION = 4.0.0 GARTYPE = v2 DESCRIPTION = Off-The-Record Messaging plugin for pidgin @@ -9,22 +9,30 @@ MASTER_SITES = http://www.cypherpunks.ca/otr/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWpidginotr,) -PATCHFILES = otr_priority.patch +#PATCHFILES = otr_priority.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +# For msgfmt, msgmerge, xgettext and gettext to be used from GNU +CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) + # pidgin-otr requires gnu gettex but doesn't do a good job of locating it -INTLTOOL_XGETTEXT = /opt/csw/bin/gxgettext -XGETTEXT = $(INTLTOOL_XGETTEXT) -INTLTOOL_MSGFMT = /opt/csw/bin/gmsgfmt -MSGFMT = $(INTLTOOL_MSGFMT) -INTLTOOL_MSGMERGE = /opt/csw/bin/gmsgmerge -EXTRA_CONFIGURE_EXPORTS = INTLTOOL_XGETTEXT XGETTEXT INTLTOOL_MSGFMT MSGFMT INTLTOOL_MSGMERGE +#INTLTOOL_XGETTEXT = /opt/csw/bin/gxgettext +#XGETTEXT = $(INTLTOOL_XGETTEXT) +#INTLTOOL_MSGFMT = /opt/csw/bin/gmsgfmt +#MSGFMT = $(INTLTOOL_MSGFMT) +#INTLTOOL_MSGMERGE = /opt/csw/bin/gmsgmerge +#EXTRA_CONFIGURE_EXPORTS = INTLTOOL_XGETTEXT XGETTEXT INTLTOOL_MSGFMT MSGFMT INTLTOOL_MSGMERGE CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS_CSWpidginotr = CSWgcrypt CSWgpgerr CSWpidgin CSWotr +RUNTIME_DEP_PKGS_CSWpidginotr = CSWlibotr5 +RUNTIME_DEP_PKGS_CSWpidginotr = CSWpidgin +BUILD_DEP_PKGS += CSWotr-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev +BUILD_DEP_PKGS += CSWlibgpg-error-dev + + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri May 3 23:49:01 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 21:49:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[20974] csw/mgar/pkg/pidginotr/trunk Message-ID: Revision: 20974 http://gar.svn.sourceforge.net/gar/?rev=20974&view=rev Author: lblume Date: 2013-05-03 21:49:00 +0000 (Fri, 03 May 2013) Log Message: ----------- pidginotr/trunk: Typo in dep declaration; cleanup Modified Paths: -------------- csw/mgar/pkg/pidginotr/trunk/Makefile csw/mgar/pkg/pidginotr/trunk/checksums Modified: csw/mgar/pkg/pidginotr/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidginotr/trunk/Makefile 2013-05-03 21:43:23 UTC (rev 20973) +++ csw/mgar/pkg/pidginotr/trunk/Makefile 2013-05-03 21:49:00 UTC (rev 20974) @@ -17,18 +17,11 @@ # For msgfmt, msgmerge, xgettext and gettext to be used from GNU CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) -# pidgin-otr requires gnu gettex but doesn't do a good job of locating it -#INTLTOOL_XGETTEXT = /opt/csw/bin/gxgettext -#XGETTEXT = $(INTLTOOL_XGETTEXT) -#INTLTOOL_MSGFMT = /opt/csw/bin/gmsgfmt -#MSGFMT = $(INTLTOOL_MSGFMT) -#INTLTOOL_MSGMERGE = /opt/csw/bin/gmsgmerge -#EXTRA_CONFIGURE_EXPORTS = INTLTOOL_XGETTEXT XGETTEXT INTLTOOL_MSGFMT MSGFMT INTLTOOL_MSGMERGE - CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS_CSWpidginotr = CSWlibotr5 -RUNTIME_DEP_PKGS_CSWpidginotr = CSWpidgin +RUNTIME_DEP_PKGS_CSWpidginotr += CSWlibotr5 +RUNTIME_DEP_PKGS_CSWpidginotr += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWpidginotr += CSWpidgin BUILD_DEP_PKGS += CSWotr-dev BUILD_DEP_PKGS += CSWlibgcrypt-dev Modified: csw/mgar/pkg/pidginotr/trunk/checksums =================================================================== --- csw/mgar/pkg/pidginotr/trunk/checksums 2013-05-03 21:43:23 UTC (rev 20973) +++ csw/mgar/pkg/pidginotr/trunk/checksums 2013-05-03 21:49:00 UTC (rev 20974) @@ -1,3 +1 @@ -f7e34362bff459578e7b1d5039c7a879 download/CSWpidginotr.gspec -37569ac8bf1a824128581dca70afd2ea download/otr_priority.patch -8af70b654b7d7c5a5b7785699ff562f9 download/pidgin-otr-3.2.0.tar.gz +eadb953376acc474e56041d4c12aa2c8 pidgin-otr-4.0.0.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 Sat May 4 00:03:29 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 03 May 2013 22:03:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20975] csw/mgar/pkg/otr/trunk/Makefile Message-ID: Revision: 20975 http://gar.svn.sourceforge.net/gar/?rev=20975&view=rev Author: lblume Date: 2013-05-03 22:03:28 +0000 (Fri, 03 May 2013) Log Message: ----------- otr/trunk: Binaries and man should go in CSWotr Modified Paths: -------------- csw/mgar/pkg/otr/trunk/Makefile Modified: csw/mgar/pkg/otr/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/trunk/Makefile 2013-05-03 21:49:00 UTC (rev 20974) +++ csw/mgar/pkg/otr/trunk/Makefile 2013-05-03 22:03:28 UTC (rev 20975) @@ -12,16 +12,14 @@ PACKAGES += CSWlibotr5 CATALOGNAME_CSWlibotr5 = libotr5 +SPKG_DESC_CSWlibotr5 += $(DESCRIPTION), libotr.so.5 PKGFILES_CSWlibotr5 += $(call baseisadirs,$(libdir),libotr\.so\.5\.0\.0) PKGFILES_CSWlibotr5 += $(call baseisadirs,$(libdir),libotr\.so\.5(\.\d+)*) -PKGFILES_CSWlibotr5 += $(bindir)/.* -PKGFILES_CSWlibotr5 += $(mandir)/man.* -SPKG_DESC_CSWlibotr5 += $(DESCRIPTION), libotr.so.5 PACKAGES += CSWotr-dev CATALOGNAME_CSWotr-dev = otr_dev SPKG_DESC_CSWotr-dev += $(DESCRIPTION), development files -# PKGFILES is catchall +PKGFILES_CSWotr-dev += $(PKGFILES_DEVEL) OBSOLETED_BY_CSWotr-dev += CSWotrdevel @@ -44,8 +42,6 @@ RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr5 RUNTIME_DEP_PKGS_CSWotr += CSWlibotr5 -RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11 BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat May 4 10:43:14 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 04 May 2013 08:43:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[20976] csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Message-ID: Revision: 20976 http://gar.svn.sourceforge.net/gar/?rev=20976&view=rev Author: lblume Date: 2013-05-04 08:43:13 +0000 (Sat, 04 May 2013) Log Message: ----------- otr/branches/libotr2/trunk: Add conditional dependencies for sparc only Modified Paths: -------------- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Modified: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-03 22:03:28 UTC (rev 20975) +++ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-04 08:43:13 UTC (rev 20976) @@ -36,19 +36,19 @@ BUILD64_LIBS_ONLY = 1 RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgcrypt11 -RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr2 RUNTIME_DEP_PKGS_CSWotr += CSWlibotr2 -RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11 +# On sparc, the dependencies end up different +ifeq ($(shell uname -p), sparc) + RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgpg-error0 + RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 +endif + BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev -# Strange issue with checkpkg makes it require those... -CHECKPKG_OVERRIDES_CSWotr += surplus-dependency|CSWlibgpg-error0 -CHECKPKG_OVERRIDES_CSWlibotr2 += surplus-dependency|CSWlibgpg-error0 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 4 11:30:42 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 May 2013 09:30:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20977] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20977 http://gar.svn.sourceforge.net/gar/?rev=20977&view=rev Author: chninkel Date: 2013-05-04 09:30:42 +0000 (Sat, 04 May 2013) Log Message: ----------- rework soname-unused to use elfdump data instead of ldd output Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-05-04 08:43:13 UTC (rev 20976) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-05-04 09:30:42 UTC (rev 20977) @@ -171,55 +171,41 @@ pkgname, messenger) orphan_sonames.extend(orphan_sonames_tmp) - sonames_unused = set() - ldd_info = pkg_data['ldd_info'][binary_info["path"]] - for ldd_response in ldd_info: - if (ldd_response['state'] == 'soname-unused' - and ldd_response['soname'] not in BASE_SOLARIS_LIBRARIES - and ldd_response['soname'] in binary_info['needed sonames']): - sonames_unused.add(ldd_response['soname']) - messenger.Message( - "Binary %s links to library %s but doesn't seem to use any" - " of its symbols. It usually happens because superfluous" - " libraries were added to the linker options, either because" - " of the configure script itself or because of the" - " \"pkg-config --libs\" output of one the dependency." - % ("/" + binary_info["path"], ldd_response['soname'])) - error_mgr.ReportError( - pkgname, "soname-unused", - "%s is needed by %s but never used" - % (ldd_response['soname'], "/" + binary_info["path"])) - - # Even when direct binding is enabled, some symbols might not be - # directly bound because the library explicitely requested the symbol - # not to be drectly bound to. - # For example, libc.so.1 does it for symbol sigaction, free, malloc... - # So we consider that direct binding is enabled if at least one - # symbol is directly bound to because that definitely means that - # -B direct or -z direct was used. + # Some common information gathering for + # "direct bind" and "soname unused" checks binary_elf_info = pkg_data["binaries_elf_info"][binary_info["path"]] - libs = set(binary_info["needed sonames"]) - # we skip the standard Solaris libraries: a lot of plugins only - # link to non directly bindable symbols of libc.so.1, librt.so.1 - # which trigger false positives. - # Direct binding really matters for opencsw libraries so it's - # easier and riskless to just skip theses libraries - libs.difference_update(BASE_SOLARIS_LIBRARIES) - + needed_libs = set(binary_info["needed sonames"]) db_libs = set() + really_needed_libs = set() for syminfo in binary_elf_info['symbol table']: - if (syminfo['shndx'] == 'UNDEF' and syminfo['flags'] - and 'D' in syminfo['flags'] and 'B' in syminfo['flags']): + if (syminfo['soname'] is not None and + syminfo['flags'] is not None): + really_needed_libs.add(syminfo['soname']) + # Even when direct binding is enabled, some symbols might not be + # directly bound because the library explicitely requested the symbol + # not to be directly bound to. + # So we consider that direct binding is enabled if at least one + # symbol is directly bound to the library + if (syminfo['shndx'] == 'UNDEF' and 'B' in syminfo['flags']): db_libs.add(syminfo['soname']) - no_db_libs = libs.difference(db_libs) - # no symbol used means no way to detect if direct binding was - # enabled so we must ignore the libraries which were linked - # without being used - no_db_libs.difference_update(sonames_unused) + # Direct bind check + + if really_needed_libs: + no_db_libs = really_needed_libs.difference(db_libs) + else: + no_db_libs = needed_libs + # we skip the standard Solaris libraries for "direct binding" + # as a lot of plugins only link to non directly bindable symbols + # of libc.so.1, librt.so.1 which trigger false positives. + # This check really matters for opencsw libraries so it's + # easier and riskless to just skip theses libraries + no_db_libs.difference_update(BASE_SOLARIS_LIBRARIES) + if no_db_libs: + no_db_libs = sorted(no_db_libs) messenger.Message( "No symbol of binary %s is directly bound against the following" " libraries: %s. Please make sure the binaries are compiled using" @@ -231,7 +217,42 @@ "%s is not directly bound to soname %s" % ("/" + binary_info["path"], soname)) + # Unused soname check + if really_needed_libs: + unused_libs = needed_libs.difference(really_needed_libs) + # we skip the standard Solaris libraries for "unused soname" + # as base solaris libraries are often linked by default by + # build system and such dependency is harmless + unused_libs.difference_update(BASE_SOLARIS_LIBRARIES) + + if unused_libs: + unused_libs = sorted(unused_libs) + messenger.Message( + "Although it is linked against, binary %s doesn't use any symbols" + " of the following libraries: %s. It usually happens because" + " superfluous libraries were added to the linker options, either" + " because of the configure script itself or because of the" + " \"pkg-config --libs\" output of one the dependency." + % ("/" + binary_info["path"], ", ".join(unused_libs))) + for soname in unused_libs: + error_mgr.ReportError( + pkgname, "soname-unused", + "%s is needed by %s but never used" + % (soname, "/" + binary_info["path"])) + + else: + # No "really needed libs" means either: + # - 1. the binary was entirely static. + # - 2. symbol information table was not present, + # + # Case 1 implies that we do not have any linking error possible + # Case 2 implies that we will not able to know against which + # library a symbol is linked, so we will not able to check + # if no symbol of a library is not used. + # We should then emulate ldd but that will not be for today... + pass + for version_dep in binary_elf_info['version needed']: if (version_dep['soname'] in ALLOWED_VERSION_DEPENDENCIES and not version_dep['version'] in Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-05-04 08:43:13 UTC (rev 20976) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-05-04 09:30:42 UTC (rev 20977) @@ -1474,8 +1474,7 @@ self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(str), mox.IsA(str)) - for soname in [ 'libcurses.so.1', 'libz.so.1', 'libssl.so.1.0.0', - 'libcrypto.so.1.0.0', 'libexpat.so.1' ]: + for soname in [ 'libintl.so.8' ]: self.error_mgr_mock.ReportError( 'CSWcadaver', 'soname-unused', soname + ' is needed by /opt/csw/bin/cadaver but never used') @@ -1516,8 +1515,8 @@ self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', - 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', - 'libc.so.1' ]: + 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + 'libc.so.1' ]: self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(str), mox.IsA(str)) @@ -1569,8 +1568,8 @@ self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(str), mox.IsA(str)) - for soname in ['libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', - 'libpam.so.1']: + for soname in ['libcrypto.so.1.0.0', 'libpam.so.1', 'libsendfile.so.1', + 'libssl.so.1.0.0']: self.error_mgr_mock.ReportError( 'CSWvsftpd', 'no-direct-binding', Modified: csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-05-04 08:43:13 UTC (rev 20976) +++ csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-05-04 09:30:42 UTC (rev 20977) @@ -87,11 +87,6 @@ {'bind': 'GLOB', 'flags': 'DBL', 'shndx': 'UNDEF', - 'soname': 'libintl.so.8', - 'symbol': 'foo'}, - {'bind': 'GLOB', - 'flags': 'DBL', - 'shndx': 'UNDEF', 'soname': 'libneon.so.27', 'symbol': 'foo'}, {'bind': 'GLOB', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 4 11:55:26 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 May 2013 09:55:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20978] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 20978 http://gar.svn.sourceforge.net/gar/?rev=20978&view=rev Author: chninkel Date: 2013-05-04 09:55:23 +0000 (Sat, 04 May 2013) Log Message: ----------- Fix some space/tabs mixes Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-05-04 09:30:42 UTC (rev 20977) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-05-04 09:55:23 UTC (rev 20978) @@ -499,11 +499,11 @@ self.pkg_data["depends"] = (("CSWfoo", None),(u"CSWcommon", "")) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { - 'version definition': [], - 'version needed': [], - 'symbol table': [ - { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } - ] + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ u'/opt/csw/lib': [u'CSWfoo'], @@ -534,11 +534,11 @@ self.pkg_data["depends"] = (("CSWbad", None),(u"CSWcommon", "")) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { - 'version definition': [], - 'version needed': [], - 'symbol table': [ - { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } - ] + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ u'/opt/csw/bdb47/lib': [u'CSWbad'], @@ -569,13 +569,13 @@ self.pkg_data["depends"] = (("CSWbad", None),(u"CSWcommon", "")) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { - 'version definition': [], - 'version needed': [], - 'symbol table': [{ 'symbol': 'foo', - 'soname': 'libdb-4.7.so', - 'bind': 'GLOB', - 'shndx': 'UNDEF', - 'flags': 'DBL' }], + 'version definition': [], + 'version needed': [], + 'symbol table': [{ 'symbol': 'foo', + 'soname': 'libdb-4.7.so', + 'bind': 'GLOB', + 'shndx': 'UNDEF', + 'flags': 'DBL' }], } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ u'/opt/csw/bdb47/lib': [u'CSWbad'], @@ -615,16 +615,15 @@ self.pkg_data["depends"] = ((u"CSWcommon", ""),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] self.pkg_data["binaries_elf_info"] = { - 'opt/csw/bin/sparcv8/rsync': { - 'version definition': [], - 'version needed': [], - 'symbol table': [ - { 'soname': 'libm.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } - ] - } - } - self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libm.so.2').AndReturn({ - }) + 'opt/csw/bin/sparcv8/rsync': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libm.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] + } + } + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libm.so.2').AndReturn({}) self.error_mgr_mock.GetPkgByPath( '/opt/csw/share/man').AndReturn(["CSWcommon"]) self.error_mgr_mock.GetPkgByPath( @@ -666,15 +665,18 @@ }], 'depends': (('CSWlibfoo', None),), 'isalist': (), - 'ldd_info': { 'opt/csw/bin/bar': [] }, - 'binaries_elf_info': { 'opt/csw/bin/bar': { - 'version definition': [], - 'version needed': [], - 'symbol table': [ - { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, - ] - } - }, + 'ldd_info': { 'opt/csw/bin/bar': [] }, + 'binaries_elf_info': { 'opt/csw/bin/bar': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libfoo.so.1', + 'symbol': 'foo', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'bind': 'GLOB' }] + } + }, 'pkgmap': [], 'files_metadata': [ {'endian': 'Little endian', @@ -691,7 +693,7 @@ 'binaries_dump_info': [], 'depends': [], 'isalist': (), - 'ldd_info': {}, + 'ldd_info': {}, 'pkgmap': [], } @@ -729,20 +731,24 @@ # 'depends': (), 'depends': ((u"CSWcommon", ""),), 'isalist': ('foo'), - 'ldd_info': { 'opt/csw/bin/bar': [], 'opt/csw/lib/libfoo.so.1': []}, - 'binaries_elf_info': { 'opt/csw/bin/bar': { - 'version definition': [], - 'version needed': [], - 'symbol table': [ - { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, - ] - }, - 'opt/csw/lib/libfoo.so.1': { - 'version definition': [], - 'version needed': [], - 'symbol table': [], - } - }, + 'ldd_info': { 'opt/csw/bin/bar': [], 'opt/csw/lib/libfoo.so.1': []}, + 'binaries_elf_info': { + 'opt/csw/bin/bar': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libfoo.so.1', + 'symbol': 'foo', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'bind': 'GLOB' }, + ]}, + 'opt/csw/lib/libfoo.so.1': { + 'version definition': [], + 'version needed': [], + 'symbol table': [], + } + }, 'pkgmap': [ { 'path': '/opt/csw/lib/libfoo.so.1', }, { 'path': '/opt/csw/bin/bar', }, @@ -770,14 +776,18 @@ self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] self.pkg_data["ldd_info"] = { 'opt/csw/lib/python/site-packages/foo.so': [] } self.pkg_data["binaries_elf_info"] = { - 'opt/csw/lib/python/site-packages/foo.so': { - 'version definition': [], - 'version needed': [], - 'symbol table': [ - { 'soname': 'libbar.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } - ] - } - } + 'opt/csw/lib/python/site-packages/foo.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libbar.so', + 'symbol': 'foo', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libbar.so').AndReturn({ u'/opt/csw/lib': [u'CSWlibbar'], u'/opt/csw/lib/sparcv9': [u'CSWlibbar'], @@ -806,14 +816,18 @@ self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] self.pkg_data["ldd_info"] = { 'opt/csw/lib/foo.so': [] } self.pkg_data["binaries_elf_info"] = { - 'opt/csw/lib/foo.so': { - 'version definition': [], - 'version needed': [], - 'symbol table': [ - { 'soname': 'libnotfound.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } - ] - } - } + 'opt/csw/lib/foo.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libnotfound.so', + 'symbol': 'foo', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename( 'libnotfound.so').AndReturn({}) self.error_mgr_mock.GetPkgByPath( @@ -1466,8 +1480,8 @@ for common_path in ["/opt/csw/share/locale/it/LC_MESSAGES", "/opt/csw/bin", - "/opt/csw/share/locale/en at quot/LC_MESSAGES", "/opt/csw/share/man", - "/opt/csw/share/doc", "/opt/csw/share/locale/es/LC_MESSAGES"]: + "/opt/csw/share/locale/en at quot/LC_MESSAGES", "/opt/csw/share/man", + "/opt/csw/share/doc", "/opt/csw/share/locale/es/LC_MESSAGES"]: self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) for i in range(21): @@ -1511,7 +1525,7 @@ "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) for common_path in ["/opt/csw/share/man", "/var/opt/csw", "/opt/csw/sbin", - "/opt/csw/share/doc", "/etc/opt/csw"]: + "/opt/csw/share/doc", "/etc/opt/csw"]: self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', @@ -1529,9 +1543,9 @@ def testDirectBindingNoSyminfo(self): self.pkg_data = vsftpd_stats self.pkg_data[0]['binaries_elf_info']['opt/csw/sbin/vsftpd'] = { - 'version definition': [], - 'version needed': [], - 'symbol table': [] } + 'version definition': [], + 'version needed': [], + 'symbol table': [] } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",)}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ @@ -1559,12 +1573,12 @@ "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) for common_path in ["/opt/csw/share/man", "/var/opt/csw", "/opt/csw/sbin", - "/opt/csw/share/doc", "/etc/opt/csw"]: + "/opt/csw/share/doc", "/etc/opt/csw"]: self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', - 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', - 'libc.so.1' ]: + 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + 'libc.so.1' ]: self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(str), mox.IsA(str)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 4 11:55:46 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 May 2013 09:55:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[20979] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 20979 http://gar.svn.sourceforge.net/gar/?rev=20979&view=rev Author: chninkel Date: 2013-05-04 09:55:46 +0000 (Sat, 04 May 2013) Log Message: ----------- use mmap instead of reading the whole file during regex search to limit unecessary memory usage Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-05-04 09:55:23 UTC (rev 20978) +++ csw/mgar/gar/v2/lib/python/package.py 2013-05-04 09:55:46 UTC (rev 20979) @@ -10,6 +10,7 @@ import subprocess import tempfile import time +import mmap import configuration as c import opencsw @@ -412,12 +413,16 @@ full_paths = self.GetAllFilePaths() files_by_pattern = {} for full_path in full_paths: - content = open(self.MakeAbsolutePath(full_path), "rb").read() - for regex in regex_list: - if re.search(regex, content): - if regex not in files_by_pattern: - files_by_pattern[regex] = [] - files_by_pattern[regex].append(full_path) + abs_path = self.MakeAbsolutePath(full_path) + if not os.path.getsize(abs_path): + continue + with open(abs_path, "rb") as f: + content = mmap.mmap(f.fileno(), 0, prot=mmap.PROT_READ) + for regex in regex_list: + if re.search(regex, content): + if regex not in files_by_pattern: + files_by_pattern[regex] = [] + files_by_pattern[regex].append(full_path) return files_by_pattern def MakeAbsolutePath(self, p): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 4 11:56:05 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 May 2013 09:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[20980] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 20980 http://gar.svn.sourceforge.net/gar/?rev=20980&view=rev Author: chninkel Date: 2013-05-04 09:56:05 +0000 (Sat, 04 May 2013) Log Message: ----------- do not process the symtab symbol table section Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-05-04 09:55:46 UTC (rev 20979) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-05-04 09:56:05 UTC (rev 20980) @@ -422,7 +422,7 @@ (?P
Version\sNeeded|Symbol\sTable # Section header |Version\sDefinition|Syminfo) \sSection: - \s+(?:\.SUNW_version|\.gnu\.version_[rd] + \s+(?P\.SUNW_version|\.gnu\.version_[rd] |\.(SUNW_l)?dynsym|\.SUNW_syminfo|.symtab)\s*$ |\s*(?:index\s+)?version\s+dependency\s*$ # Version needed header @@ -476,16 +476,22 @@ # - for non external symbols (?P\S+)\s* # symbol + """), + 'symtab': (r""" + .* # We don't care about this section """)} elfdump_data = None m = re.match(headers_re, line, re.VERBOSE) if m: if m.lastindex: - section = m.group('section').lower() + if m.group('name') == ".symtab": + section = 'symtab' + else: + section = m.group('section').lower() elif section: m = re.match(re_by_section[section], line, re.VERBOSE) - if m: + if m and m.lastindex: elfdump_data = m.groupdict() if not m: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 4 11:56:31 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 May 2013 09:56:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[20981] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20981 http://gar.svn.sourceforge.net/gar/?rev=20981&view=rev Author: chninkel Date: 2013-05-04 09:56:31 +0000 (Sat, 04 May 2013) Log Message: ----------- merge the two ShellCommand functions Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/shell.py csw/mgar/gar/v2/lib/python/system_pkgmap.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-05-04 09:56:05 UTC (rev 20980) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-05-04 09:56:31 UTC (rev 20981) @@ -192,7 +192,7 @@ binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] - retcode, stdout, stderr = shell.ShellCommand(args) + retcode, stdout, stderr = shell.ShellCommand(args, allow_error=True) if retcode: logging.error("%s returned an error: %s", args, stderr) # Should it just skip over an error? @@ -234,7 +234,7 @@ binary = os.path.join(base_dir, binary) # elfdump is the only tool that give us all informations args = [common_constants.ELFDUMP_BIN, "-svy", binary_abspath] - retcode, stdout, stderr = shell.ShellCommand(args) + retcode, stdout, stderr = shell.ShellCommand(args, allow_error=True) if retcode or stderr: # we ignore for now these elfdump errors which can be catched # later by check functions, @@ -350,7 +350,7 @@ args = ["ldd", "-Ur", binary_abspath] # ldd can be stuck while ran on a some binaries, so we define # a timeout (problem encountered with uconv) - retcode, stdout, stderr = shell.ShellCommand(args, timeout=10) + retcode, stdout, stderr = shell.ShellCommand(args, timeout=10, allow_error=True) if retcode: # There three cases where we will ignore an ldd error # - if we are trying to analyze a 64 bits binary on a Solaris 9 x86 Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-05-04 09:56:05 UTC (rev 20980) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-05-04 09:56:31 UTC (rev 20981) @@ -235,7 +235,7 @@ args = [common_constants.ELFDUMP_BIN, '-svy', os.path.join(fake_package_path, "root", fake_binary)] - shell.ShellCommand(args).AndReturn((0, ELFDUMP_OUTPUT, "")) + shell.ShellCommand(args, allow_error=True).AndReturn((0, ELFDUMP_OUTPUT, "")) self.mox.ReplayAll() self.assertEqual(BINARY_ELFINFO, ip.GetBinaryElfInfo()) @@ -256,7 +256,7 @@ args = [common_constants.ELFDUMP_BIN, '-svy', os.path.join(fake_package_path, "reloc", fake_binary)] - shell.ShellCommand(args).AndReturn((0, ELFDUMP_OUTPUT, "")) + shell.ShellCommand(args, allow_error=True).AndReturn((0, ELFDUMP_OUTPUT, "")) self.mox.ReplayAll() self.assertEqual(BINARY_ELFINFO, ip.GetBinaryElfInfo()) @@ -308,7 +308,7 @@ args = [common_constants.ELFDUMP_BIN, '-svy', os.path.join(fake_package_path, "root", fake_binary)] - shell.ShellCommand(args).AndReturn((0, fake_elfdump_output, fake_elfdump_errors)) + shell.ShellCommand(args, allow_error=True).AndReturn((0, fake_elfdump_output, fake_elfdump_errors)) self.mox.ReplayAll() self.assertEqual(fake_binary_elfinfo, ip.GetBinaryElfInfo()) @@ -334,7 +334,7 @@ self.mox.StubOutWithMock(shell, 'ShellCommand') shell.ShellCommand( ['ldd', '-Ur', '/tmp/CSWfake/root/opt/csw/bin/foo'], - timeout=10).AndReturn((0, "", "")) + allow_error=True, timeout=10).AndReturn((0, "", "")) self.mox.StubOutWithMock(ip, '_ParseLddDashRline') self.mox.ReplayAll() self.assertEqual({'opt/csw/bin/foo': []}, ip.GetLddMinusRlines()) @@ -359,7 +359,7 @@ self.mox.StubOutWithMock(shell, 'ShellCommand') shell.ShellCommand( ['ldd', '-Ur', '/tmp/CSWfake/reloc/bin/foo'], - timeout=10).AndReturn((0, "", "")) + allow_error=True, timeout=10).AndReturn((0, "", "")) self.mox.StubOutWithMock(ip, '_ParseLddDashRline') self.mox.ReplayAll() self.assertEqual({'opt/csw/bin/foo': []}, ip.GetLddMinusRlines()) @@ -385,7 +385,7 @@ self.mox.StubOutWithMock(shell, 'ShellCommand') shell.ShellCommand( ['ldd', '-Ur', '/tmp/CSWfake/root/opt/csw/bin/foo'], - timeout=10).AndReturn((1, "", "boo")) + allow_error=True, timeout=10).AndReturn((1, "", "boo")) self.mox.StubOutWithMock(ip, '_ParseLddDashRline') self.mox.ReplayAll() self.assertRaises(package.SystemUtilityError, Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-05-04 09:56:05 UTC (rev 20980) +++ csw/mgar/gar/v2/lib/python/package.py 2013-05-04 09:56:31 UTC (rev 20981) @@ -53,7 +53,7 @@ """Problem with data returned by a process.""" -class CswSrv4File(shell.ShellMixin, object): +class CswSrv4File(object): """Represents a package in the srv4 format (pkg).""" def __init__(self, pkg_path, debug=False): @@ -96,7 +96,7 @@ self.gunzipped_path = os.path.join(self.GetWorkDir(), base_name) with open(self.gunzipped_path, 'w') as gunzipped_file: args = ["gunzip", "-f", "-c", self.pkg_path] - unused_retcode = shell.ShellCommand(args, stdout=gunzipped_file) + shell.ShellCommand(args, stdout=gunzipped_file) elif self.pkg_path.endswith(pkg_suffix): self.gunzipped_path = self.pkg_path else: @@ -116,11 +116,7 @@ src_file, destdir, pkgname ] - ret, stdout, stderr = shell.ShellCommand(args) - if ret: - logging.error(stdout) - logging.error(stderr) - logging.error("% has failed" % args) + shell.ShellCommand(args) def GetPkgname(self): """It's necessary to figure out the pkgname from the .pkg file. @@ -129,7 +125,7 @@ if not self.pkgname: gunzipped_path = self.GetGunzippedPath() args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] - ret_code, stdout, stderr = shell.ShellCommand(args) + shell.ShellCommand(args) self.pkgname = stdout.strip() logging.debug("GetPkgname(): %s", repr(self.pkgname)) return self.pkgname @@ -167,7 +163,7 @@ "..", "..", "bin", "custom-pkgtrans"), gunzipped_path, self.GetWorkDir(), pkgname] logging.debug("transforming: %s", args) - unused_retcode = self.ShellCommand(args, quiet=(not self.debug)) + shell.ShellCommand(args, quiet=(not self.debug)) dirs = self.GetDirs() if len(dirs) != 1: raise Error("Need exactly one package in the package stream: " @@ -217,7 +213,7 @@ return DirectoryFormatPackage -class DirectoryFormatPackage(shell.ShellMixin, object): +class DirectoryFormatPackage(object): """Represents a package in the directory format. Allows some read-write operations. @@ -266,9 +262,9 @@ if not os.path.isdir(target_dir): os.makedirs(target_dir) args = ["pkgtrans", "-s", pkg_container_dir, target_path, pkg_dir] - self.ShellCommand(args, quiet=True) + shell.ShellCommand(args, quiet=True) args = ["gzip", "-f", target_path] - self.ShellCommand(args, quiet=True) + shell.ShellCommand(args, quiet=True) return target_path def GetBasedir(self): @@ -333,7 +329,7 @@ # Some packages extract read-only. To be sure, change them to be # user-writable. args = ["chmod", "-R", "u+w", self.directory] - self.ShellCommand(args) + shell.ShellCommand(args) pkginfo_filename = self.GetPkginfoFilename() os.chmod(pkginfo_filename, 0644) pkginfo_fd = open(pkginfo_filename, "w") Modified: csw/mgar/gar/v2/lib/python/shell.py =================================================================== --- csw/mgar/gar/v2/lib/python/shell.py 2013-05-04 09:56:05 UTC (rev 20980) +++ csw/mgar/gar/v2/lib/python/shell.py 2013-05-04 09:56:31 UTC (rev 20981) @@ -15,35 +15,11 @@ def TimeoutHandler(signum, frame): raise TimeoutExpired -class ShellMixin(object): - - def ShellCommand(self, args, quiet=False): - logging.debug("Calling: %s", repr(args)) - stdout, stderr = None, None - if quiet: - process = subprocess.Popen(args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = process.communicate() - retcode = process.wait() - else: - retcode = subprocess.call(args) - if retcode: - logging.critical(stdout) - logging.critical(stderr) - raise Error("Running %s has failed." % repr(args)) - return retcode - def ShellCommand(args, env=None, timeout=None, + quiet=True, allow_error=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE): logging.debug("Running: %s", args) - proc = subprocess.Popen(args, - stdout=stdout, - stderr=stderr, - env=env, - preexec_fn=os.setsid, - close_fds=True) # Python 3.3 have the timeout option # we have to roughly emulate it with python 2.x if timeout: @@ -51,14 +27,33 @@ signal.alarm(timeout) try: - stdout, stderr = proc.communicate() + if not quiet: + retcode = subprocess.call(args) + + else: + proc = subprocess.Popen(args, + stdout=stdout, + stderr=stderr, + env=env, + preexec_fn=os.setsid, + close_fds=True) + stdout, stderr = proc.communicate() + retcode = proc.wait() + signal.alarm(0) + except TimeoutExpired: os.kill(-proc.pid, signal.SIGKILL) msg = "Process %s killed after timeout expiration" % args raise TimeoutExpired(msg) - retcode = proc.wait() - return retcode, stdout, stderr + if retcode and not allow_error: + logging.critical(stdout) + logging.critical(stderr) + raise Error("Running %s has failed." % repr(args)) + if quiet: + return retcode, stdout, stderr + else: + return retcode Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-05-04 09:56:05 UTC (rev 20980) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-05-04 09:56:31 UTC (rev 20981) @@ -285,7 +285,7 @@ if uname_option: args.append(uname_option) # TODO: Don't fork during unit tests - ret, stdout, unused_stderr = shell.ShellCommand(args) + ret, stdout, unused_stderr = shell.ShellCommand(args, allow_error=True) if ret: raise SubprocessError("Running uname has failed.") return stdout.strip() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 4 11:56:50 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 May 2013 09:56:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[20982] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 20982 http://gar.svn.sourceforge.net/gar/?rev=20982&view=rev Author: chninkel Date: 2013-05-04 09:56:50 +0000 (Sat, 04 May 2013) Log Message: ----------- put elfdump output in a temporary file and mmap it to limit unecessary memory usage Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-05-04 09:56:31 UTC (rev 20981) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-05-04 09:56:50 UTC (rev 20982) @@ -13,6 +13,8 @@ import configuration as c import time import shell +import mmap +import tempfile from elftools.elf.elffile import ELFFile from elftools.elf.enums import ENUM_E_MACHINE @@ -233,8 +235,10 @@ if base_dir: binary = os.path.join(base_dir, binary) # elfdump is the only tool that give us all informations + elfdump_output_file = tempfile.TemporaryFile() args = [common_constants.ELFDUMP_BIN, "-svy", binary_abspath] - retcode, stdout, stderr = shell.ShellCommand(args, allow_error=True) + retcode, stdout, stderr = shell.ShellCommand(args, allow_error=True, + stdout=elfdump_output_file) if retcode or stderr: # we ignore for now these elfdump errors which can be catched # later by check functions, @@ -273,14 +277,20 @@ "as path of the error report. Logs are saved in " + "/tmp/elfdump_std(out|err).log for your inspection.") raise package.Error(msg) - elfdump_out = stdout.splitlines() symbols = {} binary_info = {'version definition': [], 'version needed': []} + if not os.fstat(elfdump_output_file.fileno()).st_size: + binary_info['symbol table'] = [] + binaries_elf_info[binary] = binary_info + continue + + elfdump_output = mmap.mmap(elfdump_output_file.fileno(), 0, prot=mmap.PROT_READ) + cur_section = None - for line in elfdump_out: + for line in iter(elfdump_output.readline, ""): try: elf_info, cur_section = self._ParseElfdumpLine(line, cur_section) except package.StdoutSyntaxError as e: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 4 12:06:16 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 May 2013 10:06:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[20983] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 20983 http://gar.svn.sourceforge.net/gar/?rev=20983&view=rev Author: chninkel Date: 2013-05-04 10:06:14 +0000 (Sat, 04 May 2013) Log Message: ----------- fix a mistake in the ShellCommand merging previous commit Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-05-04 09:56:50 UTC (rev 20982) +++ csw/mgar/gar/v2/lib/python/package.py 2013-05-04 10:06:14 UTC (rev 20983) @@ -126,7 +126,7 @@ gunzipped_path = self.GetGunzippedPath() args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] shell.ShellCommand(args) - self.pkgname = stdout.strip() + retcode, stdout, stderr = self.pkgname = stdout.strip() logging.debug("GetPkgname(): %s", repr(self.pkgname)) return self.pkgname @@ -409,7 +409,7 @@ full_paths = self.GetAllFilePaths() files_by_pattern = {} for full_path in full_paths: - abs_path = self.MakeAbsolutePath(full_path) + abs_path = self.MakeAbsolutePath(full_path) if not os.path.getsize(abs_path): continue with open(abs_path, "rb") as f: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 4 12:26:45 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 May 2013 10:26:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[20984] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 20984 http://gar.svn.sourceforge.net/gar/?rev=20984&view=rev Author: chninkel Date: 2013-05-04 10:26:44 +0000 (Sat, 04 May 2013) Log Message: ----------- really fix the mistake and stop drinking too much Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-05-04 10:06:14 UTC (rev 20983) +++ csw/mgar/gar/v2/lib/python/package.py 2013-05-04 10:26:44 UTC (rev 20984) @@ -125,8 +125,8 @@ if not self.pkgname: gunzipped_path = self.GetGunzippedPath() args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] - shell.ShellCommand(args) - retcode, stdout, stderr = self.pkgname = stdout.strip() + retcode, stdout, stderr = shell.ShellCommand(args) + self.pkgname = stdout.strip() logging.debug("GetPkgname(): %s", repr(self.pkgname)) return self.pkgname This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat May 4 12:49:55 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 04 May 2013 10:49:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[20985] csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Message-ID: Revision: 20985 http://gar.svn.sourceforge.net/gar/?rev=20985&view=rev Author: lblume Date: 2013-05-04 10:49:55 +0000 (Sat, 04 May 2013) Log Message: ----------- otr/branches/libotr2/trunk: Minor recipe cleanup Modified Paths: -------------- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile Modified: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-04 10:26:44 UTC (rev 20984) +++ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile 2013-05-04 10:49:55 UTC (rev 20985) @@ -8,7 +8,7 @@ endef MASTER_SITES = http://www.cypherpunks.ca/otr/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz PATCHFILES += heartbeat.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 4 13:11:11 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 May 2013 11:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[20986] csw/mgar/gar/v2/lib/python/shell.py Message-ID: Revision: 20986 http://gar.svn.sourceforge.net/gar/?rev=20986&view=rev Author: chninkel Date: 2013-05-04 11:11:10 +0000 (Sat, 04 May 2013) Log Message: ----------- ShellCommand should always return the same number of values Modified Paths: -------------- csw/mgar/gar/v2/lib/python/shell.py Modified: csw/mgar/gar/v2/lib/python/shell.py =================================================================== --- csw/mgar/gar/v2/lib/python/shell.py 2013-05-04 10:49:55 UTC (rev 20985) +++ csw/mgar/gar/v2/lib/python/shell.py 2013-05-04 11:11:10 UTC (rev 20986) @@ -20,6 +20,11 @@ stdout=subprocess.PIPE, stderr=subprocess.PIPE): logging.debug("Running: %s", args) + + if not quiet: + stdout = subprocess.STDOUT + stderr = subprocess.STDOUT + # Python 3.3 have the timeout option # we have to roughly emulate it with python 2.x if timeout: @@ -27,21 +32,17 @@ signal.alarm(timeout) try: - if not quiet: - retcode = subprocess.call(args) + proc = subprocess.Popen(args, + stdout=stdout, + stderr=stderr, + env=env, + preexec_fn=os.setsid, + close_fds=True) + stdout, stderr = proc.communicate() + retcode = proc.wait() - else: - proc = subprocess.Popen(args, - stdout=stdout, - stderr=stderr, - env=env, - preexec_fn=os.setsid, - close_fds=True) - stdout, stderr = proc.communicate() - retcode = proc.wait() - signal.alarm(0) - + except TimeoutExpired: os.kill(-proc.pid, signal.SIGKILL) msg = "Process %s killed after timeout expiration" % args @@ -52,8 +53,4 @@ logging.critical(stderr) raise Error("Running %s has failed." % repr(args)) - if quiet: - return retcode, stdout, stderr - else: - return retcode - + return retcode, stdout, stderr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Sat May 4 15:52:48 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sat, 04 May 2013 13:52:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[20987] csw/mgar/pkg Message-ID: Revision: 20987 http://gar.svn.sourceforge.net/gar/?rev=20987&view=rev Author: slowfranklin Date: 2013-05-04 13:52:47 +0000 (Sat, 04 May 2013) Log Message: ----------- New package Gnome dconf Added Paths: ----------- csw/mgar/pkg/dconf/ csw/mgar/pkg/dconf/Makefile csw/mgar/pkg/dconf/branches/ csw/mgar/pkg/dconf/tags/ csw/mgar/pkg/dconf/trunk/ csw/mgar/pkg/dconf/trunk/Makefile csw/mgar/pkg/dconf/trunk/checksums csw/mgar/pkg/dconf/trunk/files/ csw/mgar/pkg/dconf/trunk/files/0001-Use-statvfs-for-checking-filesystem-type.patch csw/mgar/pkg/dconf/trunk/files/0002-Remove-linker-flags-remove-c89-request.patch csw/mgar/pkg/dconf/trunk/files/0003-Add-gio-includes.patch Added: csw/mgar/pkg/dconf/Makefile =================================================================== --- csw/mgar/pkg/dconf/Makefile (rev 0) +++ csw/mgar/pkg/dconf/Makefile 2013-05-04 13:52:47 UTC (rev 20987) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/dconf/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/dconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/dconf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dconf/trunk/Makefile 2013-05-04 13:52:47 UTC (rev 20987) @@ -0,0 +1,59 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = dconf +VERSION = 0.5.1 +GARTYPE = v2 + +DESCRIPTION = low-level configuration system for glib +define BLURB + dconf is a low-level configuration system. Its main purpose is to + provide a backend to GSettings on platforms that dont already have + configuration storage systems. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(NAME)-$(VERSION).tar.bz2 +GARCOMPILER = GNU + +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_INC = $(prefix)/include/gtk-2.0 +EXTRA_INC += $(prefix)/include/cairo +EXTRA_INC += $(prefix)/include/pango-1.0 +EXTRA_INC += $(prefix)/lib/gtk-2.0/include/ +EXTRA_INC += $(prefix)/include/gdk-pixbuf-2.0/ +EXTRA_INC += $(prefix)/include/atk-1.0/ + +BUILD_DEP_PKGS += CSWlibdbusdev +BUILD_DEP_PKGS += CSWpkgconfig +BUILD_DEP_PKGS += CSWglib2devel +BUILD_DEP_PKGS += CSWgtk2devel + +RUNTIME_DEP_PKGS += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS += CSWglib2 +RUNTIME_DEP_PKGS += CSWlibdbus + +PACKAGES += CSWdconf +SPKG_DESC_CSWdconf = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWdconf += CSWlibdconf0 + +PACKAGES += CSWlibdconf0 +SPKG_DESC_CSWlibdconf0 = $(DESCRIPTION), library +PKGFILES_CSWlibdconf0 += $(call pkgfiles_lib,libdconf.so) + +PACKAGES += CSWlibdconf-dev +SPKG_DESC_CSWlibdconf-dev = $(DESCRIPTION), development files +PKGFILES_CSWlibdconf-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibdconf-dev += $(call baseisadirs,$(datadir),vala/vapi/dconf\.deps) +PKGFILES_CSWlibdconf-dev += $(call baseisadirs,$(datadir),vala/vapi/dconf\.vapi) +RUNTIME_DEP_PKGS_CSWlibdconf-dev += CSWlibdconf0 + +PATCHFILES += 0001-Use-statvfs-for-checking-filesystem-type.patch +PATCHFILES += 0002-Remove-linker-flags-remove-c89-request.patch +PATCHFILES += 0003-Add-gio-includes.patch + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__" + +include gar/category.mk + Property changes on: csw/mgar/pkg/dconf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/dconf/trunk/checksums =================================================================== --- csw/mgar/pkg/dconf/trunk/checksums (rev 0) +++ csw/mgar/pkg/dconf/trunk/checksums 2013-05-04 13:52:47 UTC (rev 20987) @@ -0,0 +1 @@ +c905497d0255fe2ba58564f9655908ab dconf-0.5.1.tar.bz2 Added: csw/mgar/pkg/dconf/trunk/files/0001-Use-statvfs-for-checking-filesystem-type.patch =================================================================== --- csw/mgar/pkg/dconf/trunk/files/0001-Use-statvfs-for-checking-filesystem-type.patch (rev 0) +++ csw/mgar/pkg/dconf/trunk/files/0001-Use-statvfs-for-checking-filesystem-type.patch 2013-05-04 13:52:47 UTC (rev 20987) @@ -0,0 +1,44 @@ +From fb34695aa0196076e19343701430b3ffa838c075 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sat, 4 May 2013 13:43:57 +0200 +Subject: [PATCH] Use statvfs for checking filesystem type + +--- + common/dconf-shmdir.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/common/dconf-shmdir.c b/common/dconf-shmdir.c +index e1e8fdf..f8c163f 100644 +--- a/common/dconf-shmdir.c ++++ b/common/dconf-shmdir.c +@@ -32,11 +32,11 @@ + static gboolean + is_local (const gchar *filename) + { +- struct statfs buf; ++ struct statvfs buf; + gint s; + + do +- s = statfs (filename, &buf); ++ s = statvfs (filename, &buf); + while (s < 0 && errno == EINTR); + + if (s < 0 && errno == ENOENT) +@@ -44,11 +44,11 @@ is_local (const gchar *filename) + g_mkdir_with_parents (filename, 0700); + + do +- s = statfs (filename, &buf); ++ s = statvfs (filename, &buf); + while (s < 0 && errno == EINTR); + } + +- return s == 0 && buf.f_type != NFS_SUPER_MAGIC; ++ return s == 0 && (strcmp(buf.f_basetype, "nfs") != 0); + } + + gchar * +-- +1.8.1.4 + Added: csw/mgar/pkg/dconf/trunk/files/0002-Remove-linker-flags-remove-c89-request.patch =================================================================== --- csw/mgar/pkg/dconf/trunk/files/0002-Remove-linker-flags-remove-c89-request.patch (rev 0) +++ csw/mgar/pkg/dconf/trunk/files/0002-Remove-linker-flags-remove-c89-request.patch 2013-05-04 13:52:47 UTC (rev 20987) @@ -0,0 +1,29 @@ +From d13c3a880c1dda31398e8a46e7072bdaf285ac31 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sat, 4 May 2013 14:06:19 +0200 +Subject: [PATCH] Remove linker flags, remove c89 request + +--- + gsettings/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gsettings/Makefile.in b/gsettings/Makefile.in +index 8439295..57525b1 100644 +--- a/gsettings/Makefile.in ++++ b/gsettings/Makefile.in +@@ -191,10 +191,10 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -fPIC -DPIC ++AM_CFLAGS = -Wall -Wmissing-prototypes -Wwrite-strings -fPIC -DPIC + INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS) + libdconfsettings_so_LDADD = $(gio_LIBS) +-libdconfsettings_so_LDFLAGS = -module -avoid-version -shared ++libdconfsettings_so_LDFLAGS = -shared + libdconfsettings_so_SOURCES = \ + ../engine/dconf-engine.c \ + ../common/dconf-shmdir.c \ +-- +1.8.1.4 + Added: csw/mgar/pkg/dconf/trunk/files/0003-Add-gio-includes.patch =================================================================== --- csw/mgar/pkg/dconf/trunk/files/0003-Add-gio-includes.patch (rev 0) +++ csw/mgar/pkg/dconf/trunk/files/0003-Add-gio-includes.patch 2013-05-04 13:52:47 UTC (rev 20987) @@ -0,0 +1,25 @@ +From d0cbd2b17933abb82a89ad2b7779f2ecf791cb04 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sat, 4 May 2013 15:22:59 +0200 +Subject: [PATCH] Add gio includes + +--- + editor/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/editor/Makefile.in b/editor/Makefile.in +index f89f0cd..1e31ceb 100644 +--- a/editor/Makefile.in ++++ b/editor/Makefile.in +@@ -192,7 +192,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CFLAGS = $(gtk_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client ++AM_CFLAGS = $(gio_CFLAGS) $(gtk_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client + AM_VALAFLAGS = --vapidir ../client --pkg gtk+-2.0 --pkg libxml-2.0 --pkg dconf + dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS) + dconf_editor_SOURCES = dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat May 4 16:47:29 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 04 May 2013 14:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20988] csw/mgar/pkg/cfengine3/branches Message-ID: Revision: 20988 http://gar.svn.sourceforge.net/gar/?rev=20988&view=rev Author: guengel Date: 2013-05-04 14:47:27 +0000 (Sat, 04 May 2013) Log Message: ----------- cfengine3/branches/solaris9: Recipe for CFEngine 3.4.4 tailored for Solaris 9 on specific user request. Modified Paths: -------------- csw/mgar/pkg/cfengine3/branches/solaris9/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch Added Paths: ----------- csw/mgar/pkg/cfengine3/branches/solaris9/ csw/mgar/pkg/cfengine3/branches/solaris9/Makefile csw/mgar/pkg/cfengine3/branches/solaris9/checksums csw/mgar/pkg/cfengine3/branches/solaris9/files/0000-Fix-src-hashes.c-so-it-compiles-under-Solaris-9.patch csw/mgar/pkg/cfengine3/branches/solaris9/files/0000-No-Werror-implicit-function-declaration.patch csw/mgar/pkg/cfengine3/branches/solaris9/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/cfengine3/branches/solaris9/Makefile csw/mgar/pkg/cfengine3/branches/solaris9/checksums csw/mgar/pkg/cfengine3/branches/solaris9/files/changelog.CSW Deleted: csw/mgar/pkg/cfengine3/branches/solaris9/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2013-03-22 23:18:52 UTC (rev 20496) +++ csw/mgar/pkg/cfengine3/branches/solaris9/Makefile 2013-05-04 14:47:27 UTC (rev 20988) @@ -1,219 +0,0 @@ -# $Id$ -# -NAME = cfengine3 -VERSION = 3.4.1 -GARTYPE = v2 -GARCOMPILER = SOS12U2 - -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -DESCRIPTION = Open source configuration management system -define BLURB - CFEngine Community is the Open Source foundation of CFEngine's innovative - configuration management technology that helps systems administrators - automate and ensure the availability, security and compliance of - mission-critical applications and services. -endef - -DISTNAME = cfengine-$(VERSION) -MASTER_SITES = http://www.cfengine.com/source-code/download/ -DISTFILES = $(DISTNAME).tar.gz -DISTFILES += $(NAME)rc -DISTFILES += CSW$(NAME)utils.postinstall -DISTFILES += csw$(NAME)-cfexecd -DISTFILES += csw$(NAME)-cfmonitord -DISTFILES += csw$(NAME)-cfserverd -DISTFILES += README.CSW -DISTFILES += changelog.CSW -VENDOR_URL = http://www.cfengine.com/community - -UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz - -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - -# See comment in patch -PATCHFILES += 0000-Do-not-perform-acceptance-test.patch -# Make build and tests work -PATCHFILES += 0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch -PATCHFILES += 0003-Fix-empty-initializer.-Add-mkdtemp.patch -PATCHFILES += 0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch - -# -# CUSTOM VARIABLES -# -cfengine_workdir = $(localstatedir)/$(NAME) -cfengine_workdir_bin = $(cfengine_workdir)/bin -initddir = $(sysconfdir)/init.d - -PACKAGES = CSW$(NAME)utils -# Catch all -CATALOGNAME_CSW$(NAME)utils = $(NAME)_utils -SPKG_DESC_CSW$(NAME)utils = CFEngine 3 utilities and documentation -RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibtokyocabinet9 -RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre1 -CHECKPKG_OVERRIDES_CSW$(NAME)utils += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)utils|catalogname=$(NAME)_utils|expected-catalogname=$(NAME)utils -CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/CoreBase/failsafe/failsafe.cf -CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/ChangeLog -OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt -CATALOGNAME_CSWlibpromises1 = libpromises1_stub -CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt_stub - -PACKAGES += CSW$(NAME)server -CATALOGNAME_CSW$(NAME)server = $(NAME)_server -SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary -RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)utils -PKGFILES_CSW$(NAME)server += $(sbindir)/cf-serverd -PKGFILES_CSW$(NAME)server += $(sbindir)/cf-runagent -PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-serverd.* -PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-runagent.* -PKGFILES_CSW$(NAME)server += $(initddir)/csw$(NAME)-cfserverd -PKGFILES_CSW$(NAME)server += $(docdir)/$(NAME)_server/.*\.CSW -CHECKPKG_OVERRIDES_CSW$(NAME)server += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)server|catalogname=$(NAME)_server|expected-catalogname=$(NAME)server - -PACKAGES += CSW$(NAME)client -CATALOGNAME_CSW$(NAME)client = $(NAME)_client -SPKG_DESC_CSW$(NAME)client = CFEngine 3 client binaries -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibxml2-2 -PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent -PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd -PKGFILES_CSW$(NAME)client += $(sbindir)/cf-monitord -PKGFILES_CSW$(NAME)client += $(mandir)/.*/cf-agent.* -PKGFILES_CSW$(NAME)client += $(mandir)/.*/cf-execd.* -PKGFILES_CSW$(NAME)client += $(mandir)/.*/cf-monitord.* -PKGFILES_CSW$(NAME)client += $(cfengine_workdir_bin)/cf-agent -PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfexecd -PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfmonitord -PKGFILES_CSW$(NAME)client += $(docdir)/$(NAME)_client/.*\.CSW -CHECKPKG_OVERRIDES_CSW$(NAME)client += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)client|catalogname=$(NAME)_client|expected-catalogname=$(NAME)client - -# CFEngine provides three daemons -# - cf-execd (client) -# - cf-monitord (client) -# - cf-serverd (server) -INITSMF = $(initddir)/csw$(NAME)-cfexecd -INITSMF += $(initddir)/csw$(NAME)-cfmonitord -INITSMF += $(initddir)/csw$(NAME)-cfserverd - -LICENSE = LICENSE - -# This file gets installed by CSW$(NAME)util since it is used by -# the server and client component -PRESERVECONF = $(sysconfdir)/$(NAME)rc - -BUILD_DEP_PKGS = CSWlibssl-dev -BUILD_DEP_PKGS += CSWlibpcre-dev -BUILD_DEP_PKGS += CSWlibxml2-dev -BUILD_DEP_PKGS += CSWlibtokyocabinet-dev -BUILD_DEP_PKGS += CSWflex -BUILD_DEP_PKGS += CSWbison - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-silent-rules -CONFIGURE_ARGS += --with-tokyocabinet=$(prefix) -CONFIGURE_ARGS += --with-openssl=$(prefix) -CONFIGURE_ARGS += --with-pcre=$(prefix) -CONFIGURE_ARGS += --with-workdir=$(cfengine_workdir) -CONFIGURE_ARGS += --without-qdbm -CONFIGURE_ARGS += --without-postgresql -CONFIGURE_ARGS += --without-mysql - -EXTRA_CPPFLAGS = -xc99=all -# -features=extensions is needed since some void functions return values... -EXTRA_CFLAGS = -xc99=all -features=extensions - -# We use this because libpromises will be moved to this private -# directory (see also move-libpromises:) -EXTRA_LDFLAGS += -R$(libdir)/$(NAME) - -# Those libs are used by configure to detect getaddrinfo() -EXTRA_CONFIGURE_ENV = LIBS="-lsocket -lnsl" - -include gar/category.mk - -post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files move-libpromises move-binaries - @$(MAKECOOKIE) - -rename-cfengine-dir: - ginstall -d $(DESTDIR)$(docdir)/$(NAME)_utils - if [ -d $(DESTDIR)$(datadir)/CoreBase ] ; then \ - mv $(DESTDIR)$(datadir)/CoreBase $(DESTDIR)$(docdir)/$(NAME)_utils ; \ - fi - for f in example_config README ChangeLog examples ; do \ - mv $(DESTDIR)$(docdir)/$$f $(DESTDIR)$(docdir)/$(NAME)_utils/ || echo "Unable to move $$f" ; \ - done - -install-smf-manifests: - ginstall -d $(DESTDIR)$(initddir) - ginstall $(WORKDIR)/csw$(NAME)-cfexecd $(DESTDIR)$(initddir)/ - ginstall $(WORKDIR)/csw$(NAME)-cfmonitord $(DESTDIR)$(initddir)/ - ginstall $(WORKDIR)/csw$(NAME)-cfserverd $(DESTDIR)$(initddir)/ - -make-cfengine-workdir: - if test ! -d $(DESTDIR)$(cfengine_workdir) ; then \ - ginstall -d $(DESTDIR)$(cfengine_workdir); \ - fi - if test ! -d $(DESTDIR)$(cfengine_workdir_bin) ; then\ - ginstall -d $(DESTDIR)$(cfengine_workdir_bin) ;\ - fi - -install-cfengine-links: make-cfengine-workdir - if test ! -h $(DESTDIR)$(cfengine_workdir_bin)/cf-promises ; then \ - ln -s $(sbindir)/cf-promises $(DESTDIR)$(cfengine_workdir_bin)/cf-promises ;\ - fi - if test ! -h $(DESTDIR)$(cfengine_workdir_bin)/cf-agent ; then \ - ln -s $(sbindir)/cf-agent $(DESTDIR)$(cfengine_workdir_bin)/cf-agent ;\ - fi - -install-cfengine3rc: - ginstall $(WORKDIR)/$(NAME)rc $(DESTDIR)$(sysconfdir)/$(NAME)rc.CSW - -install-cfengine3-csw-doc: rename-cfengine-dir - ginstall -m 644 $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)_utils/ - -fix-paths-in-files: rename-cfengine-dir - for d in $(DESTDIR)$(docdir)/$(NAME)_utils/example_config $(DESTDIR)$(docdir)/$(NAME)_utils/examples $(DESTDIR)$(docdir)/$(NAME)_utils/CoreBase; do \ - if test -d $$d ; then \ - for f in $${d}/*.cf ; do \ - sed -e 's|/var/cfengine/|/var/opt/csw/$(NAME)/|g' \ - -e 's|_var_cfengine_|_var_opt_csw_$(NAME)_|g' \ - -e 's|/usr/local/|/opt/csw/|g' \ - -e 's|_usr_local_|_opt_csw_|g' $$f > $${f}.tmp ;\ - mv $${f}.tmp $$f ; \ - done ; \ - fi ; \ - done - -# We move libpromises to a prive directory, since there is no publicly -# available API. Please note, the rpath has to be set appropriately -move-libpromises: - ginstall -d $(DESTDIR)$(libdir)/$(NAME) - if test -f $(DESTDIR)$(libdir)/libpromises.so.1.0.0 ; then \ - mv $(DESTDIR)$(libdir)/libpromises.* $(DESTDIR)$(libdir)/$(NAME)/ ; \ - fi - -# The cfengine guys decided to put binaries into $(prefix)/bin starting -# with 3.3.0. I don't see the point and keep the binaries in $(prefix)/sbin -move-binaries: - ginstall -d $(DESTDIR)$(prefix)/sbin - if test -f $(DESTDIR)$(prefix)/bin/cf-agent ; then \ - mv $(DESTDIR)$(prefix)/bin/* $(DESTDIR)$(prefix)/sbin/ ; \ - rmdir $(DESTDIR)$(prefix)/bin ; \ - fi - -post-merge: -# Get rid of the .so files. Since there are no header files provided, -# .so files are pretty much useless - find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \; - Copied: csw/mgar/pkg/cfengine3/branches/solaris9/Makefile (from rev 20497, csw/mgar/pkg/cfengine3/trunk/Makefile) =================================================================== --- csw/mgar/pkg/cfengine3/branches/solaris9/Makefile (rev 0) +++ csw/mgar/pkg/cfengine3/branches/solaris9/Makefile 2013-05-04 14:47:27 UTC (rev 20988) @@ -0,0 +1,232 @@ +# $Id$ +# +# +# I made this recipe for Solaris 9 on specific request +# of +# +# Marko Jauhiainen +# +# It deviates from the regular build script in the following manner +# +# * it uses qdbm instead of tokyocabinet +# * gcc instead of Sun Studio +# * tests will not be performed + +SKIPTEST = 1 + + +NAME = cfengine3 +VERSION = 3.4.4 +GARTYPE = v2 +GARCOMPILER = GCC4 + +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + +DESCRIPTION = Open source configuration management system +define BLURB + CFEngine Community is the Open Source foundation of CFEngine's innovative + configuration management technology that helps systems administrators + automate and ensure the availability, security and compliance of + mission-critical applications and services. +endef + +DISTNAME = cfengine-$(VERSION) +MASTER_SITES = http://www.cfengine.com/source-code/download/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += $(NAME)rc +DISTFILES += CSW$(NAME)utils.postinstall +DISTFILES += csw$(NAME)-cfexecd +DISTFILES += csw$(NAME)-cfmonitord +DISTFILES += csw$(NAME)-cfserverd +DISTFILES += README.CSW +DISTFILES += changelog.CSW +VENDOR_URL = http://www.cfengine.com/community + +UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +# See comment in patch +PATCHFILES += 0000-Do-not-perform-acceptance-test.patch +PATCHFILES += 0000-No-Werror-implicit-function-declaration.patch +# Make build and tests work +PATCHFILES += 0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch +PATCHFILES += 0003-Fix-empty-initializer.-Add-mkdtemp.patch +PATCHFILES += 0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch + +# +# CUSTOM VARIABLES +# +cfengine_workdir = $(localstatedir)/$(NAME) +cfengine_workdir_bin = $(cfengine_workdir)/bin +initddir = $(sysconfdir)/init.d + +PACKAGES = CSW$(NAME)utils +# Catch all +CATALOGNAME_CSW$(NAME)utils = $(NAME)_utils +SPKG_DESC_CSW$(NAME)utils = CFEngine 3 utilities and documentation +RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibqdbm14 +RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSW$(NAME)utils += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)utils|catalogname=$(NAME)_utils|expected-catalogname=$(NAME)utils +CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/CoreBase/failsafe/failsafe.cf +CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/ChangeLog +OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt +CATALOGNAME_CSWlibpromises1 = libpromises1_stub +CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt_stub + +PACKAGES += CSW$(NAME)server +CATALOGNAME_CSW$(NAME)server = $(NAME)_server +SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary +RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)utils +PKGFILES_CSW$(NAME)server += $(sbindir)/cf-serverd +PKGFILES_CSW$(NAME)server += $(sbindir)/cf-runagent +PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-serverd.* +PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-runagent.* +PKGFILES_CSW$(NAME)server += $(initddir)/csw$(NAME)-cfserverd +PKGFILES_CSW$(NAME)server += $(docdir)/$(NAME)_server/.*\.CSW +CHECKPKG_OVERRIDES_CSW$(NAME)server += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)server|catalogname=$(NAME)_server|expected-catalogname=$(NAME)server + +PACKAGES += CSW$(NAME)client +CATALOGNAME_CSW$(NAME)client = $(NAME)_client +SPKG_DESC_CSW$(NAME)client = CFEngine 3 client binaries +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibxml2-2 +PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent +PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd +PKGFILES_CSW$(NAME)client += $(sbindir)/cf-monitord +PKGFILES_CSW$(NAME)client += $(mandir)/.*/cf-agent.* +PKGFILES_CSW$(NAME)client += $(mandir)/.*/cf-execd.* +PKGFILES_CSW$(NAME)client += $(mandir)/.*/cf-monitord.* +PKGFILES_CSW$(NAME)client += $(cfengine_workdir_bin)/cf-agent +PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfexecd +PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfmonitord +PKGFILES_CSW$(NAME)client += $(docdir)/$(NAME)_client/.*\.CSW +CHECKPKG_OVERRIDES_CSW$(NAME)client += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)client|catalogname=$(NAME)_client|expected-catalogname=$(NAME)client + +# CFEngine provides three daemons +# - cf-execd (client) +# - cf-monitord (client) +# - cf-serverd (server) +INITSMF = $(initddir)/csw$(NAME)-cfexecd +INITSMF += $(initddir)/csw$(NAME)-cfmonitord +INITSMF += $(initddir)/csw$(NAME)-cfserverd + +LICENSE = LICENSE + +# This file gets installed by CSW$(NAME)util since it is used by +# the server and client component +PRESERVECONF = $(sysconfdir)/$(NAME)rc + +BUILD_DEP_PKGS = CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibpcre-dev +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibqdbm-dev +BUILD_DEP_PKGS += CSWflex +BUILD_DEP_PKGS += CSWbison + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-silent-rules +CONFIGURE_ARGS += --with-qdbm=$(prefix) +CONFIGURE_ARGS += --with-openssl=$(prefix) +CONFIGURE_ARGS += --with-pcre=$(prefix) +CONFIGURE_ARGS += --with-workdir=$(cfengine_workdir) +CONFIGURE_ARGS += --without-tokyocabinet +CONFIGURE_ARGS += --without-postgresql +CONFIGURE_ARGS += --without-mysql + +# We use this because libpromises will be moved to this private +# directory (see also move-libpromises:) +EXTRA_LDFLAGS += -R$(libdir)/$(NAME) + +# Those libs are used by configure to detect getaddrinfo() +EXTRA_CONFIGURE_ENV = LIBS="-lsocket -lnsl" + +include gar/category.mk + +post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files move-libpromises move-binaries + @$(MAKECOOKIE) + +rename-cfengine-dir: + ginstall -d $(DESTDIR)$(docdir)/$(NAME)_utils + if [ -d $(DESTDIR)$(datadir)/CoreBase ] ; then \ + mv $(DESTDIR)$(datadir)/CoreBase $(DESTDIR)$(docdir)/$(NAME)_utils ; \ + fi + for f in example_config README ChangeLog examples ; do \ + mv $(DESTDIR)$(docdir)/$$f $(DESTDIR)$(docdir)/$(NAME)_utils/ || echo "Unable to move $$f" ; \ + done + +install-smf-manifests: + ginstall -d $(DESTDIR)$(initddir) + ginstall $(WORKDIR)/csw$(NAME)-cfexecd $(DESTDIR)$(initddir)/ + ginstall $(WORKDIR)/csw$(NAME)-cfmonitord $(DESTDIR)$(initddir)/ + ginstall $(WORKDIR)/csw$(NAME)-cfserverd $(DESTDIR)$(initddir)/ + +make-cfengine-workdir: + if test ! -d $(DESTDIR)$(cfengine_workdir) ; then \ + ginstall -d $(DESTDIR)$(cfengine_workdir); \ + fi + if test ! -d $(DESTDIR)$(cfengine_workdir_bin) ; then\ + ginstall -d $(DESTDIR)$(cfengine_workdir_bin) ;\ + fi + +install-cfengine-links: make-cfengine-workdir + if test ! -h $(DESTDIR)$(cfengine_workdir_bin)/cf-promises ; then \ + ln -s $(sbindir)/cf-promises $(DESTDIR)$(cfengine_workdir_bin)/cf-promises ;\ + fi + if test ! -h $(DESTDIR)$(cfengine_workdir_bin)/cf-agent ; then \ + ln -s $(sbindir)/cf-agent $(DESTDIR)$(cfengine_workdir_bin)/cf-agent ;\ + fi + +install-cfengine3rc: + ginstall $(WORKDIR)/$(NAME)rc $(DESTDIR)$(sysconfdir)/$(NAME)rc.CSW + +install-cfengine3-csw-doc: rename-cfengine-dir + ginstall -m 644 $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)_utils/ + +fix-paths-in-files: rename-cfengine-dir + for d in $(DESTDIR)$(docdir)/$(NAME)_utils/example_config $(DESTDIR)$(docdir)/$(NAME)_utils/examples $(DESTDIR)$(docdir)/$(NAME)_utils/CoreBase; do \ + if test -d $$d ; then \ + for f in $${d}/*.cf ; do \ + sed -e 's|/var/cfengine/|/var/opt/csw/$(NAME)/|g' \ + -e 's|_var_cfengine_|_var_opt_csw_$(NAME)_|g' \ + -e 's|/usr/local/|/opt/csw/|g' \ + -e 's|_usr_local_|_opt_csw_|g' $$f > $${f}.tmp ;\ + mv $${f}.tmp $$f ; \ + done ; \ + fi ; \ + done + +# We move libpromises to a prive directory, since there is no publicly +# available API. Please note, the rpath has to be set appropriately +move-libpromises: + ginstall -d $(DESTDIR)$(libdir)/$(NAME) + if test -f $(DESTDIR)$(libdir)/libpromises.so.1.0.0 ; then \ + mv $(DESTDIR)$(libdir)/libpromises.* $(DESTDIR)$(libdir)/$(NAME)/ ; \ + fi + +# The cfengine guys decided to put binaries into $(prefix)/bin starting +# with 3.3.0. I don't see the point and keep the binaries in $(prefix)/sbin +move-binaries: + ginstall -d $(DESTDIR)$(prefix)/sbin + if test -f $(DESTDIR)$(prefix)/bin/cf-agent ; then \ + mv $(DESTDIR)$(prefix)/bin/* $(DESTDIR)$(prefix)/sbin/ ; \ + rmdir $(DESTDIR)$(prefix)/bin ; \ + fi + +post-merge: +# Get rid of the .so files. Since there are no header files provided, +# .so files are pretty much useless + find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \; + Deleted: csw/mgar/pkg/cfengine3/branches/solaris9/checksums =================================================================== --- csw/mgar/pkg/cfengine3/trunk/checksums 2013-03-22 23:18:52 UTC (rev 20496) +++ csw/mgar/pkg/cfengine3/branches/solaris9/checksums 2013-05-04 14:47:27 UTC (rev 20988) @@ -1 +0,0 @@ -96e2221ca0e1341f4abacde81df41ac2 cfengine-3.4.1.tar.gz Copied: csw/mgar/pkg/cfengine3/branches/solaris9/checksums (from rev 20497, csw/mgar/pkg/cfengine3/trunk/checksums) =================================================================== --- csw/mgar/pkg/cfengine3/branches/solaris9/checksums (rev 0) +++ csw/mgar/pkg/cfengine3/branches/solaris9/checksums 2013-05-04 14:47:27 UTC (rev 20988) @@ -0,0 +1 @@ +81d574a6d68f3f0a91f0803349a8b8f5 cfengine-3.4.4.tar.gz Added: csw/mgar/pkg/cfengine3/branches/solaris9/files/0000-Fix-src-hashes.c-so-it-compiles-under-Solaris-9.patch =================================================================== --- csw/mgar/pkg/cfengine3/branches/solaris9/files/0000-Fix-src-hashes.c-so-it-compiles-under-Solaris-9.patch (rev 0) +++ csw/mgar/pkg/cfengine3/branches/solaris9/files/0000-Fix-src-hashes.c-so-it-compiles-under-Solaris-9.patch 2013-05-04 14:47:27 UTC (rev 20988) @@ -0,0 +1,250 @@ +From ec426c55ca7f005ba2de5acf311b3c2de9b314a8 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 4 May 2013 15:46:35 +0200 +Subject: [PATCH] Fix src/hashes.c, so it compiles under Solaris 9 + +--- + src/hashes.c | 78 +++++++++++++++++++++++++++++----------------------------- + 1 file changed, 39 insertions(+), 39 deletions(-) + +diff --git a/src/hashes.c b/src/hashes.c +index 1a2366a..836e217 100644 +--- a/src/hashes.c ++++ b/src/hashes.c +@@ -50,7 +50,7 @@ struct AssocHashTable_ + { + AssocArray array; + CfAssoc **buckets; +- }; ++ } __sol9union; + bool huge; + }; + +@@ -88,11 +88,11 @@ static void HashConvertToHuge(AssocHashTable *hashtable) + CfAssoc **buckets = xcalloc(1, sizeof(CfAssoc *) * CF_HASHTABLESIZE); + int i; + +- for (i = 0; i < hashtable->array.size; ++i) ++ for (i = 0; i < hashtable->__sol9union.array.size; ++i) + { + /* This is a stripped down HugeHashInsertElement: it will fail on duplicate + * elements or nearly-full hash table, or table with HASH_ENTRY_DELETED */ +- CfAssoc *assoc = hashtable->array.values[i]; ++ CfAssoc *assoc = hashtable->__sol9union.array.values[i]; + int bucket = GetHash(assoc->lval); + + for (;;) +@@ -107,7 +107,7 @@ static void HashConvertToHuge(AssocHashTable *hashtable) + } + + hashtable->huge = true; +- hashtable->buckets = buckets; ++ hashtable->__sol9union.buckets = buckets; + } + + /*******************************************************************/ +@@ -120,14 +120,14 @@ static bool HugeHashInsertElement(AssocHashTable *hashtable, const char *element + do + { + /* Free bucket is found */ +- if (hashtable->buckets[i] == NULL || hashtable->buckets[i] == HASH_ENTRY_DELETED) ++ if (hashtable->__sol9union.buckets[i] == NULL || hashtable->__sol9union.buckets[i] == HASH_ENTRY_DELETED) + { +- hashtable->buckets[i] = NewAssoc(element, rval, dtype); ++ hashtable->__sol9union.buckets[i] = NewAssoc(element, rval, dtype); + return true; + } + + /* Collision -- this element already exists */ +- if (strcmp(element, hashtable->buckets[i]->lval) == 0) ++ if (strcmp(element, hashtable->__sol9union.buckets[i]->lval) == 0) + { + return false; + } +@@ -146,15 +146,15 @@ static bool TinyHashInsertElement(AssocHashTable *hashtable, const char *element + { + int i; + +- if (hashtable->array.size == TINY_LIMIT) ++ if (hashtable->__sol9union.array.size == TINY_LIMIT) + { + HashConvertToHuge(hashtable); + return HugeHashInsertElement(hashtable, element, rval, dtype); + } + +- for (i = 0; i < hashtable->array.size; ++i) ++ for (i = 0; i < hashtable->__sol9union.array.size; ++i) + { +- if (strcmp(hashtable->array.values[i]->lval, element) == 0) ++ if (strcmp(hashtable->__sol9union.array.values[i]->lval, element) == 0) + { + return false; + } +@@ -170,7 +170,7 @@ static bool TinyHashInsertElement(AssocHashTable *hashtable, const char *element + + CfAssoc *a = NewAssoc(element, rval, dtype); + +- hashtable->array.values[hashtable->array.size++] = a; ++ hashtable->__sol9union.array.values[hashtable->__sol9union.array.size++] = a; + return true; + } + +@@ -198,23 +198,23 @@ static bool HugeHashDeleteElement(AssocHashTable *hashtable, const char *element + do + { + /* End of allocated chunk */ +- if (hashtable->buckets[i] == NULL) ++ if (hashtable->__sol9union.buckets[i] == NULL) + { + break; + } + + /* Keep looking */ +- if (hashtable->buckets[i] == HASH_ENTRY_DELETED) ++ if (hashtable->__sol9union.buckets[i] == HASH_ENTRY_DELETED) + { + i = (i + 1) % CF_HASHTABLESIZE; + continue; + } + + /* Element is found */ +- if (strcmp(element, hashtable->buckets[i]->lval) == 0) ++ if (strcmp(element, hashtable->__sol9union.buckets[i]->lval) == 0) + { +- DeleteAssoc(hashtable->buckets[i]); +- hashtable->buckets[i] = NULL; ++ DeleteAssoc(hashtable->__sol9union.buckets[i]); ++ hashtable->__sol9union.buckets[i] = NULL; + return true; + } + +@@ -232,18 +232,18 @@ static bool TinyHashDeleteElement(AssocHashTable *hashtable, const char *element + { + int i; + +- for (i = 0; i < hashtable->array.size; ++i) ++ for (i = 0; i < hashtable->__sol9union.array.size; ++i) + { +- if (strcmp(hashtable->array.values[i]->lval, element) == 0) ++ if (strcmp(hashtable->__sol9union.array.values[i]->lval, element) == 0) + { + int j; + +- DeleteAssoc(hashtable->array.values[i]); +- for (j = i; j < hashtable->array.size - 1; ++j) ++ DeleteAssoc(hashtable->__sol9union.array.values[i]); ++ for (j = i; j < hashtable->__sol9union.array.size - 1; ++j) + { +- hashtable->array.values[j] = hashtable->array.values[j + 1]; ++ hashtable->__sol9union.array.values[j] = hashtable->__sol9union.array.values[j + 1]; + } +- hashtable->array.size--; ++ hashtable->__sol9union.array.size--; + return true; + } + } +@@ -274,14 +274,14 @@ static CfAssoc *HugeHashLookupElement(AssocHashTable *hashtable, const char *ele + do + { + /* End of allocated chunk */ +- if (hashtable->buckets[i] == NULL) ++ if (hashtable->__sol9union.buckets[i] == NULL) + { + return NULL; + } + +- if (hashtable->buckets[i] != HASH_ENTRY_DELETED && strcmp(element, hashtable->buckets[i]->lval) == 0) ++ if (hashtable->__sol9union.buckets[i] != HASH_ENTRY_DELETED && strcmp(element, hashtable->__sol9union.buckets[i]->lval) == 0) + { +- return hashtable->buckets[i]; ++ return hashtable->__sol9union.buckets[i]; + } + + i = (i + 1) % CF_HASHTABLESIZE; +@@ -298,11 +298,11 @@ static CfAssoc *TinyHashLookupElement(AssocHashTable *hashtable, const char *ele + { + int i; + +- for (i = 0; i < hashtable->array.size; ++i) ++ for (i = 0; i < hashtable->__sol9union.array.size; ++i) + { +- if (strcmp(hashtable->array.values[i]->lval, element) == 0) ++ if (strcmp(hashtable->__sol9union.array.values[i]->lval, element) == 0) + { +- return hashtable->array.values[i]; ++ return hashtable->__sol9union.array.values[i]; + } + } + return NULL; +@@ -328,11 +328,11 @@ static void TinyHashClear(AssocHashTable *hashtable) + { + int i; + +- for (i = 0; i < hashtable->array.size; ++i) ++ for (i = 0; i < hashtable->__sol9union.array.size; ++i) + { +- DeleteAssoc(hashtable->array.values[i]); ++ DeleteAssoc(hashtable->__sol9union.array.values[i]); + } +- hashtable->array.size = 0; ++ hashtable->__sol9union.array.size = 0; + } + + /*******************************************************************/ +@@ -343,15 +343,15 @@ static void HugeHashClear(AssocHashTable *hashtable) + + for (i = 0; i < CF_HASHTABLESIZE; i++) + { +- if (hashtable->buckets[i] != NULL) ++ if (hashtable->__sol9union.buckets[i] != NULL) + { +- if (hashtable->buckets[i] != HASH_ENTRY_DELETED) ++ if (hashtable->__sol9union.buckets[i] != HASH_ENTRY_DELETED) + { +- DeleteAssoc(hashtable->buckets[i]); ++ DeleteAssoc(hashtable->__sol9union.buckets[i]); + } + } + } +- memset(hashtable->buckets, 0, sizeof(CfAssoc *) * CF_HASHTABLESIZE); ++ memset(hashtable->__sol9union.buckets, 0, sizeof(CfAssoc *) * CF_HASHTABLESIZE); + } + + /*******************************************************************/ +@@ -361,7 +361,7 @@ void HashClear(AssocHashTable *hashtable) + if (hashtable->huge) + { + HugeHashClear(hashtable); +- free(hashtable->buckets); ++ free(hashtable->__sol9union.buckets); + } + else + { +@@ -388,7 +388,7 @@ HashIterator HashIteratorInit(AssocHashTable *hashtable) + + static CfAssoc *HugeHashIteratorNext(HashIterator *i) + { +- CfAssoc **buckets = i->hashtable->buckets; ++ CfAssoc **buckets = i->hashtable->__sol9union.buckets; + + for (; i->pos < CF_HASHTABLESIZE; i->pos++) + { +@@ -412,13 +412,13 @@ static CfAssoc *HugeHashIteratorNext(HashIterator *i) + + static CfAssoc *TinyHashIteratorNext(HashIterator *i) + { +- if (i->pos >= i->hashtable->array.size) ++ if (i->pos >= i->hashtable->__sol9union.array.size) + { + return NULL; + } + else + { +- return i->hashtable->array.values[i->pos++]; ++ return i->hashtable->__sol9union.array.values[i->pos++]; + } + } + +-- +1.7.10.3 + Added: csw/mgar/pkg/cfengine3/branches/solaris9/files/0000-No-Werror-implicit-function-declaration.patch =================================================================== --- csw/mgar/pkg/cfengine3/branches/solaris9/files/0000-No-Werror-implicit-function-declaration.patch (rev 0) +++ csw/mgar/pkg/cfengine3/branches/solaris9/files/0000-No-Werror-implicit-function-declaration.patch 2013-05-04 14:47:27 UTC (rev 20988) @@ -0,0 +1,24 @@ +From f9d0d0870b4f4d1ce2ab8ebeaee225fc8cb80229 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 4 May 2013 16:02:51 +0200 +Subject: [PATCH] No -Werror=implicit-function-declaration + +--- + configure | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure b/configure +index 8b73a6d..5eb38f8 100755 +--- a/configure ++++ b/configure +@@ -19129,7 +19129,6 @@ _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- GCC_CFLAG="$GCC_CFLAG -Werror=implicit-function-declaration" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +-- +1.7.10.3 + Modified: csw/mgar/pkg/cfengine3/branches/solaris9/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch 2013-03-22 23:18:52 UTC (rev 20496) +++ csw/mgar/pkg/cfengine3/branches/solaris9/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch 2013-05-04 14:47:27 UTC (rev 20988) @@ -26,7 +26,7 @@ +#include +#include + -+static char* mkdtemp(char *template) { ++char* mkdtemp(char *template) { + char *tmp; + int retval; + @@ -61,7 +61,7 @@ +#include +#include + -+static char* mkdtemp(char *template) { ++char* mkdtemp(char *template) { + char *tmp; + int retval; + @@ -101,7 +101,7 @@ +#include +#include + -+static char* mkdtemp(char *template) { ++char* mkdtemp(char *template) { + char *tmp; + int retval; + @@ -137,7 +137,7 @@ +#include +#include + -+static char* mkdtemp(char *template) { ++char* mkdtemp(char *template) { + char *tmp; + int retval; + @@ -175,7 +175,7 @@ +#include +#include + -+static char* mkdtemp(char *template) { ++char* mkdtemp(char *template) { + char *tmp; + int retval; + @@ -202,7 +202,7 @@ +#include +#include + -+static char* mkdtemp(char *template) { ++char* mkdtemp(char *template) { + char *tmp; + int retval; + @@ -229,7 +229,7 @@ +#include +#include + -+static char* mkdtemp(char *template) { ++char* mkdtemp(char *template) { + char *tmp; + int retval; + @@ -269,7 +269,7 @@ +#include +#include + -+static char* mkdtemp(char *template) { ++char* mkdtemp(char *template) { + char *tmp; + int retval; + @@ -309,7 +309,7 @@ +#include +#include + -+static char* mkdtemp(char *template) { ++char* mkdtemp(char *template) { + char *tmp; + int retval; + Deleted: csw/mgar/pkg/cfengine3/branches/solaris9/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2013-03-22 23:18:52 UTC (rev 20496) +++ csw/mgar/pkg/cfengine3/branches/solaris9/files/changelog.CSW 2013-05-04 14:47:27 UTC (rev 20988) @@ -1,50 +0,0 @@ -cfengine3 (3.4.1,REV=2012.12.09) - - * New upstream release 3.4.1. - - -- Rafael Ostertag Sun, 09 Dec 2012 10:12:11 +0100 - - -cfengine3 (3.3.9,REV=2012.11.10) - - * New upstream release 3.3.9. - - -- Rafael Ostertag Sat, 10 Nov 2012 14:52:46 +0100 - - -cfengine3 (3.3.7,REV=2012.10.09) - - * New upstream release 3.3.7. - - -- Rafael Ostertag Tue, 09 Oct 2012 14:48:49 +0200 - - -cfengine3 (3.3.5,REV=2012.08.21) - - * New upstream release 3.3.5. - - -- Rafael Ostertag Tue, 21 Aug 2012 19:22:27 +0200 - - -cfengine3 (3.3.3,REV=2012.06.17) - - * New upstream release 3.3.3. - - * Starting with CFEngine 3.3.0, Berkeley DB support was - dropped. Tokyocabinet is used instead. - - * Dropped support for Solaris 9. - - -- Rafael Ostertag Sun, 17 Jun 2012 14:09:15 +0200 - - -cfengine3 (3.2.3,REV=2012.01.06) - - * Obsoleted CSWlibpromises1. - - * Built now explicitely with LIBS="-lsocket -lnsl" in order to make - configure detect getaddrinfo() - - * Packages are now also built for Solaris 10. - - -- Rafael Ostertag Fri, 06 Jan 2012 16:24:39 +0100 Copied: csw/mgar/pkg/cfengine3/branches/solaris9/files/changelog.CSW (from rev 20522, csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW) =================================================================== --- csw/mgar/pkg/cfengine3/branches/solaris9/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/cfengine3/branches/solaris9/files/changelog.CSW 2013-05-04 14:47:27 UTC (rev 20988) @@ -0,0 +1,67 @@ +cfengine3 (3.4.4,REV=2013.05.04) + + * This is a respin for Solaris 9. It was compiled with GCC instead + of Sun Studio and links to QDBM instead of tokyocabinet. + + * This package is purely intended for Solaris 9. + + -- Rafael Ostertag Sat, 04 May 2013 16:42:34 +0200 + + +cfengine3 (3.4.4,REV=2013.03.26) + + * New upstream release 3.4.4. + + -- Rafael Ostertag Tue, 26 Mar 2013 11:24:16 +0100 + + +cfengine3 (3.4.1,REV=2012.12.09) + + * New upstream release 3.4.1. + + -- Rafael Ostertag Sun, 09 Dec 2012 10:12:11 +0100 + + +cfengine3 (3.3.9,REV=2012.11.10) + + * New upstream release 3.3.9. + + -- Rafael Ostertag Sat, 10 Nov 2012 14:52:46 +0100 + + +cfengine3 (3.3.7,REV=2012.10.09) + + * New upstream release 3.3.7. + + -- Rafael Ostertag Tue, 09 Oct 2012 14:48:49 +0200 + + +cfengine3 (3.3.5,REV=2012.08.21) + + * New upstream release 3.3.5. + + -- Rafael Ostertag Tue, 21 Aug 2012 19:22:27 +0200 + + +cfengine3 (3.3.3,REV=2012.06.17) + + * New upstream release 3.3.3. + + * Starting with CFEngine 3.3.0, Berkeley DB support was + dropped. Tokyocabinet is used instead. + + * Dropped support for Solaris 9. + + -- Rafael Ostertag Sun, 17 Jun 2012 14:09:15 +0200 + + +cfengine3 (3.2.3,REV=2012.01.06) + + * Obsoleted CSWlibpromises1. + + * Built now explicitely with LIBS="-lsocket -lnsl" in order to make + configure detect getaddrinfo() + + * Packages are now also built for Solaris 10. + + -- Rafael Ostertag Fri, 06 Jan 2012 16:24:39 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat May 4 19:04:18 2013 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sat, 4 May 2013 18:04:18 +0100 Subject: [csw-devel] SF.net SVN: gar:[20987] csw/mgar/pkg In-Reply-To: References: Message-ID: <20130504170418.GA28035@cotton.home.blizinski.pl> On Sat, May 04, 2013 at 01:52:48PM +0000, slowfranklin at users.sourceforge.net wrote: > Added: csw/mgar/pkg/dconf/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/dconf/trunk/Makefile (rev 0) > +++ csw/mgar/pkg/dconf/trunk/Makefile 2013-05-04 13:52:47 UTC (rev 20987) > @@ -0,0 +1,59 @@ > +# $Id$ > +# TODO (release-critical prefixed with !, non release-critical with *) > +# > +NAME = dconf > +VERSION = 0.5.1 > +GARTYPE = v2 > + > +DESCRIPTION = low-level configuration system for glib > +define BLURB > + dconf is a low-level configuration system. Its main purpose is to > + provide a backend to GSettings on platforms that dont already have > + configuration storage systems. > +endef > + > +MASTER_SITES = $(GNOME_MIRROR) > +DISTFILES = $(NAME)-$(VERSION).tar.bz2 You can use DISTNAME instead of $(NAME)-$(VERSION). Note to self: we should fix the template. > +GARCOMPILER = GNU > + > +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib We should not be using /opt/csw/X11, we should be using system X11 instead. > +EXTRA_INC = $(prefix)/include/gtk-2.0 > +EXTRA_INC += $(prefix)/include/cairo > +EXTRA_INC += $(prefix)/include/pango-1.0 > +EXTRA_INC += $(prefix)/lib/gtk-2.0/include/ > +EXTRA_INC += $(prefix)/include/gdk-pixbuf-2.0/ > +EXTRA_INC += $(prefix)/include/atk-1.0/ This doesn't look right. Normally, you only have -I/opt/csw/include (which is the default already) and source code refers to relative paths underneath. What happens when you remove these lines? > +BUILD_DEP_PKGS += CSWlibdbusdev > +BUILD_DEP_PKGS += CSWpkgconfig > +BUILD_DEP_PKGS += CSWglib2devel > +BUILD_DEP_PKGS += CSWgtk2devel > + > +RUNTIME_DEP_PKGS += CSWlibgio2-0-0 > +RUNTIME_DEP_PKGS += CSWglib2 > +RUNTIME_DEP_PKGS += CSWlibdbus > + > +PACKAGES += CSWdconf > +SPKG_DESC_CSWdconf = $(DESCRIPTION) > +RUNTIME_DEP_PKGS_CSWdconf += CSWlibdconf0 > + > +PACKAGES += CSWlibdconf0 > +SPKG_DESC_CSWlibdconf0 = $(DESCRIPTION), library > +PKGFILES_CSWlibdconf0 += $(call pkgfiles_lib,libdconf.so) > + > +PACKAGES += CSWlibdconf-dev > +SPKG_DESC_CSWlibdconf-dev = $(DESCRIPTION), development files > +PKGFILES_CSWlibdconf-dev += $(PKGFILES_DEVEL) > +PKGFILES_CSWlibdconf-dev += $(call baseisadirs,$(datadir),vala/vapi/dconf\.deps) > +PKGFILES_CSWlibdconf-dev += $(call baseisadirs,$(datadir),vala/vapi/dconf\.vapi) > +RUNTIME_DEP_PKGS_CSWlibdconf-dev += CSWlibdconf0 > + > +PATCHFILES += 0001-Use-statvfs-for-checking-filesystem-type.patch > +PATCHFILES += 0002-Remove-linker-flags-remove-c89-request.patch > +PATCHFILES += 0003-Add-gio-includes.patch > + > +CONFIGURE_ARGS = $(DIRPATHS) > +CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__" __EXTENSIONS__ is a flag meaningful for Solaris Studio, is it meaningful for GCC at all? I would think it isn't. Maciej -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From sloowfranklin at gmail.com Sat May 4 19:16:59 2013 From: sloowfranklin at gmail.com (=?ISO-8859-1?Q?Ralph_B=F6hme?=) Date: Sat, 4 May 2013 19:16:59 +0200 Subject: [csw-devel] SF.net SVN: gar:[20987] csw/mgar/pkg In-Reply-To: <20130504170418.GA28035@cotton.home.blizinski.pl> References: <20130504170418.GA28035@cotton.home.blizinski.pl> Message-ID: 2013/5/4 Maciej Blizi?ski : >> +DISTFILES = $(NAME)-$(VERSION).tar.bz2 > > You can use DISTNAME instead of $(NAME)-$(VERSION). Yeah, I tend to forget the template value. > Note to self: we should fix the template. Yes please. ;) > >> +GARCOMPILER = GNU >> + >> +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib > > We should not be using /opt/csw/X11, we should be using system X11 > instead. ??? Why? Also that would mean I'd have to add the system pkg-config paths to EXTRA_PKG_CONFIG_DIRS so that the package finds xproto.pc. >> +EXTRA_INC = $(prefix)/include/gtk-2.0 >> +EXTRA_INC += $(prefix)/include/cairo >> +EXTRA_INC += $(prefix)/include/pango-1.0 >> +EXTRA_INC += $(prefix)/lib/gtk-2.0/include/ >> +EXTRA_INC += $(prefix)/include/gdk-pixbuf-2.0/ >> +EXTRA_INC += $(prefix)/include/atk-1.0/ > > This doesn't look right. Normally, you only have -I/opt/csw/include > (which is the default already) and source code refers to relative paths > underneath. What happens when you remove these lines? Afaict, a package Makefile (and probably configure.ac) for a particular subdirectory is broken and misses to add the appropiate include search paths. If we remove them compilation fails with missing headers. For every single one of them >> +CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__" > > __EXTENSIONS__ is a flag meaningful for Solaris Studio, is it meaningful > for GCC at all? I would think it isn't. The define is meant to tweak the compilation _enviroment_ ie it effects the interfaces from a requested C/POSIX/SUS standard. The package requests C99 standard which in Solaris hides all non-standard interfaces. Defining __EXTENSIONS__ brings them back, regardless of the compiler. $ man standards.5 | grep -B 5 -A 2 EXTENSIONS standard. If the application is using interfaces and headers not defined by that standard, then in addition to defining the appropriate standard feature test macro, it must also define __EXTENSIONS__. Defining __EXTENSIONS__ provides the application with access to all interfaces and headers not in conflict with the specified standard. The application must define __EXTENSIONS__ either on the compile command line or within the application source files. Cheers! -slow From maciej at opencsw.org Sat May 4 19:45:14 2013 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sat, 4 May 2013 18:45:14 +0100 Subject: [csw-devel] SF.net SVN: gar:[20987] csw/mgar/pkg In-Reply-To: References: <20130504170418.GA28035@cotton.home.blizinski.pl> Message-ID: <20130504174514.GA28570@cotton.home.blizinski.pl> On Sat, May 04, 2013 at 07:16:59PM +0200, Ralph B?hme wrote: > 2013/5/4 Maciej Blizi?ski : > >> +DISTFILES = $(NAME)-$(VERSION).tar.bz2 > > > > You can use DISTNAME instead of $(NAME)-$(VERSION). > > Yeah, I tend to forget the template value. > > > Note to self: we should fix the template. > > Yes please. ;) Just checked, it has already been fixed. Cool! > > > >> +GARCOMPILER = GNU > >> + > >> +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib > > > > We should not be using /opt/csw/X11, we should be using system X11 > > instead. > > ??? Why? How it started: http://lists.opencsw.org/pipermail/maintainers/2010-May/012133.html How it ended: http://lists.opencsw.org/pipermail/maintainers/2010-March/011672.html > Also that would mean I'd have to add the system pkg-config paths to > EXTRA_PKG_CONFIG_DIRS so that the package finds xproto.pc. > > >> +EXTRA_INC = $(prefix)/include/gtk-2.0 > >> +EXTRA_INC += $(prefix)/include/cairo > >> +EXTRA_INC += $(prefix)/include/pango-1.0 > >> +EXTRA_INC += $(prefix)/lib/gtk-2.0/include/ > >> +EXTRA_INC += $(prefix)/include/gdk-pixbuf-2.0/ > >> +EXTRA_INC += $(prefix)/include/atk-1.0/ > > > > This doesn't look right. Normally, you only have -I/opt/csw/include > > (which is the default already) and source code refers to relative paths > > underneath. What happens when you remove these lines? > > Afaict, a package Makefile (and probably configure.ac) for a > particular subdirectory is broken and misses to add the appropiate > include search paths. If we remove them compilation fails with missing > headers. For every single one of them Okay, if it's necessary. You could add a line or a few lines of explanation. > >> +CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__" > > > > __EXTENSIONS__ is a flag meaningful for Solaris Studio, is it meaningful > > for GCC at all? I would think it isn't. > > The define is meant to tweak the compilation _enviroment_ ie it > effects the interfaces from a requested C/POSIX/SUS standard. > The package requests C99 standard which in Solaris hides all > non-standard interfaces. Defining __EXTENSIONS__ brings them back, > regardless of the compiler. > > $ man standards.5 | grep -B 5 -A 2 EXTENSIONS > > standard. If the application is using interfaces and headers > not defined by that standard, then in addition to defining > the appropriate standard feature test macro, it must also > define __EXTENSIONS__. Defining __EXTENSIONS__ provides the > application with access to all interfaces and headers not in > conflict with the specified standard. The application must > define __EXTENSIONS__ either on the compile command line or > within the application source files. Cool, if you add this explanation (or a link?) here, it'll be clearer for readers. One more thing: When you commit new code, use: mgar ci -m "what you've updated" mgar will add additional information to the commit message, e.g. which package is the commit for. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From pfelecan at opencsw.org Sat May 4 20:18:04 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Sat, 04 May 2013 20:18:04 +0200 Subject: [csw-devel] SF.net SVN: gar:[20987] csw/mgar/pkg In-Reply-To: <20130504170418.GA28035@cotton.home.blizinski.pl> ("Maciej =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Sat, 4 May 2013 18:04:18 +0100") References: <20130504170418.GA28035@cotton.home.blizinski.pl> Message-ID: Maciej Blizi?ski writes: >> +DISTFILES = $(NAME)-$(VERSION).tar.bz2 > > You can use DISTNAME instead of $(NAME)-$(VERSION). > > Note to self: we should fix the template. The template is correct AFAIK, i.e. mgar newpkg creates a correct stanza. -- Peter From lblume at users.sourceforge.net Sat May 4 22:03:02 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 04 May 2013 20:03:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[20989] csw/mgar/pkg/otr/trunk/Makefile Message-ID: Revision: 20989 http://gar.svn.sourceforge.net/gar/?rev=20989&view=rev Author: lblume Date: 2013-05-04 20:03:02 +0000 (Sat, 04 May 2013) Log Message: ----------- otr/trunk: Fix dependencies Modified Paths: -------------- csw/mgar/pkg/otr/trunk/Makefile Modified: csw/mgar/pkg/otr/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/trunk/Makefile 2013-05-04 14:47:27 UTC (rev 20988) +++ csw/mgar/pkg/otr/trunk/Makefile 2013-05-04 20:03:02 UTC (rev 20989) @@ -8,7 +8,7 @@ endef MASTER_SITES = http://www.cypherpunks.ca/otr/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz PACKAGES += CSWlibotr5 CATALOGNAME_CSWlibotr5 = libotr5 @@ -34,19 +34,25 @@ BUILD64_LIBS_ONLY = 1 RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgcrypt11 -RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibotr2 -CHECKPKG_OVERRIDES_CSWlibotr5 += surplus-dependency|CSWlibotr2 - RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr5 +RUNTIME_DEP_PKGS_CSWotr += CSWlibotr2 RUNTIME_DEP_PKGS_CSWotr += CSWlibotr5 +RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11 +# On sparc, the dependencies end up different +ifeq ($(shell uname -p), sparc) + RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgpg-error0 + RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 +endif + +CHECKPKG_OVERRIDES_CSWotr += surplus-dependency|CSWlibotr2 + BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev # Remove after pushing to catalog -CHECKPKG_OVERRIDES_CSWlibotr5 += dependency-on-nonexistent-package|CSWlibotr2 +CHECKPKG_OVERRIDES_CSWotr += dependency-on-nonexistent-package|CSWlibotr2 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat May 4 22:22:19 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 4 May 2013 21:22:19 +0100 Subject: [csw-devel] SF.net SVN: gar:[20989] csw/mgar/pkg/otr/trunk/Makefile In-Reply-To: References: Message-ID: 2013/5/4 : > +# On sparc, the dependencies end up different > +ifeq ($(shell uname -p), sparc) > + RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgpg-error0 > + RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 > +endif There's a GARCH variable which already contains the architecture information. From wahwah at users.sourceforge.net Sat May 4 22:41:39 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 04 May 2013 20:41:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20990] csw/mgar/pkg/lang-python/logilab-common/trunk Message-ID: Revision: 20990 http://gar.svn.sourceforge.net/gar/?rev=20990&view=rev Author: wahwah Date: 2013-05-04 20:41:39 +0000 (Sat, 04 May 2013) Log Message: ----------- lang-python/logilab-common/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile csw/mgar/pkg/lang-python/logilab-common/trunk/checksums Modified: csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile 2013-05-04 20:03:02 UTC (rev 20989) +++ csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile 2013-05-04 20:41:39 UTC (rev 20990) @@ -3,22 +3,17 @@ # $Id$ NAME = logilab-common -VERSION = 0.52.0 +VERSION = 0.59.1 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Python Abstract Syntax Tree New Generation PACKAGES = CSWpy-logilab-common -CATALOGNAME_CSWpy-logilab-common = py_logilab_common -define BLURB -endef -SPKG_SOURCEURL = http://www.logilab.org/project/logilab-common +VENDOR_URL = http://www.logilab.org/project/logilab-common MASTER_SITES = http://ftp.logilab.org/pub/common/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc +DISTFILES = $(DISTNAME).tar.gz ARCHALL_CSWpy-logilab-common = 1 -REINPLACE_USRSHARE += $(SITE_PACKAGES)/logilab/common/optik_ext.py +REINPLACE_USRSHARE += opt/csw/lib/python/site-packages/logilab/common/optik_ext.py REINPLACE_WHEN_USRSHARE = postinstall include gar/category.mk Modified: csw/mgar/pkg/lang-python/logilab-common/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/logilab-common/trunk/checksums 2013-05-04 20:03:02 UTC (rev 20989) +++ csw/mgar/pkg/lang-python/logilab-common/trunk/checksums 2013-05-04 20:41:39 UTC (rev 20990) @@ -1 +1 @@ -def802bd1a1fe7910d739f8b18409255 logilab-common-0.52.0.tar.gz +614f0a5cd78242dad3317fd83d54ccc4 logilab-common-0.59.1.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 Sun May 5 00:36:17 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 04 May 2013 22:36:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[20991] csw/mgar/pkg/otr/trunk/Makefile Message-ID: Revision: 20991 http://gar.svn.sourceforge.net/gar/?rev=20991&view=rev Author: lblume Date: 2013-05-04 22:36:13 +0000 (Sat, 04 May 2013) Log Message: ----------- otr/trunk: Minor cleanup before package building Modified Paths: -------------- csw/mgar/pkg/otr/trunk/Makefile Modified: csw/mgar/pkg/otr/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/trunk/Makefile 2013-05-04 20:41:39 UTC (rev 20990) +++ csw/mgar/pkg/otr/trunk/Makefile 2013-05-04 22:36:13 UTC (rev 20991) @@ -18,7 +18,7 @@ PACKAGES += CSWotr-dev CATALOGNAME_CSWotr-dev = otr_dev -SPKG_DESC_CSWotr-dev += $(DESCRIPTION), development files +SPKG_DESC_CSWotr-dev += $(DESCRIPTION), development files PKGFILES_CSWotr-dev += $(PKGFILES_DEVEL) OBSOLETED_BY_CSWotr-dev += CSWotrdevel @@ -52,7 +52,4 @@ BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev -# Remove after pushing to catalog -CHECKPKG_OVERRIDES_CSWotr += dependency-on-nonexistent-package|CSWlibotr2 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun May 5 00:40:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 04 May 2013 22:40:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[20992] csw/mgar/pkg/lang-python/logilab-astng/trunk Message-ID: Revision: 20992 http://gar.svn.sourceforge.net/gar/?rev=20992&view=rev Author: wahwah Date: 2013-05-04 22:40:40 +0000 (Sat, 04 May 2013) Log Message: ----------- lang-python/logilab-astng/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile csw/mgar/pkg/lang-python/logilab-astng/trunk/checksums Modified: csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2013-05-04 22:36:13 UTC (rev 20991) +++ csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2013-05-04 22:40:40 UTC (rev 20992) @@ -3,23 +3,20 @@ # $Id$ NAME = logilab-astng -VERSION = 0.20.3 +VERSION = 0.24.3 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Python Abstract Syntax Tree New Generation PACKAGES = CSWpy-logilab-astng -CATALOGNAME_CSWpy-logilab-astng = py_logilab_astng -define BLURB -endef -SPKG_SOURCEURL = http://www.logilab.org/project/logilab-astng -MASTER_SITES = http://ftp.logilab.org/pub/astng/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc +VENDOR_URL = http://www.logilab.org/project/logilab-astng +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES = $(DISTNAME).tar.gz ARCHALL_CSWpy-logilab-astng = 1 RUNTIME_DEP_PKGS_CSWpy-logilab-astng = CSWpy-logilab-common CHECKPKG_OVERRIDES_CSWpy-logilab-astng += surplus-dependency|CSWpy-logilab-common + include gar/category.mk + post-install-modulated: - rm $(DESTDIR)$(SITE_PACKAGES)/logilab/__init__.py + rm $(DESTDIR)$(libdir)/python/site-packages/logilab/__init__.py @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/logilab-astng/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/logilab-astng/trunk/checksums 2013-05-04 22:36:13 UTC (rev 20991) +++ csw/mgar/pkg/lang-python/logilab-astng/trunk/checksums 2013-05-04 22:40:40 UTC (rev 20992) @@ -1 +1 @@ -3379435ce06cdfa43ca9515a8d11affe logilab-astng-0.20.3.tar.gz +f0dd5dee1d5053939da174e1bfe69388 logilab-astng-0.24.3.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 Sun May 5 08:53:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 05 May 2013 06:53:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[20993] csw/mgar/pkg/lang-python/pylint/trunk Message-ID: Revision: 20993 http://gar.svn.sourceforge.net/gar/?rev=20993&view=rev Author: wahwah Date: 2013-05-05 06:53:17 +0000 (Sun, 05 May 2013) Log Message: ----------- lang-python/pylint/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/lang-python/pylint/trunk/Makefile csw/mgar/pkg/lang-python/pylint/trunk/checksums Modified: csw/mgar/pkg/lang-python/pylint/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pylint/trunk/Makefile 2013-05-04 22:40:40 UTC (rev 20992) +++ csw/mgar/pkg/lang-python/pylint/trunk/Makefile 2013-05-05 06:53:17 UTC (rev 20993) @@ -3,18 +3,17 @@ # $Id$ NAME = pylint -VERSION = 0.21.3 +VERSION = 0.28.0 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Python code static checker define BLURB endef -SPKG_SOURCEURL = http://pypi.python.org/pypi/pylint -MASTER_SITES = http://pypi.python.org/packages/source/p/pylint/ +VENDOR_URL = http://pypi.python.org/pypi/pylint +MASTER_SITES = $(PYPI_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWpylint ARCHALL_CSWpylint = 1 -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc # The software name is 'pylint'. CHECKPKG_OVERRIDES_CSWpylint += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpylint += catalogname-does-not-start-with-py_ Modified: csw/mgar/pkg/lang-python/pylint/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pylint/trunk/checksums 2013-05-04 22:40:40 UTC (rev 20992) +++ csw/mgar/pkg/lang-python/pylint/trunk/checksums 2013-05-05 06:53:17 UTC (rev 20993) @@ -1 +1 @@ -53b88b99085bb46778d4812629de6648 pylint-0.21.3.tar.gz +1ccd3812c2729b605e5fd9425ef376e6 pylint-0.28.0.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 Sun May 5 11:21:10 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 05 May 2013 09:21:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[20994] csw/mgar/pkg/pidginotr/trunk/Makefile Message-ID: Revision: 20994 http://gar.svn.sourceforge.net/gar/?rev=20994&view=rev Author: lblume Date: 2013-05-05 09:21:08 +0000 (Sun, 05 May 2013) Log Message: ----------- pidginotr/trunk: Minor recipe cleanup Modified Paths: -------------- csw/mgar/pkg/pidginotr/trunk/Makefile Modified: csw/mgar/pkg/pidginotr/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidginotr/trunk/Makefile 2013-05-05 06:53:17 UTC (rev 20993) +++ csw/mgar/pkg/pidginotr/trunk/Makefile 2013-05-05 09:21:08 UTC (rev 20994) @@ -8,12 +8,9 @@ endef MASTER_SITES = http://www.cypherpunks.ca/otr/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz #PATCHFILES = otr_priority.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz - # For msgfmt, msgmerge, xgettext and gettext to be used from GNU CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun May 5 13:10:40 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 05 May 2013 11:10:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20995] csw/mgar/pkg/pidginotr/trunk/Makefile Message-ID: Revision: 20995 http://gar.svn.sourceforge.net/gar/?rev=20995&view=rev Author: lblume Date: 2013-05-05 11:10:39 +0000 (Sun, 05 May 2013) Log Message: ----------- pidginotr/trunk: Adjuste deps, one is specific for sparc Modified Paths: -------------- csw/mgar/pkg/pidginotr/trunk/Makefile Modified: csw/mgar/pkg/pidginotr/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidginotr/trunk/Makefile 2013-05-05 09:21:08 UTC (rev 20994) +++ csw/mgar/pkg/pidginotr/trunk/Makefile 2013-05-05 11:10:39 UTC (rev 20995) @@ -8,9 +8,13 @@ endef MASTER_SITES = http://www.cypherpunks.ca/otr/ -DISTFILES = $(DISTNAME).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz #PATCHFILES = otr_priority.patch +PACKAGES = CSWpidginotr +CATALOGNAME_CSWpidginotr = pidginotr +SPKG_DESC_CSWpidginotr = Off-The-Record messaging for Pidgin + # For msgfmt, msgmerge, xgettext and gettext to be used from GNU CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) @@ -20,6 +24,13 @@ RUNTIME_DEP_PKGS_CSWpidginotr += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWpidginotr += CSWpidgin +# On sparc, the dependencies end up different +ifeq ($(shell uname -p), sparc) + RUNTIME_DEP_PKGS_CSWpidginotr += CSWlibgpg-error0 +endif + +CHECKPKG_OVERRIDES_CSWpidginotr += surplus-dependency|CSWpidgin + BUILD_DEP_PKGS += CSWotr-dev BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun May 5 14:22:40 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 05 May 2013 12:22:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20996] csw/mgar/pkg/otr/trunk/Makefile Message-ID: Revision: 20996 http://gar.svn.sourceforge.net/gar/?rev=20996&view=rev Author: lblume Date: 2013-05-05 12:22:40 +0000 (Sun, 05 May 2013) Log Message: ----------- otr/trunk: Respin without libotr2 dependency, some more cleanup Modified Paths: -------------- csw/mgar/pkg/otr/trunk/Makefile Modified: csw/mgar/pkg/otr/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/trunk/Makefile 2013-05-05 11:10:39 UTC (rev 20995) +++ csw/mgar/pkg/otr/trunk/Makefile 2013-05-05 12:22:40 UTC (rev 20996) @@ -37,18 +37,15 @@ RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr5 -RUNTIME_DEP_PKGS_CSWotr += CSWlibotr2 RUNTIME_DEP_PKGS_CSWotr += CSWlibotr5 RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11 -# On sparc, the dependencies end up different -ifeq ($(shell uname -p), sparc) - RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgpg-error0 - RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 -endif +# Don't know yet why but this dependency is only picked under sparc +RUNTIME_DEP_PKGS_CSWlibotr5_sparc = CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibotr5 += $(RUNTIME_DEP_PKGS_CSWlibotr5_$(GARCH)) +RUNTIME_DEP_PKGS_CSWotr_sparc = CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWotr += $(RUNTIME_DEP_PKGS_CSWotr_$(GARCH)) -CHECKPKG_OVERRIDES_CSWotr += surplus-dependency|CSWlibotr2 - BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun May 5 14:36:59 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 05 May 2013 12:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[20997] csw/mgar/pkg/mcabber/trunk Message-ID: Revision: 20997 http://gar.svn.sourceforge.net/gar/?rev=20997&view=rev Author: lblume Date: 2013-05-05 12:36:58 +0000 (Sun, 05 May 2013) Log Message: ----------- mcabber/trunk: Recipe cleanup before mothballing the package Modified Paths: -------------- csw/mgar/pkg/mcabber/trunk/Makefile csw/mgar/pkg/mcabber/trunk/checksums Modified: csw/mgar/pkg/mcabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/mcabber/trunk/Makefile 2013-05-05 12:22:40 UTC (rev 20996) +++ csw/mgar/pkg/mcabber/trunk/Makefile 2013-05-05 12:36:58 UTC (rev 20997) @@ -1,4 +1,4 @@ -NAME = mcabber +NAME = mcabber VERSION = 0.9.9 GARTYPE = v2 @@ -14,13 +14,14 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 SPKG_SOURCEURL = http://www.lilotux.net/~mikael/mcabber/ -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -BUILD_DEP_PKGS = CSWlibncurses-dev CSWlibssl-dev CSWotrdevel +# Please note: CSWotr-dev at this point refers to a more recent version +# than mcabber 0.9 supports. +# It will be needed to upgrade it to 0.10 +BUILD_DEP_PKGS = CSWlibncurses-dev CSWlibssl-dev CSWotr-dev BUILD_DEP_PKGS += CSWaspell CSWggettext CSWlibglib2-dev CSWpkgconfig BUILD_DEP_PKGS += CSWlibgpg-error-dev CSWgpgme CSWlibiconv-dev -RUNTIME_DEP_PKGS = CSWlibncursesw5 CSWlibssl1-0-0 CSWotr +RUNTIME_DEP_PKGS = CSWlibncursesw5 CSWlibssl1-0-0 CSWlibotr2 RUNTIME_DEP_PKGS += CSWlibaspell15 CSWlibglib2-0-0 RUNTIME_DEP_PKGS += CSWlibintl8 CSWlibpanelw5 CSWgpgme # Don't know yet why but this dependency is only picked under sparc Modified: csw/mgar/pkg/mcabber/trunk/checksums =================================================================== --- csw/mgar/pkg/mcabber/trunk/checksums 2013-05-05 12:22:40 UTC (rev 20996) +++ csw/mgar/pkg/mcabber/trunk/checksums 2013-05-05 12:36:58 UTC (rev 20997) @@ -1,3 +1 @@ -189fb9d23f5a8412bc660884528475ea download/mcabber-0.9.9.tar.bz2 -a7ceb9f017c2c9267e2264aa626b7a4e download/patch-inline.diff -73e2ae212a072d753942ff24c806ba5d download/patch-iswblank.diff +189fb9d23f5a8412bc660884528475ea mcabber-0.9.9.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun May 5 15:48:36 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 05 May 2013 13:48:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20998] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/filesystem-layout.rst Message-ID: Revision: 20998 http://gar.svn.sourceforge.net/gar/?rev=20998&view=rev Author: wahwah Date: 2013-05-05 13:48:36 +0000 (Sun, 05 May 2013) Log Message: ----------- opencsw-manual/trunk: A little more about FS hierarchy Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst 2013-05-05 12:36:58 UTC (rev 20997) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst 2013-05-05 13:48:36 UTC (rev 20998) @@ -7,7 +7,7 @@ Introduction ------------ -OpenCSW installs over an already installed Solaris system, and follows the +OpenCSW installs into an already installed Solaris system, and follows the general rule of not conflicting with existing Solaris files. The outermost installation directories are: @@ -21,8 +21,27 @@ In this setup, non-global zones see ``/opt/csw`` as mounted read-only. Any local state needs to be kept under ``/var/opt/csw``. +Inside the ``/opt/csw`` prefix, the typical hierarchy rules apply. You can +consult the Debian `filesystem hierarchy standard`_ for an overview. A short version is: + +* Executables go to ``/opt/csw/bin`` ``/opt/csw/sbin`` ``/opt/csw/libexec`` +* Shared libraries go to ``/opt/csw/lib`` +* Architecture-independent files go to ``/opt/csw/share`` +* Documentation goes to ``/opt/csw/shared/doc`` +* Manual pages go to ``/opt/csw/share/man`` + +What's special about the Solaris directory hierachy, including OpenCSW is the +possibility to include binaries for multiple architectures in a single package. +The standard is to create a subdirectory under ``bin`` named after the processor +architecture name, as returned by the ``isalist`` utility. For example, 32-bit +binaries might be in ``/opt/csw/bin`` and 64-bit Intel binaries would be in +``/opt/csw/bin/amd64``. + .. [#shared-opt-csw] `Shared /opt/csw configuration files`_ .. _Shared /opt/csw configuration files: http://wiki.opencsw.org/shared-opt-csw-setup + +.. _filesystem hierarchy standard: + http://wiki.debian.org/FilesystemHierarchyStandard This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun May 5 16:04:14 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 05 May 2013 14:04:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[20999] csw/mgar/pkg/glib/tags/modulated-1.2.10-1.3.15/ Message-ID: Revision: 20999 http://gar.svn.sourceforge.net/gar/?rev=20999&view=rev Author: wahwah Date: 2013-05-05 14:04:12 +0000 (Sun, 05 May 2013) Log Message: ----------- glib: tagging a recipe with 2 version modulation This must have been done before our current shared library policy. Added Paths: ----------- csw/mgar/pkg/glib/tags/modulated-1.2.10-1.3.15/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun May 5 16:45:27 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 05 May 2013 14:45:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21000] csw/mgar/pkg/glib/trunk/Makefile Message-ID: Revision: 21000 http://gar.svn.sourceforge.net/gar/?rev=21000&view=rev Author: wahwah Date: 2013-05-05 14:45:26 +0000 (Sun, 05 May 2013) Log Message: ----------- glib/trunk: Just version 1.2.10 Modified Paths: -------------- csw/mgar/pkg/glib/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/glib/trunk/Makefile Modified: csw/mgar/pkg/glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib/trunk/Makefile 2013-05-05 14:04:12 UTC (rev 20999) +++ csw/mgar/pkg/glib/trunk/Makefile 2013-05-05 14:45:26 UTC (rev 21000) @@ -1,69 +1,54 @@ +# $Id$ + NAME = glib -VERSION = 1.3.15 +VERSION = 1.2.10 GARTYPE = v2 -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.2.10 1.3.15 - -SKIP_MODULATIONS = isa-sparcv9-version-1.2.10 isa-amd64-version-1.2.10 - -DESCRIPTION = Utility library commonly associated with GNOME programs +DESCRIPTION = General-purpose utility library define BLURB GLib is a library containing many useful C routines for things such as trees, hashes, and lists. endef -GNOME_SUBV_FUNC = $(shell echo $1 | awk -F. '{print $$1"."$$2}') -MASTER_SITES = $(sort $(foreach VERSION,$(MODULATIONS_VERSION),$(GNOME_ROOT)/$(GNOME_PROJ)/$(call GNOME_SUBV_FUNC,$(VERSION))/)) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(NAME)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) -NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES)) -PATCHFILES-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch -PATCHFILES-1.3.15 += 0002-Don-t-break-when-index.sgml-is-not-there.patch -PATCHFILES_isa-i386-version-1.3.15 = $(PATCHFILES-1.3.15) -PATCHFILES_isa-sparcv8-version-1.3.15 = $(PATCHFILES-1.3.15) -PATCHFILES_isa-sparcv9-version-1.3.15 = $(PATCHFILES-1.3.15) +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWglib CSWglibdevel - -CATALOGNAME_CSWglib = glib -CATALOGNAME_CSWglibdevel = glib_devel - -SPKG_DESC_CSWglib = $(DESCRIPTION) -SPKG_DESC_CSWglibdevel = Development files for glib - -RUNTIME_DEP_PKGS_CSWglib = CSWggettextrt CSWiconv -RUNTIME_DEP_PKGS_CSWglibdevel = CSWglib -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWglib) - -# glib 1.x doesn't seem to be 64 bit clean -BUILD64 = 1 - -# Only needed for 1.3.x -SGML_CATALOG_FILES = /etc/opt/csw/sgml/catalog -EXTRA_BUILD_EXPORT-1.3.15 = SGML_CATALOG_FILES -EXTRA_BUILD_EXPORTS = $(EXTRA_BUILD_EXPORT-$(VERSION)) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +TEST_SCRIPTS = $(WORKSRC)/Makefile -# There are three possible harmless tests failing for 1.3.15 64 bit, so skip for now -TEST_SCRIPTS_isa-default-version-1.2.10 = $(WORKSRC)/Makefile -TEST_SCRIPTS_isa-default-version-1.3.15 = $(WORKSRC)/Makefile -TEST_SCRIPTS = $(call modulationvalue,TEST_SCRIPTS) - #provided by iconv MERGE_EXCLUDE_FILES = .*/charset.alias -MERGE_SCRIPTS_isa-default-version-1.2.10 = copy-only -MERGE_DIRS_isa-default-version-1.2.10 = $(libdir) -MERGE_SCRIPTS_isa-default-version-1.3.15 = copy-all -MERGE_DIRS_isa-extra-version-1.3.15 = $(libdir) -MERGE_SCRIPTS_isa-extra-version-1.3.15 = copy-relocated-only +PACKAGES += CSWglib-dev +SPKG_DESC_CSWglib-dev = $(DESCRIPTION), development files +PKGFILES_CSWglib-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWglib-dev += $(sharedstatedir)/gtk-doc/.* +RUNTIME_DEP_PKGS_CSWglib-dev += CSWlibgmodule1-2-0 +RUNTIME_DEP_PKGS_CSWglib-dev += CSWlibglib1-2-0 +RUNTIME_DEP_PKGS_CSWglib-dev += CSWlibgthread1-2-0 +# Historical reasons -PKGFILES_CSWglibdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWglibdevel += $(sharedstatedir)/gtk-doc/.* +OBSOLETED_BY_CSWglib-dev = CSWglib-devel +CATALOGNAME_CSWglibdevel = glib_devel +# CHECKPKG_OVERRIDES_CSWglibdevel += catalogname-does-not-match-pkgname|pkgname=CSWglibdevel|catalogname=glib_devel|expected-catalogname=glibdevel +PACKAGES += CSWlibglib1-2-0 +CATALOGNAME_CSWlibglib1-2-0 = libglib1_2_0 +PKGFILES_CSWlibglib1-2-0 += $(call baseisadirs,$(libdir),libglib-1\.2\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibglib1-2-0 += $(DESCRIPTION), libglib-1.2.so.0 +OBSOLETED_BY_CSWlibglib1-2-0 = CSWglib + +PACKAGES += CSWlibgmodule1-2-0 +CATALOGNAME_CSWlibgmodule1-2-0 = libgmodule1_2_0 +PKGFILES_CSWlibgmodule1-2-0 += $(call baseisadirs,$(libdir),libgmodule-1\.2\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgmodule1-2-0 += $(DESCRIPTION), libgmodule-1.2.so.0 +OBSOLETED_BY_CSWlibgmodule1-2-0 = CSWglib + +PACKAGES += CSWlibgthread1-2-0 +PKGFILES_CSWlibgthread1-2-0 += $(call baseisadirs,$(libdir),libgthread-1\.2\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgthread1-2-0 += $(DESCRIPTION), libgthread-1.2.so.0 +OBSOLETED_BY_CSWlibgthread1-2-0 = CSWglib + include gar/category.mk Property changes on: csw/mgar/pkg/glib/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Sun May 5 18:54:25 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 05 May 2013 16:54:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21001] csw/mgar/pkg/netatalk/trunk Message-ID: Revision: 21001 http://gar.svn.sourceforge.net/gar/?rev=21001&view=rev Author: slowfranklin Date: 2013-05-05 16:54:25 +0000 (Sun, 05 May 2013) Log Message: ----------- netatalk/trunk: Fix issues reported by checkpkg Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-05 14:45:26 UTC (rev 21000) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-05 16:54:25 UTC (rev 21001) @@ -26,20 +26,25 @@ BUILD_DEP_PKGS += CSWlibdbus-dev BUILD_DEP_PKGS += CSWlibdbus-glib-dev -RUNTIME_DEP_PKGS += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS += CSWlibgcrypt11 +RUNTIME_DEP_PKGS += CSWperl +RUNTIME_DEP_PKGS += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS += CSWlibkrb5-3 +RUNTIME_DEP_PKGS += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS += CSWlibiconv2 +RUNTIME_DEP_PKGS += CSWlibldap2-4-2 RUNTIME_DEP_PKGS += CSWbdb48 -RUNTIME_DEP_PKGS += CSWlibiconv2 -RUNTIME_DEP_PKGS += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS += CSWkrb5lib -RUNTIME_DEP_PKGS += CSWlibdbus -RUNTIME_DEP_PKGS += CSWdbusglib -# Both patched are in upstream and will be in 3.0.4 +# Patches are in upstream and will be in 3.0.4 +PATCHFILES += 0000-Add-rpath-for-bdb.patch PATCHFILES += 0001-Fix-use-of-unnamed-union-inside-struct.patch PATCHFILES += 0003-Fix-misspelled-compiler-variable.patch CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --libdir=$(prefix)/lib/netatalk +CONFIGURE_ARGS += --with-uams-path=$(prefix)/lib/netatalk CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --disable-tcp-wrappers CONFIGURE_ARGS += --with-bdb=/opt/csw/bdb48 @@ -47,5 +52,9 @@ CONFIGURE_ARGS += --with-init-style=solaris CONFIGURE_ARGS += --with-init-dir=/var/opt/csw/svc/manifest/network/ +# Path to XML dtd +CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/netatalk.xml + + include gar/category.mk Added: csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch 2013-05-05 16:54:25 UTC (rev 21001) @@ -0,0 +1,34 @@ +From 702ab8079a32e9049670cdcdc1bd6f169d3e41a9 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sun, 5 May 2013 18:21:26 +0200 +Subject: [PATCH] Add rpath for bdb + +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 3bbb206..5e54b19 100755 +--- a/configure ++++ b/configure +@@ -16649,7 +16649,7 @@ fi + + if test x"${atalk_cv_bdb_version}" = x"yes"; then + BDB_CFLAGS="-I${bdbdir}/include${subdir}" +- BDB_LIBS="-L${bdblibdir} ${atalk_cv_lib_db}" ++ BDB_LIBS="-L${bdblibdir} -R${bdblibdir} ${atalk_cv_lib_db}" + BDB_BIN="$bdbbindir" + BDB_PATH="$bdbdir" + bdbfound=yes +@@ -16742,7 +16742,7 @@ fi + + if test x"${atalk_cv_bdb_version}" = x"yes"; then + BDB_CFLAGS="-I${bdbdir}/include${subdir}" +- BDB_LIBS="-L${bdblibdir} ${atalk_cv_lib_db}" ++ BDB_LIBS="-L${bdblibdir} -R${bdblibdir} ${atalk_cv_lib_db}" + BDB_BIN="$bdbbindir" + BDB_PATH="$bdbdir" + bdbfound=yes +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 5 22:52:14 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 05 May 2013 20:52:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21002] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 21002 http://gar.svn.sourceforge.net/gar/?rev=21002&view=rev Author: rthurner Date: 2013-05-05 20:52:14 +0000 (Sun, 05 May 2013) Log Message: ----------- mercurial, update to hg-2.6 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 2013-05-05 16:54:25 UTC (rev 21001) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2013-05-05 20:52:14 UTC (rev 21002) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.5.4 +VERSION = 2.6 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2013-05-05 16:54:25 UTC (rev 21001) +++ csw/mgar/pkg/mercurial/trunk/checksums 2013-05-05 20:52:14 UTC (rev 21002) @@ -1 +1 @@ -f3c64086519c32ba7e892b6215b0fcbc mercurial-2.5.4.tar.gz +d012d8bb5f85369d3b6a630a80667170 mercurial-2.6.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 Sun May 5 23:17:22 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 05 May 2013 21:17:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21003] csw/mgar/pkg/lang-python/python-cjson/trunk/ Makefile Message-ID: Revision: 21003 http://gar.svn.sourceforge.net/gar/?rev=21003&view=rev Author: wahwah Date: 2013-05-05 21:17:21 +0000 (Sun, 05 May 2013) Log Message: ----------- lang-python/python-cjson/trunk: no need to build on Solaris 10 Modified Paths: -------------- csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile 2013-05-05 20:52:14 UTC (rev 21002) +++ csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile 2013-05-05 21:17:21 UTC (rev 21003) @@ -22,7 +22,8 @@ # This package is used for package building, therefore must be packaged for # all platforms where we build packages. PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc -PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc +# No need to build on Solaris 10. We might enable that in the future. +# PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc RUNTIME_DEP_PKGS_CSWpy-cjson += CSWlibpython2-6-1-0 CHECKPKG_OVERRIDES_CSWpy-cjson += surplus-dependency|CSWpython This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun May 5 23:51:54 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 05 May 2013 21:51:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21004] csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile Message-ID: Revision: 21004 http://gar.svn.sourceforge.net/gar/?rev=21004&view=rev Author: lblume Date: 2013-05-05 21:51:54 +0000 (Sun, 05 May 2013) Log Message: ----------- gnome-base/gconf2/trunk: Missing files in the runtime package, missing dependencies, missing configure parameters for GTK2 Modified Paths: -------------- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-05 21:17:21 UTC (rev 21003) +++ csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-05 21:51:54 UTC (rev 21004) @@ -21,13 +21,20 @@ # Many more missing BUILD_DEP_PKGS += CSWlibdbus-glib-dev +BUILD_DEP_PKGS += CSWlibxslt +BUILD_DEP_PKGS += CSWgtk-doc +BUILD_DEP_PKGS += CSWintltool PACKAGES += CSWlibgconf2-4 SPKG_DESC_CSWlibgconf2-4 = GNOME configuration database system, libgconf-2.so.4 PKGFILES_CSWlibgconf2-4 += $(call pkgfiles_lib,libgconf-2.so.4) PKGFILES_CSWlibgconf2-4 += $(call baseisadirs,$(libdir),GConf/2/.*) PKGFILES_CSWlibgconf2-4 += $(sharedstatedir)/locale/.*\.mo +PKGFILES_CSWlibgconf2-4 += $(sharedstatedir)/dbus-1/services/.* PKGFILES_CSWlibgconf2-4 += $(sysconfdir)/gconf/.* +PKGFILES_CSWlibgconf2-4 += $(bindir)/.* +PKGFILES_CSWlibgconf2-4 += $(libexecdir)/.* +PKGFILES_CSWlibgconf2-4 += $(mandir)/man.* RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWorbit2 RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgmodule2-0-0 @@ -35,8 +42,13 @@ RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWoldaprt RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibdbus-glib1-2 + OBSOLETED_BY_CSWlibgconf2-4 += CSWgconf2 PACKAGES += CSWlibgconf-dev @@ -54,9 +66,6 @@ RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibgio2-0-0 -# man-page only, override for now -CHECKPKG_OVERRIDES_CSWlibgconf-dev += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/gsettings-data-convert.1 - BUILD64_LIBS_ONLY = 1 STRIP_LIBTOOL = 1 @@ -64,6 +73,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --with-gtk=2.0 +CONFIGURE_ARGS += --enable-introspection=no # CONFIGURE_ARGS += --disable-defaults-service #The "defaults service" requires polkit. and dbus. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From laurent at opencsw.org Mon May 6 00:10:56 2013 From: laurent at opencsw.org (Laurent Blume) Date: Mon, 06 May 2013 00:10:56 +0200 Subject: [csw-devel] SF.net SVN: gar:[21004] csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile In-Reply-To: References: Message-ID: <5186D8F0.8000907@opencsw.org> Dago, I'd like you to review this one, before you or me push the packages. It first started by an error message with gvim, and I ended up doing this... Details: - the file in services/ was the one missing for gvim, so it needs to be added to the runtime; - I also added the binaries, their man, and the libexec, because I think they're also needed for regular runtime, not only dev; - added build dependencies I found out about at home (maybe more missing); - added/adjusted various runtime dependencies, removed an override: I trusted checkpkg there, it looked right (as usual); - added two configure parameters: by default, it looks for GTK+3.0, so here, it was apparently built without GTK support at all. I set it to 2.0 instead; also, it automatically enabled ?introspection?, I'm not sure what it is, but it broke the build. Apparently, it used to be disabled, so I forced it to make sure it stay that way (possibly some newer packages now make it think it's okay). Laurent On 2013-05-05 11:51 PM, lblume at users.sourceforge.net wrote: > Revision: 21004 > http://gar.svn.sourceforge.net/gar/?rev=21004&view=rev > Author: lblume > Date: 2013-05-05 21:51:54 +0000 (Sun, 05 May 2013) > Log Message: > ----------- > gnome-base/gconf2/trunk: Missing files in the runtime package, missing dependencies, missing configure parameters for GTK2 > > Modified Paths: > -------------- > csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile > > Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-05 21:17:21 UTC (rev 21003) > +++ csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-05 21:51:54 UTC (rev 21004) > @@ -21,13 +21,20 @@ > > # Many more missing > BUILD_DEP_PKGS += CSWlibdbus-glib-dev > +BUILD_DEP_PKGS += CSWlibxslt > +BUILD_DEP_PKGS += CSWgtk-doc > +BUILD_DEP_PKGS += CSWintltool > > PACKAGES += CSWlibgconf2-4 > SPKG_DESC_CSWlibgconf2-4 = GNOME configuration database system, libgconf-2.so.4 > PKGFILES_CSWlibgconf2-4 += $(call pkgfiles_lib,libgconf-2.so.4) > PKGFILES_CSWlibgconf2-4 += $(call baseisadirs,$(libdir),GConf/2/.*) > PKGFILES_CSWlibgconf2-4 += $(sharedstatedir)/locale/.*\.mo > +PKGFILES_CSWlibgconf2-4 += $(sharedstatedir)/dbus-1/services/.* > PKGFILES_CSWlibgconf2-4 += $(sysconfdir)/gconf/.* > +PKGFILES_CSWlibgconf2-4 += $(bindir)/.* > +PKGFILES_CSWlibgconf2-4 += $(libexecdir)/.* > +PKGFILES_CSWlibgconf2-4 += $(mandir)/man.* > RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWorbit2 > RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgthread2-0-0 > RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgmodule2-0-0 > @@ -35,8 +42,13 @@ > RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgobject2-0-0 > RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibglib2-0-0 > RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibxml2-2 > -RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWoldaprt > RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgio2-0-0 > +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgtk-x11-2-0-0 > +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWliblber2-4-2 > +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibldap2-4-2 > +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibdbus1-3 > +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibdbus-glib1-2 > + > OBSOLETED_BY_CSWlibgconf2-4 += CSWgconf2 > > PACKAGES += CSWlibgconf-dev > @@ -54,9 +66,6 @@ > RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibdbus1-3 > RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibgio2-0-0 > > -# man-page only, override for now > -CHECKPKG_OVERRIDES_CSWlibgconf-dev += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/gsettings-data-convert.1 > - > BUILD64_LIBS_ONLY = 1 > > STRIP_LIBTOOL = 1 > @@ -64,6 +73,8 @@ > CONFIGURE_ARGS = $(DIRPATHS) > CONFIGURE_ARGS += --enable-static=no > CONFIGURE_ARGS += --enable-gtk-doc > +CONFIGURE_ARGS += --with-gtk=2.0 > +CONFIGURE_ARGS += --enable-introspection=no > > # CONFIGURE_ARGS += --disable-defaults-service > #The "defaults service" requires polkit. and dbus. > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > From wahwah at users.sourceforge.net Mon May 6 08:40:15 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 May 2013 06:40:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21005] csw/mgar/pkg/glib/trunk/Makefile Message-ID: Revision: 21005 http://gar.svn.sourceforge.net/gar/?rev=21005&view=rev Author: wahwah Date: 2013-05-06 06:40:13 +0000 (Mon, 06 May 2013) Log Message: ----------- glib/trunk: It builds fine on Solaris 9, so why not Modified Paths: -------------- csw/mgar/pkg/glib/trunk/Makefile Modified: csw/mgar/pkg/glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib/trunk/Makefile 2013-05-05 21:51:54 UTC (rev 21004) +++ csw/mgar/pkg/glib/trunk/Makefile 2013-05-06 06:40:13 UTC (rev 21005) @@ -13,6 +13,8 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.gz +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv 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 May 6 08:49:36 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 May 2013 06:49:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21006] csw/mgar/pkg/lang-python/pychecker/ Message-ID: Revision: 21006 http://gar.svn.sourceforge.net/gar/?rev=21006&view=rev Author: wahwah Date: 2013-05-06 06:49:35 +0000 (Mon, 06 May 2013) Log Message: ----------- pychecker: Remove, pylint is so much better Removed Paths: ------------- csw/mgar/pkg/lang-python/pychecker/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From sloowfranklin at gmail.com Mon May 6 10:41:22 2013 From: sloowfranklin at gmail.com (Ralph Boehme) Date: Mon, 6 May 2013 10:41:22 +0200 Subject: [csw-devel] SF.net SVN: gar:[20987] csw/mgar/pkg In-Reply-To: <20130504174514.GA28570@cotton.home.blizinski.pl> References: <20130504170418.GA28035@cotton.home.blizinski.pl> <20130504174514.GA28570@cotton.home.blizinski.pl> Message-ID: <74241A2E-61A1-4D4E-B616-DB1030F17FCE@gmail.com> Am 04.05.2013 um 19:45 schrieb Maciej Blizi?ski : > On Sat, May 04, 2013 at 07:16:59PM +0200, Ralph B?hme wrote: >> 2013/5/4 Maciej Blizi?ski : >>>> +DISTFILES = $(NAME)-$(VERSION).tar.bz2 >>> >>> You can use DISTNAME instead of $(NAME)-$(VERSION). >> >> Yeah, I tend to forget the template value. >> >>> Note to self: we should fix the template. >> >> Yes please. ;) > > Just checked, it has already been fixed. Cool! > >>> >>>> +GARCOMPILER = GNU >>>> + >>>> +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib >>> >>> We should not be using /opt/csw/X11, we should be using system X11 >>> instead. >> >> ??? Why? > > How it started: > http://lists.opencsw.org/pipermail/maintainers/2010-May/012133.html > > How it ended: > http://lists.opencsw.org/pipermail/maintainers/2010-March/011672.html So in essence, new packages should not be using opencsw X11 stuff from /opt/csw/x11 ? But then how do I tackle this: - the package needs xproto - the package consumes several other libs via pkg-config Should I add the system pkg-config path to EXTRA_PKG_CONFIG_DIRS? i.e. Makefile:EXTRA_PKG_CONFIG_DIRS = /usr/share/pkgconfig Depending on the precedence ordering this may result in pkg-config preferring packages from the system over the opencsw packages. -slow From maciej at opencsw.org Mon May 6 11:05:39 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 6 May 2013 10:05:39 +0100 Subject: [csw-devel] SF.net SVN: gar:[20987] csw/mgar/pkg In-Reply-To: <74241A2E-61A1-4D4E-B616-DB1030F17FCE@gmail.com> References: <20130504170418.GA28035@cotton.home.blizinski.pl> <20130504174514.GA28570@cotton.home.blizinski.pl> <74241A2E-61A1-4D4E-B616-DB1030F17FCE@gmail.com> Message-ID: 2013/5/6 Ralph Boehme > So in essence, new packages should not be using opencsw X11 stuff from > /opt/csw/x11 ? > Yes. > > But then how do I tackle this: > - the package needs xproto > - the package consumes several other libs via pkg-config > > Should I add the system pkg-config path to EXTRA_PKG_CONFIG_DIRS? i.e. > > Makefile:EXTRA_PKG_CONFIG_DIRS = /usr/share/pkgconfig > > Depending on the precedence ordering this may result in pkg-config > preferring packages from the system over the opencsw packages. > Maybe we just need to remove all unwanted OpenCSW X11 libraries from the build hosts, and then your build will pick up the right libraries where possible. Dago? Maciej -------------- next part -------------- An HTML attachment was scrubbed... URL: From sloowfranklin at gmail.com Mon May 6 11:34:31 2013 From: sloowfranklin at gmail.com (Ralph Boehme) Date: Mon, 6 May 2013 11:34:31 +0200 Subject: [csw-devel] SF.net SVN: gar:[20987] csw/mgar/pkg In-Reply-To: References: <20130504170418.GA28035@cotton.home.blizinski.pl> <20130504174514.GA28570@cotton.home.blizinski.pl> <74241A2E-61A1-4D4E-B616-DB1030F17FCE@gmail.com> Message-ID: Hi Am 06.05.2013 um 11:05 schrieb Maciej (Matchek) Blizi?ski : > 2013/5/6 Ralph Boehme >> So in essence, new packages should not be using opencsw X11 stuff from /opt/csw/x11 ? > > Yes. > >> But then how do I tackle this: >> - the package needs xproto >> - the package consumes several other libs via pkg-config >> >> Should I add the system pkg-config path to EXTRA_PKG_CONFIG_DIRS? i.e. >> >> Makefile:EXTRA_PKG_CONFIG_DIRS = /usr/share/pkgconfig >> >> Depending on the precedence ordering this may result in pkg-config preferring packages from the system over the opencsw packages. > > Maybe we just need to remove all unwanted OpenCSW X11 libraries from the build hosts, and then your build will pick up the right libraries where possible. xproto is a hard dependency, so I have to either pick ours or the system one. But if we remove ours, in order for the package to pick up the system one I'd have to add the system pkg-config path to the search path of the opencsw pkg-config. Otoh, xproto is only a dependency of an optional feature of the dconf package (the dconf-editor), I can of course simply configure --disable-editor and the problem is gone. --slow From slowfranklin at users.sourceforge.net Mon May 6 11:45:17 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 06 May 2013 09:45:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21007] csw/mgar/pkg/dconf/trunk Message-ID: Revision: 21007 http://gar.svn.sourceforge.net/gar/?rev=21007&view=rev Author: slowfranklin Date: 2013-05-06 09:45:16 +0000 (Mon, 06 May 2013) Log Message: ----------- dconf/trunk: Fix one dep, add comments, add portability patch Modified Paths: -------------- csw/mgar/pkg/dconf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dconf/trunk/files/0000-Add-mkdtemp-replacement-function.patch Modified: csw/mgar/pkg/dconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/dconf/trunk/Makefile 2013-05-06 06:49:35 UTC (rev 21006) +++ csw/mgar/pkg/dconf/trunk/Makefile 2013-05-06 09:45:16 UTC (rev 21007) @@ -13,10 +13,13 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 GARCOMPILER = GNU +# for xproto EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +# the package Makefile fails to add these to the header search path EXTRA_INC = $(prefix)/include/gtk-2.0 EXTRA_INC += $(prefix)/include/cairo EXTRA_INC += $(prefix)/include/pango-1.0 @@ -24,7 +27,7 @@ EXTRA_INC += $(prefix)/include/gdk-pixbuf-2.0/ EXTRA_INC += $(prefix)/include/atk-1.0/ -BUILD_DEP_PKGS += CSWlibdbusdev +BUILD_DEP_PKGS += CSWlibdbus-dev BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWgtk2devel @@ -48,11 +51,14 @@ PKGFILES_CSWlibdconf-dev += $(call baseisadirs,$(datadir),vala/vapi/dconf\.vapi) RUNTIME_DEP_PKGS_CSWlibdconf-dev += CSWlibdconf0 +PATCHFILES += 0000-Add-mkdtemp-replacement-function.patch PATCHFILES += 0001-Use-statvfs-for-checking-filesystem-type.patch PATCHFILES += 0002-Remove-linker-flags-remove-c89-request.patch PATCHFILES += 0003-Add-gio-includes.patch CONFIGURE_ARGS = $(DIRPATHS) +# package must be compiled in C99 mode; add __EXTENSIONS__ so the headers expose +# all interfaces that go beyong C99, cf man standards.5 CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__" include gar/category.mk Added: csw/mgar/pkg/dconf/trunk/files/0000-Add-mkdtemp-replacement-function.patch =================================================================== --- csw/mgar/pkg/dconf/trunk/files/0000-Add-mkdtemp-replacement-function.patch (rev 0) +++ csw/mgar/pkg/dconf/trunk/files/0000-Add-mkdtemp-replacement-function.patch 2013-05-06 09:45:16 UTC (rev 21007) @@ -0,0 +1,34 @@ +From 41f345e8d78e79f7aaabfbd4569f890cc2e2f188 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 6 May 2013 11:20:05 +0200 +Subject: [PATCH] Add mkdtemp replacement function + +--- + service/dconf-state.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/service/dconf-state.c b/service/dconf-state.c +index 0ed156e..59f7106 100644 +--- a/service/dconf-state.c ++++ b/service/dconf-state.c +@@ -7,6 +7,17 @@ + #include + #include + ++#include ++#include ++ ++static char * ++mkdtemp(char *template) ++{ ++ if (!mktemp(template) || mkdir(template, 0700)) ++ return NULL; ++ return template; ++} ++ + static void + dconf_state_init_session (DConfState *state) + { +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon May 6 13:43:09 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 06 May 2013 11:43:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21008] csw/mgar/pkg/gobject-introspection/trunk/Makefile Message-ID: Revision: 21008 http://gar.svn.sourceforge.net/gar/?rev=21008&view=rev Author: cgrzemba Date: 2013-05-06 11:43:07 +0000 (Mon, 06 May 2013) Log Message: ----------- gobject-introspection/trunk: add dependency base pkg to the dev package Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2013-05-06 09:45:16 UTC (rev 21007) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2013-05-06 11:43:07 UTC (rev 21008) @@ -41,6 +41,7 @@ PKGFILES_CSWgobject-introspection-dev += $(PKGFILES_DEVEL) PKGFILES_CSWgobject-introspection-dev += /opt/csw/lib/libgirepository-1.0.so RUNTIME_DEP_PKGS_CSWgobject-introspection-dev += CSWlibgirepository1-0-1 +RUNTIME_DEP_PKGS_CSWgobject-introspection-dev += CSWgobject-introspection PACKAGES += CSWgobject-introspection SPKG_DESC_CSWgobject-introspection += $(DESCRIPTION), bins This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon May 6 16:26:07 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 06 May 2013 14:26:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[21009] csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile Message-ID: Revision: 21009 http://gar.svn.sourceforge.net/gar/?rev=21009&view=rev Author: lblume Date: 2013-05-06 14:26:06 +0000 (Mon, 06 May 2013) Log Message: ----------- gnome-base/gconf2/trunk: Add necessary parameters for recently added introspection Modified Paths: -------------- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-06 11:43:07 UTC (rev 21008) +++ csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-06 14:26:06 UTC (rev 21009) @@ -74,8 +74,11 @@ CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc CONFIGURE_ARGS += --with-gtk=2.0 -CONFIGURE_ARGS += --enable-introspection=no +CONFIGURE_ARGS += --enable-introspection=yes +# Needed for introspection +EXTRA_BUILD_EXPORTS += PKG_CONFIG_PATH + # CONFIGURE_ARGS += --disable-defaults-service #The "defaults service" requires polkit. and dbus. #We're better off without em. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon May 6 16:27:25 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 06 May 2013 14:27:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21010] csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile Message-ID: Revision: 21010 http://gar.svn.sourceforge.net/gar/?rev=21010&view=rev Author: lblume Date: 2013-05-06 14:27:25 +0000 (Mon, 06 May 2013) Log Message: ----------- gnome-base/gconf2/trunk: Missing introspection build dep Modified Paths: -------------- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-06 14:26:06 UTC (rev 21009) +++ csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-06 14:27:25 UTC (rev 21010) @@ -24,6 +24,7 @@ BUILD_DEP_PKGS += CSWlibxslt BUILD_DEP_PKGS += CSWgtk-doc BUILD_DEP_PKGS += CSWintltool +BUILD_DEP_PKGS += CSWgobject-introspection-dev PACKAGES += CSWlibgconf2-4 SPKG_DESC_CSWlibgconf2-4 = GNOME configuration database system, libgconf-2.so.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Mon May 6 18:30:14 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 06 May 2013 16:30:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21011] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: Revision: 21011 http://gar.svn.sourceforge.net/gar/?rev=21011&view=rev Author: slowfranklin Date: 2013-05-06 16:30:13 +0000 (Mon, 06 May 2013) Log Message: ----------- netatalk/trunk: Add libgpg-error dep to make checkpkg happy on sparc Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-06 14:27:25 UTC (rev 21010) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-06 16:30:13 UTC (rev 21011) @@ -36,6 +36,7 @@ RUNTIME_DEP_PKGS += CSWlibiconv2 RUNTIME_DEP_PKGS += CSWlibldap2-4-2 RUNTIME_DEP_PKGS += CSWbdb48 +RUNTIME_DEP_PKGS += CSWlibgpg-error0 # Patches are in upstream and will be in 3.0.4 PATCHFILES += 0000-Add-rpath-for-bdb.patch 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 May 6 18:51:12 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 May 2013 16:51:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[21012] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 21012 http://gar.svn.sourceforge.net/gar/?rev=21012&view=rev Author: wahwah Date: 2013-05-06 16:51:10 +0000 (Mon, 06 May 2013) Log Message: ----------- mGAR v2: Fix environment variable propagation. If you set PARALLELMFLAGS to e.g. "-j 10", "mgar platforms" would break. This patch adds quotes around environment variable values, allowing to pass values with spaces. Signed-off-by: Maciej Blizinski Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2013-05-06 16:30:13 UTC (rev 21011) +++ csw/mgar/gar/v2/gar.pkg.mk 2013-05-06 16:51:10 UTC (rev 21012) @@ -1061,7 +1061,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) $(_PASS_GAR_ENV) GAR_PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "$(foreach V,$(_PROPAGATE_ENV),$(if $($V),$V=$($V))) $(MAKE) -I $(GARDIR) -C $(CURDIR) $(_PASS_GAR_ENV) GAR_PLATFORM=$P _package" && \ + $(SSH) -t $(PACKAGING_HOST_$P) "$(foreach V,$(_PROPAGATE_ENV),$(if $($V),$V=\"$($V)\")) $(MAKE) -I $(GARDIR) -C $(CURDIR) $(_PASS_GAR_ENV) GAR_PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Mon May 6 19:25:26 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 06 May 2013 17:25:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21013] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: Revision: 21013 http://gar.svn.sourceforge.net/gar/?rev=21013&view=rev Author: slowfranklin Date: 2013-05-06 17:25:25 +0000 (Mon, 06 May 2013) Log Message: ----------- netatalk/trunk: Adopt libgpg-error dep hack for sparc Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-06 16:51:10 UTC (rev 21012) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-06 17:25:25 UTC (rev 21013) @@ -36,8 +36,11 @@ RUNTIME_DEP_PKGS += CSWlibiconv2 RUNTIME_DEP_PKGS += CSWlibldap2-4-2 RUNTIME_DEP_PKGS += CSWbdb48 -RUNTIME_DEP_PKGS += CSWlibgpg-error0 +# Don't know yet why but this dependency is only picked under sparc +RUNTIME_DEP_PKGS_sparc = CSWlibgpg-error0 +RUNTIME_DEP_PKGS += $(RUNTIME_DEP_PKGS_$(GARCH)) + # Patches are in upstream and will be in 3.0.4 PATCHFILES += 0000-Add-rpath-for-bdb.patch PATCHFILES += 0001-Fix-use-of-unnamed-union-inside-struct.patch 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 May 6 19:53:56 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 May 2013 17:53:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21014] csw/mgar/pkg/librsync/trunk/Makefile Message-ID: Revision: 21014 http://gar.svn.sourceforge.net/gar/?rev=21014&view=rev Author: wahwah Date: 2013-05-06 17:53:56 +0000 (Mon, 06 May 2013) Log Message: ----------- librsync/trunk: Library split, updated dependencies Modified Paths: -------------- csw/mgar/pkg/librsync/trunk/Makefile Modified: csw/mgar/pkg/librsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsync/trunk/Makefile 2013-05-06 17:25:25 UTC (rev 21013) +++ csw/mgar/pkg/librsync/trunk/Makefile 2013-05-06 17:53:56 UTC (rev 21014) @@ -1,3 +1,5 @@ +# $Id$ + NAME = librsync VERSION = 0.9.7 GARTYPE = v2 @@ -11,12 +13,10 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +DISTFILES = $(DISTNAME).tar.gz -RUNTIME_DEP_PKGS_CSWlibrsync += CSWbzip2 -RUNTIME_DEP_PKGS_CSWlibrsync += CSWlibpopt -RUNTIME_DEP_PKGS_CSWlibrsync += CSWzlib +# If it builds fine, why not. +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes @@ -28,4 +28,19 @@ # http://docs.sun.com/app/docs/doc/820-7598/6nirjunib?a=view EXTRA_CFLAGS = -features=no%extinl +PACKAGES += CSWlibrsync1 +PKGFILES_CSWlibrsync1 += $(call baseisadirs,$(libdir),librsync\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibrsync1 += $(DESCRIPTION), librsync.so.1 + +PACKAGES += CSWlibrsync-dev +PKGFILES_CSWlibrsync-dev = $(PKGFILES_DEVEL) +SPKG_DESC_CSWlibrsync-dev += Development files for librsync +RUNTIME_DEP_PKGS_CSWlibrsync-dev += CSWlibrsync1 + +# This package contains the "rdiff" utility. +PACKAGES += CSWlibrsync +SPKG_DESC_CSWlibrsync += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWlibrsync += CSWlibrsync1 +RUNTIME_DEP_PKGS_CSWlibrsync += CSWlibpopt0 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 7 00:57:37 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 May 2013 22:57:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21015] csw/mgar/gar/v2/lib/web Message-ID: Revision: 21015 http://gar.svn.sourceforge.net/gar/?rev=21015&view=rev Author: wahwah Date: 2013-05-06 22:57:37 +0000 (Mon, 06 May 2013) Log Message: ----------- pkgdb: Uniform way of connecting to the database It was inconsistent across the two web apps. It's now moved to a common place, and connecting is done only at application startup, and in each method. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/releases_web.py Added Paths: ----------- csw/mgar/gar/v2/lib/web/web_lib.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-06 17:53:56 UTC (rev 21014) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-06 22:57:37 UTC (rev 21015) @@ -20,8 +20,6 @@ import datetime from sqlobject import sqlbuilder -connected_to_db = False - urls_html = ( r'/', 'index', r'/srv4/', 'Srv4List', @@ -72,18 +70,6 @@ return json.JSONEncoder.default(self, obj) -def ConnectToDatabase(): - """Connect to the database only if necessary. - - One problem with this approach might be that if the connection is lost, the - script will never try to reconnect (unless it's done by the ORM). - """ - global connected_to_db - if not connected_to_db: - configuration.SetUpSqlobjectConnection() - connected_to_db = True - - class index(object): def GET(self): return render.index() @@ -421,7 +407,6 @@ def GET(self, catrel_name, arch_name, osrel_name, catalogname): """Get a srv4 reference by catalog ane catalogname.""" - configuration.SetUpSqlobjectConnection() try: sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( osrel_name, arch_name, catrel_name) @@ -524,7 +509,7 @@ def app_wrapper(): - ConnectToDatabase() + web_lib.ConnectToDatabase() app = web.application(urls, globals()) logging.basicConfig(level=logging.DEBUG) return app.wsgifunc() Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-06 17:53:56 UTC (rev 21014) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-06 22:57:37 UTC (rev 21015) @@ -11,7 +11,6 @@ import sqlobject import cjson from lib.python import models -from lib.python import configuration from lib.python import checkpkg_lib from lib.python import package_stats from lib.python import opencsw @@ -43,10 +42,6 @@ "beanie", ]) -def ConnectToDatabase(): - configuration.SetUpSqlobjectConnection() - - class Index(object): def GET(self): return "It works!\n" @@ -54,7 +49,6 @@ class Srv4List(object): def POST(self): messages = [] - configuration.SetUpSqlobjectConnection() x = web.input(srv4_file={}) web.header( 'Content-type', @@ -104,7 +98,6 @@ class Srv4Detail(object): def GET(self, md5_sum): """Allows to verify whether a given srv4 file exists.""" - configuration.SetUpSqlobjectConnection() srv4 = None try: srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() @@ -142,7 +135,6 @@ class Srv4CatalogAssignment(object): def GET(self, catrel_name, arch_name, osrel_name): """See if that package is in that catalog.""" - configuration.SetUpSqlobjectConnection() sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( osrel_name, arch_name, catrel_name) srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() @@ -167,7 +159,6 @@ is to add the 'Content-Length' header. However, it sometimes still gets stuck and I don't know why. """ - configuration.SetUpSqlobjectConnection() if catrel_name not in CAN_UPLOAD_TO_CATALOGS: # Updates via web are allowed only for the unstable catalog. # We should return an error message instead. @@ -239,7 +230,6 @@ raise web.notacceptable(data=response) def DELETE(self, catrel_name, arch_name, osrel_name, md5_sum): - configuration.SetUpSqlobjectConnection() try: if osrel_name not in common_constants.OS_RELS: self.ReturnError( @@ -270,9 +260,14 @@ web.webapi.internalerror = web.debugerror -app = web.application(urls, globals()) -# main = app.wsgifunc() -application = app.wsgifunc() +def app_wrapper(): + web_lib.ConnectToDatabase() + app = web.application(urls, globals()) + logging.basicConfig(level=logging.DEBUG) + return app.wsgifunc() + +application = app_wrapper() + from paste.exceptions.errormiddleware import ErrorMiddleware application = ErrorMiddleware(application, debug=True) Added: csw/mgar/gar/v2/lib/web/web_lib.py =================================================================== --- csw/mgar/gar/v2/lib/web/web_lib.py (rev 0) +++ csw/mgar/gar/v2/lib/web/web_lib.py 2013-05-06 22:57:37 UTC (rev 21015) @@ -0,0 +1,14 @@ +# A common library for web apps. + +connected_to_db = False + +def ConnectToDatabase(): + """Connect to the database only if necessary. + + One problem with this approach might be that if the connection is lost, the + script will never try to reconnect (unless it's done by the ORM). + """ + global connected_to_db + if not connected_to_db: + configuration.SetUpSqlobjectConnection() + connected_to_db = True This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 7 00:57:48 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 May 2013 22:57:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21016] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 21016 http://gar.svn.sourceforge.net/gar/?rev=21016&view=rev Author: wahwah Date: 2013-05-06 22:57:48 +0000 (Mon, 06 May 2013) Log Message: ----------- pkgdb: Use default raise, preserving the origin If "raise e" is used, the original place where the exception was raised, is lost. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-05-06 22:57:37 UTC (rev 21015) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-05-06 22:57:48 UTC (rev 21016) @@ -466,12 +466,9 @@ "csw-upload-pkg?") sys.exit(1) else: - raise e - for stats in stats_list: - logging.debug( - "Importing %s, %s", - stats["basic_stats"]["md5_sum"], - stats["basic_stats"]["pkg_basename"]) + raise + for md5_sum in md5_list: + logging.debug("Importing %s", md5_sum) try: package_stats.PackageStats.ImportPkg(stats, options.replace) except sqlobject.dberrors.OperationalError, e: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 7 00:58:00 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 May 2013 22:58:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[21017] csw/mgar/gar/v2/lib/python/checkpkg2.py Message-ID: Revision: 21017 http://gar.svn.sourceforge.net/gar/?rev=21017&view=rev Author: wahwah Date: 2013-05-06 22:57:59 +0000 (Mon, 06 May 2013) Log Message: ----------- checkpkg: Better message when errors found Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg2.py Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg2.py 2013-05-06 22:57:48 UTC (rev 21016) +++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2013-05-06 22:57:59 UTC (rev 21017) @@ -26,20 +26,21 @@ BEFORE_OVERRIDES = """If any of the reported errors were false positives, you can override them pasting the lines below to the GAR recipe.""" -AFTER_OVERRIDES = """Please note that checkpkg isn't suggesting you should -simply add these overrides to the Makefile. It only informs what the overrides -could look like. You need to understand what are the reported issues about and -use your best judgement to decide whether to fix the underlying problems or -override them. For more information, scroll up and read the detailed -messages. -To easily inspect packages you've just built, visit: - http://buildfarm.opencsw.org/pkgdb/srv4/ -""" +AFTER_OVERRIDES = ( + "Do not copy/paste these overrides without thinking!", -UNAPPLIED_OVERRIDES = """WARNING: Some overrides did not match any errors. -They can be removed, as they don't take any effect anyway. If you're getting -errors at the same time, maybe you didn't specify the overrides correctly.""" + "If you're not sure, scroll up and read the details. If you're still not " + "sure, go to the wiki and read about the error tags you see, or ask " + "on the maintainers@ mailing list.", + "http://wiki.opencsw.org/checkpkg-error-tags", +) + +UNAPPLIED_OVERRIDES = ( +"""WARNING: Some overrides did not match any errors. They can probably be +removed, as they don't take any effect anyway. If you're getting errors at the +same time, maybe you didn't specify your overrides correctly.""") + cc = common_constants class Error(Exception): @@ -175,7 +176,21 @@ print(textwrap.fill(BEFORE_OVERRIDES, 80)) for checkpkg_tag in tags_after_overrides: print checkpkg_tag.ToGarSyntax() - print textwrap.fill(AFTER_OVERRIDES, 80) + print + for paragraph in AFTER_OVERRIDES: + print(textwrap.fill(paragraph, 80)) + print + elif error_tags: + msg = ( + 'Fair enough, there were %d error tags, ' + 'but they were all overridden. ' + "Just make sure you didn't override anything silly, like " + 'sparc binaries in a i386 package.' + % len(error_tags)) + print + else: + print('Jolly good! All checks passed, no error tags reported.') + if unapplied_overrides: print textwrap.fill(UNAPPLIED_OVERRIDES, 80) for override in unapplied_overrides: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 7 00:58:09 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 May 2013 22:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21018] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 21018 http://gar.svn.sourceforge.net/gar/?rev=21018&view=rev Author: wahwah Date: 2013-05-06 22:58:08 +0000 (Mon, 06 May 2013) Log Message: ----------- pkgdb: Progressbar for catalog import Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-05-06 22:57:59 UTC (rev 21017) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-05-06 22:58:08 UTC (rev 21018) @@ -13,6 +13,7 @@ import database import datetime import getpass +import itertools import logging import models as m import optparse @@ -20,6 +21,7 @@ import os.path import package_checks import package_stats +import progressbar import re import shell import socket @@ -307,6 +309,10 @@ logging.info("Adding srv4 files to the %s %s %s catalog.", osrel, arch, catrel) db_catalog = checkpkg_lib.Catalog() + pbar = progressbar.ProgressBar() + pbar.maxval = len(md5_sums_to_add) + pbar.start() + counter = itertools.count(1) for md5 in md5_sums_to_add: logging.debug("Adding %s", cat_entry_by_md5[md5]["file_basename"]) sqo_srv4 = m.Srv4FileStats.selectBy(md5_sum=md5).getOne() @@ -327,6 +333,7 @@ logging.warning( "Could not insert %s (%s) into the database. %s", sqo_srv4.basename, sqo_srv4.md5_sum, e) + pbar.update(counter.next()) def SyncFromCatalogTree(self, catrel, base_dir, force_unpack=False): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 7 01:07:59 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 06 May 2013 23:07:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21019] csw/mgar/gar/v2/lib/web Message-ID: Revision: 21019 http://gar.svn.sourceforge.net/gar/?rev=21019&view=rev Author: wahwah Date: 2013-05-06 23:07:59 +0000 (Mon, 06 May 2013) Log Message: ----------- pkgdb: Add missed module imports Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/releases_web.py csw/mgar/gar/v2/lib/web/web_lib.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-06 22:58:08 UTC (rev 21018) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-06 23:07:59 UTC (rev 21019) @@ -17,6 +17,7 @@ from lib.python import models from lib.python import configuration from lib.python import checkpkg_lib +from lib.web import web_lib import datetime from sqlobject import sqlbuilder Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-06 22:58:08 UTC (rev 21018) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-06 23:07:59 UTC (rev 21019) @@ -20,6 +20,7 @@ import logging import tempfile +from lib.web import web_lib urls = ( r'/', 'Index', Modified: csw/mgar/gar/v2/lib/web/web_lib.py =================================================================== --- csw/mgar/gar/v2/lib/web/web_lib.py 2013-05-06 22:58:08 UTC (rev 21018) +++ csw/mgar/gar/v2/lib/web/web_lib.py 2013-05-06 23:07:59 UTC (rev 21019) @@ -1,5 +1,7 @@ # A common library for web apps. +from lib.python import configuration + connected_to_db = False def ConnectToDatabase(): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue May 7 10:39:28 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 07 May 2013 08:39:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[21020] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21020 http://gar.svn.sourceforge.net/gar/?rev=21020&view=rev Author: cgrzemba Date: 2013-05-07 08:39:27 +0000 (Tue, 07 May 2013) Log Message: ----------- qt4-gcc/trunk: obsoleting the QT4.8.0-gxx package Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-06 23:07:59 UTC (rev 21019) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-07 08:39:27 UTC (rev 21020) @@ -72,6 +72,7 @@ RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibgcc-s1 +OBSOLETED_BY_CSWlibqtcore4 = CSWlibqtcore4-gxx PACKAGES += CSWlibqtgui4 PKGFILES_CSWlibqtgui4 += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*) @@ -86,6 +87,7 @@ RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtGui.so.4.8.1 +OBSOLETED_BY_CSWlibqtgui4 = CSWlibqtgui4-gxx PACKAGES += CSWqt4-dev SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files @@ -143,6 +145,7 @@ CHECKPKG_OVERRIDES_CSWqt4-dev += discouraged-path-in-pkgmap # because libdbus needs /etc/machine-id which can generated with a tool of CSWdbus CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWdbus +OBSOLETED_BY_CSWqt4-dev = CSWqt4-dev-gxx PACKAGES += CSWlibqthelp4 PKGFILES_CSWlibqthelp4 += $(call baseisadirs,$(libdir),libQtHelp\.so\.4(\.\d+)*) @@ -154,6 +157,7 @@ RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtsql4 RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtclucene4 +OBSOLETED_BY_CSWlibqthelp4 = CSWlibqthelp4-gxx PACKAGES += CSWlibqtmultimedia4 PKGFILES_CSWlibqtmultimedia4 += $(call baseisadirs,$(libdir),libQtMultimedia\.so\.4(\.\d+)*) @@ -162,6 +166,7 @@ RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtcore4 +OBSOLETED_BY_CSWlibqtmultimedia4 = CSWlibqtmultimedia4-gxx PACKAGES += CSWlibqtnetwork4 PKGFILES_CSWlibqtnetwork4 += $(call baseisadirs,$(libdir),libQtNetwork\.so\.4(\.\d+)*) @@ -170,6 +175,7 @@ RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibqtcore4 CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtNetwork.so.4.8.1 +OBSOLETED_BY_CSWlibqtnetwork4 = CSWlibqtnetwork4 PACKAGES += CSWlibqtopengl4 PKGFILES_CSWlibqtopengl4 += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*) @@ -182,6 +188,7 @@ RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4_$(GARCH)) +OBSOLETED_BY_CSWlibqtopengl4 = CSWlibqtopengl4-gxx PACKAGES += CSWlibqtscript4 @@ -190,6 +197,7 @@ RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibqtcore4 +OBSOLETED_BY_CSWlibqtscript4 = CSWlibqtscript4-gxx PACKAGES += CSWlibqtscripttools4 PKGFILES_CSWlibqtscripttools4 += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*) @@ -199,6 +207,7 @@ RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtcore4 +OBSOLETED_BY_CSWlibqtscripttools4 = CSWlibqtscripttools4-gxx PACKAGES += CSWlibqtsql4 PKGFILES_CSWlibqtsql4 += $(call baseisadirs,$(libdir),libQtSql\.so\.4(\.\d+)*) @@ -206,6 +215,7 @@ RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibqtcore4 +OBSOLETED_BY_CSWlibqtsql4 = CSWlibqtsql4-gxx PACKAGES += CSWlibqtsvg4 PKGFILES_CSWlibqtsvg4 += $(call baseisadirs,$(libdir),libQtSvg\.so\.4(\.\d+)*) @@ -214,6 +224,7 @@ RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtcore4 +OBSOLETED_BY_CSWlibqtsvg4 = CSWlibqtsvg4-gxx PACKAGES += CSWlibqttest4 PKGFILES_CSWlibqttest4 += $(call baseisadirs,$(libdir),libQtTest\.so\.4(\.\d+)*) @@ -221,6 +232,7 @@ RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibqtcore4 +OBSOLETED_BY_CSWlibqttest4 = CSWlibqttest4-gxx PACKAGES += CSWlibphonon4 PKGFILES_CSWlibphonon4 += $(call baseisadirs,$(libdir),libphonon\.so\.4(\.\d+)*) @@ -231,6 +243,7 @@ RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibgcc-s1 +OBSOLETED_BY_CSWlibphonon4 = CSWlibphonon4-gxx PACKAGES += CSWlibqtclucene4 PKGFILES_CSWlibqtclucene4 += $(call baseisadirs,$(libdir),libQtCLucene\.so\.4(\.\d+)*) @@ -239,6 +252,7 @@ RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtcore4 # RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtdbus4 +OBSOLETED_BY_CSWlibqtclucene4 = CSWlibqtclucene4-gxx PACKAGES += CSWlibqtdbus4 PKGFILES_CSWlibqtdbus4 += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*) @@ -247,6 +261,7 @@ RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtxml4 RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtcore4 +OBSOLETED_BY_CSWlibqtdbus4 = CSWlibqtdbus4-gxx PACKAGES += CSWlibqtdeclarative4 PKGFILES_CSWlibqtdeclarative4 += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*) @@ -259,6 +274,7 @@ # RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsql4 +OBSOLETED_BY_CSWlibqtdeclarative4 = CSWlibqtdeclarative4-gxx PACKAGES += CSWlibqtdesigner4 PKGFILES_CSWlibqtdesigner4 += $(call baseisadirs,$(libdir),libQtDesigner\.so\.4(\.\d+)*) @@ -269,6 +285,7 @@ RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibgcc-s1 +OBSOLETED_BY_CSWlibqtdesigner4 = CSWlibqtdesigner4-gxx PACKAGES += CSWlibqtdesignercomponents4 PKGFILES_CSWlibqtdesignercomponents4 += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*) @@ -280,6 +297,7 @@ RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibgcc-s1 +OBSOLETED_BY_CSWlibqtdesignercomponents4 = CSWlibqtdesignercomponents4-gxx PACKAGES += CSWlibqtxml4 PKGFILES_CSWlibqtxml4 += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*) @@ -287,12 +305,14 @@ RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibqtcore4 +OBSOLETED_BY_CSWlibqtxml4 = CSWlibqtxml4-gxx PACKAGES += CSWqt4-doc SPKG_DESC_CSWqt4-doc += $(DESCRIPTION), documentation # Catch-all ARCHALL_CSWqt4-doc = 1 CHECKPKG_OVERRIDES_CSWqt4-doc += file-with-bad-content +OBSOLETED_BY_CSWqt4-doc = CSWqt4-doc-gxx include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue May 7 11:43:16 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 07 May 2013 09:43:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21021] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21021 http://gar.svn.sourceforge.net/gar/?rev=21021&view=rev Author: cgrzemba Date: 2013-05-07 09:43:16 +0000 (Tue, 07 May 2013) Log Message: ----------- qt4-gcc/trunk: refine dependencies Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-07 08:39:27 UTC (rev 21020) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-07 09:43:16 UTC (rev 21021) @@ -129,12 +129,12 @@ # RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWgstplugins RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsybdb5 +# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsybdb5 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWsqlite -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2 +# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibpq5 +# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18 +# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibicui18n50 CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWlibicui18n50 # These are code examples. @@ -175,7 +175,7 @@ RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibqtcore4 CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtNetwork.so.4.8.1 -OBSOLETED_BY_CSWlibqtnetwork4 = CSWlibqtnetwork4 +OBSOLETED_BY_CSWlibqtnetwork4 = CSWlibqtnetwork4-gxx PACKAGES += CSWlibqtopengl4 PKGFILES_CSWlibqtopengl4 += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue May 7 12:00:56 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 07 May 2013 10:00:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21022] csw/mgar/pkg/lang-python Message-ID: Revision: 21022 http://gar.svn.sourceforge.net/gar/?rev=21022&view=rev Author: pfelecan Date: 2013-05-07 10:00:56 +0000 (Tue, 07 May 2013) Log Message: ----------- lang-python/pyqt/trunk: instantiate Added Paths: ----------- csw/mgar/pkg/lang-python/pyqt/ csw/mgar/pkg/lang-python/pyqt/Makefile csw/mgar/pkg/lang-python/pyqt/branches/ csw/mgar/pkg/lang-python/pyqt/tags/ csw/mgar/pkg/lang-python/pyqt/trunk/ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile csw/mgar/pkg/lang-python/pyqt/trunk/checksums csw/mgar/pkg/lang-python/pyqt/trunk/files/ csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch csw/mgar/pkg/lang-python/pyqt/trunk/files/0002-force-xpg6-where-not-set-by-configure.patch Added: csw/mgar/pkg/lang-python/pyqt/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pyqt/Makefile 2013-05-07 10:00:56 UTC (rev 21022) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/pyqt/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-07 10:00:56 UTC (rev 21022) @@ -0,0 +1,85 @@ +# $Id$ + +NAME = pyqt +VERSION = 4.10.1 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Python bindings for Qt +define BLURB + PyQt is the Python bindings for Qt cross-platform application development + framework. +endef + +MASTER_SITES = $(SF_MIRRORS) +SF_PROJECT = pyqt +SPKG_SOURCEURL = $(MASTER_SITES) +DISTNAME = PyQt-x11-gpl-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz +LICENSE = LICENSE.GPL3 +PATCHFILES += 0001-disable-ocsw-unsupported-modules.patch +PATCHFILES += 0002-force-xpg6-where-not-set-by-configure.patch + +BUILD_DEPS_PKG += CSWqt4-dev +BUILD_DEPS_PKG += CSWpy-sip + +GARCOMPILER = GNU +EXTRA_CFLAGS += -std=gnu99 -D_XPG6 +EXTRA_CXXFLAGS += -D_XPG6 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_SCRIPTS = custom + +BUILD_SCRIPTS = custom + +TEST_SCRIPTS = + +INSTALL_SCRIPTS = custom + +PACKAGES += CSWpy-pyqt-common +CATALOGNAME_CSWpy-pyqt-common = py_pyqt_common +SPKG_DESC_CSWpy-pyqt-common = $(DESCRIPTION), common files +ARCHALL_CSWpy-pyqt-common = 1 + +PACKAGES += CSWpy-pyqt +CATALOGNAME_CSWpy-pyqt = py_pyqt +SPKG_DESC_CSWpy-pyqt = $(DESCRIPTION) +PKGFILES_CSWpy-pyqt += /opt/csw/bin/pylupdate4 +PKGFILES_CSWpy-pyqt += /opt/csw/bin/pyrcc4 +PKGFILES_CSWpy-pyqt += /opt/csw/lib/python/site-packages/PyQt4/.*[.]so +PKGFILES_CSWpy-pyqt += /opt/csw/plugins/designer/libpythonplugin.so + +include gar/category.mk + +PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) + +# assume share because QT_SHARED doesn't get defined in the +# configuration environment (TODO: explore issue in depth) +configure-custom: + cd $(WORKSRC) && \ + /usr/bin/env -i \ + $(CONFIGURE_ENV) \ + python configure-ng.py \ + --verbose \ + --confirm-license \ + --assume-shared \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ + LFLAGS="${LDFLAGS}" \ + QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \ + QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \ + QMAKE_LFLAGS+="${LDFLAGS}" + @$(MAKECOOKIE) + +build-custom: + cd $(WORKSRC) && \ + /usr/bin/env -i \ + $(BUILD_ENV) \ + $(MAKE) + @$(MAKECOOKIE) + +install-custom: + cd $(WORKSRC) && \ + /usr/bin/env -i \ + $(INSTALL_ENV) \ + $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(DESTDIR) install + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/pyqt/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/pyqt/trunk/checksums 2013-05-07 10:00:56 UTC (rev 21022) @@ -0,0 +1 @@ +e5973c4ec0b0469f329bc00209d2ad9c PyQt-x11-gpl-4.10.1.tar.gz Added: csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch (rev 0) +++ csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch 2013-05-07 10:00:56 UTC (rev 21022) @@ -0,0 +1,156 @@ +From 7ad6eea32906e2cf2f0f016b48854a4cb5d247ff Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 6 May 2013 14:23:33 +0200 +Subject: [PATCH] disable ocsw unsupported modules + +--- + configure-ng.py | 15 --------------- + configure.py | 25 +------------------------ + 2 files changed, 1 insertion(+), 39 deletions(-) + +diff --git a/configure-ng.py b/configure-ng.py +index ad7b594..0a64412 100644 +--- a/configure-ng.py ++++ b/configure-ng.py +@@ -73,10 +73,8 @@ class ModuleMetadata: + QT4_MODULES = { + 'dbus': ModuleMetadata(qmake_QT=['-gui'], qmake_TARGET='qt', + in_consolidated=False), +- 'QAxContainer': ModuleMetadata(qmake_CONFIG='qaxcontainer'), + 'Qt': ModuleMetadata(qmake_QT=['-core', '-gui'], + in_consolidated=False), +- 'QtAssistant': ModuleMetadata(qmake_LIBS='-lqassistantclient'), + 'QtCore': ModuleMetadata(qmake_QT=['-gui'], qpy_lib='qpycore'), + 'QtDBus': ModuleMetadata(qmake_QT=['dbus', '-gui'], + qpy_lib='qpydbus'), +@@ -95,10 +93,7 @@ QT4_MODULES = { + 'QtSql': ModuleMetadata(qmake_QT=['sql']), + 'QtSvg': ModuleMetadata(qmake_QT=['svg']), + 'QtTest': ModuleMetadata(qmake_QT=['testlib']), +- 'QtWebKit': ModuleMetadata(qmake_QT=['webkit', 'network']), + 'QtXml': ModuleMetadata(qmake_QT=['xml', '-gui']), +- 'QtXmlPatterns': ModuleMetadata( +- qmake_QT=['xmlpatterns', '-gui', 'network']), + 'phonon': ModuleMetadata(qmake_QT=['phonon']) + } + +@@ -106,7 +101,6 @@ QT4_MODULES = { + QT5_MODULES = { + 'dbus': ModuleMetadata(qmake_QT=['-gui'], qmake_TARGET='qt', + in_consolidated=False), +- 'QAxContainer': ModuleMetadata(qmake_QT=['axcontainer']), + 'Qt': ModuleMetadata(qmake_QT=['-core', '-gui'], + in_consolidated=False), + 'QtCore': ModuleMetadata(qmake_QT=['-gui'], qpy_lib='qpycore'), +@@ -129,12 +123,7 @@ QT5_MODULES = { + 'QtSql': ModuleMetadata(qmake_QT=['sql', 'widgets']), + 'QtSvg': ModuleMetadata(qmake_QT=['svg']), + 'QtTest': ModuleMetadata(qmake_QT=['testlib', 'widgets']), +- 'QtWebKit': ModuleMetadata( +- qmake_QT=['webkit', 'webkitwidgets', +- 'network']), + 'QtXml': ModuleMetadata(qmake_QT=['xml', '-gui']), +- 'QtXmlPatterns': ModuleMetadata( +- qmake_QT=['xmlpatterns', '-gui', 'network']) + } + + +@@ -948,12 +937,8 @@ def check_modules(target_config, verbose): + 'new QSvgWidget()') + check_module(target_config, verbose, 'QtTest', 'QtTest', + 'QTest::qSleep(0)') +- check_module(target_config, verbose, 'QtWebKit', 'qwebpage.h', +- 'new QWebPage()') + check_module(target_config, verbose, 'QtXml', 'qdom.h', + 'new QDomDocument()') +- check_module(target_config, verbose, 'QtXmlPatterns', 'qxmlname.h', +- 'new QXmlName()') + + if target_config.qt_version < 0x050000: + check_module(target_config, verbose, 'phonon', 'phonon/videowidget.h', +diff --git a/configure.py b/configure.py +index 81eb0e1..2934fad 100644 +--- a/configure.py ++++ b/configure.py +@@ -366,14 +366,9 @@ class ConfigurePyQt4: + extra_libs=sql_libs) + check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()") + check_module("QtTest", "QtTest", "QTest::qSleep(0)") +- check_module("QtWebKit", "qwebpage.h", "new QWebPage()") + check_module("QtXml", "qdom.h", "new QDomDocument()") +- check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()") + check_module("phonon", "phonon/videowidget.h", + "new Phonon::VideoWidget()") +- check_module("QtAssistant", "qassistantclient.h", +- "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, +- extra_libs=ass_libs) + + if not qt_shared: + sipconfig.inform("QtDesigner module disabled with static Qt libraries.") +@@ -381,8 +376,6 @@ class ConfigurePyQt4: + check_module("QtDesigner", "QExtensionFactory", + "new QExtensionFactory()") + +- check_module("QAxContainer", "qaxobject.h", "new QAxObject()") +- + if os.path.isdir(os.path.join(src_dir, "dbus")): + check_dbus() + +@@ -507,21 +500,12 @@ class ConfigurePyQt4: + if "QtTest" in pyqt_modules: + generate_code("QtTest") + +- if "QtWebKit" in pyqt_modules: +- generate_code("QtWebKit") +- + if "QtXml" in pyqt_modules: + generate_code("QtXml") + +- if "QtXmlPatterns" in pyqt_modules: +- generate_code("QtXmlPatterns") +- + if "phonon" in pyqt_modules: + generate_code("phonon") + +- if "QtAssistant" in pyqt_modules: +- generate_code("QtAssistant") +- + if "QtDesigner" in pyqt_modules: + qpy_inc_dir, qpy_lib_dir, qpy_lib = self._qpy_directories("QtDesigner", "qpydesigner") + +@@ -535,9 +519,6 @@ class ConfigurePyQt4: + generate_code("QtDesigner", extra_include_dirs=[qpy_inc_dir], + extra_lib_dirs=[qpy_lib_dir], extra_libs=[qpy_lib]) + +- if "QAxContainer" in pyqt_modules: +- generate_code("QAxContainer") +- + # Generate the composite module. + qtmod_sipdir = os.path.join("sip", "Qt") + mk_clean_dir(qtmod_sipdir) +@@ -1277,7 +1258,7 @@ def compile_qt_program(name, mname, extra_include_dirs=None, extra_lib_dirs=None + opengl = (mname == "QtOpenGL") + + qt = [mname] +- if mname in ("QtAssistant", "QtHelp", "QtOpenGL", "QtWebKit"): ++ if mname in ("QtHelp", "QtOpenGL"): + qt.append("QtCore") + + makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0, +@@ -1576,13 +1557,9 @@ def needed_qt_libs(mname, qt_libs): + "QtSql": ["QtGui"], + "QtSvg": ["QtGui"], + "QtTest": ["QtGui"], +- "QtWebKit": ["QtNetwork", "QtGui"], + "QtXml": ["QtCore"], +- "QtXmlPatterns": ["QtNetwork", "QtCore"], + "phonon": ["QtGui"], +- "QtAssistant": ["QtNetwork", "QtGui"], + "QtDesigner": ["QtGui"], +- "QAxContainer": ["QtGui"] + } + + # Handle the dependencies first. +-- +1.8.1.4 + Added: csw/mgar/pkg/lang-python/pyqt/trunk/files/0002-force-xpg6-where-not-set-by-configure.patch =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/files/0002-force-xpg6-where-not-set-by-configure.patch (rev 0) +++ csw/mgar/pkg/lang-python/pyqt/trunk/files/0002-force-xpg6-where-not-set-by-configure.patch 2013-05-07 10:00:56 UTC (rev 21022) @@ -0,0 +1,25 @@ +From 89d3fcd82222171a37d23ce3eaaf73b2e6f7ff54 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 7 May 2013 10:33:29 +0200 +Subject: [PATCH] force xpg6 where not set by configure + +--- + designer/pluginloader.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/designer/pluginloader.h b/designer/pluginloader.h +index a3b4fab..4d1babc 100644 +--- a/designer/pluginloader.h ++++ b/designer/pluginloader.h +@@ -28,6 +28,8 @@ + #ifndef _PLUGINLOADER_H + #define _PLUGINLOADER_H + ++#define _XPG6 ++ + #include + + #include +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue May 7 12:26:30 2013 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 7 May 2013 12:26:30 +0200 Subject: [csw-devel] SF.net SVN: gar:[20989] csw/mgar/pkg/otr/trunk/Makefile In-Reply-To: References: Message-ID: <68F26FEF-F5F4-4B8E-BC5B-56FB0CAC1E20@opencsw.org> Hi Laurent, Am 04.05.2013 um 22:22 schrieb Maciej (Matchek) Blizi?ski : > 2013/5/4 : >> +# On sparc, the dependencies end up different >> +ifeq ($(shell uname -p), sparc) >> + RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgpg-error0 >> + RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0 >> +endif > > There's a GARCH variable which already contains the architecture information. The usual idiom is RUNTIME_DEP_PKGS_CSWlibotr5-sparc += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibotr5 += $(RUNTIME_DEP_PKGS_CSWlibotr5-$(GARCH)) Best regards -- Dago -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dmichelsen at users.sourceforge.net Tue May 7 12:44:26 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 May 2013 10:44:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21023] csw/mgar/pkg/lua/trunk Message-ID: Revision: 21023 http://gar.svn.sourceforge.net/gar/?rev=21023&view=rev Author: dmichelsen Date: 2013-05-07 10:44:26 +0000 (Tue, 07 May 2013) Log Message: ----------- lua/trunk: Fix duplicate definition of prefix in lua.pc Modified Paths: -------------- csw/mgar/pkg/lua/trunk/Makefile csw/mgar/pkg/lua/trunk/files/lua.pc Modified: csw/mgar/pkg/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2013-05-07 10:00:56 UTC (rev 21022) +++ csw/mgar/pkg/lua/trunk/Makefile 2013-05-07 10:44:26 UTC (rev 21023) @@ -1,7 +1,6 @@ # $Id$ # Open issues: -# - no .pc file # - provide different C/C++ libs for liblua as discussed here: # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560139 Modified: csw/mgar/pkg/lua/trunk/files/lua.pc =================================================================== --- csw/mgar/pkg/lua/trunk/files/lua.pc 2013-05-07 10:00:56 UTC (rev 21022) +++ csw/mgar/pkg/lua/trunk/files/lua.pc 2013-05-07 10:44:26 UTC (rev 21023) @@ -4,7 +4,6 @@ # and .pc is "so useless" :-( # http://lua-users.org/lists/lua-l/2010-03/msg00718.html -prefix=@prefix@ V=@MAJOR@ R=@VERSION@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue May 7 14:15:42 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 07 May 2013 12:15:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21024] csw/mgar/pkg/dconf/trunk Message-ID: Revision: 21024 http://gar.svn.sourceforge.net/gar/?rev=21024&view=rev Author: slowfranklin Date: 2013-05-07 12:15:42 +0000 (Tue, 07 May 2013) Log Message: ----------- dconf/trunk: Add checkpkg overrides and move dconf-editor to its own package Modified Paths: -------------- csw/mgar/pkg/dconf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dconf/trunk/files/0000-Replace-posix_fallocate-with-ftruncate.patch Modified: csw/mgar/pkg/dconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/dconf/trunk/Makefile 2013-05-07 10:44:26 UTC (rev 21023) +++ csw/mgar/pkg/dconf/trunk/Makefile 2013-05-07 12:15:42 UTC (rev 21024) @@ -5,7 +5,7 @@ VERSION = 0.5.1 GARTYPE = v2 -DESCRIPTION = low-level configuration system for glib +DESCRIPTION = Low-level configuration system for glib define BLURB dconf is a low-level configuration system. Its main purpose is to provide a backend to GSettings on platforms that dont already have @@ -15,6 +15,11 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.bz2 GARCOMPILER = GNU +# g-ir-scanner chokes on linking an uninstalled library if LINKER_DIRECT and +# LINKER_IGNORE aren't reset +LINKER_DIRECT = +LINKER_IGNORE = +REINPLACE_USRSHARE += editor/dconf-model.c # for xproto EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib @@ -31,19 +36,35 @@ BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWgtk2devel +BUILD_DEP_PKGS_CSWdconf-editor += CSWlibfreetype6-dev -RUNTIME_DEP_PKGS += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWlibdbus +# as suggested by checkpkg +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibdconf0 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWpango +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWdconf += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWdconf += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWdconf += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWdconf += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWdconf += CSWlibgio2-0-0 -PACKAGES += CSWdconf -SPKG_DESC_CSWdconf = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWdconf += CSWlibdconf0 - -PACKAGES += CSWlibdconf0 -SPKG_DESC_CSWlibdconf0 = $(DESCRIPTION), library -PKGFILES_CSWlibdconf0 += $(call pkgfiles_lib,libdconf.so) - PACKAGES += CSWlibdconf-dev SPKG_DESC_CSWlibdconf-dev = $(DESCRIPTION), development files PKGFILES_CSWlibdconf-dev += $(PKGFILES_DEVEL) @@ -51,15 +72,68 @@ PKGFILES_CSWlibdconf-dev += $(call baseisadirs,$(datadir),vala/vapi/dconf\.vapi) RUNTIME_DEP_PKGS_CSWlibdconf-dev += CSWlibdconf0 +PACKAGES += CSWlibdconf0 +SPKG_DESC_CSWlibdconf0 = $(DESCRIPTION), library +PKGFILES_CSWlibdconf0 += $(call pkgfiles_lib,libdconf.so.0) + +PACKAGES += CSWdconf-editor +SPKG_DESC_CSWdconf-editor = $(DESCRIPTION), configuration editor +PKGFILES_CSWdconf-editor += $(bindir)/dconf-editor + +PACKAGES += CSWdconf +SPKG_DESC_CSWdconf = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWdconf += CSWlibdconf0 +# PKGFILES is catchall + PATCHFILES += 0000-Add-mkdtemp-replacement-function.patch PATCHFILES += 0001-Use-statvfs-for-checking-filesystem-type.patch PATCHFILES += 0002-Remove-linker-flags-remove-c89-request.patch PATCHFILES += 0003-Add-gio-includes.patch +PATCHFILES += 0000-Replace-posix_fallocate-with-ftruncate.patch CONFIGURE_ARGS = $(DIRPATHS) # package must be compiled in C99 mode; add __EXTENSIONS__ so the headers expose # all interfaces that go beyong C99, cf man standards.5 CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__" +# see above comment for LINKER_DIRECT and LINKER_IGNORE +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libthread.so.1 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libpangoft2-1.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libpangocairo-1.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libpango-1.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgtk-x11-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgobject-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgmodule-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libglib-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgio-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgdk-x11-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgdk_pixbuf-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libdconf.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libcairo.so.2 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libatk-1.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libxml2.so.2 +CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libgio-2.0.so.0 +CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libglib-2.0.so.0 +CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libgobject-2.0.so.0 +CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libdconf.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libgio-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libglib-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libgobject-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libgio-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libglib-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libgobject-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libgio-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libglib-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libgobject-2.0.so.0 +CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libintl.so.8 + include gar/category.mk Added: csw/mgar/pkg/dconf/trunk/files/0000-Replace-posix_fallocate-with-ftruncate.patch =================================================================== --- csw/mgar/pkg/dconf/trunk/files/0000-Replace-posix_fallocate-with-ftruncate.patch (rev 0) +++ csw/mgar/pkg/dconf/trunk/files/0000-Replace-posix_fallocate-with-ftruncate.patch 2013-05-07 12:15:42 UTC (rev 21024) @@ -0,0 +1,25 @@ +From a4a0bfa35e99fccb8466ffea72b2eb5d978f3feb Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 6 May 2013 13:34:12 +0200 +Subject: [PATCH] Replace posix_fallocate() with ftruncate + +--- + engine/dconf-engine.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c +index cf57431..a3f487a 100644 +--- a/engine/dconf-engine.c ++++ b/engine/dconf-engine.c +@@ -144,7 +144,7 @@ dconf_engine_setup_user (DConfEngine *engine) + + if (fd >= 0) + { +- if (posix_fallocate (fd, 0, 1) == 0) ++ if (ftruncate(fd, 1) == 0) + { + engine->shm = mmap (NULL, 1, PROT_READ, MAP_SHARED, fd, 0); + +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue May 7 14:32:10 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 07 May 2013 12:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21025] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21025 http://gar.svn.sourceforge.net/gar/?rev=21025&view=rev Author: cgrzemba Date: 2013-05-07 12:32:10 +0000 (Tue, 07 May 2013) Log Message: ----------- qt4-gcc/trunk: add catalogname-too-long override Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-07 12:15:42 UTC (rev 21024) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-07 12:32:10 UTC (rev 21025) @@ -298,6 +298,7 @@ RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibqtdesignercomponents4 = CSWlibqtdesignercomponents4-gxx +CHECKPKG_OVERRIDES_CSWlibqtdesignercomponents4-gxx += catalogname-too-long PACKAGES += CSWlibqtxml4 PKGFILES_CSWlibqtxml4 += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue May 7 15:05:01 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 07 May 2013 13:05:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21026] csw/mgar/pkg/dconf/trunk/Makefile Message-ID: Revision: 21026 http://gar.svn.sourceforge.net/gar/?rev=21026&view=rev Author: slowfranklin Date: 2013-05-07 13:05:00 +0000 (Tue, 07 May 2013) Log Message: ----------- dconf/trunk: Adjust build dep names, remove LINKER_DIRECT, update overrides Modified Paths: -------------- csw/mgar/pkg/dconf/trunk/Makefile Modified: csw/mgar/pkg/dconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/dconf/trunk/Makefile 2013-05-07 12:32:10 UTC (rev 21025) +++ csw/mgar/pkg/dconf/trunk/Makefile 2013-05-07 13:05:00 UTC (rev 21026) @@ -15,9 +15,8 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.bz2 GARCOMPILER = GNU -# g-ir-scanner chokes on linking an uninstalled library if LINKER_DIRECT and -# LINKER_IGNORE aren't reset -LINKER_DIRECT = +# g-ir-scanner chokes on linking an uninstalled library if LINKER_IGNORE isn't reset, +# it invokes gcc directly for linking LINKER_IGNORE = REINPLACE_USRSHARE += editor/dconf-model.c @@ -34,9 +33,9 @@ BUILD_DEP_PKGS += CSWlibdbus-dev BUILD_DEP_PKGS += CSWpkgconfig -BUILD_DEP_PKGS += CSWglib2devel -BUILD_DEP_PKGS += CSWgtk2devel -BUILD_DEP_PKGS_CSWdconf-editor += CSWlibfreetype6-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS_CSWdconf-editor += CSWlibfreetype-dev # as suggested by checkpkg RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibxml2-2 @@ -96,44 +95,22 @@ # all interfaces that go beyong C99, cf man standards.5 CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__" -# see above comment for LINKER_DIRECT and LINKER_IGNORE -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libthread.so.1 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libpangoft2-1.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libpangocairo-1.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libpango-1.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libintl.so.8 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgtk-x11-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgobject-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgmodule-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libglib-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgio-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgdk-x11-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgdk_pixbuf-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libfreetype.so.6 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libfontconfig.so.1 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libdconf.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libcairo.so.2 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libatk-1.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libxml2.so.2 -CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libgcc_s.so.1 -CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libgio-2.0.so.0 -CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libglib-2.0.so.0 -CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libgobject-2.0.so.0 -CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libintl.so.8 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libdconf.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libgio-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libglib-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libgobject-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libintl.so.8 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libgcc_s.so.1 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libgio-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libglib-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libgobject-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libintl.so.8 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libgio-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libglib-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libgobject-2.0.so.0 -CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libintl.so.8 +# see above comment for LINKER_IGNORE +CHECKPKG_OVERRIDES_CSWdconf += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/dconf|but|never|used +CHECKPKG_OVERRIDES_CSWdconf += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/gio/modules/libdconfsettings.so|but|never|used +CHECKPKG_OVERRIDES_CSWdconf += soname-unused|libintl.so.8|is|needed|by|/opt/csw/libexec/dconf-service|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libatk-1.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libcairo.so.2|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libfontconfig.so.1|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libfreetype.so.6|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libgdk-x11-2.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libgdk_pixbuf-2.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libgmodule-2.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libpangocairo-1.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libpangoft2-1.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libthread.so.1|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used +CHECKPKG_OVERRIDES_CSWlibdconf0 += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/libdconf.so.0.0.0|but|never|used include gar/category.mk 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 May 7 15:14:25 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 May 2013 13:14:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21027] csw/mgar/pkg/md5deep/trunk Message-ID: Revision: 21027 http://gar.svn.sourceforge.net/gar/?rev=21027&view=rev Author: dmichelsen Date: 2013-05-07 13:14:24 +0000 (Tue, 07 May 2013) Log Message: ----------- md5deep/trunk: Update to 4.3, add patch Modified Paths: -------------- csw/mgar/pkg/md5deep/trunk/Makefile csw/mgar/pkg/md5deep/trunk/checksums Added Paths: ----------- csw/mgar/pkg/md5deep/trunk/files/0001-Use-MAP_FILE-only-when-available.patch csw/mgar/pkg/md5deep/trunk/files/bootstrap.sh Modified: csw/mgar/pkg/md5deep/trunk/Makefile =================================================================== --- csw/mgar/pkg/md5deep/trunk/Makefile 2013-05-07 13:05:00 UTC (rev 21026) +++ csw/mgar/pkg/md5deep/trunk/Makefile 2013-05-07 13:14:24 UTC (rev 21027) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = md5deep -VERSION = 4.0.0 +VERSION = 4.3 GARTYPE = v2 DESCRIPTION = Compute MD5, SHA-1, SHA-256, Tiger, or Whirlpool message digests @@ -11,11 +11,24 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(DISTNAME).tar.gz +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += bootstrap.sh +# Use patch until pull request has been merged: +# https://github.com/jessek/hashdeep/pull/291 +PATCHFILES += 0001-Use-MAP_FILE-only-when-available.patch + GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 +ISAEXEC = 1 +# We need vasprintf from a newer release than the frozen one +LINKER_MAPS = + include gar/category.mk +pre-configure: + cp $(WORKDIR)/bootstrap.sh $(WORKSRC) + cd $(WORKSRC) && sh bootstrap.sh + @$(MAKECOOKIE) Modified: csw/mgar/pkg/md5deep/trunk/checksums =================================================================== --- csw/mgar/pkg/md5deep/trunk/checksums 2013-05-07 13:05:00 UTC (rev 21026) +++ csw/mgar/pkg/md5deep/trunk/checksums 2013-05-07 13:14:24 UTC (rev 21027) @@ -1 +1 @@ -fc3c0afbcf72861a5a42c699e804d6d4 md5deep-4.0.0.tar.gz +f172e686ca1df83a53308ad90f7f706d md5deep-4.3.tar.gz Added: csw/mgar/pkg/md5deep/trunk/files/0001-Use-MAP_FILE-only-when-available.patch =================================================================== --- csw/mgar/pkg/md5deep/trunk/files/0001-Use-MAP_FILE-only-when-available.patch (rev 0) +++ csw/mgar/pkg/md5deep/trunk/files/0001-Use-MAP_FILE-only-when-available.patch 2013-05-07 13:14:24 UTC (rev 21027) @@ -0,0 +1,44 @@ +From 3413c56c49ab39d78a0aada0b1e603f0f74b4335 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 7 May 2013 14:54:43 +0200 +Subject: [PATCH] Use MAP_FILE only when available + +--- + configure.ac | 3 ++- + src/hash.cpp | 6 +++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c51bd75..f05cbba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -138,7 +138,8 @@ AC_CHECK_HEADERS([libgen.h fcntl.h limits.h inttypes.h malloc.h stdint.h stdlib. + CommonCrypto/CommonDigest.h + ]) + +- ++# Definition of MAP_FILE is missing e.g. on Solaris ++AC_CHECK_DECLS([MAP_FILE]) + + # These functions not available everywhere + AC_CHECK_FUNCS([_gmtime64_s _gmtime64 gmtime_r mmap usleep mkstemp vasprintf getrusage getprogname isxdigit]) +diff --git a/src/hash.cpp b/src/hash.cpp +index c4518cf..4249e24 100644 +--- a/src/hash.cpp ++++ b/src/hash.cpp +@@ -274,7 +274,11 @@ void file_data_hasher_t::hash() + return; + } + #ifdef HAVE_MMAP +- fdht->base = (uint8_t *)mmap(0,fdht->stat_bytes,PROT_READ,MAP_FILE|MAP_SHARED,fd,0); ++ fdht->base = (uint8_t *)mmap(0,fdht->stat_bytes,PROT_READ, ++#if HAVE_DECL_MAP_FILE ++ MAP_FILE| ++#endif ++ MAP_SHARED,fd,0); + if(fdht->base>0){ + /* mmap is successful, so set the bounds. + * if it is not successful, we default to reading the fd +-- +1.8.1.4 + Added: csw/mgar/pkg/md5deep/trunk/files/bootstrap.sh =================================================================== --- csw/mgar/pkg/md5deep/trunk/files/bootstrap.sh (rev 0) +++ csw/mgar/pkg/md5deep/trunk/files/bootstrap.sh 2013-05-07 13:14:24 UTC (rev 21027) @@ -0,0 +1,7 @@ +/bin/rm -rf aclocal.m4 +autoheader -f +touch NEWS README AUTHORS ChangeLog +touch stamp-h +aclocal +autoconf -f +automake --add-missing -c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue May 7 15:15:17 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 07 May 2013 13:15:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21028] csw/mgar/pkg/dconf/trunk/Makefile Message-ID: Revision: 21028 http://gar.svn.sourceforge.net/gar/?rev=21028&view=rev Author: slowfranklin Date: 2013-05-07 13:15:17 +0000 (Tue, 07 May 2013) Log Message: ----------- dconf/trunk: Add more dependencies as suggested by Laurent Blume Modified Paths: -------------- csw/mgar/pkg/dconf/trunk/Makefile Modified: csw/mgar/pkg/dconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/dconf/trunk/Makefile 2013-05-07 13:14:24 UTC (rev 21027) +++ csw/mgar/pkg/dconf/trunk/Makefile 2013-05-07 13:15:17 UTC (rev 21028) @@ -31,11 +31,19 @@ EXTRA_INC += $(prefix)/include/gdk-pixbuf-2.0/ EXTRA_INC += $(prefix)/include/atk-1.0/ +BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibdbus-dev BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibgtk2-dev + +# Add more dependencies as suggested by Laurent Blume BUILD_DEP_PKGS_CSWdconf-editor += CSWlibfreetype-dev +BUILD_DEP_PKGS_CSWdconf-editor += CSWfconfig-dev +BUILD_DEP_PKGS_CSWdconf-editor += CSWlibgtk2-dev +BUILD_DEP_PKGS_CSWdconf-editor += CSWsunx11devel +BUILD_DEP_PKGS_CSWdconf-editor += CSWlibpcre-dev +BUILD_DEP_PKGS_CSWdconf-editor += CSWlibpng-dev # as suggested by checkpkg RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibxml2-2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue May 7 15:19:43 2013 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 7 May 2013 15:19:43 +0200 Subject: [csw-devel] SF.net SVN: gar:[21025] csw/mgar/pkg/qt4-gcc/trunk/Makefile In-Reply-To: References: Message-ID: <6F99050A-3E23-4A6C-94D3-C15DB6C74A13@opencsw.org> Hi Carsten, Am 07.05.2013 um 14:32 schrieb cgrzemba at users.sourceforge.net: > Revision: 21025 > http://gar.svn.sourceforge.net/gar/?rev=21025&view=rev > Author: cgrzemba > Date: 2013-05-07 12:32:10 +0000 (Tue, 07 May 2013) > Log Message: > ----------- > qt4-gcc/trunk: add catalogname-too-long override > > Modified Paths: > -------------- > csw/mgar/pkg/qt4-gcc/trunk/Makefile > > Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-07 12:15:42 UTC (rev 21024) > +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-07 12:32:10 UTC (rev 21025) > @@ -298,6 +298,7 @@ > RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtgui4 > RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibgcc-s1 > OBSOLETED_BY_CSWlibqtdesignercomponents4 = CSWlibqtdesignercomponents4-gxx > +CHECKPKG_OVERRIDES_CSWlibqtdesignercomponents4-gxx += catalogname-too-long Please do not override this error, but shorten the name: http://wiki.opencsw.org/checkpkg-error-tags#toc15 Best regards -- Dago > > PACKAGES += CSWlibqtxml4 > PKGFILES_CSWlibqtxml4 += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*) > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From wahwah at users.sourceforge.net Wed May 8 13:35:49 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 08 May 2013 11:35:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21029] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 21029 http://gar.svn.sourceforge.net/gar/?rev=21029&view=rev Author: wahwah Date: 2013-05-08 11:35:48 +0000 (Wed, 08 May 2013) Log Message: ----------- pkgdb-web: Disable returning full package data When getting data for the whole catalog, it's not feasible to return full package metadata, the amount of data is too large, and the whole thing is too slow. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-07 13:15:17 UTC (rev 21028) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-08 11:35:48 UTC (rev 21029) @@ -303,12 +303,11 @@ sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( osrel_name, arch_name, catrel_name) pkgs = list(models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel)) - user_data = web.input(quick='') - quick = (user_data.quick == "true") if not len(pkgs): raise web.notfound() web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=srv4-list') - pkgs_data = [p.GetRestRepr(quick)[1] for p in pkgs] + # We never want to return complete data for every object (too slow). + pkgs_data = [p.GetRestRepr(quick=True)[1] for p in pkgs] return cjson.encode(pkgs_data) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed May 8 14:14:45 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 08 May 2013 12:14:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[21030] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Message-ID: Revision: 21030 http://gar.svn.sourceforge.net/gar/?rev=21030&view=rev Author: pfelecan Date: 2013-05-08 12:14:44 +0000 (Wed, 08 May 2013) Log Message: ----------- lang-python/pyqt/trunk: verified and validated checkpkg proposed overrides Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-08 11:35:48 UTC (rev 21029) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-08 12:14:44 UTC (rev 21030) @@ -40,13 +40,35 @@ SPKG_DESC_CSWpy-pyqt-common = $(DESCRIPTION), common files ARCHALL_CSWpy-pyqt-common = 1 -PACKAGES += CSWpy-pyqt -CATALOGNAME_CSWpy-pyqt = py_pyqt -SPKG_DESC_CSWpy-pyqt = $(DESCRIPTION) -PKGFILES_CSWpy-pyqt += /opt/csw/bin/pylupdate4 -PKGFILES_CSWpy-pyqt += /opt/csw/bin/pyrcc4 -PKGFILES_CSWpy-pyqt += /opt/csw/lib/python/site-packages/PyQt4/.*[.]so -PKGFILES_CSWpy-pyqt += /opt/csw/plugins/designer/libpythonplugin.so +PACKAGES += CSWpy-pyqt +CATALOGNAME_CSWpy-pyqt = py_pyqt +SPKG_DESC_CSWpy-pyqt = $(DESCRIPTION) +PKGFILES_CSWpy-pyqt += /opt/csw/bin/pylupdate4 +PKGFILES_CSWpy-pyqt += /opt/csw/bin/pyrcc4 +PKGFILES_CSWpy-pyqt += /opt/csw/lib/python/site-packages/PyQt4/.*[.]so +PKGFILES_CSWpy-pyqt += /opt/csw/plugins/designer/libpythonplugin.so +PKGFILES_CSWpy-pyqt += /opt/csw/lib/python/site-packages/dbus/mainloop/qt.so +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibphonon4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdbus4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdeclarative4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdesigner4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqthelp4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtmultimedia4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtnetwork4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtopengl4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtscript4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtscripttools4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtsql4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtsvg4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqttest4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxml4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6 +CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpython include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed May 8 14:45:49 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 08 May 2013 12:45:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21031] csw/mgar/pkg/netatalk/trunk Message-ID: Revision: 21031 http://gar.svn.sourceforge.net/gar/?rev=21031&view=rev Author: slowfranklin Date: 2013-05-08 12:45:48 +0000 (Wed, 08 May 2013) Log Message: ----------- netatalk/trunk: Rename SMF manifest to cswnetatalk and add PRESERVECONF Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove Added Paths: ----------- csw/mgar/pkg/netatalk/trunk/files/0004-Prevent-SMF-manifest-import-on-install.patch Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-08 12:14:44 UTC (rev 21030) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-08 12:45:48 UTC (rev 21031) @@ -45,7 +45,21 @@ PATCHFILES += 0000-Add-rpath-for-bdb.patch PATCHFILES += 0001-Fix-use-of-unnamed-union-inside-struct.patch PATCHFILES += 0003-Fix-misspelled-compiler-variable.patch +PATCHFILES += 0004-Prevent-SMF-manifest-import-on-install.patch +REINPLACEMENTS += manifest1 +REINPLACE_MATCH_manifest1 = network/netatalk +REINPLACE_WITH_manifest1 = network/cswnetatalk +REINPLACE_FILES_manifest1 += netatalk.xml.in + +REINPLACEMENTS += manifest2 +REINPLACE_MATCH_manifest2 = name="netatalk" +REINPLACE_WITH_manifest2 = name="cswnetatalk" +REINPLACE_FILES_manifest2 += netatalk.xml.in + +PRESERVECONF += $(sysconfdir)/afp.conf +PRESERVECONF += $(sysconfdir)/extmap.conf + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --libdir=$(prefix)/lib/netatalk CONFIGURE_ARGS += --with-uams-path=$(prefix)/lib/netatalk @@ -57,8 +71,10 @@ CONFIGURE_ARGS += --with-init-dir=/var/opt/csw/svc/manifest/network/ # Path to XML dtd -CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/netatalk.xml +CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml - include gar/category.mk +post-install-modulated: + mv $(DESTDIR)/var/opt/csw/svc/manifest/network/netatalk.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/cswnetatalk.xml + @$(MAKECOOKIE) Added: csw/mgar/pkg/netatalk/trunk/files/0004-Prevent-SMF-manifest-import-on-install.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0004-Prevent-SMF-manifest-import-on-install.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0004-Prevent-SMF-manifest-import-on-install.patch 2013-05-08 12:45:48 UTC (rev 21031) @@ -0,0 +1,25 @@ +From 4f487a28be731ecd36e30ea2ca3b4039ba69132a Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 8 May 2013 13:59:21 +0200 +Subject: [PATCH] Prevent SMF manifest import on install + +--- + distrib/initscripts/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/distrib/initscripts/Makefile.in b/distrib/initscripts/Makefile.in +index 3ceeba3..e030cc6 100644 +--- a/distrib/initscripts/Makefile.in ++++ b/distrib/initscripts/Makefile.in +@@ -719,7 +719,7 @@ uninstall: uninstall-startup + @USE_NETBSD_TRUE at uninstall-startup: uninstall-am + + @USE_SOLARIS_TRUE at install-data-hook: +- at USE_SOLARIS_TRUE@ svccfg import netatalk.xml ++# @USE_SOLARIS_TRUE@ svccfg import netatalk.xml + + @USE_SOLARIS_TRUE at uninstall-startup: + @USE_SOLARIS_TRUE@ svccfg delete network/netatalk +-- +1.8.1.4 + Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2013-05-08 12:14:44 UTC (rev 21030) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2013-05-08 12:45:48 UTC (rev 21031) @@ -1,2 +1,2 @@ #!/bin/sh -chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/netatalk.xml > /dev/null 2>&1 +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk.xml > /dev/null 2>&1 Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2013-05-08 12:14:44 UTC (rev 21030) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2013-05-08 12:45:48 UTC (rev 21031) @@ -1,2 +1,2 @@ #!/bin/sh -chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f netatalk +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk 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 May 8 23:17:27 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 08 May 2013 21:17:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21032] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 21032 http://gar.svn.sourceforge.net/gar/?rev=21032&view=rev Author: lblume Date: 2013-05-08 21:17:23 +0000 (Wed, 08 May 2013) Log Message: ----------- glib2/trunk: glib had a different idea of inline on x86 and sparc, new CFLAGS fixes that Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-08 12:45:48 UTC (rev 21031) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-08 21:17:23 UTC (rev 21032) @@ -286,7 +286,8 @@ LD_OPTIONS = EXTRA_LINKER_FLAGS = -EXTRA_CFLAGS = -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 +# -xO4 is necessary on sparc so that function inlining happens as expected +EXTRA_CFLAGS = -xO4 -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 EXTRA_LDFLAGS = -lsocket $(RUNPATH_LINKER_FLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu May 9 02:10:18 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 09 May 2013 00:10:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[21033] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: Revision: 21033 http://gar.svn.sourceforge.net/gar/?rev=21033&view=rev Author: wahwah Date: 2013-05-09 00:10:15 +0000 (Thu, 09 May 2013) Log Message: ----------- opencsw-manual: Documentation updates. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2013-05-08 21:17:23 UTC (rev 21032) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2013-05-09 00:10:15 UTC (rev 21033) @@ -12,13 +12,18 @@ quickly and with low bandwidth use and also preserves hardlinks. Not all mirrors provide access via the ``rsync`` protocol, please consult `our list of mirrors`_. -To make a full copy of the OpenCSW repository:: - MIRROR_DIR=/export/mirror/opencsw +To make a full copy of the OpenCSW repository, first make sure you have rsync +on your system:: + sudo pkgutil -y -i rsync - sudo mkdir -p "${MIRROR_DIR}" - sudo rsync -aH --delete rsync://rsync.opencsw.org/opencsw/ "${MIRROR_DIR}" +Then copy the files:: + + sudo mkdir -p /export/mirror/opencsw + sudo chown $LOGNAME /export/mirror/opencsw + rsync -aH --delete rsync://rsync.opencsw.org/opencsw/ /export/mirror/opencsw + The directory ``opencsw-mirror`` can either be shared via HTTP or via NFS to the ``pkgutil`` clients. Use ``http://myserver/opencsw-mirror/`` for HTTP and ``file:///myserver/opencsw-mirror`` for NFS as mirror option in ``pkgutil``. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-05-08 21:17:23 UTC (rev 21032) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-05-09 00:10:15 UTC (rev 21033) @@ -4,9 +4,6 @@ .. highlight:: text -Introduction ------------- - Packages released by OpenCSW must be built on the OpenCSW buildfarm, but if you want to experiment, or build in-house packages, you might want to set up your own build farm, or at least a build host. Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst 2013-05-08 21:17:23 UTC (rev 21032) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/package-naming.rst 2013-05-09 00:10:15 UTC (rev 21033) @@ -4,11 +4,11 @@ .. highlight:: text -We are paying attention to package naming, so we can maintain consistency across -the catalog. For example, we have special rules about how to name packages with -shared libraries, or development packages. In general, we often find ourselves -following Debian, so if you're in doubt, consulting the Debian package -repository is a good idea. +We are paying attention to package naming, so we can maintain consistency +across the catalog. For example, we have special rules about how to name +packages with shared libraries and development packages. In general, we often +find ourselves following Debian, so if you're in doubt, consulting the Debian +package repository is a good idea. pkgname vs catalogname ---------------------- @@ -17,16 +17,16 @@ packaging system. These package names start with the company ticker (e.g. SUNW). OpenCSW package start with ?CSW?. -Catalognames on the other hand, are names used in the catalog index. This means -that one package has two names, for example ?CSWfoo? (pkgname) and ?foo? +Catalognames are names used in the catalog index. This means that one package +has two names, for example ?CSWfoo? (pkgname) and ?foo? (catalogname). Applications and named projects ------------------------------- -Use the project name, keep it short and simple. If the name consists of many -words, separate words. Use dashes to separate words in the pkgname (CSWfoo-bar) -and underscores in the catalogname (foo_bar). +Use the upstream project name, keep it short and simple. If the name consists +of many words, use word separators. Dashes are used to separate words in the +pkgname (CSWfoo-bar) and underscores in the catalogname (foo\_bar). Shared libraries ---------------- @@ -45,3 +45,6 @@ ------------------ Prepend packages with pm\_, py\_ and rb\_, respectively. + +.. _shared libraries: + shared-libraries.html 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 May 9 21:10:52 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 09 May 2013 19:10:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21034] csw/mgar/pkg/samba/branches/samba3 Message-ID: Revision: 21034 http://gar.svn.sourceforge.net/gar/?rev=21034&view=rev Author: lblume Date: 2013-05-09 19:10:51 +0000 (Thu, 09 May 2013) Log Message: ----------- samba/branches/samba3: Bump to 3.6.14, minor recipe cleanuo Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile csw/mgar/pkg/samba/branches/samba3/checksums Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-05-09 00:10:15 UTC (rev 21033) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-05-09 19:10:51 UTC (rev 21034) @@ -2,7 +2,7 @@ # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time NAME = samba -VERSION = 3.6.13 +VERSION = 3.6.14 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -28,6 +28,9 @@ # Split libs and packages BUILD_DEP_PKGS += CSWlibtalloc-dev +BUILD_DEP_PKGS += CSWopenldap-dev +BUILD_DEP_PKGS += CSWlibkrb5-dev + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES += CSWsamba @@ -49,16 +52,6 @@ RUNTIME_DEP_PKGS_CSWsamba += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibwbclient0 -# Just docs override for now -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/lmhosts.5 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/smb.conf.5 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/nmbd.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smbd.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tdbbackup.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/idmap_tdb2.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/net.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/swat.8 - # Make one unified package for now OBSOLETED_BY_CSWsamba += CSWsambacommon CATALOGNAME_CSWsambacommon = samba_common_stub @@ -87,9 +80,6 @@ OBSOLETED_BY_CSWsamba-client += CSWsambaclient CATALOGNAME_CSWsambaclient = samba_client_stub -# Just docs, override for now -CHECKPKG_OVERRIDES_CSWsamba-client += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/smbclient.1 - #PACKAGES += CSWsambacommon SPKG_DESC_CSWsambacommon = Shared support files for samba RUNTIME_DEP_PKGS_CSWsambacommon += CSWsasl @@ -273,8 +263,6 @@ OBSOLETED_BY_CSWsamba-winbind += CSWsambawb CATALOGNAME_CSWsambawb = samba_wb_stub -# Just docs, override for now -CHECKPKG_OVERRIDES_CSWsamba-winbind += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/winbindd.8 CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWlibnss-winbind1 EXTRA_CFLAGS = -lintl Modified: csw/mgar/pkg/samba/branches/samba3/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba3/checksums 2013-05-09 00:10:15 UTC (rev 21033) +++ csw/mgar/pkg/samba/branches/samba3/checksums 2013-05-09 19:10:51 UTC (rev 21034) @@ -1 +1 @@ -b9fe8413cbb6fa4b970a159968db2fb4 samba-3.6.13.tar.gz +ce9bf35ac2a63029ef0bd02291f113df samba-3.6.14.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 May 9 22:19:52 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 May 2013 20:19:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21035] csw/mgar/pkg/md5deep/trunk/Makefile Message-ID: Revision: 21035 http://gar.svn.sourceforge.net/gar/?rev=21035&view=rev Author: dmichelsen Date: 2013-05-09 20:19:51 +0000 (Thu, 09 May 2013) Log Message: ----------- md5deep/trunk: Skip testsuite, add package data Modified Paths: -------------- csw/mgar/pkg/md5deep/trunk/Makefile Modified: csw/mgar/pkg/md5deep/trunk/Makefile =================================================================== --- csw/mgar/pkg/md5deep/trunk/Makefile 2013-05-09 19:10:51 UTC (rev 21034) +++ csw/mgar/pkg/md5deep/trunk/Makefile 2013-05-09 20:19:51 UTC (rev 21035) @@ -18,6 +18,14 @@ # https://github.com/jessek/hashdeep/pull/291 PATCHFILES += 0001-Use-MAP_FILE-only-when-available.patch +PACKAGES += CSWmd5deep +SPKG_DESC_CSWmd5deep = Compute MD5, SHA-1, SHA-256, Tiger, or Whirlpool message digests +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWmd5deep += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWmd5deep += CSWlibstdc++6 +# Yes, we need vasprintf from 1.22.7 +CHECKPKG_OVERRIDES_CSWmd5deep += forbidden-version-interface-dependencies + GARCOMPILER = GNU BUILD64 = 1 @@ -26,6 +34,9 @@ # We need vasprintf from a newer release than the frozen one LINKER_MAPS = +# The testsuite seems broken, skip for now +SKIPTEST ?= 1 + include gar/category.mk pre-configure: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri May 10 01:41:21 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 09 May 2013 23:41:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21036] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: Revision: 21036 http://gar.svn.sourceforge.net/gar/?rev=21036&view=rev Author: wahwah Date: 2013-05-09 23:41:21 +0000 (Thu, 09 May 2013) Log Message: ----------- releases-web: Return a message after adding a pkg Just so that the client has some information back other than the HTTP status code. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-09 20:19:51 UTC (rev 21035) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2013-05-09 23:41:21 UTC (rev 21036) @@ -243,6 +243,12 @@ srv4_to_remove = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() c = checkpkg_lib.Catalog() c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name) + msg = ('Package %s / %s removed successfully' + % (srv4_to_remove.basename, md5_sum)) + response = cjson.encode({'message': msg}) + web.header('Content-Length', len(response)) + return response + except ( sqlobject.main.SQLObjectNotFound, sqlobject.dberrors.OperationalError), e: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri May 10 10:33:11 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 10 May 2013 08:33:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21037] csw/mgar/pkg/gdb/trunk Message-ID: Revision: 21037 http://gar.svn.sourceforge.net/gar/?rev=21037&view=rev Author: pfelecan Date: 2013-05-10 08:33:08 +0000 (Fri, 10 May 2013) Log Message: ----------- gdb/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile csw/mgar/pkg/gdb/trunk/checksums Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2013-05-09 23:41:21 UTC (rev 21036) +++ csw/mgar/pkg/gdb/trunk/Makefile 2013-05-10 08:33:08 UTC (rev 21037) @@ -1,7 +1,7 @@ # $Id$ NAME = gdb -VERSION = 7.5.1 +VERSION = 7.6 GARTYPE = v2 DESCRIPTION = The GNU Debugger @@ -133,6 +133,7 @@ EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/sv/LC_MESSAGES/opcodes.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/tr/LC_MESSAGES/bfd.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/uk/LC_MESSAGES/bfd.mo +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/uk/LC_MESSAGES/opcodes.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/tr/LC_MESSAGES/opcodes.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/vi/LC_MESSAGES/bfd.mo EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/locale/vi/LC_MESSAGES/opcodes.mo Modified: csw/mgar/pkg/gdb/trunk/checksums =================================================================== --- csw/mgar/pkg/gdb/trunk/checksums 2013-05-09 23:41:21 UTC (rev 21036) +++ csw/mgar/pkg/gdb/trunk/checksums 2013-05-10 08:33:08 UTC (rev 21037) @@ -1 +1 @@ -b1519bf899890d21d4774845a6e602fe gdb-7.5.1.tar.gz +a9836707337e5f7bf76a009a8904f470 gdb-7.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri May 10 11:53:06 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 10 May 2013 09:53:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21038] csw/mgar/pkg/gdb/trunk/Makefile Message-ID: Revision: 21038 http://gar.svn.sourceforge.net/gar/?rev=21038&view=rev Author: pfelecan Date: 2013-05-10 09:53:05 +0000 (Fri, 10 May 2013) Log Message: ----------- gdb/trunk: added new run-time dependency Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2013-05-10 08:33:08 UTC (rev 21037) +++ csw/mgar/pkg/gdb/trunk/Makefile 2013-05-10 09:53:05 UTC (rev 21038) @@ -80,6 +80,7 @@ RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS += CSWlibreadline6 RUNTIME_DEP_PKGS += CSWlibz1 +RUNTIME_DEP_PKGS += CSWliblzma5 # this should be declared only for the 32 bit ISAs but I doubt that # checkpkg can deal with this subtility 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 May 10 12:24:11 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 10 May 2013 10:24:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21039] csw/mgar/pkg/gnutls3/trunk Message-ID: Revision: 21039 http://gar.svn.sourceforge.net/gar/?rev=21039&view=rev Author: dmichelsen Date: 2013-05-10 10:24:08 +0000 (Fri, 10 May 2013) Log Message: ----------- gnutls3/trunk: Fixes Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile csw/mgar/pkg/gnutls3/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnutls3/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-10 09:53:05 UTC (rev 21038) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-10 10:24:08 UTC (rev 21039) @@ -1,5 +1,5 @@ NAME = gnutls -VERSION = 3.1.3 +VERSION = 3.1.10 DESCRIPTION = GNU Transport Layer Security libraries and tools define BLURB @@ -8,12 +8,17 @@ library implements the proposed standards by the IETF's TLS working group. endef -MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(DISTNAME).tar.xz +SUBV = $(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}') +MASTER_SITES = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(SUBV)/ +DISTFILES += $(DISTNAME).tar.xz # PATCHFILES += 0001-Do-not-strip-norunpath.patch +#PATCHFILES += 0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch -VENDOR_URL = http://www.gnu.org/software/gnutls/ +# Sun Studio 12 bails out on .deinit_func +GARCOMPILER = GCC4 +VENDOR_URL = http://gnutls.org + BUILD_DEP_PKGS += CSWlibnettle-dev BUILD_DEP_PKGS += CSWlibreadline-dev BUILD_DEP_PKGS += CSWlibtasn1-dev @@ -55,7 +60,7 @@ CATALOGNAME_CSWgnutlsdevel = gnutls_devel_stub # We don't need it and if defined the test breaks -LD_OPTIONS = +#LD_OPTIONS = # EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64 Modified: csw/mgar/pkg/gnutls3/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls3/trunk/checksums 2013-05-10 09:53:05 UTC (rev 21038) +++ csw/mgar/pkg/gnutls3/trunk/checksums 2013-05-10 10:24:08 UTC (rev 21039) @@ -1 +1 @@ -8a7b47456f65ffa8c01c58461fed1388 gnutls-3.1.3.tar.xz +9e73aa5c3ef3b7358159a31302e25aa7 gnutls-3.1.10.tar.xz Added: csw/mgar/pkg/gnutls3/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch =================================================================== --- csw/mgar/pkg/gnutls3/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/gnutls3/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch 2013-05-10 10:24:08 UTC (rev 21039) @@ -0,0 +1,25 @@ +From 729ae391eba80bedae241d76541fcc2c93563a29 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 10 Nov 2012 16:57:30 +0100 +Subject: [PATCH] Use AF_UNIX instead of AF_LOCAL on Solaris + +--- + tests/srp/mini-srp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/srp/mini-srp.c b/tests/srp/mini-srp.c +index a1db3f5..0d2c8a6 100644 +--- a/tests/srp/mini-srp.c ++++ b/tests/srp/mini-srp.c +@@ -282,7 +282,7 @@ static void start (const char* prio) + int fd[2]; + int ret; + +- ret = socketpair(AF_LOCAL, SOCK_STREAM, 0, fd); ++ ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd); + if (ret < 0) + { + perror("socketpair"); +-- +1.8.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri May 10 14:25:26 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 10 May 2013 12:25:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21040] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Message-ID: Revision: 21040 http://gar.svn.sourceforge.net/gar/?rev=21040&view=rev Author: pfelecan Date: 2013-05-10 12:25:26 +0000 (Fri, 10 May 2013) Log Message: ----------- lang-python/pyqt/trunk: strange dynamic shared object and stranger override Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 10:24:08 UTC (rev 21039) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 12:25:26 UTC (rev 21040) @@ -69,6 +69,7 @@ RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxml4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6 CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri May 10 14:49:58 2013 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Fri, 10 May 2013 13:49:58 +0100 Subject: [csw-devel] SF.net SVN: gar:[21040] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile In-Reply-To: References: Message-ID: <20130510124958.GA30615@cotton.home.blizinski.pl> On Fri, May 10, 2013 at 12:25:26PM +0000, pfelecan at users.sourceforge.net wrote: > Revision: 21040 > http://gar.svn.sourceforge.net/gar/?rev=21040&view=rev > Author: pfelecan > Date: 2013-05-10 12:25:26 +0000 (Fri, 10 May 2013) > Log Message: > ----------- > lang-python/pyqt/trunk: strange dynamic shared object and stranger override > > Modified Paths: > -------------- > csw/mgar/pkg/lang-python/pyqt/trunk/Makefile > > Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 10:24:08 UTC (rev 21039) > +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 12:25:26 UTC (rev 21040) > @@ -69,6 +69,7 @@ > RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxml4 > RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6 > CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpython > +CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ The /opt/csw/plugins/designer/libpythonplugin.so path looks wrong to me. What is /opt/csw/plugins? It's not a base path for anything sensible. If there are some plugins for something, the have to go into a project-specific directory. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From wilbury at opencsw.org Fri May 10 14:51:36 2013 From: wilbury at opencsw.org (Juraj Lutter) Date: Fri, 10 May 2013 14:51:36 +0200 Subject: [csw-devel] SF.net SVN: gar:[21040] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile In-Reply-To: <20130510124958.GA30615@cotton.home.blizinski.pl> References: <20130510124958.GA30615@cotton.home.blizinski.pl> Message-ID: <518CED58.8050409@opencsw.org> On 05/10/2013 02:49 PM, Maciej Blizi?ski wrote: > The /opt/csw/plugins/designer/libpythonplugin.so path looks wrong to me. > What is /opt/csw/plugins? It's not a base path for anything sensible. If > there are some plugins for something, the have to go into > a project-specific directory. Yep, lib/$(projname) or libexec/$(projname) would be more appropriate. -- Juraj Lutter From pfelecan at users.sourceforge.net Fri May 10 15:16:55 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 10 May 2013 13:16:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[21041] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Message-ID: Revision: 21041 http://gar.svn.sourceforge.net/gar/?rev=21041&view=rev Author: pfelecan Date: 2013-05-10 13:16:49 +0000 (Fri, 10 May 2013) Log Message: ----------- lang-python/pyqt/trunk: platform specific compile flags non propagation considered inoffensive Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 12:25:26 UTC (rev 21040) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 13:16:49 UTC (rev 21041) @@ -70,6 +70,7 @@ RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6 CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=3|arch_name=i386 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Fri May 10 19:48:22 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Fri, 10 May 2013 19:48:22 +0200 Subject: [csw-devel] SF.net SVN: gar:[21040] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile In-Reply-To: <20130510124958.GA30615@cotton.home.blizinski.pl> ("Maciej =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Fri, 10 May 2013 13:49:58 +0100") References: <20130510124958.GA30615@cotton.home.blizinski.pl> Message-ID: Maciej Blizi?ski writes: > On Fri, May 10, 2013 at 12:25:26PM +0000, pfelecan at users.sourceforge.net wrote: >> Revision: 21040 >> http://gar.svn.sourceforge.net/gar/?rev=21040&view=rev >> Author: pfelecan >> Date: 2013-05-10 12:25:26 +0000 (Fri, 10 May 2013) >> Log Message: >> ----------- >> lang-python/pyqt/trunk: strange dynamic shared object and stranger override >> >> Modified Paths: >> -------------- >> csw/mgar/pkg/lang-python/pyqt/trunk/Makefile >> >> Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile >> =================================================================== >> --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 10:24:08 UTC (rev 21039) >> +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 12:25:26 UTC (rev 21040) >> @@ -69,6 +69,7 @@ >> RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxml4 >> RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6 >> CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpython >> +CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ > > The /opt/csw/plugins/designer/libpythonplugin.so path looks wrong to me. > What is /opt/csw/plugins? It's not a base path for anything sensible. If > there are some plugins for something, the have to go into > a project-specific directory. Right. I wondered a long time about this, even asked for help on the maintainers list, and didn't find a reasonable explanation even though now it is crystal clear... However, the explanation that I found at http://wiki.opencsw.org/checkpkg-error-tags#toc10 is a little bit misleading, isn't it? "binary-architecture-does-not-match-placement On the sparc architecture, binaries in /opt/csw/bin need to be at most a sparcv8 binary on Solaris 9 and at most a sparcv8+ binary on Solaris 10. A sparcv9 binary must be placed under a subdirectory, e.g. /opt/csw/bin/sparcv9. A typical failure mode happens when CFLAGS from GAR are ignored by the build system, which causes Solaris Studio to produce sparcv8+ binaries, instead of sparcv8. Recommended fix: Make sure that CFLAGS are propagated properly. When to override: Do not override. When in doubt, ask on the maintainers mailing list." Now that I got the real meaning, I will correct this installation issue in the very near future. -- Peter From wahwah at users.sourceforge.net Fri May 10 20:14:43 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 10 May 2013 18:14:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21042] csw/mgar/pkg/sbcl/trunk/Makefile Message-ID: Revision: 21042 http://gar.svn.sourceforge.net/gar/?rev=21042&view=rev Author: wahwah Date: 2013-05-10 18:14:42 +0000 (Fri, 10 May 2013) Log Message: ----------- sbcl/trunk: downgrade to 1.0.23 because it builds Modified Paths: -------------- csw/mgar/pkg/sbcl/trunk/Makefile Modified: csw/mgar/pkg/sbcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sbcl/trunk/Makefile 2013-05-10 13:16:49 UTC (rev 21041) +++ csw/mgar/pkg/sbcl/trunk/Makefile 2013-05-10 18:14:42 UTC (rev 21042) @@ -4,6 +4,7 @@ NAME = sbcl VERSION = 1.0.23 +# VERSION = 1.1.7 GARTYPE = v2 DESCRIPTION = High performance Common Lisp compiler define BLURB @@ -13,21 +14,30 @@ interactive environment including a debugger, a statistical profiler, a code coverage tool, and many other extensions. endef -VENDOR_URL = +VENDOR_URL = http://www.sbcl.org/ MASTER_SITES = $(SF_MIRRORS) -CHECKPKG_OVERRIDES_CSWsbcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/sbcl.1 -CHECKPKG_OVERRIDES_CSWsbcl += file-with-bad-content|/usr/local|root/opt/csw/bin/sbcl DISTFILES = $(NAME)-$(VERSION)-source.tar.bz2 +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc CONFIGURE_SCRIPTS = BUILD_SCRIPTS = sbcl INSTALL_SCRIPTS = sbcl TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +CHECKPKG_OVERRIDES_CSWsbcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/sbcl.1 +CHECKPKG_OVERRIDES_CSWsbcl += file-with-bad-content|/usr/local|root/opt/csw/bin/sbcl + +NOGITPATCH = 1 + +GARCOMPILER = GNU + include gar/category.mk build-sbcl: - (cd $(WORKSRC) && INSTALL_ROOT=$(DESTDIR)$(prefix) /opt/csw/bin/bash make.sh) + (cd $(WORKSRC) && env -i INSTALL_ROOT=$(DESTDIR)$(prefix) $(BUILD_ENV) /opt/csw/bin/bash make.sh) install-sbcl: - (cd $(WORKSRC) && INSTALL_ROOT=$(DESTDIR)$(prefix) /opt/csw/bin/bash install.sh) + (cd $(WORKSRC) && env -i INSTALL_ROOT=$(DESTDIR)$(prefix) $(INSTALL_ENV) /opt/csw/bin/bash install.sh) @$(MAKECOOKIE) + +PATH := /usr/xpg4/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Sat May 11 10:22:25 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Sat, 11 May 2013 10:22:25 +0200 Subject: [csw-devel] SF.net SVN: gar:[21040] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile In-Reply-To: (Peter FELECAN's message of "Fri, 10 May 2013 19:48:22 +0200") References: <20130510124958.GA30615@cotton.home.blizinski.pl> Message-ID: Peter FELECAN writes: > Maciej Blizi?ski writes: > >> On Fri, May 10, 2013 at 12:25:26PM +0000, pfelecan at users.sourceforge.net wrote: >>> Revision: 21040 >>> http://gar.svn.sourceforge.net/gar/?rev=21040&view=rev >>> Author: pfelecan >>> Date: 2013-05-10 12:25:26 +0000 (Fri, 10 May 2013) >>> Log Message: >>> ----------- >>> lang-python/pyqt/trunk: strange dynamic shared object and stranger override >>> >>> Modified Paths: >>> -------------- >>> csw/mgar/pkg/lang-python/pyqt/trunk/Makefile >>> >>> Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile >>> =================================================================== >>> --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 10:24:08 UTC (rev 21039) >>> +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-10 12:25:26 UTC (rev 21040) >>> @@ -69,6 +69,7 @@ >>> RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxml4 >>> RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6 >>> CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpython >>> +CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ >> >> The /opt/csw/plugins/designer/libpythonplugin.so path looks wrong to me. >> What is /opt/csw/plugins? It's not a base path for anything sensible. If >> there are some plugins for something, the have to go into >> a project-specific directory. > > Right. I wondered a long time about this, even asked for help on the > maintainers list, and didn't find a reasonable explanation even though > now it is crystal clear... > > However, the explanation that I found at > http://wiki.opencsw.org/checkpkg-error-tags#toc10 is a little bit > misleading, isn't it? > > "binary-architecture-does-not-match-placement > > On the sparc architecture, binaries in /opt/csw/bin need to be at most a > sparcv8 binary on Solaris 9 and at most a sparcv8+ binary on Solaris > 10. A sparcv9 binary must be placed under a subdirectory, > e.g. /opt/csw/bin/sparcv9. > > A typical failure mode happens when CFLAGS from GAR are ignored by the > build system, which causes Solaris Studio to produce sparcv8+ binaries, > instead of sparcv8. > > Recommended fix: Make sure that CFLAGS are propagated properly. > When to override: Do not override. When in doubt, ask on the maintainers > mailing list." > > Now that I got the real meaning, I will correct this installation issue > in the very near future. After analyzing this issue, I will not correct, for the moment, the recipe because the root cause is in our Qt packages. Have a look at the corresponding prototypes, especially qt4_dev and you'll see that there are many directories rooted directly in /opt/csw, among them, the "plugins" directory. As my project uses the qmake system, it inherits a lot of parameters from qt4_dev. Consequently, the Qt packages recipe must be corrected and I propose to look carefully how Debian roots the corresponding components and adapt them to our file system standard. I'm filling a bug report to request these modifications. -- Peter From maciej at opencsw.org Sat May 11 10:54:12 2013 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sat, 11 May 2013 09:54:12 +0100 Subject: [csw-devel] SF.net SVN: gar:[21040] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile In-Reply-To: References: <20130510124958.GA30615@cotton.home.blizinski.pl> Message-ID: <20130511085412.GA25371@cotton.home.blizinski.pl> On Fri, May 10, 2013 at 07:48:22PM +0200, Peter FELECAN wrote: > Right. I wondered a long time about this, even asked for help on the > maintainers list, and didn't find a reasonable explanation even though > now it is crystal clear... > > However, the explanation that I found at > http://wiki.opencsw.org/checkpkg-error-tags#toc10 is a little bit > misleading, isn't it? > > "binary-architecture-does-not-match-placement > > On the sparc architecture, binaries in /opt/csw/bin need to be at most a > sparcv8 binary on Solaris 9 and at most a sparcv8+ binary on Solaris > 10. A sparcv9 binary must be placed under a subdirectory, > e.g. /opt/csw/bin/sparcv9. > > A typical failure mode happens when CFLAGS from GAR are ignored by the > build system, which causes Solaris Studio to produce sparcv8+ binaries, > instead of sparcv8. > > Recommended fix: Make sure that CFLAGS are propagated properly. > When to override: Do not override. When in doubt, ask on the maintainers > mailing list." Yes, this check was written to catch something entirely different. By coincidence, the binary in question was a binary for which we check if it is in the right subdirectory. Otherwise the check wouldn't have fired. So it was a coincidence, what we're concerned about here is not what the check was actually looking at. We don't currently have filesystem layout checks in place. If we had, this kind of check would fire too. Checks need some sort of algorithmic formula. We would need to define what are good paths for files. For example, good paths would be: /opt/csw/bin/foo /opt/csw/bin/sparcv9/foo /opt/csw/libexec/projname/bar /opt/csw/projname/share/doc/README /opt/csw/lib/projname/bar Bad paths: /usr/bin/foo /opt/csw/bin/wibble/baz /opt/csw/wibble/baz /opt/csw/projname/wibble/baz Debatable: /opt/csw/projname/lib/libfoo.so.1 (Because shared libraries usually don't need to be isolated thanks to the soname mechanism.) Should we implement a check like that? Maciej -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From pfelecan at opencsw.org Sat May 11 11:38:09 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Sat, 11 May 2013 11:38:09 +0200 Subject: [csw-devel] SF.net SVN: gar:[21040] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile In-Reply-To: <20130511085412.GA25371@cotton.home.blizinski.pl> ("Maciej =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Sat, 11 May 2013 09:54:12 +0100") References: <20130510124958.GA30615@cotton.home.blizinski.pl> <20130511085412.GA25371@cotton.home.blizinski.pl> Message-ID: Maciej Blizi?ski writes: > We don't currently have filesystem layout checks in place. If we had, > this kind of check would fire too. > > Checks need some sort of algorithmic formula. We would need to define > what are good paths for files. For example, good paths would be: > > /opt/csw/bin/foo > /opt/csw/bin/sparcv9/foo > /opt/csw/libexec/projname/bar > /opt/csw/projname/share/doc/README > /opt/csw/lib/projname/bar > > Bad paths: > > /usr/bin/foo > /opt/csw/bin/wibble/baz > /opt/csw/wibble/baz > /opt/csw/projname/wibble/baz > > Debatable: > > /opt/csw/projname/lib/libfoo.so.1 > > (Because shared libraries usually don't need to be isolated thanks to > the soname mechanism.) > > Should we implement a check like that? Yes. Look at what happens with the Qt packages. The current mess is coming from having moved the tree from a "good" root, "/opt/csw/gxx", to the "true" root "/opt/csw". In my oppinion, we should catch everything outside a known/correct set of directories at leas at the first level and maybe at other levels too. I agree that there is no Turing machine for that, using some heuristics can be feed to one... Here is an initial set, the 1st level: apache2 bdb33 bdb4 bdb42 bdb44 bdb47 bdb48 bin doc etc gcc4 gnu i386-pc-solaris2.10 include info lib libexec link man mkspecs php5 sbin share ssl var X11 Loogin at this set, collected from one of my private servers, makes me wonder about the high number and strange vriety of directories at this level: apache2?, bbdbxxx??, gcc4?, php5?, ssl? Wow! Compare this to a Debian root: bin boot dev etc home lib lib64 lost+found media mnt opt proc root run sbin selinux srv sys tmp usr var Cleaner, isn't it? -- Peter From lblume at users.sourceforge.net Sun May 12 09:46:08 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 12 May 2013 07:46:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[21043] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 21043 http://gar.svn.sourceforge.net/gar/?rev=21043&view=rev Author: lblume Date: 2013-05-12 07:46:02 +0000 (Sun, 12 May 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Bump to 5.5.31, some minor recipe cleanup Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-10 18:14:42 UTC (rev 21042) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-12 07:46:02 UTC (rev 21043) @@ -13,7 +13,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 30 +PATCHLEVEL = 31 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) @@ -79,8 +79,6 @@ PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql -CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 -CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 PATCHFILES += 0003-I-HATE-CMAKE.patch PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch @@ -135,9 +133,12 @@ # It's intentional. There's a sparcv8-incompatible assembler code there, so we # must build for sparcv8+ on Solaris 9. -CHECKPKG_OVERRIDES_CSW$(NAME)client += binary-architecture-does-not-match-placement -CHECKPKG_OVERRIDES_CSW$(NAME) += binary-architecture-does-not-match-placement -CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement +ifeq ($(shell /usr/bin/uname -pr),5.9 sparc) + CHECKPKG_OVERRIDES_CSW$(NAME)client += binary-architecture-does-not-match-placement + CHECKPKG_OVERRIDES_CSW$(NAME) += binary-architecture-does-not-match-placement + CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement +endif + CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += bad-rpath-entry PACKAGES += CSW$(NAME) @@ -158,7 +159,7 @@ # An example: # s9_preload.so.1|is|needed|by|/opt/csw/bin/innochecksum|but|never|used -CHECKPKG_OVERRIDES_CSW$(NAME) += soname-unused +#CHECKPKG_OVERRIDES_CSW$(NAME) += soname-unused EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* @@ -264,7 +265,6 @@ CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) -CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess.1 # This could be reviewed. CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2013-05-10 18:14:42 UTC (rev 21042) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2013-05-12 07:46:02 UTC (rev 21043) @@ -1 +1 @@ -f0cdd56f89e781e800cf223bd9edd00c mysql-5.5.30.tar.gz +bf402cbd52a9af33e5c25b2a4bbc56db mysql-5.5.31.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 12:51:04 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 10:51:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[21044] csw/mgar/pkg/cpan/Class-Adapter/trunk Message-ID: Revision: 21044 http://gar.svn.sourceforge.net/gar/?rev=21044&view=rev Author: bonivart Date: 2013-05-12 10:50:57 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Class-Adapter/trunk: update to 1.08, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Class-Adapter/trunk/Makefile csw/mgar/pkg/cpan/Class-Adapter/trunk/checksums Modified: csw/mgar/pkg/cpan/Class-Adapter/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Adapter/trunk/Makefile 2013-05-12 07:46:02 UTC (rev 21043) +++ csw/mgar/pkg/cpan/Class-Adapter/trunk/Makefile 2013-05-12 10:50:57 UTC (rev 21044) @@ -1,16 +1,19 @@ NAME = Class-Adapter -VERSION = 1.07 +VERSION = 1.08 CATEGORIES = cpan GARTYPE = v2 AUTHOR = ADAMK DESCRIPTION = Perl implementation of the "Adapter" Design Pattern define BLURB - Perl implementation of the "Adapter" Design Pattern endef -PACKAGES = CSWpmclassadapter -CATALOGNAME = pm_classadapter +PACKAGES = CSWpm-class-adapter +CATALOGNAME = pm_class_adapter +SPKG_DESC_CSWpm-class-adapter = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-class-adapter = CSWpmclassadapter +CATALOGNAME_CSWpmclassadapter = pm_classadapter + ARCHALL = 1 LICENSE = LICENSE Modified: csw/mgar/pkg/cpan/Class-Adapter/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Adapter/trunk/checksums 2013-05-12 07:46:02 UTC (rev 21043) +++ csw/mgar/pkg/cpan/Class-Adapter/trunk/checksums 2013-05-12 10:50:57 UTC (rev 21044) @@ -1 +1 @@ -299c95b0eadcd3b5b11c646f642c1c8c Class-Adapter-1.07.tar.gz +4a1dbb281eac71f666d2eeccf4cc8b99 Class-Adapter-1.08.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 Sun May 12 12:51:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 12 May 2013 10:51:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21045] csw/mgar/pkg/lang-python/python-markdown/trunk Message-ID: Revision: 21045 http://gar.svn.sourceforge.net/gar/?rev=21045&view=rev Author: wahwah Date: 2013-05-12 10:51:40 +0000 (Sun, 12 May 2013) Log Message: ----------- lang-python/python-markdown/trunk: version bump to 2.3.1 Modified Paths: -------------- csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile csw/mgar/pkg/lang-python/python-markdown/trunk/checksums Modified: csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile 2013-05-12 10:50:57 UTC (rev 21044) +++ csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile 2013-05-12 10:51:40 UTC (rev 21045) @@ -3,14 +3,14 @@ # $Id$ NAME = Markdown -VERSION = 2.1.1 +VERSION = 2.3.1 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Python implementation of Markdown -define BLURB -endef +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc + MASTER_SITES = $(PYPI_MIRROR) DISTFILES = $(DISTNAME).tar.gz Modified: csw/mgar/pkg/lang-python/python-markdown/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-markdown/trunk/checksums 2013-05-12 10:50:57 UTC (rev 21044) +++ csw/mgar/pkg/lang-python/python-markdown/trunk/checksums 2013-05-12 10:51:40 UTC (rev 21045) @@ -1 +1 @@ -3f82d30c488e4b88b8f86eb1c9ad0da7 Markdown-2.1.1.tar.gz +82f6828ec2292dda52fc38b743776bc6 Markdown-2.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 13:02:59 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 11:02:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21046] csw/mgar/pkg/cpan/Class-Factory-Util/trunk/Makefile Message-ID: Revision: 21046 http://gar.svn.sourceforge.net/gar/?rev=21046&view=rev Author: bonivart Date: 2013-05-12 11:02:59 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Class-Factory-Util/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Class-Factory-Util/trunk/Makefile Modified: csw/mgar/pkg/cpan/Class-Factory-Util/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Factory-Util/trunk/Makefile 2013-05-12 10:51:40 UTC (rev 21045) +++ csw/mgar/pkg/cpan/Class-Factory-Util/trunk/Makefile 2013-05-12 11:02:59 UTC (rev 21046) @@ -6,13 +6,16 @@ DESCRIPTION = Provide utility methods for factory classes define BLURB - Provide utility methods for factory classes endef DISTFILES += COPYING -PACKAGES = CSWpmclassfactutil -CATALOGNAME = pm_classfactutil +PACKAGES = CSWpm-class-factory-util +CATALOGNAME = pm_class_factory_util +SPKG_DESC_CSWpm-class-factory-util = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-class-factory-util = CSWpmclassfactutil +CATALOGNAME_CSWpmclassfactutil = pm_classfactutil + ARCHALL = 1 # Strip unknown options This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 13:12:49 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 11:12:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21047] csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile Message-ID: Revision: 21047 http://gar.svn.sourceforge.net/gar/?rev=21047&view=rev Author: bonivart Date: 2013-05-12 11:12:48 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Crypt-PasswdMD5/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile 2013-05-12 11:02:59 UTC (rev 21046) +++ csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile 2013-05-12 11:12:48 UTC (rev 21047) @@ -6,13 +6,16 @@ DESCRIPTION = Provides interoperable MD5-based crypt() functions define BLURB - Provides interoperable MD5-based crypt() functions endef DISTFILES += COPYING -PACKAGES = CSWpmcryptpasswdmd5 -CATALOGNAME = pm_cryptpasswdmd5 +PACKAGES = CSWpm-crypt-passwdmd5 +CATALOGNAME = pm_crypt_passwdmd5 +SPKG_DESC_CSWpm-crypt-passwdmd5 = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-crypt-passwdmd5 = CSWpmcryptpasswdmd5 +CATALOGNAME_CSWpmcryptpasswdmd5 = pm_cryptpasswdmd5 + ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 13:18:20 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 11:18:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21048] csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile Message-ID: Revision: 21048 http://gar.svn.sourceforge.net/gar/?rev=21048&view=rev Author: bonivart Date: 2013-05-12 11:18:20 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Crypt-RC5/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile 2013-05-12 11:12:48 UTC (rev 21047) +++ csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile 2013-05-12 11:18:20 UTC (rev 21048) @@ -6,13 +6,16 @@ DESCRIPTION = Perl implementation of the RC5 encryption algorithm define BLURB - Perl implementation of the RC5 encryption algorithm endef DISTFILES += COPYING -PACKAGES = CSWpmcryptrc5 -CATALOGNAME = pm_cryptrc5 +PACKAGES = CSWpm-crypt-rc5 +CATALOGNAME = pm_crypt_rc5 +SPKG_DESC_CSWpm-crypt-rc5 = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-crypt-rc5 = CSWpmcryptrc5 +CATALOGNAME_CSWpmcryptrc5 = pm_cryptrc5 + ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 14:36:27 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 12:36:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21049] csw/mgar/pkg/cpan/Data-ICal/trunk Message-ID: Revision: 21049 http://gar.svn.sourceforge.net/gar/?rev=21049&view=rev Author: bonivart Date: 2013-05-12 12:36:26 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Data-ICal/trunk: update to 0.20, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Data-ICal/trunk/Makefile csw/mgar/pkg/cpan/Data-ICal/trunk/checksums Modified: csw/mgar/pkg/cpan/Data-ICal/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Data-ICal/trunk/Makefile 2013-05-12 11:18:20 UTC (rev 21048) +++ csw/mgar/pkg/cpan/Data-ICal/trunk/Makefile 2013-05-12 12:36:26 UTC (rev 21049) @@ -1,22 +1,31 @@ NAME = Data-ICal -VERSION = 0.16 +VERSION = 0.20 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = ALEXMV +AUTHOR = TSIBLEY DESCRIPTION = Generates iCalendar (RFC 2445) calendar files define BLURB - Generates iCalendar (RFC 2445) calendar files endef DISTFILES += COPYING -PACKAGES = CSWpmdataical -CATALOGNAME = pm_dataical +PACKAGES = CSWpm-data-ical +CATALOGNAME = pm_data_ical +SPKG_DESC_CSWpm-data-ical = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-data-ical = CSWpmdataical +CATALOGNAME_CSWpmdataical = pm_dataical + ARCHALL = 1 PATCHFILES += 0001-Replace-crap-installer-with-something-more-standard.patch -RUNTIME_DEP_PKGS += CSWpmclsaccessor CSWpmclassretval CSWpmtextvfileasdata +BUILD_DEP_PKGS += CSWpm-test-longstring +BUILD_DEP_PKGS += CSWpm-test-nowarnings +BUILD_DEP_PKGS += CSWpmtestwarn +RUNTIME_DEP_PKGS += CSWpm-class-accessor +RUNTIME_DEP_PKGS += CSWpm-class-returnvalue +RUNTIME_DEP_PKGS += CSWpm-text-vfile-asdata + include gar/category.mk Modified: csw/mgar/pkg/cpan/Data-ICal/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Data-ICal/trunk/checksums 2013-05-12 11:18:20 UTC (rev 21048) +++ csw/mgar/pkg/cpan/Data-ICal/trunk/checksums 2013-05-12 12:36:26 UTC (rev 21049) @@ -1,3 +1 @@ -313a3dfd22c5a34832ed31f5a3934fa8 0001-Replace-crap-installer-with-something-more-standard.patch -98996bde28a864ffdd755bd147f569f0 COPYING -12430864424a7bfe77e5d62a083f792c Data-ICal-0.16.tar.gz +48d600f1abddc55e293a070e0dfd2979 Data-ICal-0.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 14:49:44 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 12:49:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21050] csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/ Makefile Message-ID: Revision: 21050 http://gar.svn.sourceforge.net/gar/?rev=21050&view=rev Author: bonivart Date: 2013-05-12 12:49:43 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Class-Accessor-Chained/trunk: fix dep Modified Paths: -------------- csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile Modified: csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile 2013-05-12 12:36:26 UTC (rev 21049) +++ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile 2013-05-12 12:49:43 UTC (rev 21050) @@ -19,6 +19,6 @@ ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpmclsaccessor +RUNTIME_DEP_PKGS += CSWpm-class-accessor include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 15:02:20 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 13:02:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21051] csw/mgar/pkg/cpan/Exception-Class/trunk Message-ID: Revision: 21051 http://gar.svn.sourceforge.net/gar/?rev=21051&view=rev Author: bonivart Date: 2013-05-12 13:02:20 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Exception-Class/trunk: update to 1.37, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Exception-Class/trunk/Makefile csw/mgar/pkg/cpan/Exception-Class/trunk/checksums Modified: csw/mgar/pkg/cpan/Exception-Class/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Exception-Class/trunk/Makefile 2013-05-12 12:49:43 UTC (rev 21050) +++ csw/mgar/pkg/cpan/Exception-Class/trunk/Makefile 2013-05-12 13:02:20 UTC (rev 21051) @@ -1,23 +1,24 @@ NAME = Exception-Class -VERSION = 1.32 +VERSION = 1.37 CATEGORIES = cpan GARTYPE = v2 AUTHOR = DROLSKY DESCRIPTION = Declare real exception classes in Perl define BLURB - Exception::Class allows you to declare exception hierarchies in your modules - in a "Java-esque" manner. It features a simple interface allowing - programmers to 'declare' exception classes at compile time. It also has a - base exception class, Exception::Class::Base, that can be easily extended. endef -PACKAGES = CSWpmexceptcls -CATALOGNAME = pm_exceptcls +PACKAGES = CSWpm-exception-class +CATALOGNAME = pm_exception_class +SPKG_DESC_CSWpm-exception-class = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-exception-class = CSWpmexceptcls +CATALOGNAME_CSWpmexceptcls = pm_exceptcls + ARCHALL = 1 LICENSE = LICENSE -RUNTIME_DEP_PKGS += CSWpmclsdtainherit CSWpmdevstacktrace +RUNTIME_DEP_PKGS += CSWpm-class-data-inheritable +RUNTIME_DEP_PKGS += CSWpm-devel-stacktrace include gar/category.mk Modified: csw/mgar/pkg/cpan/Exception-Class/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Exception-Class/trunk/checksums 2013-05-12 12:49:43 UTC (rev 21050) +++ csw/mgar/pkg/cpan/Exception-Class/trunk/checksums 2013-05-12 13:02:20 UTC (rev 21051) @@ -1 +1 @@ -83788ad5a2c5e946877e4ec362e19622 Exception-Class-1.32.tar.gz +9953d120112d971f1deafdba9dc15aa7 Exception-Class-1.37.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 15:12:36 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 13:12:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21052] csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk Message-ID: Revision: 21052 http://gar.svn.sourceforge.net/gar/?rev=21052&view=rev Author: bonivart Date: 2013-05-12 13:12:35 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/ExtUtils-Manifest/trunk: update to 1.61, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/Makefile csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/checksums Modified: csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/Makefile 2013-05-12 13:02:20 UTC (rev 21051) +++ csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/Makefile 2013-05-12 13:12:35 UTC (rev 21052) @@ -1,21 +1,23 @@ NAME = ExtUtils-Manifest -VERSION = 1.58 +VERSION = 1.61 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = RKOBES +AUTHOR = FLORA DESCRIPTION = Utilities to write and check a MANIFEST file define BLURB - Utilities to write and check a MANIFEST file. endef DISTFILES += COPYING -PACKAGES = CSWpmextutilsmft -CATALOGNAME = pm_extutilsmft +PACKAGES = CSWpm-extutils-manifest +CATALOGNAME = pm_extutils_manifest +SPKG_DESC_CSWpm-extutils-manifest = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-extutils-manifest = CSWpmextutilsmft +CATALOGNAME_CSWpmextutilsmft = pm_extutilsmft ARCHALL = 1 -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*\/man\/man3.* .*\/man\/man1.* +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* include gar/category.mk Modified: csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/checksums 2013-05-12 13:02:20 UTC (rev 21051) +++ csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/checksums 2013-05-12 13:12:35 UTC (rev 21052) @@ -1 +1 @@ -1644112b9ac75822d820b047c968edd9 ExtUtils-Manifest-1.58.tar.gz +8d72d056722a9424e642aa0e66b6b50b ExtUtils-Manifest-1.61.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 15:19:18 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 13:19:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[21053] csw/mgar/pkg/cpan/GD-Barcode/trunk/Makefile Message-ID: Revision: 21053 http://gar.svn.sourceforge.net/gar/?rev=21053&view=rev Author: bonivart Date: 2013-05-12 13:19:17 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/GD-Barcode/trunk: fix name and deps Modified Paths: -------------- csw/mgar/pkg/cpan/GD-Barcode/trunk/Makefile Modified: csw/mgar/pkg/cpan/GD-Barcode/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD-Barcode/trunk/Makefile 2013-05-12 13:12:35 UTC (rev 21052) +++ csw/mgar/pkg/cpan/GD-Barcode/trunk/Makefile 2013-05-12 13:19:17 UTC (rev 21053) @@ -6,17 +6,18 @@ DESCRIPTION = Create barcode images with GD define BLURB - GD::Barcode is a subclass of GD and allows you to create barcode image with - GD. This module based on "Generate Barcode Ver 1.02 By Shisei Hanai - 97/08/22". endef DISTFILES += COPYING -PACKAGES = CSWpmgdbarcode -CATALOGNAME = pm_gdbarcode +PACKAGES = CSWpm-gd-barcode +CATALOGNAME = pm_gd_barcode +SPKG_DESC_CSWpm-gd-barcode = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-gd-barcode = CSWpmgdbarcode +CATALOGNAME_CSWpmgdbarcode = pm_gdbarcode + ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpmgd +RUNTIME_DEP_PKGS += CSWpm-gd include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 17:38:08 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 15:38:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[21054] csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile Message-ID: Revision: 21054 http://gar.svn.sourceforge.net/gar/?rev=21054&view=rev Author: bonivart Date: 2013-05-12 15:38:05 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Hook-LexWrap/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile Modified: csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile 2013-05-12 13:19:17 UTC (rev 21053) +++ csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile 2013-05-12 15:38:05 UTC (rev 21054) @@ -6,13 +6,16 @@ DESCRIPTION = Lexically scoped subroutine wrappers define BLURB - Lexically scoped subroutine wrappers endef DISTFILES += COPYING -PACKAGES = CSWpmhooklexwrap -CATALOGNAME = pm_hooklexwrap +PACKAGES = CSWpm-hook-lexwrap +CATALOGNAME = pm_hook_lexwrap +SPKG_DESC_CSWpm-hook-lexwrap = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-hook-lexwrap = CSWpmhooklexwrap +CATALOGNAME_CSWpmhooklexwrap = pm_hooklexwrap + ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 18:38:40 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 16:38:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21055] csw/mgar/pkg/cpan/Log-Any/trunk Message-ID: Revision: 21055 http://gar.svn.sourceforge.net/gar/?rev=21055&view=rev Author: bonivart Date: 2013-05-12 16:38:37 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Log-Any/trunk: update to 0.15, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Any/trunk/Makefile csw/mgar/pkg/cpan/Log-Any/trunk/checksums Modified: csw/mgar/pkg/cpan/Log-Any/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Any/trunk/Makefile 2013-05-12 15:38:05 UTC (rev 21054) +++ csw/mgar/pkg/cpan/Log-Any/trunk/Makefile 2013-05-12 16:38:37 UTC (rev 21055) @@ -1,18 +1,21 @@ NAME = Log-Any -VERSION = 0.11 +VERSION = 0.15 CATEGORIES = cpan GARTYPE = v2 AUTHOR = JSWARTZ DESCRIPTION = Bringing loggers and listeners together define BLURB - Bringing loggers and listeners together endef DISTFILES += COPYING -PACKAGES = CSWpmlogany -CATALOGNAME = pm_logany +PACKAGES = CSWpm-log-any +CATALOGNAME = pm_log_any +SPKG_DESC_CSWpm-log-any = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-log-any = CSWpmlogany +CATALOGNAME_CSWpmlogany = pm_logany + ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Any/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Any/trunk/checksums 2013-05-12 15:38:05 UTC (rev 21054) +++ csw/mgar/pkg/cpan/Log-Any/trunk/checksums 2013-05-12 16:38:37 UTC (rev 21055) @@ -1,2 +1 @@ -28e155cc77ffb9bb6071df1054f39acc COPYING -9186d94ee2ae7cada408fc5faf86d975 Log-Any-0.11.tar.gz +8337dd1dedd499de70f941ef980b5fe9 Log-Any-0.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 19:03:16 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 17:03:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21056] csw/mgar/pkg/cpan/Test-Deep/trunk Message-ID: Revision: 21056 http://gar.svn.sourceforge.net/gar/?rev=21056&view=rev Author: bonivart Date: 2013-05-12 17:03:15 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Test-Deep/trunk: update to 0.110, fix deps Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile csw/mgar/pkg/cpan/Test-Deep/trunk/checksums Modified: csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile 2013-05-12 16:38:37 UTC (rev 21055) +++ csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile 2013-05-12 17:03:15 UTC (rev 21056) @@ -1,12 +1,11 @@ NAME = Test-Deep -VERSION = 0.108 +VERSION = 0.110 CATEGORIES = cpan GARTYPE = v2 AUTHOR = RJBS DESCRIPTION = Extremely flexible deep comparison define BLURB - Extremely flexible deep comparison endef DISTFILES += COPYING @@ -19,7 +18,7 @@ ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpmtesttester -RUNTIME_DEP_PKGS += CSWpmtestnowarnings +RUNTIME_DEP_PKGS += CSWpm-test-tester +RUNTIME_DEP_PKGS += CSWpm-test-nowarnings include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-Deep/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Deep/trunk/checksums 2013-05-12 16:38:37 UTC (rev 21055) +++ csw/mgar/pkg/cpan/Test-Deep/trunk/checksums 2013-05-12 17:03:15 UTC (rev 21056) @@ -1 +1 @@ -df17efafc31acb927cc1d950115f4178 Test-Deep-0.108.tar.gz +a5daeaaffcd8cf94a12594ff76970045 Test-Deep-0.110.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun May 12 20:53:47 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 May 2013 18:53:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21057] csw/mgar/pkg/cpan Message-ID: Revision: 21057 http://gar.svn.sourceforge.net/gar/?rev=21057&view=rev Author: bonivart Date: 2013-05-12 18:53:46 +0000 (Sun, 12 May 2013) Log Message: ----------- cpan/Readonly-XS/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Readonly-XS/ csw/mgar/pkg/cpan/Readonly-XS/Makefile csw/mgar/pkg/cpan/Readonly-XS/branches/ csw/mgar/pkg/cpan/Readonly-XS/tags/ csw/mgar/pkg/cpan/Readonly-XS/trunk/ csw/mgar/pkg/cpan/Readonly-XS/trunk/Makefile csw/mgar/pkg/cpan/Readonly-XS/trunk/checksums csw/mgar/pkg/cpan/Readonly-XS/trunk/files/ Added: csw/mgar/pkg/cpan/Readonly-XS/Makefile =================================================================== --- csw/mgar/pkg/cpan/Readonly-XS/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Readonly-XS/Makefile 2013-05-12 18:53:46 UTC (rev 21057) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/cpan/Readonly-XS/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Readonly-XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Readonly-XS/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Readonly-XS/trunk/Makefile 2013-05-12 18:53:46 UTC (rev 21057) @@ -0,0 +1,17 @@ +NAME = Readonly-XS +VERSION = 1.05 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = ROODE + +DESCRIPTION = Companion module for Readonly.pm, to speed up read-only scalar variables +define BLURB +endef + +PACKAGES += CSWpm-readonly-xs +CATALOGNAME += pm_readonly_xs + +RUNTIME_DEP_PKGS += CSWpmreadonly + +include gar/category.mk + Property changes on: csw/mgar/pkg/cpan/Readonly-XS/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cpan/Readonly-XS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Readonly-XS/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Readonly-XS/trunk/checksums 2013-05-12 18:53:46 UTC (rev 21057) @@ -0,0 +1 @@ +df71f29abfcbd14c963f912d6d6ded6b Readonly-XS-1.05.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun May 12 21:10:53 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 12 May 2013 19:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21058] csw/mgar/pkg/php5/trunk Message-ID: Revision: 21058 http://gar.svn.sourceforge.net/gar/?rev=21058&view=rev Author: bdwalton Date: 2013-05-12 19:10:53 +0000 (Sun, 12 May 2013) Log Message: ----------- php5/trunk: version bump: 5.3.21 -> 5.3.25 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2013-05-12 18:53:46 UTC (rev 21057) +++ csw/mgar/pkg/php5/trunk/Makefile 2013-05-12 19:10:53 UTC (rev 21058) @@ -1,5 +1,5 @@ NAME = php5 -VERSION = 5.3.21 +VERSION = 5.3.25 GARTYPE = v2 SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJECT)-$(VERSION) @@ -19,9 +19,10 @@ endef EXTRA_MODULATORS = SAPI -MODULATIONS_SAPI = cgi ap2 +MODULATIONS_SAPI = cgi ap2 fpm MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all +MERGE_SCRIPTS_isa-default-sapi-fpm = copy-all # turn on the build scripts to enable/disable modules PHP5_EXT = 1 @@ -324,6 +325,9 @@ ifeq ($(SAPI),ap2) CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs endif +ifeq ($(SAPI),fpm) +CONFIGURE_ARGS += --enable-fpm +endif # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2013-05-12 18:53:46 UTC (rev 21057) +++ csw/mgar/pkg/php5/trunk/checksums 2013-05-12 19:10:53 UTC (rev 21058) @@ -1 +1 @@ -1b214fc19bb5f5c0902ba27c74d5f4a2 php-5.3.21.tar.bz2 +347625ed7fbf2fe1f1c70b0f879fee2a php-5.3.25.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun May 12 21:37:49 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 12 May 2013 19:37:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21059] csw/mgar/pkg/php5/trunk Message-ID: Revision: 21059 http://gar.svn.sourceforge.net/gar/?rev=21059&view=rev Author: wilbury Date: 2013-05-12 19:37:49 +0000 (Sun, 12 May 2013) Log Message: ----------- php5/trunk: Do not activate module during package build. Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/0003-Do-not-activate-php5-module-during-package-build.patch Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2013-05-12 19:10:53 UTC (rev 21058) +++ csw/mgar/pkg/php5/trunk/Makefile 2013-05-12 19:37:49 UTC (rev 21059) @@ -47,6 +47,7 @@ DISTFILES += httpd-php5.conf PATCHFILES += 0001-Strip-usr-ucblib-references.patch +PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg @@ -356,6 +357,9 @@ pre-install-modulated: $(PI_SCRIPTS) @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \ cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) ) + @echo "LoadModule foo_module libexec/mod_foo.so" > $(DESTDIR)$(AP2SYSCONF)/httpd.conf + @echo "LoadModule foo1_module libexec/mod_foo1.so" > $(DESTDIR)$(AP2SYSCONF)/httpd.conf + @echo "LoadModule foo2_module libexec/mod_foo2.so" > $(DESTDIR)$(AP2SYSCONF)/httpd.conf @$(MAKECOOKIE) post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf Added: csw/mgar/pkg/php5/trunk/files/0003-Do-not-activate-php5-module-during-package-build.patch =================================================================== --- csw/mgar/pkg/php5/trunk/files/0003-Do-not-activate-php5-module-during-package-build.patch (rev 0) +++ csw/mgar/pkg/php5/trunk/files/0003-Do-not-activate-php5-module-during-package-build.patch 2013-05-12 19:37:49 UTC (rev 21059) @@ -0,0 +1,25 @@ +From 65752fa7bb4c2577352ed758f695f53a23edd734 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Sun, 12 May 2013 19:25:05 +0200 +Subject: [PATCH] Do not activate php5 module during package build. + +--- + sapi/apache2handler/config.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 +index 702f91f..9e3d546 100644 +--- a/sapi/apache2handler/config.m4 ++++ b/sapi/apache2handler/config.m4 +@@ -77,7 +77,7 @@ if test "$PHP_APXS2" != "no"; then + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ +- -i -a -n php5" ++ -i -n php5" + fi + + case $host_alias in +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun May 12 21:39:52 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 12 May 2013 19:39:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21060] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 21060 http://gar.svn.sourceforge.net/gar/?rev=21060&view=rev Author: wilbury Date: 2013-05-12 19:39:52 +0000 (Sun, 12 May 2013) Log Message: ----------- php5/trunk: Use the right redirection. Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2013-05-12 19:37:49 UTC (rev 21059) +++ csw/mgar/pkg/php5/trunk/Makefile 2013-05-12 19:39:52 UTC (rev 21060) @@ -357,9 +357,9 @@ pre-install-modulated: $(PI_SCRIPTS) @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \ cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) ) - @echo "LoadModule foo_module libexec/mod_foo.so" > $(DESTDIR)$(AP2SYSCONF)/httpd.conf - @echo "LoadModule foo1_module libexec/mod_foo1.so" > $(DESTDIR)$(AP2SYSCONF)/httpd.conf - @echo "LoadModule foo2_module libexec/mod_foo2.so" > $(DESTDIR)$(AP2SYSCONF)/httpd.conf + @echo "LoadModule foo_module libexec/mod_foo.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf + @echo "LoadModule foo1_module libexec/mod_foo1.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf + @echo "LoadModule foo2_module libexec/mod_foo2.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf @$(MAKECOOKIE) post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun May 12 22:11:47 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 12 May 2013 20:11:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21061] csw/mgar/pkg/libcurl4/trunk/Makefile Message-ID: Revision: 21061 http://gar.svn.sourceforge.net/gar/?rev=21061&view=rev Author: dmichelsen Date: 2013-05-12 20:11:47 +0000 (Sun, 12 May 2013) Log Message: ----------- libcurl4/trunk: Latest standards Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2013-05-12 19:39:52 UTC (rev 21060) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2013-05-12 20:11:47 UTC (rev 21061) @@ -16,9 +16,19 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES += $(NAME)-$(VERSION).tar.lzma +VENDOR_URL = http://curl.haxx.se + # Because of OpenSSL 1.0 update PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +BUILD_DEP_PKGS += CSWopenldap-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibcares-dev +BUILD_DEP_PKGS += CSWlibssh2-dev +BUILD_DEP_PKGS += CSWlibfbopenssl-dev +BUILD_DEP_PKGS += CSWlibrtmp-dev +BUILD_DEP_PKGS += CSWlibidn-dev + PACKAGES += CSWlibcurl4 CATALOGNAME_CSWlibcurl4 = libcurl4 SPKG_DESC_CSWlibcurl4 = Library for client-side URL transfers, libcurl.so.4 @@ -58,7 +68,7 @@ PKGFILES_CSWlibcurl-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibcurl-dev += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWlibcurl-dev += CSWlibidn-dev -OBSOLETED_BY_CSWlibcurl-dev = CSWcurldevel +OBSOLETED_BY_CSWlibcurl-dev += CSWcurldevel CATALOGNAME_CSWcurldevel = curl_devel_stub PACKAGES += CSWcurl @@ -70,16 +80,6 @@ RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 #RUNTIME_DEP_PKGS_CSWcurl += CSWlibssl1-0-0 -BUILD_DEP_PKGS += CSWopenldap-dev -BUILD_DEP_PKGS += CSWlibssl-dev -BUILD_DEP_PKGS += CSWlibcares-dev -BUILD_DEP_PKGS += CSWlibssh2-dev -BUILD_DEP_PKGS += CSWlibfbopenssl-dev -BUILD_DEP_PKGS += CSWlibrtmp-dev -BUILD_DEP_PKGS += CSWlibidn-dev - -VENDOR_URL = http://curl.haxx.se - EXTRA_MODULATORS = FEATURES MODULATIONS_FEATURES = minimal full @@ -135,15 +135,15 @@ $(GARCOMPILER)_LD_FLAGS := # Rebuild the minimal library with AUX linkage to feature library -post-build-modulated: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 -post-build-modulated: +post-build: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 +post-build: $(if $(filter minimal,$(FEATURES)),\ rm -f $(WORKSRC)/lib/libcurl.la; \ $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC)/lib $(BUILD_ARGS); \ ) @$(MAKECOOKIE) -post-merge: +post-merge-global: @# This is needed because the substitutions from pax args do not change the @# contents of the symlink rm -f $(PKGROOT)$(libdir)/libcurl-feature.so.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Mon May 13 00:02:53 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 12 May 2013 22:02:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21062] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 21062 http://gar.svn.sourceforge.net/gar/?rev=21062&view=rev Author: wilbury Date: 2013-05-12 22:02:52 +0000 (Sun, 12 May 2013) Log Message: ----------- php5/trunk: No FPM at the moment, compilation issues. Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2013-05-12 20:11:47 UTC (rev 21061) +++ csw/mgar/pkg/php5/trunk/Makefile 2013-05-12 22:02:52 UTC (rev 21062) @@ -19,10 +19,10 @@ endef EXTRA_MODULATORS = SAPI -MODULATIONS_SAPI = cgi ap2 fpm +MODULATIONS_SAPI = cgi ap2 MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all -MERGE_SCRIPTS_isa-default-sapi-fpm = copy-all +#MERGE_SCRIPTS_isa-default-sapi-fpm = copy-all # turn on the build scripts to enable/disable modules PHP5_EXT = 1 @@ -326,9 +326,9 @@ ifeq ($(SAPI),ap2) CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs endif -ifeq ($(SAPI),fpm) -CONFIGURE_ARGS += --enable-fpm -endif +#ifeq ($(SAPI),fpm) +#CONFIGURE_ARGS += --enable-fpm +#endif # Disable Tests (report submitted to PHP QA) SKIPTEST = 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 Mon May 13 12:05:13 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 May 2013 10:05:13 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[662] mirror Message-ID: <20130513100551.1A1B35C6@mail.opencsw.org> Revision: 662 http://sourceforge.net/p/opencsw/code/662 Author: dmichelsen Date: 2013-05-13 10:05:11 +0000 (Mon, 13 May 2013) Log Message: ----------- Add check_prtdiag for V440 Added Paths: ----------- mirror/check_prtdiag mirror/check_prtdiag.conf Added: mirror/check_prtdiag =================================================================== --- mirror/check_prtdiag (rev 0) +++ mirror/check_prtdiag 2013-05-13 10:05:11 UTC (rev 662) @@ -0,0 +1,390 @@ +#!/usr/bin/perl -w +# +# File : check_prtdiag +# Purpose : prtdiag output parser +# Author : S?bastien Ph?lep (seb at le-seb.org) +# Date : 2009/01/14 +# + +# Required packages ========================================================= # +use strict; +use File::Basename; +use Getopt::Std; + +# Constants ================================================================= # +my $PROGNAME = basename($0); +my $CONFFILE = "${PROGNAME}.conf"; +my $VERSION = "1.12"; + +# Globals =================================================================== # +my %conf = (); +my @diag = (); +my $syst = undef; +my $file = undef; +my @failed = (); +my @passed = (); +my %options = (); +my $verbose = undef; +my $cfgfile = undef; + +# Functions ================================================================= # + +# Default handler for --help +sub HELP_MESSAGE +{ + usage(0); +} + +# Default handler for --version +sub VERSION_MESSAGE +{ + usage(0); +} + +# Script usage +sub usage +{ + # Get exit status + my $status = shift; + my $errmsg = shift; + + # We've been called with an error message. + # Print it to STDERR with short usage + if( $errmsg ) + { + print STDERR "${PROGNAME}: $errmsg\n\n"; + print STDERR "Usage: ${PROGNAME} [-hv] [-c ] [-f ]\n"; + print STDERR "Try '-h' for help.\n"; + } + else + { + # Print full usage to STDOUT + print STDOUT << "EOF"; + +${PROGNAME} - ${VERSION} +Search for SUN hardware errors in prtdiag output. + +Usage: ${PROGNAME} [-hv] [-c ] [-f ] + + -f : use prtdiag output found in file + -c : specify alternate location for config file + (default location: '$CONFFILE') + -h : this (help) message + -v : verbose output +EOF + } + + # Exit with specified status + exit($status); +} + +# Main starts here =========================================================== # + +# Use getopts for processing command line options +usage(3) unless( getopts("f:c:hv",\%options) ); + +# Need command usage ? +usage(0) if($options{'h'}); + +# Initialize values +$cfgfile = $options{'c'} ? $options{'c'} : $CONFFILE; +$file = $options{'f'} ? $options{'f'} : undef; +$verbose = $options{'v'} ? 1 : 0; + +# Go English ! +$ENV{'LANG'} = "C"; + +# Load config file +unless( open(CONFIG,"<${cfgfile}") ) +{ + print STDERR "Initialization error - unable to open file '${cfgfile}' : $!\n"; + exit(3); +} +my $section = undef; +while() +{ + chomp(); + + # Remove comments + s/#.*//; + + # Ignore blank lines + next if( m/^\s*$/ ); + + if( m/^\s*\[\s*(.*?)\s*\]\s*$/ ) + { + $section = $1; + next; + } + elsif( m/^\s*(.*?)\s*=\s*(.*?)\s*$/ ) + { + $conf{$section}->{$1} = $2 if( defined($section) ); + } +} +close(CONFIG); + +# Check minimum config +unless( $file ) +{ + unless( defined($conf{'commands'}->{'prtdiag'}) ) + { + print STDERR "Initialization error - 'prtdiag' command not defined in file '${CONFFILE}' !\n"; + exit(3); + } + + # Substitute macros + foreach my $section ( %conf ) + { + foreach my $param ( keys( %{ $conf{$section} } ) ) + { + # Command substitution + if( $conf{$section}->{$param} =~ m/CMD\((.*?)\)/ ) + { + my $command = $1; + unless( defined($conf{'commands'}->{$command}) ) + { + print STDERR "Initialization error - '$command' command not defined in file '${CONFFILE}' !\n"; + exit(3); + } + + my @result = `$conf{'commands'}->{$command} 2>&1`; + unless( ($?>>8) == 0 ) + { + print STDERR "Initialization error - Failed Substitution for '$command' : @result !\n"; + exit(3); + } + + chomp($result[0]); + $conf{$section}->{$param} =~ s/CMD\($command\)/$result[0]/; + } + } + } +} + +# Get prtdiag input +unless( $file ) +{ + unless( open(DIAG,"$conf{'commands'}->{'prtdiag'}|") ) + { + print STDOUT "Failed to create pipe for command '".$conf{'commands'}->{'prtdiag'}."' : $!\n"; + exit(3); + } +} +else +{ + unless( open(DIAG,"<$file") ) + { + print STDOUT "Failed to open file '$file' for reading : $!\n"; + exit(3); + } +} +while() +{ + chomp(); + s/^\s*(.*?)\s*$/$1/; + push(@diag,$_); +} +close(DIAG); + +# Look for system type +unless( defined($syst) ) +{ + FSYS: + foreach my $section ( keys(%conf) ) + { + foreach my $param ( keys(%{ $conf{$section} }) ) + { + next unless( $param eq "system.match" ); + if( grep(/$conf{$section}->{'system.match'}/, at diag) ) + { + $syst = $section; + last FSYS; + } + } + } +} + +# Check for unidentified system type +unless( defined($syst) ) +{ + print STDOUT "Unable to identify system type !\n"; + exit(3); +} +print STDERR "Using system type : $syst\n" if( $verbose); + +# Further config checks +unless( defined($conf{$syst}->{'system.checks'}) ) +{ + print STDOUT "Initialization failed - Missing 'system.checks' entry for section '$syst' in file '$CONFFILE' !\n"; + exit(3); +} +my @checks = split(/\s*,\s*/,$conf{$syst}->{'system.checks'}); +if( scalar(@checks) == 0 ) +{ + print STDOUT "No check defined in 'system.checks' entry for section '$syst' in file '$CONFFILE' !\n"; + exit(3); +} +foreach my $check ( @checks ) +{ + foreach my $param ( "description", "begin_match", "end_match", "data_match", "data_labels", "ok_condition", "output_string" ) + { + my $param_name = "checks.$check.$param"; + unless( defined($conf{$syst}->{$param_name}) ) + { + print STDOUT "Initialization error - Missing '$param_name' entry for section '$syst' in file '$CONFFILE' !\n"; + exit(3); + } + } +} + +# Check'em all +foreach my $check ( @checks ) +{ + # Get associated data + my $description = $conf{$syst}->{"checks.$check.description"}; + my @labels = split(/\s*,\s*/,$conf{$syst}->{"checks.$check.data_labels"}); + my $fetch_mode = $conf{$syst}->{"checks.$check.fetch_mode"}; + my $begin = 0; + my $dcount = 0; + my $lcount = 0; + my %data = (); + + print STDERR "\nChecking $description:\n" if( $verbose); + + # Parse prtdiag output + DIAG: foreach( @diag ) + { + unless( $begin ) + { + # Looking for begin pattern + next DIAG unless( m/$conf{$syst}->{"checks.$check.begin_match"}/ ); + s/$conf{$syst}->{"checks.$check.begin_match"}//; + $begin = 1; + } + else + { + # Stop parsing if matched end pattern + last DIAG if( m/$conf{$syst}->{"checks.$check.end_match"}/ ); + } + + # Skip unwanted data + if( defined($conf{$syst}->{"checks.$check.skip_match"}) ) + { + next DIAG if( m/$conf{$syst}->{"checks.$check.skip_match"}/ ); + } + + # Reinit read values + my @values = (); + + # === Fetching data in linear mode === # + if( defined($fetch_mode) and ($fetch_mode eq "linear") ) + { + # Use specified regexp separator, or define a default one + my $regexp_separator = $conf{$syst}->{"checks.$check.data_match_regsep"} || '\s*,\s'; + + # Extract regular expresssions to be used for data collection + my @dmatch = split(/\s*,\s*/,$conf{$syst}->{"checks.$check.data_match"}); + + # Take care of counters + if( $lcount >= scalar(@labels) ) + { + $lcount = 0; + $dcount = $dcount + scalar(@labels) + 1; + } + + # Get all matching values + @values = m/$dmatch[$lcount]/g; + + # Update our hash + for( my $i=0; $i < scalar(@values); $i++ ) + { + $data{($dcount+$i)}->{$labels[$lcount]} = $values[$i]; + } + $lcount++; + + # Next one + next DIAG; + } + # === Fetching data otherwise (aka tabular mode) === # + else + { + # Next one if this does not match + next DIAG unless( @values = m/$conf{$syst}->{"checks.$check.data_match"}/g ); + + # Update our hash + for( my $i=0; $i < scalar(@values); $i++ ) + { + # Take care of counters + if( $lcount >= scalar(@labels) ) + { + $lcount = 0; + $dcount++; + } + + $data{$dcount}->{$labels[$lcount]} = $values[$i]; + $lcount++; + } + } + } + + # Check collected data + my $errors = 0; + my $tests = 0; + foreach my $dataset ( keys(%data) ) + { + my $test_result = ""; + my $ok_condition = $conf{$syst}->{"checks.$check.ok_condition"}; + my $output_string = $conf{$syst}->{"checks.$check.output_string"}; + + # Substitute labels in condition and output string + foreach my $label ( keys( %{ $data{$dataset} } ) ) + { + $ok_condition =~ s/%$label%/$data{$dataset}->{$label}/g; + $output_string =~ s/%$label%/$data{$dataset}->{$label}/g; + } + + # Test condition + if( eval($ok_condition) ) + { + # Test passed + $test_result = "INF - $output_string"; + push(@passed,$output_string); + } + else + { + # Test failed + $test_result = "ERR - $output_string"; + push(@failed,$output_string); + $errors++; + + } + $tests++; + print STDERR " $test_result\n" if( $verbose); + } + print STDERR "Checked $tests component".( $tests le 1 ? "" : "s").", found ".( $errors == 0 ? "no error" : "$errors errors" ).".\n" if( $verbose ); +} + +# Analyze global results +my $checked = scalar(@passed) + scalar(@failed); +if( scalar(@failed) > 0 ) +{ + print STDERR "\n" if( $verbose ); + print STDOUT "CRITICAL - Checked $checked component".( $checked le 1 ? "" : "s").", found ".scalar(@failed)." errors : ".join(', ', at failed)."|"; + print STDOUT join(', ', at passed); + print STDOUT "\n"; + exit(2); +} +elsif( $checked == 0 ) +{ + print STDERR "\n" if( $verbose ); + print STDOUT "WARNING - Found nothing to check !\n"; + exit(1); +} +else +{ + print STDERR "\n" if( $verbose ); + print STDOUT "OK - Successfully checked $checked component".( $checked le 1 ? "" : "s")."|"; + print STDOUT join(', ', at passed); + print STDOUT "\n"; + exit(0); +} Property changes on: mirror/check_prtdiag ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: mirror/check_prtdiag.conf =================================================================== --- mirror/check_prtdiag.conf (rev 0) +++ mirror/check_prtdiag.conf 2013-05-13 10:05:11 UTC (rev 662) @@ -0,0 +1,522 @@ +# check_prtdiag.conf + +[commands] +platform = /sbin/uname -i +prtdiag = /usr/platform/CMD(platform)/sbin/prtdiag -v + +[SunFire 280R] +system.match = ^System Configuration:.*Sun Fire 280R +system.checks = Leds,Fans,Disks,PSU + +checks.Leds.description = system leds status +checks.Leds.begin_match = ^System LED Status:\s+ +checks.Leds.end_match = ^$ +checks.Leds.fetch_mode = linear +checks.Leds.data_match = ((?:\S+\s)*\S+),\[\s*(.*?)\s*\] +checks.Leds.data_labels = Location,Status +checks.Leds.ok_condition = not( ( "%Location%" =~ m/FAULT/i ) and ("%Status%" eq "ON") ) +checks.Leds.output_string = System LED '%Location%' status is '%Status%' + +checks.Fans.description = fans status +checks.Fans.begin_match = ^Fan Bank : +checks.Fans.end_match = ^= +checks.Fans.data_match = ^(\S+)\s+\[\s*(\S+)\s*\] +checks.Fans.data_labels = Bank,Status +checks.Fans.ok_condition = "%Status%" eq "NO_FAULT" +checks.Fans.output_string = Fan '%Bank%' status is '%Status%' + +checks.Disks.description = disks status +checks.Disks.begin_match = ^Disk Status: +checks.Disks.end_match = ^= +checks.Disks.data_match = ^(.*?\d+)(?:.*?)\[\s*(\S+)\s*\]\s*$ +checks.Disks.data_labels = Disk,Status +checks.Disks.ok_condition = "%Status%" eq "NO_FAULT" +checks.Disks.output_string = Disk '%Disk%' status is '%Status%' + +checks.PSU.description = power supplies status +checks.PSU.begin_match = ^Power Supplies: +checks.PSU.end_match = ^= +checks.PSU.data_match = ^(.*?\d+)\s+\[\s*(\S+)\s*\] +checks.PSU.data_labels = Supply,Status +checks.PSU.ok_condition = "%Status%" eq "OK" +checks.PSU.output_string = Power supply '%Supply%' status is '%Status%' + + +[Enterprise 150] +system.match = ^System Configuration:.*Sun Ultra 1 SBus +system.checks = Boards + +checks.Boards.description = IO cards status +checks.Boards.begin_match = ^=+\sIO Cards +checks.Boards.end_match = ^= +checks.Boards.data_match = ^(No failures found in System|(?:No|Detected) System Faults) +checks.Boards.data_labels = Diagnosis +checks.Boards.ok_condition = "%Diagnosis%" =~ m/^(No) / +checks.Boards.output_string = System diagnosis for IO cards is '%Diagnosis%' + + +[Enterprise 250] +system.match = ^System Configuration:.*Sun \(TM\) Enterprise 250 +system.checks = Memory,Leds,Disks,Fans,PSU,Boards + +checks.Memory.description = memory banks status +checks.Memory.begin_match = ^=+ Memory +checks.Memory.end_match = ^= +checks.Memory.data_match = ^\s*(\d+)\s+\S+\s+(.*?)\s+.*?(\S+)$ +checks.Memory.data_labels = Bank,Socket,Status +checks.Memory.ok_condition = "%Status%" eq "OK" +checks.Memory.output_string = Memory unit '%Socket%' on bank '%Bank%' status is '%Status%' + +checks.Leds.description = system leds status +checks.Leds.begin_match = ^System LED Status:\s+ +checks.Leds.end_match = ^$ +checks.Leds.fetch_mode = linear +checks.Leds.data_match = ((?:\S+\s)*\S+),\[\s*(.*?)\s*\] +checks.Leds.data_labels = Location,Status +checks.Leds.ok_condition = not( ( "%Location%" =~ m/ERROR/i ) and ("%Status%" eq "ON") ) +checks.Leds.output_string = System LED '%Location%' status is '%Status%' + +checks.Disks.description = disks status +checks.Disks.begin_match = ^Disk LED Status: +checks.Disks.end_match = ^= +checks.Disks.data_match = (DISK\s+\d+):\s+\[\s*(.*?)\s*\] +checks.Disks.data_labels = Disk,Status +checks.Disks.ok_condition = "%Status%" =~ m/^(OK|EMPTY)$/ +checks.Disks.output_string = Disk '%Disk%' status is '%Status%' + +checks.Fans.description = fans status +checks.Fans.begin_match = ^Fan Bank : +checks.Fans.end_match = ^= +checks.Fans.data_match = ^(\S+)\s+\d+\s+(\S+) +checks.Fans.data_labels = Bank,Status +checks.Fans.ok_condition = "%Status%" eq "OK" +checks.Fans.output_string = Fan '%Bank%' status is '%Status%' + +checks.PSU.description = power supplies status +checks.PSU.begin_match = ^Power Supplies: +checks.PSU.end_match = ^= +checks.PSU.data_match = ^\s*(\d+).*?(\S+)$ +checks.PSU.data_labels = Supply,Status +checks.PSU.ok_condition = "%Status%" eq "OK" +checks.PSU.output_string = Power supply '%Supply%' status is '%Status%' + +checks.Boards.description = IO cards status +checks.Boards.begin_match = ^=+\sIO Cards +checks.Boards.end_match = ^= +checks.Boards.data_match = ^(No failures found in System|(?:No|Detected) System Faults) +checks.Boards.data_labels = Diagnosis +checks.Boards.ok_condition = "%Diagnosis%" =~ m/^No / +checks.Boards.output_string = System diagnosis for IO cards is '%Diagnosis%' + + +[Enterprise 450] +system.match = ^System Configuration:.*Sun Enterprise 450 +system.checks = Memory,Leds,Disks,Fans,PSU,Boards + +checks.Memory.description = memory banks status +checks.Memory.begin_match = ^=+ Memory +checks.Memory.end_match = ^= +checks.Memory.data_match = ^\s*(\d+)\s+\S+\s+(.*?)\s+.*?(\S+)$ +checks.Memory.data_labels = Bank,Socket,Status +checks.Memory.ok_condition = "%Status%" eq "OK" +checks.Memory.output_string = Memory unit '%Socket%' on bank '%Bank%' status is '%Status%' + +checks.Leds.description = system leds status +checks.Leds.begin_match = ^System LED Status:\s+ +checks.Leds.end_match = ^$ +checks.Leds.fetch_mode = linear +checks.Leds.data_match = ((?:\S+\s)*\S+),\[\s*(.*?)\s*\] +checks.Leds.data_labels = Location,Status +checks.Leds.ok_condition = not( ( "%Location%" =~ m/ERROR/i ) and ("%Status%" eq "ON") ) +checks.Leds.output_string = System LED '%Location%' status is '%Status%' + +checks.Disks.description = disks status +checks.Disks.begin_match = ^Disk LED Status: +checks.Disks.end_match = ^= +checks.Disks.data_match = (DISK\s+\d+):\s+\[\s*(.*?)\s*\] +checks.Disks.data_labels = Disk,Status +checks.Disks.ok_condition = "%Status%" =~ m/^(OK|EMPTY)$/ +checks.Disks.output_string = Disk '%Disk%' status is '%Status%' + +checks.Fans.description = fans status +checks.Fans.begin_match = ^Fans: +checks.Fans.end_match = ^$ +checks.Fans.data_match = ^(\S+)\s+\d+\s+(\S+) +checks.Fans.data_labels = Bank,Status +checks.Fans.ok_condition = "%Status%" eq "OK" +checks.Fans.output_string = Fan '%Bank%' status is '%Status%' + +checks.PSU.description = power supplies status +checks.PSU.begin_match = ^Power Supplies: +checks.PSU.end_match = ^= +checks.PSU.data_match = ^\s*(\d+).*?(\S+)$ +checks.PSU.data_labels = Supply,Status +checks.PSU.ok_condition = "%Status%" eq "OK" +checks.PSU.output_string = Power supply '%Supply%' status is '%Status%' + +checks.Boards.description = IO cards status +checks.Boards.begin_match = ^=+\sIO Cards +checks.Boards.end_match = ^= +checks.Boards.data_match = ^(No failures found in System|(?:No|Detected) System Faults) +checks.Boards.data_labels = Diagnosis +checks.Boards.ok_condition = "%Diagnosis%" =~ m/^No / +checks.Boards.output_string = System diagnosis for IO cards is '%Diagnosis%' + + +[Enterprise 3000] +system.match = Sun Enterprise 3000$ +system.checks = Leds,Fans,Temperatures,PSU,Boards + +checks.Leds.description = system leds status +checks.Leds.begin_match = ^System LED Status: +checks.Leds.end_match = :$ +checks.Leds.data_match = ^\S+\s+(\S+)\s+(\S+)\s+(\S+) +checks.Leds.data_labels = Power,Failure,Running +checks.Leds.ok_condition = "%Failure%" ne "ON" +checks.Leds.output_string = System failure led status is '%Failure%' + +checks.Fans.description = fans status +checks.Fans.begin_match = ^Fans: +checks.Fans.end_match = ^$ +checks.Fans.skip_match = ^(-+|Unit) +checks.Fans.data_match = ^(\S+)\s+(\S+) +checks.Fans.data_labels = Unit,Status +checks.Fans.ok_condition = "%Status%" eq "OK" +checks.Fans.output_string = Fan '%Unit%' status is '%Status%' + +checks.Temperatures.description = temperature sensors +checks.Temperatures.begin_match = ^System Temperatures +checks.Temperatures.end_match = :$ +checks.Temperatures.skip_match = ^Location +checks.Temperatures.data_match = ^(\S+\s+\d+):\s+(.*?)\s+(\S+) +checks.Temperatures.data_labels = Location,Temperature,Trend +checks.Temperatures.ok_condition = ( "%Trend%" eq "stable" ) +checks.Temperatures.output_string = Trend status '%Trend%' for temperature sensor '%Location%' (temp.: %Temperature% deg.) + +checks.PSU.description = power supplies status +checks.PSU.begin_match = ^Power Supplies: +checks.PSU.end_match = ^$ +checks.PSU.data_match = ^((?:\S+\s)*\S+)\s+(\S+) +checks.PSU.skip_match = ^(Supply|-+) +checks.PSU.data_labels = Supply,Status +checks.PSU.ok_condition = "%Status%" eq "OK" +checks.PSU.output_string = Power supply '%Supply%' status is '%Status%' + +checks.Boards.description = IO cards status +checks.Boards.begin_match = ^=+(\sIO Cards|Cartes ES) +checks.Boards.end_match = ^=+\s\S+ +checks.Boards.data_match = ^(No failures found in System|(?:No|Detected) System Faults) +checks.Boards.data_labels = Diagnosis +checks.Boards.ok_condition = "%Diagnosis%" =~ m/^No / +checks.Boards.output_string = System diagnosis for IO cards is '%Diagnosis%' + + +[Ultra 10] +system.match = ^System Configuration:.*Sun Ultra 5\/10 UPA\/PCI +system.checks = Boards + +checks.Boards.description = IO cards status +checks.Boards.begin_match = ^=+\sIO Cards +checks.Boards.end_match = ^= +checks.Boards.data_match = ^(No failures found in System|(?:No|Detected) System Faults) +checks.Boards.data_labels = Diagnosis +checks.Boards.ok_condition = "%Diagnosis%" =~ m/^No / +checks.Boards.output_string = System diagnosis for IO cards is '%Diagnosis%' + + +[SunFire V120] +system.match = ^System Configuration:.*Sun Fire V120 +system.checks = Boards + +checks.Boards.description = IO cards status +checks.Boards.begin_match = ^=+\sIO Cards +checks.Boards.end_match = ^= +checks.Boards.data_match = ^(No failures found in System|(?:No|Detected) System Faults) +checks.Boards.data_labels = Diagnosis +checks.Boards.ok_condition = "%Diagnosis%" =~ m/^No / +checks.Boards.output_string = System diagnosis for IO cards is '%Diagnosis%' + + +[SunFire V240] +system.match = ^System Configuration:.*Sun Fire V240 +system.checks = Fans,Leds,Temperatures,Voltages,Current,FRU + +checks.Fans.description = fans status +checks.Fans.begin_match = ^Fan Speeds: +checks.Fans.end_match = :$ +checks.Fans.data_match = ^(.*?\d+)\s+(\S+)\s+(\S+) +checks.Fans.data_labels = Location,Sensor,Status +checks.Fans.ok_condition = "%Status%" eq "okay" +checks.Fans.output_string = Fan '%Location%/%Sensor%' status is '%Status%' + +checks.Leds.description = system leds status +checks.Leds.begin_match = ^Led State: +checks.Leds.end_match = :$ +checks.Leds.data_match = ^(\S+)\s+(?:SERVICE)\s+(\S+) +checks.Leds.data_labels = Location,State +checks.Leds.ok_condition = "%State%" eq "off" +checks.Leds.output_string = Service indicator '%Location%' state is '%State%' + +checks.Temperatures.description = temperature sensors +checks.Temperatures.begin_match = ^Temperature sensors: +checks.Temperatures.end_match = :$ +checks.Temperatures.skip_match = ^Location +checks.Temperatures.data_match = ^(\S+)\s+(\S+).*?(\S+)$ +checks.Temperatures.data_labels = Location,Sensor,Status +checks.Temperatures.ok_condition = ( "%Status%" eq "okay" ) +checks.Temperatures.output_string = Temperature sensor '%Location%/%Sensor%' status is '%Status%' + +checks.Voltages.description = voltage sensors +checks.Voltages.begin_match = ^Voltage sensors: +checks.Voltages.end_match = :$ +checks.Voltages.skip_match = ^Location +checks.Voltages.data_match = ^(\S+)\s+(\S+).*?(\S+)$ +checks.Voltages.data_labels = Location,Sensor,Status +checks.Voltages.ok_condition = "%Status%" eq "okay" +checks.Voltages.output_string = Voltage sensor '%Location%/%Sensor%' status is '%Status%' + +checks.Current.description = current sensors +checks.Current.begin_match = ^Current sensors: +checks.Current.end_match = ^$ +checks.Current.skip_match = ^Location +checks.Current.data_match = ^(\S+)\s+(\S+).*?(\S+)$ +checks.Current.data_labels = Location,Sensor,Status +checks.Current.ok_condition = "%Status%" eq "okay" +checks.Current.output_string = Current sensor '%Location%/%Sensor%' status is '%Status%' + +checks.FRU.description = FRU operational status +checks.FRU.begin_match = ^Fru Operational Status: +checks.FRU.end_match = ^$ +checks.FRU.skip_match = ^Location +checks.FRU.data_match = ^(\S+)\s+(\S+) +checks.FRU.data_labels = Location,Status +checks.FRU.ok_condition = "%Status%" =~ m/present|okay/ +checks.FRU.output_string = FRU '%Location%' status is '%Status%' + + +[SunFire V440] +system.match = ^System Configuration:.*Sun Fire V440 +system.checks = Fans,Leds,Temperatures,Voltages,Current,FRU + +checks.Fans.description = fans status +checks.Fans.begin_match = ^Fan Speeds: +checks.Fans.end_match = :$ +checks.Fans.data_match = ^(.*?\d+)\s+(\S+)\s+(\S+) +checks.Fans.data_labels = Location,Sensor,Status +checks.Fans.ok_condition = "%Status%" eq "okay" +checks.Fans.output_string = Fan '%Location%/%Sensor%' status is '%Status%' + +checks.Leds.description = system leds status +checks.Leds.begin_match = ^Led State: +checks.Leds.end_match = :$ +checks.Leds.data_match = ^(\S+)\s+(?:SERVICE)\s+(\S+) +checks.Leds.data_labels = Location,State +checks.Leds.ok_condition = "%State%" eq "off" +checks.Leds.output_string = Service indicator '%Location%' state is '%State%' + +checks.Temperatures.description = temperature sensors +checks.Temperatures.begin_match = ^Temperature sensors: +checks.Temperatures.end_match = :$ +checks.Temperatures.skip_match = ^Location +checks.Temperatures.data_match = ^(\S+)\s+(\S+).*?(\S+)$ +checks.Temperatures.data_labels = Location,Sensor,Status +checks.Temperatures.ok_condition = ( "%Status%" eq "okay" ) +checks.Temperatures.output_string = Temperature sensor '%Location%/%Sensor%' status is '%Status%' + +checks.Voltages.description = voltage sensors +checks.Voltages.begin_match = ^Voltage sensors: +checks.Voltages.end_match = :$ +checks.Voltages.skip_match = ^Location +checks.Voltages.data_match = ^(\S+)\s+(\S+).*?(\S+)$ +checks.Voltages.data_labels = Location,Sensor,Status +checks.Voltages.ok_condition = "%Status%" eq "okay" +checks.Voltages.output_string = Voltage sensor '%Location%/%Sensor%' status is '%Status%' + +checks.Current.description = current sensors +checks.Current.begin_match = ^Current sensors: +checks.Current.end_match = ^$ +checks.Current.skip_match = ^Location +checks.Current.data_match = ^(\S+)\s+(\S+).*?(\S+)$ +checks.Current.data_labels = Location,Sensor,Status +checks.Current.ok_condition = "%Status%" eq "okay" +checks.Current.output_string = Current sensor '%Location%/%Sensor%' status is '%Status%' + +checks.FRU.description = FRU operational status +checks.FRU.begin_match = ^Fru Operational Status: +checks.FRU.end_match = ^$ +checks.FRU.skip_match = ^Location +checks.FRU.data_match = ^(\S+)\s+(\S+)$ +checks.FRU.data_labels = Location,Status +checks.FRU.ok_condition = "%Status%" =~ m/present|okay/ +checks.FRU.output_string = FRU '%Location%' status is '%Status%' + + +[SunFire V490] +system.match = ^System Configuration:.*Sun Fire V490 +system.checks = Temperatures,Leds,Disks,Fans,PSU + +checks.Temperatures.description = temperature sensors +checks.Temperatures.begin_match = ^System Temperatures.*: +checks.Temperatures.end_match = ^$ +checks.Temperatures.skip_match = ^Device +checks.Temperatures.data_match = ^(\S+)\s+(\S+)\s+(\S+)$ +checks.Temperatures.data_labels = Sensor,Temperature,Status +checks.Temperatures.ok_condition = ( "%Status%" eq "OK" ) +checks.Temperatures.output_string = Temperature sensor '%Sensor%' status is '%Status%' (temp.: %Temperature% deg.) + +checks.Leds.description = system leds status +checks.Leds.begin_match = ^System LED Status: +checks.Leds.end_match = ^= +checks.Leds.fetch_mode = linear +checks.Leds.skip_match = ^-+ +checks.Leds.data_match = ((?:\S+\s)*\S+),\[\s*(.*?)\s*\] +checks.Leds.data_labels = Location,Status +checks.Leds.ok_condition = not( ( "%Location%" eq "FAULT" ) and ("%Status%" eq "ON") ) +checks.Leds.output_string = System LED '%Location%' status is '%Status%' + +checks.Disks.description = disks status +checks.Disks.begin_match = ^Disk Status: +checks.Disks.end_match = ^$ +checks.Disks.data_match = ^(.*?\d+)(?:.*?)\[\s*(\S+)\s*\]\s*$ +checks.Disks.data_labels = Disk,Status +checks.Disks.ok_condition = "%Status%" eq "NO_FAULT" +checks.Disks.output_string = Disk '%Disk%' status is '%Status%' + +checks.Fans.description = fans status +checks.Fans.begin_match = ^Fan Status: +checks.Fans.end_match = ^= +checks.Fans.data_match = ^(\S+)\s+(\S+)\s+(.*?)\s+\[\s*(\S+)\s*\] +checks.Fans.data_labels = Tray,Fan,Speed,Status +checks.Fans.ok_condition = "%Status%" eq "NO_FAULT" +checks.Fans.output_string = Fan '%Tray%/%Fan%' status is '%Status%' (speed: %Speed% rpm) + +checks.PSU.description = power supplies status +checks.PSU.begin_match = ^Power Supplies: +checks.PSU.end_match = ^= +checks.PSU.data_match = ^(.*?)\s+\[\s*(\S+)\s*\] +checks.PSU.data_labels = Supply,Status +checks.PSU.ok_condition = "%Status%" eq "NO_FAULT" +checks.PSU.output_string = Power supply '%Supply%' status is '%Status%' + + +[SunFire 880] +system.match = ^System Configuration:.*Sun Fire 880 +system.checks = Boards,Temperatures,Leds,Disks,Fans,PSU + +checks.Boards.description = IO cards status +checks.Boards.begin_match = ^=+\sIO Cards +checks.Boards.end_match = ^= +checks.Boards.data_match = ^(No failures found in System|(?:No|Detected) System Faults) +checks.Boards.data_labels = Diagnosis +checks.Boards.ok_condition = "%Diagnosis%" =~ m/^No / +checks.Boards.output_string = System diagnosis for IO cards is '%Diagnosis%' + +checks.Temperatures.description = temperature sensors +checks.Temperatures.begin_match = ^System Temperatures +checks.Temperatures.end_match = ^$ +checks.Temperatures.skip_match = ^Device +checks.Temperatures.data_match = ^(\S+)\s+(.*?)\s+(\S+) +checks.Temperatures.data_labels = Device,Temperature,Status +checks.Temperatures.ok_condition = ( "%Status%" eq "OK" ) +checks.Temperatures.output_string = Temperature sensor '%Device%' status is '%Status%' (temp.: %Temperature% deg.) + +checks.Leds.description = system leds status +checks.Leds.begin_match = ^System LED Status: +checks.Leds.end_match = ^= +checks.Leds.skip_match = ^$ +checks.Leds.fetch_mode = linear +checks.Leds.data_match = ((?:\S+\s)*\S+),\[\s*(.*?)\s*\] +checks.Leds.data_labels = Location,Status +checks.Leds.ok_condition = not( ( "%Location%" eq "FAULT" ) and ("%Status%" eq "ON") ) +checks.Leds.output_string = System LED '%Location%' status is '%Status%' + +checks.Disks.description = disks status +checks.Disks.begin_match = ^Disk Status: +checks.Disks.end_match = ^$ +checks.Disks.data_match = ^(.*?\d+)(?:.*?)\[PRESENT\]\s+\[\s*(\S+)\s*\] +checks.Disks.data_labels = Disk,Fault +checks.Disks.ok_condition = "%Fault%" eq "OFF" +checks.Disks.output_string = Fault LED status '%Fault%' for disk '%Disk%' + +checks.Fans.description = fans status +checks.Fans.begin_match = ^Fan Bank : +checks.Fans.end_match = ^= +checks.Fans.data_match = ^(\S+)\s+(\d+)\s+\[ENABLED\]\s+(\S+) +checks.Fans.data_labels = Fan,Speed,Status +checks.Fans.ok_condition = "%Status%" eq "OK" +checks.Fans.output_string = Fan '%Fan%' status is '%Status%' (speed: %Speed% rpm) + +checks.PSU.description = power supplies status +checks.PSU.begin_match = ^Power Supplies: +checks.PSU.end_match = ^= +checks.PSU.data_match = ^(\S+\d+)\s+(\S+) +checks.PSU.data_labels = Supply,Status +checks.PSU.ok_condition = "%Status%" eq "GOOD" +checks.PSU.output_string = Power supply '%Supply%' status is '%Status%' + + +[SunFire V210] +system.match = ^System Configuration:.*Sun Fire V210 +system.checks = CPU,Fans,Temperatures,Current,Voltages,Leds,FRU + +checks.CPU.description = CPU status +checks.CPU.begin_match = ^=+ CPUs = +checks.CPU.end_match = ^$ +checks.CPU.data_match = ^\s*(\d+)\s+(?:.*?)\s+(\S+)\s+(\S+)\s*$ +checks.CPU.data_labels = CPU,Status,Location +checks.CPU.ok_condition = "%Status%" eq "on-line" +checks.CPU.output_string = CPU%CPU% ('%Location%') status is '%Status%' + +checks.Fans.description = fans status +checks.Fans.begin_match = ^Fan Status: +checks.Fans.end_match = :$ +checks.Fans.skip_match = ^Location +checks.Fans.data_match = ^(\S+)\s+(\S+)\s+(\S+) +checks.Fans.data_labels = Location,Sensor,Status +checks.Fans.ok_condition = "%Status%" eq "okay" +checks.Fans.output_string = Fan '%Location%/%Sensor%' status is '%Status%' + +checks.Leds.description = system leds status +checks.Leds.begin_match = ^Led State: +checks.Leds.end_match = :$ +checks.Leds.data_match = ^(\S+)\s+(?:SERVICE)\s+(\S+) +checks.Leds.data_labels = Location,State +checks.Leds.ok_condition = "%State%" eq "off" +checks.Leds.output_string = Service indicator '%Location%' state is '%State%' + +checks.Temperatures.description = temperature sensors +checks.Temperatures.begin_match = ^Temperature sensors: +checks.Temperatures.end_match = :$ +checks.Temperatures.skip_match = ^Location +checks.Temperatures.data_match = ^(\S+)\s+(\S+).*?(\S+)$ +checks.Temperatures.data_labels = Location,Sensor,Status +checks.Temperatures.ok_condition = ( "%Status%" eq "okay" ) +checks.Temperatures.output_string = Temperature sensor '%Location%/%Sensor%' status is '%Status%' + +checks.Voltages.description = voltage sensors +checks.Voltages.begin_match = ^Voltage sensors: +checks.Voltages.end_match = :$ +checks.Voltages.skip_match = ^Location +checks.Voltages.data_match = ^(\S+)\s+(\S+).*?(\S+)$ +checks.Voltages.data_labels = Location,Sensor,Status +checks.Voltages.ok_condition = "%Status%" eq "okay" +checks.Voltages.output_string = Voltage sensor '%Location%/%Sensor%' status is '%Status%' + +checks.Current.description = current sensors +checks.Current.begin_match = ^Current sensors: +checks.Current.end_match = :$ +checks.Current.skip_match = ^Location +checks.Current.data_match = ^(\S+)\s+(\S+).*?(\S+)$ +checks.Current.data_labels = Location,Sensor,Status +checks.Current.ok_condition = "%Status%" eq "okay" +checks.Current.output_string = Current sensor '%Location%/%Sensor%' status is '%Status%' + +checks.FRU.description = FRU operational status +checks.FRU.begin_match = ^Fru Operational Status: +checks.FRU.end_match = ^$ +checks.FRU.skip_match = ^Location +checks.FRU.data_match = ^(\S+)\s+(\S+) +checks.FRU.data_labels = Location,Status +checks.FRU.ok_condition = "%Status%" =~ m/present|okay/ +checks.FRU.output_string = FRU '%Location%' status is '%Status%' + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Mon May 13 12:54:08 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Mon, 13 May 2013 12:54:08 +0200 Subject: [csw-devel] SF.net SVN: opencsw:[662] mirror In-Reply-To: <20130513100551.1A1B35C6@mail.opencsw.org> (dmichelsen@users.sourceforge.net's message of "Mon, 13 May 2013 10:05:13 +0000") References: <20130513100551.1A1B35C6@mail.opencsw.org> Message-ID: dmichelsen at users.sourceforge.net writes: > +#!/usr/bin/perl -w Maybe: #!/usr/bin/env perl -w is more adequate. -- Peter From wilbury at users.sourceforge.net Mon May 13 13:44:32 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 13 May 2013 11:44:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21063] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 21063 http://gar.svn.sourceforge.net/gar/?rev=21063&view=rev Author: wilbury Date: 2013-05-13 11:44:28 +0000 (Mon, 13 May 2013) Log Message: ----------- php5/trunk: Update dependencies. Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2013-05-12 22:02:52 UTC (rev 21062) +++ csw/mgar/pkg/php5/trunk/Makefile 2013-05-13 11:44:28 UTC (rev 21063) @@ -82,8 +82,8 @@ CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibexpat1 CSWlibz1 -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n50 -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc50 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc51 INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 # embeded 'magic' information to detect file types...odd, but... @@ -130,8 +130,8 @@ SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 CSWlibz1 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n50 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc50 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc51 OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 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 May 13 19:07:10 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 May 2013 17:07:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21064] csw/mgar/gar/v2 Message-ID: Revision: 21064 http://gar.svn.sourceforge.net/gar/?rev=21064&view=rev Author: wahwah Date: 2013-05-13 17:07:10 +0000 (Mon, 13 May 2013) Log Message: ----------- pkgdb: Fix generate-catalog-file's tests Also, register the test in the central test suite so we don't miss these tests in the future. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py csw/mgar/gar/v2/tests/run_tests.py Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-13 11:44:28 UTC (rev 21063) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-13 17:07:10 UTC (rev 21064) @@ -29,20 +29,19 @@ # bind 9.4.2,REV=2008.07.09_rev=p1 CSWbind # bind-9.4.2,REV=2008.07.09_rev=p1-SunOS5.8-sparc-CSW.pkg.gz # f68df57fcf54bfd37304b79d6f7eeacc 2954112 CSWcommon|CSWosslrt net none - cfg = generate_catalog_file.CatalogFileGenerator("dublin", "sparc", "SunOS5.10", mock_pkgcache, mock_rest) - mock_pkgcache.GetDeps('fdb7912713da36afcbbe52266c15cb3f').AndReturn( - { - "pkgname": "CSW389-admin-mock", - "deps": [ - ["CSWfoo", ""], - ["CSWbar", ""], - ] - } - ) - mock_pkgcache.GetPkgstats('fdb7912713da36afcbbe52266c15cb3f').AndReturn( - # {"i_depends": ["CSWincompatible", "CSWzorg"]} - {"i_depends": []} - ) + cfg = generate_catalog_file.CatalogFileGenerator("dublin", + "sparc", + "SunOS5.10", + mock_pkgcache, mock_rest) + mock_rest.GetCatalogData('fdb7912713da36afcbbe52266c15cb3f').AndReturn({ + "deps": [ + ["CSWfoo", ""], + ["CSWbar", ""], + ], + "i_deps": [], + "pkginfo_name": "389_admin - The 389 LDAP server Admin Tools", + "pkgname": "CSW389-admin-mock", + }) self.mox.ReplayAll() self.assertEquals( "389_admin " Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2013-05-13 11:44:28 UTC (rev 21063) +++ csw/mgar/gar/v2/tests/run_tests.py 2013-05-13 17:07:10 UTC (rev 21064) @@ -18,6 +18,7 @@ from database_test import * from dependency_checks_test import * from inspective_package_test import * +from generate_catalog_file import * from ldd_emul_test import * from models_test import * from opencsw_test import * 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 May 13 19:27:58 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 May 2013 17:27:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21065] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21065 http://gar.svn.sourceforge.net/gar/?rev=21065&view=rev Author: wahwah Date: 2013-05-13 17:27:58 +0000 (Mon, 13 May 2013) Log Message: ----------- pkgdb: A multi-line test for generate-catalog-file To be able to test adding new lines to the catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/generate_catalog_file.py csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-13 17:07:10 UTC (rev 21064) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-13 17:27:58 UTC (rev 21065) @@ -80,12 +80,19 @@ out_file = os.path.join(out_dir, CATALOG_FN) if os.path.exists(out_file): raise Error("File %s already exists." % out_file) + lines = self._GenerateCatalogLines() + with open(out_file, "w") as fd: + fd.write("\n".join(lines)) + + def _GenerateCatalogAsLines(self): + """Return the complete catalog as a list of lines.""" lines = [] + # Potential additional lines might go here. + # liens.append("...") if self.catalog: # the catalog might be None for pkg_data in self.catalog: lines.append(self.ComposeCatalogLine(pkg_data)) - with open(out_file, "w") as fd: - fd.write("\n".join(lines)) + return lines def GenerateDescriptions(self, out_dir): out_file = os.path.join(out_dir, DESC_FN) Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-13 17:07:10 UTC (rev 21064) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-13 17:27:58 UTC (rev 21065) @@ -17,6 +17,21 @@ "version_string": "1.1.29,REV=2012.05.02" } +FAKE_CATALOG_DATA = { + "deps": [ + ["CSWfoo", ""], + ["CSWbar", ""], + ], + "i_deps": [], + "pkginfo_name": "389_admin - The 389 LDAP server Admin Tools", + "pkgname": "CSW389-admin-mock", +} + +EXPECTED_LINE = ("389_admin 1.1.29,REV=2012.05.02 CSW389-admin-mock " + "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz " + "fdb7912713da36afcbbe52266c15cb3f 395802 CSWfoo|CSWbar " + "none none") + class CatalogFileGeneratorUnitTest(mox.MoxTestBase): def testComposeCatalogLineBasic(self): @@ -33,27 +48,27 @@ "sparc", "SunOS5.10", mock_pkgcache, mock_rest) - mock_rest.GetCatalogData('fdb7912713da36afcbbe52266c15cb3f').AndReturn({ - "deps": [ - ["CSWfoo", ""], - ["CSWbar", ""], - ], - "i_deps": [], - "pkginfo_name": "389_admin - The 389 LDAP server Admin Tools", - "pkgname": "CSW389-admin-mock", - }) + md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' + mock_rest.GetCatalogData(md5_sum).AndReturn(FAKE_CATALOG_DATA) self.mox.ReplayAll() - self.assertEquals( - "389_admin " - "1.1.29,REV=2012.05.02 " - "CSW389-admin-mock " - "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz " - "fdb7912713da36afcbbe52266c15cb3f " - "395802 " - "CSWfoo|CSWbar " - "none none", - cfg.ComposeCatalogLine(PKG_DATA_1)) + self.assertEquals(EXPECTED_LINE, cfg.ComposeCatalogLine(PKG_DATA_1)) + def testGenerateCatalogAsLines(self): + mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) + mock_rest = self.mox.CreateMock(rest.RestClient) + cfg = generate_catalog_file.CatalogFileGenerator("dublin", + "sparc", + "SunOS5.10", + mock_pkgcache, mock_rest) + md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' + mock_rest.GetCatalog('dublin', 'sparc', 'SunOS5.10').AndReturn([PKG_DATA_1]) + mock_rest.GetCatalogData(md5_sum).AndReturn(FAKE_CATALOG_DATA) + self.mox.ReplayAll() + self.assertEquals([ + # Potential additional lines go here. + EXPECTED_LINE, + ], cfg._GenerateCatalogAsLines()) + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon May 13 22:28:46 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 13 May 2013 20:28:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21066] csw/mgar/pkg/gnutls3/trunk Message-ID: Revision: 21066 http://gar.svn.sourceforge.net/gar/?rev=21066&view=rev Author: chninkel Date: 2013-05-13 20:28:40 +0000 (Mon, 13 May 2013) Log Message: ----------- gnutls3/trunk: suppress gets warning Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gnutls3/trunk/files/0001-no-gets-warning.patch Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-13 17:27:58 UTC (rev 21065) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-13 20:28:40 UTC (rev 21066) @@ -12,7 +12,7 @@ MASTER_SITES = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(SUBV)/ DISTFILES += $(DISTNAME).tar.xz # PATCHFILES += 0001-Do-not-strip-norunpath.patch -#PATCHFILES += 0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch +PATCHFILES += 0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch # Sun Studio 12 bails out on .deinit_func GARCOMPILER = GCC4 @@ -59,6 +59,8 @@ OBSOLETED_BY_CSWlibgnutls-dev = CSWgnutlsdevel CATALOGNAME_CSWgnutlsdevel = gnutls_devel_stub +PATCHFILES += 0001-no-gets-warning.patch + # We don't need it and if defined the test breaks #LD_OPTIONS = @@ -74,3 +76,7 @@ include gar/category.mk +pre-configure: + cd $(WORKSRC) && autoconf + @${MAKECOOKIE} + Added: csw/mgar/pkg/gnutls3/trunk/files/0001-no-gets-warning.patch =================================================================== --- csw/mgar/pkg/gnutls3/trunk/files/0001-no-gets-warning.patch (rev 0) +++ csw/mgar/pkg/gnutls3/trunk/files/0001-no-gets-warning.patch 2013-05-13 20:28:40 UTC (rev 21066) @@ -0,0 +1,25 @@ +From d65e6e5f4ae8d5a326ead9db9c2e0117b149835b Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Mon, 13 May 2013 17:51:35 +0200 +Subject: [PATCH] no gets warning + +--- + gl/m4/stdio_h.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4 +index ebade06..9788ded 100644 +--- a/gl/m4/stdio_h.m4 ++++ b/gl/m4/stdio_h.m4 +@@ -74,7 +74,7 @@ AC_DEFUN([gl_STDIO_H], + dnl corresponding gnulib module is not in use, and which is not + dnl guaranteed by both C89 and C11. + gl_WARN_ON_USE_PREPARE([[#include +- ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen ++ ]], [dprintf fpurge fseeko ftello getdelim getline pclose popen + renameat snprintf tmpfile vdprintf vsnprintf]) + ]) + +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon May 13 22:29:51 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 13 May 2013 20:29:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21067] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: Revision: 21067 http://gar.svn.sourceforge.net/gar/?rev=21067&view=rev Author: chninkel Date: 2013-05-13 20:29:51 +0000 (Mon, 13 May 2013) Log Message: ----------- gnutls3/trunk: workaround a host detection bug in configure for amd64 Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-13 20:28:40 UTC (rev 21066) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-13 20:29:51 UTC (rev 21067) @@ -70,6 +70,9 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --with-lzo +# Workaround a host detection bug in configure for amd64 +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) +CONFIGURE_ARGS_amd64 += --host=x86_64-pc-solaris2$(shell uname -r |sed -e 's/[^.]*//') # We put all libs in one package as they are .so.26 and are all bumped together CHECKPKG_OVERRIDES_CSWlibgnutls26 += shared-lib-pkgname-mismatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 00:53:53 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 May 2013 22:53:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21068] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21068 http://gar.svn.sourceforge.net/gar/?rev=21068&view=rev Author: wahwah Date: 2013-05-13 22:53:53 +0000 (Mon, 13 May 2013) Log Message: ----------- generate-catalog-file: More unit tests To smoke-test the basic generation functions. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/generate_catalog_file.py csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-13 20:29:51 UTC (rev 21067) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-13 22:53:53 UTC (rev 21068) @@ -80,9 +80,9 @@ out_file = os.path.join(out_dir, CATALOG_FN) if os.path.exists(out_file): raise Error("File %s already exists." % out_file) - lines = self._GenerateCatalogLines() + lines = self._GenerateCatalogAsLines() with open(out_file, "w") as fd: - fd.write("\n".join(lines)) + fd.write("\n".join(lines).encode('utf-8')) def _GenerateCatalogAsLines(self): """Return the complete catalog as a list of lines.""" @@ -104,7 +104,7 @@ catalog_data = self.pkgcache.GetDeps(pkg_data["md5_sum"]) lines.append(catalog_data['pkginfo_name']) with open(out_file, "w") as fd: - fd.write("\n".join(lines)) + fd.write("\n".join(lines).encode('utf-8')) def main(): Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-13 20:29:51 UTC (rev 21067) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-13 22:53:53 UTC (rev 21068) @@ -4,6 +4,8 @@ import mox import generate_catalog_file import rest +import __builtin__ +import io PKG_DATA_1 = { "basename": "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz", @@ -69,6 +71,38 @@ EXPECTED_LINE, ], cfg._GenerateCatalogAsLines()) + def testGenerateCatalog(self): + mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) + mock_rest = self.mox.CreateMock(rest.RestClient) + self.mox.StubOutWithMock(__builtin__, 'open') + cfg = generate_catalog_file.CatalogFileGenerator("dublin", + "sparc", + "SunOS5.10", + mock_pkgcache, mock_rest) + mock_rest.GetCatalog('dublin', 'sparc', 'SunOS5.10').AndReturn([PKG_DATA_1]) + md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' + mock_rest.GetCatalogData(md5_sum).AndReturn(FAKE_CATALOG_DATA) + fake_file = io.BytesIO(); + open('fake-dir/catalog', 'w').AndReturn(fake_file) + self.mox.ReplayAll() + cfg.GenerateCatalog('fake-dir') + def testGenerateDescriptions(self): + mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) + mock_rest = self.mox.CreateMock(rest.RestClient) + self.mox.StubOutWithMock(__builtin__, 'open') + cfg = generate_catalog_file.CatalogFileGenerator("dublin", + "sparc", + "SunOS5.10", + mock_pkgcache, mock_rest) + md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' + mock_pkgcache.GetDeps(md5_sum).AndReturn(FAKE_CATALOG_DATA) + mock_rest.GetCatalog('dublin', 'sparc', 'SunOS5.10').AndReturn([PKG_DATA_1]) + fake_file = io.BytesIO(); + open('fake-dir/descriptions', 'w').AndReturn(fake_file) + self.mox.ReplayAll() + cfg.GenerateDescriptions('fake-dir') + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 00:54:09 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 May 2013 22:54:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21069] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21069 http://gar.svn.sourceforge.net/gar/?rev=21069&view=rev Author: wahwah Date: 2013-05-13 22:54:09 +0000 (Mon, 13 May 2013) Log Message: ----------- pkgdb: Fix inspective_package unit tests Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-05-13 22:53:53 UTC (rev 21068) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-05-13 22:54:09 UTC (rev 21069) @@ -15,6 +15,7 @@ import shell import mmap import tempfile +import io from elftools.elf.elffile import ELFFile from elftools.elf.enums import ENUM_E_MACHINE @@ -282,12 +283,20 @@ binary_info = {'version definition': [], 'version needed': []} - if not os.fstat(elfdump_output_file.fileno()).st_size: + try: + file_size = os.fstat(elfdump_output_file.fileno()).st_size + except io.UnsupportedOperation: + file_size = len(elfdump_output_file.getvalue()) + if not file_size: binary_info['symbol table'] = [] binaries_elf_info[binary] = binary_info continue - elfdump_output = mmap.mmap(elfdump_output_file.fileno(), 0, prot=mmap.PROT_READ) + try: + fileno = elfdump_output_file.fileno() + elfdump_output = mmap.mmap(fileno, 0, prot=mmap.PROT_READ) + except io.UnsupportedOperation: + elfdump_output = elfdump_output_file cur_section = None for line in iter(elfdump_output.readline, ""): Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-05-13 22:53:53 UTC (rev 21068) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-05-13 22:54:09 UTC (rev 21069) @@ -9,6 +9,8 @@ import magic import os import common_constants +import tempfile +import io LDD_R_OUTPUT_1 = """\tlibc.so.1 => /lib/libc.so.1 \tsymbol not found: check_encoding_conversion_args (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) @@ -135,7 +137,7 @@ -class InspectivePackageUnitTest(mox.MoxTestBase): +class InspectivePackageUnitTest(mox.MoxTestBase, unittest.TestCase): def testListBinaries(self): self.mox.StubOutWithMock(os, 'access') @@ -220,6 +222,11 @@ def testGetBinaryElfInfoRoot(self): + self.mox.StubOutWithMock(tempfile, 'TemporaryFile') + fake_file = io.BytesIO() + fake_file.write(ELFDUMP_OUTPUT) + fake_file.seek(0) + tempfile.TemporaryFile().AndReturn(fake_file) fake_binary = 'opt/csw/lib/libssl.so.1.0.0' fake_package_path = '/fake/path/CSWfoo' @@ -235,12 +242,20 @@ args = [common_constants.ELFDUMP_BIN, '-svy', os.path.join(fake_package_path, "root", fake_binary)] - shell.ShellCommand(args, allow_error=True).AndReturn((0, ELFDUMP_OUTPUT, "")) + shell.ShellCommand( + args, + allow_error=True, + stdout=mox.IgnoreArg()).AndReturn((0, "", "")) self.mox.ReplayAll() self.assertEqual(BINARY_ELFINFO, ip.GetBinaryElfInfo()) def testGetBinaryElfInfoReloc(self): + self.mox.StubOutWithMock(tempfile, 'TemporaryFile') + fake_file = io.BytesIO() + fake_file.write(ELFDUMP_OUTPUT) + fake_file.seek(0) + tempfile.TemporaryFile().AndReturn(fake_file) fake_binary = 'lib/libssl.so.1.0.0' fake_package_path = '/fake/path/CSWfoo' @@ -256,7 +271,7 @@ args = [common_constants.ELFDUMP_BIN, '-svy', os.path.join(fake_package_path, "reloc", fake_binary)] - shell.ShellCommand(args, allow_error=True).AndReturn((0, ELFDUMP_OUTPUT, "")) + shell.ShellCommand(args, allow_error=True, stdout=fake_file).AndReturn((0, "", "")) self.mox.ReplayAll() self.assertEqual(BINARY_ELFINFO, ip.GetBinaryElfInfo()) @@ -296,6 +311,12 @@ 'version definition': [], } } + self.maxDiff = None + self.mox.StubOutWithMock(tempfile, 'TemporaryFile') + fake_file = io.BytesIO() + fake_file.write(fake_elfdump_output) + fake_file.seek(0) + tempfile.TemporaryFile().AndReturn(fake_file) ip = inspective_package.InspectivePackage(fake_package_path) self.mox.StubOutWithMock(ip, 'ListBinaries') self.mox.StubOutWithMock(ip, 'GetBasedir') @@ -308,7 +329,10 @@ args = [common_constants.ELFDUMP_BIN, '-svy', os.path.join(fake_package_path, "root", fake_binary)] - shell.ShellCommand(args, allow_error=True).AndReturn((0, fake_elfdump_output, fake_elfdump_errors)) + shell.ShellCommand( + args, + allow_error=True, + stdout=fake_file).AndReturn((0, fake_elfdump_output, fake_elfdump_errors)) self.mox.ReplayAll() self.assertEqual(fake_binary_elfinfo, ip.GetBinaryElfInfo()) 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 May 14 14:14:20 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 14 May 2013 12:14:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21070] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 21070 http://gar.svn.sourceforge.net/gar/?rev=21070&view=rev Author: lblume Date: 2013-05-14 12:14:20 +0000 (Tue, 14 May 2013) Log Message: ----------- krb5-lib/trunk: Add a fix to remove compiler-specific options from the config script; remove some obsolete overrides Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-05-13 22:54:09 UTC (rev 21069) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-05-14 12:14:20 UTC (rev 21070) @@ -66,8 +66,6 @@ PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub -# /usr/local in a manpage is OK. -CHECKPKG_OVERRIDES_CSWlibkrb5-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sserver.8 PACKAGES += CSWlibcom-err3 CATALOGNAME_CSWlibcom-err3 = libcom_err3 @@ -106,7 +104,6 @@ RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0 RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3 -CHECKPKG_OVERRIDES_CSWlibkrb5-priv += non-uniform-lib-versions-in-package PACKAGES += CSWlibkrb5-3 CATALOGNAME_CSWlibkrb5-3 = libkrb5_3 @@ -179,3 +176,7 @@ perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \ $(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in @$(MAKECOOKIE) + +# Remove Studio-specific arch references +post-install-modulated: + gsed -i -e '/^[^#]/s/-xarch=[^ ]* //' -e '/^[^#]/s/-xchip=[^ ]* //' $(DESTDIR)$(bindir)/krb5-config 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 May 14 17:38:34 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 14 May 2013 15:38:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21071] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 21071 http://gar.svn.sourceforge.net/gar/?rev=21071&view=rev Author: lblume Date: 2013-05-14 15:38:34 +0000 (Tue, 14 May 2013) Log Message: ----------- krb5-lib/trunk: Remove incorrect dependency Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-05-14 12:14:20 UTC (rev 21070) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-05-14 15:38:34 UTC (rev 21071) @@ -52,7 +52,6 @@ PACKAGES += CSWlibkrb5-dev SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries -RUNTIME_DEP_PKGS_CSWlibkrb5-dev = CSWkrb5lib RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2 @@ -160,9 +159,6 @@ INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile -# This name is so old that there it is not recognized as devel-package -CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWkrb5lib - # pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname CATALOGNAME_CSWkrb5lib = krb5_lib_stub This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 17:39:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 15:39:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21072] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21072 http://gar.svn.sourceforge.net/gar/?rev=21072&view=rev Author: wahwah Date: 2013-05-14 15:39:17 +0000 (Tue, 14 May 2013) Log Message: ----------- integrate-catalogs: Bugfix + test cases This bug caused an inconsitency in the kiel catalog, because two lines mushed together resulted in an unapplied change to the kiel catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/integrate_catalogs_test.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2013-05-14 15:38:34 UTC (rev 21071) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2013-05-14 15:39:17 UTC (rev 21072) @@ -12,17 +12,13 @@ from Cheetah import Template import cjson -import gdbm -import json import catalog import common_constants import logging import opencsw import optparse -import pprint import rest import sys -import urllib2 import re @@ -39,7 +35,7 @@ "machine buildfarm.opencsw.org login \${LOGNAME} password \$(cat /etc/opt/csw/releases/auth/\${LOGNAME})" fi -set -x +set -e readonly CURL="curl --netrc" readonly REST_URL=http://buildfarm.opencsw.org/releases/ @@ -112,6 +108,7 @@ #if "new_pkgs" in $diffs_by_catalogname[$catalogname]: new_pkg_$catalogname# #end if + #if "removed_pkgs" in $diffs_by_catalogname[$catalogname]: remove_pkg_$catalogname# #end if @@ -135,9 +132,11 @@ #end for """ + class Error(Exception): """Generic error.""" + class UsageError(Error): """Wrong usage.""" @@ -146,7 +145,7 @@ return dict((x[field], x) for x in d) -def GetDiffsByCatalogname(catrel_from, catrel_to, include_downgrades, +def GetCatalogs(catrel_from, catrel_to, include_downgrades, include_version_changes): rest_client = rest.RestClient() def GetCatalog(rest_client, r_catrel, r_arch, r_osrel): @@ -163,11 +162,9 @@ catalogs_to_fetch_args.append((rest_client, catrel, arch, osrel)) # Convert this to pool.map when multiprocessing if fixed. catalogs = dict(map(lambda x: GetCatalog(*x), catalogs_to_fetch_args)) - diffs_by_catalogname = ComposeDiffsByCatalogname( - catalogs, catrel_from, catrel_to, include_version_changes, - include_downgrades) - return catalogs, diffs_by_catalogname + return catalogs + def ComposeDiffsByCatalogname(catalogs, catrel_from, catrel_to, include_version_changes, include_downgrades): """Get a data structure indexed with catalognames. @@ -286,9 +283,12 @@ (tuple(cjson.decode(x)), jsonable_catalogs[x]) for x in jsonable_catalogs) else: - catalogs, diffs_by_catalogname = GetDiffsByCatalogname( + catalogs = GetCatalogs( catrel_from, catrel_to, options.include_downgrades, options.include_version_changes) + diffs_by_catalogname = ComposeDiffsByCatalogname( + catalogs, catrel_from, catrel_to, include_version_changes, + include_downgrades) bundles_by_md5 = {} bundles_missing = set() cp = rest.CachedPkgstats("pkgstats") @@ -300,7 +300,6 @@ if md5 not in bundles_by_md5 and md5 not in bundles_missing: stats = cp.GetPkgstats(md5) bundle_key = "OPENCSW_BUNDLE" - # pprint.pprint(stats) if stats: if bundle_key in stats["pkginfo"]: bundles_by_md5[md5] = stats["pkginfo"][bundle_key] Added: csw/mgar/gar/v2/lib/python/integrate_catalogs_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs_test.py 2013-05-14 15:39:17 UTC (rev 21072) @@ -0,0 +1,160 @@ +#!/opt/csw/bin/python2.6 + +import Cheetah +import mox +import unittest2 as unittest + +import integrate_catalogs + +OUT_1 = u"""#!/bin/bash +# Catalog modification (not integration yet): unstable-fake -> kiel-fake +# Generated by fake_prog + + +if ! grep buildfarm ~/.netrc +then + touch ~/.netrc + chmod 0600 ~/.netrc + echo >> ~/.netrc "machine buildfarm.opencsw.org login ${LOGNAME} password $(cat /etc/opt/csw/releases/auth/${LOGNAME})" +fi + +set -e + +readonly CURL="curl --netrc" +readonly REST_URL=http://buildfarm.opencsw.org/releases/ + +function _add_to_cat { + ${CURL} -X PUT ${REST_URL}catalogs/$1/$2/$3/$4/ ; echo +} + +function _del_from_cat { + ${CURL} -X DELETE ${REST_URL}catalogs/$1/$2/$3/$4/ ; echo +} + +""" + +OUT_2 = OUT_1 + """function new_pkg_fake_catalogname_1 { + # adding fake_basename_1.pkg + _add_to_cat kiel-fake i386 SunOS5.10 6110aad210240504ede48f9cd8b4501c +} +function undo_new_pkg_fake_catalogname_1 { + # UNDO adding fake_basename_1.pkg + _del_from_cat kiel-fake i386 SunOS5.10 6110aad210240504ede48f9cd8b4501c +} + +function new_pkg_fake_catalogname_2 { + # adding fake_basename_2.pkg + _add_to_cat kiel-fake sparc SunOS5.10 6110aad210240504ede48f9cd8b4501d +} +function undo_new_pkg_fake_catalogname_2 { + # UNDO adding fake_basename_2.pkg + _del_from_cat kiel-fake sparc SunOS5.10 6110aad210240504ede48f9cd8b4501d +} +function upgrade_fake_catalogname_2 { + # fake_catalogname_2 upgrade from 1.1.31,REV=2013.01.07 to 1.0,REV=2013.01.08 + _del_from_cat kiel-fake i386 SunOS5.10 6110aad210240504ede48f9cd8b4501c + _add_to_cat kiel-fake i386 SunOS5.10 6110aad210240504ede48f9cd8b4501d +} +function undo_upgrade_fake_catalogname_2 { + # UNDO of fake_catalogname_2 upgrade from 1.1.31,REV=2013.01.07 to 1.0,REV=2013.01.08 + _del_from_cat kiel-fake i386 SunOS5.10 6110aad210240504ede48f9cd8b4501d + _add_to_cat kiel-fake i386 SunOS5.10 6110aad210240504ede48f9cd8b4501c +} + +new_pkg_fake_catalogname_1 + # bundles: +new_pkg_fake_catalogname_2 +upgrade_fake_catalogname_2 # version 1.1.31,REV=2013.01.07 to 1.0,REV=2013.01.08 # bundles: +""" + +class TemplateUnitTest(mox.MoxTestBase, unittest.TestCase): + + def testTemplateMinimal(self): + self.maxDiff = None + bundles_by_catalogname = {} + bundles_by_md5 = {} + diffs_by_catalogname = {} + namespace = { + "bundles_by_catalogname": bundles_by_catalogname, + "bundles_by_md5": bundles_by_md5, + "diffs_by_catalogname": diffs_by_catalogname, + "catrel_to": "kiel-fake", + "catrel_from": "unstable-fake", + "prog": "fake_prog", + } + t = Cheetah.Template.Template(integrate_catalogs.CATALOG_MOD_TMPL, searchList=[namespace]) + # Compare line by line for better output. + self.assertEqual(OUT_1.splitlines(), unicode(t).splitlines()) + + def testTemplateUpgrade(self): + self.maxDiff = None + bundles_by_catalogname = { + "fake_catalogname_1" : [], + "fake_catalogname_2" : [], + } + bundles_by_md5 = { + "fake_md5": [], + } + catalogs = { + ("unstable-fake", "i386", "SunOS5.8"): [], + ("kiel-fake", "i386", "SunOS5.8"): [], + ("unstable-fake", "i386", "SunOS5.9"): [], + ("kiel-fake", "i386", "SunOS5.9"): [], + ("unstable-fake", "i386", "SunOS5.10"): [ + { + "basename": "fake_basename_1.pkg", + "catalogname": "fake_catalogname_1", + "md5_sum": "6110aad210240504ede48f9cd8b4501c", + "version": "1.1.30,REV=2013.01.08", + }, + { + "basename": "fake_basename_2.pkg", + "catalogname": "fake_catalogname_2", + "md5_sum": "6110aad210240504ede48f9cd8b4501d", + "version": "1.0,REV=2013.01.08", + }, + ], + ("kiel-fake", "i386", "SunOS5.10"): [ + { + "basename": "fake_basename_2.pkg", + "catalogname": "fake_catalogname_2", + "md5_sum": "6110aad210240504ede48f9cd8b4501c", + "version": "1.1.31,REV=2013.01.07", + }, + ], + ("unstable-fake", "i386", "SunOS5.11"): [], + ("kiel-fake", "i386", "SunOS5.11"): [], + + ("unstable-fake", "sparc", "SunOS5.8"): [], + ("kiel-fake", "sparc", "SunOS5.8"): [], + ("unstable-fake", "sparc", "SunOS5.9"): [], + ("kiel-fake", "sparc", "SunOS5.9"): [], + ("unstable-fake", "sparc", "SunOS5.10"): [ + { + "basename": "fake_basename_2.pkg", + "catalogname": "fake_catalogname_2", + "md5_sum": "6110aad210240504ede48f9cd8b4501d", + "version": "1.0,REV=2013.01.08", + }, + ], + ("kiel-fake", "sparc", "SunOS5.10"): [], + ("unstable-fake", "sparc", "SunOS5.11"): [], + ("kiel-fake", "sparc", "SunOS5.11"): [], + } + diffs_by_catalogname = integrate_catalogs.ComposeDiffsByCatalogname( + catalogs, "unstable-fake", "kiel-fake", True, True) + namespace = { + "bundles_by_catalogname": bundles_by_catalogname, + "bundles_by_md5": bundles_by_md5, + "diffs_by_catalogname": diffs_by_catalogname, + "catrel_to": "kiel-fake", + "catrel_from": "unstable-fake", + "prog": "fake_prog", + } + t = Cheetah.Template.Template(integrate_catalogs.CATALOG_MOD_TMPL, searchList=[namespace]) + # Compare line by line for better output. + self.assertEqual(OUT_2.splitlines(), unicode(t).splitlines()) + + +if __name__ == '__main__': + unittest.main() Property changes on: csw/mgar/gar/v2/lib/python/integrate_catalogs_test.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 18:44:49 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 16:44:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21073] csw/mgar/gar/v2/tests/run_tests.py Message-ID: Revision: 21073 http://gar.svn.sourceforge.net/gar/?rev=21073&view=rev Author: wahwah Date: 2013-05-14 16:44:49 +0000 (Tue, 14 May 2013) Log Message: ----------- pkgdb: integrate_catalogs_test added to the suite Modified Paths: -------------- csw/mgar/gar/v2/tests/run_tests.py Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2013-05-14 15:39:17 UTC (rev 21072) +++ csw/mgar/gar/v2/tests/run_tests.py 2013-05-14 16:44:49 UTC (rev 21073) @@ -17,6 +17,7 @@ from csw_upload_pkg_test import * from database_test import * from dependency_checks_test import * +from integrate_catalogs_test import * from inspective_package_test import * from generate_catalog_file import * from ldd_emul_test import * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 18:45:07 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 16:45:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[21074] csw/mgar/gar/v2/lib Message-ID: Revision: 21074 http://gar.svn.sourceforge.net/gar/?rev=21074&view=rev Author: wahwah Date: 2013-05-14 16:45:07 +0000 (Tue, 14 May 2013) Log Message: ----------- pkgdb-web: Return data for catalog generation Just the data we need, no less, no more. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/representations.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-05-14 16:44:49 UTC (rev 21073) +++ csw/mgar/gar/v2/lib/python/models.py 2013-05-14 16:45:07 UTC (rev 21074) @@ -489,6 +489,39 @@ ).orderBy('catalogname') return res + +def GetCatalogGenerationResult(sqo_osrel, sqo_arch, sqo_catrel): + """Get rows with catalog results. + + CatalogEntry + catalogname version pkgname basename md5_sum size deps category i_deps + """ + join = [ + sqlbuilder.INNERJOINOn(None, + Srv4FileInCatalog, + Srv4FileInCatalog.q.srv4file==Srv4FileStats.q.id), + sqlbuilder.INNERJOINOn(None, + CatalogGenData, + Srv4FileStats.q.md5_sum==CatalogGenData.q.md5_sum), + ] + where = sqlbuilder.AND( + Srv4FileInCatalog.q.osrel==sqo_osrel, + Srv4FileInCatalog.q.arch==sqo_arch, + Srv4FileInCatalog.q.catrel==sqo_catrel, + Srv4FileStats.q.use_to_generate_catalogs==True, + ) + select = sqlbuilder.Select( + ['catalogname', 'version_string', 'pkgname', 'basename', + 'srv4_file_stats.md5_sum', + 'size', 'deps', 'i_deps'], + where=where, + orderBy='catalogname', + join=join) + query = sqlobject.sqlhub.processConnection.sqlrepr(select) + rows = sqlobject.sqlhub.processConnection.queryAll(query) + return rows + + def GetSqoTriad(osrel, arch, catrel): sqo_osrel = OsRelease.selectBy(short_name=osrel).getOne() sqo_arch = Architecture.selectBy(name=arch).getOne() Added: csw/mgar/gar/v2/lib/python/representations.py =================================================================== --- csw/mgar/gar/v2/lib/python/representations.py (rev 0) +++ csw/mgar/gar/v2/lib/python/representations.py 2013-05-14 16:45:07 UTC (rev 21074) @@ -0,0 +1,6 @@ +import collections + +# Full catalog entry, enough to write a line of a catalog file. +CatalogEntry = collections.namedtuple( + 'CatalogEntry', 'catalogname version pkgname basename' + 'md5_sum size deps category i_deps') Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-14 16:44:49 UTC (rev 21073) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-14 16:45:07 UTC (rev 21074) @@ -17,6 +17,7 @@ from lib.python import models from lib.python import configuration from lib.python import checkpkg_lib +from lib.python import representations from lib.web import web_lib import datetime from sqlobject import sqlbuilder @@ -43,6 +44,8 @@ 'PkgnameByFilename', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames-and-paths-by-basename', 'PkgnamesAndPathsByBasename', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/for-generation/', + 'CatalogForGeneration', # Query by catalog release, arch, OS release and catalogname r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname', @@ -505,6 +508,36 @@ return cjson.encode(simple_data) +class CatalogForGeneration(object): + + def GET(self, catrel_name, arch_name, osrel_name): + """A list of tuples, aligning with the catalog format. + + catalogname version_string pkgname + basename md5_sum size deps category i_deps + """ + sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( + osrel_name, arch_name, catrel_name) + rows = list(models.GetCatalogGenerationResult(sqo_osrel, sqo_arch, sqo_catrel)) + def GenCatalogEntry(row): + entry = representations.CatalogEntry( + catalogname=row[0], + version=row[1], + pkgname=row[2], + basename=row[3], + md5_sum=row[4], + size=row[5], + deps="|".join([x[0] for x in cjson.decode(row[6])]), + category="none", + i_deps="|".join(cjson.decode(row[7])), + ) + return entry + entries_list = [GenCatalogEntry(row) for row in rows] + response = cjson.encode([tuple(x) for x in entries_list]) + web.header('Content-Length', str(len(response))) + return response + + web.webapi.internalerror = web.debugerror This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 18:45:18 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 16:45:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[21075] csw/mgar/gar/v2/lib/python/rest.py Message-ID: Revision: 21075 http://gar.svn.sourceforge.net/gar/?rev=21075&view=rev Author: wahwah Date: 2013-05-14 16:45:17 +0000 (Tue, 14 May 2013) Log Message: ----------- pkgdb: Retry failed calls to catalog data. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2013-05-14 16:45:07 UTC (rev 21074) +++ csw/mgar/gar/v2/lib/python/rest.py 2013-05-14 16:45:17 UTC (rev 21075) @@ -9,6 +9,7 @@ import pycurl import re import urllib2 +import httplib import retry_decorator @@ -76,6 +77,7 @@ # Other HTTP errors are should be thrown. raise + @retry_decorator.Retry(tries=4, exceptions=(RestCommunicationError, httplib.BadStatusLine)) def GetCatalogData(self, md5_sum): self.ValidateMd5(md5_sum) url = self.rest_url + self.PKGDB_APP + "/srv4/%s/catalog-data/" % md5_sum This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 18:45:31 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 16:45:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[21076] csw/mgar/gar/v2/lib Message-ID: Revision: 21076 http://gar.svn.sourceforge.net/gar/?rev=21076&view=rev Author: wahwah Date: 2013-05-14 16:45:30 +0000 (Tue, 14 May 2013) Log Message: ----------- pkgdb: Various cleanup Modified Paths: -------------- csw/mgar/gar/v2/lib/python/rest.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2013-05-14 16:45:17 UTC (rev 21075) +++ csw/mgar/gar/v2/lib/python/rest.py 2013-05-14 16:45:30 UTC (rev 21076) @@ -113,7 +113,7 @@ try: data = urllib2.urlopen(url).read() return cjson.decode(data) - except urllib2.HTTPError, e: + except urllib2.HTTPError as e: logging.warning("%s -- %s", url, e) return None Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-14 16:45:17 UTC (rev 21075) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-14 16:45:30 UTC (rev 21076) @@ -39,7 +39,7 @@ ) urls_rest = ( r'/rest/catalogs/', 'RestCatalogList', - r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/', 'Catalogs', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/', 'RestCatalogDetail', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgname-by-filename', 'PkgnameByFilename', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames-and-paths-by-basename', @@ -47,8 +47,10 @@ r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/for-generation/', 'CatalogForGeneration', # Query by catalog release, arch, OS release and catalogname - r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname', - r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', + 'Srv4ByCatAndCatalogname', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', + 'Srv4ByCatAndPkgname', r'/rest/maintainers/([0-9]+)/', 'RestMaintainerDetail', r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail', r'/rest/srv4/([0-9a-f]{32})/files/', 'RestSrv4DetailFiles', @@ -301,7 +303,7 @@ return render.ErrorTagList(rows) -class Catalogs(object): +class RestCatalogDetail(object): def GET(self, catrel_name, arch_name, osrel_name): sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( osrel_name, arch_name, catrel_name) @@ -476,6 +478,7 @@ except sqlobject.dberrors.OperationalError, e: raise web.internalerror(e) + class RestCatalogList(object): def GET(self): archs = models.Architecture.select() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 18:45:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 16:45:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21077] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 21077 http://gar.svn.sourceforge.net/gar/?rev=21077&view=rev Author: wahwah Date: 2013-05-14 16:45:41 +0000 (Tue, 14 May 2013) Log Message: ----------- pkgdb-web: Send content length Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-14 16:45:30 UTC (rev 21076) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-14 16:45:41 UTC (rev 21077) @@ -313,7 +313,9 @@ web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=srv4-list') # We never want to return complete data for every object (too slow). pkgs_data = [p.GetRestRepr(quick=True)[1] for p in pkgs] - return cjson.encode(pkgs_data) + response = cjson.encode(pkgs_data) + web.header('Content-Length', str(len(response))) + return response class PkgnameByFilename(object): @@ -508,7 +510,9 @@ 'pkginfo_name': cat_gen_data.pkginfo_name, 'pkgname': cat_gen_data.pkgname, } - return cjson.encode(simple_data) + response = cjson.encode(simple_data) + web.header('Content-Length', str(len(response))) + return response class CatalogForGeneration(object): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 18:48:12 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 16:48:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[21078] csw/mgar/gar/v2/lib/python/representations.py Message-ID: Revision: 21078 http://gar.svn.sourceforge.net/gar/?rev=21078&view=rev Author: wahwah Date: 2013-05-14 16:48:11 +0000 (Tue, 14 May 2013) Log Message: ----------- pkgdb: Small bugfix for representations.py Modified Paths: -------------- csw/mgar/gar/v2/lib/python/representations.py Modified: csw/mgar/gar/v2/lib/python/representations.py =================================================================== --- csw/mgar/gar/v2/lib/python/representations.py 2013-05-14 16:45:41 UTC (rev 21077) +++ csw/mgar/gar/v2/lib/python/representations.py 2013-05-14 16:48:11 UTC (rev 21078) @@ -2,5 +2,5 @@ # Full catalog entry, enough to write a line of a catalog file. CatalogEntry = collections.namedtuple( - 'CatalogEntry', 'catalogname version pkgname basename' + 'CatalogEntry', 'catalogname version pkgname basename ' 'md5_sum size deps category i_deps') 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 May 14 19:25:47 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 May 2013 17:25:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21079] csw/mgar/gar/v2/lib/python/generate_catalog_file.py Message-ID: Revision: 21079 http://gar.svn.sourceforge.net/gar/?rev=21079&view=rev Author: dmichelsen Date: 2013-05-14 17:25:47 +0000 (Tue, 14 May 2013) Log Message: ----------- mGAR v2: Add CREATIONDATE to catalog generation Modified Paths: -------------- csw/mgar/gar/v2/lib/python/generate_catalog_file.py Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-14 16:48:11 UTC (rev 21078) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-14 17:25:47 UTC (rev 21079) @@ -26,6 +26,7 @@ import optparse import logging import sys +from datetime import datetime class Error(Exception): @@ -87,8 +88,10 @@ def _GenerateCatalogAsLines(self): """Return the complete catalog as a list of lines.""" lines = [] + lines.append("# CREATIONDATE " + datetime.now().isoformat() + "Z") + # Potential additional lines might go here. - # liens.append("...") + # lines.append("...") if self.catalog: # the catalog might be None for pkg_data in self.catalog: lines.append(self.ComposeCatalogLine(pkg_data)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 20:16:19 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 18:16:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[21080] csw/mgar/gar/v2/tests/run_tests.py Message-ID: Revision: 21080 http://gar.svn.sourceforge.net/gar/?rev=21080&view=rev Author: wahwah Date: 2013-05-14 18:16:19 +0000 (Tue, 14 May 2013) Log Message: ----------- pkgdb: Fix generate_catalog_file_test in suite It's the _test module that needs to be imported. Modified Paths: -------------- csw/mgar/gar/v2/tests/run_tests.py Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2013-05-14 17:25:47 UTC (rev 21079) +++ csw/mgar/gar/v2/tests/run_tests.py 2013-05-14 18:16:19 UTC (rev 21080) @@ -19,7 +19,7 @@ from dependency_checks_test import * from integrate_catalogs_test import * from inspective_package_test import * -from generate_catalog_file import * +from generate_catalog_file_test import * from ldd_emul_test import * from models_test import * from opencsw_test import * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue May 14 21:34:28 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 14 May 2013 19:34:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[21081] csw/mgar/pkg/cpan/HTML-Mason/trunk Message-ID: Revision: 21081 http://gar.svn.sourceforge.net/gar/?rev=21081&view=rev Author: bonivart Date: 2013-05-14 19:34:27 +0000 (Tue, 14 May 2013) Log Message: ----------- cpan/HTML-Mason/trunk: update to 1.51, fix name and deps Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile csw/mgar/pkg/cpan/HTML-Mason/trunk/checksums Modified: csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile 2013-05-14 18:16:19 UTC (rev 21080) +++ csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile 2013-05-14 19:34:27 UTC (rev 21081) @@ -1,24 +1,30 @@ NAME = HTML-Mason -VERSION = 1.45 +VERSION = 1.51 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = DROLSKY +AUTHOR = JSWARTZ DESCRIPTION = High-performance, dynamic web site authoring system define BLURB - Mason is a tool for building, serving and managing large web sites. Its - features make it an ideal backend for high load sites serving dynamic - content, such as online newspapers or database driven e-commerce sites. endef LICENSE = LICENSE -PACKAGES = CSWpmhtmlmason -CATALOGNAME = pm_htmlmason +PACKAGES = CSWpm-html-mason +CATALOGNAME = pm_html_mason +SPKG_DESC_CSWpm-html-mason = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-html-mason = CSWpmhtmlmason +CATALOGNAME_CSWpmhtmlmason = pm_htmlmason -BUILD_DEP_PKGS = CSWpmlogany CSWpmtestdeep -RUNTIME_DEP_PKGS = CSWpmexceptcls CSWpmclscontainer CSWpmparamsvalidate CSWpmcachecache +BUILD_DEP_PKGS += CSWpm-test-deep +RUNTIME_DEP_PKGS += CSWpmcachecache +RUNTIME_DEP_PKGS += CSWpmclscontainer +RUNTIME_DEP_PKGS += CSWpm-exception-class +RUNTIME_DEP_PKGS += CSWpm-html-parser +RUNTIME_DEP_PKGS += CSWpm-log-any +RUNTIME_DEP_PKGS += CSWpm-params-validate + ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/HTML-Mason/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Mason/trunk/checksums 2013-05-14 18:16:19 UTC (rev 21080) +++ csw/mgar/pkg/cpan/HTML-Mason/trunk/checksums 2013-05-14 19:34:27 UTC (rev 21081) @@ -1 +1 @@ -5ad416ae8425d81dde3daf5fab913a23 HTML-Mason-1.45.tar.gz +bb7ee986b3b7b3ea54fb6b7e25c56e81 HTML-Mason-1.51.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue May 14 21:52:36 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 14 May 2013 19:52:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21082] csw/mgar/pkg/cpan/PPIx-Regexp/trunk Message-ID: Revision: 21082 http://gar.svn.sourceforge.net/gar/?rev=21082&view=rev Author: bonivart Date: 2013-05-14 19:52:34 +0000 (Tue, 14 May 2013) Log Message: ----------- cpan/PPIx-Regexp/trunk: update to 0.034, fix deps Modified Paths: -------------- csw/mgar/pkg/cpan/PPIx-Regexp/trunk/Makefile csw/mgar/pkg/cpan/PPIx-Regexp/trunk/checksums Modified: csw/mgar/pkg/cpan/PPIx-Regexp/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PPIx-Regexp/trunk/Makefile 2013-05-14 19:34:27 UTC (rev 21081) +++ csw/mgar/pkg/cpan/PPIx-Regexp/trunk/Makefile 2013-05-14 19:52:34 UTC (rev 21082) @@ -1,8 +1,5 @@ -# $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# NAME = PPIx-Regexp -VERSION = 0.020 +VERSION = 0.034 GARTYPE = v2 CATEGORIES = cpan AUTHOR = WYANT @@ -18,10 +15,9 @@ LICENSE = LICENSES/Artistic +RUNTIME_DEP_PKGS += CSWpm-list-moreutils RUNTIME_DEP_PKGS += CSWpm-ppi +RUNTIME_DEP_PKGS += CSWpm-task-weaken -# Unreleased dep, remove next time -CHECKPKG_OVERRIDES_CSWpm-ppix-regexp += unidentified-dependency|CSWpm-ppi - include gar/category.mk Modified: csw/mgar/pkg/cpan/PPIx-Regexp/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/PPIx-Regexp/trunk/checksums 2013-05-14 19:34:27 UTC (rev 21081) +++ csw/mgar/pkg/cpan/PPIx-Regexp/trunk/checksums 2013-05-14 19:52:34 UTC (rev 21082) @@ -1 +1 @@ -1293df6eb0765646a73808d32ff8ed82 PPIx-Regexp-0.020.tar.gz +51f9a82dd411a968d76d0562089246b8 PPIx-Regexp-0.034.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 14 22:42:56 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 May 2013 20:42:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21083] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21083 http://gar.svn.sourceforge.net/gar/?rev=21083&view=rev Author: dmichelsen Date: 2013-05-14 20:42:55 +0000 (Tue, 14 May 2013) Log Message: ----------- mGAR v2: Catalog generation CREATIONDATE fixes Modified Paths: -------------- csw/mgar/gar/v2/lib/python/generate_catalog_file.py csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-14 19:52:34 UTC (rev 21082) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-14 20:42:55 UTC (rev 21083) @@ -26,7 +26,7 @@ import optparse import logging import sys -from datetime import datetime +import datetime class Error(Exception): @@ -88,7 +88,7 @@ def _GenerateCatalogAsLines(self): """Return the complete catalog as a list of lines.""" lines = [] - lines.append("# CREATIONDATE " + datetime.now().isoformat() + "Z") + lines.append("# CREATIONDATE " + datetime.datetime.utcnow().replace(microsecond=0).isoformat() + "Z") # Potential additional lines might go here. # lines.append("...") Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-14 19:52:34 UTC (rev 21082) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-14 20:42:55 UTC (rev 21083) @@ -1,5 +1,6 @@ #!/usr/bin/env python +import datetime import unittest import mox import generate_catalog_file @@ -29,6 +30,7 @@ "pkgname": "CSW389-admin-mock", } +#EXPECTED_LINE = (["# CREATIONDATE 2013-04-01T11:11:11Z", EXPECTED_LINE = ("389_admin 1.1.29,REV=2012.05.02 CSW389-admin-mock " "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz " "fdb7912713da36afcbbe52266c15cb3f 395802 CSWfoo|CSWbar " @@ -58,6 +60,9 @@ def testGenerateCatalogAsLines(self): mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) mock_rest = self.mox.CreateMock(rest.RestClient) + self.mox.StubOutWithMock(datetime, 'datetime') + datetime.datetime.utcnow().AndReturn(datetime.datetime(year=2013, month=4, day=1, hour=11, minute=11, second=11)); + self.mox.ReplayAll() cfg = generate_catalog_file.CatalogFileGenerator("dublin", "sparc", "SunOS5.10", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 22:59:43 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 20:59:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21084] csw/mgar/gar/v2/lib/python/ generate_catalog_file_test.py Message-ID: Revision: 21084 http://gar.svn.sourceforge.net/gar/?rev=21084&view=rev Author: wahwah Date: 2013-05-14 20:59:42 +0000 (Tue, 14 May 2013) Log Message: ----------- generate-catalog-file: Handle UTC correctly + test Hopefully, correctly. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-14 20:42:55 UTC (rev 21083) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-14 20:59:42 UTC (rev 21084) @@ -30,7 +30,6 @@ "pkgname": "CSW389-admin-mock", } -#EXPECTED_LINE = (["# CREATIONDATE 2013-04-01T11:11:11Z", EXPECTED_LINE = ("389_admin 1.1.29,REV=2012.05.02 CSW389-admin-mock " "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz " "fdb7912713da36afcbbe52266c15cb3f 395802 CSWfoo|CSWbar " @@ -60,9 +59,10 @@ def testGenerateCatalogAsLines(self): mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) mock_rest = self.mox.CreateMock(rest.RestClient) + fake_datetime = datetime.datetime(year=2013, month=4, day=1, + hour=11, minute=11, second=11) self.mox.StubOutWithMock(datetime, 'datetime') - datetime.datetime.utcnow().AndReturn(datetime.datetime(year=2013, month=4, day=1, hour=11, minute=11, second=11)); - self.mox.ReplayAll() + datetime.datetime.utcnow().AndReturn(fake_datetime) cfg = generate_catalog_file.CatalogFileGenerator("dublin", "sparc", "SunOS5.10", @@ -72,7 +72,7 @@ mock_rest.GetCatalogData(md5_sum).AndReturn(FAKE_CATALOG_DATA) self.mox.ReplayAll() self.assertEquals([ - # Potential additional lines go here. + "# CREATIONDATE 2013-04-01T11:11:11Z", EXPECTED_LINE, ], cfg._GenerateCatalogAsLines()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 14 22:59:53 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 20:59:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21085] csw/mgar/gar/v2/lib/python/ generate_catalog_file_test.py Message-ID: Revision: 21085 http://gar.svn.sourceforge.net/gar/?rev=21085&view=rev Author: wahwah Date: 2013-05-14 20:59:53 +0000 (Tue, 14 May 2013) Log Message: ----------- generate-catalog-file: Unit test cleanup Modified Paths: -------------- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-14 20:59:42 UTC (rev 21084) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-14 20:59:53 UTC (rev 21085) @@ -1,13 +1,14 @@ #!/usr/bin/env python +import __builtin__ import datetime -import unittest +import io import mox -import generate_catalog_file import rest -import __builtin__ -import io +import unittest2 as unittest +from lib.python import generate_catalog_file + PKG_DATA_1 = { "basename": "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz", "catalogname": "389_admin", @@ -35,7 +36,7 @@ "fdb7912713da36afcbbe52266c15cb3f 395802 CSWfoo|CSWbar " "none none") -class CatalogFileGeneratorUnitTest(mox.MoxTestBase): +class CatalogFileGeneratorUnitTest(mox.MoxTestBase, unittest.TestCase): def testComposeCatalogLineBasic(self): mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) @@ -87,7 +88,7 @@ mock_rest.GetCatalog('dublin', 'sparc', 'SunOS5.10').AndReturn([PKG_DATA_1]) md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' mock_rest.GetCatalogData(md5_sum).AndReturn(FAKE_CATALOG_DATA) - fake_file = io.BytesIO(); + fake_file = io.BytesIO() open('fake-dir/catalog', 'w').AndReturn(fake_file) self.mox.ReplayAll() cfg.GenerateCatalog('fake-dir') @@ -103,7 +104,7 @@ md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' mock_pkgcache.GetDeps(md5_sum).AndReturn(FAKE_CATALOG_DATA) mock_rest.GetCatalog('dublin', 'sparc', 'SunOS5.10').AndReturn([PKG_DATA_1]) - fake_file = io.BytesIO(); + fake_file = io.BytesIO() open('fake-dir/descriptions', 'w').AndReturn(fake_file) self.mox.ReplayAll() cfg.GenerateDescriptions('fake-dir') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed May 15 01:15:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 14 May 2013 23:15:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21086] csw/mgar/gar/v2/lib Message-ID: Revision: 21086 http://gar.svn.sourceforge.net/gar/?rev=21086&view=rev Author: wahwah Date: 2013-05-14 23:15:16 +0000 (Tue, 14 May 2013) Log Message: ----------- pkgdb: Faster catalog generation Instead of lots of back-and-forth over the REST interface, we now have a single endpoint which gives us complete catalog information. All we need to do is to write that to a text file and call it a catalog. The server side has to do a little more work, for example filter out all non-CSW packages from dependencies. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/generate_catalog_file.py csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/representations.py csw/mgar/gar/v2/lib/python/rest.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-14 20:59:53 UTC (rev 21085) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2013-05-14 23:15:16 UTC (rev 21086) @@ -27,6 +27,7 @@ import logging import sys import datetime +import representations class Error(Exception): @@ -35,81 +36,61 @@ class CatalogFileGenerator(object): def __init__(self, catrel, arch, osrel, - pkgcache=None, rest_client=None): + rest_client=None): self.catrel = catrel self.arch = arch self.osrel = osrel home_dir = os.environ['HOME'] - self.pkgcache = pkgcache or rest.CachedPkgstats(os.path.join(home_dir, "pkgstats")) self.rest_client = rest_client or rest.RestClient() self._catalog = None @property def catalog(self): if not self._catalog: - self._catalog = self.rest_client.GetCatalog(self.catrel, self.arch, self.osrel) + self._catalog = self.rest_client.GetCatalogForGeneration(self.catrel, + self.arch, + self.osrel) + try: + self._catalog = [representations.CatalogEntry._make(x) + for x in self._catalog] + except TypeError: + print self._catalog + raise return self._catalog - def ComposeCatalogLine(self, pkg_data): - catalog_data = self.rest_client.GetCatalogData(pkg_data["md5_sum"]) - i_deps = catalog_data["i_deps"] - if i_deps: - i_deps = "|".join(i_deps) - else: - i_deps = "none" - deps = [] - for dep, _ in catalog_data["deps"]: - if "CSW" in dep: - deps.append(dep) - if deps: - deps = "|".join(deps) - else: - deps = "none" - items = [ - pkg_data["catalogname"], - pkg_data["version_string"], - catalog_data["pkgname"], - pkg_data["basename"], - pkg_data["md5_sum"], - unicode(pkg_data["size"]), - deps, - "none", - i_deps] + def ComposeCatalogLine(self, catalog_entry): + items = tuple(catalog_entry)[:9] return " ".join(items) def GenerateCatalog(self, out_dir): - out_file = os.path.join(out_dir, CATALOG_FN) - if os.path.exists(out_file): - raise Error("File %s already exists." % out_file) - lines = self._GenerateCatalogAsLines() - with open(out_file, "w") as fd: + out_catalog = os.path.join(out_dir, CATALOG_FN) + out_desc = os.path.join(out_dir, DESC_FN) + if os.path.exists(out_catalog): + raise Error("File %s already exists." % out_catalog) + if os.path.exists(out_desc): + raise Error("File %s already exists." % out_desc) + lines, descriptions = self._GenerateCatalogAsLines() + with open(out_catalog, "w") as fd: fd.write("\n".join(lines).encode('utf-8')) + with open(out_desc, "w") as fd: + fd.write("\n".join(descriptions).encode('utf-8')) def _GenerateCatalogAsLines(self): """Return the complete catalog as a list of lines.""" lines = [] - lines.append("# CREATIONDATE " + datetime.datetime.utcnow().replace(microsecond=0).isoformat() + "Z") + descriptions = [] + date_iso = datetime.datetime.utcnow().replace(microsecond=0).isoformat() + lines.append("# CREATIONDATE %sZ" % date_iso) # Potential additional lines might go here. # lines.append("...") if self.catalog: # the catalog might be None - for pkg_data in self.catalog: - lines.append(self.ComposeCatalogLine(pkg_data)) - return lines + for catalog_entry in self.catalog: + lines.append(self.ComposeCatalogLine(catalog_entry)) + descriptions.append(catalog_entry.desc) + return lines, descriptions - def GenerateDescriptions(self, out_dir): - out_file = os.path.join(out_dir, DESC_FN) - if os.path.exists(out_file): - raise Error("File %s already exists." % out_file) - lines = [] - if self.catalog: - for pkg_data in self.catalog: - catalog_data = self.pkgcache.GetDeps(pkg_data["md5_sum"]) - lines.append(catalog_data['pkginfo_name']) - with open(out_file, "w") as fd: - fd.write("\n".join(lines).encode('utf-8')) - def main(): logging.basicConfig(level=logging.DEBUG) parser = optparse.OptionParser() @@ -120,7 +101,6 @@ options, args = parser.parse_args() cfg = CatalogFileGenerator(options.catrel, options.arch, options.osrel) cfg.GenerateCatalog(options.out_dir) - cfg.GenerateDescriptions(options.out_dir) if __name__ == '__main__': Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-14 20:59:53 UTC (rev 21085) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file_test.py 2013-05-14 23:15:16 UTC (rev 21086) @@ -9,28 +9,15 @@ from lib.python import generate_catalog_file -PKG_DATA_1 = { - "basename": "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz", - "catalogname": "389_admin", - "file_basename": "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz", - "md5_sum": "fdb7912713da36afcbbe52266c15cb3f", - "mtime": "2012-05-02 12:06:38", - "rev": "2012.05.02", - "size": 395802, - "version": "1.1.29,REV=2012.05.02", - "version_string": "1.1.29,REV=2012.05.02" -} +PKG_DATA_1 = [ + ["389_admin", "1.1.29,REV=2012.05.02", + "CSW389-admin-mock", + "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz", + "fdb7912713da36afcbbe52266c15cb3f", + "395802", "CSWfoo|CSWbar", "none", "none", + "389_admin - The 389 LDAP server Admin Tools"], +] -FAKE_CATALOG_DATA = { - "deps": [ - ["CSWfoo", ""], - ["CSWbar", ""], - ], - "i_deps": [], - "pkginfo_name": "389_admin - The 389 LDAP server Admin Tools", - "pkgname": "CSW389-admin-mock", -} - EXPECTED_LINE = ("389_admin 1.1.29,REV=2012.05.02 CSW389-admin-mock " "389_admin-1.1.29,REV=2012.05.02-SunOS5.10-sparc-CSW.pkg.gz " "fdb7912713da36afcbbe52266c15cb3f 395802 CSWfoo|CSWbar " @@ -39,7 +26,6 @@ class CatalogFileGeneratorUnitTest(mox.MoxTestBase, unittest.TestCase): def testComposeCatalogLineBasic(self): - mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) mock_rest = self.mox.CreateMock(rest.RestClient) # Catalog format: # http://wiki.opencsw.org/catalog-format @@ -51,14 +37,11 @@ cfg = generate_catalog_file.CatalogFileGenerator("dublin", "sparc", "SunOS5.10", - mock_pkgcache, mock_rest) - md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' - mock_rest.GetCatalogData(md5_sum).AndReturn(FAKE_CATALOG_DATA) + mock_rest) self.mox.ReplayAll() - self.assertEquals(EXPECTED_LINE, cfg.ComposeCatalogLine(PKG_DATA_1)) + self.assertEquals(EXPECTED_LINE, cfg.ComposeCatalogLine(PKG_DATA_1[0])) - def testGenerateCatalogAsLines(self): - mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) + def testGenerateCatalogEmpty(self): mock_rest = self.mox.CreateMock(rest.RestClient) fake_datetime = datetime.datetime(year=2013, month=4, day=1, hour=11, minute=11, second=11) @@ -67,47 +50,50 @@ cfg = generate_catalog_file.CatalogFileGenerator("dublin", "sparc", "SunOS5.10", - mock_pkgcache, mock_rest) - md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' - mock_rest.GetCatalog('dublin', 'sparc', 'SunOS5.10').AndReturn([PKG_DATA_1]) - mock_rest.GetCatalogData(md5_sum).AndReturn(FAKE_CATALOG_DATA) + mock_rest) + mock_rest.GetCatalogForGeneration('dublin', 'sparc', 'SunOS5.10').AndReturn([]) self.mox.ReplayAll() - self.assertEquals([ + catalog_lines, descriptions = cfg._GenerateCatalogAsLines() + expected_lines = [ "# CREATIONDATE 2013-04-01T11:11:11Z", - EXPECTED_LINE, - ], cfg._GenerateCatalogAsLines()) + ] + self.assertEquals(expected_lines, catalog_lines) + self.assertEquals([], descriptions) - def testGenerateCatalog(self): - mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) + def testGenerateCatalogAsLines(self): mock_rest = self.mox.CreateMock(rest.RestClient) - self.mox.StubOutWithMock(__builtin__, 'open') + fake_datetime = datetime.datetime(year=2013, month=4, day=1, + hour=11, minute=11, second=11) + self.mox.StubOutWithMock(datetime, 'datetime') + datetime.datetime.utcnow().AndReturn(fake_datetime) cfg = generate_catalog_file.CatalogFileGenerator("dublin", "sparc", "SunOS5.10", - mock_pkgcache, mock_rest) - mock_rest.GetCatalog('dublin', 'sparc', 'SunOS5.10').AndReturn([PKG_DATA_1]) - md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' - mock_rest.GetCatalogData(md5_sum).AndReturn(FAKE_CATALOG_DATA) - fake_file = io.BytesIO() - open('fake-dir/catalog', 'w').AndReturn(fake_file) + mock_rest) + mock_rest.GetCatalogForGeneration('dublin', 'sparc', 'SunOS5.10').AndReturn(PKG_DATA_1) self.mox.ReplayAll() - cfg.GenerateCatalog('fake-dir') + catalog_lines, descriptions = cfg._GenerateCatalogAsLines() + expected_lines = [ + "# CREATIONDATE 2013-04-01T11:11:11Z", + EXPECTED_LINE, + ] + self.assertEquals(expected_lines, catalog_lines) + self.assertEquals(['389_admin - The 389 LDAP server Admin Tools'], descriptions) - def testGenerateDescriptions(self): - mock_pkgcache = self.mox.CreateMock(rest.CachedPkgstats) + def testGenerateCatalog(self): mock_rest = self.mox.CreateMock(rest.RestClient) self.mox.StubOutWithMock(__builtin__, 'open') cfg = generate_catalog_file.CatalogFileGenerator("dublin", "sparc", "SunOS5.10", - mock_pkgcache, mock_rest) - md5_sum = 'fdb7912713da36afcbbe52266c15cb3f' - mock_pkgcache.GetDeps(md5_sum).AndReturn(FAKE_CATALOG_DATA) - mock_rest.GetCatalog('dublin', 'sparc', 'SunOS5.10').AndReturn([PKG_DATA_1]) + mock_rest) + mock_rest.GetCatalogForGeneration('dublin', 'sparc', 'SunOS5.10').AndReturn(PKG_DATA_1) fake_file = io.BytesIO() - open('fake-dir/descriptions', 'w').AndReturn(fake_file) + fake_desc_file = io.BytesIO() + open('fake-dir/catalog', 'w').AndReturn(fake_file) + open('fake-dir/descriptions', 'w').AndReturn(fake_desc_file) self.mox.ReplayAll() - cfg.GenerateDescriptions('fake-dir') + cfg.GenerateCatalog('fake-dir') if __name__ == '__main__': Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-05-14 20:59:53 UTC (rev 21085) +++ csw/mgar/gar/v2/lib/python/models.py 2013-05-14 23:15:16 UTC (rev 21086) @@ -511,9 +511,15 @@ Srv4FileStats.q.use_to_generate_catalogs==True, ) select = sqlbuilder.Select( - ['catalogname', 'version_string', 'pkgname', 'basename', + ['catalogname', + 'version_string', + 'pkgname', + 'basename', 'srv4_file_stats.md5_sum', - 'size', 'deps', 'i_deps'], + 'size', + 'deps', + 'i_deps', + 'pkginfo_name'], where=where, orderBy='catalogname', join=join) Modified: csw/mgar/gar/v2/lib/python/representations.py =================================================================== --- csw/mgar/gar/v2/lib/python/representations.py 2013-05-14 20:59:53 UTC (rev 21085) +++ csw/mgar/gar/v2/lib/python/representations.py 2013-05-14 23:15:16 UTC (rev 21086) @@ -3,4 +3,4 @@ # Full catalog entry, enough to write a line of a catalog file. CatalogEntry = collections.namedtuple( 'CatalogEntry', 'catalogname version pkgname basename ' - 'md5_sum size deps category i_deps') + 'md5_sum size deps category i_deps desc') Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2013-05-14 20:59:53 UTC (rev 21085) +++ csw/mgar/gar/v2/lib/python/rest.py 2013-05-14 23:15:16 UTC (rev 21086) @@ -247,7 +247,13 @@ logging.debug("SavePkgstats(): url=%r", url) return self._CurlPut(url, [('pkgstats', cjson.encode(pkgstats))]) + def GetCatalogForGeneration(self, catrel, arch, osrel): + url = (self.rest_url + self.PKGDB_APP + "/catalogs/%s/%s/%s/for-generation/" + % (catrel, arch, osrel)) + data = urllib2.urlopen(url).read() + return cjson.decode(data) + class CachedPkgstats(object): """Class responsible for holding and caching package stats. Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-14 20:59:53 UTC (rev 21085) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-05-14 23:15:16 UTC (rev 21086) @@ -527,16 +527,28 @@ osrel_name, arch_name, catrel_name) rows = list(models.GetCatalogGenerationResult(sqo_osrel, sqo_arch, sqo_catrel)) def GenCatalogEntry(row): + i_deps = cjson.decode(row[7]) + if i_deps: + i_deps_str = "|".join(i_deps) + else: + i_deps_str = "none" + deps_with_desc = cjson.decode(row[6]) + deps = [x[0] for x in deps_with_desc if x[0].startswith('CSW')] + if deps: + deps_str = '|'.join(deps) + else: + deps_str = "none" entry = representations.CatalogEntry( - catalogname=row[0], - version=row[1], - pkgname=row[2], - basename=row[3], - md5_sum=row[4], - size=row[5], - deps="|".join([x[0] for x in cjson.decode(row[6])]), - category="none", - i_deps="|".join(cjson.decode(row[7])), + catalogname=row[0], # 0 + version=row[1], # 1 + pkgname=row[2], # 2 + basename=row[3], # 3 + md5_sum=row[4], # 4 + size=str(row[5]), # 5 + deps=deps_str, # 6 + category="none", # 7 + i_deps=i_deps_str, # 8 + desc=row[8], # 9 ) return entry entries_list = [GenCatalogEntry(row) for row in rows] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed May 15 08:20:16 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 15 May 2013 06:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21087] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 21087 http://gar.svn.sourceforge.net/gar/?rev=21087&view=rev Author: rthurner Date: 2013-05-15 06:20:15 +0000 (Wed, 15 May 2013) Log Message: ----------- mercurial, update to hg-2.6.1 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2013-05-14 23:15:16 UTC (rev 21086) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2013-05-15 06:20:15 UTC (rev 21087) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.6 +VERSION = 2.6.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2013-05-14 23:15:16 UTC (rev 21086) +++ csw/mgar/pkg/mercurial/trunk/checksums 2013-05-15 06:20:15 UTC (rev 21087) @@ -1 +1 @@ -d012d8bb5f85369d3b6a630a80667170 mercurial-2.6.tar.gz +db34e6085b71c33ba250e689b1535101 mercurial-2.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 10:03:56 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 08:03:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21088] csw/mgar/pkg/cpan/Perl-Critic/trunk Message-ID: Revision: 21088 http://gar.svn.sourceforge.net/gar/?rev=21088&view=rev Author: bonivart Date: 2013-05-15 08:03:55 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/Perl-Critic/trunk: update to 1.118, fix deps Modified Paths: -------------- csw/mgar/pkg/cpan/Perl-Critic/trunk/Makefile csw/mgar/pkg/cpan/Perl-Critic/trunk/checksums Modified: csw/mgar/pkg/cpan/Perl-Critic/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Perl-Critic/trunk/Makefile 2013-05-15 06:20:15 UTC (rev 21087) +++ csw/mgar/pkg/cpan/Perl-Critic/trunk/Makefile 2013-05-15 08:03:55 UTC (rev 21088) @@ -1,15 +1,11 @@ -# $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# NAME = Perl-Critic -VERSION = 1.116 +VERSION = 1.118 GARTYPE = v2 CATEGORIES = cpan -AUTHOR = ELLIOTJS +AUTHOR = THALJEF DESCRIPTION = Critique Perl source code for best-practices define BLURB - Critique Perl source code for best-practices endef PACKAGES = CSWpm-perl-critic @@ -18,30 +14,29 @@ LICENSE = LICENSE -BUILD_DEP_PKGS += CSWpmreadline +BUILD_DEP_PKGS += CSWpm-module-build +BUILD_DEP_PKGS += CSWpm-test-deep -RUNTIME_DEP_PKGS += CSWperltidy +# Required +RUNTIME_DEP_PKGS += CSWpmbkeywords +RUNTIME_DEP_PKGS += CSWpm-config-tiny RUNTIME_DEP_PKGS += CSWpm-email-address -RUNTIME_DEP_PKGS += CSWpm-pod-spell +RUNTIME_DEP_PKGS += CSWpm-exception-class +RUNTIME_DEP_PKGS += CSWpm-io-string +RUNTIME_DEP_PKGS += CSWpm-list-moreutils RUNTIME_DEP_PKGS += CSWpm-ppi RUNTIME_DEP_PKGS += CSWpm-ppix-regexp RUNTIME_DEP_PKGS += CSWpm-ppix-utilities +RUNTIME_DEP_PKGS += CSWperltidy +RUNTIME_DEP_PKGS += CSWpm-pod-spell +RUNTIME_DEP_PKGS += CSWpmreadonly RUNTIME_DEP_PKGS += CSWpm-string-format -RUNTIME_DEP_PKGS += CSWpmbkeywords -RUNTIME_DEP_PKGS += CSWpmconfigtiny -RUNTIME_DEP_PKGS += CSWpmtestdeep +RUNTIME_DEP_PKGS += CSWpm-task-weaken -# Unreleased deps, remove next time -CHECKPKG_OVERRIDES_CSWpm-perl-critic += unidentified-dependency|CSWpm-email-address -CHECKPKG_OVERRIDES_CSWpm-perl-critic += unidentified-dependency|CSWpm-pod-spell -CHECKPKG_OVERRIDES_CSWpm-perl-critic += unidentified-dependency|CSWpm-ppi -CHECKPKG_OVERRIDES_CSWpm-perl-critic += unidentified-dependency|CSWpm-ppix-regexp -CHECKPKG_OVERRIDES_CSWpm-perl-critic += unidentified-dependency|CSWpm-ppix-utilities -CHECKPKG_OVERRIDES_CSWpm-perl-critic += unidentified-dependency|CSWpm-string-format +# Recommended +RUNTIME_DEP_PKGS += CSWpmfilehomedir +RUNTIME_DEP_PKGS += CSWpm-file-which +RUNTIME_DEP_PKGS += CSWpm-readonly-xs -# Harmless documentation examples -CHECKPKG_OVERRIDES_CSWpm-perl-critic += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Perl/Critic/Policy/CodeLayout/RequireTidyCode.pm -CHECKPKG_OVERRIDES_CSWpm-perl-critic += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/Perl::Critic::Policy::CodeLayout::RequireTidyCode.3perl - include gar/category.mk Modified: csw/mgar/pkg/cpan/Perl-Critic/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Perl-Critic/trunk/checksums 2013-05-15 06:20:15 UTC (rev 21087) +++ csw/mgar/pkg/cpan/Perl-Critic/trunk/checksums 2013-05-15 08:03:55 UTC (rev 21088) @@ -1 +1 @@ -75b24983cde08329800d814ef7033ca9 Perl-Critic-1.116.tar.gz +25391a51d57cdf34c535f01d9ff91b83 Perl-Critic-1.118.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed May 15 11:25:16 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 15 May 2013 09:25:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21089] csw/mgar/pkg/dconf/trunk Message-ID: Revision: 21089 http://gar.svn.sourceforge.net/gar/?rev=21089&view=rev Author: slowfranklin Date: 2013-05-15 09:25:16 +0000 (Wed, 15 May 2013) Log Message: ----------- dconf/trunk: Fix mkdtemp patch for Solaris 11 Modified Paths: -------------- csw/mgar/pkg/dconf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dconf/trunk/files/0006-mkdtemp-replacement.patch Modified: csw/mgar/pkg/dconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/dconf/trunk/Makefile 2013-05-15 08:03:55 UTC (rev 21088) +++ csw/mgar/pkg/dconf/trunk/Makefile 2013-05-15 09:25:16 UTC (rev 21089) @@ -92,11 +92,11 @@ RUNTIME_DEP_PKGS_CSWdconf += CSWlibdconf0 # PKGFILES is catchall -PATCHFILES += 0000-Add-mkdtemp-replacement-function.patch PATCHFILES += 0001-Use-statvfs-for-checking-filesystem-type.patch PATCHFILES += 0002-Remove-linker-flags-remove-c89-request.patch PATCHFILES += 0003-Add-gio-includes.patch PATCHFILES += 0000-Replace-posix_fallocate-with-ftruncate.patch +PATCHFILES += 0006-mkdtemp-replacement.patch CONFIGURE_ARGS = $(DIRPATHS) # package must be compiled in C99 mode; add __EXTENSIONS__ so the headers expose Added: csw/mgar/pkg/dconf/trunk/files/0006-mkdtemp-replacement.patch =================================================================== --- csw/mgar/pkg/dconf/trunk/files/0006-mkdtemp-replacement.patch (rev 0) +++ csw/mgar/pkg/dconf/trunk/files/0006-mkdtemp-replacement.patch 2013-05-15 09:25:16 UTC (rev 21089) @@ -0,0 +1,43 @@ +From d31ada964044649ebcfce90b46e9fa46cb98e16d Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 15 May 2013 11:21:40 +0200 +Subject: [PATCH] mkdtemp() replacement + +--- + service/dconf-state.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/service/dconf-state.c b/service/dconf-state.c +index 0ed156e..31244b0 100644 +--- a/service/dconf-state.c ++++ b/service/dconf-state.c +@@ -7,6 +7,17 @@ + #include + #include + ++#include ++#include ++ ++static char * ++my_mkdtemp(char *template) ++{ ++ if (!mktemp(template) || mkdir(template, 0700)) ++ return NULL; ++ return template; ++} ++ + static void + dconf_state_init_session (DConfState *state) + { +@@ -59,7 +70,7 @@ dconf_state_init_session (DConfState *state) + + shmdir = g_build_filename (tmpdir, "dconf.XXXXXX", NULL); + +- if ((state->shm_dir = mkdtemp (shmdir)) == NULL) ++ if ((state->shm_dir = my_mkdtemp (shmdir)) == NULL) + g_error ("Can not create reasonable shm directory"); + } + } +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed May 15 14:49:43 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 15 May 2013 12:49:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21090] csw/mgar/pkg/dconf/trunk/Makefile Message-ID: Revision: 21090 http://gar.svn.sourceforge.net/gar/?rev=21090&view=rev Author: slowfranklin Date: 2013-05-15 12:49:42 +0000 (Wed, 15 May 2013) Log Message: ----------- dconf/trunk: Overrides simplification, use EXTRA_CFLAGS for passing compiler flags and remove duplicate build dep Modified Paths: -------------- csw/mgar/pkg/dconf/trunk/Makefile Modified: csw/mgar/pkg/dconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/dconf/trunk/Makefile 2013-05-15 09:25:16 UTC (rev 21089) +++ csw/mgar/pkg/dconf/trunk/Makefile 2013-05-15 12:49:42 UTC (rev 21090) @@ -31,7 +31,6 @@ EXTRA_INC += $(prefix)/include/gdk-pixbuf-2.0/ EXTRA_INC += $(prefix)/include/atk-1.0/ -BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibdbus-dev BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibglib2-dev @@ -101,24 +100,12 @@ CONFIGURE_ARGS = $(DIRPATHS) # package must be compiled in C99 mode; add __EXTENSIONS__ so the headers expose # all interfaces that go beyong C99, cf man standards.5 -CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__" +EXTRA_CFLAGS += -std=c99 -D__EXTENSIONS__ # see above comment for LINKER_IGNORE -CHECKPKG_OVERRIDES_CSWdconf += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/dconf|but|never|used -CHECKPKG_OVERRIDES_CSWdconf += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/gio/modules/libdconfsettings.so|but|never|used -CHECKPKG_OVERRIDES_CSWdconf += soname-unused|libintl.so.8|is|needed|by|/opt/csw/libexec/dconf-service|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libatk-1.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libcairo.so.2|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libfontconfig.so.1|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libfreetype.so.6|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libgdk-x11-2.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libgdk_pixbuf-2.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libgmodule-2.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libpangocairo-1.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libpangoft2-1.0.so.0|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused|libthread.so.1|is|needed|by|/opt/csw/bin/dconf-editor|but|never|used -CHECKPKG_OVERRIDES_CSWlibdconf0 += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/libdconf.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWdconf += soname-unused +CHECKPKG_OVERRIDES_CSWdconf-editor += soname-unused +CHECKPKG_OVERRIDES_CSWlibdconf0 += soname-unused include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 19:29:54 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 17:29:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21091] csw/mgar/pkg/cpan/HTML-Template-Pro/trunk Message-ID: Revision: 21091 http://gar.svn.sourceforge.net/gar/?rev=21091&view=rev Author: bonivart Date: 2013-05-15 17:29:53 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/HTML-Template-Pro/trunk: update to 0.9510, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/Makefile csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/checksums Modified: csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/Makefile 2013-05-15 12:49:42 UTC (rev 21090) +++ csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/Makefile 2013-05-15 17:29:53 UTC (rev 21091) @@ -1,19 +1,22 @@ NAME = HTML-Template-Pro -VERSION = 0.9504 +VERSION = 0.9510 CATEGORIES = cpan GARTYPE = v2 AUTHOR = VIY DESCRIPTION = Perl/XS module to use HTML Templates from CGI scripts define BLURB - Perl/XS module to use HTML Templates from CGI scripts endef DISTFILES += COPYING -PACKAGES = CSWpmhtmltemplatepro -CATALOGNAME = pm_htmltemplatepro +PACKAGES = CSWpm-html-template-pro +CATALOGNAME = pm_html_template_pro +SPKG_DESC_CSWpm-html-template-pro = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-html-template-pro = CSWpmhtmltemplatepro +CATALOGNAME_CSWpmhtmltemplatepro = pm_htmltemplatepro -RUNTIME_DEP_PKGS_CSWpmhtmltemplatepro += CSWpmjson CSWlibpcre0 +RUNTIME_DEP_PKGS += CSWpm-json +RUNTIME_DEP_PKGS += CSWlibpcre1 include gar/category.mk Modified: csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/checksums 2013-05-15 12:49:42 UTC (rev 21090) +++ csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/checksums 2013-05-15 17:29:53 UTC (rev 21091) @@ -1 +1 @@ -845b51f0f0c0c1a0b10f99d6631b3321 HTML-Template-Pro-0.9504.tar.gz +28c25f87ed2cec1ecbe78a2ff9548d0a HTML-Template-Pro-0.9510.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 19:54:38 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 17:54:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21092] csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk Message-ID: Revision: 21092 http://gar.svn.sourceforge.net/gar/?rev=21092&view=rev Author: bonivart Date: 2013-05-15 17:54:37 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/HTTP-Server-Simple/trunk: update to 0.44, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/Makefile csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/checksums Modified: csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/Makefile 2013-05-15 17:29:53 UTC (rev 21091) +++ csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/Makefile 2013-05-15 17:54:37 UTC (rev 21092) @@ -1,18 +1,21 @@ NAME = HTTP-Server-Simple -VERSION = 0.43 +VERSION = 0.44 CATEGORIES = cpan GARTYPE = v2 AUTHOR = JESSE DESCRIPTION = Lightweight HTTP server define BLURB - Lightweight HTTP server endef DISTFILES += COPYING -PACKAGES = CSWpmhttpsvrsimp -CATALOGNAME = pm_httpsvrsimp +PACKAGES = CSWpm-http-server-simple +CATALOGNAME = pm_http_server_simple +SPKG_DESC_CSWpm-http-server-simple = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-http-server-simple = CSWpmhttpsvrsimp +CATALOGNAME_CSWpmhttpsvrsimp = pm_httpsvrsimp + ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/checksums 2013-05-15 17:29:53 UTC (rev 21091) +++ csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/checksums 2013-05-15 17:54:37 UTC (rev 21092) @@ -1 +1 @@ -8f430708ab7b4c2b3a4e48c549c7185e HTTP-Server-Simple-0.43.tar.gz +70d4ae98affb9e921ab1478bbdffca3b HTTP-Server-Simple-0.44.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 20:02:03 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 18:02:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21093] csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/ Makefile Message-ID: Revision: 21093 http://gar.svn.sourceforge.net/gar/?rev=21093&view=rev Author: bonivart Date: 2013-05-15 18:02:02 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/Locale-Maketext-Simple/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile Modified: csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile 2013-05-15 17:54:37 UTC (rev 21092) +++ csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile 2013-05-15 18:02:02 UTC (rev 21093) @@ -6,18 +6,18 @@ DESCRIPTION = Simple interface to Locale::Maketext::Lexicon define BLURB - This module is a simple wrapper around Locale::Maketext::Lexicon, designed - to alleviate the need of creating Language Classes for module authors. endef DISTFILES += COPYING -PACKAGES = CSWpmlclemktxtsimple -CATALOGNAME = pm_lclemktxtsimple +PACKAGES = CSWpm-locale-maketext-simple +CATALOGNAME = pm_locale_maketext_simple +SPKG_DESC_CSWpm-locale-maketext-simple = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-locale-maketext-simple = CSWpmlclemktxtsimple +CATALOGNAME_CSWpmlclemktxtsimple = pm_lclemktxtsimple + ARCHALL = 1 -RUNTIME_DEP_PKGS = CSWpmlclemktxtlex +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* -EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 20:15:15 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 18:15:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21094] csw/mgar/pkg/cpan/Module-Load/trunk Message-ID: Revision: 21094 http://gar.svn.sourceforge.net/gar/?rev=21094&view=rev Author: bonivart Date: 2013-05-15 18:15:14 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/Module-Load/trunk: update to 0.24, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile csw/mgar/pkg/cpan/Module-Load/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Load/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2013-05-15 18:02:02 UTC (rev 21093) +++ csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2013-05-15 18:15:14 UTC (rev 21094) @@ -1,22 +1,23 @@ NAME = Module-Load -VERSION = 0.18 +VERSION = 0.24 CATEGORIES = cpan GARTYPE = v2 AUTHOR = BINGOS DESCRIPTION = Runtime require of both modules and files define BLURB - Eliminates the need to know whether you are trying to require either a file - or a module. endef DISTFILES += COPYING -PACKAGES = CSWpmmodload -CATALOGNAME = pm_modload +PACKAGES = CSWpm-mod-load +CATALOGNAME = pm_mod_load +SPKG_DESC_CSWpm-mod-load = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-mod-load = CSWpmmodload +CATALOGNAME_CSWpmmodload = pm_modload ARCHALL = 1 -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*\/man\/man3.* .*\/man\/man1.* +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Load/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/checksums 2013-05-15 18:02:02 UTC (rev 21093) +++ csw/mgar/pkg/cpan/Module-Load/trunk/checksums 2013-05-15 18:15:14 UTC (rev 21094) @@ -1,2 +1 @@ -722b591573eae09d26997366cd63125d COPYING -3c8b06ecccef2741167e5dd4bd1e0095 Module-Load-0.18.tar.gz +3fb7b6ade15cfeb3379d1a0c06c32e2f Module-Load-0.24.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 20:22:52 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 18:22:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21095] csw/mgar/pkg/cpan/Module-Loaded/trunk Message-ID: Revision: 21095 http://gar.svn.sourceforge.net/gar/?rev=21095&view=rev Author: bonivart Date: 2013-05-15 18:22:52 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/Module-Loaded/trunk: update to 0.08, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Loaded/trunk/Makefile csw/mgar/pkg/cpan/Module-Loaded/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Loaded/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Loaded/trunk/Makefile 2013-05-15 18:15:14 UTC (rev 21094) +++ csw/mgar/pkg/cpan/Module-Loaded/trunk/Makefile 2013-05-15 18:22:52 UTC (rev 21095) @@ -1,25 +1,23 @@ NAME = Module-Loaded -VERSION = 0.06 +VERSION = 0.08 CATEGORIES = cpan GARTYPE = v2 AUTHOR = BINGOS DESCRIPTION = Mark modules as loaded or unloaded define BLURB - When testing applications, often you find yourself needing to provide - functionality in your test environment that would usually be provided by - external modules. Rather than munging the INC by hand to mark these external - modules as loaded, so they are not attempted to be loaded by perl, this - module offers you a very simple way to mark modules as loaded and/or - unloaded. endef DISTFILES += COPYING -PACKAGES = CSWpmmodloaded -CATALOGNAME = pm_modloaded +PACKAGES = CSWpm-mod-loaded +CATALOGNAME = pm_mod_loaded +SPKG_DESC_CSWpm-mod-loaded = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-mod-loaded = CSWpmmodloaded +CATALOGNAME_CSWpmmodloaded = pm_modloaded + ARCHALL = 1 -EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Loaded/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Loaded/trunk/checksums 2013-05-15 18:15:14 UTC (rev 21094) +++ csw/mgar/pkg/cpan/Module-Loaded/trunk/checksums 2013-05-15 18:22:52 UTC (rev 21095) @@ -1,2 +1 @@ -608826974d5644ee7967a713fa72cf36 COPYING -0a0bb1915828b73bb07f9b5239c5b976 Module-Loaded-0.06.tar.gz +a55e491c3804db2c9f86b14e06f1a17f Module-Loaded-0.08.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 20:29:39 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 18:29:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21096] csw/mgar/pkg/cpan/Module-Versions-Report/trunk/ Makefile Message-ID: Revision: 21096 http://gar.svn.sourceforge.net/gar/?rev=21096&view=rev Author: bonivart Date: 2013-05-15 18:29:38 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/Module-Versions-Report/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/Makefile Modified: csw/mgar/pkg/cpan/Module-Versions-Report/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/Makefile 2013-05-15 18:22:52 UTC (rev 21095) +++ csw/mgar/pkg/cpan/Module-Versions-Report/trunk/Makefile 2013-05-15 18:29:38 UTC (rev 21096) @@ -6,29 +6,16 @@ DESCRIPTION = Report versions of all modules in memory define BLURB - I often get email from someone reporting a bug in a module I've written. I - email back, asking what version of the module it is, what version of Perl on - what OS, and sometimes what version of some relevent third library (like - XML::Parser). They reply, saying "Perl 5". I say "I need the exact version, as - reported by perl -v". They tell me. And I say "I, uh, also asked about the - version of my module and XML::Parser [or whatever]". They say "Oh yeah. It's - 2.27". "Is that my module or XML::Parser?" "XML::Parser." "OK, and what about - my module's version?" "Ohyeah. That's 3.11." By this time, days have passed, - and what should have been a simple operation -- reporting the version of Perl - and relevent modules, has been needlessly complicated. - - This module is for simplifying that task. If you add "use - Module::Versions::Report;" to a program (especially handy if your program is - one that demonstrates a bug in some module), then when the program has - finished running, you well get a report detailing the all modules in memory, - and noting the version of each (for modules that defined a $VERSION, at - least). endef DISTFILES += COPYING -PACKAGES = CSWpmmodversrpt -CATALOGNAME = pm_modversrpt +PACKAGES = CSWpm-module-versions-report +CATALOGNAME = pm_module_versions_report +SPKG_DESC_CSWpm-module-versions-report = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-module-versions-report = CSWpmmodversrpt +CATALOGNAME_CSWpmmodversrpt = pm_modversrpt + ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 21:14:43 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 19:14:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21097] csw/mgar/pkg/cpan/PDF-Reuse/trunk/Makefile Message-ID: Revision: 21097 http://gar.svn.sourceforge.net/gar/?rev=21097&view=rev Author: bonivart Date: 2013-05-15 19:14:42 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/PDF-Reuse/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/PDF-Reuse/trunk/Makefile Modified: csw/mgar/pkg/cpan/PDF-Reuse/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PDF-Reuse/trunk/Makefile 2013-05-15 18:29:38 UTC (rev 21096) +++ csw/mgar/pkg/cpan/PDF-Reuse/trunk/Makefile 2013-05-15 19:14:42 UTC (rev 21097) @@ -6,13 +6,16 @@ DESCRIPTION = Reuse and mass produce PDF documents define BLURB - Reuse and mass produce PDF documents endef DISTFILES += COPYING -PACKAGES = CSWpmpdfreuse -CATALOGNAME = pm_pdfreuse +PACKAGES = CSWpm-pdf-reuse +CATALOGNAME = pm_pdf_reuse +SPKG_DESC_CSWpm-pdf-reuse = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-pdf-reuse = CSWpmpdfreuse +CATALOGNAME_CSWpmpdfreuse = pm_pdfreuse + ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 21:47:46 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 19:47:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21098] csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile Message-ID: Revision: 21098 http://gar.svn.sourceforge.net/gar/?rev=21098&view=rev Author: bonivart Date: 2013-05-15 19:47:45 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/String-CRC32/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile Modified: csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile 2013-05-15 19:14:42 UTC (rev 21097) +++ csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile 2013-05-15 19:47:45 UTC (rev 21098) @@ -6,22 +6,15 @@ DESCRIPTION = Interface for cyclic redundency check generation define BLURB - The CRC32 module calculates CRC sums of 32 bit lenghts. It generates the - same CRC values as ZMODEM, PKZIP, PICCHECK and many others. Despite its - name, this module is able to compute the checksum of strings as well as of - files. endef DISTFILES += COPYING -PACKAGES = CSWpmstringcrc32 -CATALOGNAME = pm_stringcrc32 +PACKAGES = CSWpm-string-crc32 +CATALOGNAME = pm_string_crc32 +SPKG_DESC_CSWpm-string-crc32 = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-string-crc32 = CSWpmstringcrc32 +CATALOGNAME_CSWpmstringcrc32 = pm_stringcrc32 include gar/category.mk -post-install-modulated: - @echo " ==> Post-install for $(NAME) (custom)" - @( cd $(WORKSRC) ; \ - gmake metafile ; \ - cp $(NAME)-$(VERSION)/META.yml . ) - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 22:29:50 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 20:29:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21099] csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk Message-ID: Revision: 21099 http://gar.svn.sourceforge.net/gar/?rev=21099&view=rev Author: bonivart Date: 2013-05-15 20:29:47 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/Net-IDN-Nameprep/trunk: update to 1.101, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile 2013-05-15 19:47:45 UTC (rev 21098) +++ csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile 2013-05-15 20:29:47 UTC (rev 21099) @@ -1,16 +1,19 @@ NAME = Net-IDN-Nameprep -VERSION = 1.100 +VERSION = 1.101 CATEGORIES = cpan GARTYPE = v2 AUTHOR = CFAERBER DESCRIPTION = A Stringprep Profile for Internationalized Domain Names (RFC 3491) define BLURB - A Stringprep Profile for Internationalized Domain Names (RFC 3491) endef -PACKAGES = CSWpmnetidnnameprep -CATALOGNAME = pm_netidnnameprep +PACKAGES = CSWpm-net-idn-nameprep +CATALOGNAME = pm_net_idn_nameprep +SPKG_DESC_CSWpm-net-idn-nameprep = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-net-idn-nameprep = CSWpmnetidnnameprep +CATALOGNAME_CSWpmnetidnnameprep = pm_netidnnameprep + ARCHALL = 1 LICENSE = LICENSE Modified: csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums 2013-05-15 19:47:45 UTC (rev 21098) +++ csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums 2013-05-15 20:29:47 UTC (rev 21099) @@ -1 +1 @@ -e2f79e7d4defcdf6ab1a96c732b3fc0c Net-IDN-Nameprep-1.100.tar.gz +716a9400c55bde1c20136b0bef585557 Net-IDN-Nameprep-1.101.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 15 22:40:38 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 20:40:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21100] csw/mgar/pkg/cpan/SMS-Send/trunk Message-ID: Revision: 21100 http://gar.svn.sourceforge.net/gar/?rev=21100&view=rev Author: bonivart Date: 2013-05-15 20:40:34 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/SMS-Send/trunk: update to 1.06, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/SMS-Send/trunk/Makefile csw/mgar/pkg/cpan/SMS-Send/trunk/checksums Modified: csw/mgar/pkg/cpan/SMS-Send/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/SMS-Send/trunk/Makefile 2013-05-15 20:29:47 UTC (rev 21099) +++ csw/mgar/pkg/cpan/SMS-Send/trunk/Makefile 2013-05-15 20:40:34 UTC (rev 21100) @@ -1,20 +1,24 @@ NAME = SMS-Send -VERSION = 0.05 +VERSION = 1.06 CATEGORIES = cpan GARTYPE = v2 AUTHOR = ADAMK DESCRIPTION = Driver-based API for sending SMS messages define BLURB - Driver-based API for sending SMS messages endef -PACKAGES = CSWpmsmssend -CATALOGNAME = pm_smssend +PACKAGES = CSWpm-sms-send +CATALOGNAME = pm_sms_send +SPKG_DESC_CSWpm-sms-send = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-sms-send = CSWpmsmssend +CATALOGNAME_CSWpmsmssend = pm_smssend + ARCHALL = 1 LICENSE = LICENSE -RUNTIME_DEP_PKGS = CSWpmclassadapter CSWpmparamsutil +RUNTIME_DEP_PKGS += CSWpm-class-adapter +RUNTIME_DEP_PKGS += CSWpm-params-util include gar/category.mk Modified: csw/mgar/pkg/cpan/SMS-Send/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/SMS-Send/trunk/checksums 2013-05-15 20:29:47 UTC (rev 21099) +++ csw/mgar/pkg/cpan/SMS-Send/trunk/checksums 2013-05-15 20:40:34 UTC (rev 21100) @@ -1 +1 @@ -d87fd901e56277689103769f0acd0245 SMS-Send-0.05.tar.gz +bf8c79fb145883c3cd475e5687201151 SMS-Send-1.06.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 Wed May 15 23:25:46 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 15 May 2013 21:25:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21101] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: Revision: 21101 http://gar.svn.sourceforge.net/gar/?rev=21101&view=rev Author: chninkel Date: 2013-05-15 21:25:45 +0000 (Wed, 15 May 2013) Log Message: ----------- gnutls3/trunk: updated dependencies and disabled guile support for now Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-15 20:40:34 UTC (rev 21100) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-15 21:25:45 UTC (rev 21101) @@ -29,35 +29,38 @@ PACKAGES += CSWgnutls CATALOGNAME_gnutls = gnutls SPKG_DESC_CSWgnutls = GNU Transport Layer Security Utility Programs -RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls26 -RUNTIME_DEP_PKGS_CSWgnutls += CSWgpgerr -RUNTIME_DEP_PKGS_CSWgnutls += CSWreadline -RUNTIME_DEP_PKGS_CSWgnutls += CSWzlib -RUNTIME_DEP_PKGS_CSWgnutls += CSWlibtasn1-3 -RUNTIME_DEP_PKGS_CSWgnutls += CSWgcrypt -RUNTIME_DEP_PKGS_CSWgnutls += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWgnutls += CSWlibintl8 # This is a dependency for legacy packages expecting to find libgnutls*.so.13 in CSWgnutls. # CSWlibgnutls13 is built from a branch RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls13 CHECKPKG_OVERRIDES_CSWgnutls += unidentified-dependency|CSWlibgnutls13 CHECKPKG_OVERRIDES_CSWgnutls += surplus-dependency|CSWlibgnutls13 -PACKAGES += CSWlibgnutls26 -CATALOGNAME_CSWlibgnutls = libgnutls26 -SPKG_DESC_CSWlibgnutls26 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.26 -PKGFILES_CSWlibgnutls26 = $(call baseisadirs,$(libdir),libgnutls.*\.so\.26(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgcrypt -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgpgerr -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibtasn1-3 -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWzlib +PACKAGES += CSWlibgnutls28 +CATALOGNAME_CSWlibgnutls = libgnutls28 +SPKG_DESC_CSWlibgnutls28 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.28 +PKGFILES_CSWlibgnutls28 = $(PKGFILES_RT) +PKGFILES_CSWlibgnutls28 += $(docdir)/libgnutls28/.* +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibhogweed2 +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibp11kit0 +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibnettle4 +# We put all libs in one package as they are .so.28 and are all bumped together +CHECKPKG_OVERRIDES_CSWlibgnutls28 += shared-lib-pkgname-mismatch + PACKAGES += CSWlibgnutls-dev SPKG_DESC_CSWlibgnutls-dev = Development Files for GNU TLS PKGFILES_CSWlibgnutls-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibgnutls-dev += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWlibgnutls-dev += CSWlibgnutls28 OBSOLETED_BY_CSWlibgnutls-dev = CSWgnutlsdevel -CATALOGNAME_CSWgnutlsdevel = gnutls_devel_stub PATCHFILES += 0001-no-gets-warning.patch @@ -70,12 +73,11 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --with-lzo +CONFIGURE_ARGS += --disable-guile # Workaround a host detection bug in configure for amd64 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) -CONFIGURE_ARGS_amd64 += --host=x86_64-pc-solaris2$(shell uname -r |sed -e 's/[^.]*//') +CONFIGURE_ARGS_amd64 += --build=x86_64-pc-solaris2$(shell uname -r |sed -e 's/[^.]*//') -# We put all libs in one package as they are .so.26 and are all bumped together -CHECKPKG_OVERRIDES_CSWlibgnutls26 += shared-lib-pkgname-mismatch include gar/category.mk 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 May 16 00:05:25 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 May 2013 22:05:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21102] csw/mgar/pkg/cpan/Passwd-Unix/trunk Message-ID: Revision: 21102 http://gar.svn.sourceforge.net/gar/?rev=21102&view=rev Author: bonivart Date: 2013-05-15 22:05:20 +0000 (Wed, 15 May 2013) Log Message: ----------- cpan/Passwd-Unix/trunk: update to 0.7, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile csw/mgar/pkg/cpan/Passwd-Unix/trunk/checksums Modified: csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile 2013-05-15 21:25:45 UTC (rev 21101) +++ csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile 2013-05-15 22:05:20 UTC (rev 21102) @@ -1,20 +1,24 @@ NAME = Passwd-Unix -VERSION = 0.52 +VERSION = 0.7 CATEGORIES = cpan GARTYPE = v2 AUTHOR = STRZELEC DESCRIPTION = Abstract interface to /etc/passwd, /etc/shadow and /etc/group format files define BLURB - Abstract interface to /etc/passwd, /etc/shadow and /etc/group format files endef DISTFILES += COPYING -PACKAGES = CSWpmpasswdunix -CATALOGNAME = pm_passwdunix +PACKAGES = CSWpm-passwd-unix +CATALOGNAME = pm_passwd_unix +SPKG_DESC_CSWpm-passwd-unix = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-passwd-unix = CSWpmpasswdunix +CATALOGNAME_CSWpmpasswdunix = pm_passwdunix + ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpmcryptpasswdmd5 CSWpmstructcompare +RUNTIME_DEP_PKGS += CSWpm-crypt-passwdmd5 +RUNTIME_DEP_PKGS += CSWpmstructcompare include gar/category.mk Modified: csw/mgar/pkg/cpan/Passwd-Unix/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Passwd-Unix/trunk/checksums 2013-05-15 21:25:45 UTC (rev 21101) +++ csw/mgar/pkg/cpan/Passwd-Unix/trunk/checksums 2013-05-15 22:05:20 UTC (rev 21102) @@ -1 +1 @@ -5590c788a541b1268f38dadf9a829692 Passwd-Unix-0.52.tar.gz +4625aee54f0c3c60ba76dda2cc932a7f Passwd-Unix-0.7.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 Thu May 16 07:02:49 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 16 May 2013 05:02:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21103] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: Revision: 21103 http://gar.svn.sourceforge.net/gar/?rev=21103&view=rev Author: chninkel Date: 2013-05-16 05:02:45 +0000 (Thu, 16 May 2013) Log Message: ----------- gnutls3/trunk: configure default ca certificate location Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-15 22:05:20 UTC (rev 21102) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-05-16 05:02:45 UTC (rev 21103) @@ -74,6 +74,7 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --with-lzo CONFIGURE_ARGS += --disable-guile +CONFIGURE_ARGS += --with-default-trust-store-file=$(sysconfdir)/ssl/certs/ca-certificates.crt # Workaround a host detection bug in configure for amd64 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) CONFIGURE_ARGS_amd64 += --build=x86_64-pc-solaris2$(shell uname -r |sed -e 's/[^.]*//') 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 May 16 13:25:33 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 May 2013 11:25:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21104] csw/mgar/pkg/pca/trunk Message-ID: Revision: 21104 http://gar.svn.sourceforge.net/gar/?rev=21104&view=rev Author: dmichelsen Date: 2013-05-16 11:25:33 +0000 (Thu, 16 May 2013) Log Message: ----------- pca/trunk: Update to 20130502-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2013-05-16 05:02:45 UTC (rev 21103) +++ csw/mgar/pkg/pca/trunk/Makefile 2013-05-16 11:25:33 UTC (rev 21104) @@ -1,5 +1,5 @@ NAME = pca -VERSION = 20120829-01 +VERSION = 20130502-01 GARTYPE = v2 DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2013-05-16 05:02:45 UTC (rev 21103) +++ csw/mgar/pkg/pca/trunk/checksums 2013-05-16 11:25:33 UTC (rev 21104) @@ -2,4 +2,4 @@ def9838b9f704ec17a32dd2aeec8bf02 clean 3027cc2e36a52704e4443cb5c7a91427 cleanup_sadm 9032b788b8a494082368ea0881146078 mkxref -5741bdb76e7b28495673bf82d44fccdf pca-20120829-01 +70c76b041938d4d57ba7f529a783011b pca-20130502-01 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 May 16 14:16:28 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 12:16:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[21105] csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile Message-ID: Revision: 21105 http://gar.svn.sourceforge.net/gar/?rev=21105&view=rev Author: bonivart Date: 2013-05-16 12:16:28 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/Struct-Compare/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile Modified: csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile 2013-05-16 11:25:33 UTC (rev 21104) +++ csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile 2013-05-16 12:16:28 UTC (rev 21105) @@ -6,13 +6,16 @@ DESCRIPTION = Recursive diff for perl structures define BLURB - Recursive diff for perl structures endef DISTFILES += COPYING -PACKAGES = CSWpmstructcompare -CATALOGNAME = pm_structcompare +PACKAGES = CSWpm-struct-compare +CATALOGNAME = pm_struct_compare +SPKG_DESC_CSWpm-struct-compare = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-struct-compare = CSWpmstructcompare +CATALOGNAME_CSWpmstructcompare = pm_structcompare + ARCHALL = 1 include gar/category.mk 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 May 16 14:39:50 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 12:39:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21106] csw/mgar/pkg/cpan/PDF-Reuse-Barcode/trunk/Makefile Message-ID: Revision: 21106 http://gar.svn.sourceforge.net/gar/?rev=21106&view=rev Author: bonivart Date: 2013-05-16 12:39:50 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/PDF-Reuse-Barcode/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/PDF-Reuse-Barcode/trunk/Makefile Modified: csw/mgar/pkg/cpan/PDF-Reuse-Barcode/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PDF-Reuse-Barcode/trunk/Makefile 2013-05-16 12:16:28 UTC (rev 21105) +++ csw/mgar/pkg/cpan/PDF-Reuse-Barcode/trunk/Makefile 2013-05-16 12:39:50 UTC (rev 21106) @@ -6,15 +6,24 @@ DESCRIPTION = Reuse and mass produce PDF documents define BLURB - Reuse and mass produce PDF documents endef DISTFILES += COPYING -PACKAGES = CSWpmpdfreusebarcode -CATALOGNAME = pm_pdfreusebarcode +PACKAGES = CSWpm-pdf-reuse-barcode +CATALOGNAME = pm_pdf_reuse_barcode +SPKG_DESC_CSWpm-pdf-reuse-barcode = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-pdf-reuse-barcode = CSWpmpdfreusebarcode +CATALOGNAME_CSWpmpdfreusebarcode = pm_pdfreusebarcode + ARCHALL = 1 -BUILD_DEP_PKGS = CSWpmgdbarcode CSWpmpdfreuse CSWpmbarcodecode128 +BUILD_DEP_PKGS += CSWpm-gd-barcode +BUILD_DEP_PKGS += CSWpm-pdf-reuse +BUILD_DEP_PKGS += CSWpm-barcode-code128 +RUNTIME_DEP_PKGS += CSWpm-gd-barcode +RUNTIME_DEP_PKGS += CSWpm-pdf-reuse +RUNTIME_DEP_PKGS += CSWpm-barcode-code128 + include gar/category.mk 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 May 16 14:42:15 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 12:42:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21107] csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile Message-ID: Revision: 21107 http://gar.svn.sourceforge.net/gar/?rev=21107&view=rev Author: bonivart Date: 2013-05-16 12:42:15 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/SVN-Mirror/trunk: fix name, deps Modified Paths: -------------- csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile Modified: csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile 2013-05-16 12:39:50 UTC (rev 21106) +++ csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile 2013-05-16 12:42:15 UTC (rev 21107) @@ -6,18 +6,25 @@ DESCRIPTION = Mirror remote repository to local Subversion repository define BLURB - SVN::Mirror allows you to mirror remote repository to your local subversion - repository. endef DISTFILES += COPYING -PACKAGES = CSWpmsvnmirror -CATALOGNAME = pm_svnmirror +PACKAGES = CSWpm-svn-mirror +CATALOGNAME = pm_svn_mirror +SPKG_DESC_CSWpm-svn-mirror = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-svn-mirror = CSWpmsvnmirror +CATALOGNAME_CSWpmsvnmirror = pm_svnmirror + ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpmdatauuid CSWpmsvn CSWsvn -RUNTIME_DEP_PKGS += CSWpmsvnsimple CSWpmtermreadkey CSWpmuri +RUNTIME_DEP_PKGS += CSWpm-class-accessor +RUNTIME_DEP_PKGS += CSWpm-timedate +RUNTIME_DEP_PKGS += CSWpmfilechdir +RUNTIME_DEP_PKGS += CSWpmsvn +RUNTIME_DEP_PKGS += CSWpm-svn-simple-edit +RUNTIME_DEP_PKGS += CSWpm-term-readkey +RUNTIME_DEP_PKGS += CSWpm-uri # VCP Support (disabled for now) PATCHFILES += novcp.diff 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 May 16 14:49:41 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 12:49:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21108] csw/mgar/pkg/cpan/File-chdir/trunk Message-ID: Revision: 21108 http://gar.svn.sourceforge.net/gar/?rev=21108&view=rev Author: bonivart Date: 2013-05-16 12:49:41 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/File-chdir/trunk: update to 0.1008, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/File-chdir/trunk/Makefile csw/mgar/pkg/cpan/File-chdir/trunk/checksums Modified: csw/mgar/pkg/cpan/File-chdir/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-chdir/trunk/Makefile 2013-05-16 12:42:15 UTC (rev 21107) +++ csw/mgar/pkg/cpan/File-chdir/trunk/Makefile 2013-05-16 12:49:41 UTC (rev 21108) @@ -1,18 +1,16 @@ NAME = File-chdir -VERSION = 0.06 +VERSION = 0.1008 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = MSCHWERN +AUTHOR = DAGOLDEN -DESCRIPTION = a more sensible way to change directories +DESCRIPTION = A more sensible way to change directories define BLURB - Perl's chdir() has the unfortunate problem of being very, very, very global. - If any part of your program calls chdir() or if any library you use calls - chdir(), it changes the current working directory for the whole program. - This sucks. File::chdir gives you an alternative, $$CWD and @CWD. These two - variables combine all the power of chdir(), File::Spec and Cwd. endef -DISTFILES = $(call admfiles,CSWpmfilechdir,depend prototype) +PACKAGES = CSWpm-file-chdir +SPKG_DESC_CSWpm-file-chdir = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-file-chdir = CSWpmfilechdir +CATALOGNAME_CSWpmfilechdir = pm_filechdir include gar/category.mk Modified: csw/mgar/pkg/cpan/File-chdir/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-chdir/trunk/checksums 2013-05-16 12:42:15 UTC (rev 21107) +++ csw/mgar/pkg/cpan/File-chdir/trunk/checksums 2013-05-16 12:49:41 UTC (rev 21108) @@ -1,4 +1 @@ -20066434a2b5654d9a2123cf861d2504 download/CSWpmfilechdir.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmfilechdir.depend -45cfb5c8f0baca2a7a4279d9bb7fa717 download/CSWpmfilechdir.prototype -41a4661789f6de97fb632e4560d37864 download/File-chdir-0.06.tar.gz +4b0bfb8135554ef1e4e1440b89befe09 File-chdir-0.1008.tar.gz 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 May 16 14:55:05 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 12:55:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21109] csw/mgar/pkg/cpan/Test-Warn/trunk/Makefile Message-ID: Revision: 21109 http://gar.svn.sourceforge.net/gar/?rev=21109&view=rev Author: bonivart Date: 2013-05-16 12:55:04 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/Test-Warn/trunk: update to 0.24, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Warn/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-Warn/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Warn/trunk/Makefile 2013-05-16 12:49:41 UTC (rev 21108) +++ csw/mgar/pkg/cpan/Test-Warn/trunk/Makefile 2013-05-16 12:55:04 UTC (rev 21109) @@ -6,7 +6,6 @@ DESCRIPTION = Extension to test methods for warnings define BLURB - Extension to test methods for warnings endef DISTFILES += COPYING @@ -15,7 +14,8 @@ CATALOGNAME = pm_test_warn SPKG_DESC_CSWpm-test-warn = $(DESCRIPTION) OBSOLETED_BY_CSWpm-test-warn = CSWpmtestwarn -CATALOGNAME_CSWpmtestwarn = pm_testwarn_stub +CATALOGNAME_CSWpmtestwarn = pm_testwarn + ARCHALL = 1 RUNTIME_DEP_PKGS += CSWpmtreedagnode 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 May 16 15:27:13 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 May 2013 13:27:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21110] csw/mgar/pkg/leafnode/trunk Message-ID: Revision: 21110 http://gar.svn.sourceforge.net/gar/?rev=21110&view=rev Author: dmichelsen Date: 2013-05-16 13:27:11 +0000 (Thu, 16 May 2013) Log Message: ----------- leafnode/trunk: Update to 1.11.8 and 64 bit Modified Paths: -------------- csw/mgar/pkg/leafnode/trunk/Makefile csw/mgar/pkg/leafnode/trunk/checksums Modified: csw/mgar/pkg/leafnode/trunk/Makefile =================================================================== --- csw/mgar/pkg/leafnode/trunk/Makefile 2013-05-16 12:55:04 UTC (rev 21109) +++ csw/mgar/pkg/leafnode/trunk/Makefile 2013-05-16 13:27:11 UTC (rev 21110) @@ -1,5 +1,5 @@ NAME = leafnode -VERSION = 1.11.6 +VERSION = 1.11.8 GARTYPE = v2 DESCRIPTION = An NNTP server for small leaf sites @@ -7,14 +7,16 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += $(DISTNAME).tar.xz UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=57767 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -RUNTIME_DEP_PKGS = CSWpcrert +RUNTIME_DEP_PKGS_CSWleafnode += CSWlibpcre1 +BUILD64 = 1 +ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/leafnode/trunk/checksums =================================================================== --- csw/mgar/pkg/leafnode/trunk/checksums 2013-05-16 12:55:04 UTC (rev 21109) +++ csw/mgar/pkg/leafnode/trunk/checksums 2013-05-16 13:27:11 UTC (rev 21110) @@ -1,2 +1 @@ -5a083968dbacc3d6f6d1013241c23e39 download/leafnode-1.11.6.tar.bz2 -3e82b440d115cda11b2c13026f312566 download/CSWleafnode.gspec +71c8b0dc3e5bf40b5072bcb6d3389abf leafnode-1.11.8.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 May 16 15:45:28 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 May 2013 13:45:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[21111] csw/mgar/pkg/leafnode/trunk/Makefile Message-ID: Revision: 21111 http://gar.svn.sourceforge.net/gar/?rev=21111&view=rev Author: dmichelsen Date: 2013-05-16 13:45:27 +0000 (Thu, 16 May 2013) Log Message: ----------- leafnode/trunk: Relocate config files Modified Paths: -------------- csw/mgar/pkg/leafnode/trunk/Makefile Modified: csw/mgar/pkg/leafnode/trunk/Makefile =================================================================== --- csw/mgar/pkg/leafnode/trunk/Makefile 2013-05-16 13:27:11 UTC (rev 21110) +++ csw/mgar/pkg/leafnode/trunk/Makefile 2013-05-16 13:45:27 UTC (rev 21111) @@ -19,4 +19,21 @@ ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +sysconfdir = /etc$(prefix)/leafnode + +EXTRA_MERGE_EXCLUDE_FILES += $(sysconfdir)/Makefile.dist +EXTRA_MERGE_EXCLUDE_FILES += $(sysconfdir)/UNINSTALL-daemontools +EXTRA_MERGE_EXCLUDE_FILES += $(sysconfdir)/run.tcpd.dist +EXTRA_MERGE_EXCLUDE_FILES += $(sysconfdir)/run.tcpserver.dist + +PRESERVECONF += $(sysconfdir)/config +PRESERVECONF += $(sysconfdir)/filters +PRESERVECONF += $(sysconfdir)/nntp.rules + include gar/category.mk + +post-install: + cd $(DESTDIR)$(sysconfdir) && mv config.example config + cd $(DESTDIR)$(sysconfdir) && mv filters.example filters + cd $(DESTDIR)$(sysconfdir) && mv nntp.rules.dist nntp.rules + @$(MAKECOOKIE) 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 May 16 15:51:02 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 13:51:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21112] csw/mgar/pkg/cpan/File-chdir/trunk/Makefile Message-ID: Revision: 21112 http://gar.svn.sourceforge.net/gar/?rev=21112&view=rev Author: bonivart Date: 2013-05-16 13:51:02 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/File-chdir/trunk: archall=1 Modified Paths: -------------- csw/mgar/pkg/cpan/File-chdir/trunk/Makefile Modified: csw/mgar/pkg/cpan/File-chdir/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-chdir/trunk/Makefile 2013-05-16 13:45:27 UTC (rev 21111) +++ csw/mgar/pkg/cpan/File-chdir/trunk/Makefile 2013-05-16 13:51:02 UTC (rev 21112) @@ -13,4 +13,6 @@ OBSOLETED_BY_CSWpm-file-chdir = CSWpmfilechdir CATALOGNAME_CSWpmfilechdir = pm_filechdir +ARCHALL = 1 + include gar/category.mk 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 May 16 16:17:40 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 14:17:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21113] csw/mgar/pkg/cpan/Text-Iconv/trunk/Makefile Message-ID: Revision: 21113 http://gar.svn.sourceforge.net/gar/?rev=21113&view=rev Author: bonivart Date: 2013-05-16 14:17:40 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/Text-Iconv/trunk: fix name, deps Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Iconv/trunk/Makefile Modified: csw/mgar/pkg/cpan/Text-Iconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Iconv/trunk/Makefile 2013-05-16 13:51:02 UTC (rev 21112) +++ csw/mgar/pkg/cpan/Text-Iconv/trunk/Makefile 2013-05-16 14:17:40 UTC (rev 21113) @@ -6,14 +6,16 @@ DESCRIPTION = Perl interface to iconv() codeset conversion function define BLURB - Perl interface to iconv() codeset conversion function endef DISTFILES += COPYING -PACKAGES = CSWpmtexticonv -CATALOGNAME = pm_texticonv +PACKAGES = CSWpm-text-iconv +CATALOGNAME = pm_text_iconv +SPKG_DESC_CSWpm-text-iconv = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-text-iconv = CSWpmtexticonv +CATALOGNAME_CSWpmtexticonv = pm_texticonv -RUNTIME_DEP_PKGS_CSWpmtexticonv += CSWiconv +RUNTIME_DEP_PKGS += CSWlibiconv2 include gar/category.mk 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 May 16 16:36:22 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 May 2013 14:36:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21114] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 21114 http://gar.svn.sourceforge.net/gar/?rev=21114&view=rev Author: dmichelsen Date: 2013-05-16 14:36:22 +0000 (Thu, 16 May 2013) Log Message: ----------- pcre/trunk: Update to 8.32, enable 32 bit chars, disable stack for recursion Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2013-05-16 14:17:40 UTC (rev 21113) +++ csw/mgar/pkg/pcre/trunk/Makefile 2013-05-16 14:36:22 UTC (rev 21114) @@ -1,5 +1,5 @@ NAME = pcre -VERSION = 8.31 +VERSION = 8.32 GARTYPE = v2 DESCRIPTION = Perl-compatible regular expression tools @@ -22,6 +22,7 @@ RUNTIME_DEP_PKGS_CSWpcre += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre16-0 +RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre32-0 RUNTIME_DEP_PKGS_CSWpcre += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWpcre += CSWlibz1 RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcreposix0 @@ -30,6 +31,7 @@ SPKG_DESC_CSWlibpcre-dev = Development files for libpcre.so.1, libpcre16.so.0, libpcrecpp.so.0 and libpcreposix.so.0 RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre16-0 +RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre32-0 RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcreposix0 RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcrecpp0 PKGFILES_CSWlibpcre-dev += $(PKGFILES_DEVEL) @@ -43,6 +45,9 @@ CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcresample.html CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcredemo.html +# We don't want to depend on pcre +CHECKPKG_OVERRIDES_CSWlibpcre-dev += missing-dependency|CSWpcre + PACKAGES += CSWlibpcre1 SPKG_DESC_CSWlibpcre1 = Perl-compatible regular expression tools, libpcre.so.1 PKGFILES_CSWlibpcre1 = $(call pkgfiles_lib,libpcre.so.1) @@ -51,6 +56,10 @@ SPKG_DESC_CSWlibpcre16-0 = Perl-compatible regular expression tools, libpcre16.so.0 PKGFILES_CSWlibpcre16-0 = $(call pkgfiles_lib,libpcre16.so.0) +PACKAGES += CSWlibpcre32-0 +SPKG_DESC_CSWlibpcre32-0 = Perl-compatible regular expression tools, libpcre32.so.0 +PKGFILES_CSWlibpcre32-0 = $(call pkgfiles_lib,libpcre32.so.0) + PACKAGES += CSWlibpcrecpp0 SPKG_DESC_CSWlibpcrecpp0 += Perl-compatible regular expression tools, libpcrecpp.so.0 PKGFILES_CSWlibpcrecpp0 += $(call pkgfiles_lib,libpcrecpp.so.0) @@ -74,12 +83,19 @@ CONFIGURE_ARGS += --enable-pcregrep-libbz2 CONFIGURE_ARGS += --enable-pcretest-libreadline CONFIGURE_ARGS += --enable-pcre16 +CONFIGURE_ARGS += --enable-pcre32 +# The stack on Solaris is rather limited, disable stack allocation +CONFIGURE_ARGS += --disable-stack-for-recursion + # No JIT for Sparc, may try for x86 at some later time #CONFIGURE_ARGS += --enable-jit +# This includes some alias things that don't work with the Sun linker +BUILD_OVERRIDE_VARS += EXTRA_LIBPCRECPP_LDFLAGS + # We need more than the default 8 MB of stack space -TEST_SCRIPTS = custom +# TEST_SCRIPTS = custom include gar/category.mk Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2013-05-16 14:17:40 UTC (rev 21113) +++ csw/mgar/pkg/pcre/trunk/checksums 2013-05-16 14:36:22 UTC (rev 21114) @@ -1 +1 @@ -1c9a276af932b5599157f96e945391f0 pcre-8.31.tar.bz2 +62f02a76bb57a40bc66681760ed511d5 pcre-8.32.tar.bz2 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 May 16 16:58:29 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 14:58:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21115] csw/mgar/pkg/cpan Message-ID: Revision: 21115 http://gar.svn.sourceforge.net/gar/?rev=21115&view=rev Author: bonivart Date: 2013-05-16 14:58:28 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/HTML-Form/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/HTML-Form/ csw/mgar/pkg/cpan/HTML-Form/Makefile csw/mgar/pkg/cpan/HTML-Form/branches/ csw/mgar/pkg/cpan/HTML-Form/tags/ csw/mgar/pkg/cpan/HTML-Form/trunk/ csw/mgar/pkg/cpan/HTML-Form/trunk/Makefile csw/mgar/pkg/cpan/HTML-Form/trunk/checksums csw/mgar/pkg/cpan/HTML-Form/trunk/files/ Added: csw/mgar/pkg/cpan/HTML-Form/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Form/Makefile (rev 0) +++ csw/mgar/pkg/cpan/HTML-Form/Makefile 2013-05-16 14:58:28 UTC (rev 21115) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/cpan/HTML-Form/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/HTML-Form/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Form/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/HTML-Form/trunk/Makefile 2013-05-16 14:58:28 UTC (rev 21115) @@ -0,0 +1,21 @@ +NAME = HTML-Form +VERSION = 6.03 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = GAAS + +DESCRIPTION = Class that represents an HTML form element +define BLURB +endef + +PACKAGES = CSWpm-html-form +CATALOGNAME = pm_html_form + +ARCHALL = 1 + +RUNTIME_DEP_PKGS += CSWpm-html-parser +RUNTIME_DEP_PKGS += CSWpm-http-message +RUNTIME_DEP_PKGS += CSWpm-uri + +include gar/category.mk + Property changes on: csw/mgar/pkg/cpan/HTML-Form/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cpan/HTML-Form/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Form/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/HTML-Form/trunk/checksums 2013-05-16 14:58:28 UTC (rev 21115) @@ -0,0 +1 @@ +fa6c2680207ed4fef5ea2ef09c210614 HTML-Form-6.03.tar.gz 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 May 16 17:08:00 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 15:08:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[21116] csw/mgar/pkg/cpan/Text-Autoformat/trunk Message-ID: Revision: 21116 http://gar.svn.sourceforge.net/gar/?rev=21116&view=rev Author: bonivart Date: 2013-05-16 15:07:59 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/Text-Autoformat/trunk: update to 1.669003, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums Modified: csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile 2013-05-16 14:58:28 UTC (rev 21115) +++ csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile 2013-05-16 15:07:59 UTC (rev 21116) @@ -1,24 +1,21 @@ NAME = Text-Autoformat -VERSION = 1.669002 +VERSION = 1.669003 CATEGORIES = cpan GARTYPE = v2 AUTHOR = DCONWAY DESCRIPTION = Automatic text wrapping and reformatting define BLURB - The fundamental task of the autoformat subroutine is to identify and - rearrange independent paragraphs in a text. Paragraphs typically consist of - a series of lines containing at least one non-whitespace character, followed - by one or more lines containing only optional whitespace. This is a more - liberal definition than many other formatters use: most require an empty - line to terminate a paragraph. Paragraphs may also be denoted by bulleting, - numbering, or quoting (see the following sections). endef DISTFILES += COPYING -PACKAGES = CSWpmtxtautofmt -CATALOGNAME = pm_txtautofmt +PACKAGES = CSWpm-text-autoformat +CATALOGNAME = pm_text_autoformat +SPKG_DESC_CSWpm-text-autoformat = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-text-autoformat = CSWpmtxtautofmt +CATALOGNAME_CSWpmtxtautofmt = pm_txtautofmt + ARCHALL = 1 RUNTIME_DEP_PKGS += CSWpmtxtreform Modified: csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums 2013-05-16 14:58:28 UTC (rev 21115) +++ csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums 2013-05-16 15:07:59 UTC (rev 21116) @@ -1 +1 @@ -c2c400207f49a769e32b5b1b660b07f7 Text-Autoformat-1.669002.tar.gz +c5b637612be7461b4102c6daf9976267 Text-Autoformat-1.669003.tar.gz 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 May 16 17:11:56 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 15:11:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21117] csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile Message-ID: Revision: 21117 http://gar.svn.sourceforge.net/gar/?rev=21117&view=rev Author: bonivart Date: 2013-05-16 15:11:55 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/Text-Reform/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile Modified: csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile 2013-05-16 15:07:59 UTC (rev 21116) +++ csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile 2013-05-16 15:11:55 UTC (rev 21117) @@ -6,13 +6,16 @@ DESCRIPTION = Manual text wrapping and reformatting define BLURB - Manual text wrapping and reformatting endef DISTFILES += COPYING -PACKAGES = CSWpmtxtreform -CATALOGNAME = pm_txtreform +PACKAGES = CSWpm-text-reform +CATALOGNAME = pm_text_reform +SPKG_DESC_CSWpm-text-reform = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-text-reform = CSWpmtxtreform +CATALOGNAME_CSWpmtxtreform = pm_txtreform + ARCHALL = 1 include gar/category.mk 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 May 16 17:20:17 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 15:20:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21118] csw/mgar/pkg/cpan/Unicode-Stringprep/trunk Message-ID: Revision: 21118 http://gar.svn.sourceforge.net/gar/?rev=21118&view=rev Author: bonivart Date: 2013-05-16 15:20:17 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/Unicode-Stringprep/trunk: update to 1.104, fix build dep,fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/checksums Modified: csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile 2013-05-16 15:11:55 UTC (rev 21117) +++ csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile 2013-05-16 15:20:17 UTC (rev 21118) @@ -1,18 +1,23 @@ NAME = Unicode-Stringprep -VERSION = 1.103 +VERSION = 1.104 CATEGORIES = cpan GARTYPE = v2 AUTHOR = CFAERBER DESCRIPTION = Preparation of Internationalized Strings (RFC 3454) define BLURB - Preparation of Internationalized Strings (RFC 3454) endef -PACKAGES = CSWpmunicodestrprep -CATALOGNAME = pm_unicodestringprep +PACKAGES = CSWpm-unicode-stringprep +CATALOGNAME = pm_unicode_stringprep +SPKG_DESC_CSWpm-unicode-stringprep = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-unicode-stringprep = CSWpmunicodestrprep +CATALOGNAME_CSWpmunicodestrprep = pm_unicodestringprep + ARCHALL = 1 LICENSE = LICENSE +BUILD_DEP_PKGS += CSWpm-test-nowarnings + include gar/category.mk Modified: csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/checksums 2013-05-16 15:11:55 UTC (rev 21117) +++ csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/checksums 2013-05-16 15:20:17 UTC (rev 21118) @@ -1 +1 @@ -38b37d58e8444832a8bb5b3c492726cd Unicode-Stringprep-1.103.tar.gz +cd19b39c9d3dd7caf6db4b2bf3464a72 Unicode-Stringprep-1.104.tar.gz 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 May 16 17:24:52 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 15:24:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21119] csw/mgar/pkg/cpan/XML-Dumper/trunk/Makefile Message-ID: Revision: 21119 http://gar.svn.sourceforge.net/gar/?rev=21119&view=rev Author: bonivart Date: 2013-05-16 15:24:52 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/XML-Dumper/trunk: fix dep and name Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Dumper/trunk/Makefile Modified: csw/mgar/pkg/cpan/XML-Dumper/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Dumper/trunk/Makefile 2013-05-16 15:20:17 UTC (rev 21118) +++ csw/mgar/pkg/cpan/XML-Dumper/trunk/Makefile 2013-05-16 15:24:52 UTC (rev 21119) @@ -6,15 +6,18 @@ DESCRIPTION = Perl module for dumping Perl objects from/to XML define BLURB - Perl module for dumping Perl objects from/to XML endef DISTFILES += COPYING -PACKAGES = CSWpmxmldumper -CATALOGNAME = pm_xmldumper +PACKAGES = CSWpm-xml-dumper +CATALOGNAME = pm_xml_dumper +SPKG_DESC_CSWpm-xml-dumper = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-xml-dumper = CSWpmxmldumper +CATALOGNAME_CSWpmxmldumper = pm_xmldumper + ARCHALL = 1 -RUNTIME_DEP_PKGS = CSWpmxmlparser +RUNTIME_DEP_PKGS = CSWpm-xml-parser include gar/category.mk 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 May 16 17:47:41 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 15:47:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21120] csw/mgar/pkg/cpan/XML-LibXSLT/trunk Message-ID: Revision: 21120 http://gar.svn.sourceforge.net/gar/?rev=21120&view=rev Author: bonivart Date: 2013-05-16 15:47:41 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/XML-LibXSLT/trunk: update to 1.80, fix dep, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/XML-LibXSLT/trunk/Makefile csw/mgar/pkg/cpan/XML-LibXSLT/trunk/checksums Modified: csw/mgar/pkg/cpan/XML-LibXSLT/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-LibXSLT/trunk/Makefile 2013-05-16 15:24:52 UTC (rev 21119) +++ csw/mgar/pkg/cpan/XML-LibXSLT/trunk/Makefile 2013-05-16 15:47:41 UTC (rev 21120) @@ -1,30 +1,28 @@ NAME = XML-LibXSLT -VERSION = 1.70 +VERSION = 1.80 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = PAJAS +AUTHOR = SHLOMIF DESCRIPTION = interface to the gnome libxslt library define BLURB - This module is an interface to the gnome project's libxslt. This is an - extremely good XSLT engine, highly compliant and also very fast. I have - tests showing this to be more than twice as fast as Sablotron. endef DISTFILES += COPYING -PACKAGES = CSWpmxmllibxslt -CATALOGNAME = pm_xmllibxslt +PACKAGES = CSWpm-xml-libxslt +CATALOGNAME = pm_xml_libxslt +SPKG_DESC_CSWpm-xml-libxslt = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-xml-libxslt = CSWpmxmllibxslt +CATALOGNAME_CSWpmxmllibxslt = pm_xmllibxslt -RUNTIME_DEP_PKGS += CSWpmxmllibxml -RUNTIME_DEP_PKGS += CSWgcrypt -RUNTIME_DEP_PKGS += CSWgdbm -RUNTIME_DEP_PKGS += CSWlibxslt -RUNTIME_DEP_PKGS += CSWgpgerr -RUNTIME_DEP_PKGS += CSWiconv -RUNTIME_DEP_PKGS += CSWlibxml2 -RUNTIME_DEP_PKGS += CSWzlib +RUNTIME_DEP_PKGS_CSWpm-xml-libxslt += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWpm-xml-libxslt += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWpm-xml-libxslt += CSWlibexslt0 +RUNTIME_DEP_PKGS += CSWpm-xml-libxml SKIPTEST = 1 +CHECKPKG_OVERRIDES_CSWpm-xml-libxslt += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/csw/auto/XML/LibXSLT/LibXSLT.so + include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-LibXSLT/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-LibXSLT/trunk/checksums 2013-05-16 15:24:52 UTC (rev 21119) +++ csw/mgar/pkg/cpan/XML-LibXSLT/trunk/checksums 2013-05-16 15:47:41 UTC (rev 21120) @@ -1,2 +1 @@ -56581bab90498634a2d0748eb0951d04 COPYING -c63a7913999de076e5c911810f69b392 XML-LibXSLT-1.70.tar.gz +bd8d0eaeee311a6dc148963a3f7753c6 XML-LibXSLT-1.80.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 Thu May 16 18:08:16 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 16 May 2013 16:08:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21121] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 21121 http://gar.svn.sourceforge.net/gar/?rev=21121&view=rev Author: lblume Date: 2013-05-16 16:08:12 +0000 (Thu, 16 May 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Use build options close to those of the official build; Fix the make test Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-16 15:47:41 UTC (rev 21120) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-16 16:08:12 UTC (rev 21121) @@ -28,9 +28,6 @@ GARCOMPILER = SOS12U3 endif -#Since Solaris9 does not have sos12u3 use lower opt -OPT_FLAGS_SOS12_i386 = -xO2 - # There is some assembler code, which doesn't work on sparcv8, and I don't see # an easy way to switch it off. ISA_DEFAULT_sparc-5.9 = sparcv8plus @@ -52,9 +49,21 @@ (Structured Query Language) database server. endef -EXTRA_CFLAGS += -mt -D__EXTENSIONS__ -EXTRA_CXXFLAGS += -mt -D__EXTENSIONS__ +# Those options follow those of the official builds +EXTRA_CFLAGS-sparc = -Xa -xstrconst +EXTRA_CFLAGS-i386 = -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt +EXTRA_CXXFLAGS-sparc = -noex +EXTRA_CXXFLAGS-i386 = -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt +EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GARCH)) -g -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm +EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(GARCH)) -g0 -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm +# The official build used -xO2 on 32 bit x86, -xO3 for 64 bit +# Use that for all builds +OPT_FLAGS_SOS-32 = -xO2 +OPT_FLAGS_SOS-64 = -xO3 +OPT_FLAGS_SOS = $(OPT_FLAGS_SOS-$(MEMORYMODEL)) + + INITSMF = $(sysconfdir)/init\.d/csw$(NAME) # Existing databases are in this location @@ -83,6 +92,9 @@ PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch +# Cf http://bugs.mysql.com/bug.php?id=62572 +PATCHFILES += 0005_my_vsnprintf-t_fails_bug_62572.patch + PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) @@ -189,30 +201,6 @@ BUILD_DEP_PKGS += CSWcmake BUILD_DEP_PKGS += CSWbison -# Set ./configure options -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-assembler -# Why not have a docs package? -# CONFIGURE_ARGS += --without-docs -CONFIGURE_ARGS += --enable-local-infile -CONFIGURE_ARGS += --with-charset=utf8 -CONFIGURE_ARGS += --with-extra-charsets=all -CONFIGURE_ARGS += --with-low-memory -CONFIGURE_ARGS += --with-pthread -CONFIGURE_ARGS += --with-readline -CONFIGURE_ARGS += --with-zlib-dir=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-ssl=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-plugins=max-no-ndb -CONFIGURE_ARGS += --with-comment="(OpenCSW)" -CONFIGURE_ARGS += --with-mysqld-user=mysql -CONFIGURE_ARGS += --with-fast-mutexes -CONFIGURE_ARGS += --with-libwrap -CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc -CONFIGURE_ARGS += --with-big-tables -CONFIGURE_ARGS += --enable-thread-safe-client -CONFIGURE_ARGS_DBG = --with-debug -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) - # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix) CMAKE_ARGS += -DINSTALL_LAYOUT=RPM @@ -220,36 +208,46 @@ CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir) CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) -# CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir)) CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin -CMAKE_ARGS += -DWITH_READLINE=1 CMAKE_ARGS += -DWITH_LIBWRAP=1 CMAKE_ARGS += -DWITH_SSL=system CMAKE_ARGS += -DWITH_ZLIB=system CMAKE_ARGS += -DDEFAULT_CHARSET=utf8 CMAKE_ARGS += -DDEFAULT_COLLATION=utf8_general_ci CMAKE_ARGS += -DWITH_COMMENT='OpenCSW' -CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" -CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" CMAKE_ARGS += -DBUILD_CONFIG=mysql_release -# CMAKE_ARGS += -DOPENSSL_INCLUDE_DIR="$(includedir)" -# CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" -# CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix) -# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/libssl.so -# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/libcrypto.so -CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" -CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)" -CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" +CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON +CMAKE_ARGS += -DBISON_EXECUTABLE=/opt/csw/bin/bison -# TODO: Make the tests pass. They don't at the moment. -SKIPTEST ?= 1 -TEST_SCRIPTS = custom -TEST_TARGETS = check +# The line below come from the official MySQL build configuration +CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON" +CMAKE_ARGS += "-DENABLE_DEBUG_SYNC:BOOL=ON" +CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" +CMAKE_ARGS += "-DENABLE_GCOV:BOOL=OFF" +CMAKE_ARGS += "-DWITH_ARCHIVE_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_BLACKHOLE_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_DEBUG:BOOL=OFF" +CMAKE_ARGS += "-DWITH_EMBEDDED_SERVER:BOOL=ON" +CMAKE_ARGS += "-DWITH_EXAMPLE_STORAGE_ENGINE:BOOL=OFF" +CMAKE_ARGS += "-DWITH_EXTRA_CHARSETS:STRING=all" +CMAKE_ARGS += "-DWITH_FEDERATED_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_INNOBASE_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_LIBEDIT:BOOL=OFF" +CMAKE_ARGS += "-DWITH_PARTITION_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_PERFSCHEMA_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_PIC:BOOL=ON" +CMAKE_ARGS += "-DWITH_READLINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_UNIT_TESTS:BOOL=ON" +CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF" + USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup PROTOTYPE_MODIFIERS = dbdir Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch 2013-05-16 16:08:12 UTC (rev 21121) @@ -0,0 +1,14 @@ +--- a/unittest/mysys/my_vsnprintf-t.c.original lun. mars 25 14:14:58 2013 ++++ b/unittest/mysys/my_vsnprintf-t.c jeu. mai 16 15:35:30 2013 +@@ -31,7 +31,11 @@ + + int main(void) + { ++#if defined (__GNUC__) + plan(58); ++#else ++ plan(57); ++#endif + + test1("Constant string", + "Constant string"); 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 May 16 18:34:44 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 16 May 2013 16:34:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21122] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 21122 http://gar.svn.sourceforge.net/gar/?rev=21122&view=rev Author: lblume Date: 2013-05-16 16:34:44 +0000 (Thu, 16 May 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: No dtrace on Solaris 9 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-16 16:08:12 UTC (rev 21121) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-16 16:34:44 UTC (rev 21122) @@ -229,7 +229,6 @@ # The line below come from the official MySQL build configuration CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON" CMAKE_ARGS += "-DENABLE_DEBUG_SYNC:BOOL=ON" -CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" CMAKE_ARGS += "-DENABLE_GCOV:BOOL=OFF" CMAKE_ARGS += "-DWITH_ARCHIVE_STORAGE_ENGINE:BOOL=ON" CMAKE_ARGS += "-DWITH_BLACKHOLE_STORAGE_ENGINE:BOOL=ON" @@ -246,6 +245,9 @@ CMAKE_ARGS += "-DWITH_READLINE:BOOL=ON" CMAKE_ARGS += "-DWITH_UNIT_TESTS:BOOL=ON" CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF" +ifneq ($(shell /usr/bin/uname -r),5.9) +CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" +endif USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup 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 May 16 19:12:06 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 May 2013 17:12:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21123] csw/mgar/pkg/file/trunk Message-ID: Revision: 21123 http://gar.svn.sourceforge.net/gar/?rev=21123&view=rev Author: dmichelsen Date: 2013-05-16 17:12:05 +0000 (Thu, 16 May 2013) Log Message: ----------- file/trunk: Update to 5.14 and enable pcre due to problems with stack size on recursive implementation of Solaris stock regexec Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Added Paths: ----------- csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2013-05-16 16:34:44 UTC (rev 21122) +++ csw/mgar/pkg/file/trunk/Makefile 2013-05-16 17:12:05 UTC (rev 21123) @@ -1,7 +1,7 @@ # $Id$ NAME = file -VERSION = 5.12 +VERSION = 5.14 GARTYPE = v2 define BLURB @@ -15,8 +15,10 @@ MASTER_SITES = ftp://ftp.astron.com/pub/file/ DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch +# PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch +PATCHFILES += 0001-Use-PCRE.patch + VENDOR_URL = http://www.darwinsys.com/file/ PACKAGES += CSWgfile @@ -46,6 +48,7 @@ PKGFILES_CSWlibmagic1 += $(call pkgfiles_lib,libmagic.so.1) RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibmagic-data +RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibpcreposix0 CHECKPKG_OVERRIDES_CSWlibmagic1 += surplus-dependency|CSWlibmagic-data OBSOLETED_BY_CSWlibmagic1 += CSWlibmagic @@ -67,6 +70,8 @@ # These flags are not understood by Sun Studio CONFIGURE_ARGS += --disable-warnings +EXTRA_LINKER_FLAGS += -lpcreposix -lpcre + BUILD64_LIBS_ONLY = 1 PYCOMPILE = 1 Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2013-05-16 16:34:44 UTC (rev 21122) +++ csw/mgar/pkg/file/trunk/checksums 2013-05-16 17:12:05 UTC (rev 21123) @@ -1 +1 @@ -1d7d85cb9354f79e5e351deef36be6ba file-5.12.tar.gz +c26625f1d6773ad4bc5a87c0e315632c file-5.14.tar.gz Added: csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch =================================================================== --- csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch (rev 0) +++ csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch 2013-05-16 17:12:05 UTC (rev 21123) @@ -0,0 +1,25 @@ +From d54a5b9bf5d91b42e4c3fd01229a5123e22a6019 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 16 May 2013 14:58:54 +0200 +Subject: [PATCH] Use PCRE + +--- + src/file.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/file.h b/src/file.h +index 2b64399..364a067 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -61,7 +61,7 @@ + #ifdef HAVE_INTTYPES_H + #include + #endif +-#include ++#include + #include + #include + #include +-- +1.8.1.4 + 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 May 16 19:39:20 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 17:39:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21124] csw/mgar/pkg/cpan/WWW-Mechanize/trunk Message-ID: Revision: 21124 http://gar.svn.sourceforge.net/gar/?rev=21124&view=rev Author: bonivart Date: 2013-05-16 17:39:19 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/WWW-Mechanize/trunk: update to 1.72, fix name and deps Modified Paths: -------------- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/Makefile csw/mgar/pkg/cpan/WWW-Mechanize/trunk/checksums Modified: csw/mgar/pkg/cpan/WWW-Mechanize/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/Makefile 2013-05-16 17:12:05 UTC (rev 21123) +++ csw/mgar/pkg/cpan/WWW-Mechanize/trunk/Makefile 2013-05-16 17:39:19 UTC (rev 21124) @@ -1,29 +1,32 @@ NAME = WWW-Mechanize -VERSION = 1.66 +VERSION = 1.72 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = PETDANCE +AUTHOR = JESSE DESCRIPTION = Handy web browsing in a Perl object define BLURB - WWW::Mechanize, or Mech for short, helps you automate interaction with a - website. It supports performing a sequence of page fetches including - following links and submitting forms. Each fetched page is parsed and its - links and forms are extracted. A link or a form can be selected, form fields - can be filled and the next page can be fetched. Mech also stores a history - of the URLs you've visited, which can be queried and revisited. endef DISTFILES += COPYING -PACKAGES = CSWpmwwwmechanize -CATALOGNAME = pm_wwwmechanize +PACKAGES = CSWpm-www-mechanize +CATALOGNAME = pm_www_mechanize +SPKG_DESC_CSWpm-www-mechanize = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-www-mechanize = CSWpmwwwmechanize +CATALOGNAME_CSWpmwwwmechanize = pm_wwwmechanize + ARCHALL = 1 -RUNTIME_DEP_PKGS += CSWpmhtmlparser -RUNTIME_DEP_PKGS += CSWpmhttpsvrsimp -RUNTIME_DEP_PKGS += CSWpmlibwww -RUNTIME_DEP_PKGS += CSWpmuri +RUNTIME_DEP_PKGS += CSWpm-html-form +RUNTIME_DEP_PKGS += CSWpm-html-parser +RUNTIME_DEP_PKGS += CSWpm-html-tree +RUNTIME_DEP_PKGS += CSWpm-http-daemon +RUNTIME_DEP_PKGS += CSWpm-http-message +RUNTIME_DEP_PKGS += CSWpm-http-server-simple +RUNTIME_DEP_PKGS += CSWpm-libwww-perl +RUNTIME_DEP_PKGS += CSWpm-test-warn +RUNTIME_DEP_PKGS += CSWpm-uri CONFIGURE_ARGS = -nolive -nolocal Modified: csw/mgar/pkg/cpan/WWW-Mechanize/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/checksums 2013-05-16 17:12:05 UTC (rev 21123) +++ csw/mgar/pkg/cpan/WWW-Mechanize/trunk/checksums 2013-05-16 17:39:19 UTC (rev 21124) @@ -1 +1 @@ -40690ba4cd93b8c3b931582acf87eeac WWW-Mechanize-1.66.tar.gz +231709669de7d912185b91e454206532 WWW-Mechanize-1.72.tar.gz 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 May 16 19:49:54 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 May 2013 17:49:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21125] csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk Message-ID: Revision: 21125 http://gar.svn.sourceforge.net/gar/?rev=21125&view=rev Author: bonivart Date: 2013-05-16 17:49:53 +0000 (Thu, 16 May 2013) Log Message: ----------- cpan/Test-WWW-Mechanize/trunk: update to 1.44, fix name and deps Modified Paths: -------------- csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/checksums Modified: csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile 2013-05-16 17:39:19 UTC (rev 21124) +++ csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile 2013-05-16 17:49:53 UTC (rev 21125) @@ -1,25 +1,32 @@ NAME = Test-WWW-Mechanize -VERSION = 1.30 +VERSION = 1.44 CATEGORIES = cpan GARTYPE = v2 AUTHOR = PETDANCE DESCRIPTION = Testing-specific WWW::Mechanize subclass define BLURB - Testing-specific WWW::Mechanize subclass endef DISTFILES += COPYING -PACKAGES = CSWpmtestwwwmech -CATALOGNAME = pm_testwwwmech +PACKAGES = CSWpm-test-www-mechanize +CATALOGNAME = pm_test_www_mechanize +SPKG_DESC_CSWpm-test-www-mechanize = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-test-www-mechanize = CSWpmtestwwwmech +CATALOGNAME_CSWpmtestwwwmech = pm_testwwwmech + ARCHALL = 1 -SKIPTEST = 1 +RUNTIME_DEP_PKGS += CSWpm-carp-assert-more +RUNTIME_DEP_PKGS += CSWpm-html-tree +RUNTIME_DEP_PKGS += CSWpm-http-server-simple +RUNTIME_DEP_PKGS += CSWpm-libwww-perl +RUNTIME_DEP_PKGS += CSWpm-test-longstring +RUNTIME_DEP_PKGS += CSWpm-uri +RUNTIME_DEP_PKGS += CSWpm-www-mechanize -RUNTIME_DEP_PKGS += CSWpmtestlongstr -RUNTIME_DEP_PKGS += CSWpmwwwmechanize -RUNTIME_DEP_PKGS += CSWpmhtmltree -RUNTIME_DEP_PKGS += CSWpmcarpassertmore +# Released at same time, remove next time +CHECKPKG_OVERRIDES_CSWpm-test-www-mechanize += dependency-on-nonexistent-package|CSWpm-www-mechanize include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/checksums 2013-05-16 17:39:19 UTC (rev 21124) +++ csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/checksums 2013-05-16 17:49:53 UTC (rev 21125) @@ -1 +1 @@ -a0d70d501e26e398f47bf0b3a5be0483 Test-WWW-Mechanize-1.30.tar.gz +fd3e4fe5b6adc66470752dd261d62542 Test-WWW-Mechanize-1.44.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 Thu May 16 20:49:04 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 16 May 2013 18:49:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[21126] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 21126 http://gar.svn.sourceforge.net/gar/?rev=21126&view=rev Author: lblume Date: 2013-05-16 18:49:04 +0000 (Thu, 16 May 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Add the right parameter for test Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-16 17:49:53 UTC (rev 21125) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-16 18:49:04 UTC (rev 21126) @@ -311,6 +311,8 @@ CONFIGURE_SCRIPTS = custom +TEST_TARGET = test + include gar/category.mk test-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From laurent at opencsw.org Fri May 17 00:35:30 2013 From: laurent at opencsw.org (Laurent Blume) Date: Fri, 17 May 2013 00:35:30 +0200 Subject: [csw-devel] SF.net SVN: gar:[21121] csw/mgar/pkg/mysql5/branches/mysql-5.5.x In-Reply-To: References: Message-ID: <51955F32.5040903@opencsw.org> With this one, I'm introducing some changes to the way MySQL 5.5 is built to make it closer to how they make the official builds, which vary according to arch and bitness (though some of their methods seem a little dubious). There should however not be any change in the look and feel. And I've fixed the test so at least it fully passes "make test" now. I'm planning to introduce it very soon because I need it. I'll test for S10 on x86 and sparc. If anybody notices some unwelcome side-effect, please tell me. Laurent On 2013-05-16 6:08 PM, lblume at users.sourceforge.net wrote: > Revision: 21121 > http://gar.svn.sourceforge.net/gar/?rev=21121&view=rev > Author: lblume > Date: 2013-05-16 16:08:12 +0000 (Thu, 16 May 2013) > Log Message: > ----------- > mysql5/branches/mysql-5.5.x: Use build options close to those of the official build; Fix the make test > > Modified Paths: > -------------- > csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile > > Added Paths: > ----------- > csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch > > Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile > =================================================================== > --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-16 15:47:41 UTC (rev 21120) > +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-05-16 16:08:12 UTC (rev 21121) > @@ -28,9 +28,6 @@ > GARCOMPILER = SOS12U3 > endif > > -#Since Solaris9 does not have sos12u3 use lower opt > -OPT_FLAGS_SOS12_i386 = -xO2 > - > # There is some assembler code, which doesn't work on sparcv8, and I don't see > # an easy way to switch it off. > ISA_DEFAULT_sparc-5.9 = sparcv8plus > @@ -52,9 +49,21 @@ > (Structured Query Language) database server. > endef > > -EXTRA_CFLAGS += -mt -D__EXTENSIONS__ > -EXTRA_CXXFLAGS += -mt -D__EXTENSIONS__ > +# Those options follow those of the official builds > +EXTRA_CFLAGS-sparc = -Xa -xstrconst > +EXTRA_CFLAGS-i386 = -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt > +EXTRA_CXXFLAGS-sparc = -noex > +EXTRA_CXXFLAGS-i386 = -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt > +EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GARCH)) -g -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm > +EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(GARCH)) -g0 -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm > > +# The official build used -xO2 on 32 bit x86, -xO3 for 64 bit > +# Use that for all builds > +OPT_FLAGS_SOS-32 = -xO2 > +OPT_FLAGS_SOS-64 = -xO3 > +OPT_FLAGS_SOS = $(OPT_FLAGS_SOS-$(MEMORYMODEL)) > + > + > INITSMF = $(sysconfdir)/init\.d/csw$(NAME) > > # Existing databases are in this location > @@ -83,6 +92,9 @@ > PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch > PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch > > +# Cf http://bugs.mysql.com/bug.php?id=62572 > +PATCHFILES += 0005_my_vsnprintf-t_fails_bug_62572.patch > + > PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) > PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) > SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) > @@ -189,30 +201,6 @@ > BUILD_DEP_PKGS += CSWcmake > BUILD_DEP_PKGS += CSWbison > > -# Set ./configure options > -CONFIGURE_ARGS = $(DIRPATHS) > -CONFIGURE_ARGS += --disable-assembler > -# Why not have a docs package? > -# CONFIGURE_ARGS += --without-docs > -CONFIGURE_ARGS += --enable-local-infile > -CONFIGURE_ARGS += --with-charset=utf8 > -CONFIGURE_ARGS += --with-extra-charsets=all > -CONFIGURE_ARGS += --with-low-memory > -CONFIGURE_ARGS += --with-pthread > -CONFIGURE_ARGS += --with-readline > -CONFIGURE_ARGS += --with-zlib-dir=$(BUILD_PREFIX) > -CONFIGURE_ARGS += --with-ssl=$(BUILD_PREFIX) > -CONFIGURE_ARGS += --with-plugins=max-no-ndb > -CONFIGURE_ARGS += --with-comment="(OpenCSW)" > -CONFIGURE_ARGS += --with-mysqld-user=mysql > -CONFIGURE_ARGS += --with-fast-mutexes > -CONFIGURE_ARGS += --with-libwrap > -CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc > -CONFIGURE_ARGS += --with-big-tables > -CONFIGURE_ARGS += --enable-thread-safe-client > -CONFIGURE_ARGS_DBG = --with-debug > -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) > - > # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide > CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix) > CMAKE_ARGS += -DINSTALL_LAYOUT=RPM > @@ -220,36 +208,46 @@ > CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir) > CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) > CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) > -# CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir)) > CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) > CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin > -CMAKE_ARGS += -DWITH_READLINE=1 > CMAKE_ARGS += -DWITH_LIBWRAP=1 > CMAKE_ARGS += -DWITH_SSL=system > CMAKE_ARGS += -DWITH_ZLIB=system > CMAKE_ARGS += -DDEFAULT_CHARSET=utf8 > CMAKE_ARGS += -DDEFAULT_COLLATION=utf8_general_ci > CMAKE_ARGS += -DWITH_COMMENT='OpenCSW' > -CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" > -CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" > CMAKE_ARGS += -DBUILD_CONFIG=mysql_release > -# CMAKE_ARGS += -DOPENSSL_INCLUDE_DIR="$(includedir)" > -# CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" > -# CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" > CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix) > -# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/libssl.so > -# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/libcrypto.so > -CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" > +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" > +CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" > CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" > -CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)" > -CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)" > +CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" > +CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" > CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON > +CMAKE_ARGS += -DBISON_EXECUTABLE=/opt/csw/bin/bison > > -# TODO: Make the tests pass. They don't at the moment. > -SKIPTEST ?= 1 > -TEST_SCRIPTS = custom > -TEST_TARGETS = check > +# The line below come from the official MySQL build configuration > +CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON" > +CMAKE_ARGS += "-DENABLE_DEBUG_SYNC:BOOL=ON" > +CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" > +CMAKE_ARGS += "-DENABLE_GCOV:BOOL=OFF" > +CMAKE_ARGS += "-DWITH_ARCHIVE_STORAGE_ENGINE:BOOL=ON" > +CMAKE_ARGS += "-DWITH_BLACKHOLE_STORAGE_ENGINE:BOOL=ON" > +CMAKE_ARGS += "-DWITH_DEBUG:BOOL=OFF" > +CMAKE_ARGS += "-DWITH_EMBEDDED_SERVER:BOOL=ON" > +CMAKE_ARGS += "-DWITH_EXAMPLE_STORAGE_ENGINE:BOOL=OFF" > +CMAKE_ARGS += "-DWITH_EXTRA_CHARSETS:STRING=all" > +CMAKE_ARGS += "-DWITH_FEDERATED_STORAGE_ENGINE:BOOL=ON" > +CMAKE_ARGS += "-DWITH_INNOBASE_STORAGE_ENGINE:BOOL=ON" > +CMAKE_ARGS += "-DWITH_LIBEDIT:BOOL=OFF" > +CMAKE_ARGS += "-DWITH_PARTITION_STORAGE_ENGINE:BOOL=ON" > +CMAKE_ARGS += "-DWITH_PERFSCHEMA_STORAGE_ENGINE:BOOL=ON" > +CMAKE_ARGS += "-DWITH_PIC:BOOL=ON" > +CMAKE_ARGS += "-DWITH_READLINE:BOOL=ON" > +CMAKE_ARGS += "-DWITH_UNIT_TESTS:BOOL=ON" > +CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF" > > + > USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup > > PROTOTYPE_MODIFIERS = dbdir > > Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch > =================================================================== > --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch (rev 0) > +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch 2013-05-16 16:08:12 UTC (rev 21121) > @@ -0,0 +1,14 @@ > +--- a/unittest/mysys/my_vsnprintf-t.c.original lun. mars 25 14:14:58 2013 > ++++ b/unittest/mysys/my_vsnprintf-t.c jeu. mai 16 15:35:30 2013 > +@@ -31,7 +31,11 @@ > + > + int main(void) > + { > ++#if defined (__GNUC__) > + plan(58); > ++#else > ++ plan(57); > ++#endif > + > + test1("Constant string", > + "Constant string"); > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > From cgrzemba at users.sourceforge.net Fri May 17 08:03:35 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 17 May 2013 06:03:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21127] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21127 http://gar.svn.sourceforge.net/gar/?rev=21127&view=rev Author: cgrzemba Date: 2013-05-17 06:03:34 +0000 (Fri, 17 May 2013) Log Message: ----------- qt4-gcc/trunk: introduce csw path layout Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-16 18:49:04 UTC (rev 21126) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-17 06:03:34 UTC (rev 21127) @@ -3,6 +3,7 @@ NAME = qt VERSION = 4.8.1 GARTYPE = v2 +MAJOR = $(basename $(basename $(VERSION))) DESCRIPTION = TrollTech C++ application framework define BLURB @@ -43,6 +44,14 @@ CONFIGURE_ARGS += -opensource CONFIGURE_ARGS += -confirm-license CONFIGURE_ARGS += -prefix $(prefix) +CONFIGURE_ARGS += -plugindir $(libdir)/$(NAME)$(MAJOR)/plugins +CONFIGURE_ARGS += -docdir $(docdir)/$(NAME)$(MAJOR) +CONFIGURE_ARGS += -translationdir $(sharedstatedir)/$(NAME)$(MAJOR)/translations +CONFIGURE_ARGS += -importdir $(libdir)/$(NAME)$(MAJOR)/imports +CONFIGURE_ARGS += -demosdir $(sharedstatedir)/$(NAME)$(MAJOR)/demos +CONFIGURE_ARGS += -examplesdir $(sharedstatedir)/$(NAME)$(MAJOR)/examples +CONFIGURE_ARGS += -datadir $(sharedstatedir)/$(NAME)$(MAJOR) +CONFIGURE_ARGS += -sysconfdir $(syconfdir)/$(NAME)$(MAJOR) CONFIGURE_ARGS += -no-qt3support CONFIGURE_ARGS += -no-xshape CONFIGURE_ARGS += -webkit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri May 17 09:36:21 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 17 May 2013 07:36:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21128] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21128 http://gar.svn.sourceforge.net/gar/?rev=21128&view=rev Author: cgrzemba Date: 2013-05-17 07:36:20 +0000 (Fri, 17 May 2013) Log Message: ----------- qt4-gcc/trunk: move examples to libdir Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-17 06:03:34 UTC (rev 21127) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-17 07:36:20 UTC (rev 21128) @@ -49,7 +49,7 @@ CONFIGURE_ARGS += -translationdir $(sharedstatedir)/$(NAME)$(MAJOR)/translations CONFIGURE_ARGS += -importdir $(libdir)/$(NAME)$(MAJOR)/imports CONFIGURE_ARGS += -demosdir $(sharedstatedir)/$(NAME)$(MAJOR)/demos -CONFIGURE_ARGS += -examplesdir $(sharedstatedir)/$(NAME)$(MAJOR)/examples +CONFIGURE_ARGS += -examplesdir $(libdir)/$(NAME)$(MAJOR)/examples CONFIGURE_ARGS += -datadir $(sharedstatedir)/$(NAME)$(MAJOR) CONFIGURE_ARGS += -sysconfdir $(syconfdir)/$(NAME)$(MAJOR) CONFIGURE_ARGS += -no-qt3support 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 May 17 10:02:24 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 17 May 2013 08:02:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[21129] csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile Message-ID: Revision: 21129 http://gar.svn.sourceforge.net/gar/?rev=21129&view=rev Author: lblume Date: 2013-05-17 08:02:21 +0000 (Fri, 17 May 2013) Log Message: ----------- gnome-base/gconf2/trunk: Disable introspection, it breaks build; Disable gsettings, it cores and appears useless Modified Paths: -------------- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-17 07:36:20 UTC (rev 21128) +++ csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2013-05-17 08:02:21 UTC (rev 21129) @@ -24,7 +24,6 @@ BUILD_DEP_PKGS += CSWlibxslt BUILD_DEP_PKGS += CSWgtk-doc BUILD_DEP_PKGS += CSWintltool -BUILD_DEP_PKGS += CSWgobject-introspection-dev PACKAGES += CSWlibgconf2-4 SPKG_DESC_CSWlibgconf2-4 = GNOME configuration database system, libgconf-2.so.4 @@ -75,15 +74,12 @@ CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc CONFIGURE_ARGS += --with-gtk=2.0 -CONFIGURE_ARGS += --enable-introspection=yes +# This one causes grief duiring build time +CONFIGURE_ARGS += --enable-introspection=no +# gsettings dumps core and does not appear to have any use here, +# as it lacks any schema.xml file to wortk with. +CONFIGURE_ARGS += --enable-gsettings-backend=no -# Needed for introspection -EXTRA_BUILD_EXPORTS += PKG_CONFIG_PATH - -# CONFIGURE_ARGS += --disable-defaults-service -#The "defaults service" requires polkit. and dbus. -#We're better off without em. - include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri May 17 14:12:30 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 17 May 2013 12:12:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21130] csw/mgar/pkg/lang-python/python/branches/python-3.3 Message-ID: Revision: 21130 http://gar.svn.sourceforge.net/gar/?rev=21130&view=rev Author: wahwah Date: 2013-05-17 12:12:29 +0000 (Fri, 17 May 2013) Log Message: ----------- lang-python/python/branches/python-3.3: version bump to 3.3.2 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-05-17 08:02:21 UTC (rev 21129) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-05-17 12:12:29 UTC (rev 21130) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 3.3.1 +VERSION = 3.3.2 VER = 3.3 DVER = 3-3 UVER = 3_3 Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums 2013-05-17 08:02:21 UTC (rev 21129) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums 2013-05-17 12:12:29 UTC (rev 21130) @@ -1 +1 @@ -fb7147a15359a941e0b048c641fd7123 Python-3.3.1.tar.bz2 +7dffe775f3bea68a44f762a3490e5e28 Python-3.3.2.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 Fri May 17 14:40:56 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 17 May 2013 12:40:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21131] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 21131 http://gar.svn.sourceforge.net/gar/?rev=21131&view=rev Author: lblume Date: 2013-05-17 12:40:56 +0000 (Fri, 17 May 2013) Log Message: ----------- glib2/trunk: Have a different optimization level for sparc, needed so inline is detected properly; Add a script to increase ulimit -n during the tests Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/set-ulimit-for-build-test Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-17 12:12:29 UTC (rev 21130) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-17 12:40:56 UTC (rev 21131) @@ -23,6 +23,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.xz DISTFILES += changelog.CSW +DISTFILES += set-ulimit-for-build-test # # Build patches @@ -287,7 +288,9 @@ EXTRA_LINKER_FLAGS = # -xO4 is necessary on sparc so that function inlining happens as expected -EXTRA_CFLAGS = -xO4 -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 +EXTRA_CFLAGS_sparc = -xO4 -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 +EXTRA_CFLAGS_i386 = -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 +EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) EXTRA_LDFLAGS = -lsocket $(RUNPATH_LINKER_FLAGS) @@ -316,6 +319,9 @@ #SKIPTEST = 1 +# For tests to succeed, set the ulimit higher than the default of 256. +EXTRA_TEST_ENV += BASH_ENV=$(abspath $(WORKDIR)/set-ulimit-for-build-test) + # Those are to make the checks work EXTRA_COMMON_EXPORTS = TZ EXTRA_COMMON_EXPORTS += DISPLAY Added: csw/mgar/pkg/glib2/trunk/files/set-ulimit-for-build-test =================================================================== --- csw/mgar/pkg/glib2/trunk/files/set-ulimit-for-build-test (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/set-ulimit-for-build-test 2013-05-17 12:40:56 UTC (rev 21131) @@ -0,0 +1 @@ +ulimit -S -n 10000 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 May 17 15:00:13 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 May 2013 13:00:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21132] csw/mgar/pkg/cpan Message-ID: Revision: 21132 http://gar.svn.sourceforge.net/gar/?rev=21132&view=rev Author: dmichelsen Date: 2013-05-17 13:00:10 +0000 (Fri, 17 May 2013) Log Message: ----------- cpan/DateTime-Format-ISO8601: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/DateTime-Format-ISO8601/ csw/mgar/pkg/cpan/DateTime-Format-ISO8601/branches/ csw/mgar/pkg/cpan/DateTime-Format-ISO8601/tags/ csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/ csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/Makefile csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/checksums csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/files/ Property changes on: csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/Makefile 2013-05-17 13:00:10 UTC (rev 21132) @@ -0,0 +1,28 @@ +NAME = DateTime-Format-ISO8601 +VERSION = 0.08 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = JHOBLITT + +DESCRIPTION = Parses ISO8601 formats +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +PACKAGES += CSWpm-datetime-format-iso8601 +CATALOGNAME_CSWpm-datetime-format-iso8601 = pm_datetime_format_iso8601 +SPKG_DESC_CSWpm-datetime-format-iso8601 = Parses ISO8601 formats +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-datetime-format-iso8601 = 1 +RUNTIME_DEP_PKGS_CSWpm-datetime-format-iso8601 += CSWpm-datetime +RUNTIME_DEP_PKGS_CSWpm-datetime-format-iso8601 += CSWpm-datetime-format-builder + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Format-ISO8601/trunk/checksums 2013-05-17 13:00:10 UTC (rev 21132) @@ -0,0 +1 @@ +b7c0a4b5e767a8d3b87f3dc678d8c30c DateTime-Format-ISO8601-0.08.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri May 17 16:43:43 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 17 May 2013 14:43:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21133] csw/mgar/pkg/cpan/Tree-DAG_Node/trunk Message-ID: Revision: 21133 http://gar.svn.sourceforge.net/gar/?rev=21133&view=rev Author: bonivart Date: 2013-05-17 14:43:43 +0000 (Fri, 17 May 2013) Log Message: ----------- cpan/Tree-DAG_Node/trunk: update to 1.11, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/Makefile csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/checksums Modified: csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/Makefile 2013-05-17 13:00:10 UTC (rev 21132) +++ csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/Makefile 2013-05-17 14:43:43 UTC (rev 21133) @@ -1,24 +1,23 @@ NAME = Tree-DAG_Node -VERSION = 1.06 +VERSION = 1.11 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = COGENT +AUTHOR = RSAVAGE DESCRIPTION = Class for representing nodes in a tree define BLURB - This class encapsulates/makes/manipulates objects that represent nodes in a - tree structure. The tree structure is not an object itself, but is emergent - from the linkages you create between nodes. This class provides the methods - for making linkages that can be used to build up a tree, while preventing - you from ever making any kinds of linkages which are not allowed in a tree - (such as having a node be its own mother or ancestor, or having a node have - two mothers). endef DISTFILES += COPYING -PACKAGES = CSWpmtreedagnode -CATALOGNAME = pm_treedagnode +MODDIST ?= $(DISTNAME).tgz + +PACKAGES = CSWpm-tree-dag-node +CATALOGNAME = pm_tree_dag_node +SPKG_DESC_CSWpm-tree-dag-node = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-tree-dag-node = CSWpmtreedagnode +CATALOGNAME_CSWpmtreedagnode = pm_treedagnode + ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/checksums 2013-05-17 13:00:10 UTC (rev 21132) +++ csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/checksums 2013-05-17 14:43:43 UTC (rev 21133) @@ -1,2 +1 @@ -c415a925d089134a166b72864a1ca43b COPYING -3b006f128bd1d8961fc57c466ffa05f2 Tree-DAG_Node-1.06.tar.gz +362e63bef4711d286ad7542a5055013d Tree-DAG_Node-1.11.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri May 17 16:52:47 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 17 May 2013 14:52:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21134] csw/mgar/pkg/cpan/Net-Netmask/trunk Message-ID: Revision: 21134 http://gar.svn.sourceforge.net/gar/?rev=21134&view=rev Author: bonivart Date: 2013-05-17 14:52:47 +0000 (Fri, 17 May 2013) Log Message: ----------- cpan/Net-Netmask/trunk: update to 1.9016, fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile csw/mgar/pkg/cpan/Net-Netmask/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile 2013-05-17 14:43:43 UTC (rev 21133) +++ csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile 2013-05-17 14:52:47 UTC (rev 21134) @@ -1,18 +1,24 @@ NAME = Net-Netmask -VERSION = 1.9015 +VERSION = 1.9016 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MUIR DESCRIPTION = Parse, manipulate and lookup IP network blocks define BLURB - Parse, manipulate and lookup IP network blocks endef DISTFILES += COPYING -PACKAGES = CSWpmnetnetmask -CATALOGNAME = pm_netnetmask +MASTER_SITES = http://search.cpan.org/CPAN/authors/id/M/MU/MUIR/modules/ +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES = CSWpm-net-netmask +CATALOGNAME = pm_net_netmask +SPKG_DESC_CSWpm-net-netmask = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-net-netmask = CSWpmnetnetmask +CATALOGNAME_CSWpmnetnetmask = pm_netnetmask + ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-Netmask/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Netmask/trunk/checksums 2013-05-17 14:43:43 UTC (rev 21133) +++ csw/mgar/pkg/cpan/Net-Netmask/trunk/checksums 2013-05-17 14:52:47 UTC (rev 21134) @@ -1,2 +1 @@ -3d6734478ccc5c63108efe748107619b COPYING -90298105cd17a5c2a4059297e09f1546 Net-Netmask-1.9015.tar.gz +174606b568f8545b8968aecf50ba7a37 Net-Netmask-1.9016.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri May 17 16:57:32 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 17 May 2013 14:57:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21135] csw/mgar/pkg/cpan/Number-Format/trunk/Makefile Message-ID: Revision: 21135 http://gar.svn.sourceforge.net/gar/?rev=21135&view=rev Author: bonivart Date: 2013-05-17 14:57:32 +0000 (Fri, 17 May 2013) Log Message: ----------- cpan/Number-Format/trunk: fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Number-Format/trunk/Makefile Modified: csw/mgar/pkg/cpan/Number-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Number-Format/trunk/Makefile 2013-05-17 14:52:47 UTC (rev 21134) +++ csw/mgar/pkg/cpan/Number-Format/trunk/Makefile 2013-05-17 14:57:32 UTC (rev 21135) @@ -6,19 +6,19 @@ DESCRIPTION = Perl extension for formatting numbers define BLURB - Number::Format is a library for formatting numbers. Functions are provided for - converting numbers to strings in a variety of ways, and to convert strings that - contain numbers back into numeric form. The output formats may include thousands - separators - characters inserted between each group of three characters counting - right to left from the decimal point. The characters used for the decimal point and - the thousands separator come from the locale information or can be specified by the - user. endef DISTFILES += COPYING -PACKAGES = CSWpmnumberformat -CATALOGNAME = pm_numberformat +PACKAGES = CSWpm-number-format +CATALOGNAME = pm_number_format +SPKG_DESC_CSWpm-number-format = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-number-format = CSWpmnumberformat +CATALOGNAME_CSWpmnumberformat = pm_numberformat + ARCHALL = 1 +# Fails one Russian locale test +SKIPTEST = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 18 00:02:21 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 17 May 2013 22:02:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21136] csw/mgar/pkg/gnutls/trunk Message-ID: Revision: 21136 http://gar.svn.sourceforge.net/gar/?rev=21136&view=rev Author: chninkel Date: 2013-05-17 22:02:15 +0000 (Fri, 17 May 2013) Log Message: ----------- gnutls/trunk: updated to 2.12.23 Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile csw/mgar/pkg/gnutls/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnutls/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch csw/mgar/pkg/gnutls/trunk/files/0003-correctly-handle-the-null-key-case.patch Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2013-05-17 14:57:32 UTC (rev 21135) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2013-05-17 22:02:15 UTC (rev 21136) @@ -1,5 +1,5 @@ NAME = gnutls -VERSION = 2.10.4 +VERSION = 2.12.23 GARTYPE = v2 DESCRIPTION = GNU Transport Layer Security libraries and tools @@ -10,9 +10,15 @@ endef MASTER_SITES = $(GNU_MIRROR) -MASTER_SITES += http://alpha.gnu.org/gnu/gnutls/ +MASTER_SITES += ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PATCHFILES += 0001-Do-not-strip-norunpath.patch +#PATCHFILES += 0001-Do-not-strip-norunpath.patch +PATCHFILES += 0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch +# certtool uses fprintf to print the keyid but when +# the key id is null it segfaults under Solaris +# (where it prints (null) under Linux) +# This patchs fixes this (and is taken from gnutls3) +PATCHFILES += 0003-correctly-handle-the-null-key-case.patch UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -37,12 +43,12 @@ PACKAGES += CSWlibgnutls26 CATALOGNAME_CSWlibgnutls = libgnutls26 SPKG_DESC_CSWlibgnutls26 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.26 -PKGFILES_CSWlibgnutls26 = $(call baseisadirs,$(libdir),libgnutls.*\.so\.26(\.\d+)*) +PKGFILES_CSWlibgnutls26 = $(PKGFILES_RT) RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgcrypt RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWggettextrt RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgpgerr RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibtasn1-3 -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibz1 PACKAGES += CSWlibgnutls-dev CATALOGNAME_CSWlibgnutls-dev = libgnutls_dev @@ -61,8 +67,11 @@ BUILD_DEP_PKGS += CSWreadline BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibgnutls26) -BUILD_DEP_PKGS += CSWlibtasn1devel +BUILD_DEP_PKGS += CSWlibtasn1-dev +GARCOMPILER = GNU +GARFLAVOR = DBG + # We don't need it and if defined the test breaks LD_OPTIONS = Modified: csw/mgar/pkg/gnutls/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls/trunk/checksums 2013-05-17 14:57:32 UTC (rev 21135) +++ csw/mgar/pkg/gnutls/trunk/checksums 2013-05-17 22:02:15 UTC (rev 21136) @@ -1 +1 @@ -4e1517084018a8b1fdc96daabea40528 gnutls-2.10.4.tar.bz2 +f3c1d34bd5f113395c4be0d5dfc2b7fe gnutls-2.12.23.tar.bz2 Added: csw/mgar/pkg/gnutls/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch =================================================================== --- csw/mgar/pkg/gnutls/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/gnutls/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch 2013-05-17 22:02:15 UTC (rev 21136) @@ -0,0 +1,31 @@ +From 43971c3e07d4303fa74191facb7c8d07600076f3 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Wed, 15 May 2013 22:56:42 +0200 +Subject: [PATCH] Use AF_UNIX instead of AF_LOCAL on Solaris + +--- + lib/nettle/egd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/nettle/egd.c b/lib/nettle/egd.c +index b1886d4..690df8c 100644 +--- a/lib/nettle/egd.c ++++ b/lib/nettle/egd.c +@@ -141,12 +141,12 @@ _rndegd_connect_socket (void) + } + + memset (&addr, 0, sizeof addr); +- addr.sun_family = AF_LOCAL; ++ addr.sun_family = AF_UNIX; + strcpy (addr.sun_path, name); + addr_len = (offsetof (struct sockaddr_un, sun_path) + + strlen (addr.sun_path)); + +- fd = socket (AF_LOCAL, SOCK_STREAM, 0); ++ fd = socket (AF_UNIX, SOCK_STREAM, 0); + if (fd == -1) + { + _gnutls_debug_log ("can't create unix domain socket: %s\n", +-- +1.8.1.4 + Added: csw/mgar/pkg/gnutls/trunk/files/0003-correctly-handle-the-null-key-case.patch =================================================================== --- csw/mgar/pkg/gnutls/trunk/files/0003-correctly-handle-the-null-key-case.patch (rev 0) +++ csw/mgar/pkg/gnutls/trunk/files/0003-correctly-handle-the-null-key-case.patch 2013-05-17 22:02:15 UTC (rev 21136) @@ -0,0 +1,26 @@ +From 3e21ed4cad3df8d433c568cee1f040a7d076b6c3 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Fri, 17 May 2013 23:13:48 +0200 +Subject: [PATCH] correctly handle the null key case + +--- + src/certtool.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/certtool.c b/src/certtool.c +index 832ca53..a4b97da 100644 +--- a/src/certtool.c ++++ b/src/certtool.c +@@ -2626,7 +2626,8 @@ print_bag_data (gnutls_pkcs12_bag_t bag) + result = gnutls_pkcs12_bag_get_key_id (bag, i, &id); + if (result < 0) + error (EXIT_FAILURE, 0, "get_key_id: %s", gnutls_strerror (type)); +- fprintf (outfile, "\tKey ID: %s\n", raw_to_string (id.data, id.size)); ++ if (id.size > 0) ++ fprintf (outfile, "\tKey ID: %s\n", raw_to_string (id.data, id.size)); + + result = gnutls_pkcs12_bag_get_data (bag, i, &cdata); + if (result < 0) +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat May 18 11:18:30 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 18 May 2013 09:18:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21137] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 21137 http://gar.svn.sourceforge.net/gar/?rev=21137&view=rev Author: lblume Date: 2013-05-18 09:18:21 +0000 (Sat, 18 May 2013) Log Message: ----------- glib2/trunk: Remove unused dependencies and do some cleanup in the overrides Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-17 22:02:15 UTC (rev 21136) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-18 09:18:21 UTC (rev 21137) @@ -92,113 +92,85 @@ PACKAGES += CSWglib2 SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWglib2 += CSWgio-fam-backend RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWglib2 += CSWgio-fam-backend -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibffi4 +RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0 CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWgio-fam-backend +CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgio2-0-0 +CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgthread2-0-0 - PACKAGES += CSWgio-fam-backend SPKG_DESC_CSWgio-fam-backend = $(DESCRIPTION), GIO FAM backend PKGFILES_CSWgio-fam-backend = .*/libgiofam.so RUNTIME_DEP_PKGS_CSWgio-fam-backend = CSWlibfam0 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibffi4 PACKAGES += CSWlibgio2-0-0 SPKG_DESC_CSWlibgio2-0-0 += $(DESCRIPTION), libgio-2.0.so.0 PKGFILES_CSWlibgio2-0-0 += $(call pkgfiles_lib,libgio-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWsharedmimeinfo -RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibffi4 # Those are ok: hardcoded search paths which have added /opt/csw CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibgio2-0-0_$(GARCH)) + PACKAGES += CSWlibglib2-0-0 PKGFILES_CSWlibglib2-0-0 += $(call pkgfiles_lib,libglib-2.0.so.0) SPKG_DESC_CSWlibglib2-0-0 += $(DESCRIPTION), libglib-2.0.so.0 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibpcre1 -# Those are ok: hardcoded search paths which have added /opt/csw -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4 PACKAGES += CSWlibgmodule2-0-0 PKGFILES_CSWlibgmodule2-0-0 += $(call pkgfiles_lib,libgmodule-2.0.so.0) SPKG_DESC_CSWlibgmodule2-0-0 += $(DESCRIPTION), libgmodule-2.0.so.0 -RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibpcre1 +# Those are ok: hardcoded search paths which have added /opt/csw +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibglib2-0-0_$(GARCH)) PACKAGES += CSWlibgobject2-0-0 PKGFILES_CSWlibgobject2-0-0 += $(call pkgfiles_lib,libgobject-2.0.so.0) SPKG_DESC_CSWlibgobject2-0-0 += $(DESCRIPTION), libgobject-2.0.so.0 -RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi4 PACKAGES += CSWlibgthread2-0-0 SPKG_DESC_CSWlibgthread2-0-0 += $(DESCRIPTION), libgthread-2.0.so.0 PKGFILES_CSWlibgthread2-0-0 += $(call pkgfiles_lib,libgthread-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibpcre1 PACKAGES += CSWlibglib2-dev SPKG_DESC_CSWlibglib2-dev = Development files for libglib-2.0.so.0 and assorted libglib, libgmodule, libgobject and libgthread RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWiconv -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWzlib RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWpython -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibffi4 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibz1 PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.* PKGFILES_CSWlibglib2-dev += .*/gdbus-2.0.* @@ -217,25 +189,6 @@ PKGFILES_CSWlibglib2-dev += .*/man1/gtester.* OBSOLETED_BY_CSWlibglib2-dev = CSWglib2devel CATALOGNAME_CSWglib2devel = glib2_devel_stub -CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWglib2 -CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWiconv -CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWzlib -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyo CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/__init__.pyc CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/__init__.pyo CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/codegen.pyc @@ -283,10 +236,6 @@ # This is used to adjust paths in documentation BUILD_DEP_PKGS += CSWgsed -# We don't need it and if defined the test breaks -LD_OPTIONS = -EXTRA_LINKER_FLAGS = - # -xO4 is necessary on sparc so that function inlining happens as expected EXTRA_CFLAGS_sparc = -xO4 -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 EXTRA_CFLAGS_i386 = -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 18 12:20:03 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 18 May 2013 10:20:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21138] csw/mgar/pkg/lang-python/sqlobject/trunk Message-ID: Revision: 21138 http://gar.svn.sourceforge.net/gar/?rev=21138&view=rev Author: wahwah Date: 2013-05-18 10:20:03 +0000 (Sat, 18 May 2013) Log Message: ----------- lang-python/sqlobject/trunk: version bump to 1.4.0 Modified Paths: -------------- csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile csw/mgar/pkg/lang-python/sqlobject/trunk/checksums Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2013-05-18 09:18:21 UTC (rev 21137) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2013-05-18 10:20:03 UTC (rev 21138) @@ -3,15 +3,12 @@ # $Id$ NAME = SQLObject -VERSION = 1.3.2 +VERSION = 1.4.0 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Object Relational Manager for Python -define BLURB -endef -SPKG_SOURCEURL = http://www.sqlobject.org/ -MASTER_SITES = http://pypi.python.org/packages/source/S/$(NAME)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +VENDOR_URL = http://www.sqlobject.org/ +DISTFILES = $(DISTNAME).tar.gz LICENSE = docs/SQLObject.txt PACKAGES = CSWpy-sqlobject RUNTIME_DEP_PKGS_CSWpy-sqlobject = CSWpy-formencode Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2013-05-18 09:18:21 UTC (rev 21137) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2013-05-18 10:20:03 UTC (rev 21138) @@ -1 +1 @@ -225f5ecb912804415ffbd24db9473367 SQLObject-1.3.2.tar.gz +c6b3a305a05edc8edb56db06d0945178 SQLObject-1.4.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 Sat May 18 18:44:14 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 18 May 2013 16:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21139] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 21139 http://gar.svn.sourceforge.net/gar/?rev=21139&view=rev Author: wahwah Date: 2013-05-18 16:44:13 +0000 (Sat, 18 May 2013) Log Message: ----------- pkgdb: Use the REST interface for add+remove When adding and/or removing packages using pkgdb, use the REST interface instead of a direct database connection. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-05-18 10:20:03 UTC (rev 21138) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-05-18 16:44:13 UTC (rev 21139) @@ -23,6 +23,7 @@ import package_stats import progressbar import re +import rest import shell import socket import sqlobject @@ -497,35 +498,24 @@ srv4.DeleteAllDependentObjects() srv4.destroySelf() elif command == 'add-to-cat': - if len(args) <= 3: + if len(args) < 4: raise UsageError("Not enough arguments, see usage.") user = getpass.getuser() - osrel, arch, catrel= args[:3] - c = checkpkg_lib.Catalog() + osrel, arch, catrel = args[:3] + username, password = rest.GetUsernameAndPassword() + rest_client = rest.RestClient(username=username, password=password) md5_sums = args[3:] for md5_sum in md5_sums: - try: - sqo_srv4 = m.Srv4FileStats.select( - m.Srv4FileStats.q.md5_sum==md5_sum).getOne() - logging.debug('Adding %s to the catalog', md5_sum) - c.AddSrv4ToCatalog(sqo_srv4, osrel, arch, catrel, who=user) - except sqlobject.main.SQLObjectNotFound as e: - logging.warning('Srv4 file %r, osrel %r, arch %r or catrel %r ' - 'was not found in the database, ' - 'and the package was not added: %s', - md5_sum, osrel, arch, catrel, e) + rest_client.AddSvr4ToCatalog(catrel, arch, osrel, md5_sum) elif command == 'del-from-cat': if len(args) < 4: raise UsageError("Not enough arguments, see usage.") osrel, arch, catrel= args[:3] md5_sums = args[3:] - c = checkpkg_lib.Catalog() + username, password = rest.GetUsernameAndPassword() + rest_client = rest.RestClient(username=username, password=password) for md5_sum in md5_sums: - sqo_srv4 = m.Srv4FileStats.select( - m.Srv4FileStats.q.md5_sum==md5_sum).getOne() - logging.debug("Removing %s from %s %s %s", - sqo_srv4, osrel, arch, catrel) - c.RemoveSrv4(sqo_srv4, osrel, arch, catrel) + rest_client.RemoveSvr4FromCatalog(catrel, arch, osrel, md5_sum) elif command == 'system-files-to-file': logging.debug("Args: %s", args) outfile = None This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun May 19 01:07:44 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 18 May 2013 23:07:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21140] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 21140 http://gar.svn.sourceforge.net/gar/?rev=21140&view=rev Author: lblume Date: 2013-05-18 23:07:44 +0000 (Sat, 18 May 2013) Log Message: ----------- glib2/trunk: Remove LDFLAGS that breaks ; minor dependencies adjustments Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-18 16:44:13 UTC (rev 21139) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-18 23:07:44 UTC (rev 21140) @@ -164,13 +164,14 @@ PACKAGES += CSWlibglib2-dev SPKG_DESC_CSWlibglib2-dev = Development files for libglib-2.0.so.0 and assorted libglib, libgmodule, libgobject and libgthread RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWglib2 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWpython +RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend +CHECKPKG_OVERRIDES_CSWCSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.* PKGFILES_CSWlibglib2-dev += .*/gdbus-2.0.* @@ -241,7 +242,7 @@ EXTRA_CFLAGS_i386 = -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) -EXTRA_LDFLAGS = -lsocket $(RUNPATH_LINKER_FLAGS) +EXTRA_LDFLAGS += -lsocket BUILD64 = 1 @@ -266,8 +267,6 @@ # DTrace compilation fails, disable for now CONFIGURE_ARGS += --disable-dtrace -#SKIPTEST = 1 - # For tests to succeed, set the ulimit higher than the default of 256. EXTRA_TEST_ENV += BASH_ENV=$(abspath $(WORKDIR)/set-ulimit-for-build-test) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun May 19 12:38:31 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 19 May 2013 10:38:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[21141] csw/mgar/pkg/nsd/trunk Message-ID: Revision: 21141 http://gar.svn.sourceforge.net/gar/?rev=21141&view=rev Author: idogan23 Date: 2013-05-19 10:38:08 +0000 (Sun, 19 May 2013) Log Message: ----------- nsd: Bump version to NSD 3.2.15 Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nsd/trunk/checksums Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2013-05-18 23:07:44 UTC (rev 21140) +++ csw/mgar/pkg/nsd/trunk/Makefile 2013-05-19 10:38:08 UTC (rev 21141) @@ -1,5 +1,5 @@ NAME = nsd -VERSION = 3.2.13 +VERSION = 3.2.15 GARTYPE = v2 DESCRIPTION = An authoritative only non-recursive name server Modified: csw/mgar/pkg/nsd/trunk/checksums =================================================================== --- csw/mgar/pkg/nsd/trunk/checksums 2013-05-18 23:07:44 UTC (rev 21140) +++ csw/mgar/pkg/nsd/trunk/checksums 2013-05-19 10:38:08 UTC (rev 21141) @@ -1 +1 @@ -b6494ffadf4ce72ff367a7c3f00498c1 nsd-3.2.13.tar.gz +b5fdbf78bd3f4133d1295af21a61f7c8 nsd-3.2.15.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 Sun May 19 13:12:39 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 19 May 2013 11:12:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21142] csw/mgar/pkg/liblcms2/trunk Message-ID: Revision: 21142 http://gar.svn.sourceforge.net/gar/?rev=21142&view=rev Author: dmichelsen Date: 2013-05-19 11:12:27 +0000 (Sun, 19 May 2013) Log Message: ----------- liblcms2/trunk: Update to 2.4 and adjust dependencies Modified Paths: -------------- csw/mgar/pkg/liblcms2/trunk/Makefile csw/mgar/pkg/liblcms2/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/liblcms2/trunk/files/0001-Remove-hardcoded-Wall.patch Modified: csw/mgar/pkg/liblcms2/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms2/trunk/Makefile 2013-05-19 10:38:08 UTC (rev 21141) +++ csw/mgar/pkg/liblcms2/trunk/Makefile 2013-05-19 11:12:27 UTC (rev 21142) @@ -1,5 +1,5 @@ NAME = lcms2 -VERSION = 2.2 +VERSION = 2.4 GARTYPE = v2 DESCRIPTION = The little color management system and tools @@ -18,8 +18,6 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES += 0001-Remove-hardcoded-Wall.patch - VENDOR_URL = http://www.littlecms.com/ PACKAGES += CSWliblcms2-2 @@ -35,9 +33,8 @@ SPKG_DESC_CSWliblcms2-utils = Utility programs for LCMS (Little Color Management) # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWtiff -RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWjpeg -RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWzlib +RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWlibtiff3 # Probably make separate package for Solaris 10 as it has float support EXTRA_CPPFLAGS-5.9 = -Dpowf=pow -Dfabsf=labs Modified: csw/mgar/pkg/liblcms2/trunk/checksums =================================================================== --- csw/mgar/pkg/liblcms2/trunk/checksums 2013-05-19 10:38:08 UTC (rev 21141) +++ csw/mgar/pkg/liblcms2/trunk/checksums 2013-05-19 11:12:27 UTC (rev 21142) @@ -1 +1 @@ -aaf33c7c25675e6163189ba488ae20f5 lcms2-2.2.tar.gz +861ef15fa0bc018f9ddc932c4ad8b6dd lcms2-2.4.tar.gz Deleted: csw/mgar/pkg/liblcms2/trunk/files/0001-Remove-hardcoded-Wall.patch =================================================================== --- csw/mgar/pkg/liblcms2/trunk/files/0001-Remove-hardcoded-Wall.patch 2013-05-19 10:38:08 UTC (rev 21141) +++ csw/mgar/pkg/liblcms2/trunk/files/0001-Remove-hardcoded-Wall.patch 2013-05-19 11:12:27 UTC (rev 21142) @@ -1,25 +0,0 @@ -From 3e8a1c71e3c350e9a0f31a00cb747959d48d73ba Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 7 Jun 2011 15:32:08 +0200 -Subject: [PATCH] Remove hardcoded -Wall - ---- - testbed/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/testbed/Makefile.in b/testbed/Makefile.in -index 89f5c13..0be576f 100644 ---- a/testbed/Makefile.in -+++ b/testbed/Makefile.in -@@ -81,7 +81,7 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = --pedantic -Wall -std=c99 -O2 -+CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ --- -1.7.5.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun May 19 16:01:06 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 19 May 2013 14:01:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21143] csw/mgar/pkg/fluxbox/trunk Message-ID: Revision: 21143 http://gar.svn.sourceforge.net/gar/?rev=21143&view=rev Author: wahwah Date: 2013-05-19 14:01:06 +0000 (Sun, 19 May 2013) Log Message: ----------- fluxbox/trunk: version upgrade, a couple patches Modified Paths: -------------- csw/mgar/pkg/fluxbox/trunk/Makefile csw/mgar/pkg/fluxbox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-OpenCSW-bash.patch csw/mgar/pkg/fluxbox/trunk/files/0002-Workaround-the-double-EXEEXT-substitution.patch csw/mgar/pkg/fluxbox/trunk/files/0003-The-italian-NLS-part-is-broken.patch csw/mgar/pkg/fluxbox/trunk/files/0004-Use-the-fluxbox-command-that-was-just-built.patch csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch Removed Paths: ------------- csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch Modified: csw/mgar/pkg/fluxbox/trunk/Makefile =================================================================== --- csw/mgar/pkg/fluxbox/trunk/Makefile 2013-05-19 11:12:27 UTC (rev 21142) +++ csw/mgar/pkg/fluxbox/trunk/Makefile 2013-05-19 14:01:06 UTC (rev 21143) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = fluxbox -VERSION = 1.3.2 +VERSION = 1.3.5 GARTYPE = v2 DESCRIPTION = Brief description @@ -14,30 +14,28 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.bz2 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - EXTRA_CPPFLAGS = -features=extensions -D__FUNCTION__=__func__ EXTRA_LINKER_FLAGS = -norunpath -# PATCHFILES += 0001-Use-gwhoami-from-CSWcoreutils.patch -PATCHFILES += 0001-Solaris-userland-port-grep-whoami.patch +PATCHFILES += 0001-Solaris-userland-OpenCSW-bash.patch +PATCHFILES += 0002-Workaround-the-double-EXEEXT-substitution.patch +PATCHFILES += 0003-The-italian-NLS-part-is-broken.patch +PATCHFILES += 0004-Use-the-fluxbox-command-that-was-just-built.patch +PATCHFILES += 0006-fluxbox-generate_menu-Use-CSWbash.patch CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS_CSWfluxbox += CSWimlib2 -RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWfluxbox += CSWbash +RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxpm4 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxft2 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxrender -RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibz1 -RUNTIME_DEP_PKGS_CSWfluxbox += CSWxpm -CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/fluxbox-style.5 -CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/share|root/opt/csw/bin/fluxbox-generate_menu -CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fluxbox-generate_menu -CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fbsetbg +RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibimlib2-1 +RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfribidi0 +CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content +# checkpkg doesn't detect this dependency +CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWbash + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/fluxbox/trunk/checksums =================================================================== --- csw/mgar/pkg/fluxbox/trunk/checksums 2013-05-19 11:12:27 UTC (rev 21142) +++ csw/mgar/pkg/fluxbox/trunk/checksums 2013-05-19 14:01:06 UTC (rev 21143) @@ -1 +1 @@ -f95b0bdb9ee41bfac124bd0fc601f248 fluxbox-1.3.2.tar.bz2 +9d9e183424a0934e20417ff20775a570 fluxbox-1.3.5.tar.bz2 Added: csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-OpenCSW-bash.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-OpenCSW-bash.patch (rev 0) +++ csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-OpenCSW-bash.patch 2013-05-19 14:01:06 UTC (rev 21143) @@ -0,0 +1,61 @@ +From 31c823ba3a38a920e46a7c32718e61dcec6467b8 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 19 May 2013 13:01:14 +0200 +Subject: [PATCH] Solaris userland, OpenCSW bash + +--- + util/fbsetbg | 5 +++-- + util/fluxbox-generate_menu.in | 7 ++++--- + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/util/fbsetbg b/util/fbsetbg +index e277317..f3ad444 100644 +--- a/util/fbsetbg ++++ b/util/fbsetbg +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # Set wallpaper for fluxbox. + # +@@ -48,7 +48,8 @@ wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri x + lastwallpaper="${HOME}/.fluxbox/lastwallpaper" + + +-WHOAMI=`whoami` ++PATH=/usr/xpg4/bin:$PATH # just for xpg4 'id'. Sol11 is fine with /bin/id ++WHOAMI=`id -u -n` + [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin + + command="`basename \"$0\"`" +diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in +index bc01062..897da0b 100755 +--- a/util/fluxbox-generate_menu.in ++++ b/util/fluxbox-generate_menu.in +@@ -330,7 +330,7 @@ searchForIcon(){ + # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" + if [ -f "$entry_icon" ]; then + # if icon exists and entry does not already exists, add it +- if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then ++ if ! grep -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then + printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING + else + : echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING +@@ -557,11 +557,12 @@ rm -f ${MENUFILENAME}.tmp + # End functions + + +-WHOAMI=`whoami` ++PATH=/usr/xpg4/bin:$PATH # just for xpg4 'id'. Sol11 is fine with /bin/id ++WHOAMI=`id -u -n` + [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + + # Check for Imlib2-support +-if @pkgprefix at fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then ++if @pkgprefix at fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep "^IMLIB"; then + PNG_ICONS="yes" + else + # better assume to assume "no" +-- +1.8.1.4 + Deleted: csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch 2013-05-19 11:12:27 UTC (rev 21142) +++ csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch 2013-05-19 14:01:06 UTC (rev 21143) @@ -1,56 +0,0 @@ -From f9e400a3cf8517ab4417dbe117a588b2e0669d4c Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Thu, 7 Jun 2012 10:23:16 +0200 -Subject: [PATCH] Solaris userland port: grep, whoami - ---- - util/fbsetbg | 4 ++-- - util/fluxbox-generate_menu.in | 7 ++++--- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/util/fbsetbg b/util/fbsetbg -index 0bdb804..bb96f7f 100644 ---- a/util/fbsetbg -+++ b/util/fbsetbg -@@ -47,8 +47,8 @@ - wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg' - lastwallpaper="${HOME}/.fluxbox/lastwallpaper" - -- --WHOAMI=`whoami` -+PATH=/usr/xpg4/bin:$PATH # just for xpg4 'id'. Sol11 is fine with /bin/id -+WHOAMI=`id -u -n` - [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin - - command="`basename \"$0\"`" -diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in -index cecc3fe..54fd959 100755 ---- a/util/fluxbox-generate_menu.in -+++ b/util/fluxbox-generate_menu.in -@@ -330,7 +330,7 @@ searchForIcon(){ - # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" - if [ -f "$entry_icon" ]; then - # if icon exists and entry does not already exists, add it -- if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then -+ if ! grep -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then - echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING - else - : echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING -@@ -557,11 +557,12 @@ rm -f ${MENUFILENAME}.tmp - # End functions - - --WHOAMI=`whoami` -+PATH=/usr/xpg4/bin:$PATH # just for xpg4 'id'. Sol11 is fine with /bin/id -+WHOAMI=`id -u -n` - [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin - - # Check for Imlib2-support --if @pkgprefix at fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then -+if @pkgprefix at fluxbox@pkgsuffix@ -info 2> /dev/null | grep "^IMLIB"; then - PNG_ICONS="yes" - else - # better assume to assume "no" --- -1.7.10 - Deleted: csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch 2013-05-19 11:12:27 UTC (rev 21142) +++ csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch 2013-05-19 14:01:06 UTC (rev 21143) @@ -1,25 +0,0 @@ -From 9ad03afab9348046c24a45e0eecda76568f778a9 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Mon, 4 Jun 2012 21:14:44 +0200 -Subject: [PATCH] Use gwhoami from CSWcoreutils - ---- - util/fbsetbg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/fbsetbg b/util/fbsetbg -index 0bdb804..cf888e7 100644 ---- a/util/fbsetbg -+++ b/util/fbsetbg -@@ -48,7 +48,7 @@ wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri x - lastwallpaper="${HOME}/.fluxbox/lastwallpaper" - - --WHOAMI=`whoami` -+WHOAMI=`gwhoami` - [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin - - command="`basename \"$0\"`" --- -1.7.10 - Added: csw/mgar/pkg/fluxbox/trunk/files/0002-Workaround-the-double-EXEEXT-substitution.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0002-Workaround-the-double-EXEEXT-substitution.patch (rev 0) +++ csw/mgar/pkg/fluxbox/trunk/files/0002-Workaround-the-double-EXEEXT-substitution.patch 2013-05-19 14:01:06 UTC (rev 21143) @@ -0,0 +1,34 @@ +From 30d052b3ce0aed292756a08b8377a36e4d7c9819 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 19 May 2013 13:54:46 +0200 +Subject: [PATCH] Workaround the double EXEEXT substitution + +--- + util/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/util/Makefile.in b/util/Makefile.in +index 4b809b6..f315b94 100644 +--- a/util/Makefile.in ++++ b/util/Makefile.in +@@ -780,7 +780,7 @@ startfluxbox: startfluxbox.in + -e "s, at pkgbindir@,$(bindir),g" \ + -e "s, at pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ + -e "s, at pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ +- -e "s, at EXEEXT@,$(EXEEXT),g" \ ++ -e "s, at EXE\{2\}XT@,$(EXEEXT),g" \ + $(srcdir)/startfluxbox.in > startfluxbox + -chmod 755 startfluxbox + +@@ -788,7 +788,7 @@ fluxbox-generate_menu: fluxbox-generate_menu.in + @regex_cmd@ -e "s, at PREFIX@,$(prefix),g" \ + -e "s, at pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ + -e "s, at pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ +- -e "s, at EXEEXT@,$(EXEEXT),g" \ ++ -e "s, at EXE\{2\}XT@,$(EXEEXT),g" \ + $(srcdir)/fluxbox-generate_menu.in \ + > fluxbox-generate_menu + -chmod 755 fluxbox-generate_menu +-- +1.8.1.4 + Added: csw/mgar/pkg/fluxbox/trunk/files/0003-The-italian-NLS-part-is-broken.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0003-The-italian-NLS-part-is-broken.patch (rev 0) +++ csw/mgar/pkg/fluxbox/trunk/files/0003-The-italian-NLS-part-is-broken.patch 2013-05-19 14:01:06 UTC (rev 21143) @@ -0,0 +1,25 @@ +From 1c583e3d7125f89e53138417263e9bd3f4149017 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 19 May 2013 13:57:49 +0200 +Subject: [PATCH] The italian NLS part is broken + +--- + nls/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nls/Makefile.in b/nls/Makefile.in +index 27eee7a..2071bbe 100644 +--- a/nls/Makefile.in ++++ b/nls/Makefile.in +@@ -225,7 +225,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + NLSTEST = @NLS@ + SUBDIRS = C cs_CZ da_DK es_AR es_ES et_EE fr_FR pt_BR ru_RU \ +- sv_SE tr_TR it_IT pt_PT bg_BG ja_JP ko_KR \ ++ sv_SE tr_TR pt_PT bg_BG ja_JP ko_KR \ + lv_LV de_DE nl_NL no_NO sl_SI pl_PL vi_VN be_BY \ + uk_UA el_GR nb_NO zh_CN fi_FI en_US en_GB de_CH \ + de_AT fr_CH sk_SK zh_TW mk_MK he_IL +-- +1.8.1.4 + Added: csw/mgar/pkg/fluxbox/trunk/files/0004-Use-the-fluxbox-command-that-was-just-built.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0004-Use-the-fluxbox-command-that-was-just-built.patch (rev 0) +++ csw/mgar/pkg/fluxbox/trunk/files/0004-Use-the-fluxbox-command-that-was-just-built.patch 2013-05-19 14:01:06 UTC (rev 21143) @@ -0,0 +1,40 @@ +From 69f34ff8f71dc588e1b0bc0f2901aa05d8b6f54b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 19 May 2013 14:54:17 +0200 +Subject: [PATCH] Use the 'fluxbox' command that was just built + +Not the one from somewhere in PATH. +--- + data/Makefile.am | 2 +- + data/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index c71f820..912cb6a 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -55,7 +55,7 @@ menu: ../util/fluxbox-generate_menu + PREFIX="${prefix}" \ + MENUTITLE="Fluxbox-${VERSION}" \ + INSTALL=Yes \ +- PATH="${PATH}:../util:../util/fbrun" \ ++ PATH="../src:${PATH}:../util:../util/fbrun" \ + ../util/fluxbox-generate_menu + + ../util/fluxbox-generate_menu: +diff --git a/data/Makefile.in b/data/Makefile.in +index 58070b8..80f2021 100644 +--- a/data/Makefile.in ++++ b/data/Makefile.in +@@ -653,7 +653,7 @@ menu: ../util/fluxbox-generate_menu + PREFIX="${prefix}" \ + MENUTITLE="Fluxbox-${VERSION}" \ + INSTALL=Yes \ +- PATH="${PATH}:../util:../util/fbrun" \ ++ PATH="../src:${PATH}:../util:../util/fbrun" \ + ../util/fluxbox-generate_menu + + ../util/fluxbox-generate_menu: +-- +1.8.1.4 + Added: csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch (rev 0) +++ csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch 2013-05-19 14:01:06 UTC (rev 21143) @@ -0,0 +1,23 @@ +From b464eac98a65b9d3c0dbd39765d23f87b29a5902 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 19 May 2013 15:48:01 +0200 +Subject: [PATCH] fluxbox-generate_menu: Use CSWbash + +The script is not compatible with /bin/sh on Solaris. +--- + util/fluxbox-generate_menu.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in +index 1b8e976..2c62650 100755 +--- a/util/fluxbox-generate_menu.in ++++ b/util/fluxbox-generate_menu.in +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # generate_menu for Fluxbox + # +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun May 19 16:50:15 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 19 May 2013 14:50:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21144] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 21144 http://gar.svn.sourceforge.net/gar/?rev=21144&view=rev Author: lblume Date: 2013-05-19 14:49:34 +0000 (Sun, 19 May 2013) Log Message: ----------- glib2/trunk: Typo in one override, make some others arch-specific; fix PATH so python is found Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-19 14:01:06 UTC (rev 21143) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-19 14:49:34 UTC (rev 21144) @@ -171,7 +171,7 @@ RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWpython RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend -CHECKPKG_OVERRIDES_CSWCSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend +CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.* PKGFILES_CSWlibglib2-dev += .*/gdbus-2.0.* @@ -206,22 +206,39 @@ CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/parser.pyo CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/utils.pyc CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/utils.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyo -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyc -CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyc +CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyo +CHECKPKG_OVERRIDES_CSWlibglib2-dev += $(CHECKPKG_OVERRIDES_CSWlibglib2-dev_$(GARCH)) PACKAGES += CSWglib2-doc ARCHALL_CSWglib2-doc = 1 @@ -289,7 +306,9 @@ include gar/category.mk # We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out -PATH := /opt/csw/gnu:$(PATH) +# IT seems that the correct Python is not picked up during make check on x86 +# without putting /opt/csw/bin first in PATH +PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) post-merge: @echo "=== Cleanup stray bash_completion.d ===" 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 May 19 17:10:29 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 19 May 2013 15:10:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21145] csw/mgar/pkg/rcs/trunk Message-ID: Revision: 21145 http://gar.svn.sourceforge.net/gar/?rev=21145&view=rev Author: dmichelsen Date: 2013-05-19 15:09:20 +0000 (Sun, 19 May 2013) Log Message: ----------- rcs/trunk: Update to 5.8 Modified Paths: -------------- csw/mgar/pkg/rcs/trunk/Makefile csw/mgar/pkg/rcs/trunk/checksums Modified: csw/mgar/pkg/rcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/rcs/trunk/Makefile 2013-05-19 14:49:34 UTC (rev 21144) +++ csw/mgar/pkg/rcs/trunk/Makefile 2013-05-19 15:09:20 UTC (rev 21145) @@ -1,5 +1,5 @@ NAME = rcs -VERSION = 5.7 +VERSION = 5.8 GARTYPE = v2 DESCRIPTION = GNU Revision Control System @@ -7,11 +7,8 @@ endef MASTER_SITES = http://www.cs.purdue.edu/homes/trinkle/RCS/ -DISTFILES = $(NAME)-$(VERSION).tar.Z +DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - RUNTIME_DEP_PKGS = CSWdiffutils man1dir = $(mandir)/man1 @@ -20,6 +17,13 @@ DIFF = $(bindir)/gdiff DIFF3 = $(bindir)/gdiff3 +BUILD64 = 1 +ISAEXEC = 1 + +# Every kind of -xO* leads to this strange error in Sun Studio 12 or even 12.3: +# cg error (as) : location counter not on word boundary +OPT_FLAGS_SOS = + NORUNPATH = 1 CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --with-diffutils Modified: csw/mgar/pkg/rcs/trunk/checksums =================================================================== --- csw/mgar/pkg/rcs/trunk/checksums 2013-05-19 14:49:34 UTC (rev 21144) +++ csw/mgar/pkg/rcs/trunk/checksums 2013-05-19 15:09:20 UTC (rev 21145) @@ -1 +1 @@ -423282f0edb353296d9f3498ab683abf download/rcs-5.7.tar.Z +c0fa1f3528418cee83b7e6e06fc87957 rcs-5.8.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 Sun May 19 17:23:59 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 19 May 2013 15:23:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21146] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 21146 http://gar.svn.sourceforge.net/gar/?rev=21146&view=rev Author: dmichelsen Date: 2013-05-19 15:23:53 +0000 (Sun, 19 May 2013) Log Message: ----------- file/trunk: Reactivate necessary patch for python module Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2013-05-19 15:09:20 UTC (rev 21145) +++ csw/mgar/pkg/file/trunk/Makefile 2013-05-19 15:23:53 UTC (rev 21146) @@ -15,7 +15,7 @@ MASTER_SITES = ftp://ftp.astron.com/pub/file/ DISTFILES = $(DISTNAME).tar.gz -# PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch +PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch PATCHFILES += 0001-Use-PCRE.patch 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 May 19 17:23:59 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 19 May 2013 15:23:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21147] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 21147 http://gar.svn.sourceforge.net/gar/?rev=21147&view=rev Author: dmichelsen Date: 2013-05-19 15:23:56 +0000 (Sun, 19 May 2013) Log Message: ----------- doxygen/trunk: Update to 1.8.4 Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2013-05-19 15:23:53 UTC (rev 21146) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2013-05-19 15:23:56 UTC (rev 21147) @@ -1,5 +1,5 @@ NAME = doxygen -VERSION = 1.8.3.1 +VERSION = 1.8.4 GARTYPE = v2 DESCRIPTION = A documentation system for programming languages Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2013-05-19 15:23:53 UTC (rev 21146) +++ csw/mgar/pkg/doxygen/trunk/checksums 2013-05-19 15:23:56 UTC (rev 21147) @@ -1 +1 @@ -31b0aaab51c5cab7db9f0ebbe9f85530 doxygen-1.8.3.1.src.tar.gz +5f460b91c0d8c34a76173cf22015c2fc doxygen-1.8.4.src.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 Sun May 19 17:36:33 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 19 May 2013 15:36:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21148] csw/mgar/pkg/rcs/trunk/Makefile Message-ID: Revision: 21148 http://gar.svn.sourceforge.net/gar/?rev=21148&view=rev Author: dmichelsen Date: 2013-05-19 15:36:32 +0000 (Sun, 19 May 2013) Log Message: ----------- rcs/trunk: No 64 bit for now Modified Paths: -------------- csw/mgar/pkg/rcs/trunk/Makefile Modified: csw/mgar/pkg/rcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/rcs/trunk/Makefile 2013-05-19 15:23:56 UTC (rev 21147) +++ csw/mgar/pkg/rcs/trunk/Makefile 2013-05-19 15:36:32 UTC (rev 21148) @@ -17,9 +17,6 @@ DIFF = $(bindir)/gdiff DIFF3 = $(bindir)/gdiff3 -BUILD64 = 1 -ISAEXEC = 1 - # Every kind of -xO* leads to this strange error in Sun Studio 12 or even 12.3: # cg error (as) : location counter not on word boundary OPT_FLAGS_SOS = 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 May 19 17:53:12 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 19 May 2013 15:53:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[21149] csw/mgar/pkg/rcs/trunk/Makefile Message-ID: Revision: 21149 http://gar.svn.sourceforge.net/gar/?rev=21149&view=rev Author: dmichelsen Date: 2013-05-19 15:53:12 +0000 (Sun, 19 May 2013) Log Message: ----------- rcs/trunk: Update relocations and overrides Modified Paths: -------------- csw/mgar/pkg/rcs/trunk/Makefile Modified: csw/mgar/pkg/rcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/rcs/trunk/Makefile 2013-05-19 15:36:32 UTC (rev 21148) +++ csw/mgar/pkg/rcs/trunk/Makefile 2013-05-19 15:53:12 UTC (rev 21149) @@ -9,11 +9,10 @@ MASTER_SITES = http://www.cs.purdue.edu/homes/trinkle/RCS/ DISTFILES = $(NAME)-$(VERSION).tar.gz +# We need this for gdiff and gdiff3 RUNTIME_DEP_PKGS = CSWdiffutils +CHECKPKG_OVERRIDES_CSWrcs += surplus-dependency|CSWdiffutils -man1dir = $(mandir)/man1 -man5dir = $(mandir)/man5 - DIFF = $(bindir)/gdiff DIFF3 = $(bindir)/gdiff3 @@ -27,7 +26,6 @@ TEST_TARGET = -INSTALL_OVERRIDE_DIRS = prefix man1dir man5dir BUILD_OVERRIDE_DIRS = DIFF DIFF3 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon May 20 09:33:19 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 20 May 2013 07:33:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[21150] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 21150 http://gar.svn.sourceforge.net/gar/?rev=21150&view=rev Author: lblume Date: 2013-05-20 07:33:18 +0000 (Mon, 20 May 2013) Log Message: ----------- glib2/trunk: Disable another sporaidally failing test Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-19 15:53:12 UTC (rev 21149) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-20 07:33:18 UTC (rev 21150) @@ -86,6 +86,9 @@ PATCHFILES += 0003-Make-glib-work-with-zoneinfo-version-1.patch PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch +# What to say? Disable yet another sporadically failing up test +PATCHFILES += 0023-disable-mainloop-invoke-test.patch + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Added: csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch 2013-05-20 07:33:18 UTC (rev 21150) @@ -0,0 +1,12 @@ +--- a/glib/tests/mainloop.c.original Sat Jul 14 22:33:18 2012 ++++ b/glib/tests/mainloop.c Sun May 19 23:58:20 2013 +@@ -477,7 +477,8 @@ + g_test_add_func ("/mainloop/basic", test_mainloop_basic); + g_test_add_func ("/mainloop/timeouts", test_timeouts); + g_test_add_func ("/mainloop/priorities", test_priorities); +- g_test_add_func ("/mainloop/invoke", test_invoke); ++/* Fails sporadically on amd64, disabled */ ++/* g_test_add_func ("/mainloop/invoke", test_invoke); */ + g_test_add_func ("/mainloop/child_sources", test_child_sources); + g_test_add_func ("/mainloop/recursive_child_sources", test_recursive_child_sources); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon May 20 14:58:53 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 20 May 2013 12:58:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21151] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 21151 http://gar.svn.sourceforge.net/gar/?rev=21151&view=rev Author: lblume Date: 2013-05-20 12:58:53 +0000 (Mon, 20 May 2013) Log Message: ----------- glib2/trunk: Make a patch amd64-only to avoid conflicting with sparc-only patches Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-20 07:33:18 UTC (rev 21150) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-20 12:58:53 UTC (rev 21151) @@ -87,7 +87,7 @@ PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch # What to say? Disable yet another sporadically failing up test -PATCHFILES += 0023-disable-mainloop-invoke-test.patch +PATCHFILES_isa-amd64 += 0023-disable-mainloop-invoke-test.patch PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch 2013-05-20 07:33:18 UTC (rev 21150) +++ csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch 2013-05-20 12:58:53 UTC (rev 21151) @@ -1,12 +1,12 @@ --- a/glib/tests/mainloop.c.original Sat Jul 14 22:33:18 2012 -+++ b/glib/tests/mainloop.c Sun May 19 23:58:20 2013 ++++ b/glib/tests/mainloop.c Mon May 20 10:46:38 2013 @@ -477,7 +477,8 @@ g_test_add_func ("/mainloop/basic", test_mainloop_basic); g_test_add_func ("/mainloop/timeouts", test_timeouts); g_test_add_func ("/mainloop/priorities", test_priorities); - g_test_add_func ("/mainloop/invoke", test_invoke); -+/* Fails sporadically on amd64, disabled */ -+/* g_test_add_func ("/mainloop/invoke", test_invoke); */ ++/* g_test_add_func ("/mainloop/invoke", test_invoke); */ /* Fails sporadically ++ on amd64, disabled */ g_test_add_func ("/mainloop/child_sources", test_child_sources); g_test_add_func ("/mainloop/recursive_child_sources", test_recursive_child_sources); 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 May 20 21:51:33 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 20 May 2013 19:51:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21152] csw/mgar/pkg/fluxbox/trunk Message-ID: Revision: 21152 http://gar.svn.sourceforge.net/gar/?rev=21152&view=rev Author: wahwah Date: 2013-05-20 19:51:29 +0000 (Mon, 20 May 2013) Log Message: ----------- fluxbox/trunk: Use GNU grep Modified Paths: -------------- csw/mgar/pkg/fluxbox/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/fluxbox/trunk/files/0005-fluxbox-generate_menu-Use-CSWbash.patch csw/mgar/pkg/fluxbox/trunk/files/0006-use-ggrep-in-generate_menu.patch Removed Paths: ------------- csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch Modified: csw/mgar/pkg/fluxbox/trunk/Makefile =================================================================== --- csw/mgar/pkg/fluxbox/trunk/Makefile 2013-05-20 12:58:53 UTC (rev 21151) +++ csw/mgar/pkg/fluxbox/trunk/Makefile 2013-05-20 19:51:29 UTC (rev 21152) @@ -21,11 +21,13 @@ PATCHFILES += 0002-Workaround-the-double-EXEEXT-substitution.patch PATCHFILES += 0003-The-italian-NLS-part-is-broken.patch PATCHFILES += 0004-Use-the-fluxbox-command-that-was-just-built.patch -PATCHFILES += 0006-fluxbox-generate_menu-Use-CSWbash.patch +PATCHFILES += 0005-fluxbox-generate_menu-Use-CSWbash.patch +PATCHFILES += 0006-use-ggrep-in-generate_menu.patch CONFIGURE_ARGS = $(DIRPATHS) RUNTIME_DEP_PKGS_CSWfluxbox += CSWbash +RUNTIME_DEP_PKGS_CSWfluxbox += CSWggrep RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxpm4 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxrender @@ -35,6 +37,7 @@ # checkpkg doesn't detect this dependency CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWggrep include gar/category.mk Copied: csw/mgar/pkg/fluxbox/trunk/files/0005-fluxbox-generate_menu-Use-CSWbash.patch (from rev 21143, csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch) =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0005-fluxbox-generate_menu-Use-CSWbash.patch (rev 0) +++ csw/mgar/pkg/fluxbox/trunk/files/0005-fluxbox-generate_menu-Use-CSWbash.patch 2013-05-20 19:51:29 UTC (rev 21152) @@ -0,0 +1,23 @@ +From b464eac98a65b9d3c0dbd39765d23f87b29a5902 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 19 May 2013 15:48:01 +0200 +Subject: [PATCH] fluxbox-generate_menu: Use CSWbash + +The script is not compatible with /bin/sh on Solaris. +--- + util/fluxbox-generate_menu.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in +index 1b8e976..2c62650 100755 +--- a/util/fluxbox-generate_menu.in ++++ b/util/fluxbox-generate_menu.in +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # generate_menu for Fluxbox + # +-- +1.8.1.4 + Deleted: csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch 2013-05-20 12:58:53 UTC (rev 21151) +++ csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch 2013-05-20 19:51:29 UTC (rev 21152) @@ -1,23 +0,0 @@ -From b464eac98a65b9d3c0dbd39765d23f87b29a5902 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sun, 19 May 2013 15:48:01 +0200 -Subject: [PATCH] fluxbox-generate_menu: Use CSWbash - -The script is not compatible with /bin/sh on Solaris. ---- - util/fluxbox-generate_menu.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in -index 1b8e976..2c62650 100755 ---- a/util/fluxbox-generate_menu.in -+++ b/util/fluxbox-generate_menu.in -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # generate_menu for Fluxbox - # --- -1.8.1.4 - Added: csw/mgar/pkg/fluxbox/trunk/files/0006-use-ggrep-in-generate_menu.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0006-use-ggrep-in-generate_menu.patch (rev 0) +++ csw/mgar/pkg/fluxbox/trunk/files/0006-use-ggrep-in-generate_menu.patch 2013-05-20 19:51:29 UTC (rev 21152) @@ -0,0 +1,121 @@ +From 676961dbec8b2c6749806b2d7cdd774fd8e758fe Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 20 May 2013 21:17:37 +0200 +Subject: [PATCH] use ggrep in generate_menu + +--- + util/fluxbox-generate_menu.in | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in +index 6dea643..4763193 100755 +--- a/util/fluxbox-generate_menu.in ++++ b/util/fluxbox-generate_menu.in +@@ -113,7 +113,7 @@ EOF + } + + testoption() { +- if [ -z "$3" -o -n "`echo $3|grep '^-'`" ]; then ++ if [ -z "$3" -o -n "`echo $3|/opt/csw/bin/ggrep '^-'`" ]; then + echo "Error: The option $2 requires an argument." >&2 + exit 1 + fi +@@ -262,7 +262,7 @@ doSearch(){ + # $dnlamVERBOSE "# Searching for icon $temp_icon for $execname" >> $ICONMAPPING + + # check in $ICONMAPPING before searching directories +- entry_icon=`grep "^\"${execname}\"" $ICONMAPPING | head -n 1 | grep -o '<.*>'` ++ entry_icon=`/opt/csw/bin/ggrep "^\"${execname}\"" $ICONMAPPING | head -n 1 | /opt/csw/bin/ggrep -o '<.*>'` + if [ -n "$entry_icon" ]; then + entry_icon=`replaceWithinString "$entry_icon" "<"` + entry_icon=`replaceWithinString "$entry_icon" ">"` +@@ -330,7 +330,7 @@ searchForIcon(){ + # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" + if [ -f "$entry_icon" ]; then + # if icon exists and entry does not already exists, add it +- if ! grep -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then ++ if ! /opt/csw/bin/ggrep -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then + printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING + else + : echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING +@@ -355,14 +355,14 @@ createIconMapping(){ + # echo $DESKTOP_FILE; + #entry_name=`grep '^[ ]*Name=' $DESKTOP_FILE | head -n 1` + #entry_name=${entry_name##*=} +- entry_exec=`grep '^[ ]*Exec=' "$DESKTOP_FILE" | head -n 1` ++ entry_exec=`/opt/csw/bin/ggrep '^[ ]*Exec=' "$DESKTOP_FILE" | head -n 1` + entry_exec=${entry_exec##*=} + entry_exec=`replaceWithinString "$entry_exec" "\""` + if [ -z "$entry_exec" ]; then + entry_exec=${DESKTOP_FILE%%.desktop*} + fi + +- entry_icon=`grep '^[ ]*Icon=' "$DESKTOP_FILE" | head -n 1` ++ entry_icon=`/opt/csw/bin/ggrep '^[ ]*Icon=' "$DESKTOP_FILE" | head -n 1` + entry_icon=${entry_icon##*=} + + # $dnlamVERBOSE echo "--- $entry_exec $entry_icon" >&2 +@@ -394,11 +394,11 @@ lookupIcon() { + execname=`removePath "$execname"` + + #echo "grepping ${execname}" +- iconString=`grep "^\"${execname}\"" $ICONMAPPING | head -n 1 | grep -o '<.*>'` ++ iconString=`/opt/csw/bin/ggrep "^\"${execname}\"" $ICONMAPPING | head -n 1 | /opt/csw/bin/ggrep -o '<.*>'` + # $dnlamVERBOSE "lookupIcon $execname, $iconString" >&2 + + if [ -z "$iconString" ] ; then +- iconString=`grep "^\"${execname%% *}" $ICONMAPPING | head -n 1 | grep -o '<.*>'` ++ iconString=`/opt/csw/bin/ggrep "^\"${execname%% *}" $ICONMAPPING | head -n 1 | /opt/csw/bin/ggrep -o '<.*>'` + fi + + if [ -z "$iconString" ] && [ -z "$PARSING_DESKTOP" ] ; then +@@ -414,7 +414,7 @@ lookupIcon() { + append() { + if [ -z "${INSTALL}" ]; then + # $dnlamVERBOSE echo "append: $*" >&2 +- iconString="`echo $* | grep -o '<.*>'`" ++ iconString="`echo $* | /opt/csw/bin/ggrep -o '<.*>'`" + # echo "iconString=$iconString" >&2 + if [ -z "$iconString" ] && [ -z "$NO_ICON" ]; then + echo -n " $* " >> ${MENUFILENAME} +@@ -464,8 +464,8 @@ append_menu_end() { + menu_entry() { + if [ -f "$1" ]; then + # space&tab here +- entry_name=`grep '^[ ]*Name=' "$1" | head -n 1 | cut -d = -f 2` +- entry_exec=`grep '^[ ]*Exec=' "$1" | head -n 1 | cut -d = -f 2` ++ entry_name=`/opt/csw/bin/ggrep '^[ ]*Name=' "$1" | head -n 1 | cut -d = -f 2` ++ entry_exec=`/opt/csw/bin/ggrep '^[ ]*Exec=' "$1" | head -n 1 | cut -d = -f 2` + if [ -n "$entry_name" -a -n "$entry_exec" ]; then + append "[exec] ($entry_name) {$entry_exec}" + fi +@@ -543,7 +543,7 @@ until [ $counter -lt 1 ] || \ + cmp ${MENUFILENAME} ${MENUFILENAME}.tmp >/dev/null 2>&1; do + [ -s ${MENUFILENAME}.tmp ] && mv ${MENUFILENAME}.tmp ${MENUFILENAME} + counter=`expr $counter - 1` +- grep -v '^$' ${MENUFILENAME}|sed -e "/^\[submenu].*/{ ++ /opt/csw/bin/ggrep -v '^$' ${MENUFILENAME}|sed -e "/^\[submenu].*/{ + n + N + /^\[submenu].*\n\[end]/d +@@ -562,7 +562,7 @@ WHOAMI=`id -u -n` + [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + + # Check for Imlib2-support +-if @pkgprefix at fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep "^IMLIB"; then ++if @pkgprefix at fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | /opt/csw/bin/ggrep "^IMLIB"; then + PNG_ICONS="yes" + else + # better assume to assume "no" +@@ -1422,7 +1422,7 @@ fi + PREFIX="${PREFIX:=@PREFIX@}" + if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then + hash @pkgprefix at fluxbox@pkgsuffix@@EXEEXT@ +- PREFIX=`hash | grep @pkgprefix at fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix at fluxbox@pkgsuffix@@EXEEXT@$,,'` ++ PREFIX=`hash | /opt/csw/bin/ggrep @pkgprefix at fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix at fluxbox@pkgsuffix@@EXEEXT@$,,'` + fi + + +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon May 20 22:01:56 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 20 May 2013 20:01:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21153] csw/mgar/pkg/gnutls/trunk/Makefile Message-ID: Revision: 21153 http://gar.svn.sourceforge.net/gar/?rev=21153&view=rev Author: chninkel Date: 2013-05-20 20:01:56 +0000 (Mon, 20 May 2013) Log Message: ----------- removed gnutls and gnutls-dev packages that are provided by gnutls3 reenable some linker options (direct binding, mapfile, -z ignore flag) disable guile support fix the test suite Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2013-05-20 19:51:29 UTC (rev 21152) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2013-05-20 20:01:56 UTC (rev 21153) @@ -19,65 +19,50 @@ # (where it prints (null) under Linux) # This patchs fixes this (and is taken from gnutls3) PATCHFILES += 0003-correctly-handle-the-null-key-case.patch +# Some certificates used in the test suite are expired, +# so the chainverify test fails. +# The is supposed to be workarounded in the gnutls test +# suite by redefining the time function, but this doesn't work +# here because libgnutls has been compiled with direct binding +# hence it only links the time function with the original library. +# We workaround the problem by changing the test so it expects +# the certificates to be expired (another solution is to use LD_PRELOAD). +PATCHFILES += 0004-workaround-certificate-expiration-issue-in-the-test-.patch UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 VENDOR_URL = http://www.gnu.org/software/gnutls/ -PACKAGES += CSWgnutls -CATALOGNAME_gnutls = gnutls -SPKG_DESC_CSWgnutls = GNU Transport Layer Security Utility Programs -RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls26 -RUNTIME_DEP_PKGS_CSWgnutls += CSWgpgerr -RUNTIME_DEP_PKGS_CSWgnutls += CSWreadline -RUNTIME_DEP_PKGS_CSWgnutls += CSWzlib -RUNTIME_DEP_PKGS_CSWgnutls += CSWlibtasn1-3 -RUNTIME_DEP_PKGS_CSWgnutls += CSWgcrypt -RUNTIME_DEP_PKGS_CSWgnutls += CSWggettextrt -# This is a dependency for legacy packages expecting to find libgnutls*.so.13 in CSWgnutls. -# CSWlibgnutls13 is built from a branch -RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls13 -CHECKPKG_OVERRIDES_CSWgnutls += unidentified-dependency|CSWlibgnutls13 -CHECKPKG_OVERRIDES_CSWgnutls += surplus-dependency|CSWlibgnutls13 - PACKAGES += CSWlibgnutls26 CATALOGNAME_CSWlibgnutls = libgnutls26 SPKG_DESC_CSWlibgnutls26 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.26 PKGFILES_CSWlibgnutls26 = $(PKGFILES_RT) -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgcrypt -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgpgerr -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibtasn1-3 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibnettle4 +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibgc1 +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibhogweed2 +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibtasn1-6 +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibp11kit0 +RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibgmp10 -PACKAGES += CSWlibgnutls-dev -CATALOGNAME_CSWlibgnutls-dev = libgnutls_dev -SPKG_DESC_CSWlibgnutls-dev = Development Files for GNU TLS -PKGFILES_CSWlibgnutls-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibgnutls-dev += CSWlibgnutls26 -PACKAGES += CSWgnutlsdevel -CATALOGNAME_CSWgnutlsdevel = gnutls_devel -SPKG_DESC_CSWgnutlsdevel = Legacy development package for GNU TLS now provided by CSWlibgnutls-dev -PKGFILES_CSWgnutlsdevel = NOFILES -ARCHALL_CSWgnutlsdevel = 1 -RUNTIME_DEP_PKGS_CSWgnutlsdevel = CSWlibgnutls-dev -# This is empty, shut up! -CHECKPKG_OVERRIDES_CSWgnutlsdevel += archall-devel-package - BUILD_DEP_PKGS += CSWreadline BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibgnutls26) BUILD_DEP_PKGS += CSWlibtasn1-dev GARCOMPILER = GNU -GARFLAVOR = DBG -# We don't need it and if defined the test breaks -LD_OPTIONS = - BUILD64_LIBS_ONLY = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-guile +# If defined with the default value, the test breaks +# so we only keep the required items +LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) + # We put all libs in one package as they are .so.26 and are all bumped together CHECKPKG_OVERRIDES_CSWlibgnutls26 += shared-lib-pkgname-mismatch 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 May 20 23:00:16 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 20 May 2013 21:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21154] csw/mgar/pkg/lang-python/python-dateutil/trunk/ Makefile Message-ID: Revision: 21154 http://gar.svn.sourceforge.net/gar/?rev=21154&view=rev Author: wahwah Date: 2013-05-20 21:00:15 +0000 (Mon, 20 May 2013) Log Message: ----------- lang-python/python-dateutil/trunk: add an override Modified Paths: -------------- csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2013-05-20 20:01:56 UTC (rev 21153) +++ csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2013-05-20 21:00:15 UTC (rev 21154) @@ -13,22 +13,20 @@ endef MASTER_SITES = http://labix.org/download/$(NAME)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz SPKG_SOURCEURL = http://labix.org/$(NAME)/ BUILD_DEP_PKGS = CSWpysetuptools PACKAGES = CSWpy-dateutil -CATALOGNAME = py_dateutil -EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc - UPSTREAM_MASTER_SITES = http://labix.org/python-dateutil/ -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = dateutil LICENSE = LICENSE ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/dateutil/tz.py + include gar/category.mk test-dateutil: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 21 09:56:54 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 21 May 2013 07:56:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21155] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: Revision: 21155 http://gar.svn.sourceforge.net/gar/?rev=21155&view=rev Author: wahwah Date: 2013-05-21 07:56:50 +0000 (Tue, 21 May 2013) Log Message: ----------- opencsw-manual/trunk: catalog format + 32-bit/64-bit support Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2013-05-20 21:00:15 UTC (rev 21154) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-developers/index.rst 2013-05-21 07:56:50 UTC (rev 21155) @@ -5,6 +5,8 @@ This is a manual for developers who want to build own software, using tools and libraries provided by OpenCSW. +.. _linking against OpenCSW libraries: + Linking against OpenCSW libraries ================================= @@ -25,6 +27,14 @@ LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64" PKG_CONFIG_PATH="/opt/csw/lib/64/pkgconfig" +64-bit libraries live in the ``/opt/csw/lib/sparcv9`` and/or +``/opt/csw/lib/amd64`` directories. The ``/opt/csw/lib/64`` path is +a symlink to a chosen architecture subdirectory. For example, on SPARC +``/opt/csw/lib/64`` is a symlink to ``/opt/csw/lib/sparcv9``. All +binaries compiled with the ``-R/opt/csw/lib/64`` flag will try to look +at that path and find their libraries. + + .. _LD_LIBRARY_PATH - just say no: https://blogs.oracle.com/rie/entry/tt_ld_library_path_tt Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst 2013-05-21 07:56:50 UTC (rev 21155) @@ -0,0 +1,150 @@ +-------------------------- +32-bit and 64-bit packages +-------------------------- + +64-bit binaries aren't always best +---------------------------------- + +It's counter-intuitive, but 64-bit binaries are more memory-hungry and +often slower than 32-bit ones. It makes sense to build 64-bit binaries +when: + +* There's a measurable speed boost. +* The application needs to access more than 2G of RAM. +* The application needs to open more than 256 file descriptors. +* The application must match the kernel because it accesses its internal + structures. One example is the ``lsof`` utility. + +There's also the 2G file size restriction, but it can be worked around +by adding the ``-D_LARGEFILE64_SOURCE=1`` flag to the C preprocessor. + +32-bit or 64-bit ? Executables +------------------------------ + +When building packages, the general guideline with regard to bitness is +that executables should default to 32-bit, unless there are reasons to +default them to 64-bit. So the default would be:: + + /opt/csw/bin/foo (32-bit binary) + /opt/csw/bin/sparcv9/foo (64-bit binary) + +If ``/opt/csw/bin`` is in PATH, the 32-bit binary will be run by +default, but if the user wants, they can run the 64-bit binary as well. + +To run the 64-bit binary where/when possible, you can use isaexec:: + + /opt/csw/bin/foo ? isaexec (hardlink) + /opt/csw/bin/sparcv8/foo (32-bit binary) + /opt/csw/bin/sparcv9/foo (64-bit binary) + +The ``isaexec`` program is a wrapper which detects the architecture and +looks for the most advanced binary the current architecture can run. On +sparc, it almost always means running a 64-bit binary. So if you use +``isaexec``, it means defaulting to 64-bit in most cases. + +32-bit or 64-bit ? Shared libraries +----------------------------------- + +The policy regarding shared libraries is different: if possible, do +include 64-bit shared libraries in your package. Even though they might +not be used by default, certain projects might significantly benefit +from them at some point. One example would be ImageMagick, which +performs better in 64-bit mode, and requires numerous shared libraries +to run. + +.. _64-bit header files: + +Development packages (header files) +----------------------------------- + +Development packages in most cases don't distinguish between 32-bit and +64-bit ? you don't have to do anything. + +However, there are some software projects (e.g. ``gmp``) which install +different headers depending on bitness. These have to be handled +specifically, but providing both 32-bit and 64-bit header files with +a specific switch file. For example:: + + /opt/csw/include/foo.h (the switch file) + /opt/csw/include/foo-32.h + /opt/csw/include/foo-64.h + +The contents of ``foo.h`` would be:: + + /* Allow 32 and 64 bit headers to coexist */ + #if defined __amd64 || defined __x86_64 || defined __sparcv9 + #include "foo-64.h" + #else + #include "foo-32.h" + #endif + +To implement the following in GAR, you need to set ``EXTRA_PAX_ARGS`` to +rewrite specific header names to be bit-specific, and then manually +install the switch file:: + + EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/foo.h$$,.$(includedir)/foo-32.h,p" + EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/foo.h$$,.$(includedir)/foo-64.h,p" + EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) + + (...) + + include gar/category.mk + + post-merge: + ginstall $(FILEDIR)/foo.h $(PKGROOT)$(includedir)/foo.h + @$(MAKECOOKIE) + +This operation must happen in the post-merge stage, because this +operation must be done after we've built binaries for all architectures +and we're merging them into a single directory tree. See the +`modulations in GAR video`_ for more information. + +Other files which happen to be 32-bit or 64-bit specific +-------------------------------------------------------- + +Usually only binaries and libraries differ; all other files have the +same content regardless to the architecture. However, some software +projects might embed architecture specific information into files which +aren't binaries and don't have a mechanism of choosing the right version +of the file at runtime:: + + /opt/csw/bin/foo ? isaexec (hardlink) + /opt/csw/sparcv8/foo (32-bit binary, has /opt/csw/lib in RUNPATH) + /opt/csw/sparcv9/foo (64-bit binary, has /opt/csw/lib/64 in RUNPATH) + /opt/csw/lib/64 ? sparcv9 (symlink) + /opt/csw/lib/libfoo.so.1 (32-bit library) + /opt/csw/lib/sparcv9/libfoo.so.1 (64-bit library) + /opt/csw/lib/foo/arch_specific_data (ZONK! no mechanism to differentiate!) + +The `64-bit header files`_ example shown above is a lucky case, because +header files follow the C syntax, so you can use the ``#if defined`` +conditional statement. In the general case there is no single solution, +it all depends on whether you can write a conditional statement such +that you get the 32-bit or 64-bit content depending on a choice made at +runtime. + + +Compiling 64-bit binaries +------------------------- + +To compile a 64-bit binary, you add ``-m64`` to the compiler invocation. +See more about :ref:`linking against OpenCSW libraries`. + +In GAR, there's a shortcut:: + + BUILD64 = 1 + + +**See also** + +* `Solaris 64-bit Developer's Guide`_ +* `Are 64-bit Binaries Really Slower than 32-bit Binaries?`_ + +.. _Solaris 64-bit Developer's Guide: + http://docs.sun.com/app/docs/doc/816-5138 + +.. _Are 64-bit Binaries Really Slower than 32-bit Binaries?: + http://www.osnews.com/story/5768 + +.. _modulations in GAR video: + http://youtu.be/7I3efByIg84 Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-05-20 21:00:15 UTC (rev 21154) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-05-21 07:56:50 UTC (rev 21155) @@ -2,24 +2,91 @@ Building a package catalog -------------------------- -If you have built a package (or a set of them), you might want to test them. -You could just ``gunzip`` the packages and run ``pkgadd``, but if you wanted to test -your package on a couple of systems, it's better to build a catalog. +If you have built a package (or a set of them), you might want to test +them. You could just ``gunzip`` the packages and run ``pkgadd``, but if +you wanted to test your package on a couple of systems, it's better to +build a catalog. Make sure you've installed the ``pkgutilplus`` package. It contains the -``bldcat`` utility. You can use it to create a local catalog with your -package:: +``bldcat`` utility. You can use it to create a local catalog containing +your package:: catalog_root=${HOME}/opencsw-catalog catalog_path=${catalog_root}/$(uname -p)/$(uname -r) cp /path/to/your_package.pkg ${catalog_path} bldcat ${catalog_path} -Once this is done, you can instruct ``pkgutil`` to install packages from it. You -can either serve the root catalog directory over HTTP, or you can refer to -a local filesystem path:: +Once this is done, you can instruct ``pkgutil`` to install packages from +it. You can either serve the root catalog directory over HTTP, or you +can refer to a local filesystem path:: sudo pkgutil -t file://${catalog_path} -y -i your_package If you create a persistent local catalog, you can add the path or URL to -``/opt/csw/etc/pkgutil.conf``. +``/etc/opt/csw/pkgutil.conf``. + +Building your own catalogs +-------------------------- + +If you have test packages that you have built for OpenCSW or your own +packages that have dependencies on each other, you may want to use +pkgutil to install them. For that to work you need a catalog for your +packages just like the ones OpenCSW publishes. + +There's a simple perl script to parse your packages in a directory and +build a catalog for them. The one argument is the directory to parse for +``*.pkg.gz`` files and stdout is used so use normal redirection for the +catalog:: + + $ bldcat . + xv 3.10a,REV=2008.10.15 CSWxv xv-3.10a,REV=2008.10.15-SunOS5.8-sparc-CSW.pkg.gz d887c7aed0e849471467e4944d14c2eb 1877768 CSWcommon|CSWtiff|CSWpng|CSWjpeg|CSWzlib none + $ bldcat . > catalog + $ ls -l + -rw-r--r-- 1 bonivart csw 167 Oct 22 17:19 catalog + -rw-r--r-- 1 bonivart csw 1877768 Oct 22 17:19 xv-3.10a,REV=2008.10.15-SunOS5.8-sparc-CSW.pkg.gz + $ more catalog + xv 3.10a,REV=2008.10.15 CSWxv xv-3.10a,REV=2008.10.15-SunOS5.8-sparc-CSW.pkg.gz d887c7aed0e849471467e4944d14c2eb 1877768 CSWcommon|CSWtiff|CSWpng|CSWjpeg|CSWzlib none + +The script is a part of the pkgutilplus (CSWpkgutilplus) package. + +Checking the catalog +-------------------- + +There's also a simple check that the catalog is correct. It checks that +every line is eight fields and that the dependency and category fields +begin and end with chars. It also warns if packages are not compressed +(normal for gzip and pkg-get). It also checks for duplicates. + +Test run on a manipulated catalog:: + + # chkcat /var/opt/csw/pkgutil/catalog + Skipping signature. + Skipping comment. + Skipping comment. + Skipping comment. + + ERROR! 7 fields instead of normal 8. + 2.2.4,REV=2008.10.01 CSWlibtoolrt libtool_rt-2.2.4,REV=2008.10.01-SunOS5.8-sparc-CSW.pkg.gz 72ae2f64521df6e18b7d665bbf11e984 82427 CSWisaexec|CSWcommon none + + ERROR! 7 fields instead of normal 8. + rubydoc 1.8.7,REV=2008.09.19_p72 CSWrubydoc rubydoc-1.8.7,REV=2008.09.19_p72-SunOS5.8-i386-CSW.pkg.gz d47700240d7c675e5f843b03a937c28e 3032323 none + WARNING! Package CSWrubytk is not compressed. + rubytk 1.8.7,REV=2008.09.19_p72 CSWrubytk rubytk-1.8.7,REV=2008.09.19_p72-SunOS5.8-i386-CSW.pkg 2215ac92175922c593245ef577e92fc9 317259 CSWruby|CSWtcl|CSWtk|CSWcommon none + + + WARNING! Package CSWrubytk is not compressed. + rubytk 1.8.7,REV=2008.09.19_p72 CSWrubytk rubytk-1.8.7,REV=2008.09.19_p72-SunOS5.8-i386-CSW.pkg 2215ac92175922c593245ef577e92fc9 317259 CSWruby|CSWtcl|CSWtk|CSWcommon none + + ERROR! The category field of package CSWspamassassin begins with a non-char. + spamassassin 3.2.5,REV=2008.10.21 CSWspamassassin + spamassassin-3.2.5,REV=2008.10.21-SunOS5.8-i386-CSW.pkg.gz + e5bd858be4a67023b02ee1e5e760295b 896877 + CSWosslrt|CSWperl|CSWpmarchivetar|CSWpmdbi|CSWpmdigestsha1|CSWpmiosocketinet6|CSWpmiosocketssl|CSWpmiozlib|CSWpmipcountry|CSWpmldap|CSWpmlibwww|CSWpmmaildkim|CSWpmmailspf|CSWpmmailtools|CSWpmmimebase64|CSWpmnetdns|CSWpmuri|CSWpmhtmlparser|CSWzlib|CSWcommon + +none + + ERROR! The dependency field of package CSWxv ends with a pipe char. + xv 3.10a,REV=2008.10.17 CSWxv xv-3.10a,REV=2008.10.17-SunOS5.8-i386-CSW.pkg.gz 9de3c40048fc8c9f79616ee388fc98f1 1731846 CSWcommon|CSWtiff|CSWpng|CSWjpeg|CSWzlib| none + + Skipping signature. Exiting. + +The script is a part of the pkgutilplus (CSWpkgutilplus) package. Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/catalog-format.rst 2013-05-21 07:56:50 UTC (rev 21155) @@ -0,0 +1,29 @@ +-------------- +Catalog format +-------------- + +Catalog format in short:: + + common version package file md5 size dependencies category i-dependencies + +For example:: + + bind 9.4.2,REV=2008.07.09_rev=p1 CSWbind bind-9.4.2,REV=2008.07.09_rev=p1-SunOS5.8-sparc-CSW.pkg.gz f68df57fcf54bfd37304b79d6f7eeacc 2954112 CSWcommon|CSWosslrt net none + +Each field is space separated, the dependencies field can be split with +the pipe char, like in the example above with two dependencies. The same +goes for the category and incompatible dependencies fields. + +A package can only occur once in the catalog, meaning that both package +names and catalog names must be unique in a catalog. + +The catalog may have to be extended to support more features like if +there's a source package available. In that case extra fields should be +added to the end so not to break existing tools. + +See also: + +* `Building a catalog`_ + +.. _Building a catalog: + building-a-catalog.html Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2013-05-20 21:00:15 UTC (rev 21154) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2013-05-21 07:56:50 UTC (rev 21155) @@ -11,7 +11,9 @@ about-documentation contributing-to-recipes filesystem-layout + catalog-format building-a-catalog shared-libraries package-naming buildfarm-setup + 32-bit-and-64-bit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue May 21 11:36:37 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 21 May 2013 09:36:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21156] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21156 http://gar.svn.sourceforge.net/gar/?rev=21156&view=rev Author: cgrzemba Date: 2013-05-21 09:36:32 +0000 (Tue, 21 May 2013) Log Message: ----------- qt4-gcc/trunk: adjust package content Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-21 07:56:50 UTC (rev 21155) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-05-21 09:36:32 UTC (rev 21156) @@ -102,11 +102,11 @@ SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files PKGFILES_CSWqt4-dev += $(PKGFILES_DEVEL) PKGFILES_CSWqt4-dev += $(call baseisadirs,$(bindir),.*) -PKGFILES_CSWqt4-dev += $(prefix)/examples/.* -PKGFILES_CSWqt4-dev += $(prefix)/plugins/.* -PKGFILES_CSWqt4-dev += $(prefix)/demos/.* -PKGFILES_CSWqt4-dev += $(prefix)/imports/.* -PKGFILES_CSWqt4-dev += $(prefix)/mkspecs/.* +PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/examples/.* +PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/plugins/.* +PKGFILES_CSWqt4-dev += $(sharedstatedir)/$(NAME)$(MAJOR)/demos/.* +PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/imports/.* +PKGFILES_CSWqt4-dev += $(sharedstatedir)/$(NAME)$(MAJOR)/mkspecs/.* RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscript4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesignercomponents4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesigner4 @@ -138,13 +138,13 @@ # RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWgstplugins RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgcc-s1 -# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsybdb5 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWsqlite -# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibpq5 -# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3 -# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibicui18n50 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsybdb5 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18 CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWlibicui18n50 # These are code examples. CHECKPKG_OVERRIDES_CSWqt4-dev += binary-architecture-does-not-match-placement 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 May 21 13:55:11 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 May 2013 11:55:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21157] csw/mgar/pkg/geolitedb/trunk Message-ID: Revision: 21157 http://gar.svn.sourceforge.net/gar/?rev=21157&view=rev Author: dmichelsen Date: 2013-05-21 11:55:10 +0000 (Tue, 21 May 2013) Log Message: ----------- geolitedb/trunk: Update to 20130521 Modified Paths: -------------- csw/mgar/pkg/geolitedb/trunk/Makefile csw/mgar/pkg/geolitedb/trunk/checksums Modified: csw/mgar/pkg/geolitedb/trunk/Makefile =================================================================== --- csw/mgar/pkg/geolitedb/trunk/Makefile 2013-05-21 09:36:32 UTC (rev 21156) +++ csw/mgar/pkg/geolitedb/trunk/Makefile 2013-05-21 11:55:10 UTC (rev 21157) @@ -1,5 +1,5 @@ NAME = geolitedb -VERSION = 20120403 +VERSION = 20130521 GARTYPE = v2 DESCRIPTION = Geolite country database Modified: csw/mgar/pkg/geolitedb/trunk/checksums =================================================================== --- csw/mgar/pkg/geolitedb/trunk/checksums 2013-05-21 09:36:32 UTC (rev 21156) +++ csw/mgar/pkg/geolitedb/trunk/checksums 2013-05-21 11:55:10 UTC (rev 21157) @@ -1,4 +1,4 @@ -ab0f52a35128d1aced906ac4cbfbed9c GeoIP.dat.gz -91b661fee55eb76543ce00732f1e2b3e GeoIPv6.dat.gz -7f25d84d9246b2b4c1f1a4fc4ffa5d59 GeoLiteCity.dat.xz -e40e816465c25b1494280ad6d25598d1 GeoLiteCityv6.dat.gz +634d72f4ffbb2de57efa468add572d38 GeoIP.dat.gz +42a24002066543943220721adf304ee1 GeoIPv6.dat.gz +645e2b1f351bc7740786670708ef90d5 GeoLiteCity.dat.xz +4beb1bf51a56bd0775684e8fb6f446f2 GeoLiteCityv6.dat.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 Tue May 21 14:02:08 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 21 May 2013 12:02:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[21158] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 21158 http://gar.svn.sourceforge.net/gar/?rev=21158&view=rev Author: wahwah Date: 2013-05-21 12:02:07 +0000 (Tue, 21 May 2013) Log Message: ----------- lang-python/python/branches/python-3.3: build 64-bit libraries Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-05-21 11:55:10 UTC (rev 21157) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-05-21 12:02:07 UTC (rev 21158) @@ -52,6 +52,9 @@ # BUILD64 = 1 # ISAEXEC = 1 +# Maybe including just the libraries will work fine? +BUILD64_LIBS_ONLY = 1 + # There is a file name conflict over libffi.so symlink between libffi package # and a gcc-java package. While it will ultimately belong to libffi_dev, the # symlink is currently under a subdirectory. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 21 14:05:57 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 21 May 2013 12:05:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21159] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 21159 http://gar.svn.sourceforge.net/gar/?rev=21159&view=rev Author: wahwah Date: 2013-05-21 12:05:57 +0000 (Tue, 21 May 2013) Log Message: ----------- lang-python/python/trunk: try enabling the 64-bit build; but no ISAEXEC Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-05-21 12:02:07 UTC (rev 21158) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-05-21 12:05:57 UTC (rev 21159) @@ -62,8 +62,11 @@ # tests. SKIPTEST = 1 -# TODO: Enable the 64-bit build at some point. -# BUILD64 = 1 +# For now, do not set ISAEXEC, until _sysconfigdata.py returns right values +# depending on runtime. +# A thread on python-list: +# http://mail.python.org/pipermail/python-list/2013-May/647197.html +BUILD64 = 1 EXTRA_INC += $(prefix)/bdb47/include EXTRA_LIB += $(prefix)/bdb47/lib 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 May 21 14:29:21 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 May 2013 12:29:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21160] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/building-a-catalog.rst Message-ID: Revision: 21160 http://gar.svn.sourceforge.net/gar/?rev=21160&view=rev Author: dmichelsen Date: 2013-05-21 12:29:21 +0000 (Tue, 21 May 2013) Log Message: ----------- opencsw-manual/trunk: Fix example Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-05-21 12:05:57 UTC (rev 21159) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-05-21 12:29:21 UTC (rev 21160) @@ -35,17 +35,19 @@ There's a simple perl script to parse your packages in a directory and build a catalog for them. The one argument is the directory to parse for -``*.pkg.gz`` files and stdout is used so use normal redirection for the -catalog:: +``*.pkg.gz`` files and the `catalog` file is put in the same directory +together with the `descriptions` of all packages:: $ bldcat . - xv 3.10a,REV=2008.10.15 CSWxv xv-3.10a,REV=2008.10.15-SunOS5.8-sparc-CSW.pkg.gz d887c7aed0e849471467e4944d14c2eb 1877768 CSWcommon|CSWtiff|CSWpng|CSWjpeg|CSWzlib none - $ bldcat . > catalog + Inspecting ./xv-3.10a,REV=2008.10.17-SunOS5.8-sparc-CSW.pkg.gz $ ls -l - -rw-r--r-- 1 bonivart csw 167 Oct 22 17:19 catalog - -rw-r--r-- 1 bonivart csw 1877768 Oct 22 17:19 xv-3.10a,REV=2008.10.15-SunOS5.8-sparc-CSW.pkg.gz + -rw-r--r-- 1 dam csw 172 May 21 14:22 catalog + -rw-r--r-- 1 dam csw 53 May 21 14:22 descriptions + -rw-r--r-- 1 dam csw 1878846 May 21 14:17 xv-3.10a,REV=2008.10.17-SunOS5.8-sparc-CSW.pkg.gz $ more catalog - xv 3.10a,REV=2008.10.15 CSWxv xv-3.10a,REV=2008.10.15-SunOS5.8-sparc-CSW.pkg.gz d887c7aed0e849471467e4944d14c2eb 1877768 CSWcommon|CSWtiff|CSWpng|CSWjpeg|CSWzlib none + xv 3.10a,REV=2008.10.17 CSWxv xv-3.10a,REV=2008.10.17-SunOS5.8-sparc-CSW.pkg.gz 83f5619d7daa6678812cc870810042f2 1878846 CSWcommon|CSWtiff|CSWpng|CSWjpeg|CSWzlib none none + $ more descriptions + xv - Interactive image display and manipulation tool The script is a part of the pkgutilplus (CSWpkgutilplus) package. @@ -55,7 +57,7 @@ There's also a simple check that the catalog is correct. It checks that every line is eight fields and that the dependency and category fields begin and end with chars. It also warns if packages are not compressed -(normal for gzip and pkg-get). It also checks for duplicates. +(normal for gzip and pkgutil). It also checks for duplicates. Test run on a manipulated catalog:: 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 May 21 14:30:47 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 May 2013 12:30:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21161] csw/mgar/pkg/libcurl4/trunk/Makefile Message-ID: Revision: 21161 http://gar.svn.sourceforge.net/gar/?rev=21161&view=rev Author: dmichelsen Date: 2013-05-21 12:30:47 +0000 (Tue, 21 May 2013) Log Message: ----------- libcurl4/trunk: Adjust rule name to latest standars Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2013-05-21 12:29:21 UTC (rev 21160) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2013-05-21 12:30:47 UTC (rev 21161) @@ -143,7 +143,7 @@ ) @$(MAKECOOKIE) -post-merge-global: +post-merge-all: @# This is needed because the substitutions from pax args do not change the @# contents of the symlink rm -f $(PKGROOT)$(libdir)/libcurl-feature.so.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 21 14:32:45 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 21 May 2013 12:32:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[21162] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 21162 http://gar.svn.sourceforge.net/gar/?rev=21162&view=rev Author: wahwah Date: 2013-05-21 12:32:44 +0000 (Tue, 21 May 2013) Log Message: ----------- lang-python/python/trunk: No, that does not even link.~ Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-05-21 12:30:47 UTC (rev 21161) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-05-21 12:32:44 UTC (rev 21162) @@ -62,11 +62,10 @@ # tests. SKIPTEST = 1 -# For now, do not set ISAEXEC, until _sysconfigdata.py returns right values -# depending on runtime. +# The 64-bit build is probably not going to happen for Python 2.6. # A thread on python-list: # http://mail.python.org/pipermail/python-list/2013-May/647197.html -BUILD64 = 1 +# BUILD64 = 1 EXTRA_INC += $(prefix)/bdb47/include EXTRA_LIB += $(prefix)/bdb47/lib 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 May 21 16:45:15 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 May 2013 14:45:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21163] csw/mgar/pkg Message-ID: Revision: 21163 http://gar.svn.sourceforge.net/gar/?rev=21163&view=rev Author: dmichelsen Date: 2013-05-21 14:45:14 +0000 (Tue, 21 May 2013) Log Message: ----------- jenkins/trunk: Intial commit Added Paths: ----------- csw/mgar/pkg/jenkins/ csw/mgar/pkg/jenkins/Makefile csw/mgar/pkg/jenkins/branches/ csw/mgar/pkg/jenkins/tags/ csw/mgar/pkg/jenkins/trunk/ csw/mgar/pkg/jenkins/trunk/Makefile csw/mgar/pkg/jenkins/trunk/checksums csw/mgar/pkg/jenkins/trunk/files/ csw/mgar/pkg/jenkins/trunk/files/COPYING Added: csw/mgar/pkg/jenkins/Makefile =================================================================== --- csw/mgar/pkg/jenkins/Makefile (rev 0) +++ csw/mgar/pkg/jenkins/Makefile 2013-05-21 14:45:14 UTC (rev 21163) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/jenkins/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/jenkins/trunk/Makefile =================================================================== --- csw/mgar/pkg/jenkins/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jenkins/trunk/Makefile 2013-05-21 14:45:14 UTC (rev 21163) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = jenkins +VERSION = 1.515 +GARTYPE = v2 + +DESCRIPTION = An extendable open source continuous integration server + +MASTER_SITES += http://mirrors.jenkins-ci.org/war/$(VERSION)/ +DISTFILES += jenkins.war +DISTFILES += COPYING + +PACKAGES += CSWjenkins +SPKG_DESC_CSWjenkins = An extendable open source continuous integration server +# PKGFILES is catchall +ARCHALL_CSWjenkins = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(sharedstatedir)/webapps + ginstall -m 0644 $(WORKDIR)/jenkins.war $(DESTDIR)$(sharedstatedir)/webapps + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/jenkins/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/jenkins/trunk/checksums =================================================================== --- csw/mgar/pkg/jenkins/trunk/checksums (rev 0) +++ csw/mgar/pkg/jenkins/trunk/checksums 2013-05-21 14:45:14 UTC (rev 21163) @@ -0,0 +1 @@ +a0a0f8cf8582f3daf539e495f1edb6a0 jenkins.war Added: csw/mgar/pkg/jenkins/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/jenkins/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/jenkins/trunk/files/COPYING 2013-05-21 14:45:14 UTC (rev 21163) @@ -0,0 +1,22 @@ +The MIT License + +Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + 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 May 21 17:32:44 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 21 May 2013 15:32:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21164] csw/mgar/pkg/imap-c-client/trunk Message-ID: Revision: 21164 http://gar.svn.sourceforge.net/gar/?rev=21164&view=rev Author: lblume Date: 2013-05-21 15:32:44 +0000 (Tue, 21 May 2013) Log Message: ----------- imap-c-client/trunk: Add a 64 bit version of the lib; do some cleanup of obsolete overrides Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile csw/mgar/pkg/imap-c-client/trunk/files/shared.diff Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2013-05-21 14:45:14 UTC (rev 21163) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2013-05-21 15:32:44 UTC (rev 21164) @@ -23,6 +23,8 @@ MERGE_EXCLUDE_STATICLIBS = +BUILD64_LIBS_ONLY = 1 + # Build libc-client.so PATCHFILES += shared.diff @@ -36,32 +38,23 @@ SPKG_DESC_CSWlibc-client2007f += $(DESCRIPTION), libc-client.2007f.so PKGFILES_CSWlibc-client2007f += $(call pkgfiles_lib,libc-client.2007f.so) RUNTIME_DEP_PKGS_CSWlibc-client2007f += CSWlibssl1-0-0 -CHECKPKG_OVERRIDES_CSWlibc-client2007f += file-with-bad-content|/usr/share|root/opt/csw/lib/libc-client.2007f.so CHECKPKG_OVERRIDES_CSWlibc-client2007f += soname-equals-filename|file=/opt/csw/lib/libc-client.2007f.so +CHECKPKG_OVERRIDES_CSWlibc-client2007f_i386 += soname-equals-filename|file=/opt/csw/lib/amd64/libc-client.2007f.so +CHECKPKG_OVERRIDES_CSWlibc-client2007f_sparc += soname-equals-filename|file=/opt/csw/lib/sparcv9/libc-client.2007f.so +CHECKPKG_OVERRIDES_CSWlibc-client2007f += $(CHECKPKG_OVERRIDES_CSWlibc-client2007f_$(GARCH)) PACKAGES += CSWlibc-client-dev SPKG_DESC_CSWlibc-client-dev = Development files for $(NAME) $(VERSION) PKGFILES_CSWlibc-client-dev = $(PKGFILES_DEVEL_INCLUDEDIR) -PKGFILES_CSWlibc-client-dev += $(libdir)/libc-client.so -PKGFILES_CSWlibc-client-dev += $(libdir)/c-client.a +PKGFILES_CSWlibc-client-dev += $(libdir)/.*libc-client.so +PKGFILES_CSWlibc-client-dev += $(libdir)/.*c-client.a RUNTIME_DEP_PKGS_CSWlibc-client-dev += CSWlibc-client2007f OBSOLETED_BY_CSWlibc-client-dev = CSWimap-devel -CHECKPKG_OVERRIDES_CSWlibc-client-dev += surplus-dependency|CSWlibc-client2007f -CHECKPKG_OVERRIDES_CSWlibc-client-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/c-client.a PACKAGES += CSWimap SPKG_DESC_CSWimap = Mail server daemon (UW) RUNTIME_DEP_PKGS_CSWimap = CSWlibssl1-0-0 -CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tmail.1 -CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/SSLBUILD -CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/bugs.txt -CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/IPv6.txt -CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/BUILD -CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/FAQ.html -CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/FAQ.txt - - INETDCONF = $(sysconfdir)/pkg/CSWimap/imap.inetd.conf INETDCONF += $(sysconfdir)/pkg/CSWimap/imaps.inetd.conf INETDCONF += $(sysconfdir)/pkg/CSWimap/pop.inetd.conf @@ -80,7 +73,7 @@ include gar/category.mk build-custom: - @( cd $(WORKSRC) ; $(BUILD_ENV) DISTVERSION=$(VERSION) make soc ) + @( cd $(WORKSRC) ; $(BUILD_ENV) DISTVERSION=$(VERSION) make EXTRALDFLAGS="$(LDFLAGS) $(EXTRA_LDFLAGS)" EXTRACFLAGS="$(CFLAGS) $(EXTRA_CFLAGS)" soc ) @$(MAKECOOKIE) install-uwimap: @@ -113,14 +106,17 @@ @$(MAKECOOKIE) install-libc-client: - ginstall -d $(DESTDIR)$(libdir) - ginstall -p -m644 $(WORKSRC)/c-client/c-client.a $(DESTDIR)$(libdir) - ginstall -p -m755 \ - $(WORKSRC)/c-client/libc-client.$(VERSION).so $(DESTDIR)$(libdir) ginstall -d $(DESTDIR)$(includedir)/imap ginstall -p -m644 $(WORKSRC)/c-client/*.h $(DESTDIR)$(includedir)/imap ginstall -p -m644 $(WORKSRC)/c-client/linkage.c $(DESTDIR)$(includedir)/imap ginstall -p -m644 \ $(WORKSRC)/src/osdep/tops-20/shortsym.h $(DESTDIR)$(includedir)/imap + @$(MAKECOOKIE) + +post-install-modulated: + ginstall -d $(DESTDIR)$(libdir) + ginstall -p -m644 $(WORKSRC)/c-client/c-client.a $(DESTDIR)$(libdir) + ginstall -p -m755 \ + $(WORKSRC)/c-client/libc-client.$(VERSION).so $(DESTDIR)$(libdir) cd $(DESTDIR)$(libdir); ln -sf libc-client.$(VERSION).so libc-client.so @$(MAKECOOKIE) Modified: csw/mgar/pkg/imap-c-client/trunk/files/shared.diff =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/files/shared.diff 2013-05-21 14:45:14 UTC (rev 21163) +++ csw/mgar/pkg/imap-c-client/trunk/files/shared.diff 2013-05-21 15:32:44 UTC (rev 21164) @@ -90,7 +90,7 @@ OSCFLAGS + +osdep.o: $(OSDEPS) -+ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c ++ $(CC) `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c + @echo ============================================================== @echo Building OS-dependent module @echo If you get No such file error messages for files x509.h, ssl.h, @@ -101,7 +101,7 @@ + @echo ============================================================== + +osdep.so: $(OSDEPS) -+ $(CC) -KPIC -DPIC -D_REENTRANT -c $(CFLAGS) `$(CAT) OSCFLAGS` osdep.c -o $@ ++ $(CC) -KPIC -DPIC -D_REENTRANT -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c -o $@ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue May 21 18:48:15 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 21 May 2013 16:48:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21165] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 21165 http://gar.svn.sourceforge.net/gar/?rev=21165&view=rev Author: slowfranklin Date: 2013-05-21 16:48:15 +0000 (Tue, 21 May 2013) Log Message: ----------- glib2/trunk: Resurrect largefile support by disabling libelf Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0021-Disable-libelf-doesn-t-work-with-large-file-support.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-21 15:32:44 UTC (rev 21164) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-21 16:48:15 UTC (rev 21165) @@ -85,6 +85,7 @@ PATCHFILES += 0006-Adjust-hardcoded-paths-to-match-Solaris-CSW.patch PATCHFILES += 0003-Make-glib-work-with-zoneinfo-version-1.patch PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch +PATCHFILES += 0021-Disable-libelf-doesn-t-work-with-large-file-support.patch # What to say? Disable yet another sporadically failing up test PATCHFILES_isa-amd64 += 0023-disable-mainloop-invoke-test.patch @@ -266,14 +267,6 @@ BUILD64 = 1 -# Glib 2.32.4 won't compile and abort with a message from sys/elf.h: -# -# "/usr/include/libelf.h", line 23: #error: "large files are not supported by libelf" -# -# so, I decided to disable-largefile support for 32bit libs, instead of patching up the code. -CONFIGURE_ARGS-32 = --disable-largefile -CONFIGURE_ARGS-64 = - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=gnu CONFIGURE_ARGS += --with-pcre=system Added: csw/mgar/pkg/glib2/trunk/files/0021-Disable-libelf-doesn-t-work-with-large-file-support.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0021-Disable-libelf-doesn-t-work-with-large-file-support.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0021-Disable-libelf-doesn-t-work-with-large-file-support.patch 2013-05-21 16:48:15 UTC (rev 21165) @@ -0,0 +1,37 @@ +From 27aa5d04c12dc1ae97888c077812a91f1b817da8 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 15 May 2013 15:55:58 +0200 +Subject: [PATCH] Disable libelf, doesn't work with large file support + +--- + configure | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index c7338ff..92a836e 100755 +--- a/configure ++++ b/configure +@@ -26025,17 +26025,17 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$LIBELF_PKG_ERRORS" >&5 + +- have_libelf=maybe ++ have_libelf=no + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- have_libelf=maybe ++ have_libelf=no + else + LIBELF_CFLAGS=$pkg_cv_LIBELF_CFLAGS + LIBELF_LIBS=$pkg_cv_LIBELF_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- have_libelf=yes ++ have_libelf=no + fi + + if test $have_libelf = maybe; then +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue May 21 18:50:44 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 21 May 2013 16:50:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21166] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 21166 http://gar.svn.sourceforge.net/gar/?rev=21166&view=rev Author: slowfranklin Date: 2013-05-21 16:50:44 +0000 (Tue, 21 May 2013) Log Message: ----------- glib2/trunk: Add Solaris 11 specific packages for FEN support Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-21 16:48:15 UTC (rev 21165) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-21 16:50:44 UTC (rev 21166) @@ -90,7 +90,9 @@ # What to say? Disable yet another sporadically failing up test PATCHFILES_isa-amd64 += 0023-disable-mainloop-invoke-test.patch +# Solaris 11 specific package for FEN support PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 PACKAGES += CSWglib2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 21 18:50:59 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 21 May 2013 16:50:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21167] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: Revision: 21167 http://gar.svn.sourceforge.net/gar/?rev=21167&view=rev Author: wahwah Date: 2013-05-21 16:50:58 +0000 (Tue, 21 May 2013) Log Message: ----------- opencsw-manual/trunk: less clutter in the TOC Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2013-05-21 16:50:44 UTC (rev 21166) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2013-05-21 16:50:58 UTC (rev 21167) @@ -5,7 +5,7 @@ A user's manual for people who manage Solaris systems with OpenCSW packages. .. toctree:: - :maxdepth: 2 + :maxdepth: 1 introduction getting-started Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-05-21 16:50:44 UTC (rev 21166) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-05-21 16:50:58 UTC (rev 21167) @@ -35,8 +35,8 @@ There's a simple perl script to parse your packages in a directory and build a catalog for them. The one argument is the directory to parse for -``*.pkg.gz`` files and the `catalog` file is put in the same directory -together with the `descriptions` of all packages:: +``*.pkg.gz`` files and the ``catalog`` file is put in the same directory +together with the ``descriptions`` of all packages:: $ bldcat . Inspecting ./xv-3.10a,REV=2008.10.17-SunOS5.8-sparc-CSW.pkg.gz Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2013-05-21 16:50:44 UTC (rev 21166) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2013-05-21 16:50:58 UTC (rev 21167) @@ -6,7 +6,7 @@ package repositories, either at OpenCSW or at their own organization. .. toctree:: - :maxdepth: 2 + :maxdepth: 1 about-documentation contributing-to-recipes 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 May 21 21:20:58 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 21 May 2013 19:20:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21168] csw/mgar/pkg/liblcms2/trunk/Makefile Message-ID: Revision: 21168 http://gar.svn.sourceforge.net/gar/?rev=21168&view=rev Author: dmichelsen Date: 2013-05-21 19:20:57 +0000 (Tue, 21 May 2013) Log Message: ----------- liblcms2/trunk: Add comment Modified Paths: -------------- csw/mgar/pkg/liblcms2/trunk/Makefile Modified: csw/mgar/pkg/liblcms2/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms2/trunk/Makefile 2013-05-21 16:50:58 UTC (rev 21167) +++ csw/mgar/pkg/liblcms2/trunk/Makefile 2013-05-21 19:20:57 UTC (rev 21168) @@ -2,6 +2,10 @@ VERSION = 2.4 GARTYPE = v2 +# Retry compiling ghostscript 9.07 on version bump as some new API was introduced not in 2.4 yet: +# https://bugzilla.redhat.com/show_bug.cgi?id=912307 +# http://list-archives.org/2013/02/14/gs-devel-ghostscript-com/ghostscript-9-07-and-ghostpdl-9-07/f/6061272699 + DESCRIPTION = The little color management system and tools define BLURB Little cms intends to be a small-footprint, speed optimized This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue May 21 21:20:58 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 21 May 2013 19:20:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21169] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 21169 http://gar.svn.sourceforge.net/gar/?rev=21169&view=rev Author: bonivart Date: 2013-05-21 19:20:58 +0000 (Tue, 21 May 2013) Log Message: ----------- miltergreylist/trunk: update to 4.5.1 Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/checksums csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2013-05-21 19:20:57 UTC (rev 21168) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2013-05-21 19:20:58 UTC (rev 21169) @@ -1,5 +1,5 @@ NAME = miltergreylist -VERSION = 4.4.1 +VERSION = 4.5.1 #RELEASE = a1 #DISTVERSION = $(VERSION)$(RELEASE) DISTVERSION = $(VERSION) @@ -9,7 +9,6 @@ DESCRIPTION = Greylist mail filtering method define BLURB - Greylist mail filtering method endef MASTER_SITES = http://ftp.espci.fr/pub/milter-greylist/ @@ -26,7 +25,7 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -CHECKPKG_OVERRIDES += file-with-bad-content +CHECKPKG_OVERRIDES_CSWmiltergreylist += file-with-bad-content|/usr/local|root/opt/csw/bin/milter-greylist PATCHFILES += 0001-Path-and-user-changes-in-conf-file.patch PATCHFILES += 0002-change-socket-path.patch Modified: csw/mgar/pkg/miltergreylist/trunk/checksums =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/checksums 2013-05-21 19:20:57 UTC (rev 21168) +++ csw/mgar/pkg/miltergreylist/trunk/checksums 2013-05-21 19:20:58 UTC (rev 21169) @@ -1 +1 @@ -56cfd2aa25d4eb88bb94cd0ee5026508 milter-greylist-4.4.1.tgz +e0149825bd2912e20a57f70539b00427 milter-greylist-4.5.1.tgz Modified: csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch 2013-05-21 19:20:57 UTC (rev 21168) +++ csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch 2013-05-21 19:20:58 UTC (rev 21169) @@ -12,7 +12,7 @@ --- a/greylist.conf +++ b/greylist.conf @@ -5,11 +5,11 @@ - # $Id: greylist.conf,v 1.48 2010/04/15 07:51:29 manu Exp $ + # $Id: greylist.conf,v 1.49 2013/01/27 02:10:19 manu Exp $ # -pidfile "/var/run/milter-greylist.pid" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue May 21 22:22:48 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 21 May 2013 20:22:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21170] csw/mgar/pkg/wput/trunk/Makefile Message-ID: Revision: 21170 http://gar.svn.sourceforge.net/gar/?rev=21170&view=rev Author: chninkel Date: 2013-05-21 20:22:48 +0000 (Tue, 21 May 2013) Log Message: ----------- wput/trunk: updated to compile against newest gnutls Modified Paths: -------------- csw/mgar/pkg/wput/trunk/Makefile Modified: csw/mgar/pkg/wput/trunk/Makefile =================================================================== --- csw/mgar/pkg/wput/trunk/Makefile 2013-05-21 19:20:58 UTC (rev 21169) +++ csw/mgar/pkg/wput/trunk/Makefile 2013-05-21 20:22:48 UTC (rev 21170) @@ -2,7 +2,7 @@ VERSION = 0.6.2 GARTYPE = v2 -DESCRIPTION = the opposite of wget: a command line ftp client +DESCRIPTION = The opposite of wget: a command line ftp client define BLURB Wput is a command-line ftp-client that looks like wget but instead of downloading, uploads files or whole directories to remote ftp-servers. @@ -16,9 +16,8 @@ LICENSE = COPYING BUILD_DEP_PKGS = CSWgnutlsdevel +RUNTIME_DEP_PKGS = CSWlibintl8 CSWlibgnutls28 -RUNTIME_DEP_PKGS = CSWggettextrt CSWgnutls CSWgcrypt - # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=141519 UPSTREAM_USE_SF = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue May 21 23:07:23 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 21 May 2013 21:07:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21171] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 21171 http://gar.svn.sourceforge.net/gar/?rev=21171&view=rev Author: bdwalton Date: 2013-05-21 21:07:23 +0000 (Tue, 21 May 2013) Log Message: ----------- php5/trunk: fully kill the fpm module stuff Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2013-05-21 20:22:48 UTC (rev 21170) +++ csw/mgar/pkg/php5/trunk/Makefile 2013-05-21 21:07:23 UTC (rev 21171) @@ -22,7 +22,6 @@ MODULATIONS_SAPI = cgi ap2 MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all -#MERGE_SCRIPTS_isa-default-sapi-fpm = copy-all # turn on the build scripts to enable/disable modules PHP5_EXT = 1 @@ -326,9 +325,6 @@ ifeq ($(SAPI),ap2) CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs endif -#ifeq ($(SAPI),fpm) -#CONFIGURE_ARGS += --enable-fpm -#endif # Disable Tests (report submitted to PHP QA) SKIPTEST = 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 May 22 11:01:58 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 May 2013 09:01:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21172] csw/mgar/pkg Message-ID: Revision: 21172 http://gar.svn.sourceforge.net/gar/?rev=21172&view=rev Author: dmichelsen Date: 2013-05-22 09:01:46 +0000 (Wed, 22 May 2013) Log Message: ----------- jbig2dec/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/jbig2dec/ csw/mgar/pkg/jbig2dec/Makefile csw/mgar/pkg/jbig2dec/branches/ csw/mgar/pkg/jbig2dec/tags/ csw/mgar/pkg/jbig2dec/trunk/ csw/mgar/pkg/jbig2dec/trunk/Makefile csw/mgar/pkg/jbig2dec/trunk/checksums csw/mgar/pkg/jbig2dec/trunk/files/ csw/mgar/pkg/jbig2dec/trunk/files/0001-Fix-test-in-testsuite.patch Added: csw/mgar/pkg/jbig2dec/Makefile =================================================================== --- csw/mgar/pkg/jbig2dec/Makefile (rev 0) +++ csw/mgar/pkg/jbig2dec/Makefile 2013-05-22 09:01:46 UTC (rev 21172) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/jbig2dec/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/jbig2dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/jbig2dec/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jbig2dec/trunk/Makefile 2013-05-22 09:01:46 UTC (rev 21172) @@ -0,0 +1,40 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = jbig2dec +VERSION = 0.11 +GARTYPE = v2 + +DESCRIPTION = Decoder implementing JBIG2 bi-level image compression + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.xz + +PATCHFILES += 0001-Fix-test-in-testsuite.patch + +VENDOR_URL = http://jbig2dec.sourceforge.net + +PACKAGES += CSWjbig2dec +SPKG_DESC_CSWjbig2dec = Decoder implementing JBIG2 bi-level image compression +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWjbig2dec += CSWlibjbig2dec0 + +PACKAGES += CSWlibjbig2dec0 +SPKG_DESC_CSWlibjbig2dec0 = Library for decoding JBIG2 bi-level images, libjbig2dec.so.0 +PKGFILES_CSWlibjbig2dec0 += $(call pkgfiles_lib,libjbig2dec.so.0) + +PACKAGES += CSWlibjbig2dec-dev +SPKG_DESC_CSWlibjbig2dec-dev = Development files for libjbig2dec.so.0 +PKGFILES_CSWlibjbig2dec-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibjbig2dec-dev += CSWlibjbig2dec0 + +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +# We need /opt/csw/bin/python for the testsuite +TEST_ENV_PATH = $(bindir):$(PATH) + +include gar/category.mk + Property changes on: csw/mgar/pkg/jbig2dec/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/jbig2dec/trunk/checksums =================================================================== --- csw/mgar/pkg/jbig2dec/trunk/checksums (rev 0) +++ csw/mgar/pkg/jbig2dec/trunk/checksums 2013-05-22 09:01:46 UTC (rev 21172) @@ -0,0 +1 @@ +4cc8ab6fb7ebe6f24460ec5ce30d84d9 jbig2dec-0.11.tar.xz Added: csw/mgar/pkg/jbig2dec/trunk/files/0001-Fix-test-in-testsuite.patch =================================================================== --- csw/mgar/pkg/jbig2dec/trunk/files/0001-Fix-test-in-testsuite.patch (rev 0) +++ csw/mgar/pkg/jbig2dec/trunk/files/0001-Fix-test-in-testsuite.patch 2013-05-22 09:01:46 UTC (rev 21172) @@ -0,0 +1,22 @@ +From 319645e8b4311a582012ea7c00211fff8ace5df6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 22 May 2013 10:51:50 +0200 +Subject: [PATCH] Fix test in testsuite + +--- + test_jbig2dec.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test_jbig2dec.py b/test_jbig2dec.py +index c6f143e..8ca3425 100755 +--- a/test_jbig2dec.py ++++ b/test_jbig2dec.py +@@ -184,4 +184,4 @@ for filename, file_hash, decode_hash in KnownFileHash.known_hashes: + # run the defined tests if we're called as a script + if __name__ == "__main__": + result = suite.run() +- sys.exit(not result) ++ sys.exit(result) +-- +1.8.1.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 Wed May 22 11:47:25 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 May 2013 09:47:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21173] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/32-bit-and-64-bit.rst Message-ID: Revision: 21173 http://gar.svn.sourceforge.net/gar/?rev=21173&view=rev Author: dmichelsen Date: 2013-05-22 09:47:24 +0000 (Wed, 22 May 2013) Log Message: ----------- opencsw-manual: Add lf64 Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst 2013-05-22 09:01:46 UTC (rev 21172) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/32-bit-and-64-bit.rst 2013-05-22 09:47:24 UTC (rev 21173) @@ -16,7 +16,8 @@ structures. One example is the ``lsof`` utility. There's also the 2G file size restriction, but it can be worked around -by adding the ``-D_LARGEFILE64_SOURCE=1`` flag to the C preprocessor. +by adding the ``-D_LARGEFILE64_SOURCE=1`` flag to the C preprocessor +as documented in `lf64(5)`. 32-bit or 64-bit ? Executables ------------------------------ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed May 22 12:11:22 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 22 May 2013 10:11:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21174] csw/mgar/pkg/autogen/trunk Message-ID: Revision: 21174 http://gar.svn.sourceforge.net/gar/?rev=21174&view=rev Author: pfelecan Date: 2013-05-22 10:11:22 +0000 (Wed, 22 May 2013) Log Message: ----------- autogen/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile csw/mgar/pkg/autogen/trunk/checksums Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2013-05-22 09:47:24 UTC (rev 21173) +++ csw/mgar/pkg/autogen/trunk/Makefile 2013-05-22 10:11:22 UTC (rev 21174) @@ -2,7 +2,7 @@ NAME = autogen -VERSION = 5.17.3 +VERSION = 5.17.4 GARTYPE = v2 DESCRIPTION = The Automated Text and Program Generation Tool @@ -23,7 +23,10 @@ GARCOMPILER = GNU # why the heck LD_OPTIONS is not used? +BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS = CSWguile-dev +BUILD_DEP_PKGS += CSWlibgc-dev +BUILD_DEP_PKGS += CSWlibgmp-dev BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibz-dev @@ -145,6 +148,7 @@ # there is one test failing (keyword.test) and I choose to ignore it # as the remaining ones pass. +# TODO: solve the issue of missing symbol references from ggettext test-custom: cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) VERBOSE=true && $(MAKE) -i -k -C $(OBJDIR) check $(MAKECOOKIE) Modified: csw/mgar/pkg/autogen/trunk/checksums =================================================================== --- csw/mgar/pkg/autogen/trunk/checksums 2013-05-22 09:47:24 UTC (rev 21173) +++ csw/mgar/pkg/autogen/trunk/checksums 2013-05-22 10:11:22 UTC (rev 21174) @@ -1 +1 @@ -2d14ced1c28f71e61bb7c58e93317a40 autogen-5.17.3.tar.gz +09f074cba57610bf4ef1147e01c8ae90 autogen-5.17.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed May 22 13:01:26 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 22 May 2013 11:01:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21175] csw/mgar/pkg/autogen/trunk/Makefile Message-ID: Revision: 21175 http://gar.svn.sourceforge.net/gar/?rev=21175&view=rev Author: pfelecan Date: 2013-05-22 11:01:25 +0000 (Wed, 22 May 2013) Log Message: ----------- autogen/trunk: remove the overrides to start from a clean slate Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2013-05-22 10:11:22 UTC (rev 21174) +++ csw/mgar/pkg/autogen/trunk/Makefile 2013-05-22 11:01:25 UTC (rev 21175) @@ -56,38 +56,6 @@ RUNTIME_DEP_PKGS_CSWautogen += CSWlibz1 RUNTIME_DEP_PKGS_CSWautogen += CSWlibintl8 CHECKPKG_OVERRIDES_CSWautogen += file-with-bad-content|/usr/share|root/opt/csw/share/autogen/mdoc2texi -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libgc.so.1|is|needed|by|/opt/csw/bin/autogen|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libgen.so.1|is|needed|by|/opt/csw/bin/autogen|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libopts.so.25 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libguile-2.0.so.22 -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libguile-2.0.so.22|is|needed|by|/opt/csw/bin/columns|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libgc.so.1|is|needed|by|/opt/csw/bin/columns|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libgen.so.1|is|needed|by|/opt/csw/bin/columns|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libopts.so.25 -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libgen.so.1|is|needed|by|/opt/csw/bin/getdefs|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/getdefs|is|not|directly|bound|to|soname|libopts.so.25 -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libz.so.1|is|needed|by|/opt/csw/bin/xml2ag|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libiconv.so.2|is|needed|by|/opt/csw/bin/xml2ag|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libgen.so.1|is|needed|by|/opt/csw/bin/xml2ag|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libxml2.so.2 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libopts.so.25 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libgc.so.1 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libgen.so.1 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libgc.so.1 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libguile-2.0.so.22 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libgen.so.1 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/getdefs|is|not|directly|bound|to|soname|libgen.so.1 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libiconv.so.2 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libz.so.1 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libgen.so.1 -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/autogen|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/columns|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/getdefs|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/xml2ag|but|never|used -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libintl.so.8 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libintl.so.8 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/getdefs|is|not|directly|bound|to|soname|libintl.so.8 -CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libintl.so.8 PACKAGES += CSWautogen-doc CATALOGNAME_CSWautogen-doc = autogen_doc @@ -109,11 +77,6 @@ OBSOLETED_BY_CSWlibopts25 = CSWautogenrt RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.12.1|is|not|directly|bound|to|soname|libgcc_s.so.1 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.12.1|is|not|directly|bound|to|soname|libgen.so.1 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.13.0|is|not|directly|bound|to|soname|libgcc_s.so.1 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.13.0|is|not|directly|bound|to|soname|libintl.so.8 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.13.0|is|not|directly|bound|to|soname|libgen.so.1 PACKAGES += CSWautogen-dev CATALOGNAME_CSWautogen-dev = autogen_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed May 22 13:19:45 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 22 May 2013 11:19:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[21176] csw/mgar/pkg/autogen/trunk/Makefile Message-ID: Revision: 21176 http://gar.svn.sourceforge.net/gar/?rev=21176&view=rev Author: pfelecan Date: 2013-05-22 11:19:44 +0000 (Wed, 22 May 2013) Log Message: ----------- autogen/trunk: add some overrides Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2013-05-22 11:01:25 UTC (rev 21175) +++ csw/mgar/pkg/autogen/trunk/Makefile 2013-05-22 11:19:44 UTC (rev 21176) @@ -56,6 +56,25 @@ RUNTIME_DEP_PKGS_CSWautogen += CSWlibz1 RUNTIME_DEP_PKGS_CSWautogen += CSWlibintl8 CHECKPKG_OVERRIDES_CSWautogen += file-with-bad-content|/usr/share|root/opt/csw/share/autogen/mdoc2texi +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libgc.so.1 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libgen.so.1 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libguile-2.0.so.22 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/autogen|is|not|directly|bound|to|soname|libopts.so.25 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libgc.so.1 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libgen.so.1 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libguile-2.0.so.22 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/columns|is|not|directly|bound|to|soname|libopts.so.25 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/getdefs|is|not|directly|bound|to|soname|libgen.so.1 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/getdefs|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/getdefs|is|not|directly|bound|to|soname|libopts.so.25 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libgen.so.1 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libiconv.so.2 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libopts.so.25 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libxml2.so.2 +CHECKPKG_OVERRIDES_CSWautogen += no-direct-binding|/opt/csw/bin/xml2ag|is|not|directly|bound|to|soname|libz.so.1 PACKAGES += CSWautogen-doc CATALOGNAME_CSWautogen-doc = autogen_doc @@ -77,6 +96,9 @@ OBSOLETED_BY_CSWlibopts25 = CSWautogenrt RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.14.0|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.14.0|is|not|directly|bound|to|soname|libgen.so.1 +CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.14.0|is|not|directly|bound|to|soname|libintl.so.8 PACKAGES += CSWautogen-dev CATALOGNAME_CSWautogen-dev = autogen_dev 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 May 22 13:21:35 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 May 2013 11:21:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21177] csw/mgar/pkg/gperf/trunk/Makefile Message-ID: Revision: 21177 http://gar.svn.sourceforge.net/gar/?rev=21177&view=rev Author: dmichelsen Date: 2013-05-22 11:21:35 +0000 (Wed, 22 May 2013) Log Message: ----------- gperf: Skip runpathes Modified Paths: -------------- csw/mgar/pkg/gperf/trunk/Makefile Modified: csw/mgar/pkg/gperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gperf/trunk/Makefile 2013-05-22 11:19:44 UTC (rev 21176) +++ csw/mgar/pkg/gperf/trunk/Makefile 2013-05-22 11:21:35 UTC (rev 21177) @@ -19,5 +19,7 @@ CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_LINKER_FLAGS += -norunpath + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed May 22 15:54:03 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 22 May 2013 13:54:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21178] csw/mgar/pkg/swig/trunk Message-ID: Revision: 21178 http://gar.svn.sourceforge.net/gar/?rev=21178&view=rev Author: cgrzemba Date: 2013-05-22 13:54:03 +0000 (Wed, 22 May 2013) Log Message: ----------- swig/trunk: upgrade to version 2.0.9 Modified Paths: -------------- csw/mgar/pkg/swig/trunk/Makefile csw/mgar/pkg/swig/trunk/checksums Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2013-05-22 11:21:35 UTC (rev 21177) +++ csw/mgar/pkg/swig/trunk/Makefile 2013-05-22 13:54:03 UTC (rev 21178) @@ -1,7 +1,7 @@ # $Id$ NAME = swig -VERSION = 2.0.4 +VERSION = 2.0.9 GARTYPE = v2 DESCRIPTION = A scripting interface generator for C/C++ code. @@ -31,10 +31,11 @@ LICENSE_CSWswig = LICENSE -RUNTIME_DEP_PKGS = CSWzlib -RUNTIME_DEP_PKGS_CSWswig += CSWlibpcre0 -RUNTIME_DEP_PKGS_CSWswig += CSWzlib +# REINPLACE_USRLOCAL += Doc/* +RUNTIME_DEP_PKGS_CSWswig += CSWlibz1 +RUNTIME_DEP_PKGS_CSWswig += CSWlibpcre1 + #SWIG doesn't DEPEND on the languages it supports being installed # but, for the record, languages we *do* have: #DEPEND += lang/tcl lang/python lang/perl lang/guile @@ -43,13 +44,15 @@ # and languages we don't have, yet: #DEPEND += lang/pike lang/chicken lang/mono lang/mzscheme +EXTRA_LINKER_FLAGS = -norunpath + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-tcl=$(prefix) # Configure finds most things, but point to a more current Java -CONFIGURE_ARGS += --with-java=/usr/j2se/bin/java -CONFIGURE_ARGS += --with-javac=/usr/j2se/bin/javac -CONFIGURE_ARGS += --with-javaincl=/usr/j2se/include +CONFIGURE_ARGS += --with-java=/usr/jdk/instances/jdk1.6.0/bin/java +CONFIGURE_ARGS += --with-javac=/usr/jdk/instances/jdk1.6.0/bin/javac +CONFIGURE_ARGS += --with-javaincl=/usr/jdk/instances/jdk1.6.0/include MAKE_ARGS += docs @@ -58,37 +61,9 @@ #SWIG doesn't DEPEND on the languages it supports being installed CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWruby|or|CSWruby18 +CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 CHECKPKG_OVERRIDES_CSWswig += missing-dependency|CSWpython -# lots of '/usr/local' in documentation and examples -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/Makefile -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/Makefile.in -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/pike/enum/README -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/tcl/index.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/python/index.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/python/libffi/Makefile -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/ruby/index.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Examples/test-suite/ocaml/makedebugtop -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Introduction.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Pike.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Ruby.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Scripting.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/SWIGDocumentation.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/CCache.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Perl5.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Library.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Tcl.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Java.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/doc/swig/Doc/Manual/Python.html -CHECKPKG_OVERRIDES_CSWswig += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ccache-swig.1 - -# not sure about these -CHECKPKG_OVERRIDES_CSWswig += bad-rpath-entry|/lib|opt/csw/bin/swig -CHECKPKG_OVERRIDES_CSWswig += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bin/swig -CHECKPKG_OVERRIDES_CSWswig += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/bin/swig -CHECKPKG_OVERRIDES_CSWswig += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bin/swig - # pkgmk can't handle spaces in filenames EXTRA_MERGE_EXCLUDE_FILES = .*test-suite/preproc_include_(d|e|f).* Modified: csw/mgar/pkg/swig/trunk/checksums =================================================================== --- csw/mgar/pkg/swig/trunk/checksums 2013-05-22 11:21:35 UTC (rev 21177) +++ csw/mgar/pkg/swig/trunk/checksums 2013-05-22 13:54:03 UTC (rev 21178) @@ -1 +1 @@ -4319c503ee3a13d2a53be9d828c3adc0 swig-2.0.4.tar.gz +54d534b14a70badc226129159412ea85 swig-2.0.9.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 May 22 16:08:00 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 May 2013 14:08:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[21179] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: Revision: 21179 http://gar.svn.sourceforge.net/gar/?rev=21179&view=rev Author: dmichelsen Date: 2013-05-22 14:07:59 +0000 (Wed, 22 May 2013) Log Message: ----------- ghostscript/trunk: Intermediate commit Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2013-05-22 13:54:03 UTC (rev 21178) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2013-05-22 14:07:59 UTC (rev 21179) @@ -11,50 +11,6 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PACKAGES = CSWghostscript -SPKG_DESC_CSWgs = PostScript and PDF interpreter - -RUNTIME_DEP_PKGS_CSWgs += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWgs += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgs += CSWlibssl0-9-8 -RUNTIME_DEP_PKGS_CSWgs += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWgs += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWgs += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWgs += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWgs += CSWlibcupsimage2 -RUNTIME_DEP_PKGS_CSWgs += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWgs += CSWlibk5crypto3 - -RUNTIME_DEP_PKGS_CSWgs += CSWfconfig -RUNTIME_DEP_PKGS_CSWgs += CSWgnutls -RUNTIME_DEP_PKGS_CSWgs += CSWgtk2 -RUNTIME_DEP_PKGS_CSWgs += CSWjpeg -RUNTIME_DEP_PKGS_CSWgs += CSWpango -RUNTIME_DEP_PKGS_CSWgs += CSWperl -RUNTIME_DEP_PKGS_CSWgs += CSWgsfonts -RUNTIME_DEP_PKGS_CSWgs += CSWjbig2dec - -# I'm dubious about this one. Maybe unnecessary? -# RUNTIME_DEP_PKGS_CSWgs += CSWlibcairo - -CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWperl -# Fonts are definitely necessary. -CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWgsfonts - -# Only docs and man pages. -CHECKPKG_OVERRIDES_CSWgs += file-with-bad-content -# Historical reasons. -CHECKPKG_OVERRIDES_CSWgs += catalogname-does-not-match-pkgname|pkgname=CSWgs|catalogname=ghostscript|expected-catalogname=gs - -# Pending release of libpaper -#RUNTIME_DEP_PKGS_CSWgs += CSWlibpaper - -# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsc -# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsx - -OSOLETED_BY_CSWghostscript += CSWgs -CATALOGNAME_CSWgs = ghostscript_stub - VENDOR_URL = http://www.ghostscript.com LICENSE = LICENSE @@ -71,30 +27,104 @@ #PATCHFILES += 0007-libidn-needs-L-opt-csw-lib.patch #PATCHFILES += 0008-Wrong-place-in-configure.patch +PACKAGES += CSWghostscript +SPKG_DESC_CSWghostscript = PostScript and PDF interpreter +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgs9 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibz1 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWghostscript += CSWjbig2dec +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibpaper1 +RUNTIME_DEP_PKGS_CSWghostscript += CSWemacs-common +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgtk-x11-2-0-0 + +# These are probably ok +CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/lprsetup.sh +CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/unix-lpr.sh +CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/lprsetup.sh +CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/unix-lpr.sh + +CHECKPKG_OVERRIDES_CSWghostscript += missing-dependency|CSWemacs-common + +# This was the old package +OBSOLETED_BY_CSWghostscript += CSWgs +CATALOGNAME_CSWgs = ghostscript_stub + +PACKAGES += CSWlibgs9 +SPKG_DESC_CSWlibgs9 = Ghostscript library, libgs.so.9 +PKGFILES_CSWlibgs9 += $(call pkgfiles_lib,libgs.so.9) +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWjbig2dec +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibpaper1 + +PACKAGES += CSWghostscript-dev +SPKG_DESC_CSWghostscript-dev = Development files for ghostscript and libgs.so.9 +PKGFILES_CSWghostscript-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibgs9 + +# Otherwise we link to the installed libgs.so in /opt/csw/lib which may have an old SONAME +#LD_OPTIONS = +#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + # Not until libcupsimage.so libcups.so libkrb5.so libk5crypto.so # libcom_err.so libkrb5support.so are 64-bit # EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx +BUILD64 = 1 +ISAEXEC = 1 + EXTRA_CFLAGS += $(LINKER_FLAGS) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic -CONFIGURE_ARGS += --enable-cups CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts -# This fails due to ghostscript using PLATFORM for internal use which gets set -# by GAR -#TEST_TARGET = +# There is no 64 bit cups ATM, see +# https://www.opencsw.org/mantis/view.php?id=5079 +CONFIGURE_ARGS-32 += --enable-cups +CONFIGURE_ARGS-64 += --disable-cups +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +# We want the shared library +BUILD_ARGS += so + +INSTALL_ARGS += soinstall + include gar/category.mk # BUILD_ARGS = std so # INSTALL_ARGS = install install-so -# Use CSW build packages instead of bundled stuff -#pre-configure: -# @(echo "~~~ Removing bundled binaries ~~~") -# rm -rf $(WORKSRC)/jpeg -# rm -rf $(WORKSRC)/jbig2dec -# rm -rf $(WORKSRC)/jasper +post-extract: + @# Ghostscript 9.07 depends on API not released in the current lcms2 2.4 + @# https://bugzilla.redhat.com/show_bug.cgi?id=912307 + @# http://list-archives.org/2013/02/14/gs-devel-ghostscript-com/ghostscript-9-07-and-ghostpdl-9-07/f/6061272699 + #rm -rf $(WORKSRC)/lcms2 + rm -rf $(WORKSRC)/zlib + rm -rf $(WORKSRC)/jpeg + rm -rf $(WORKSRC)/tiff + rm -rf $(WORKSRC)/jbig2dec + rm -rf $(WORKSRC)/libpng + rm -rf $(WORKSRC)/freetype + @$(MAKECOOKIE) + 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 May 22 16:22:51 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 May 2013 14:22:51 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[663] mirror/check_prtdiag Message-ID: <3bFx006Rjcz19X@mail.opencsw.org> Revision: 663 http://sourceforge.net/p/opencsw/code/663 Author: dmichelsen Date: 2013-05-22 14:22:49 +0000 (Wed, 22 May 2013) Log Message: ----------- check_prtdiag: Fix output Modified Paths: -------------- mirror/check_prtdiag Modified: mirror/check_prtdiag =================================================================== --- mirror/check_prtdiag 2013-05-13 10:05:11 UTC (rev 662) +++ mirror/check_prtdiag 2013-05-22 14:22:49 UTC (rev 663) @@ -369,7 +369,7 @@ if( scalar(@failed) > 0 ) { print STDERR "\n" if( $verbose ); - print STDOUT "CRITICAL - Checked $checked component".( $checked le 1 ? "" : "s").", found ".scalar(@failed)." errors : ".join(', ', at failed)."|"; + print STDOUT uc( $PROGNAME ) . " CRITICAL - Checked $checked component".( $checked le 1 ? "" : "s").", found ".scalar(@failed)." errors : ".join(', ', at failed)."|"; print STDOUT join(', ', at passed); print STDOUT "\n"; exit(2); @@ -377,13 +377,13 @@ elsif( $checked == 0 ) { print STDERR "\n" if( $verbose ); - print STDOUT "WARNING - Found nothing to check !\n"; + print STDOUT uc( $PROGNAME ) . " WARNING - Found nothing to check !\n"; exit(1); } else { print STDERR "\n" if( $verbose ); - print STDOUT "OK - Successfully checked $checked component".( $checked le 1 ? "" : "s")."|"; + print STDOUT uc( $PROGNAME ) . " OK - Successfully checked $checked component".( $checked le 1 ? "" : "s")."|"; print STDOUT join(', ', at passed); print STDOUT "\n"; exit(0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Wed May 22 22:05:32 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Wed, 22 May 2013 20:05:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21180] csw/mgar/pkg/puppet3/trunk/Makefile Message-ID: Revision: 21180 http://gar.svn.sourceforge.net/gar/?rev=21180&view=rev Author: phipsy Date: 2013-05-22 20:05:32 +0000 (Wed, 22 May 2013) Log Message: ----------- puppet3: 3.2.1 Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2013-05-22 14:07:59 UTC (rev 21179) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2013-05-22 20:05:32 UTC (rev 21180) @@ -3,7 +3,7 @@ # $Id$ NAME = puppet3 -VERSION = 3.1.1 +VERSION = 3.2.1 GARTYPE = v2 define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Wed May 22 22:07:56 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Wed, 22 May 2013 20:07:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21181] csw/mgar/pkg/puppet3/trunk/checksums Message-ID: Revision: 21181 http://gar.svn.sourceforge.net/gar/?rev=21181&view=rev Author: phipsy Date: 2013-05-22 20:07:55 +0000 (Wed, 22 May 2013) Log Message: ----------- puppet3: checksums Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/checksums Modified: csw/mgar/pkg/puppet3/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet3/trunk/checksums 2013-05-22 20:05:32 UTC (rev 21180) +++ csw/mgar/pkg/puppet3/trunk/checksums 2013-05-22 20:07:55 UTC (rev 21181) @@ -1,3 +1,4 @@ 2117e3a1964ac54fcd36d926eed3db94 puppet-3.0.1.tar.gz 4cbdcc9dfcda677c820175375a500651 puppet-3.1.0.tar.gz e942079612703a460a9fdb52e6bcae4a puppet-3.1.1.tar.gz +a9bce4fe7a68aebcb6e97256e7faac5b puppet-3.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Wed May 22 22:23:39 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Wed, 22 May 2013 20:23:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21182] csw/mgar/pkg/facter/trunk Message-ID: Revision: 21182 http://gar.svn.sourceforge.net/gar/?rev=21182&view=rev Author: phipsy Date: 2013-05-22 20:23:37 +0000 (Wed, 22 May 2013) Log Message: ----------- facter: 1.7.1 Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2013-05-22 20:07:55 UTC (rev 21181) +++ csw/mgar/pkg/facter/trunk/Makefile 2013-05-22 20:23:37 UTC (rev 21182) @@ -3,7 +3,7 @@ # $Id$ NAME = facter -VERSION = 1.6.18 +VERSION = 1.7.1 GARTYPE = v2 DESCRIPTION = A system fact gatherer Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2013-05-22 20:07:55 UTC (rev 21181) +++ csw/mgar/pkg/facter/trunk/checksums 2013-05-22 20:23:37 UTC (rev 21182) @@ -8,3 +8,4 @@ 573bf01ff662f4a3391a7e558b91d65d facter-1.6.12.tar.gz b6c3df8ad1781c10d30785c58a4504ef facter-1.6.14.tar.gz c209df5909ccd4112c19cf4b535027a7 facter-1.6.18.tar.gz +fed2e78a44324505adfc7c6c09ca30f4 facter-1.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 22 23:33:13 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 22 May 2013 21:33:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21183] csw/mgar/pkg/libcurl4/branches/curl-7.30.0/ Message-ID: Revision: 21183 http://gar.svn.sourceforge.net/gar/?rev=21183&view=rev Author: bdwalton Date: 2013-05-22 21:33:12 +0000 (Wed, 22 May 2013) Log Message: ----------- branch to work on the auto* tools problem with 7.30.0 Added Paths: ----------- csw/mgar/pkg/libcurl4/branches/curl-7.30.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed May 22 23:35:38 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 22 May 2013 21:35:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21184] csw/mgar/pkg/libcurl4/branches/curl-7.30.0 Message-ID: Revision: 21184 http://gar.svn.sourceforge.net/gar/?rev=21184&view=rev Author: bdwalton Date: 2013-05-22 21:35:38 +0000 (Wed, 22 May 2013) Log Message: ----------- libcurl4/branches/curl-7.30.0: version bump to 7.30.0 Modified Paths: -------------- csw/mgar/pkg/libcurl4/branches/curl-7.30.0/Makefile csw/mgar/pkg/libcurl4/branches/curl-7.30.0/checksums Modified: csw/mgar/pkg/libcurl4/branches/curl-7.30.0/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/branches/curl-7.30.0/Makefile 2013-05-22 21:33:12 UTC (rev 21183) +++ csw/mgar/pkg/libcurl4/branches/curl-7.30.0/Makefile 2013-05-22 21:35:38 UTC (rev 21184) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.28.1 +VERSION = 7.30.0 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers Modified: csw/mgar/pkg/libcurl4/branches/curl-7.30.0/checksums =================================================================== --- csw/mgar/pkg/libcurl4/branches/curl-7.30.0/checksums 2013-05-22 21:33:12 UTC (rev 21183) +++ csw/mgar/pkg/libcurl4/branches/curl-7.30.0/checksums 2013-05-22 21:35:38 UTC (rev 21184) @@ -1 +1 @@ -b716ab1103fd4bef99b98f5ff2c7b638 curl-7.28.1.tar.lzma +e47049eaabfbed194bef7ae4960fdc37 curl-7.30.0.tar.lzma 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 May 23 15:24:04 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 May 2013 13:24:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[21185] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 21185 http://gar.svn.sourceforge.net/gar/?rev=21185&view=rev Author: dmichelsen Date: 2013-05-23 13:24:03 +0000 (Thu, 23 May 2013) Log Message: ----------- rrdtool/trunk: Update to 1.4.8 Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/checksums Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2013-05-22 21:35:38 UTC (rev 21184) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2013-05-23 13:24:03 UTC (rev 21185) @@ -1,5 +1,5 @@ NAME = rrdtool -VERSION = 1.4.7 +VERSION = 1.4.8 GARTYPE = v2 DESCRIPTION = Time-series data logging and graphing @@ -41,7 +41,6 @@ RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibwrap1 -RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibdbi1 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4 OBSOLETED_BY_CSWrrdtool = CSWrrd @@ -62,15 +61,11 @@ RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1 PACKAGES += CSWlibrrd-th4 SPKG_DESC_CSWlibrrd-th4 = Runtime library for RRDtool, librrd_th.so.4 PKGFILES_CSWlibrrd-th4 += $(call pkgfiles_lib,librrd_th.so.4) -RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibwrap1 -RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2013-05-22 21:35:38 UTC (rev 21184) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2013-05-23 13:24:03 UTC (rev 21185) @@ -1 +1 @@ -ffe369d8921b4dfdeaaf43812100c38f rrdtool-1.4.7.tar.gz +dbe59386db97fd2f2216729facd74ca8 rrdtool-1.4.8.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 May 23 18:22:23 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 May 2013 16:22:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21186] csw/mgar/pkg/erlang/trunk Message-ID: Revision: 21186 http://gar.svn.sourceforge.net/gar/?rev=21186&view=rev Author: dmichelsen Date: 2013-05-23 16:22:20 +0000 (Thu, 23 May 2013) Log Message: ----------- erlang/trunk: Update to R16B Modified Paths: -------------- csw/mgar/pkg/erlang/trunk/Makefile csw/mgar/pkg/erlang/trunk/checksums Added Paths: ----------- csw/mgar/pkg/erlang/trunk/files/0001-Fix-main-signature.patch Modified: csw/mgar/pkg/erlang/trunk/Makefile =================================================================== --- csw/mgar/pkg/erlang/trunk/Makefile 2013-05-23 13:24:03 UTC (rev 21185) +++ csw/mgar/pkg/erlang/trunk/Makefile 2013-05-23 16:22:20 UTC (rev 21186) @@ -1,6 +1,6 @@ # $Id$ NAME = erlang -VERSION = R15B02 +VERSION = R16B GARTYPE = v2 DESCRIPTION = A functional programming language from Ericsson @@ -15,9 +15,12 @@ DISTNAME = otp_src_$(VERSION) DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Fix-main-signature.patch + # TBD: # - Solaris 10 x86 needs a libdlpi.so symlink: # ln -s /lib/libdlpi.so.1 /lib/libdlpi.so +# Solaris patches needed 145923-03 (sparc) or 145924-03 (i386) # We want DTrace PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -26,8 +29,8 @@ PACKAGES += CSWerlang SPKG_DESC_CSWerlang = A functional programming language from Ericsson -RUNTIME_DEP_PKGS_CSWerlang += CSWemacscommon RUNTIME_DEP_PKGS_CSWerlang += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWerlang += CSWlibssl1-0-0 PACKAGES += CSWerlang-dev SPKG_DESC_CSWerlang-dev = Ericson Erlang OTP library sources and headers Modified: csw/mgar/pkg/erlang/trunk/checksums =================================================================== --- csw/mgar/pkg/erlang/trunk/checksums 2013-05-23 13:24:03 UTC (rev 21185) +++ csw/mgar/pkg/erlang/trunk/checksums 2013-05-23 16:22:20 UTC (rev 21186) @@ -1 +1 @@ -ccbe5e032a2afe2390de8913bfe737a1 otp_src_R15B02.tar.gz +7ee131515bc496e7522e0dec2a4c26e3 otp_src_R16B.tar.gz Added: csw/mgar/pkg/erlang/trunk/files/0001-Fix-main-signature.patch =================================================================== --- csw/mgar/pkg/erlang/trunk/files/0001-Fix-main-signature.patch (rev 0) +++ csw/mgar/pkg/erlang/trunk/files/0001-Fix-main-signature.patch 2013-05-23 16:22:20 UTC (rev 21186) @@ -0,0 +1,48 @@ +From 22d2c18e2b5df4a56267748c972993e26c715595 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 23 May 2013 16:25:11 +0200 +Subject: [PATCH] Fix main signature + +--- + lib/os_mon/c_src/ferrule.c | 2 +- + lib/os_mon/c_src/mod_syslog.c | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/lib/os_mon/c_src/ferrule.c b/lib/os_mon/c_src/ferrule.c +index 744f302..f22f750 100644 +--- a/lib/os_mon/c_src/ferrule.c ++++ b/lib/os_mon/c_src/ferrule.c +@@ -50,7 +50,7 @@ + #define FDS_STDIN 0 + #define FDS_PIPE 1 + +-main(int argc, char *argv[]) ++int main(int argc, char *argv[]) + /* usage: ferrule ownpath */ + { + int i, pipe_fd; +diff --git a/lib/os_mon/c_src/mod_syslog.c b/lib/os_mon/c_src/mod_syslog.c +index 87fbfba..6f8b566 100644 +--- a/lib/os_mon/c_src/mod_syslog.c ++++ b/lib/os_mon/c_src/mod_syslog.c +@@ -47,7 +47,7 @@ + #define TRUE 1 + #define WAIT 1 + +-main(int argc, char *argv[]) ++int main(int argc, char *argv[]) + /* usage: mod_syslog mode ownpath syslogconf */ + { + int syslogd_pid, n_lines_copied=0; +@@ -128,6 +128,8 @@ main(int argc, char *argv[]) + make_exit(PIPE_NOT_FOUND); + else */ + make_exit(OK); ++ ++ return 0; + } + + void make_exit(int exit_code) +-- +1.8.1.4 + 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 May 23 18:59:25 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 23 May 2013 16:59:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21187] csw/mgar/pkg/samba/branches/samba3 Message-ID: Revision: 21187 http://gar.svn.sourceforge.net/gar/?rev=21187&view=rev Author: lblume Date: 2013-05-23 16:59:24 +0000 (Thu, 23 May 2013) Log Message: ----------- samba/branches/samba3: Bump to 3.6.15 Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile csw/mgar/pkg/samba/branches/samba3/checksums Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-05-23 16:22:20 UTC (rev 21186) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-05-23 16:59:24 UTC (rev 21187) @@ -1,8 +1,8 @@ # TBD: # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time -NAME = samba -VERSION = 3.6.14 +NAME = samba +VERSION = 3.6.15 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) Modified: csw/mgar/pkg/samba/branches/samba3/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba3/checksums 2013-05-23 16:22:20 UTC (rev 21186) +++ csw/mgar/pkg/samba/branches/samba3/checksums 2013-05-23 16:59:24 UTC (rev 21187) @@ -1 +1 @@ -ce9bf35ac2a63029ef0bd02291f113df samba-3.6.14.tar.gz +d9424e9badb089bd51e6cfc752b21dfa samba-3.6.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 24 16:19:45 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 May 2013 14:19:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[21188] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 21188 http://gar.svn.sourceforge.net/gar/?rev=21188&view=rev Author: dmichelsen Date: 2013-05-24 14:19:42 +0000 (Fri, 24 May 2013) Log Message: ----------- libxml2/trunk: Update to 2.9.1, some tests failing Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/checksums csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-23 16:59:24 UTC (rev 21187) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-24 14:19:42 UTC (rev 21188) @@ -1,5 +1,5 @@ NAME = libxml2 -VERSION = 2.7.8 +VERSION = 2.9.1 GARTYPE = v2 DESCRIPTION = XML Parser Library @@ -9,7 +9,7 @@ MASTER_SITES = ftp://xmlsoft.org/libxml2/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = 0001-Forcefully-disable-the-symbol-versioning.patch +# PATCHFILES = 0001-Forcefully-disable-the-symbol-versioning.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2013-05-23 16:59:24 UTC (rev 21187) +++ csw/mgar/pkg/libxml2/trunk/checksums 2013-05-24 14:19:42 UTC (rev 21188) @@ -1 +1 @@ -8127a65e8c3b08856093099b52599c86 libxml2-2.7.8.tar.gz +9c0cfef285d5c4a5c80d00904ddab380 libxml2-2.9.1.tar.gz Modified: csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch 2013-05-23 16:59:24 UTC (rev 21187) +++ csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch 2013-05-24 14:19:42 UTC (rev 21188) @@ -1,18 +1,17 @@ -From 022f9c9f9f02233f175bd6c1d604072b82790c3f Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 3 Aug 2011 03:28:15 +0200 +From 8a1c3cdecc3befbe22961b78e4e2c107fce8a198 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 24 May 2013 15:18:01 +0200 Subject: [PATCH] Forcefully disable the symbol versioning -Signed-off-by: Ben Walton --- - configure | 11 +++-------- - 1 files changed, 3 insertions(+), 8 deletions(-) + configure | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index 605e8c4..068295c 100755 +index 80dd0fc..6203fd0 100755 --- a/configure +++ b/configure -@@ -11410,17 +11410,12 @@ if test "$lt_cv_prog_gnu_ld" = yes; then +@@ -11876,17 +11876,12 @@ if test "$lt_cv_prog_gnu_ld" = yes; then VERSION_SCRIPT_FLAGS=-Wl,--version-script= else case $host in @@ -21,7 +20,7 @@ esac fi -- if test -z "$VERSION_SCRIPT_FLAGS"; then +- if test -n "$VERSION_SCRIPT_FLAGS"; then - USE_VERSION_SCRIPT_TRUE= - USE_VERSION_SCRIPT_FALSE='#' -else @@ -34,5 +33,5 @@ -- -1.7.6 +1.8.1.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 Fri May 24 16:22:36 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 May 2013 14:22:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21189] csw/mgar/pkg/erlang/trunk Message-ID: Revision: 21189 http://gar.svn.sourceforge.net/gar/?rev=21189&view=rev Author: dmichelsen Date: 2013-05-24 14:22:36 +0000 (Fri, 24 May 2013) Log Message: ----------- erlang/trunk: More fixes Modified Paths: -------------- csw/mgar/pkg/erlang/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/erlang/trunk/files/0001-Do-not-use-ssl-standard-locations.patch Modified: csw/mgar/pkg/erlang/trunk/Makefile =================================================================== --- csw/mgar/pkg/erlang/trunk/Makefile 2013-05-24 14:19:42 UTC (rev 21188) +++ csw/mgar/pkg/erlang/trunk/Makefile 2013-05-24 14:22:36 UTC (rev 21189) @@ -17,6 +17,8 @@ PATCHFILES += 0001-Fix-main-signature.patch +PATCHFILES += 0001-Do-not-use-ssl-standard-locations.patch + # TBD: # - Solaris 10 x86 needs a libdlpi.so symlink: # ln -s /lib/libdlpi.so.1 /lib/libdlpi.so @@ -32,16 +34,28 @@ RUNTIME_DEP_PKGS_CSWerlang += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWerlang += CSWlibssl1-0-0 +# These are just examples +CHECKPKG_OVERRIDES_CSWerlang += file-with-bad-content + +# This is just for the emacs style +CHECKPKG_OVERRIDES_CSWerlang += missing-dependency|CSWemacs-common + + PACKAGES += CSWerlang-dev SPKG_DESC_CSWerlang-dev = Ericson Erlang OTP library sources and headers -PKGFILES_CSWerlang-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWerlang-dev += .*/src/.* +PKGFILES_CSWerlang-dev += .*/include/.* +PKGFILES_CSWerlang-dev += $(mandir)/man3erl/.* OBSOLETED_BY_CSWerlang-dev = CSWerlangdevel CATALOGNAME_CSWerlangdevel = erlang_devel_stub +CHECKPKG_OVERRIDES_CSWerlang-dev += file-with-bad-content + PACKAGES += CSWerlang-doc SPKG_DESC_CSWerlang-doc = Erlang manual and documentation # This is empty right now, make sure docs are build later... -PKGFILES_CSWerlang-doc += $(docdir)/.* +PKGFILES_CSWerlang-doc += .*/doc/.* +PKGFILES_CSWerlang-doc += .*/info OBSOLETED_BY_CSWerlang-doc = CSWerlangdoc CATALOGNAME_CSWerlangdoc = erlang_doc_stub @@ -49,13 +63,16 @@ # $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) BUILD64 = 1 +ISAEXEC = 1 # [8:23pm] aurora: LDFLAGS="-L/opt/csw/lib/64" CFLAGS="-I/opt/csw/include" CXXFLAGS="-I/opt/csw/include" AR=gar ./configure --with-ssl=/opt/csw --disable-dynamic-ssl-lib --enable-m64-build --with-odbc=/opt/csw --without-wx CONFIGURE_ARGS = $(DIRPATHS) + CONFIGURE_ARGS += --with-ssl=$(prefix) - CONFIGURE_ARGS += --disable-dynamic-ssl-lib - CONFIGURE_ARGS += --without-wx +#CONFIGURE_ARGS += --disable-dynamic-ssl-lib + +CONFIGURE_ARGS += --without-wx #CONFIGURE_ARGS += --enable-threads #CONFIGURE_ARGS += --enable-smp-support #CONFIGURE_ARGS += --enable-kernel-poll @@ -68,6 +85,9 @@ CONFIGURE_ARGS-64 += --enable-m64-build CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +# We need to override this or we pollute RUNPATH with lots of invalid dirs like /usr/local etc. +CONFIGURE_ARGS += std_ssl_locations= + EXTRA_CONFIGURE_ENV += AR=$(bindir)/gar # On Solaris 10 i386 enabling hipe leads to Added: csw/mgar/pkg/erlang/trunk/files/0001-Do-not-use-ssl-standard-locations.patch =================================================================== --- csw/mgar/pkg/erlang/trunk/files/0001-Do-not-use-ssl-standard-locations.patch (rev 0) +++ csw/mgar/pkg/erlang/trunk/files/0001-Do-not-use-ssl-standard-locations.patch 2013-05-24 14:22:36 UTC (rev 21189) @@ -0,0 +1,25 @@ +From 91bfc9c834ca9222ddde8f4c48dca6d8384cbf4c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 24 May 2013 11:49:59 +0200 +Subject: [PATCH] Do not use ssl standard locations + +--- + erts/configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/erts/configure b/erts/configure +index b6ec8ae..29223a4 100755 +--- a/erts/configure ++++ b/erts/configure +@@ -36959,7 +36959,7 @@ fi + + + +-std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl" ++#std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl" + + + # Check whether --with-ssl-zlib or --without-ssl-zlib was given. +-- +1.8.1.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 Fri May 24 16:37:13 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 May 2013 14:37:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21190] csw/mgar/pkg/libxslt/trunk Message-ID: Revision: 21190 http://gar.svn.sourceforge.net/gar/?rev=21190&view=rev Author: dmichelsen Date: 2013-05-24 14:37:12 +0000 (Fri, 24 May 2013) Log Message: ----------- libxslt/trunk: Update to 1.1.28 Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile csw/mgar/pkg/libxslt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script.patch Removed Paths: ------------- csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2013-05-24 14:22:36 UTC (rev 21189) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2013-05-24 14:37:12 UTC (rev 21190) @@ -1,5 +1,5 @@ NAME = libxslt -VERSION = 1.1.26 +VERSION = 1.1.28 GARTYPE = v2 DESCRIPTION = XSLT engine for the XML Toolkit @@ -10,20 +10,17 @@ MASTER_SITES = ftp://xmlsoft.org/libxslt/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES += 0001-Forcefully-disable-version-script-use.patch +PATCHFILES += 0001-Forcefully-disable-version-script.patch BUILD_DEP_PKGS = CSWlibxml2-dev CSWlibgcrypt-dev PACKAGES = CSWlibxslt SPKG_DESC_CSWlibxslt = XSLT engine runtime package -CATALOGNAME_CSWlibxslt = libxslt -RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibgcrypt11 CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWlibxslt += CSWiconv CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibxslt += CSWzlib -RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0 +RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibexslt0 PACKAGES += CSWlibxslt-dev -CATALOGNAME_CSWlibxslt-dev = libxslt_dev SPKG_DESC_CSWlibxslt-dev = XSLT engine development package OBSOLETED_BY_CSWlibxslt-dev = CSWlibxsltdevel RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt @@ -35,48 +32,40 @@ PKGFILES_CSWlibxslt-dev += $(call isadirs,$(libdir),xsltConf.sh) PACKAGES += CSWpy-libxslt -CATALOGNAME_CSWpy-libxslt = py_libxslt SPKG_DESC_CSWpy-libxslt = XSLT engine python package OBSOLETED_BY_CSWpy-libxslt = CSWpylibxslt -RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWpython RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibgcrypt11 -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWiconv PKGFILES_CSWpy-libxslt = $(libdir)/python.* PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.* +# Sadly, yes.... +CHECKPKG_OVERRIDES_CSWpy-libxslt += 64bits-binaries-missing + PACKAGES += CSWlibexslt0 -CATALOGNAME_CSWlibexslt0 = libexslt0 -PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0\.8\.15) -PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0(\.\d+)*) +PKGFILES_CSWlibexslt0 += $(call pkgfiles_lib,libexslt.so.0) SPKG_DESC_CSWlibexslt0 += XSLT engine runtime package, libexslt.so.0 -RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWiconv RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWzlib RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgcrypt11 PACKAGES += CSWlibxslt1 -CATALOGNAME_CSWlibxslt1 = libxslt1 -PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1\.1\.26) -PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1(\.\d+)*) +PKGFILES_CSWlibxslt1 += $(call pkgfiles_lib,libxslt.so.1) SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1 RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWiconv -RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWzlib SPKG_SOURCEURL = http://xmlsoft.org/XSLT/ CONFIGURE_ARGS_32 = CONFIGURE_ARGS_64 = --without-python CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) -BUILD64_LIBS_ONLY = 1 -STRIP_LIBTOOL = 1 +BUILD64 = 1 +ISAEXEC = 1 + PYCOMPILE = 1 include gar/category.mk Modified: csw/mgar/pkg/libxslt/trunk/checksums =================================================================== --- csw/mgar/pkg/libxslt/trunk/checksums 2013-05-24 14:22:36 UTC (rev 21189) +++ csw/mgar/pkg/libxslt/trunk/checksums 2013-05-24 14:37:12 UTC (rev 21190) @@ -1 +1 @@ -e61d0364a30146aaa3001296f853b2b9 libxslt-1.1.26.tar.gz +9667bf6f9310b957254fdcf6596600b7 libxslt-1.1.28.tar.gz Deleted: csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch 2013-05-24 14:22:36 UTC (rev 21189) +++ csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch 2013-05-24 14:37:12 UTC (rev 21190) @@ -1,28 +0,0 @@ -From ab7627feedff611e438f7a31fa27c7b0a8a3be96 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sat, 9 Oct 2010 03:56:15 +0200 -Subject: [PATCH] Forcefully disable version script use. - -Signed-off-by: Ben Walton ---- - libxslt/Makefile.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libxslt/Makefile.in b/libxslt/Makefile.in -index 8cba338..c163255 100644 ---- a/libxslt/Makefile.in -+++ b/libxslt/Makefile.in -@@ -327,8 +327,8 @@ libxslt_la_SOURCES = \ - xsltwin32config.h.in \ - libxslt.h - -- at USE_VERSION_SCRIPT_FALSE@LIBXSLT_VERSION_SCRIPT = -- at USE_VERSION_SCRIPT_TRUE@LIBXSLT_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxslt.syms -+LIBXSLT_VERSION_SCRIPT = -+ - libxslt_la_LIBADD = $(EXTRA_LIBS) - libxslt_la_LDFLAGS = \ - $(WIN32_EXTRA_LDFLAGS) \ --- -1.7.3 - Copied: csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script.patch (from rev 20894, csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch) =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script.patch (rev 0) +++ csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script.patch 2013-05-24 14:37:12 UTC (rev 21190) @@ -0,0 +1,26 @@ +From c82c1c5147f1d989b7967a4e9798b5457d7f1f28 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 24 May 2013 15:13:49 +0200 +Subject: [PATCH] Forcefully disable version script + +--- + libxslt/Makefile.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libxslt/Makefile.in b/libxslt/Makefile.in +index e0a998b..f070844 100644 +--- a/libxslt/Makefile.in ++++ b/libxslt/Makefile.in +@@ -375,8 +375,7 @@ libxslt_la_SOURCES = \ + xsltwin32config.h.in \ + libxslt.h + +- at USE_VERSION_SCRIPT_FALSE@LIBXSLT_VERSION_SCRIPT = +- at USE_VERSION_SCRIPT_TRUE@LIBXSLT_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxslt.syms ++LIBXSLT_VERSION_SCRIPT = + libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) + libxslt_la_LDFLAGS = \ + $(WIN32_EXTRA_LDFLAGS) \ +-- +1.8.1.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 Fri May 24 17:10:51 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 May 2013 15:10:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21191] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: Revision: 21191 http://gar.svn.sourceforge.net/gar/?rev=21191&view=rev Author: dmichelsen Date: 2013-05-24 15:10:50 +0000 (Fri, 24 May 2013) Log Message: ----------- ghostscript/trunk: Cleanup Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2013-05-24 14:37:12 UTC (rev 21190) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2013-05-24 15:10:50 UTC (rev 21191) @@ -81,20 +81,9 @@ PKGFILES_CSWghostscript-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibgs9 -# Otherwise we link to the installed libgs.so in /opt/csw/lib which may have an old SONAME -#LD_OPTIONS = -#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) - -# Not until libcupsimage.so libcups.so libkrb5.so libk5crypto.so -# libcom_err.so libkrb5support.so are 64-bit - -# EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx - BUILD64 = 1 ISAEXEC = 1 -EXTRA_CFLAGS += $(LINKER_FLAGS) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts @@ -108,13 +97,15 @@ # We want the shared library BUILD_ARGS += so +# This is needed because libidn.so and libpaper.so are not linked with LDFLAGS set +BUILD_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))" + +TEST_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))" + INSTALL_ARGS += soinstall include gar/category.mk -# BUILD_ARGS = std so -# INSTALL_ARGS = install install-so - post-extract: @# Ghostscript 9.07 depends on API not released in the current lcms2 2.4 @# https://bugzilla.redhat.com/show_bug.cgi?id=912307 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 May 24 20:55:57 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 24 May 2013 18:55:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21192] csw/mgar/pkg/samba/branches/samba3/files/cswsamba Message-ID: Revision: 21192 http://gar.svn.sourceforge.net/gar/?rev=21192&view=rev Author: lblume Date: 2013-05-24 18:55:55 +0000 (Fri, 24 May 2013) Log Message: ----------- samba/branches/samba3: Increase ulimit -n on start Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/files/cswsamba Modified: csw/mgar/pkg/samba/branches/samba3/files/cswsamba =================================================================== --- csw/mgar/pkg/samba/branches/samba3/files/cswsamba 2013-05-24 15:10:50 UTC (rev 21191) +++ csw/mgar/pkg/samba/branches/samba3/files/cswsamba 2013-05-24 18:55:55 UTC (rev 21192) @@ -13,6 +13,9 @@ case "$1" in start) + # Increase the max number of open files to what Samba likes + ulimit -S -n 16384 + if [ -f $SMBCONF ]; then echo "Starting samba..." @sbindir@/nmbd -D This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 25 09:39:18 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 25 May 2013 07:39:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[21193] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 21193 http://gar.svn.sourceforge.net/gar/?rev=21193&view=rev Author: wahwah Date: 2013-05-25 07:39:14 +0000 (Sat, 25 May 2013) Log Message: ----------- update the patch. sadly, the test suite fails. Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch Property Changed: ---------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-24 18:55:55 UTC (rev 21192) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-25 07:39:14 UTC (rev 21193) @@ -1,3 +1,7 @@ +# $Id$ +# +# ! There are test failures, unfortunately. + NAME = libxml2 VERSION = 2.9.1 GARTYPE = v2 @@ -11,9 +15,6 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz # PATCHFILES = 0001-Forcefully-disable-the-symbol-versioning.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - PACKAGES = CSWlibxml2-2 CSWlibxml2-dev CSWpy-libxml2 OBSOLETED_BY_CSWlibxml2-2 = CSWlibxml2 Property changes on: csw/mgar/pkg/libxml2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch 2013-05-24 18:55:55 UTC (rev 21192) +++ csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch 2013-05-25 07:39:14 UTC (rev 21193) @@ -1,17 +1,17 @@ -From 8a1c3cdecc3befbe22961b78e4e2c107fce8a198 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 24 May 2013 15:18:01 +0200 -Subject: [PATCH] Forcefully disable the symbol versioning +From 43f2a579cd9808557fa2d8ce4d5f5b6f94d627b0 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 25 May 2013 09:07:33 +0200 +Subject: [PATCH] Forcefully disable the symbol versioning 2 --- - configure | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) + configure | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/configure b/configure -index 80dd0fc..6203fd0 100755 +index 80dd0fc..f314402 100755 --- a/configure +++ b/configure -@@ -11876,17 +11876,12 @@ if test "$lt_cv_prog_gnu_ld" = yes; then +@@ -11876,18 +11876,10 @@ if test "$lt_cv_prog_gnu_ld" = yes; then VERSION_SCRIPT_FLAGS=-Wl,--version-script= else case $host in @@ -27,11 +27,10 @@ - USE_VERSION_SCRIPT_TRUE='#' - USE_VERSION_SCRIPT_FALSE= -fi -+USE_VERSION_SCRIPT_TRUE='#' -+USE_VERSION_SCRIPT_FALSE= +- - + _cppflags="${CPPFLAGS}" -- 1.8.1.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 25 13:14:51 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 25 May 2013 11:14:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21194] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 21194 http://gar.svn.sourceforge.net/gar/?rev=21194&view=rev Author: wahwah Date: 2013-05-25 11:14:50 +0000 (Sat, 25 May 2013) Log Message: ----------- libxml2/trunk: Group recipe lines by package Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-25 07:39:14 UTC (rev 21193) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-25 11:14:50 UTC (rev 21194) @@ -12,64 +12,61 @@ endef MASTER_SITES = ftp://xmlsoft.org/libxml2/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz # PATCHFILES = 0001-Forcefully-disable-the-symbol-versioning.patch -PACKAGES = CSWlibxml2-2 CSWlibxml2-dev CSWpy-libxml2 +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw -OBSOLETED_BY_CSWlibxml2-2 = CSWlibxml2 -OBSOLETED_BY_CSWpy-libxml2 = CSWpylibxml2 -OBSOLETED_BY_CSWlibxml2-dev = CSWlibxml2devel +EXTRA_CPPFLAGS = -DXML_XML_DEFAULT_CATALOG=\\\"$(sysconfdir)/xml/catalog\\\" +EXTRA_CPPFLAGS += -DXML_SGML_DEFAULT_CATALOG=\\\"$(sysconfdir)/sgml/catalog\\\" -CATALOGNAME_CSWlibxml2-2 = libxml2_2 -CATALOGNAME_CSWlibxml2-dev = libxml2_dev -CATALOGNAME_CSWpy-libxml2 = py_libxml2 - -SPKG_DESC_CSWlibxml2-2 = XML Parser Library -SPKG_DESC_CSWlibxml2-dev = XML Parser Library Developer Files -SPKG_DESC_CSWpy-libxml2 = XML Parser Library Python Bindings - -RUNTIME_DEP_PKGS_CSWlibxml2-2 = CSWiconv CSWzlib -RUNTIME_DEP_PKGS_CSWlibxml2-dev = CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWpy-libxml2 = CSWlibpython2-6-1-0 CSWpython CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWiconv CSWzlib - # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(prefix) CONFIGURE_ARGS_64 = --without-python -EXTRA_CPPFLAGS = -DXML_XML_DEFAULT_CATALOG=\\\"$(sysconfdir)/xml/catalog\\\" -EXTRA_CPPFLAGS += -DXML_SGML_DEFAULT_CATALOG=\\\"$(sysconfdir)/sgml/catalog\\\" - CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) -BUILD64 = 1 +BUILD64_LIBS_ONLY = 1 PYCOMPILE = 1 STRIP_LIBTOOL = 1 -# Skip 64 bit binaries - they are just big and gain nothing -MERGE_SCRIPTS_isa-default64 = copy-relocated-only copy-config-only -MERGE_DIRS_isa-default64 = $(libdir) +PACKAGES += CSWlibxml2-2 +OBSOLETED_BY_CSWlibxml2-2 = CSWlibxml2 +SPKG_DESC_CSWlibxml2-2 = XML Parser Library +RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWliblzma5 +RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWlibz1 +# The catch-all package. -EXTRA_PAX_ARGS = -s ",^\.$(docdir)/libxml2-$(VERSION),.$(docdir)/libxml2,p" -EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(VERSION),.$(docdir)/pylibxml2,p" -EXTRA_PAX_ARGS += -s ",^\.$(libdir)/python[^/]*,.$(libdir)/python,p" - +PACKAGES += CSWlibxml2-dev +OBSOLETED_BY_CSWlibxml2-dev = CSWlibxml2devel +SPKG_DESC_CSWlibxml2-dev = XML Parser Library Developer Files +RUNTIME_DEP_PKGS_CSWlibxml2-dev = CSWlibxml2-2 PKGFILES_CSWlibxml2-dev = $(PKGFILES_DEVEL) PKGFILES_CSWlibxml2-dev += $(docdir)/libxml2/.* PKGFILES_CSWlibxml2-dev += $(sharedstatedir)/gtk-doc/.* PKGFILES_CSWlibxml2-dev += $(libdir)/xml2Conf.sh PKGFILES_CSWlibxml2-dev += $(call isadirs,$(libdir),xml2Conf.sh) +PACKAGES += CSWpy-libxml2 +OBSOLETED_BY_CSWpy-libxml2 = CSWpylibxml2 +SPKG_DESC_CSWpy-libxml2 = XML Parser Library Python Bindings +RUNTIME_DEP_PKGS_CSWpy-libxml2 = CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWpython +RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWlibxml2-2 PKGFILES_CSWpy-libxml2 = $(libdir)/python/.* PKGFILES_CSWpy-libxml2 += $(docdir)/pylibxml2/.* +EXTRA_PAX_ARGS = -s ",^\.$(docdir)/libxml2-$(VERSION),.$(docdir)/libxml2,p" +EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(VERSION),.$(docdir)/pylibxml2,p" +EXTRA_PAX_ARGS += -s ",^\.$(libdir)/python[^/]*,.$(libdir)/python,p" + CHECKPKG_OVERRIDES_CSWlibxml2-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/libxml2/html/xml.html -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw +# http://lists.opencsw.org/pipermail/maintainers/2011-August/015093.html +SKIPTEST = 1 include gar/category.mk - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 25 14:23:35 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 25 May 2013 12:23:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21195] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 21195 http://gar.svn.sourceforge.net/gar/?rev=21195&view=rev Author: wahwah Date: 2013-05-25 12:23:35 +0000 (Sat, 25 May 2013) Log Message: ----------- libxml2/trunk: There is no 64-bit python Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-25 11:14:50 UTC (rev 21194) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-25 12:23:35 UTC (rev 21195) @@ -59,6 +59,8 @@ RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWlibxml2-2 PKGFILES_CSWpy-libxml2 = $(libdir)/python/.* PKGFILES_CSWpy-libxml2 += $(docdir)/pylibxml2/.* +# There is no 64-bit Python. +CHECKPKG_OVERRIDES_CSWpy-libxml2 += 64bits-binaries-missing EXTRA_PAX_ARGS = -s ",^\.$(docdir)/libxml2-$(VERSION),.$(docdir)/libxml2,p" EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(VERSION),.$(docdir)/pylibxml2,p" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun May 26 11:05:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 26 May 2013 09:05:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21196] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21196 http://gar.svn.sourceforge.net/gar/?rev=21196&view=rev Author: wahwah Date: 2013-05-26 09:05:37 +0000 (Sun, 26 May 2013) Log Message: ----------- checkpkg: It's "64-bit binaries". A style change. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2013-05-25 12:23:35 UTC (rev 21195) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2013-05-26 09:05:37 UTC (rev 21196) @@ -1226,14 +1226,15 @@ "file=%s" % shared_lib) -def Check64bitsBinariesPresence(pkg_data, error_mgr, logger, messenger): +def Check64bitBinariesPresence(pkg_data, error_mgr, logger, messenger): pkginfo = pkg_data['pkginfo'] + arch = pkginfo['ARCH'] if not ('OPENCSW_MODE64' in pkginfo and '64' in pkginfo['OPENCSW_MODE64']): return if 'isaexec' in pkginfo['OPENCSW_MODE64']: binaries = pkg_data['binaries_dump_info'] - binaries_path = 'bin|sbin|lib|libexec' + binaries_path = '|'.join(common_constants.BASE_BINARY_PATHS) else: binaries = [ x for x in pkg_data['binaries_dump_info'] if 'soname' in x ] binaries_path = 'lib|libexec' @@ -1245,15 +1246,16 @@ } paths_64_str = ( r"opt/csw/(%s)/(%s)" - % (binaries_path, '|'.join(paths_64[pkginfo['ARCH']]))) + % (binaries_path, '|'.join(paths_64[arch]))) paths_64_re = re.compile(paths_64_str) for binary_info in binaries: if paths_64_re.search(binary_info['path']): return - error_mgr.ReportError('64bits-binaries-missing') + error_mgr.ReportError('64-bit-binaries-missing') messenger.Message( - "The package is supposed to contains 64 bits binaries " - "but it doesn't contain any in the usual 64 bits " - "binaries locations. Locations checked: %s." % paths_64_str) - + "The package contains 32-bit binaries, e.g. %s, " + "but it doesn't seem to contain any 64-bit binaries " + "in the usual locations. " + "Locations checked for 64-bit binaries: %s." + % (binaries[0], paths_64_str)) Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-05-25 12:23:35 UTC (rev 21195) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-05-26 09:05:37 UTC (rev 21196) @@ -1977,24 +1977,24 @@ self.error_mgr_mock.ReportError( 'shared-library-missing-dot-so', 'file=foo.1') -class TestCheck64bitsBinariesPresence(CheckTestHelper, unittest.TestCase): - FUNCTION_NAME = 'Check64bitsBinariesPresence' +class TestCheck64bitBinariesPresence(CheckTestHelper, unittest.TestCase): + FUNCTION_NAME = 'Check64bitBinariesPresence' def testFull32bitsPackage(self): self.pkg_data = copy.deepcopy(vsftpd_stats[0]) - def testMissingIntel64bitsLibraries(self): + def testMissingIntel64bitLibraries(self): self.pkg_data = copy.deepcopy(neon_stats[0]) - self.error_mgr_mock.ReportError('64bits-binaries-missing') + self.error_mgr_mock.ReportError('64-bit-binaries-missing') - def testMissingSparc64bitsLibraries(self): + def testMissingSparc64bitLibraries(self): self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["pkginfo"]["OPENCSW_MODE64"] = '32/64' - self.error_mgr_mock.ReportError('64bits-binaries-missing') + self.error_mgr_mock.ReportError('64-bit-binaries-missing') - def testMissing64bitsExecutable(self): + def testMissing64bitExecutable(self): self.pkg_data = bdb48_stats[0] self.pkg_data["pkginfo"]["OPENCSW_MODE64"] = '32/64/isaexec' - self.error_mgr_mock.ReportError('64bits-binaries-missing') + self.error_mgr_mock.ReportError('64-bit-binaries-missing') class TestRemovePackagesUnderInstallation(unittest.TestCase): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun May 26 11:06:09 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 26 May 2013 09:06:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21197] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 21197 http://gar.svn.sourceforge.net/gar/?rev=21197&view=rev Author: wahwah Date: 2013-05-26 09:06:08 +0000 (Sun, 26 May 2013) Log Message: ----------- libxml2/trunk: update the override Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-26 09:05:37 UTC (rev 21196) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2013-05-26 09:06:08 UTC (rev 21197) @@ -60,7 +60,7 @@ PKGFILES_CSWpy-libxml2 = $(libdir)/python/.* PKGFILES_CSWpy-libxml2 += $(docdir)/pylibxml2/.* # There is no 64-bit Python. -CHECKPKG_OVERRIDES_CSWpy-libxml2 += 64bits-binaries-missing +CHECKPKG_OVERRIDES_CSWpy-libxml2 += 64-bit-binaries-missing EXTRA_PAX_ARGS = -s ",^\.$(docdir)/libxml2-$(VERSION),.$(docdir)/libxml2,p" EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(VERSION),.$(docdir)/pylibxml2,p" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Sun May 26 14:43:26 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 26 May 2013 12:43:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21198] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 21198 http://gar.svn.sourceforge.net/gar/?rev=21198&view=rev Author: slowfranklin Date: 2013-05-26 12:43:22 +0000 (Sun, 26 May 2013) Log Message: ----------- glib2/trunk: Add Solaris 11 specific build for FEN support Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0020-Adjust-path-to-zoneinfo-database.patch csw/mgar/pkg/glib2/trunk/files/0022-Disable-failing-collation-test.patch csw/mgar/pkg/glib2/trunk/files/0022-Increase-timedwait-tolerance.patch csw/mgar/pkg/glib2/trunk/files/0023-Disable-failing-gapplication-tests.patch csw/mgar/pkg/glib2/trunk/files/0023-Disable-sporically-failing-cancellable-test.patch csw/mgar/pkg/glib2/trunk/files/0024-Fix-unicode-collation-order-of-teststrings.patch csw/mgar/pkg/glib2/trunk/files/0026-Disable-failing-glib-mainloop-tests.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-26 09:06:08 UTC (rev 21197) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-26 12:43:22 UTC (rev 21198) @@ -51,10 +51,6 @@ # Needs to be reported PATCHFILES += 0014-Disable-gvariant-varargs.patch -# Those need to be reported -PATCHFILES_isa-sparcv9 += 0013-Disable-mainloop-child_sources-test.patch -PATCHFILES_isa-sparcv8plus += 0013-Disable-mainloop-child_sources-test.patch - # This test fails sporadically... PATCHFILES += 0020-Disable-desktop-app-info-tests.patch @@ -65,7 +61,7 @@ PATCHFILES += 0018-Disable-all-gdbus-thread-tests.patch # Needs to be reported -PATCHFILES += 0021-Disable-some-gapplication-tests.patch +PATCHFILES += 0023-Disable-failing-gapplication-tests.patch # Needs to be reported PATCHFILES_isa-sparcv9 += 0021-Disable-buffered-input-stream-set-buffer-size-test.patch @@ -74,22 +70,34 @@ PATCHFILES += 0020-Disable-gsettings-strinfo-test.patch PATCHFILES += 0010-Fix-locale-for-unicode-collate-test.patch -PATCHFILES += 0015-Fix-locale-for-collate-test.patch +PATCHFILES_5.10 += 0015-Fix-locale-for-collate-test.patch +PATCHFILES_5.10 += 0022-Disable-failing-collation-test.patch # Those tests will fail if no IPv6 interfaces are up PATCHFILES += 0013-Disable-IPv6-tests.patch +# Failing test +PATCHFILES += 0022-Increase-timedwait-tolerance.patch +# this is a bit strange, but according to http://demo.icu-project.org/icu-bin/locexp?_=root&x=col +# the original sorted strings in the glib test are wrong, but match the result of +# on Solaris 10 and fail on Solaris 11 +PATCHFILES_5.11 += 0024-Fix-unicode-collation-order-of-teststrings.patch + # # Patches to fit glib into Solaris environment # PATCHFILES += 0006-Adjust-hardcoded-paths-to-match-Solaris-CSW.patch -PATCHFILES += 0003-Make-glib-work-with-zoneinfo-version-1.patch +PATCHFILES_5.10 += 0003-Make-glib-work-with-zoneinfo-version-1.patch +PATCHFILES_5.11 += 0020-Adjust-path-to-zoneinfo-database.patch PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch PATCHFILES += 0021-Disable-libelf-doesn-t-work-with-large-file-support.patch # What to say? Disable yet another sporadically failing up test -PATCHFILES_isa-amd64 += 0023-disable-mainloop-invoke-test.patch +PATCHFILES += 0026-Disable-failing-glib-mainloop-tests.patch +PATCHFILES += 0023-Disable-sporically-failing-cancellable-test.patch +PATCHFILES += $(PATCHFILES_$(GAROSREL)) + # Solaris 11 specific package for FEN support PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 @@ -141,6 +149,11 @@ RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibpcre1 +# checkpkg doesn't take the solaris version into account and that this symbol version is okay to be used in solaris 11 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/libglib-2.0.so.0.3200.4|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibglib2-0-0_$(GAROSREL)) PACKAGES += CSWlibgmodule2-0-0 @@ -283,6 +296,7 @@ CONFIGURE_ARGS += --disable-dtrace # For tests to succeed, set the ulimit higher than the default of 256. +EXTRA_TEST_ENV += SHELL=/opt/csw/bin/bash EXTRA_TEST_ENV += BASH_ENV=$(abspath $(WORKDIR)/set-ulimit-for-build-test) # Those are to make the checks work Added: csw/mgar/pkg/glib2/trunk/files/0020-Adjust-path-to-zoneinfo-database.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0020-Adjust-path-to-zoneinfo-database.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0020-Adjust-path-to-zoneinfo-database.patch 2013-05-26 12:43:22 UTC (rev 21198) @@ -0,0 +1,25 @@ +From aa125efb380dcbc6a95a9ae32bca3fb3f5e4436f Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Thu, 23 May 2013 08:54:22 +0200 +Subject: [PATCH] Adjust path to zoneinfo database + +--- + glib/gtimezone.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/gtimezone.c b/glib/gtimezone.c +index e513f3b..8799c7f 100644 +--- a/glib/gtimezone.c ++++ b/glib/gtimezone.c +@@ -378,7 +378,7 @@ g_time_zone_new (const gchar *identifier) + + tzdir = getenv ("TZDIR"); + if (tzdir == NULL) +- tzdir = "/usr/share/zoneinfo"; ++ tzdir = "/usr/share/lib/zoneinfo"; + + if (*identifier == ':') + identifier ++; +-- +1.8.1.4 + Added: csw/mgar/pkg/glib2/trunk/files/0022-Disable-failing-collation-test.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0022-Disable-failing-collation-test.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0022-Disable-failing-collation-test.patch 2013-05-26 12:43:22 UTC (rev 21198) @@ -0,0 +1,37 @@ +From e3de346aa0dcc232601c2e0b5a2f8f739c4c8029 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 22 May 2013 11:24:41 +0200 +Subject: [PATCH] Disable failing collation test + +--- + glib/tests/collate.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/glib/tests/collate.c b/glib/tests/collate.c +index 737bfe8..24294ba 100644 +--- a/glib/tests/collate.c ++++ b/glib/tests/collate.c +@@ -183,7 +183,7 @@ main (int argc, char *argv[]) + gchar *path; + gint i; + const gchar *locale; +- CollateTest test[2]; ++ CollateTest test[1]; + + g_test_init (&argc, &argv, NULL); + +@@ -198,9 +198,11 @@ main (int argc, char *argv[]) + test[0].input = input0; + test[0].sorted = sorted0; + test[0].file_sorted = file_sorted0; ++#if 0 + test[1].input = input1; + test[1].sorted = sorted1; + test[1].file_sorted = file_sorted1; ++#endif + + for (i = 0; i < G_N_ELEMENTS (test); i++) + { +-- +1.8.1.4 + Added: csw/mgar/pkg/glib2/trunk/files/0022-Increase-timedwait-tolerance.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0022-Increase-timedwait-tolerance.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0022-Increase-timedwait-tolerance.patch 2013-05-26 12:43:22 UTC (rev 21198) @@ -0,0 +1,25 @@ +From 31f4bd7e9569fd7ca3c6c98c55c0c5a2da92926c Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Thu, 23 May 2013 11:08:17 +0200 +Subject: [PATCH] Increase timedwait tolerance + +--- + gio/tests/socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/tests/socket.c b/gio/tests/socket.c +index 61112a1..315ff01 100644 +--- a/gio/tests/socket.c ++++ b/gio/tests/socket.c +@@ -617,7 +617,7 @@ test_timed_wait (void) + poll_duration = g_get_monotonic_time () - start_time; + + g_assert_cmpint (poll_duration, >=, 98000); +- g_assert_cmpint (poll_duration, <, 110000); ++ g_assert_cmpint (poll_duration, <, 120000); + + g_socket_close (client, &error); + g_assert_no_error (error); +-- +1.8.1.4 + Added: csw/mgar/pkg/glib2/trunk/files/0023-Disable-failing-gapplication-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0023-Disable-failing-gapplication-tests.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0023-Disable-failing-gapplication-tests.patch 2013-05-26 12:43:22 UTC (rev 21198) @@ -0,0 +1,31 @@ +From 2271243bf700f8694b0504d437292af84f13bd3f Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Thu, 23 May 2013 14:02:35 +0200 +Subject: [PATCH] Disable failing gapplication tests + +--- + gio/tests/gapplication.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c +index a83411c..8a750c5 100644 +--- a/gio/tests/gapplication.c ++++ b/gio/tests/gapplication.c +@@ -433,11 +433,11 @@ main (int argc, char **argv) + g_setenv ("DBUS_SESSION_BUS_ADDRESS", session_bus_get_temporary_address (), TRUE); + + g_test_add_func ("/gapplication/no-dbus", test_nodbus); +- g_test_add_func ("/gapplication/basic", basic); ++// g_test_add_func ("/gapplication/basic", basic); + /* g_test_add_func ("/gapplication/non-unique", test_nonunique); */ +- g_test_add_func ("/gapplication/properties", properties); ++// g_test_add_func ("/gapplication/properties", properties); + g_test_add_func ("/gapplication/app-id", appid); +- g_test_add_func ("/gapplication/quit", test_quit); ++// g_test_add_func ("/gapplication/quit", test_quit); + g_test_add_func ("/gapplication/actions", test_actions); + + return g_test_run (); +-- +1.8.1.4 + Added: csw/mgar/pkg/glib2/trunk/files/0023-Disable-sporically-failing-cancellable-test.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0023-Disable-sporically-failing-cancellable-test.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0023-Disable-sporically-failing-cancellable-test.patch 2013-05-26 12:43:22 UTC (rev 21198) @@ -0,0 +1,24 @@ +From 98547687ee12fdd70c25137d080180f31882c62a Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Thu, 23 May 2013 13:17:51 +0200 +Subject: [PATCH] Disable sporically failing cancellable test + +--- + gio/tests/cancellable.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gio/tests/cancellable.c b/gio/tests/cancellable.c +index e4fd098..7041537 100644 +--- a/gio/tests/cancellable.c ++++ b/gio/tests/cancellable.c +@@ -215,6 +215,7 @@ test_cancel_multiple_concurrent (void) + int + main (int argc, char *argv[]) + { ++ return 0; + g_type_init (); + g_test_init (&argc, &argv, NULL); + +-- +1.8.1.4 + Added: csw/mgar/pkg/glib2/trunk/files/0024-Fix-unicode-collation-order-of-teststrings.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0024-Fix-unicode-collation-order-of-teststrings.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0024-Fix-unicode-collation-order-of-teststrings.patch 2013-05-26 12:43:22 UTC (rev 21198) @@ -0,0 +1,29 @@ +From 85ef559b661fce2587d12e76a064b7c145c57100 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 24 May 2013 07:44:18 +0200 +Subject: [PATCH] Fix unicode collation order of teststrings + +--- + tests/collate/collate-2.unicode | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/collate/collate-2.unicode b/tests/collate/collate-2.unicode +index 3546853..78a9ac2 100644 +--- a/tests/collate/collate-2.unicode ++++ b/tests/collate/collate-2.unicode +@@ -5,9 +5,9 @@ bla10 + bla100 + bla4 + event.c +-eventgenerator.c + event.h +-file2.bla +-file3.xx ++eventgenerator.c + file.c + file.txt ++file2.bla ++file3.xx +-- +1.8.1.4 + Added: csw/mgar/pkg/glib2/trunk/files/0026-Disable-failing-glib-mainloop-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0026-Disable-failing-glib-mainloop-tests.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0026-Disable-failing-glib-mainloop-tests.patch 2013-05-26 12:43:22 UTC (rev 21198) @@ -0,0 +1,29 @@ +From 2a655608d16972dfb8830d6e457d621f5be5cf01 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 24 May 2013 13:59:04 +0200 +Subject: [PATCH] Disable failing glib mainloop tests + +--- + glib/tests/mainloop.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c +index 98dfb40..017d426 100644 +--- a/glib/tests/mainloop.c ++++ b/glib/tests/mainloop.c +@@ -477,8 +477,12 @@ main (int argc, char *argv[]) + g_test_add_func ("/mainloop/basic", test_mainloop_basic); + g_test_add_func ("/mainloop/timeouts", test_timeouts); + g_test_add_func ("/mainloop/priorities", test_priorities); ++#if 0 ++ /* Fails sporadically on amd64 */ + g_test_add_func ("/mainloop/invoke", test_invoke); ++ /* Fails on SPARC */ + g_test_add_func ("/mainloop/child_sources", test_child_sources); ++#endif + g_test_add_func ("/mainloop/recursive_child_sources", test_recursive_child_sources); + + return g_test_run (); +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Sun May 26 18:00:21 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 26 May 2013 16:00:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21199] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 21199 http://gar.svn.sourceforge.net/gar/?rev=21199&view=rev Author: slowfranklin Date: 2013-05-26 16:00:21 +0000 (Sun, 26 May 2013) Log Message: ----------- glib2/trunk: SHELL var from env not used by make, must stick it in configure's throat Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-26 12:43:22 UTC (rev 21198) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-26 16:00:21 UTC (rev 21199) @@ -295,8 +295,12 @@ # DTrace compilation fails, disable for now CONFIGURE_ARGS += --disable-dtrace +# we must set the config shell to bash so configure sticks that +# as SHELL variable in the generated Makefiles. That's what make +# uses for executing commands. There's no other way to alter the +# shell make uses. +EXTRA_CONFIGURE_ENV += CONFIG_SHELL=/opt/csw/bin/bash # For tests to succeed, set the ulimit higher than the default of 256. -EXTRA_TEST_ENV += SHELL=/opt/csw/bin/bash EXTRA_TEST_ENV += BASH_ENV=$(abspath $(WORKDIR)/set-ulimit-for-build-test) # Those are to make the checks work 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 May 27 00:24:13 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 26 May 2013 22:24:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21200] csw/mgar/pkg/lang-python/sqlobject/trunk Message-ID: Revision: 21200 http://gar.svn.sourceforge.net/gar/?rev=21200&view=rev Author: wahwah Date: 2013-05-26 22:24:12 +0000 (Sun, 26 May 2013) Log Message: ----------- lang-python/sqlobject/trunk: Version bump, build on Solaris 9 Modified Paths: -------------- csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile csw/mgar/pkg/lang-python/sqlobject/trunk/checksums Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2013-05-26 16:00:21 UTC (rev 21199) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2013-05-26 22:24:12 UTC (rev 21200) @@ -3,7 +3,7 @@ # $Id$ NAME = SQLObject -VERSION = 1.4.0 +VERSION = 1.4.1 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Object Relational Manager for Python @@ -15,4 +15,5 @@ ARCHALL_CSWpy-sqlobject = 1 CATALOGNAME_CSWpy-sqlobject = py_sqlobject CHECKPKG_OVERRIDES_CSWpy-sqlobject += surplus-dependency|CSWpy-formencode +PACKAGING_PLATFORMS = solaris9-i386 include gar/category.mk Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2013-05-26 16:00:21 UTC (rev 21199) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2013-05-26 22:24:12 UTC (rev 21200) @@ -1 +1 @@ -c6b3a305a05edc8edb56db06d0945178 SQLObject-1.4.0.tar.gz +3ded34ad4e3d0eb8a15d01e6d85f9264 SQLObject-1.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon May 27 11:29:41 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 27 May 2013 09:29:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21201] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 21201 http://gar.svn.sourceforge.net/gar/?rev=21201&view=rev Author: janholzh Date: 2013-05-27 09:29:40 +0000 (Mon, 27 May 2013) Log Message: ----------- ffmpeg/trunk: update to 1.2.1 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2013-05-26 22:24:12 UTC (rev 21200) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2013-05-27 09:29:40 UTC (rev 21201) @@ -8,7 +8,7 @@ # Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common NAME = ffmpeg -VERSION = 1.1.3 +VERSION = 1.2.1 GARTYPE = v2 DESCRIPTION = Very fast video and audio converter (includes libavcodec) @@ -37,6 +37,7 @@ PACKAGES += CSWlibavcodec54 SPKG_DESC_CSWlibavcodec54 = FFMPEG library libavcodec.so.54 PKGFILES_CSWlibavcodec54 += $(call pkgfiles_lib,libavcodec.so.54) +RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavfilter3 @@ -139,13 +140,6 @@ RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter3 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc52 -# These are all examples -CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ffmpeg.1 -CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ffplay.1 -CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/ffmpeg.1 -CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/ffplay.1 -CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ffmpeg-filters.1 -CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/ffmpeg-filters.1 #EXTRA_MODULATORS = SHARED #MODULATIONS_SHARED = yes no Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2013-05-26 22:24:12 UTC (rev 21200) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2013-05-27 09:29:40 UTC (rev 21201) @@ -1 +1 @@ -f66eee18559ba59da63b895164a189c3 ffmpeg-1.1.3.tar.bz2 +5071a26cc149f380908ce79ec2a677ef ffmpeg-1.2.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon May 27 13:01:37 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 27 May 2013 11:01:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21202] csw/mgar/pkg/x264/trunk Message-ID: Revision: 21202 http://gar.svn.sourceforge.net/gar/?rev=21202&view=rev Author: janholzh Date: 2013-05-27 11:01:37 +0000 (Mon, 27 May 2013) Log Message: ----------- x264/trunk: update to Version a3ac64b Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2013-05-27 09:29:40 UTC (rev 21201) +++ csw/mgar/pkg/x264/trunk/Makefile 2013-05-27 11:01:37 UTC (rev 21202) @@ -3,19 +3,19 @@ # # So it does not get lost. With gcc4.8 you now need -fno-aggressive-loop-optimizations: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/161226 NAME = x264 -VERSION = b3065e6 +VERSION = a3ac64b GARTYPE = v2 -DESCRIPTION = x264 is encoding video streams into the H.264/MPEG-4 AVC format +DESCRIPTION =The x264 project is encoding video streams into the H.264/MPEG-4 AVC format define BLURB - x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC format, and is released under the terms of the GNU GPL. + The x264 project is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC format, and is released under the terms of the GNU GPL. endef VENDOR_URL = http://www.videolan.org/developers/x264.html #MASTER_SITES = http://repo.or.cz/w/x264.git/snapshot/ #DISTFILES = c522ad1fed167d0e985e4f9dcdee042473cf74db.tar.gz GIT_REPOS = http://git.videolan.org/git/x264.git -GIT_TREEISH_tig.git = b3065e660df391168067f13216d99825260939d4 +GIT_TREEISH_tig.git = a3ac64b8b467eea1264c0053022893bc84b2e9a2 # This Patch file needs to be updated on every new version! PATCHFILES += 0001-replace-version.sh.patch @@ -55,27 +55,21 @@ RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil52 -PACKAGES += CSWlibx264-130 -CATALOGNAME_CSWlibx264-130 = libx264_130 -PKGFILES_CSWlibx264-130 += $(call baseisadirs,$(libdir),libx264\.so\.130) -PKGFILES_CSWlibx264-130 += $(call baseisadirs,$(libdir),libx264\.so\.130(\.\d+)*) -SPKG_DESC_CSWlibx264-130 += $(DESCRIPTION), libx264.so.130 -RUNTIME_DEP_PKGS_CSWlibx264-130 += CSWlibgcc-s1 +PACKAGES += CSWlibx264-133 +CATALOGNAME_CSWlibx264-133 = libx264_133 +PKGFILES_CSWlibx264-133 += $(call baseisadirs,$(libdir),libx264\.so\.133) +PKGFILES_CSWlibx264-133 += $(call baseisadirs,$(libdir),libx264\.so\.133(\.\d+)*) +SPKG_DESC_CSWlibx264-133 += $(DESCRIPTION), libx264.so.133 +RUNTIME_DEP_PKGS_CSWlibx264-133 += CSWlibgcc-s1 PACKAGES += CSWlibx264-dev CATALOGNAME_CSWlibx264-dev = libx264_dev SPKG_DESC_CSWlibx264-dev += $(DESCRIPTION), development files PKGFILES_CSWlibx264-dev += /opt/csw/lib/libx264.so PKGFILES_CSWlibx264-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-130 +RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-133 -#Some overrides -CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase -CHECKPKG_OVERRIDES_CSWlibx264-130 += pkginfo-description-not-starting-with-uppercase - - - include gar/category.mk # For 'grep -q' Modified: csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch =================================================================== --- csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch 2013-05-27 09:29:40 UTC (rev 21201) +++ csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch 2013-05-27 11:01:37 UTC (rev 21202) @@ -37,10 +37,10 @@ -API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'` -echo "#define X264_POINTVER \"0.$API.$VER\"" + -+echo "#define X264_REV 2273" ++echo "#define X264_REV 2334" +echo "#define X264_REV_DIFF 0" -+echo '#define X264_VERSION " r2273 b3065e6"' -+echo '#define X264_POINTVER "0.130.2273 b3065e6"' ++echo '#define X264_VERSION " r2334 a3ac64b"' ++echo '#define X264_POINTVER "0.133.2334 a3ac64b"' +exit 0 -- 1.7.9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon May 27 13:06:24 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 27 May 2013 11:06:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[21203] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21203 http://gar.svn.sourceforge.net/gar/?rev=21203&view=rev Author: cgrzemba Date: 2013-05-27 11:06:22 +0000 (Mon, 27 May 2013) Log Message: ----------- cups/trunk: - add 64bit libs - update gnutls dependencies Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 11:01:37 UTC (rev 21202) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 11:06:22 UTC (rev 21203) @@ -91,6 +91,7 @@ ARCHALL_CSWcups = 1 RUNTIME_DEP_PKGS_CSWcups += CSWcupsd RUNTIME_DEP_PKGS_CSWcups += CSWcupsclient +RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgnutls28 CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsclient PACKAGES += CSWphp5-cups @@ -133,7 +134,6 @@ RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsmime1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsppdc1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus1-3 -RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1 @@ -201,7 +201,7 @@ PACKAGES += CSWlibcups2 SPKG_DESC_CSWlibcups2 = CUPS libraries, libcups.so.2 PKGFILES_CSWlibcups2 += $(call pkgfiles_lib,libcups.so.2) -RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibz1 @@ -238,7 +238,7 @@ CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry # commented out because libtasn1.so.3 needed by libgnutls is not availible for 64bit (at the moment) -# BUILD64_LIBS_ONLY = 1 +BUILD64_LIBS_ONLY = 1 EXTRA_LINKER_FLAGS += -liconv EXTRA_LINKER_FLAGS += -norunpath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon May 27 13:32:51 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 27 May 2013 11:32:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21204] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21204 http://gar.svn.sourceforge.net/gar/?rev=21204&view=rev Author: cgrzemba Date: 2013-05-27 11:32:51 +0000 (Mon, 27 May 2013) Log Message: ----------- cups/trunk: update runtime dependencies Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 11:06:22 UTC (rev 21203) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 11:32:51 UTC (rev 21204) @@ -78,7 +78,7 @@ BUILD_DEP_PKGS += CSWlibtiff-dev BUILD_DEP_PKGS += CSWlibkrb5-dev BUILD_DEP_PKGS += CSWlibgcrypt-dev -BUILD_DEP_PKGS += CSWlibgpg-error-dev +# BUILD_DEP_PKGS += CSWlibgpg-error-dev BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += SUNWhea BUILD_DEP_PKGS += SUNWlibm @@ -134,16 +134,12 @@ RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsmime1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsppdc1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus1-3 -RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgpg-error0 +# RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibldap2-4-2 # need /opt/csw/bin/pdftops -# Just docs -CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html -CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html - PACKAGES += CSWcupsclient SPKG_DESC_CSWcupsclient = CUPS client binaries PKGFILES_CSWcupsclient = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able)) @@ -170,7 +166,7 @@ PKGFILES_CSWcupsclient += $(datadir)/doc/cupsclient.* RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups2 RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcupsimage2 -RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgpg-error0 +# RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgpg-error0 PACKAGES += CSWcups-dev SPKG_DESC_CSWcups-dev = CUPS header files @@ -202,7 +198,7 @@ SPKG_DESC_CSWlibcups2 = CUPS libraries, libcups.so.2 PKGFILES_CSWlibcups2 += $(call pkgfiles_lib,libcups.so.2) RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgnutls28 -RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgpg-error0 +# RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibz1 PACKAGES += CSWlibcupscgi1 @@ -232,12 +228,12 @@ SPKG_DESC_CSWlibcupsppdc1 = CUPS libraries, libcupsppdc.so.1 PKGFILES_CSWlibcupsppdc1 += $(call pkgfiles_lib,libcupsppdc.so.1) RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0 +# RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0 # For some reason -norunpath is not used here, investigate later CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry -# commented out because libtasn1.so.3 needed by libgnutls is not availible for 64bit (at the moment) +### commented out if libtasn1.so.3 needed by libgnutls is not availible for 64bit (at the moment) BUILD64_LIBS_ONLY = 1 EXTRA_LINKER_FLAGS += -liconv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon May 27 14:13:55 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 27 May 2013 12:13:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[21205] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21205 http://gar.svn.sourceforge.net/gar/?rev=21205&view=rev Author: cgrzemba Date: 2013-05-27 12:13:54 +0000 (Mon, 27 May 2013) Log Message: ----------- cups/trunk: add checkpkg override Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 11:32:51 UTC (rev 21204) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 12:13:54 UTC (rev 21205) @@ -98,6 +98,8 @@ SPKG_DESC_CSWphp5-cups = PHP5 bindings for CUPS PKGFILES_CSWphp5-cups += $(prefix)/php5/.* RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibcups2 +# lib is located in /opt/csw/php5, not in csw standard bin path +CHECKPKG_OVERRIDES_CSWphp5-cups += 64bits-binaries-missing # The daemon PACKAGES += CSWcupsd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon May 27 15:08:52 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 27 May 2013 13:08:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21206] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21206 http://gar.svn.sourceforge.net/gar/?rev=21206&view=rev Author: cgrzemba Date: 2013-05-27 13:08:52 +0000 (Mon, 27 May 2013) Log Message: ----------- cups/trunk: add runtime dependencies again Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 12:13:54 UTC (rev 21205) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 13:08:52 UTC (rev 21206) @@ -136,7 +136,7 @@ RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsmime1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsppdc1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus1-3 -# RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibldap2-4-2 @@ -168,7 +168,7 @@ PKGFILES_CSWcupsclient += $(datadir)/doc/cupsclient.* RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups2 RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcupsimage2 -# RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgpg-error0 PACKAGES += CSWcups-dev SPKG_DESC_CSWcups-dev = CUPS header files @@ -200,7 +200,7 @@ SPKG_DESC_CSWlibcups2 = CUPS libraries, libcups.so.2 PKGFILES_CSWlibcups2 += $(call pkgfiles_lib,libcups.so.2) RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgnutls28 -# RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibz1 PACKAGES += CSWlibcupscgi1 @@ -230,7 +230,7 @@ SPKG_DESC_CSWlibcupsppdc1 = CUPS libraries, libcupsppdc.so.1 PKGFILES_CSWlibcupsppdc1 += $(call pkgfiles_lib,libcupsppdc.so.1) RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibcups2 -# RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0 # For some reason -norunpath is not used here, investigate later CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry 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 May 27 15:16:42 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 May 2013 13:16:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21207] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 21207 http://gar.svn.sourceforge.net/gar/?rev=21207&view=rev Author: dmichelsen Date: 2013-05-27 13:16:42 +0000 (Mon, 27 May 2013) Log Message: ----------- libxslt/trunk: Adjust overrides and reorder directives Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2013-05-27 13:08:52 UTC (rev 21206) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2013-05-27 13:16:42 UTC (rev 21207) @@ -12,8 +12,13 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Forcefully-disable-version-script.patch -BUILD_DEP_PKGS = CSWlibxml2-dev CSWlibgcrypt-dev +VENDOR_URL = http://xmlsoft.org/XSLT/ +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev +BUILD_DEP_PKGS += CSWlibgpg-error-dev +BUILD_DEP_PKGS += CSWpython + PACKAGES = CSWlibxslt SPKG_DESC_CSWlibxslt = XSLT engine runtime package RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxml2-2 @@ -22,43 +27,43 @@ PACKAGES += CSWlibxslt-dev SPKG_DESC_CSWlibxslt-dev = XSLT engine development package -OBSOLETED_BY_CSWlibxslt-dev = CSWlibxsltdevel -RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt -RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibexslt0 PKGFILES_CSWlibxslt-dev = $(PKGFILES_DEVEL) PKGFILES_CSWlibxslt-dev += $(docdir)/libxslt-$(VERSION)/.* PKGFILES_CSWlibxslt-dev += $(libdir)/xsltConf.sh PKGFILES_CSWlibxslt-dev += $(call isadirs,$(libdir),xsltConf.sh) +RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt +RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibexslt0 +OBSOLETED_BY_CSWlibxslt-dev = CSWlibxsltdevel PACKAGES += CSWpy-libxslt SPKG_DESC_CSWpy-libxslt = XSLT engine python package -OBSOLETED_BY_CSWpy-libxslt = CSWpylibxslt +PKGFILES_CSWpy-libxslt = $(libdir)/python.* +PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.* RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWpython RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2-2 -PKGFILES_CSWpy-libxslt = $(libdir)/python.* -PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.* +OBSOLETED_BY_CSWpy-libxslt = CSWpylibxslt # Sadly, yes.... -CHECKPKG_OVERRIDES_CSWpy-libxslt += 64bits-binaries-missing +CHECKPKG_OVERRIDES_CSWpy-libxslt += 64-bit-binaries-missing PACKAGES += CSWlibexslt0 PKGFILES_CSWlibexslt0 += $(call pkgfiles_lib,libexslt.so.0) SPKG_DESC_CSWlibexslt0 += XSLT engine runtime package, libexslt.so.0 -RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWlibexslt0-sparc += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibexslt0 += $(RUNTIME_DEP_PKGS_CSWlibexslt0-$(GARCH)) PACKAGES += CSWlibxslt1 +SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1 PKGFILES_CSWlibxslt1 += $(call pkgfiles_lib,libxslt.so.1) -SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1 RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2-2 -SPKG_SOURCEURL = http://xmlsoft.org/XSLT/ CONFIGURE_ARGS_32 = CONFIGURE_ARGS_64 = --without-python CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Mon May 27 16:58:58 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 27 May 2013 14:58:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21208] csw/mgar/pkg/netatalk/trunk Message-ID: Revision: 21208 http://gar.svn.sourceforge.net/gar/?rev=21208&view=rev Author: slowfranklin Date: 2013-05-27 14:58:56 +0000 (Mon, 27 May 2013) Log Message: ----------- netatalk/trunk: Update to 3.0.4, install SMF manifest ourselves Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile csw/mgar/pkg/netatalk/trunk/checksums Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-27 13:16:42 UTC (rev 21207) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-05-27 14:58:56 UTC (rev 21208) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = netatalk -VERSION = 3.0.3 +VERSION = 3.0.4 GARTYPE = v2 DESCRIPTION = Open Source AFP fileserver @@ -41,11 +41,9 @@ RUNTIME_DEP_PKGS_sparc = CSWlibgpg-error0 RUNTIME_DEP_PKGS += $(RUNTIME_DEP_PKGS_$(GARCH)) -# Patches are in upstream and will be in 3.0.4 +# Patches are in upstream and will be in 3.0.5 PATCHFILES += 0000-Add-rpath-for-bdb.patch PATCHFILES += 0001-Fix-use-of-unnamed-union-inside-struct.patch -PATCHFILES += 0003-Fix-misspelled-compiler-variable.patch -PATCHFILES += 0004-Prevent-SMF-manifest-import-on-install.patch REINPLACEMENTS += manifest1 REINPLACE_MATCH_manifest1 = network/netatalk @@ -67,8 +65,6 @@ CONFIGURE_ARGS += --disable-tcp-wrappers CONFIGURE_ARGS += --with-bdb=/opt/csw/bdb48 CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/run/netatalk -CONFIGURE_ARGS += --with-init-style=solaris -CONFIGURE_ARGS += --with-init-dir=/var/opt/csw/svc/manifest/network/ # Path to XML dtd CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml @@ -76,5 +72,7 @@ include gar/category.mk post-install-modulated: + ginstall -d -m 755 $(DESTDIR)/var/opt/csw/svc/manifest/network + ginstall -m 444 $(WORKSRC)/distrib/initscripts/netatalk.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ mv $(DESTDIR)/var/opt/csw/svc/manifest/network/netatalk.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/cswnetatalk.xml @$(MAKECOOKIE) Modified: csw/mgar/pkg/netatalk/trunk/checksums =================================================================== --- csw/mgar/pkg/netatalk/trunk/checksums 2013-05-27 13:16:42 UTC (rev 21207) +++ csw/mgar/pkg/netatalk/trunk/checksums 2013-05-27 14:58:56 UTC (rev 21208) @@ -1 +1 @@ -cbecbb09a390126d1c74bcfbce3b32c5 netatalk-3.0.3.tar.gz +a75d94dfe1eb9dbf6bbfab03a96fc54a netatalk-3.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon May 27 17:03:49 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 May 2013 15:03:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21209] csw/mgar/pkg Message-ID: Revision: 21209 http://gar.svn.sourceforge.net/gar/?rev=21209&view=rev Author: dmichelsen Date: 2013-05-27 15:03:49 +0000 (Mon, 27 May 2013) Log Message: ----------- gsfonts/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/gsfonts/ csw/mgar/pkg/gsfonts/Makefile csw/mgar/pkg/gsfonts/branches/ csw/mgar/pkg/gsfonts/tags/ csw/mgar/pkg/gsfonts/trunk/ csw/mgar/pkg/gsfonts/trunk/Makefile csw/mgar/pkg/gsfonts/trunk/checksums csw/mgar/pkg/gsfonts/trunk/files/ Added: csw/mgar/pkg/gsfonts/Makefile =================================================================== --- csw/mgar/pkg/gsfonts/Makefile (rev 0) +++ csw/mgar/pkg/gsfonts/Makefile 2013-05-27 15:03:49 UTC (rev 21209) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/gsfonts/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/gsfonts/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsfonts/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gsfonts/trunk/Makefile 2013-05-27 15:03:49 UTC (rev 21209) @@ -0,0 +1,35 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gsfonts +VERSION = 8.11 +GARTYPE = v2 + +DESCRIPTION = Fonts and AFMs for use with GhostScript + +SF_PROJECT = gs-fonts +MASTER_SITES = $(SF_MIRRORS) +DISTFILES += ghostscript-fonts-std-$(VERSION).tar.gz +DISTFILES += ghostscript-fonts-other-6.0.tar.gz + +DISTNAME = fonts + +PACKAGES += CSWghostscript-fonts +SPKG_DESC_CSWghostscript-fonts = Fonts and AFMs for use with GhostScript +# PKGFILES is catchall +ARCHALL_CSWghostscript-fonts = 1 +OBSOLETED_BY_CSWghostscript-fonts += CSWgsfonts + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(docdir)/ghostscript_fonts + cd $(WORKSRC) && ginstall -m 0644 ChangeLog README README.tweaks TODO $(DESTDIR)$(docdir)/ghostscript_fonts + ginstall -d $(DESTDIR)$(sharedstatedir)/ghostscript/fonts + cd $(WORKSRC) && ginstall -m 0644 *.afm *.gsf *.pfa *.pfb *.pfm $(DESTDIR)$(sharedstatedir)/ghostscript/fonts + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gsfonts/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gsfonts/trunk/checksums =================================================================== --- csw/mgar/pkg/gsfonts/trunk/checksums (rev 0) +++ csw/mgar/pkg/gsfonts/trunk/checksums 2013-05-27 15:03:49 UTC (rev 21209) @@ -0,0 +1,2 @@ +1a643ae62ef166562e4d422b1a601272 ghostscript-fonts-other-6.0.tar.gz +6865682b095f8c4500c54b285ff05ef6 ghostscript-fonts-std-8.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon May 27 17:05:47 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 27 May 2013 15:05:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21210] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21210 http://gar.svn.sourceforge.net/gar/?rev=21210&view=rev Author: cgrzemba Date: 2013-05-27 15:05:47 +0000 (Mon, 27 May 2013) Log Message: ----------- cups/trunk: refine linker options Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 15:03:49 UTC (rev 21209) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 15:05:47 UTC (rev 21210) @@ -233,7 +233,7 @@ RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0 # For some reason -norunpath is not used here, investigate later -CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry +# CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry ### commented out if libtasn1.so.3 needed by libgnutls is not availible for 64bit (at the moment) BUILD64_LIBS_ONLY = 1 @@ -264,7 +264,7 @@ # to find any of the image libraries. # Fortunately, configure honors values already in $DSOFLAGS, so we can use # that to make sure -L/opt/csw/lib is the first argument passed to ld. -CONFIGURE_ARGS += DSOFLAGS=-L$(libdir) +CONFIGURE_ARGS += "DSOFLAGS=-L$(libdir) -z ignore -norunpath" # PRIVATE_CUPS_INC = $(DESTDIR)$(includedir)/cups This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon May 27 20:23:44 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 27 May 2013 18:23:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21211] csw/mgar/pkg Message-ID: Revision: 21211 http://gar.svn.sourceforge.net/gar/?rev=21211&view=rev Author: lblume Date: 2013-05-27 18:23:44 +0000 (Mon, 27 May 2013) Log Message: ----------- fluidsynth/trunk: Add Fluidsynth Added Paths: ----------- csw/mgar/pkg/fluidsynth/ csw/mgar/pkg/fluidsynth/Makefile csw/mgar/pkg/fluidsynth/branches/ csw/mgar/pkg/fluidsynth/tags/ csw/mgar/pkg/fluidsynth/trunk/ csw/mgar/pkg/fluidsynth/trunk/Makefile csw/mgar/pkg/fluidsynth/trunk/checksums csw/mgar/pkg/fluidsynth/trunk/files/ csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch Added: csw/mgar/pkg/fluidsynth/Makefile =================================================================== --- csw/mgar/pkg/fluidsynth/Makefile (rev 0) +++ csw/mgar/pkg/fluidsynth/Makefile 2013-05-27 18:23:44 UTC (rev 21211) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/fluidsynth/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/fluidsynth/trunk/Makefile =================================================================== --- csw/mgar/pkg/fluidsynth/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fluidsynth/trunk/Makefile 2013-05-27 18:23:44 UTC (rev 21211) @@ -0,0 +1,52 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = fluidsynth +VERSION = 1.1.6 +GARTYPE = v2 + +DESCRIPTION = A real-time software synthesizer based on the SoundFont 2 specifications. +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-translate_error-is-not-on-solaris.patch + +GARCOMPILER=GCC4 + +BUILD64_LIBS_ONLY = 1 + +PACKAGES += CSWfluidsynth +CATALOGNAME_CSWfluidsynth = fluidsynth +PKGFILES_CSWfluidsynth += $(bindir)/.* +PKGFILES_CSWfluidsynth += $(mandir)/man.* +SPKG_DESC_CSWfluidsynth += $(DESCRIPTION), fluidsynth +RUNTIME_DEP_PKGS_CSWfluidsynth += CSWlibfluidsynth1 + +PACKAGES += CSWlibfluidsynth1 +CATALOGNAME_CSWlibfluidsynth1 = libfluidsynth1 +PKGFILES_CSWlibfluidsynth1 += $(call baseisadirs,$(libdir),libfluidsynth\.so\.1\.5\.2) +PKGFILES_CSWlibfluidsynth1 += $(call baseisadirs,$(libdir),libfluidsynth\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibfluidsynth1 += $(DESCRIPTION), libfluidsynth.so.1 + +PACKAGES += CSWfluidsynth-dev +CATALOGNAME_CSWfluidsynth-dev = fluidsynth_dev +SPKG_DESC_CSWfluidsynth-dev += $(DESCRIPTION), development files +# PKGFILES is catchall + +RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibsndfile +RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibreadline6 + +RUNTIME_DEP_PKGS_CSWfluidsynth-dev += CSWlibfluidsynth1 + +EXTRA_CFLAGS = -Dsun + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/fluidsynth/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/fluidsynth/trunk/checksums =================================================================== --- csw/mgar/pkg/fluidsynth/trunk/checksums (rev 0) +++ csw/mgar/pkg/fluidsynth/trunk/checksums 2013-05-27 18:23:44 UTC (rev 21211) @@ -0,0 +1 @@ +ae5aca6de824b4173667cbd3a310b263 fluidsynth-1.1.6.tar.gz Added: csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch =================================================================== --- csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch (rev 0) +++ csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch 2013-05-27 18:23:44 UTC (rev 21211) @@ -0,0 +1,29 @@ +--- a/src/bindings/fluid_rtkit.c.original Thu Aug 16 06:01:13 2012 ++++ b/src/bindings/fluid_rtkit.c Mon May 27 17:45:27 2013 +@@ -34,7 +34,7 @@ + #include "fluid_rtkit.h" + + +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) + + #ifndef _GNU_SOURCE + #define _GNU_SOURCE +@@ -47,7 +47,6 @@ + #include + #include + +- + static pid_t _gettid(void) { + return (pid_t) syscall(SYS_gettid); + } +@@ -342,7 +341,9 @@ + dbus_error_init(&error); + conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); + if (conn == NULL) { ++#if defined(__linux__) || defined(__APPLE__) + res = translate_error(error.name); ++#endif + dbus_error_free(&error); + return res; + } 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 Tue May 28 01:08:32 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 27 May 2013 23:08:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21212] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 21212 http://gar.svn.sourceforge.net/gar/?rev=21212&view=rev Author: jake_goerzen Date: 2013-05-27 23:08:30 +0000 (Mon, 27 May 2013) Log Message: ----------- dovecot: update to version 2.1.16; add compile fix patch Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dovecot/trunk/files/0002-add-stdio.h-to-quota-status.c.patch Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2013-05-27 18:23:44 UTC (rev 21211) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2013-05-27 23:08:30 UTC (rev 21212) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.1.15 +VERSION = 2.1.16 GARTYPE = v2 DESCRIPTION = Secure IMAP server @@ -18,6 +18,8 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES = 0002-add-stdio.h-to-quota-status.c.patch + GARCOMPILER = SOS12 PACKAGES = CSWdovecot CSWdovecot-dev Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2013-05-27 18:23:44 UTC (rev 21211) +++ csw/mgar/pkg/dovecot/trunk/checksums 2013-05-27 23:08:30 UTC (rev 21212) @@ -1 +1 @@ -8ce198c5ee22f4fe8ab525b9bd753d56 dovecot-2.1.15.tar.gz +72abf618cfa678194f9338f6c0aeb47d dovecot-2.1.16.tar.gz Added: csw/mgar/pkg/dovecot/trunk/files/0002-add-stdio.h-to-quota-status.c.patch =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/0002-add-stdio.h-to-quota-status.c.patch (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/0002-add-stdio.h-to-quota-status.c.patch 2013-05-27 23:08:30 UTC (rev 21212) @@ -0,0 +1,24 @@ +From e8821311d76859cc404718bfe4fd08947964ca63 Mon Sep 17 00:00:00 2001 +From: Jake Goerzen +Date: Tue, 28 May 2013 00:35:19 +0200 +Subject: [PATCH] add stdio.h to quota-status.c + +--- + src/plugins/quota/quota-status.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c +index 80268eb..4ef3c9a 100644 +--- a/src/plugins/quota/quota-status.c ++++ b/src/plugins/quota/quota-status.c +@@ -11,6 +11,7 @@ + #include "mail-storage-service.h" + #include "quota-private.h" + #include "quota-plugin.h" ++#include + + enum quota_protocol { + QUOTA_PROTOCOL_UNKNOWN = 0, +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue May 28 08:11:39 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 28 May 2013 06:11:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21213] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21213 http://gar.svn.sourceforge.net/gar/?rev=21213&view=rev Author: cgrzemba Date: 2013-05-28 06:11:38 +0000 (Tue, 28 May 2013) Log Message: ----------- cups/trunk: - -z ignore has removed dependency to gpg-error0 Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-05-27 23:08:30 UTC (rev 21212) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-05-28 06:11:38 UTC (rev 21213) @@ -136,7 +136,7 @@ RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsmime1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsppdc1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus1-3 -RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgpg-error0 +# RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibldap2-4-2 @@ -168,7 +168,7 @@ PKGFILES_CSWcupsclient += $(datadir)/doc/cupsclient.* RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups2 RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcupsimage2 -RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgpg-error0 +# RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgpg-error0 PACKAGES += CSWcups-dev SPKG_DESC_CSWcups-dev = CUPS header files @@ -200,7 +200,7 @@ SPKG_DESC_CSWlibcups2 = CUPS libraries, libcups.so.2 PKGFILES_CSWlibcups2 += $(call pkgfiles_lib,libcups.so.2) RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgnutls28 -RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgpg-error0 +# RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibz1 PACKAGES += CSWlibcupscgi1 @@ -230,7 +230,7 @@ SPKG_DESC_CSWlibcupsppdc1 = CUPS libraries, libcupsppdc.so.1 PKGFILES_CSWlibcupsppdc1 += $(call pkgfiles_lib,libcupsppdc.so.1) RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0 +# RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0 # For some reason -norunpath is not used here, investigate later # CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue May 28 09:34:52 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 28 May 2013 07:34:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21214] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 21214 http://gar.svn.sourceforge.net/gar/?rev=21214&view=rev Author: janholzh Date: 2013-05-28 07:34:51 +0000 (Tue, 28 May 2013) Log Message: ----------- ffmpeg/trunk: link against libx264-133 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2013-05-28 06:11:38 UTC (rev 21213) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2013-05-28 07:34:51 UTC (rev 21214) @@ -47,7 +47,7 @@ RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-130 +RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-133 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibgcc-s1 PACKAGES += CSWlibavdevice54 @@ -67,7 +67,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-130 +RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-133 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibgcc-s1 PACKAGES += CSWlibavfilter3 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 May 28 10:30:01 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 28 May 2013 08:30:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21215] csw/mgar/pkg/fluidsynth/trunk/Makefile Message-ID: Revision: 21215 http://gar.svn.sourceforge.net/gar/?rev=21215&view=rev Author: lblume Date: 2013-05-28 08:30:00 +0000 (Tue, 28 May 2013) Log Message: ----------- fluidsynth/trunk: Use Studio to remove a dependency Modified Paths: -------------- csw/mgar/pkg/fluidsynth/trunk/Makefile Modified: csw/mgar/pkg/fluidsynth/trunk/Makefile =================================================================== --- csw/mgar/pkg/fluidsynth/trunk/Makefile 2013-05-28 07:34:51 UTC (rev 21214) +++ csw/mgar/pkg/fluidsynth/trunk/Makefile 2013-05-28 08:30:00 UTC (rev 21215) @@ -14,8 +14,6 @@ PATCHFILES += 0001-translate_error-is-not-on-solaris.patch -GARCOMPILER=GCC4 - BUILD64_LIBS_ONLY = 1 PACKAGES += CSWfluidsynth @@ -37,15 +35,12 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibdbus1-3 -RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibsndfile RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWfluidsynth-dev += CSWlibfluidsynth1 -EXTRA_CFLAGS = -Dsun - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk 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 May 28 11:48:56 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 28 May 2013 09:48:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21216] csw/mgar/pkg/jbig2dec/trunk Message-ID: Revision: 21216 http://gar.svn.sourceforge.net/gar/?rev=21216&view=rev Author: dmichelsen Date: 2013-05-28 09:48:55 +0000 (Tue, 28 May 2013) Log Message: ----------- jbig2dec/trunk: Add patch Modified Paths: -------------- csw/mgar/pkg/jbig2dec/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/jbig2dec/trunk/files/0001-Use-accessor-function.patch Modified: csw/mgar/pkg/jbig2dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/jbig2dec/trunk/Makefile 2013-05-28 08:30:00 UTC (rev 21215) +++ csw/mgar/pkg/jbig2dec/trunk/Makefile 2013-05-28 09:48:55 UTC (rev 21216) @@ -1,6 +1,7 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # + NAME = jbig2dec VERSION = 0.11 GARTYPE = v2 @@ -11,6 +12,7 @@ DISTFILES = $(DISTNAME).tar.xz PATCHFILES += 0001-Fix-test-in-testsuite.patch +PATCHFILES += 0001-Use-accessor-function.patch VENDOR_URL = http://jbig2dec.sourceforge.net @@ -22,6 +24,7 @@ PACKAGES += CSWlibjbig2dec0 SPKG_DESC_CSWlibjbig2dec0 = Library for decoding JBIG2 bi-level images, libjbig2dec.so.0 PKGFILES_CSWlibjbig2dec0 += $(call pkgfiles_lib,libjbig2dec.so.0) +RUNTIME_DEP_PKGS_CSWjbig2dec += CSWlibpng15-15 PACKAGES += CSWlibjbig2dec-dev SPKG_DESC_CSWlibjbig2dec-dev = Development files for libjbig2dec.so.0 @@ -31,10 +34,10 @@ BUILD64 = 1 ISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(DIRPATHS) -# We need /opt/csw/bin/python for the testsuite -TEST_ENV_PATH = $(bindir):$(PATH) +# Detection of PNG support is broken due to test for removed legacy function, hardcode for now +CONFIGURE_ARGS += ac_cv_lib_png_png_check_sig=yes include gar/category.mk Added: csw/mgar/pkg/jbig2dec/trunk/files/0001-Use-accessor-function.patch =================================================================== --- csw/mgar/pkg/jbig2dec/trunk/files/0001-Use-accessor-function.patch (rev 0) +++ csw/mgar/pkg/jbig2dec/trunk/files/0001-Use-accessor-function.patch 2013-05-28 09:48:55 UTC (rev 21216) @@ -0,0 +1,34 @@ +From 98117d1651483893071cc3a87c9e52a41847110c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 28 May 2013 11:41:12 +0200 +Subject: [PATCH] Use accessor function + +--- + jbig2_image_png.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/jbig2_image_png.c b/jbig2_image_png.c +index 342c0c3..13c0b67 100644 +--- a/jbig2_image_png.c ++++ b/jbig2_image_png.c +@@ -33,7 +33,7 @@ jbig2_png_write_data(png_structp png_ptr, png_bytep data, png_size_t length) + { + png_size_t check; + +- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr); ++ check = fwrite(data, 1, length, png_get_io_ptr(png_ptr)); + if (check != length) { + png_error(png_ptr, "Write Error"); + } +@@ -43,7 +43,7 @@ static void + jbig2_png_flush(png_structp png_ptr) + { + png_FILE_p io_ptr; +- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr)); ++ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr); + if (io_ptr != NULL) + fflush(io_ptr); + } +-- +1.8.1.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 Tue May 28 13:34:36 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 28 May 2013 11:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21217] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: Revision: 21217 http://gar.svn.sourceforge.net/gar/?rev=21217&view=rev Author: dmichelsen Date: 2013-05-28 11:34:36 +0000 (Tue, 28 May 2013) Log Message: ----------- ghostscript/trunk: Disable SSE2 for pentium_pro and depend on now split CSWlibjbig2dec0 Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2013-05-28 09:48:55 UTC (rev 21216) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2013-05-28 11:34:36 UTC (rev 21217) @@ -35,7 +35,7 @@ RUNTIME_DEP_PKGS_CSWghostscript += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWghostscript += CSWjbig2dec +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibjbig2dec0 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibcupsimage2 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibidn11 @@ -54,6 +54,10 @@ CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/unix-lpr.sh CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/lprsetup.sh CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/unix-lpr.sh +CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/unix-lpr.sh +CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/lprsetup.sh +CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/lprsetup.sh +CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/unix-lpr.sh CHECKPKG_OVERRIDES_CSWghostscript += missing-dependency|CSWemacs-common @@ -69,7 +73,7 @@ RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibcupsimage2 -RUNTIME_DEP_PKGS_CSWlibgs9 += CSWjbig2dec +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibjbig2dec0 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibcups2 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibidn11 @@ -94,6 +98,10 @@ CONFIGURE_ARGS-64 += --disable-cups CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +# pentium_pro does not have SSE2 and the detection does not work +CONFIGURE_ARGS-32-i386 += --disable-sse2 +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)-$(GARCH)) + # We want the shared library BUILD_ARGS += so 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 May 28 15:26:05 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 28 May 2013 13:26:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21218] csw/mgar/pkg/fluidsynth/trunk Message-ID: Revision: 21218 http://gar.svn.sourceforge.net/gar/?rev=21218&view=rev Author: lblume Date: 2013-05-28 13:26:05 +0000 (Tue, 28 May 2013) Log Message: ----------- fluidsynth/trunk: Include official patches to fix the Solaris build Modified Paths: -------------- csw/mgar/pkg/fluidsynth/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/fluidsynth/trunk/files/0002-fix-solaris-build.patch csw/mgar/pkg/fluidsynth/trunk/files/0003-fix-previous.patch Removed Paths: ------------- csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch Modified: csw/mgar/pkg/fluidsynth/trunk/Makefile =================================================================== --- csw/mgar/pkg/fluidsynth/trunk/Makefile 2013-05-28 11:34:36 UTC (rev 21217) +++ csw/mgar/pkg/fluidsynth/trunk/Makefile 2013-05-28 13:26:05 UTC (rev 21218) @@ -12,7 +12,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += 0001-translate_error-is-not-on-solaris.patch +# Official patches to fix the Solaris build - included upstream +PATCHFILES += 0002-fix-solaris-build.patch +PATCHFILES += 0003-fix-previous.patch BUILD64_LIBS_ONLY = 1 Deleted: csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch =================================================================== --- csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch 2013-05-28 11:34:36 UTC (rev 21217) +++ csw/mgar/pkg/fluidsynth/trunk/files/0001-translate_error-is-not-on-solaris.patch 2013-05-28 13:26:05 UTC (rev 21218) @@ -1,29 +0,0 @@ ---- a/src/bindings/fluid_rtkit.c.original Thu Aug 16 06:01:13 2012 -+++ b/src/bindings/fluid_rtkit.c Mon May 27 17:45:27 2013 -@@ -34,7 +34,7 @@ - #include "fluid_rtkit.h" - - --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__linux__) || defined(__APPLE__) - - #ifndef _GNU_SOURCE - #define _GNU_SOURCE -@@ -47,7 +47,6 @@ - #include - #include - -- - static pid_t _gettid(void) { - return (pid_t) syscall(SYS_gettid); - } -@@ -342,7 +341,9 @@ - dbus_error_init(&error); - conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); - if (conn == NULL) { -+#if defined(__linux__) || defined(__APPLE__) - res = translate_error(error.name); -+#endif - dbus_error_free(&error); - return res; - } Added: csw/mgar/pkg/fluidsynth/trunk/files/0002-fix-solaris-build.patch =================================================================== --- csw/mgar/pkg/fluidsynth/trunk/files/0002-fix-solaris-build.patch (rev 0) +++ csw/mgar/pkg/fluidsynth/trunk/files/0002-fix-solaris-build.patch 2013-05-28 13:26:05 UTC (rev 21218) @@ -0,0 +1,63 @@ +--- a/src/bindings/fluid_rtkit.c ++++ b/src/bindings/fluid_rtkit.c +@@ -290,28 +290,6 @@ + dbus_error_free(&error); + + return ret; +-} +- +-#else +- +-int rtkit_make_realtime(DBusConnection *connection, pid_t thread, int priority) { +- return -ENOTSUP; +-} +- +-int rtkit_make_high_priority(DBusConnection *connection, pid_t thread, int nice_level) { +- return -ENOTSUP; +-} +- +-int rtkit_get_max_realtime_priority(DBusConnection *connection) { +- return -ENOTSUP; +-} +- +-int rtkit_get_min_nice_level(DBusConnection *connection, int* min_nice_level) { +- return -ENOTSUP; +-} +- +-long long rtkit_get_rttime_nsec_max(DBusConnection *connection) { +- return -ENOTSUP; + } + + #endif +@@ -375,4 +353,31 @@ + + } + ++ ++#else ++ ++int rtkit_make_realtime(DBusConnection *connection, pid_t thread, int priority) { ++ return -ENOTSUP; ++} ++ ++int rtkit_make_high_priority(DBusConnection *connection, pid_t thread, int nice_level) { ++ return -ENOTSUP; ++} ++ ++int rtkit_get_max_realtime_priority(DBusConnection *connection) { ++ return -ENOTSUP; ++} ++ ++int rtkit_get_min_nice_level(DBusConnection *connection, int* min_nice_level) { ++ return -ENOTSUP; ++} ++ ++long long rtkit_get_rttime_nsec_max(DBusConnection *connection) { ++ return -ENOTSUP; ++} ++ ++int fluid_rtkit_make_realtime(pid_t thread, int priority) { ++ return -ENOTSUP; ++} ++ + #endif Added: csw/mgar/pkg/fluidsynth/trunk/files/0003-fix-previous.patch =================================================================== --- csw/mgar/pkg/fluidsynth/trunk/files/0003-fix-previous.patch (rev 0) +++ csw/mgar/pkg/fluidsynth/trunk/files/0003-fix-previous.patch 2013-05-28 13:26:05 UTC (rev 21218) @@ -0,0 +1,20 @@ +--- a/src/bindings/fluid_rtkit.c ++++ b/src/bindings/fluid_rtkit.c +@@ -291,8 +291,6 @@ + + return ret; + } +- +-#endif + + #ifndef RLIMIT_RTTIME + # define RLIMIT_RTTIME 15 +@@ -380,4 +378,6 @@ + return -ENOTSUP; + } + +-#endif ++#endif /* defined(__linux__) || defined(__APPLE__) */ ++ ++#endif /* DBUS_SUPPORT */ + 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 May 28 16:30:46 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 28 May 2013 14:30:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21219] csw/mgar/pkg Message-ID: Revision: 21219 http://gar.svn.sourceforge.net/gar/?rev=21219&view=rev Author: dmichelsen Date: 2013-05-28 14:30:46 +0000 (Tue, 28 May 2013) Log Message: ----------- jasper/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/jasper/ csw/mgar/pkg/jasper/Makefile csw/mgar/pkg/jasper/branches/ csw/mgar/pkg/jasper/tags/ csw/mgar/pkg/jasper/trunk/ csw/mgar/pkg/jasper/trunk/Makefile csw/mgar/pkg/jasper/trunk/checksums csw/mgar/pkg/jasper/trunk/files/ Added: csw/mgar/pkg/jasper/Makefile =================================================================== --- csw/mgar/pkg/jasper/Makefile (rev 0) +++ csw/mgar/pkg/jasper/Makefile 2013-05-28 14:30:46 UTC (rev 21219) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/jasper/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/jasper/trunk/Makefile =================================================================== --- csw/mgar/pkg/jasper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jasper/trunk/Makefile 2013-05-28 14:30:46 UTC (rev 21219) @@ -0,0 +1,44 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = jasper +VERSION = 1.900.1 +GARTYPE = v2 + +DESCRIPTION = JasPer reference implementation of the codec specified by JPEG-2000 + +MASTER_SITES = http://www.ece.uvic.ca/~frodo/jasper/software/ +DISTFILES += $(DISTNAME).zip + +VENDOR_URL = http://www.ece.uvic.ca/~frodo/jasper/ + +BUILD_DEP_PKGS += CSWmesa +BUILD_DEP_PKGS += CSWfreeglut +BUILD_DEP_PKGS += CSWlibjpeg-dev + +PACKAGES += CSWjasper +SPKG_DESC_CSWjasper = JasPer reference implementation of the codec specified by JPEG-2000 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWjasper += CSWlibjasper1 +RUNTIME_DEP_PKGS_CSWjasper += CSWmesa +RUNTIME_DEP_PKGS_CSWjasper += CSWfreeglut + +PACKAGES += CSWlibjasper1 +SPKG_DESC_CSWlibjasper1 = Library for JPEG-2000 access, libjasper.so.1 +PKGFILES_CSWlibjasper1 += $(call pkgfiles_lib,libjasper.so.1) +RUNTIME_DEP_PKGS_CSWlibjasper1 += CSWlibjpeg7 + +PACKAGES += CSWlibjasper-dev +SPKG_DESC_CSWlibjasper-dev = Development files for libjasper.so.1 +PKGFILES_CSWlibjasper-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibjasper-dev += CSWlibjasper1 + +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-shared + +include gar/category.mk + Property changes on: csw/mgar/pkg/jasper/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/jasper/trunk/checksums =================================================================== --- csw/mgar/pkg/jasper/trunk/checksums (rev 0) +++ csw/mgar/pkg/jasper/trunk/checksums 2013-05-28 14:30:46 UTC (rev 21219) @@ -0,0 +1 @@ +a342b2b4495b3e1394e161eb5d85d754 jasper-1.900.1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue May 28 16:59:00 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 28 May 2013 14:59:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[21220] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 21220 http://gar.svn.sourceforge.net/gar/?rev=21220&view=rev Author: cgrzemba Date: 2013-05-28 14:58:59 +0000 (Tue, 28 May 2013) Log Message: ----------- cups/trunk: giving up: there are arch dependent runtime dependencies on gpg-error Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-05-28 14:30:46 UTC (rev 21219) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-05-28 14:58:59 UTC (rev 21220) @@ -78,7 +78,7 @@ BUILD_DEP_PKGS += CSWlibtiff-dev BUILD_DEP_PKGS += CSWlibkrb5-dev BUILD_DEP_PKGS += CSWlibgcrypt-dev -# BUILD_DEP_PKGS += CSWlibgpg-error-dev +BUILD_DEP_PKGS += CSWlibgpg-error-dev BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += SUNWhea BUILD_DEP_PKGS += SUNWlibm @@ -136,10 +136,11 @@ RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsmime1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsppdc1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus1-3 -# RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWcupsd_sparc += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWcupsd += $(RUNTIME_DEP_PKGS_CSWcupsd_$(GARCH)) # need /opt/csw/bin/pdftops PACKAGES += CSWcupsclient @@ -168,7 +169,8 @@ PKGFILES_CSWcupsclient += $(datadir)/doc/cupsclient.* RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups2 RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcupsimage2 -# RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWcupsclient_sparc += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWcupsclient += $(RUNTIME_DEP_PKGS_CSWcupsclient_$(GARCH)) PACKAGES += CSWcups-dev SPKG_DESC_CSWcups-dev = CUPS header files @@ -200,8 +202,9 @@ SPKG_DESC_CSWlibcups2 = CUPS libraries, libcups.so.2 PKGFILES_CSWlibcups2 += $(call pkgfiles_lib,libcups.so.2) RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgnutls28 -# RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibcups2_sparc += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibcups2 += $(RUNTIME_DEP_PKGS_CSWlibcups2_$(GARCH)) PACKAGES += CSWlibcupscgi1 SPKG_DESC_CSWlibcupscgi1 = CUPS libraries, libcupscgi.so.1 @@ -230,7 +233,8 @@ SPKG_DESC_CSWlibcupsppdc1 = CUPS libraries, libcupsppdc.so.1 PKGFILES_CSWlibcupsppdc1 += $(call pkgfiles_lib,libcupsppdc.so.1) RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibcups2 -# RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibcupsppdc1_sparc += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibcupsppdc1 +=$(RUNTIME_DEP_PKGS_CSWlibcupsppdc1_$(GARCH)) # For some reason -norunpath is not used here, investigate later # CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue May 28 18:38:02 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 28 May 2013 16:38:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21221] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 21221 http://gar.svn.sourceforge.net/gar/?rev=21221&view=rev Author: wahwah Date: 2013-05-28 16:38:02 +0000 (Tue, 28 May 2013) Log Message: ----------- lang-python/python/branches/python-3.3: This doesn't work. But I'm committing anyway. Also, I filed a bug at python.org Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-05-28 14:58:59 UTC (rev 21220) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-05-28 16:38:02 UTC (rev 21221) @@ -11,6 +11,7 @@ # Known issues: # # - No 64-bit build +# http://bugs.python.org/issue18083 # - ctypes module doesn't compile # - http://forums.sun.com/thread.jspa?threadID=5148204 # - http://bugs.python.org/issue4902 @@ -49,22 +50,13 @@ TEST_TARGET = test # There are problems with platform-dependent data in $(prefix)/lib/python3.3 -# BUILD64 = 1 -# ISAEXEC = 1 +# Installation paths are defined in: +# http://hg.python.org/cpython/file/26588b6a39d9/Makefile.pre.in#l114 +# http://wiki.debian.org/Python/MultiArch +GARFLAVOR = DBG +BUILD64 = 1 +ISAEXEC = 1 -# Maybe including just the libraries will work fine? -BUILD64_LIBS_ONLY = 1 - -# There is a file name conflict over libffi.so symlink between libffi package -# and a gcc-java package. While it will ultimately belong to libffi_dev, the -# symlink is currently under a subdirectory. -# pkgchk -L CSWlibffi-dev -# (...) -# /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev -# EXTRA_LINKER_FLAGS += $(libdir)/ffi - -# LDFLAGS += -L$(libdir)/ffi - BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS EXTRA_LINKER_FLAGS = -lsocket -lresolv -lrt @@ -214,4 +206,13 @@ include gar/category.mk +# There is a file name conflict over libffi.so symlink between libffi package +# and a gcc-java package. While it will ultimately belong to libffi_dev, the +# symlink is currently under a subdirectory. +# pkgchk -L CSWlibffi-dev +# (...) +# /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev +# EXTRA_LINKER_FLAGS += $(libdir)/ffi +# LDFLAGS += -L$(libdir)/ffi + LINKER_FLAGS := -L$(libdir)/ffi $(LINKER_FLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 29 10:56:20 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 29 May 2013 08:56:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21222] csw/mgar/pkg/bind/trunk Message-ID: Revision: 21222 http://gar.svn.sourceforge.net/gar/?rev=21222&view=rev Author: bonivart Date: 2013-05-29 08:56:18 +0000 (Wed, 29 May 2013) Log Message: ----------- bind/trunk: update to 9.9.3 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 2013-05-28 16:38:02 UTC (rev 21221) +++ csw/mgar/pkg/bind/trunk/Makefile 2013-05-29 08:56:18 UTC (rev 21222) @@ -2,34 +2,27 @@ # owner/group for device files? (root:sys) NAME = bind -VERSION = 9.9.2 +VERSION = 9.9.3 GARTYPE = v2 # Enable these for Px-releases -#RELEASE = rc1 -RELEASE = P2 -DISTVERSION = $(VERSION)-$(RELEASE) -SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(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 - BIND is open-source software that implements the Domain Name System (DNS) - protocols for the Internet. It is a reference implementation of those - protocols, but it is also production-grade software, suitable for use in - high-volume and high-reliability applications. endef # Enable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -#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 @@ -62,7 +55,6 @@ RUNTIME_DEP_PKGS_CSWlibbind += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibbind += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibgcc-s1 PACKAGES += CSWbindutils @@ -99,6 +91,7 @@ PKGFILES_CSWbindutils = $(bindir)/.* PKGFILES_CSWbindchroot = .*chroot.* +TEST_SCRIPTS = custom INSTALL_SCRIPTS = custom PROTOTYPE_MODIFIERS = 1 @@ -120,21 +113,26 @@ 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/liblwres.so.90.0.1|soname=liblwres.so.90|pkgname=CSWlibbind|expected=CSWliblwres90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.0.2|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.90.0.2|soname=libisccc.so.90|pkgname=CSWlibbind|expected=CSWlibisccc90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.92.1.0|soname=libisc.so.92|pkgname=CSWlibbind|expected=CSWlibisc92 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.95.1.1|soname=libdns.so.95|pkgname=CSWlibbind|expected=CSWlibdns95 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.5|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.7|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.99.0.1|soname=libdns.so.99|pkgname=CSWlibbind|expected=CSWlibdns99 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.95.0.1|soname=libisc.so.95|pkgname=CSWlibbind|expected=CSWlibisc95 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.90.0.3|soname=libisccc.so.90|pkgname=CSWlibbind|expected=CSWlibisccc90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.0.6|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.90.0.4|soname=liblwres.so.90|pkgname=CSWlibbind|expected=CSWliblwres90 # Some new checks, have no idea about their relevance -CHECKPKG_OVERRIDES_CSWlibbind += soname-unused CHECKPKG_OVERRIDES_CSWlibbind += no-direct-binding include gar/category.mk DOCLIST = README.CSW db.127.0.0 db.localhost named.conf named.root rndc.key +test-custom: + @echo " ==> Testing $(NAME) (custom)" + ( cd $(WORKSRC) ; \ + gmake force-test ) + @$(MAKECOOKIE) + install-custom: @echo " ==> Installing $(NAME) (custom)" @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2013-05-28 16:38:02 UTC (rev 21221) +++ csw/mgar/pkg/bind/trunk/checksums 2013-05-29 08:56:18 UTC (rev 21222) @@ -1 +1 @@ -2be7763c99b7e7b42ac3a18a267ce1aa bind-9.9.2-P2.tar.gz +7baa8359f0773e04f63d7e694db1909c bind-9.9.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 29 12:23:52 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 May 2013 10:23:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21223] csw/mgar/pkg/nettle/trunk Message-ID: Revision: 21223 http://gar.svn.sourceforge.net/gar/?rev=21223&view=rev Author: dmichelsen Date: 2013-05-29 10:23:52 +0000 (Wed, 29 May 2013) Log Message: ----------- nettle/trunk: Update to 2.7.1 Modified Paths: -------------- csw/mgar/pkg/nettle/trunk/Makefile csw/mgar/pkg/nettle/trunk/checksums Modified: csw/mgar/pkg/nettle/trunk/Makefile =================================================================== --- csw/mgar/pkg/nettle/trunk/Makefile 2013-05-29 08:56:18 UTC (rev 21222) +++ csw/mgar/pkg/nettle/trunk/Makefile 2013-05-29 10:23:52 UTC (rev 21223) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = nettle -VERSION = 2.7 +VERSION = 2.7.1 GARTYPE = v2 DESCRIPTION = A low-level cryptographic library Modified: csw/mgar/pkg/nettle/trunk/checksums =================================================================== --- csw/mgar/pkg/nettle/trunk/checksums 2013-05-29 08:56:18 UTC (rev 21222) +++ csw/mgar/pkg/nettle/trunk/checksums 2013-05-29 10:23:52 UTC (rev 21223) @@ -1 +1 @@ -2caa1bd667c35db71becb93c5d89737f nettle-2.7.tar.gz +003d5147911317931dd453520eb234a5 nettle-2.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed May 29 12:55:08 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 29 May 2013 10:55:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[21224] csw/mgar/pkg/miltergreylist/trunk/files/ CSWmiltergreylist.init Message-ID: Revision: 21224 http://gar.svn.sourceforge.net/gar/?rev=21224&view=rev Author: bonivart Date: 2013-05-29 10:55:08 +0000 (Wed, 29 May 2013) Log Message: ----------- miltergreylist/trunk: fix init script Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init Modified: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init 2013-05-29 10:23:52 UTC (rev 21223) +++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init 2013-05-29 10:55:08 UTC (rev 21224) @@ -1,12 +1,12 @@ #!/sbin/sh -# 2009-10-13 Peter Bonivart +# 2013-05-29 Peter Bonivart if [ -f /lib/svc/share/smf_include.sh ]; then . /lib/svc/share/smf_include.sh fi -MILDIR=/var/opt/csw/miltergreylist +MILDIR=/var/opt/csw/milter-greylist BINDIR=/opt/csw/bin USER=greylist 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 May 30 11:48:00 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 30 May 2013 09:48:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[21225] csw/mgar/pkg/scummvm/trunk Message-ID: Revision: 21225 http://gar.svn.sourceforge.net/gar/?rev=21225&view=rev Author: lblume Date: 2013-05-30 09:47:56 +0000 (Thu, 30 May 2013) Log Message: ----------- scummvm/trunk: Bump to version 1.6.0; add fluidsynth support; some minor fixes Modified Paths: -------------- csw/mgar/pkg/scummvm/trunk/Makefile csw/mgar/pkg/scummvm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/scummvm/trunk/files/ csw/mgar/pkg/scummvm/trunk/files/0001-redefining-FILE.patch csw/mgar/pkg/scummvm/trunk/files/0002-configure-really-is-a-bash-script.patch Modified: csw/mgar/pkg/scummvm/trunk/Makefile =================================================================== --- csw/mgar/pkg/scummvm/trunk/Makefile 2013-05-29 10:55:08 UTC (rev 21224) +++ csw/mgar/pkg/scummvm/trunk/Makefile 2013-05-30 09:47:56 UTC (rev 21225) @@ -1,5 +1,5 @@ -NAME = scummvm -VERSION = 1.4.0 +NAME = scummvm +VERSION = 1.6.0 GARTYPE = v2 DESCRIPTION = Virtual machine for several classic graphical point-and-click adventure games @@ -20,7 +20,15 @@ RUNTIME_DEP_PKGS_CSWscummvm += CSWlibmad0 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibvorbisfile3 +RUNTIME_DEP_PKGS_CSWscummvm += CSWlibfluidsynth1 +BUILD64=1 + +BUILD_DEP_PKGS_CSWscummvm += CSWlibsdl-dev +BUILD_DEP_PKGS_CSWscummvm += CSWfluidsynth-dev + +PATCHFILES += 0001-redefining-FILE.patch +PATCHFILES += 0002-configure-really-is-a-bash-script.patch # Don't know about these, investigate later CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/bin/scummvm CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/share/man/man6/scummvm.6 @@ -33,7 +41,10 @@ CONFIGURE_ARGS += --mandir=$(mandir) CONFIGURE_ARGS += --datadir=$(datadir) CONFIGURE_ARGS += --libdir=$(libdir) -CONFIGURE_ARGS += --enable-all-engines +CONFIGURE_ARGS += --enable-release +CONFIGURE_ARGS += --enable-plugins +CONFIGURE_ARGS += --default-dynamic +CONFIGURE_ARGS += --enable-updates TEST_TARGET = test Modified: csw/mgar/pkg/scummvm/trunk/checksums =================================================================== --- csw/mgar/pkg/scummvm/trunk/checksums 2013-05-29 10:55:08 UTC (rev 21224) +++ csw/mgar/pkg/scummvm/trunk/checksums 2013-05-30 09:47:56 UTC (rev 21225) @@ -1 +1 @@ -361000b78ebf0d0f449e98238d677be1 scummvm-1.4.0.tar.bz2 +473c151ff44e3db7b603ecacd800a0d2 scummvm-1.6.0.tar.bz2 Added: csw/mgar/pkg/scummvm/trunk/files/0001-redefining-FILE.patch =================================================================== --- csw/mgar/pkg/scummvm/trunk/files/0001-redefining-FILE.patch (rev 0) +++ csw/mgar/pkg/scummvm/trunk/files/0001-redefining-FILE.patch 2013-05-30 09:47:56 UTC (rev 21225) @@ -0,0 +1,18 @@ +--- ./backends/platform/sdl/sdl-sys.h Sun May 26 22:21:47 2013 ++++ ./backends/platform/sdl/sdl-sys.h Wed May 29 18:04:58 2013 +@@ -34,10 +34,15 @@ + // Remove FILE override from common/forbidden.h, and replace + // it with an alternate slightly less unfriendly override. + #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_FILE) ++#if defined(__sun) + #undef FILE ++typedef __FILE FILE; ++#else ++#undef FILE + typedef struct { int FAKE; } FAKE_FILE; + #define FILE FAKE_FILE + #endif ++#endif + + #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_strcasecmp) + #undef strcasecmp Added: csw/mgar/pkg/scummvm/trunk/files/0002-configure-really-is-a-bash-script.patch =================================================================== --- csw/mgar/pkg/scummvm/trunk/files/0002-configure-really-is-a-bash-script.patch (rev 0) +++ csw/mgar/pkg/scummvm/trunk/files/0002-configure-really-is-a-bash-script.patch 2013-05-30 09:47:56 UTC (rev 21225) @@ -0,0 +1,8 @@ +--- ./configure.original Mon May 27 21:52:21 2013 ++++ ./configure Mon May 27 21:51:17 2013 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # configure -- custom configure script for ScummVM. + # 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 May 30 20:31:22 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 30 May 2013 18:31:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21226] csw/mgar/pkg/scummvm/trunk/Makefile Message-ID: Revision: 21226 http://gar.svn.sourceforge.net/gar/?rev=21226&view=rev Author: lblume Date: 2013-05-30 18:31:21 +0000 (Thu, 30 May 2013) Log Message: ----------- scummvm/trunk: Clean up dependencies and overrides; add isaexec Modified Paths: -------------- csw/mgar/pkg/scummvm/trunk/Makefile Modified: csw/mgar/pkg/scummvm/trunk/Makefile =================================================================== --- csw/mgar/pkg/scummvm/trunk/Makefile 2013-05-30 09:47:56 UTC (rev 21225) +++ csw/mgar/pkg/scummvm/trunk/Makefile 2013-05-30 18:31:21 UTC (rev 21226) @@ -9,29 +9,32 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -RUNTIME_DEP_PKGS_CSWscummvm += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibz1 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibogg0 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibflac8 -RUNTIME_DEP_PKGS_CSWscummvm += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWscummvm += CSWlibmad0 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibvorbisfile3 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibfluidsynth1 +RUNTIME_DEP_PKGS_CSWscummvm += CSWmesa +RUNTIME_DEP_PKGS_CSWscummvm += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWscummvm += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWscummvm += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWscummvm += CSWlibtheoradec1 -BUILD64=1 +BUILD64 = 1 +ISAEXEC = 1 BUILD_DEP_PKGS_CSWscummvm += CSWlibsdl-dev BUILD_DEP_PKGS_CSWscummvm += CSWfluidsynth-dev +BUILD_DEP_PKGS_CSWscummvm += CSWlibmad-dev +BUILD_DEP_PKGS_CSWscummvm += CSWlibfaad-dev +BUILD_DEP_PKGS_CSWscummvm += CSWlibtheora-dev PATCHFILES += 0001-redefining-FILE.patch PATCHFILES += 0002-configure-really-is-a-bash-script.patch -# Don't know about these, investigate later -CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/bin/scummvm -CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/share/man/man6/scummvm.6 GARCOMPILER = GCC4 @@ -45,6 +48,7 @@ CONFIGURE_ARGS += --enable-plugins CONFIGURE_ARGS += --default-dynamic CONFIGURE_ARGS += --enable-updates +CONFIGURE_ARGS += --disable-nasm TEST_TARGET = test 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 May 30 20:39:36 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 30 May 2013 18:39:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21227] csw/mgar/pkg/dbus/trunk Message-ID: Revision: 21227 http://gar.svn.sourceforge.net/gar/?rev=21227&view=rev Author: dmichelsen Date: 2013-05-30 18:39:35 +0000 (Thu, 30 May 2013) Log Message: ----------- dbus/trunk: Update to 1.7.2 Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile csw/mgar/pkg/dbus/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2013-05-30 18:31:21 UTC (rev 21226) +++ csw/mgar/pkg/dbus/trunk/Makefile 2013-05-30 18:39:35 UTC (rev 21227) @@ -5,7 +5,7 @@ # ! cleanup of /usr/share, /usr/local occurrences NAME = dbus -VERSION = 1.7.0 +VERSION = 1.7.2 GARTYPE = v2 DESCRIPTION = DBus Message Bus System @@ -30,10 +30,6 @@ DISTFILES += cswusergroup DISTFILES += cswdbus -# Use patch until this is fixed: -# https://bugs.freedesktop.org/show_bug.cgi?id=63071 -PATCHFILES += 0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch - PACKAGES += CSWdbus CATALOGNAME_CSWdbus = dbus SPKG_DESC_CSWdbus = $(DESCRIPTION) @@ -56,12 +52,12 @@ OBSOLETED_BY_CSWlibdbus1-3 += CSWlibdbus # These are search pathes: # /opt/csw/share:/usr/local/share:/usr/share: -CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/libdbus-1.so.3.8.0 -CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/libdbus-1.so.3.8.0 -CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.0 -CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.0 -CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libdbus-1.so.3.8.0 -CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libdbus-1.so.3.8.0 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/libdbus-1.so.3.8.1 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/libdbus-1.so.3.8.1 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.1 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.1 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libdbus-1.so.3.8.1 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libdbus-1.so.3.8.1 PACKAGES += CSWlibdbus-dev SPKG_DESC_CSWlibdbus-dev = Development files for libdbus @@ -100,10 +96,6 @@ include gar/category.mk -post-patch: - cd $(WORKSRC) && PATH=$(prefix)/gnu:$(PATH) ./autogen.sh - @$(MAKECOOKIE) - post-merge-all: ginstall -d $(PKGROOT)/etc/opt/csw/init.d ginstall $(WORKDIR)/cswdbus $(PKGROOT)/etc/opt/csw/init.d/cswdbus Modified: csw/mgar/pkg/dbus/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus/trunk/checksums 2013-05-30 18:31:21 UTC (rev 21226) +++ csw/mgar/pkg/dbus/trunk/checksums 2013-05-30 18:39:35 UTC (rev 21227) @@ -1 +1 @@ -a23c223efd7003b88bef6a4d32d82a99 dbus-1.7.0.tar.gz +72b38f1ee0b60d45fbb4d43a96ee3262 dbus-1.7.2.tar.gz Deleted: csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch =================================================================== --- csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch 2013-05-30 18:31:21 UTC (rev 21226) +++ csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch 2013-05-30 18:39:35 UTC (rev 21227) @@ -1,40 +0,0 @@ -From 713c89789b8e5f7e4a0cbe69d11d07829141201f Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 3 Apr 2013 10:38:51 +0200 -Subject: [PATCH] If alloca.h is available it is required (e.g. on Solaris 10) - ---- - configure.ac | 2 ++ - dbus/dbus-sysdeps-unix.c | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index ee89dcb..3bd2405 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -688,6 +688,8 @@ AC_CHECK_HEADERS(ws2tcpip.h) - - AC_CHECK_HEADERS(wspiapi.h) - -+AC_CHECK_HEADERS(alloca.h) -+ - # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris - # - case $host_os in -diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c -index 30606ff..88db415 100644 ---- a/dbus/dbus-sysdeps-unix.c -+++ b/dbus/dbus-sysdeps-unix.c -@@ -72,6 +72,9 @@ - #ifdef HAVE_GETPEERUCRED - #include - #endif -+#ifdef HAVE_ALLOCA_H -+#include -+#endif - - #ifdef HAVE_ADT - #include --- -1.8.1.4 - Deleted: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff =================================================================== --- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff 2013-05-30 18:31:21 UTC (rev 21226) +++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff 2013-05-30 18:39:35 UTC (rev 21227) @@ -1,13 +0,0 @@ -diff --speed-large-files --minimal -Nru dbus-sysdeps.h.orig dbus-sysdeps.h ---- dbus-1.3.1.orig/dbus/dbus-sysdeps.h 2010-07-03 23:01:04.802652103 +0200 -+++ dbus-1.3.1/dbus/dbus-sysdeps.h 2010-07-03 23:01:16.801332639 +0200 -@@ -27,6 +27,8 @@ - - #include "config.h" - -+#include -+ - #ifdef HAVE_STDINT_H - #include - #endif - 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 May 30 23:51:56 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 30 May 2013 21:51:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21228] csw/mgar/pkg/scummvm/trunk/Makefile Message-ID: Revision: 21228 http://gar.svn.sourceforge.net/gar/?rev=21228&view=rev Author: lblume Date: 2013-05-30 21:51:56 +0000 (Thu, 30 May 2013) Log Message: ----------- scummvm/trunk: Default for data is not proper Modified Paths: -------------- csw/mgar/pkg/scummvm/trunk/Makefile Modified: csw/mgar/pkg/scummvm/trunk/Makefile =================================================================== --- csw/mgar/pkg/scummvm/trunk/Makefile 2013-05-30 18:39:35 UTC (rev 21227) +++ csw/mgar/pkg/scummvm/trunk/Makefile 2013-05-30 21:51:56 UTC (rev 21228) @@ -42,7 +42,7 @@ CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --bindir=$(bindir) CONFIGURE_ARGS += --mandir=$(mandir) -CONFIGURE_ARGS += --datadir=$(datadir) +CONFIGURE_ARGS += --datarootdir=$(datadir) CONFIGURE_ARGS += --libdir=$(libdir) CONFIGURE_ARGS += --enable-release CONFIGURE_ARGS += --enable-plugins 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 May 31 10:58:13 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 31 May 2013 08:58:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21229] csw/mgar/pkg/libxpm/ Message-ID: Revision: 21229 http://gar.svn.sourceforge.net/gar/?rev=21229&view=rev Author: dmichelsen Date: 2013-05-31 08:58:11 +0000 (Fri, 31 May 2013) Log Message: ----------- libxpm: Remove, as the current build recipe is in xpm/ Removed Paths: ------------- csw/mgar/pkg/libxpm/ 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 May 31 13:21:32 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 31 May 2013 11:21:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21230] csw/mgar/pkg/jasper/trunk/Makefile Message-ID: Revision: 21230 http://gar.svn.sourceforge.net/gar/?rev=21230&view=rev Author: dmichelsen Date: 2013-05-31 11:21:32 +0000 (Fri, 31 May 2013) Log Message: ----------- jasper/trunk: Include docs and obsolete CSWjasperdocs Modified Paths: -------------- csw/mgar/pkg/jasper/trunk/Makefile Modified: csw/mgar/pkg/jasper/trunk/Makefile =================================================================== --- csw/mgar/pkg/jasper/trunk/Makefile 2013-05-31 08:58:11 UTC (rev 21229) +++ csw/mgar/pkg/jasper/trunk/Makefile 2013-05-31 11:21:32 UTC (rev 21230) @@ -31,7 +31,9 @@ PACKAGES += CSWlibjasper-dev SPKG_DESC_CSWlibjasper-dev = Development files for libjasper.so.1 PKGFILES_CSWlibjasper-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibjasper-dev += $(docdir)/libjasper_dev/.* RUNTIME_DEP_PKGS_CSWlibjasper-dev += CSWlibjasper1 +OBSOLETED_BY_CSWlibjasper-dev += CSWjasperdocs BUILD64 = 1 ISAEXEC = 1 @@ -42,3 +44,7 @@ include gar/category.mk +post-install: + ginstall -d $(DESTDIR)$(docdir)/libjasper_dev + ginstall -m 0644 $(WORKSRC)/doc/* $(DESTDIR)$(docdir)/libjasper_dev + @$(MAKECOOKIE) 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 May 31 14:23:41 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 31 May 2013 12:23:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21231] csw/mgar/pkg/ghostscript/trunk Message-ID: Revision: 21231 http://gar.svn.sourceforge.net/gar/?rev=21231&view=rev Author: dmichelsen Date: 2013-05-31 12:23:39 +0000 (Fri, 31 May 2013) Log Message: ----------- ghostscript/trunk: Add BUILD_DEP_PKGS, always enable CUPS, remove unused patches Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2013-05-31 12:23:39 UTC (rev 21231) @@ -18,14 +18,17 @@ UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= UPSTREAM_USE_SF = 1 -## PATCHFILES += 0001-Support-libjpeg7.patch -#PATCHFILES += 0002-Rearrange-compiler-flags.patch -#PATCHFILES += 0003-Change-gcc-flags-to-sun.patch -## PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch -#PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch -## PATCHFILES += 0006-Fix-dynamic-link-flag.patch -#PATCHFILES += 0007-libidn-needs-L-opt-csw-lib.patch -#PATCHFILES += 0008-Wrong-place-in-configure.patch +# Many more missing +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibtiff-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWcups-dev +BUILD_DEP_PKGS += CSWlibjbig2dec-dev +BUILD_DEP_PKGS += CSWfconfig-dev +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWlibpaper-dev +BUILD_DEP_PKGS += CSWlibcairo2 PACKAGES += CSWghostscript SPKG_DESC_CSWghostscript = PostScript and PDF interpreter @@ -91,13 +94,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts +CONFIGURE_ARGS += --enable-cups -# There is no 64 bit cups ATM, see -# https://www.opencsw.org/mantis/view.php?id=5079 -CONFIGURE_ARGS-32 += --enable-cups -CONFIGURE_ARGS-64 += --disable-cups -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - # pentium_pro does not have SSE2 and the detection does not work CONFIGURE_ARGS-32-i386 += --disable-sse2 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)-$(GARCH)) Deleted: csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch 2013-05-31 12:23:39 UTC (rev 21231) @@ -1,14 +0,0 @@ ---- ghostscript-8.70.orig/jpeg/jcinit.c 2010-01-09 03:15:02.698411311 +0100 -+++ ghostscript-8.70/jpeg/jcinit.c 2010-01-09 03:46:28.021317069 +0100 -@@ -42,7 +42,11 @@ - jinit_forward_dct(cinfo); - /* Entropy encoding: either Huffman or arithmetic coding. */ - if (cinfo->arith_code) { -+#ifdef JERR_ARITH_NOTIMPL - ERREXIT(cinfo, JERR_ARITH_NOTIMPL); -+#else -+ jinit_arith_encoder(cinfo); -+#endif - } else { - if (cinfo->progressive_mode) { - #ifdef C_PROGRESSIVE_SUPPORTED Deleted: csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch 2013-05-31 12:23:39 UTC (rev 21231) @@ -1,23 +0,0 @@ ---- ghostscript-8.70.orig/base/jasper.mak 2008-04-11 00:08:20.000000000 +0200 -+++ ghostscript-8.70/base/jasper.mak 2010-01-09 06:04:15.251525415 +0100 -@@ -159,7 +159,8 @@ - $(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D) - - # define our specific compiler --JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) -+#JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) -+JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) $(CFLAGS) - JASO_=$(O_)$(JASOBJ) - - # switch in the selected .dev ---- ghostscript-8.70.orig/base/lib.mak 2009-07-22 23:09:42.000000000 +0200 -+++ ghostscript-8.70/base/lib.mak 2010-01-09 06:15:47.023956040 +0100 -@@ -30,7 +30,7 @@ - GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_) - GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_) - GLJBIG2CC=$(CC_) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_) --GLJASCC=$(CC_) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) -+GLJASCC=$(CC) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) $(CFLAGS) - GLLDFJB2CC=$(CC_) $(I_)$(LDF_JB2I_) $(II)$(GLI_)$(_I) $(JB2CF_) $(GLF_) - GLLWFJPXCC=$(CC_) $(I_)$(LWF_JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) - GLCCSHARED=$(CC_SHARED) $(GLCCFLAGS) Deleted: csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch 2013-05-31 12:23:39 UTC (rev 21231) @@ -1,24 +0,0 @@ ---- /home/hson/tmp/ghostscript-8.70/base/devs.mak 2009-02-14 01:46:58.000000000 +0100 -+++ ghostscript-8.70/base/devs.mak 2010-01-09 06:42:04.053689304 +0100 -@@ -418,10 +418,10 @@ - ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - - $(GLOBJ)lvga256.so : $(lvga256_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl - - $(GLOBJ)vgalib.so : $(vgalib_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl - - ### -------------------------- The X11 device -------------------------- ### - -@@ -524,7 +524,7 @@ - ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - - $(GLOBJ)X11.so : $(x11alt_) $(x11_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) -+ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) - - ###### --------------- Memory-buffered printer devices --------------- ###### - Deleted: csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch 2013-05-31 12:23:39 UTC (rev 21231) @@ -1,116 +0,0 @@ -diff -Nru ghostscript-8.70.orig/base/gs.mak ghostscript-8.70/base/gs.mak ---- ghostscript-8.70.orig/base/gs.mak 2009-01-27 21:43:37.000000000 +0100 -+++ ghostscript-8.70/base/gs.mak 2010-01-10 23:24:54.511788159 +0100 -@@ -363,7 +363,7 @@ - FEATURE_DEVS_EXTRA= - DEVICE_DEVS_EXTRA= - --DEVS_ALL=$(GLGENDIR)$(D)$(PLATFORM).dev\ -+DEVS_ALL=$(GLGENDIR)$(D)$(BUILD_PLATFORM).dev\ - $(FEATURE_DEVS) $(FEATURE_DEVS_EXTRA) \ - $(DEVICE_DEVS) $(DEVICE_DEVS1) \ - $(DEVICE_DEVS2) $(DEVICE_DEVS3) $(DEVICE_DEVS4) $(DEVICE_DEVS5) \ -@@ -375,7 +375,7 @@ - - devs_tr=$(GLGENDIR)$(D)devs.tr - $(devs_tr) : $(GS_MAK) $(TOP_MAKEFILES) $(ECHOGS_XE) -- $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(PLATFORM) -+ $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(BUILD_PLATFORM) - $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS) - $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS_EXTRA) - $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS) -diff -Nru ghostscript-8.70.orig/base/macos-mcp.mak ghostscript-8.70/base/macos-mcp.mak ---- ghostscript-8.70.orig/base/macos-mcp.mak 2009-01-08 10:17:18.000000000 +0100 -+++ ghostscript-8.70/base/macos-mcp.mak 2010-01-10 23:25:55.154224777 +0100 -@@ -75,7 +75,7 @@ - - # Define the platform name. - --PLATFORM=macos_ -+BUILD_PLATFORM=macos_ - - - # don't use any shared libraries, they are compiled into the Ghostscript Lib -@@ -267,7 +267,7 @@ - include $(GLSRCDIR)/unixhead.mak - - # Redefine the platform name before going on --PLATFORM=macos_ -+BUILD_PLATFORM=macos_ - - include $(GLSRCDIR)/gs.mak - # psromfs.mak must precede lib.mak -diff -Nru ghostscript-8.70.orig/base/msvclib.mak ghostscript-8.70/base/msvclib.mak ---- ghostscript-8.70.orig/base/msvclib.mak 2008-08-29 01:16:39.000000000 +0200 -+++ ghostscript-8.70/base/msvclib.mak 2010-01-10 23:26:01.887097616 +0100 -@@ -445,7 +445,7 @@ - - LIB_ONLY=$(GLOBJDIR)\gslib.obj $(GLOBJDIR)\gsnogc.obj $(GLOBJDIR)\gconfig.obj $(GLOBJDIR)\gscdefs.obj $(GLOBJDIR)\gsromfs$(COMPILE_INITS).obj - MAKEDLL=0 --PLATFORM=mslib32_ -+BUILD_PLATFORM=mslib32_ - - !include $(GLSRCDIR)\version.mak - !include $(GLSRCDIR)\msvccmd.mak -diff -Nru ghostscript-8.70.orig/base/openvms.mak ghostscript-8.70/base/openvms.mak ---- ghostscript-8.70.orig/base/openvms.mak 2009-01-08 10:17:18.000000000 +0100 -+++ ghostscript-8.70/base/openvms.mak 2010-01-10 23:25:36.911773955 +0100 -@@ -270,7 +270,7 @@ - - # Define the platform name. - --PLATFORM=openvms_ -+BUILD_PLATFORM=openvms_ - - # Define the name of the makefile -- used in dependencies. - -diff -Nru ghostscript-8.70.orig/base/openvms.mmk ghostscript-8.70/base/openvms.mmk ---- ghostscript-8.70.orig/base/openvms.mmk 2009-01-08 10:17:18.000000000 +0100 -+++ ghostscript-8.70/base/openvms.mmk 2010-01-10 23:25:27.461102799 +0100 -@@ -298,7 +298,7 @@ - - # Define the platform name. - --PLATFORM=openvms_ -+BUILD_PLATFORM=openvms_ - - # Define the name of the makefile -- used in dependencies. - -diff -Nru ghostscript-8.70.orig/base/unixhead.mak ghostscript-8.70/base/unixhead.mak ---- ghostscript-8.70.orig/base/unixhead.mak 2007-12-31 19:07:59.000000000 +0100 -+++ ghostscript-8.70/base/unixhead.mak 2010-01-10 23:22:33.391601312 +0100 -@@ -21,7 +21,7 @@ - # Define the platform name. For a "stock" System V platform, - # use sysv_ instead of unix_. - --PLATFORM=unix_ -+BUILD_PLATFORM=unix_ - - # Define the syntax for command, object, and executable files. - -diff -Nru ghostscript-8.70.orig/base/watclib.mak ghostscript-8.70/base/watclib.mak ---- ghostscript-8.70.orig/base/watclib.mak 2009-01-08 10:17:18.000000000 +0100 -+++ ghostscript-8.70/base/watclib.mak 2010-01-10 23:25:03.490859364 +0100 -@@ -115,7 +115,7 @@ - SYNC=winsync - !endif - --PLATFORM=watclib_ -+BUILD_PLATFORM=watclib_ - MAKEFILE=$(GLSRCDIR)\watclib.mak - TOP_MAKEFILES=$(MAKEFILE) $(GLSRCDIR)\wccommon.mak - PLATOPT= -diff -Nru ghostscript-8.70.orig/base/winlib.mak ghostscript-8.70/base/winlib.mak ---- ghostscript-8.70.orig/base/winlib.mak 2009-02-21 21:59:34.000000000 +0100 -+++ ghostscript-8.70/base/winlib.mak 2010-01-10 23:25:12.830496306 +0100 -@@ -28,8 +28,8 @@ - - # Define the platform name. - --!ifndef PLATFORM --PLATFORM=mswin32_ -+!ifndef BUILD_PLATFORM -+BUILD_PLATFORM=mswin32_ - !endif - - # Define the auxiliary program dependency. We use this to Deleted: csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch 2013-05-31 12:23:39 UTC (rev 21231) @@ -1,27 +0,0 @@ ---- ../../../work.old/solaris8-sparc/build-isa-sparcv8/ghostscript-8.70.orig/Makefile.in 2009-05-22 01:46:45.000000000 +0200 -+++ ghostscript-8.70/Makefile.in 2010-01-11 04:36:20.575145752 +0100 -@@ -67,11 +67,11 @@ - # The following must be substituted using @datadir@ and @libdir@ - # to avoid adding RPM generation paths (CUPS STR #1112) - gsdir = @datadir@/ghostscript --gsdatadir = $(gsdir)/$(GS_DOT_VERSION) -+gsdatadir = $(gsdir) - gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION) - gsincludedir = @includedir@/ghostscript/ - --docdir=$(gsdatadir)/doc -+docdir=$(gsdir)/doc/ghostscript - exdir=$(gsdatadir)/examples - GS_DOCDIR=$(docdir) - -@@ -342,8 +342,8 @@ - RM=rm -f - - # ------ Dynamic loader options ------- # --SOC_CFLAGS = @SOC_CFLAGS@ --SOC_LIBS = @SOC_LIBS@ -+SOC_CFLAGS = -I/opt/csw/X11/include @SOC_CFLAGS@ -+SOC_LIBS = -L/opt/csw/X11/lib @SOC_LIBS@ - SOC_LOADER = @SOC_LOADER@ - - Deleted: csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch 2013-05-31 12:23:39 UTC (rev 21231) @@ -1,11 +0,0 @@ ---- ghostscript-8.70.orig/base/unix-dll.mak 2008-09-13 22:22:25.000000000 +0200 -+++ ghostscript-8.70/base/unix-dll.mak 2010-01-11 03:00:54.165762459 +0100 -@@ -49,7 +49,7 @@ - GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) - GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) - GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) --LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR) -+LDFLAGS_SO=-G -h$(GS_SONAME_MAJOR) - - # MacOS X - #GS_SOEXT=dylib Deleted: csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch 2013-05-31 12:23:39 UTC (rev 21231) @@ -1,30 +0,0 @@ -From fd8d878d5f1bdb7a49dbdfd220e6c7f3525743e1 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 17 May 2011 16:51:09 +0200 -Subject: [PATCH] Do not return something in void context - ---- - base/gdevdrop.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/base/gdevdrop.c b/base/gdevdrop.c -index fc52ebe..50a315b 100644 ---- a/base/gdevdrop.c -+++ b/base/gdevdrop.c -@@ -408,9 +408,11 @@ pack_planar_from_standard(gx_device_memory * dev, int y, int destx, - const byte *sp = src; - int x, plane; - -- if (pdepth == 1 && dev->color_info.num_components == 4) -- return pack_planar_cmyk_1bit_from_standard(dev, y, destx, src, width, -+ if (pdepth == 1 && dev->color_info.num_components == 4) { -+ pack_planar_cmyk_1bit_from_standard(dev, y, destx, src, width, - depth, src_depth); -+ return; -+ } - - for (plane = 0; plane < dev->num_planes; plane++) { - byte *dest = scan_line_base(dev, y + plane * dev->height); --- -1.7.3.2 - Deleted: csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch 2013-05-31 12:23:39 UTC (rev 21231) @@ -1,25 +0,0 @@ -From ded20c08df2aee8ab5cc43cbe2287784c7f82162 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Thu, 2 Feb 2012 14:43:12 +0100 -Subject: [PATCH] libidn needs -L/opt/csw/lib - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index 9ccd15d..ecd8317 100755 ---- a/configure -+++ b/configure -@@ -5116,7 +5116,7 @@ if test "${ac_cv_lib_idn_stringprep+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lidn $LIBS" -+LIBS="-L/opt/csw/lib -lidn $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --- -1.7.8.3 - Deleted: csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch 2013-05-31 11:21:32 UTC (rev 21230) +++ csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch 2013-05-31 12:23:39 UTC (rev 21231) @@ -1,25 +0,0 @@ -From f44f599849020abd2cbff12de84f36e4087316f6 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Thu, 2 Feb 2012 14:56:52 +0100 -Subject: [PATCH] Wrong place in configure - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index ecd8317..e98175e 100755 ---- a/configure -+++ b/configure -@@ -5170,7 +5170,7 @@ HAVE_LIBIDN='' - UTF8DEVS='' - if test x$with_libidn != xno; then - HAVE_LIBIDN=-DHAVE_LIBIDN -- LIBS="$LIBS -lidn" -+ LIBS="$LIBS -L/opt/csw/lib -lidn" - - if test x$found_iconv != xno; then - UTF8DEVS='$(PSD)utf8.dev' --- -1.7.8.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 Fri May 31 14:39:43 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 31 May 2013 12:39:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21232] csw/mgar/pkg/groff/trunk Message-ID: Revision: 21232 http://gar.svn.sourceforge.net/gar/?rev=21232&view=rev Author: dmichelsen Date: 2013-05-31 12:39:43 +0000 (Fri, 31 May 2013) Log Message: ----------- groff/trunk: Rework recipe, enable 64 bit etc. Modified Paths: -------------- csw/mgar/pkg/groff/trunk/Makefile csw/mgar/pkg/groff/trunk/checksums Modified: csw/mgar/pkg/groff/trunk/Makefile =================================================================== --- csw/mgar/pkg/groff/trunk/Makefile 2013-05-31 12:23:39 UTC (rev 21231) +++ csw/mgar/pkg/groff/trunk/Makefile 2013-05-31 12:39:43 UTC (rev 21232) @@ -1,17 +1,7 @@ NAME = groff -VERSION = 1.19 -GARTYPE = v1 +VERSION = 1.22.2 -DESCRIPTION = front end for the groff document formatting system -define BLURB - groff is the front end to a ducument formatting system. Included with GNUs - version of groff are the utilities: troff, pic, eqn, tbl, grn, refer, -man, - -mdoc, and -ms; drivers for the PostScript, TeX dvi format, HP LaserJet 4 - printers, Canon CAPSL printers, HTML format (still alpha), and typewriter- - like devices. Also included is a modified version fo the Berkeley -me - macros, an enhanced version of the X11 xditview previewer, and an - implimentation of the -mm macros contributed by Joergen Haegg (jg at axis.se). -endef +DESCRIPTION = Front end for the groff document formatting system MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz @@ -19,8 +9,30 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +VENDOR_URL = http://www.gnu.org/software/groff/groff.html -INSTALL_OVERRIDE_DIRS = bindir datadir +PACKAGES += CSWgroff +SPKG_DESC_CSWgroff = GNU roff/troff/nroff +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWgroff += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgroff += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWgroff += CSWperl +# I am not sure if we really need this +RUNTIME_DEP_PKGS_CSWgroff += CSWpsutils +CHECKPKG_OVERRIDES_CSWgroff += surplus-dependency|CSWpsutils + +# Mostly harmless +CHECKPKG_OVERRIDES_CSWgroff += file-with-bad-content + +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset\.alias + +GARCOMPILER = GNU + +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-appresdir=$(libdir)/X11/app-defaults + include gar/category.mk Modified: csw/mgar/pkg/groff/trunk/checksums =================================================================== --- csw/mgar/pkg/groff/trunk/checksums 2013-05-31 12:23:39 UTC (rev 21231) +++ csw/mgar/pkg/groff/trunk/checksums 2013-05-31 12:39:43 UTC (rev 21232) @@ -1 +1 @@ -c12bf574120df33ec8c18d92703e099e download/groff-1.19.tar.gz +9f4cd592a5efc7e36481d8d8d8af6d16 groff-1.22.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 31 15:14:22 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 31 May 2013 13:14:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21233] csw/mgar/pkg/samba/trunk Message-ID: Revision: 21233 http://gar.svn.sourceforge.net/gar/?rev=21233&view=rev Author: dmichelsen Date: 2013-05-31 13:14:22 +0000 (Fri, 31 May 2013) Log Message: ----------- samba/trunk: Update to 4.0.6, always enable cups Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/samba/trunk/checksums Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2013-05-31 12:39:43 UTC (rev 21232) +++ csw/mgar/pkg/samba/trunk/Makefile 2013-05-31 13:14:22 UTC (rev 21233) @@ -1,6 +1,6 @@ NAME = samba -VERSION = 4.0.3 +VERSION = 4.0.6 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -311,8 +311,7 @@ CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR) -CONFIGURE_ARGS-64 += --disable-cups -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +CONFIGURE_ARGS += --enable-cups # Can't use fdatasync atm do to linker problems #CONFIGURE_ARGS += ac_cv_lib_rt_fdatasync=no Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2013-05-31 12:39:43 UTC (rev 21232) +++ csw/mgar/pkg/samba/trunk/checksums 2013-05-31 13:14:22 UTC (rev 21233) @@ -1 +1 @@ -fdb093fb362109dae0ccadc314318da7 samba-4.0.3.tar.gz +db9dc684f167a602c18acc19d3e7e401 samba-4.0.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 31 15:43:02 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 31 May 2013 13:43:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21234] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 21234 http://gar.svn.sourceforge.net/gar/?rev=21234&view=rev Author: dmichelsen Date: 2013-05-31 13:43:02 +0000 (Fri, 31 May 2013) Log Message: ----------- fontconfig/trunk: Update to 2.10.2, rework package names, drop unused patch Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fontconfig/trunk/files/CSWfontconfig.postinstall Removed Paths: ------------- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2013-05-31 13:14:22 UTC (rev 21233) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2013-05-31 13:43:02 UTC (rev 21234) @@ -1,10 +1,10 @@ # $Id$ NAME = fontconfig -VERSION = 2.8.0 +VERSION = 2.10.2 GARTYPE = v2 -DESCRIPTION = A library for configuring and customizing font access. +DESCRIPTION = A library for configuring and customizing font access define BLURB Fontconfig is a library for configuring and customizing font access. It contains two essential modules, the configuration module which builds an @@ -13,49 +13,41 @@ endef MASTER_SITES = http://www.fontconfig.org/release/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWfconfig.postinstall +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += CSWfontconfig.postinstall -PATCHFILES = fix-zerowidth-struct.patch +VENDOR_URL = http://www.fontconfig.org -BUILD64_LIBS_ONLY = 1 +PACKAGES += CSWlibfontconfig1 +PKGFILES_CSWlibfontconfig1 += $(call pkgfiles_lib,libfontconfig.so.1) +SPKG_DESC_CSWlibfontconfig1 += A library for configuring and customizing font access, libfontconfig.so.1 +RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibexpat1 -SPKG_SOURCEURL = http://www.fontconfig.org/ +PACKAGES += CSWfontconfig-dev +SPKG_DESC_CSWfontconfig-dev += Development files for libfontconfig.so.1 +PKGFILES_CSWfontconfig-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWfontconfig-dev += CSWlibfontconfig1 +OBSOLETED_BY_CSWfontconfig-dev += CSWfconfig-dev -MIGRATE_FILES = fontconfig +PACKAGES += CSWfontconfig +SPKG_DESC_CSWfontconfig = A library for configuring and customizing font access +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWfontconfig += CSWlibfontconfig1 +# This is for /usr/share/fonts which is ok +CHECKPKG_OVERRIDES_CSWfontconfig += file-with-bad-content|/usr/share|root/etc/opt/csw/fontconfig/fonts.conf +OBSOLETED_BY_CSWfontconfig += CSWfconfig +CATALOGNAME_CSWfconfig = fontconfig_stub + +BUILD64_LIBS_ONLY = 1 + +MIGRATE_FILES_CSWfontconfig = fontconfig + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/share/fonts CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig -CONFIGURE_ARGS += --with-confdir=/etc/opt/csw/fontconfig +CONFIGURE_ARGS += --with-baseconfigdir=/etc/opt/csw/fontconfig -PACKAGES += CSWlibfontconfig1 -PKGFILES_CSWlibfontconfig1 += $(call baseisadirs,$(libdir),libfontconfig\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibfontconfig1 += $(DESCRIPTION), libfontconfig.so.1 -RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibz1 - -PACKAGES += CSWfconfig-dev -SPKG_DESC_CSWfconfig-dev += $(DESCRIPTION), development files -PKGFILES_CSWfconfig-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWfconfig-dev += CSWlibfontconfig1 - -PACKAGES += CSWfconfig -CATALOGNAME_CSWfconfig = fontconfig -SPKG_DESC_CSWfconfig = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWfconfig += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWfconfig += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWfconfig += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWfconfig += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWfconfig += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWfconfig += CSWlibz1 -# It's the documentation. -CHECKPKG_OVERRIDES_CSWfconfig += file-with-bad-content -# One of the classic: "historical reasons" -CHECKPKG_OVERRIDES_CSWfconfig += catalogname-does-not-match-pkgname|pkgname=CSWfconfig|catalogname=fontconfig|expected-catalogname=fconfig - include gar/category.mk Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2013-05-31 13:14:22 UTC (rev 21233) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2013-05-31 13:43:02 UTC (rev 21234) @@ -1 +1 @@ -77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz +025e08b3d7fe45c433de5718e441ed15 fontconfig-2.10.2.tar.gz Deleted: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2013-05-31 13:14:22 UTC (rev 21233) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2013-05-31 13:43:02 UTC (rev 21234) @@ -1,24 +0,0 @@ -#!/bin/sh - -CHROOTDIR=${BASEDIR:-/} - -echo -echo Fontconfig needs to update its font cache. -echo This can take up to a couple of minutes. -echo - -${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s -touch ${BASEDIR}/var/opt/csw/cache/fontconfig/.fc-cache_done 2>/dev/null - -${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-list 2>&1 >/dev/null & - -# removing ancient fonts.cache-csw-1 files from fontconfig-2.3.2 -find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \; -find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \; -find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \; -# removing ancient *.cache-csw-2 files -rm ${BASEDIR}/var/opt/csw/cache/fontconfig/*.cache-csw-2 2>/dev/null -# remove obsolete cache dir -[ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null - -exit 0 Copied: csw/mgar/pkg/fontconfig/trunk/files/CSWfontconfig.postinstall (from rev 20894, csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall) =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfontconfig.postinstall (rev 0) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfontconfig.postinstall 2013-05-31 13:43:02 UTC (rev 21234) @@ -0,0 +1,24 @@ +#!/bin/sh + +CHROOTDIR=${BASEDIR:-/} + +echo +echo Fontconfig needs to update its font cache. +echo This can take up to a couple of minutes. +echo + +${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s +touch ${BASEDIR}/var/opt/csw/cache/fontconfig/.fc-cache_done 2>/dev/null + +${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-list 2>&1 >/dev/null & + +# removing ancient fonts.cache-csw-1 files from fontconfig-2.3.2 +find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \; +find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \; +find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \; +# removing ancient *.cache-csw-2 files +rm ${BASEDIR}/var/opt/csw/cache/fontconfig/*.cache-csw-2 2>/dev/null +# remove obsolete cache dir +[ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null + +exit 0 Deleted: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2013-05-31 13:14:22 UTC (rev 21233) +++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2013-05-31 13:43:02 UTC (rev 21234) @@ -1,12 +0,0 @@ -diff -Naur fontconfig-2.7.3.orig/src/fcint.h fontconfig-2.7.3.patched/src/fcint.h ---- fontconfig-2.7.3.orig/src/fcint.h 2009-06-28 19:46:36.000000000 +0200 -+++ fontconfig-2.7.3.patched/src/fcint.h 2009-09-28 15:47:07.195049714 +0200 -@@ -253,7 +253,7 @@ - FcExprPage *next_page; - FcExpr *next; - FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)]; -- FcExpr end[0]; -+ FcExpr end[]; - }; - - typedef enum _FcQual { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.