From guengel at users.sourceforge.net Thu May 1 08:29:00 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 1 May 2014 06:29:00 +0000 Subject: SF.net SVN: gar:[23530] csw/mgar/pkg/nrpe/trunk/files/cswnrpe Message-ID: <3gK6BK5HzQzw6@mail.opencsw.org> Revision: 23530 http://sourceforge.net/p/gar/code/23530 Author: guengel Date: 2014-05-01 06:28:58 +0000 (Thu, 01 May 2014) Log Message: ----------- nrpe/trunk: Added 'unalias -a' to cswnrpe in order to make it work on solaris 11. Closes #5087. Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/files/cswnrpe Modified: csw/mgar/pkg/nrpe/trunk/files/cswnrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2014-04-30 14:03:49 UTC (rev 23529) +++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2014-05-01 06:28:58 UTC (rev 23530) @@ -1,5 +1,7 @@ #!/bin/sh +unalias -a + BINDIR="/opt/csw/bin" BINFILE="$BINDIR/nrpe" 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 1 16:14:27 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 1 May 2014 14:14:27 +0000 Subject: SF.net SVN: gar:[23531] csw/mgar/pkg/squidguard/trunk Message-ID: <3gKJWP2wSTz1Kd@mail.opencsw.org> Revision: 23531 http://sourceforge.net/p/gar/code/23531 Author: dmichelsen Date: 2014-05-01 14:14:24 +0000 (Thu, 01 May 2014) Log Message: ----------- squidguard/trunk: Allow for new syntax of squid helpers as reported in squid bug #3978 Modified Paths: -------------- csw/mgar/pkg/squidguard/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/squidguard/trunk/files/0001-Allow-options-for-LEX.patch csw/mgar/pkg/squidguard/trunk/files/bug3978-attachment2988.patch Modified: csw/mgar/pkg/squidguard/trunk/Makefile =================================================================== --- csw/mgar/pkg/squidguard/trunk/Makefile 2014-05-01 06:28:58 UTC (rev 23530) +++ csw/mgar/pkg/squidguard/trunk/Makefile 2014-05-01 14:14:24 UTC (rev 23531) @@ -10,40 +10,38 @@ MASTER_SITES = http://squidguard.org/Downloads/ MASTER_SITES += http://squidguard.org/Downloads/Patches/1.4/ + DISTNAME = squidGuard-$(PKGVERSION) DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Allow-options-for-LEX.patch + # These files do patch the source, but they are not in "patch-format" SQUIDGUARDPATCHES += squidGuard-1.4-patch-20091015.tar.gz SQUIDGUARDPATCHES += squidGuard-1.4-patch-20091019.tar.gz DISTFILES += $(SQUIDGUARDPATCHES) NOEXTRACT += $(SQUIDGUARDPATCHES) +# This patch is for the new Squid helper format +# http://bugs.squid-cache.org/show_bug.cgi?id=3978 +DISTFILES += bug3978-attachment2988.patch + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz VENDOR_URL = http://squidguard.org/ +BUILD_DEP_PKGS += CSWbison +BUILD_DEP_PKGS += CSWflex +BUILD_DEP_PKGS += CSWbdb48devel +BUILD_DEP_PKGS += CSWopenldap-dev + PACKAGES += CSWsquidguard SPKG_DESC_CSWsquidguard = URL redirector used to use blacklists with the proxysoftware Squid # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWsquidguard += CSWbdb48 RUNTIME_DEP_PKGS_CSWsquidguard += CSWlibldap2-4-2 -# Just docs, leave for now -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/configure.txt -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/features.txt -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/features.html -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/faq.txt -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/installation.html -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/configuration.txt -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/install.txt -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/configure.html -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/configuration.html -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/install.html -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/faq.html -CHECKPKG_OVERRIDES_CSWsquidguard += file-with-bad-content|/usr/local|root/opt/csw/share/doc/squidguard/installation.txt - REINPLACEMENTS += nochown REINPLACE_MATCH_nochown = (.*)(chown.*) REINPLACE_WITH_nochown = \1\# \2 @@ -66,6 +64,9 @@ CONFIGURE_ARGS += --with-sg-logdir=$(SQUIDGUARD_LOG) CONFIGURE_ARGS += --with-sg-dbhome=$(SQUIDGUARD_DB) +EXTRA_CONFIGURE_EXPORTS += LEX +CONFIGURE_ENV_LEX = $(bindir_install)/flex --noansi-definitions + PRESERVECONF += $(SQUIDGUARD_CONF) MIGRATE_FILES += squidGuard.conf @@ -85,12 +86,14 @@ include gar/category.mk -post-extract-modulated: +post-extract: -gzip -c -d $(DOWNLOADDIR)/squidGuard-1.4-patch-20091015.tar.gz | (cd $(WORKSRC) && tar xvf -) -gzip -c -d $(DOWNLOADDIR)/squidGuard-1.4-patch-20091019.tar.gz | (cd $(WORKSRC) && tar xvf -) + cd $(WORKSRC) && gpatch -p1 <../bug3978-attachment2988.patch + cd $(WORKSRC)/test && perl -i.orig -npe 'if(/^$$/){s/^$$/ERR/}else{s/([^ ]*).*/OK rewrite-url="$$1"/}' test1.expected test2.expected @$(MAKECOOKIE) -post-install-modulated: +post-install: ginstall -d $(DESTDIR)$(sharedstatedir)/doc/squidguard ginstall $(WORKSRC)/doc/* $(DESTDIR)$(sharedstatedir)/doc/squidguard @$(MAKECOOKIE) Added: csw/mgar/pkg/squidguard/trunk/files/0001-Allow-options-for-LEX.patch =================================================================== --- csw/mgar/pkg/squidguard/trunk/files/0001-Allow-options-for-LEX.patch (rev 0) +++ csw/mgar/pkg/squidguard/trunk/files/0001-Allow-options-for-LEX.patch 2014-05-01 14:14:24 UTC (rev 23531) @@ -0,0 +1,25 @@ +From f6380127e08a6cfa0f20169eb9166d2c71e11649 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 1 May 2014 15:45:40 +0200 +Subject: [PATCH] Allow options for LEX + +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 44754ec..9117e1b 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -77,7 +77,7 @@ y.tab.o: y.tab.c y.tab.h sg.h sgEx.h + $(COMPILE) -c y.tab.c + + lex.yy.c: sg.l sg.h +- @if [ $(LEX) != ":" ]; then \ ++ @if [ "$(LEX)" != ":" ]; then \ + $(LEX) sg.l ; \ + else \ + echo " " ; \ +-- +1.8.4.1 + Added: csw/mgar/pkg/squidguard/trunk/files/bug3978-attachment2988.patch =================================================================== --- csw/mgar/pkg/squidguard/trunk/files/bug3978-attachment2988.patch (rev 0) +++ csw/mgar/pkg/squidguard/trunk/files/bug3978-attachment2988.patch 2014-05-01 14:14:24 UTC (rev 23531) @@ -0,0 +1,76 @@ +diff -urN squidGuard-1.4.orig/src/main.c squidGuard-1.4.upgraded/src/main.c +--- squidGuard-1.4.orig/src/main.c 2013-12-11 17:42:15.000000000 +1300 ++++ squidGuard-1.4.upgraded/src/main.c 2013-12-11 19:04:09.000000000 +1300 +@@ -175,7 +175,7 @@ + sgReloadConfig(); + } + if(failsafe_mode) { +- puts(""); ++ puts("ERR message=\"squidGuard failsafe mode\""); + fflush(stdout); + if(sig_hup){ + sgReloadConfig(); +@@ -184,7 +184,7 @@ + } + if(parseLine(buf,&squidInfo) != 1){ + sgLogError("Error parsing squid line: %s",buf); +- puts(""); ++ puts("BH message=\"squidGuard error parsing squid line\""); + } + else { + src = Source; +@@ -196,14 +196,14 @@ + acl = sgAclCheckSource(src); + if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){ + if(src == NULL || src->cont_search == 0){ +- puts(""); ++ puts("ERR"); + break; + } else + if(src->next != NULL){ + src = src->next; + continue; + } else { +- puts(""); ++ puts("ERR"); + break; + } + } else { +@@ -215,9 +215,10 @@ + squidInfo.ident[0] = '-'; + squidInfo.ident[1] = '\0'; + } +- fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src, +- squidInfo.srcDomain,squidInfo.ident, +- squidInfo.method); ++ if (isdigit(redirect[0]) && isdigit(redirect[1]) && isdigit(redirect[2]) && redirect[3]==':') { ++ fprintf(stdout,"OK status=%c%c%c url=\"%s\"\n", redirect[0], redirect[1], redirect[2], &redirect[4]); ++ } else ++ fprintf(stdout,"OK rewrite-url=\"%s\"\n",redirect); + /* sgLogError("%s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */ + break; + } +diff -urN squidGuard-1.4.orig/src/sgDiv.c squidGuard-1.4.upgraded/src/sgDiv.c +--- squidGuard-1.4.orig/src/sgDiv.c 2013-12-11 17:42:15.000000000 +1300 ++++ squidGuard-1.4.upgraded/src/sgDiv.c 2013-12-11 18:58:33.000000000 +1300 +@@ -771,7 +771,7 @@ + } + sgLogError("Going into emergency mode"); + while(fgets(buf, MAX_BUF, stdin) != NULL){ +- puts(""); ++ puts("ERR"); + fflush(stdout); + } + sgLogError("ending emergency mode, stdin empty"); +diff -urN squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4.upgraded/src/sgDiv.c.in +--- squidGuard-1.4.orig/src/sgDiv.c.in 2013-12-11 17:42:15.000000000 +1300 ++++ squidGuard-1.4.upgraded/src/sgDiv.c.in 2013-12-11 18:58:40.000000000 +1300 +@@ -782,7 +782,7 @@ + } + sgLogError("Going into emergency mode"); + while(fgets(buf, MAX_BUF, stdin) != NULL){ +- puts(""); ++ puts("ERR"); + fflush(stdout); + } + sgLogError("ending emergency mode, stdin empty"); 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 Thu May 1 17:40:52 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 1 May 2014 15:40:52 +0000 Subject: SF.net SVN: gar:[23532] csw/mgar/pkg/tor/branches/ Message-ID: <3gKLQy6B25z1SR@mail.opencsw.org> Revision: 23532 http://sourceforge.net/p/gar/code/23532 Author: jake_goerzen Date: 2014-05-01 15:40:50 +0000 (Thu, 01 May 2014) Log Message: ----------- removing test directory branches/alpha Removed Paths: ------------- csw/mgar/pkg/tor/branches/ 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 2 09:42:19 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 2 May 2014 07:42:19 +0000 Subject: SF.net SVN: gar:[23533] csw/mgar/pkg/urxvt/trunk Message-ID: <3gKlmX3SGBzc4@mail.opencsw.org> Revision: 23533 http://sourceforge.net/p/gar/code/23533 Author: wahwah Date: 2014-05-02 07:42:14 +0000 (Fri, 02 May 2014) Log Message: ----------- urxvt/trunk: Updated deps, but the version is still the old one Modified Paths: -------------- csw/mgar/pkg/urxvt/trunk/Makefile csw/mgar/pkg/urxvt/trunk/checksums csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper Modified: csw/mgar/pkg/urxvt/trunk/Makefile =================================================================== --- csw/mgar/pkg/urxvt/trunk/Makefile 2014-05-01 15:40:50 UTC (rev 23532) +++ csw/mgar/pkg/urxvt/trunk/Makefile 2014-05-02 07:42:14 UTC (rev 23533) @@ -6,7 +6,7 @@ VERSION = 9.07 GARTYPE = v2 -DESCRIPTION = A VT102 emulator for the X window system (pron. ouR XVT, unicode) +DESCRIPTION = VT102 emulator for the X window system (pron. ouR XVT, unicode) define BLURB rxvt-unicode, is a colour vt102 terminal emulator intended as an xterm(1) replacement for users who do not require features such as Tektronix 4014 @@ -18,29 +18,24 @@ http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod endef -MASTER_SITES = http://dist.schmorp.de/rxvt-unicode/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += urxvt-wrapper -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 -SPKG_SOURCEURL = http://software.schmorp.de/pkg/rxvt-unicode.html -PACKAGES = CSWurxvt -CATALOGNAME_CSWurxvt = urxvt -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-perl -CONFIGURE_ARGS += --with-terminfo=/opt/csw/share/terminfo -# Because of terminfo -RUNTIME_DEP_PKGS_CSWurxvt += CSWncurses -# Shared library dependencies -RUNTIME_DEP_PKGS_CSWurxvt += CSWfconfig -RUNTIME_DEP_PKGS_CSWurxvt += CSWftype2 -RUNTIME_DEP_PKGS_CSWurxvt += CSWlibx11 -RUNTIME_DEP_PKGS_CSWurxvt += CSWlibxft2 -RUNTIME_DEP_PKGS_CSWurxvt += CSWlibxrender +MASTER_SITES = http://dist.schmorp.de/rxvt-unicode/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += urxvt-wrapper +VENDOR_URL = http://software.schmorp.de/pkg/rxvt-unicode.html +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc GARCOMPILER = GNU -EXTRA_INC = /opt/csw/X11/include -EXTRA_LIB = /opt/csw/X11/lib -EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib +PATCHFILES += rxvt-unicode-9.06-solaris8.patch +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-perl +CONFIGURE_ARGS += --with-terminfo=/opt/csw/share/terminfo + +PACKAGES = CSWrxvt-unicode +SPKG_DESC_CSWrxvt-unicode = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWterminfo +CHECKPKG_OVERRIDES_CSWrxvt-unicode += surplus-dependency|CSWterminfo +OBSOLETED_BY_CSWrxvt-unicode = CSWurxvt + include gar/category.mk post-install-modulated: Modified: csw/mgar/pkg/urxvt/trunk/checksums =================================================================== --- csw/mgar/pkg/urxvt/trunk/checksums 2014-05-01 15:40:50 UTC (rev 23532) +++ csw/mgar/pkg/urxvt/trunk/checksums 2014-05-02 07:42:14 UTC (rev 23533) @@ -1,2 +1 @@ 49bb52c99e002bf85eb41d8385d903b5 rxvt-unicode-9.07.tar.bz2 -24c55df0baad064901c9cf5e4b8d5eef urxvt-wrapper Modified: csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper =================================================================== --- csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper 2014-05-01 15:40:50 UTC (rev 23532) +++ csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper 2014-05-02 07:42:14 UTC (rev 23533) @@ -9,7 +9,9 @@ libexec="/opt/csw/libexec" libexec_binary="${libexec}/${executable}" -if [ ! -r "${libexec_binary}" ]; then +if [ -r "${libexec_binary}" ]; then + : +else echo "Can't read ${libexec_binary}" exit 1 fi 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 2 10:47:08 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 2 May 2014 08:47:08 +0000 Subject: SF.net SVN: gar:[23534] csw/mgar/pkg/boost/trunk Message-ID: <3gKnCH6qlzzjZ@mail.opencsw.org> Revision: 23534 http://sourceforge.net/p/gar/code/23534 Author: wahwah Date: 2014-05-02 08:47:06 +0000 (Fri, 02 May 2014) Log Message: ----------- boost/trunk: it does not build Modified Paths: -------------- csw/mgar/pkg/boost/trunk/Makefile csw/mgar/pkg/boost/trunk/checksums Added Paths: ----------- csw/mgar/pkg/boost/trunk/files/0001-Don-t-try-to-use-fchmodat.patch csw/mgar/pkg/boost/trunk/files/0003-Bug-4757-fix-backported.patch csw/mgar/pkg/boost/trunk/files/Boost-bug-4757-fix.patch Modified: csw/mgar/pkg/boost/trunk/Makefile =================================================================== --- csw/mgar/pkg/boost/trunk/Makefile 2014-05-02 07:42:14 UTC (rev 23533) +++ csw/mgar/pkg/boost/trunk/Makefile 2014-05-02 08:47:06 UTC (rev 23534) @@ -1,7 +1,7 @@ # $Id$ NAME = boost -VERSION = 1.45.0 +VERSION = 1.55.0 GARTYPE = v2 define BLURB @@ -16,37 +16,40 @@ programming style of the Standard Template Library (STL). endef -MASTER_SITES = $(SF_MIRROR)/$(NAME)/ +DESCRIPTION = Free peer-reviewed portable C++ source libraries + +MASTER_SITES = $(SF_MIRROR) DISTVERSION = $(subst .,_,$(VERSION)) DISTNAME = $(NAME)_$(DISTVERSION) DISTFILES = $(DISTNAME).tar.bz2 +# PATCHFILES += 0003-Bug-4757-fix-backported.patch + +# It takes an awful lot of time. +NOGITPATCH = 1 + +# PATCHFILES += 0001-Don-t-try-to-use-fchmodat.patch + # Known problems: # https://svn.boost.org/trac/boost/ticket/4757 # Proposed fix: # https://svn.boost.org/trac/boost/changeset/66651 # We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7586 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +# UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7586 +# UPSTREAM_USE_SF = 1 +UPSTREAM_MASTER_SITES = http://www.boost.org/users/history/ +UFILES_REGEX = Version (\d+(?:\.\d+)*) -# GARCOMPILER = GNU + TOOLSET = sun COMPILER_SUFFIX_PKG = COMPILER_SUFFIX_CAT = -PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG) -CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG) += boost$(COMPILER_SUFFIX_CAT) -SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG) = Boost libraries -# The boost build system is hard to harness. -CHECKPKG_OVERRIDES_CSWboost$(COMPILER_SUFFIX_PKG) += bad-rpath-entry +PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)-dev +SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG)-dev = $(DESCRIPTION), development files +PKGFILES_CSWboost$(COMPILER_SUFFIX_PKG)-dev = $(PKGFILES_DEVEL) -PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)devel -CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG)devel = boost$(COMPILER_SUFFIX_CAT)_devel -SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG)devel = Boost libraries, development files -PKGFILES_CSWboost$(COMPILER_SUFFIX_PKG)devel = $(PKGFILES_DEVEL) - # Empty transitional package PACKAGES += CSWboostrt CATALOGNAME_CSWboostrt = boost_rt @@ -57,35 +60,46 @@ LICENSE = LICENSE_1_0.txt BUILD_DEP_PKGS += CSWstar -BUILD_DEP_PKGS += CSWboost-jam CONFIGURE_SCRIPTS = boost BUILD_SCRIPTS = boost INSTALL_SCRIPTS = bjam +BUILD64 = 1 + BUILD_ARGS += toolset=$(TOOLSET) BUILD_ARGS += --prefix=$(DESTDIR)$(prefix) +BUILD_ARGS += --libdir=$(DESTDIR)$(libdir) BUILD_ARGS += link=shared -BUILD_ARGS += cflags="$(CFLAGS)" -BUILD_ARGS += cxxflags="$(CXXFLAGS)" -BUILD_ARGS += linkflags="$(LDFLAGS) $(LD_OPTIONS)" +BUILD_ARGS += cflags='$(CFLAGS)' +BUILD_ARGS += cxxflags='$(CXXFLAGS)' +BUILD_ARGS += linkflags='$(LDFLAGS) $(LD_OPTIONS)' # Stop on the first error BUILD_ARGS += -q # Display commands as you run them, I want to know what you are doing there BUILD_ARGS += -d+2 +BUILD_ARGS += include='/opt/csw/include' +BUILD_ARGS += --debug-building +BUILD_ARGS += address-model=$(MEMORYMODEL) +# We don't have 64-bit Python +BUILD_ARGS += --without-python +BUILD_ARGS_sparcv8plus = instruction-set=v9 +BUILD_ARGS_sparcv9 = instruction-set=v9 +BUILD_ARGS += $(BUILD_ARGS_$(ISA)) + TEST_SCRIPTS = JAMDIR_sparc = solarissparc JAMDIR_i386 = solarisx86 JAMDIR = $(JAMDIR_$(GARCH)) -# BUILD64_LIBS_ONLY = 1 +# BUILD64 = 1 # These can't be just passed from Make's PARALLELMFLAGS because of the -l flag. -BJAM_PARALLELMFLAGS_current9s = -j 32 -BJAM_PARALLELMFLAGS_current9x = -j 5 -BJAM_PARALLELMFLAGS = $(BJAM_PARALLELMFLAGS_$(call modulation2host)) +# BJAM_PARALLELMFLAGS_current9s = -j 32 +# BJAM_PARALLELMFLAGS_current9x = -j 5 +# BJAM_PARALLELMFLAGS = $(BJAM_PARALLELMFLAGS_$(call modulation2host)) include gar/category.mk @@ -100,19 +114,21 @@ @$(MAKECOOKIE) configure-boost: - cd $(WORKSRC) && ./bootstrap.sh + ( cd $(WORKSRC) && \ + ./bootstrap.sh $(TOOLSET)) @$(MAKECOOKIE) build-boost: cd $(WORKSRC) && \ - ./bjam \ + ./b2 \ + -d+2 \ $(BJAM_PARALLELMFLAGS) \ $(BUILD_ARGS) @$(MAKECOOKIE) install-bjam: cd $(WORKSRC) && \ - ./bjam \ + ./b2 \ $(BJAM_PARALLELMFLAGS) \ $(BUILD_ARGS) \ install Modified: csw/mgar/pkg/boost/trunk/checksums =================================================================== --- csw/mgar/pkg/boost/trunk/checksums 2014-05-02 07:42:14 UTC (rev 23533) +++ csw/mgar/pkg/boost/trunk/checksums 2014-05-02 08:47:06 UTC (rev 23534) @@ -1 +1 @@ -d405c606354789d0426bc07bea617e58 boost_1_45_0.tar.bz2 +d6eef4b4cacb2183f2bf265a5a03a354 boost_1_55_0.tar.bz2 Copied: csw/mgar/pkg/boost/trunk/files/0001-Don-t-try-to-use-fchmodat.patch (from rev 17220, csw/mgar/pkg/boost/branches/boost-gcc/files/0001-Don-t-try-to-use-fchmodat.patch) =================================================================== --- csw/mgar/pkg/boost/trunk/files/0001-Don-t-try-to-use-fchmodat.patch (rev 0) +++ csw/mgar/pkg/boost/trunk/files/0001-Don-t-try-to-use-fchmodat.patch 2014-05-02 08:47:06 UTC (rev 23534) @@ -0,0 +1,25 @@ +From 41a096b2d285342872396ab98594a0cadba310e5 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 27 Feb 2012 00:49:24 +0100 +Subject: [PATCH] Don't try to use fchmodat + +--- + libs/filesystem/v3/src/operations.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libs/filesystem/v3/src/operations.cpp b/libs/filesystem/v3/src/operations.cpp +index 226f107..116029b 100644 +--- a/libs/filesystem/v3/src/operations.cpp ++++ b/libs/filesystem/v3/src/operations.cpp +@@ -1387,7 +1387,7 @@ namespace detail + + // Mac OS X Lion and some other platforms don't support fchmodat() + # if defined(AT_FDCWD) && defined(AT_SYMLINK_NOFOLLOW) \ +- && (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x5100) ++ && (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x5100) && 0 + if (::fchmodat(AT_FDCWD, p.c_str(), mode_cast(prms), + !(prms & symlink_perms) ? 0 : AT_SYMLINK_NOFOLLOW)) + # else // fallback if fchmodat() not supported +-- +1.7.9 + Added: csw/mgar/pkg/boost/trunk/files/0003-Bug-4757-fix-backported.patch =================================================================== --- csw/mgar/pkg/boost/trunk/files/0003-Bug-4757-fix-backported.patch (rev 0) +++ csw/mgar/pkg/boost/trunk/files/0003-Bug-4757-fix-backported.patch 2014-05-02 08:47:06 UTC (rev 23534) @@ -0,0 +1,86 @@ +From 8b06be191c2f4644d3a266bd140bdac7710aabf4 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 18 Dec 2010 02:13:56 +0100 +Subject: [PATCH 3/3] Bug 4757 fix, backported + +Bug 4757: Compiler error in boost/array.hpp on Solaris w/Sun Studio 12 + +https://svn.boost.org/trac/boost/ticket/4757 +--- + boost/array.hpp | 46 ++++++++++++++++++++++++++++++---------------- + 1 files changed, 30 insertions(+), 16 deletions(-) + +diff --git a/boost/array.hpp b/boost/array.hpp +index b56a84a..a5bee24 100644 +--- a/boost/array.hpp ++++ b/boost/array.hpp +@@ -346,7 +346,34 @@ namespace boost { + x.swap(y); + } + +- // Specific for boost::array: simply returns its elems data member. ++#if defined(__SUNPRO_CC) ++// Trac ticket #4757; the Sun Solaris compiler can't handle ++// syntax like 'T(&get_c_array(boost::array& arg))[N]' ++// ++// We can't just use this for all compilers, because the ++// borland compilers can't handle this form. ++ namespace detail { ++ template struct c_array ++ { ++ typedef T type[N]; ++ }; ++ } ++ ++ // Specific for boost::array: simply returns its elems data member. ++ template ++ typename detail::c_array::type& get_c_array(boost::array& arg) ++ { ++ return arg.elems; ++ } ++ ++ // Specific for boost::array: simply returns its elems data member. ++ template ++ typename const detail::c_array::type& get_c_array(const boost::array& arg) ++ { ++ return arg.elems; ++ } ++#else ++// Specific for boost::array: simply returns its elems data member. + template + T(&get_c_array(boost::array& arg))[N] + { +@@ -359,7 +386,8 @@ namespace boost { + { + return arg.elems; + } +- ++#endif ++ + #if 0 + // Overload for std::array, assuming that std::array will have + // explicit conversion functions as discussed at the WG21 meeting +@@ -381,20 +409,6 @@ namespace boost { + } /* namespace boost */ + + +-#else +-// Specific for boost::array: simply returns its elems data member. +- template +- T(&get_c_array(boost::array& arg))[N] +- { +- return arg.elems; +- } +- +- // Const version. +- template +- const T(&get_c_array(const boost::array& arg))[N] +- { +- return arg.elems; +- } + #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) + # pragma warning(pop) + #endif +-- +1.7.3.2 + Added: csw/mgar/pkg/boost/trunk/files/Boost-bug-4757-fix.patch =================================================================== --- csw/mgar/pkg/boost/trunk/files/Boost-bug-4757-fix.patch (rev 0) +++ csw/mgar/pkg/boost/trunk/files/Boost-bug-4757-fix.patch 2014-05-02 08:47:06 UTC (rev 23534) @@ -0,0 +1,54 @@ +https://svn.boost.org/trac/boost/ticket/4757 + +Patch stolen from: +https://svn.boost.org/trac/boost/changeset/66651 + +Index: trunk/boost/array.hpp +=================================================================== +--- trunk/boost/array.hpp (revision 66154) ++++ trunk/boost/array.hpp (revision 66651) +@@ -347,19 +347,10 @@ + } + +-#if 0 +- // Specific for boost::array: simply returns its elems data member. +- template +- T(&get_c_array(boost::array& arg))[N] +- { +- return arg.elems; +- } +- +- // Const version. +- template +- const T(&get_c_array(const boost::array& arg))[N] +- { +- return arg.elems; +- } +-#else ++#if defined(__SUNPRO_CC) ++// Trac ticket #4757; the Sun Solaris compiler can't handle ++// syntax like 'T(&get_c_array(boost::array& arg))[N]' ++// ++// We can't just use this for all compilers, because the ++// borland compilers can't handle this form. + namespace detail { + template struct c_array +@@ -382,4 +373,18 @@ + return arg.elems; + } ++#else ++// Specific for boost::array: simply returns its elems data member. ++ template ++ T(&get_c_array(boost::array& arg))[N] ++ { ++ return arg.elems; ++ } ++ ++ // Const version. ++ template ++ const T(&get_c_array(const boost::array& arg))[N] ++ { ++ return arg.elems; ++ } + #endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri May 2 11:07:33 2014 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 2 May 2014 09:07:33 +0000 Subject: SF.net SVN: gar:[23535] csw/mgar/pkg/php5/branches/php-5.5.x Message-ID: <3gKnfh36JJznv@mail.opencsw.org> Revision: 23535 http://sourceforge.net/p/gar/code/23535 Author: wilbury Date: 2014-05-02 09:07:31 +0000 (Fri, 02 May 2014) Log Message: ----------- php5/branches/php-5.5.x: Version bump. Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile csw/mgar/pkg/php5/branches/php-5.5.x/checksums Modified: csw/mgar/pkg/php5/branches/php-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-05-02 08:47:06 UTC (rev 23534) +++ csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-05-02 09:07:31 UTC (rev 23535) @@ -1,5 +1,5 @@ NAME = php -VERSION = 5.5.11 +VERSION = 5.5.12 GARTYPE = v2 DESCRIPTION = A high-level scripting language. Modified: csw/mgar/pkg/php5/branches/php-5.5.x/checksums =================================================================== --- csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-05-02 08:47:06 UTC (rev 23534) +++ csw/mgar/pkg/php5/branches/php-5.5.x/checksums 2014-05-02 09:07:31 UTC (rev 23535) @@ -1 +1 @@ -c8c9ad960bae0265054b5879423f7a75 php-5.5.11.tar.bz2 +943af92c2e67bba29429bdd9acf9cbd4 php-5.5.12.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 Fri May 2 22:41:32 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 2 May 2014 20:41:32 +0000 Subject: SF.net SVN: gar:[23536] csw/mgar/pkg/lang-python/zope-interface/trunk Message-ID: <3gL53W1cSqz1Rk@mail.opencsw.org> Revision: 23536 http://sourceforge.net/p/gar/code/23536 Author: wahwah Date: 2014-05-02 20:41:31 +0000 (Fri, 02 May 2014) Log Message: ----------- lang-python/zope-interface/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile csw/mgar/pkg/lang-python/zope-interface/trunk/checksums Modified: csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile 2014-05-02 09:07:31 UTC (rev 23535) +++ csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile 2014-05-02 20:41:31 UTC (rev 23536) @@ -3,7 +3,7 @@ # $Id$ NAME = zope.interface -VERSION = 4.1.0 +VERSION = 4.1.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/lang-python/zope-interface/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/zope-interface/trunk/checksums 2014-05-02 09:07:31 UTC (rev 23535) +++ csw/mgar/pkg/lang-python/zope-interface/trunk/checksums 2014-05-02 20:41:31 UTC (rev 23536) @@ -1 +1 @@ -ac63de1784ea0327db876c908af07a94 zope.interface-4.1.0.tar.gz +edcd5f719c5eb2e18894c4d06e29b6c6 zope.interface-4.1.1.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 3 01:06:35 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 2 May 2014 23:06:35 +0000 Subject: SF.net SVN: gar:[23537] csw/mgar/pkg/lang-python/python/branches/python-2.7 Message-ID: <3gL8Gr0lY4z3H@mail.opencsw.org> Revision: 23537 http://sourceforge.net/p/gar/code/23537 Author: wahwah Date: 2014-05-02 23:06:29 +0000 (Fri, 02 May 2014) Log Message: ----------- lang-python/python/branches/python-2.7: Version bump. Probably won't build. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2014-05-02 20:41:31 UTC (rev 23536) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2014-05-02 23:06:29 UTC (rev 23537) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 2.7.5 +VERSION = 2.7.6 VER = 2.7 DVER = 2-7 UVER = 2_7 @@ -37,7 +37,7 @@ PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc -DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES = $(DISTNAME).tar.xz DISTFILES += pyport.h # The test for sunaudiodev fails. Not that it's a good practice to skip Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2014-05-02 20:41:31 UTC (rev 23536) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2014-05-02 23:06:29 UTC (rev 23537) @@ -1 +1 @@ -6334b666b7ff2038c761d7b27ba699c1 Python-2.7.5.tar.bz2 +bcf93efa8eaf383c98ed3ce40b763497 Python-2.7.6.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 Sat May 3 01:12:55 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 2 May 2014 23:12:55 +0000 Subject: SF.net SVN: gar:[23538] csw/mgar/pkg/gcc4/branches/gcc-4.8.x/ Message-ID: <3gL8Q65cxJz6g@mail.opencsw.org> Revision: 23538 http://sourceforge.net/p/gar/code/23538 Author: wahwah Date: 2014-05-02 23:12:53 +0000 (Fri, 02 May 2014) Log Message: ----------- gcc: Make a branch for 4.8.x Added Paths: ----------- csw/mgar/pkg/gcc4/branches/gcc-4.8.x/ Index: csw/mgar/pkg/gcc4/branches/gcc-4.8.x =================================================================== --- csw/mgar/pkg/gcc4/trunk 2014-05-02 23:06:29 UTC (rev 23537) +++ csw/mgar/pkg/gcc4/branches/gcc-4.8.x 2014-05-02 23:12:53 UTC (rev 23538) Property changes on: csw/mgar/pkg/gcc4/branches/gcc-4.8.x ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,3 ## +cookies +download +work Added: svn:mergeinfo ## -0,0 +1,3 ## +/csw/mgar/pkg/gcc4/branches/ada-enable:16158-16379 +/csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15321-15435 +/csw/mgar/pkg/gcc4/branches/opt-csw-prefix:15436-15623 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat May 3 01:18:04 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 2 May 2014 23:18:04 +0000 Subject: SF.net SVN: gar:[23539] csw/mgar/pkg/gcc4/branches/bootstrap-3.4/ Message-ID: <3gL8X31hY2zB7@mail.opencsw.org> Revision: 23539 http://sourceforge.net/p/gar/code/23539 Author: wahwah Date: 2014-05-02 23:18:03 +0000 (Fri, 02 May 2014) Log Message: ----------- gcc: Removing unused branch. Removed Paths: ------------- csw/mgar/pkg/gcc4/branches/bootstrap-3.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 3 01:19:25 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 2 May 2014 23:19:25 +0000 Subject: SF.net SVN: gar:[23540] csw/mgar/pkg/gcc4/branches/gccgo/ Message-ID: <3gL8Yb6VK3zFM@mail.opencsw.org> Revision: 23540 http://sourceforge.net/p/gar/code/23540 Author: wahwah Date: 2014-05-02 23:19:20 +0000 (Fri, 02 May 2014) Log Message: ----------- gcc: Removing unused gccgo branch Removed Paths: ------------- csw/mgar/pkg/gcc4/branches/gccgo/ 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 3 21:55:54 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 3 May 2014 19:55:54 +0000 Subject: SF.net SVN: gar:[23541] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: <3gLh0X1GFmznV@mail.opencsw.org> Revision: 23541 http://sourceforge.net/p/gar/code/23541 Author: wahwah Date: 2014-05-03 19:55:53 +0000 (Sat, 03 May 2014) Log Message: ----------- lang-python/python/branches/python-2.7: Adjusted the deps on 5.9 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2014-05-02 23:19:20 UTC (rev 23540) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2014-05-03 19:55:53 UTC (rev 23541) @@ -87,7 +87,6 @@ PACKAGES = CSWidle$(CVER) PACKAGES += CSWpython$(CVER) -PACKAGES += CSWpython$(CVER)-tk PACKAGES += CSWlibpython$(DVER)-1-0 @@ -115,8 +114,6 @@ PKGFILES_CSWidle$(CVER) += $(libdir)/.*/idlelib/.* PKGFILES_CSWidle$(CVER) += $(bindir)/idle -PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* -PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* ARCHALL_CSWidle$(CVER) = 1 @@ -136,16 +133,6 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) - -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.9 += CSWlibtcl8-4 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.9 += CSWtk -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.10 += CSWlibtcl8-5 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.10 += CSWlibtk8-5 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += $(RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_$(GAROSREL)) - # Don't merge test files. EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test/.* @@ -208,7 +195,6 @@ SPKG_DESC_CSWidle$(CVER) = Python IDE SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series -SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused @@ -216,8 +202,6 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += surplus-dependency|CSWpython$(CVER) CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER) -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused LICENSE = LICENSE @@ -226,11 +210,8 @@ CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER) # Checkpkg does not understand relocatable packages. CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/gdbm.so @@ -238,7 +219,6 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER) += file-with-bad-content @@ -252,10 +232,7 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_curses_panel.so|but|never|used CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_curses_panel.so|but|never|used CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_hashlib.so|but|never|used -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += no-direct-binding|/opt/csw/lib/python$(VER)/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 -CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_tkinter.so|but|never|used - # 64-bit overrides CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWlibffi4 CHECKPKG_OVERRIDES_CSWpython$(CVER) += no-direct-binding|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 @@ -265,6 +242,26 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncurses.so.5|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel_failed.so|but|never|used CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_curses_panel.so|but|never|used CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_hashlib.so|but|never|used + +# Package definitions. We'll be gradually moving package definitions from the +# old grouping by variable name into grouping by package. +PACKAGES += CSWpython$(CVER)-tk +SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) +PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* +PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtk8-5 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += no-direct-binding|/opt/csw/lib/python$(VER)/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python$(VER)/lib-dynload/_tkinter.so|but|never|used CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += no-direct-binding|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/sparcv9/python$(VER)/lib-dynload/_tkinter.so|but|never|used 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 4 00:30:34 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 3 May 2014 22:30:34 +0000 Subject: SF.net SVN: gar:[23542] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: <3gLlQn6ZVczyG@mail.opencsw.org> Revision: 23542 http://sourceforge.net/p/gar/code/23542 Author: wahwah Date: 2014-05-03 22:30:33 +0000 (Sat, 03 May 2014) Log Message: ----------- lang-python/python/branches/python-2.7: Tests are failing on 5.9 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2014-05-03 19:55:53 UTC (rev 23541) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2014-05-03 22:30:33 UTC (rev 23542) @@ -42,7 +42,8 @@ # The test for sunaudiodev fails. Not that it's a good practice to skip # tests. -#SKIPTEST = 1 +SKIPTEST_5.9 = 1 +SKIPTEST = $(SKIPTEST_$(GAROSREL)) TEST_SCRIPTS = custom # for a faster turn-around: 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 4 10:27:52 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 4 May 2014 08:27:52 +0000 Subject: SF.net SVN: gar:[23543] csw/mgar/gar/v2/lib/python/activity.py Message-ID: <3gM0h054Jtz1BK@mail.opencsw.org> Revision: 23543 http://sourceforge.net/p/gar/code/23543 Author: wahwah Date: 2014-05-04 08:27:46 +0000 (Sun, 04 May 2014) Log Message: ----------- Maintainer activity: add usernames to whitelist Modified Paths: -------------- csw/mgar/gar/v2/lib/python/activity.py Modified: csw/mgar/gar/v2/lib/python/activity.py =================================================================== --- csw/mgar/gar/v2/lib/python/activity.py 2014-05-03 22:30:33 UTC (rev 23542) +++ csw/mgar/gar/v2/lib/python/activity.py 2014-05-04 08:27:46 UTC (rev 23543) @@ -26,9 +26,12 @@ MAINTAINER_WHITELIST = set([ # People who haven't released packages in a long time, but are otherwise # active. - 'claudio', - 'rmottola', - 'wbonnet', + 'claudio', # actively works on perl as of 2014-04 + 'daniel', # answers, email, is on standby, plans to build reSIProcate + 'jcraig', # wants to keep active status + 'rmottola', # answers email, works on GNUstep + 'trygvis', # answers email + 'wbonnet', # answers email ]) def RevDeps(pkgs): 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 4 10:28:00 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 4 May 2014 08:28:00 +0000 Subject: SF.net SVN: gar:[23544] csw/mgar/gar/v2/gar.conf.mk Message-ID: <3gM0h82qQ7z1D0@mail.opencsw.org> Revision: 23544 http://sourceforge.net/p/gar/code/23544 Author: wahwah Date: 2014-05-04 08:28:00 +0000 (Sun, 04 May 2014) Log Message: ----------- mGAR v2: Set the default version of GCC to 4.9 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2014-05-04 08:27:46 UTC (rev 23543) +++ csw/mgar/gar/v2/gar.conf.mk 2014-05-04 08:28:00 UTC (rev 23544) @@ -545,7 +545,7 @@ SOS12U2_CC_HOME ?= /opt/solstudio12.2 SOS12U3_CC_HOME ?= /opt/solarisstudio12.3 - GCC4_VERSION ?= 4.8 + GCC4_VERSION ?= 4.9 GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc-$(GCC4_VERSION) 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 4 10:28:07 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 4 May 2014 08:28:07 +0000 Subject: SF.net SVN: gar:[23545] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: <3gM0hK15BLz1HL@mail.opencsw.org> Revision: 23545 http://sourceforge.net/p/gar/code/23545 Author: wahwah Date: 2014-05-04 08:28:07 +0000 (Sun, 04 May 2014) Log Message: ----------- pkgdb show errors shows overridden status When displaying errors in a package, we want to know if errors are overridden or not. 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 2014-05-04 08:28:00 UTC (rev 23544) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2014-05-04 08:28:07 UTC (rev 23545) @@ -441,6 +441,7 @@ srv4 = GetPkg(md5_sum) res = m.CheckpkgErrorTag.select(m.CheckpkgErrorTag.q.srv4_file==srv4) for row in res: + print 'overridden' if row.overridden else 'active', print row.pkgname, row.tag_name, row.tag_info, row.catrel.name, row.arch.name, print row.os_rel.short_name elif (command, subcommand) == ('show', '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 Sun May 4 10:36:53 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 4 May 2014 08:36:53 +0000 Subject: SF.net SVN: gar:[23546] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: <3gM0tR2CFbz1Nb@mail.opencsw.org> Revision: 23546 http://sourceforge.net/p/gar/code/23546 Author: wahwah Date: 2014-05-04 08:36:51 +0000 (Sun, 04 May 2014) Log Message: ----------- gcc4/trunk: Making build files similar between gcc-4.8 and 4.9 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2014-05-04 08:28:07 UTC (rev 23545) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2014-05-04 08:36:51 UTC (rev 23546) @@ -17,7 +17,7 @@ DISTFILES = $(DISTNAME).tar.bz2 # MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ # MASTER_SITES += http://ftp.heanet.ie/mirrors/gnu/gcc/$(NAME)-$(VERSION)/ -MASTER_SITES += ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-4.9.0/ +MASTER_SITES += ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(VERSION)/ MASTER_SITES += ftp://ftp.gnu.org/gnu/gcc/gcc-$(VERSION)/ LIBOBJC = 4 @@ -110,6 +110,7 @@ # Used multiple times in package definitions JAVA_LIB_VERSION = 15 +GO_LIB_VERSION = 5 ALTERNATIVES_PRIO = 482 @@ -122,7 +123,7 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj-tools$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgij$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo5 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo$(GO_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgomp1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibitm1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc3 @@ -161,7 +162,7 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWggrep CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWgsed # This is basically the devel package -CHECKPKG_OVERRIDES_CSWgcc4core += shared-lib-package-contains-so-symlink +CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += shared-lib-package-contains-so-symlink # The .a files are necessary CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap @@ -242,12 +243,12 @@ SPKG_DESC_CSWlibssp0 += $(DESCRIPTION), libssp.so.0 RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1 -PACKAGES += CSWlibgo5 -PKGFILES_CSWlibgo5 += $(call baseisadirs,$(libdir),libgo\.so\.5(\.\d+)*) -SPKG_DESC_CSWlibgo5 += $(DESCRIPTION), libgo.so.5 -RUNTIME_DEP_PKGS_CSWlibgo5 += CSWlibgcc-s1 +PACKAGES += CSWlibgo$(GO_LIB_VERSION) +PKGFILES_CSWlibgo$(GO_LIB_VERSION) += $(call baseisadirs,$(libdir),libgo\.so\.$(GO_LIB_VERSION)(\.\d+)*) +SPKG_DESC_CSWlibgo$(GO_LIB_VERSION) += $(DESCRIPTION), libgo.so.$(GO_LIB_VERSION) +RUNTIME_DEP_PKGS_CSWlibgo$(GO_LIB_VERSION) += CSWlibgcc-s1 # Hasn't been investigated. I feel lucky. -CHECKPKG_OVERRIDES_CSWlibgo5 += file-with-bad-content +CHECKPKG_OVERRIDES_CSWlibgo$(GO_LIB_VERSION) += file-with-bad-content PACKAGES += CSWlibitm1 PKGFILES_CSWlibitm1 += $(call baseisadirs,$(libdir),libitm\.so\.1(\.\d+)*) @@ -272,8 +273,8 @@ # Dependencies only on Intel RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386 += CSWlibcilkrts5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386 += CSWlibquadmath0 +RUNTIME_DEP_PKGS_CSWlibgfortran3_i386 += CSWlibquadmath0 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH)) -RUNTIME_DEP_PKGS_CSWlibgfortran3_i386 += CSWlibquadmath0 RUNTIME_DEP_PKGS_CSWlibgfortran3 += $(RUNTIME_DEP_PKGS_CSWlibgfortran3_$(GARCH)) PACKAGES += CSWlibatomic1 @@ -492,7 +493,7 @@ CHECKPKG_OVERRIDES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgfortran3 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgij$(JAVA_LIB_VERSION) += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibgo5 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgo$(GO_LIB_VERSION) += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgomp1 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibitm1 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibobjc-gc4 += no-direct-binding This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sun May 4 20:39:55 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sun, 4 May 2014 18:39:55 +0000 Subject: SF.net SVN: gar:[23547] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gMGGB5hskz16b@mail.opencsw.org> Revision: 23547 http://sourceforge.net/p/gar/code/23547 Author: claudio_sf Date: 2014-05-04 18:39:54 +0000 (Sun, 04 May 2014) Log Message: ----------- perl/trunk: serial testing Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-05-04 08:36:51 UTC (rev 23546) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-05-04 18:39:54 UTC (rev 23547) @@ -128,8 +128,7 @@ # Test # Beware, test may fail when run in paralled. We leave it like this because it's a lot faster and the failure not very common. Just rerun mgar test. # You can always run the test single threaded if needed. - test-perl: @echo " ==> Running make $(TEST_TARGET) in $*" - cd $(WORKSRC) && $(MAKE) test + cd $(WORKSRC) && $(MAKE) -j1 test @$(MAKECOOKIE) 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 5 01:04:40 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 4 May 2014 23:04:40 +0000 Subject: SF.net SVN: gar:[23548] csw/mgar/pkg/lang-python/zope-interface/trunk/ Makefile Message-ID: <3gMN7n4w4Hz1JN@mail.opencsw.org> Revision: 23548 http://sourceforge.net/p/gar/code/23548 Author: wahwah Date: 2014-05-04 23:04:39 +0000 (Sun, 04 May 2014) Log Message: ----------- lang-python/zope-interface/trunk: Blurb is not necessary Modified Paths: -------------- csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile Modified: csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile 2014-05-04 18:39:54 UTC (rev 23547) +++ csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile 2014-05-04 23:04:39 UTC (rev 23548) @@ -8,8 +8,6 @@ GARTYPE = v2 DESCRIPTION = Implementation of object interfaces in Python -define BLURB -endef MASTER_SITES += $(PYPI_MIRROR) DISTFILES += $(DISTNAME).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 5 08:18:24 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 5 May 2014 06:18:24 +0000 Subject: SF.net SVN: gar:[23549] csw/mgar/pkg/mailman/trunk Message-ID: <3gMYm904qDz53@mail.opencsw.org> Revision: 23549 http://sourceforge.net/p/gar/code/23549 Author: dmichelsen Date: 2014-05-05 06:18:23 +0000 (Mon, 05 May 2014) Log Message: ----------- mailman/trunk: Update to 2.1.18, update to Python 2.7 Modified Paths: -------------- csw/mgar/pkg/mailman/trunk/Makefile csw/mgar/pkg/mailman/trunk/checksums Modified: csw/mgar/pkg/mailman/trunk/Makefile =================================================================== --- csw/mgar/pkg/mailman/trunk/Makefile 2014-05-04 23:04:39 UTC (rev 23548) +++ csw/mgar/pkg/mailman/trunk/Makefile 2014-05-05 06:18:23 UTC (rev 23549) @@ -6,7 +6,7 @@ # at all # ! Python modules are clearly installed in a wrong plac NAME = mailman -VERSION = 2.1.15 +VERSION = 2.1.18 DESCRIPTION = Mailman mailing list software @@ -16,15 +16,16 @@ PACKAGES += CSWmailman SPKG_DESC_CSWmailman = Mailman mailing list software # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWmailman += CSWpython +RUNTIME_DEP_PKGS_CSWmailman += CSWpython27 RUNTIME_DEP_PKGS_CSWmailman += CSWperl +CHECKPKG_OVERRIDES_CSWmailman += surplus-dependency|CSWpython27 # The mailman build system puts files in all sorts of strange places prefix=$(BUILD_PREFIX)/$(NAME) CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --without-permcheck -CONFIGURE_ARGS += --with-python=/opt/csw/bin/python2.6 +CONFIGURE_ARGS += --with-python=/opt/csw/bin/python2.7 # There is no testsuite TEST_SCRIPTS = Modified: csw/mgar/pkg/mailman/trunk/checksums =================================================================== --- csw/mgar/pkg/mailman/trunk/checksums 2014-05-04 23:04:39 UTC (rev 23548) +++ csw/mgar/pkg/mailman/trunk/checksums 2014-05-05 06:18:23 UTC (rev 23549) @@ -1 +1 @@ -7d207489e8e9de0727cb334d46029833 mailman-2.1.15.tgz +02ce493711248e1d3723356188446d9f mailman-2.1.18.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon May 5 09:05:58 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 5 May 2014 07:05:58 +0000 Subject: SF.net SVN: gar:[23550] csw/mgar/pkg/sudo/trunk Message-ID: <3gMZq14DzHzQG@mail.opencsw.org> Revision: 23550 http://sourceforge.net/p/gar/code/23550 Author: dmichelsen Date: 2014-05-05 07:05:53 +0000 (Mon, 05 May 2014) Log Message: ----------- sudo/trunk: Update to 1.8.10p2 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2014-05-05 06:18:23 UTC (rev 23549) +++ csw/mgar/pkg/sudo/trunk/Makefile 2014-05-05 07:05:53 UTC (rev 23550) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.10p1 +VERSION = 1.8.10p2 GARTYPE = v2 EXTRA_MODULATORS = LDAP Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2014-05-05 06:18:23 UTC (rev 23549) +++ csw/mgar/pkg/sudo/trunk/checksums 2014-05-05 07:05:53 UTC (rev 23550) @@ -1 +1 @@ -1d9c2bc5aaf02608343d17b9a666e8e1 sudo-1.8.10p1.tar.gz +5e5eab1036a7cc2c088ab0d9b6b6a42e sudo-1.8.10p2.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 Mon May 5 13:57:47 2014 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 5 May 2014 11:57:47 +0000 Subject: SF.net SVN: gar:[23551] csw/mgar/pkg/augeas/trunk Message-ID: <3gMjHm48Gyzs7@mail.opencsw.org> Revision: 23551 http://sourceforge.net/p/gar/code/23551 Author: phipsy Date: 2014-05-05 11:57:44 +0000 (Mon, 05 May 2014) Log Message: ----------- augeas: 1.2.0 (build failing; needs work) Modified Paths: -------------- csw/mgar/pkg/augeas/trunk/Makefile csw/mgar/pkg/augeas/trunk/checksums Modified: csw/mgar/pkg/augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/augeas/trunk/Makefile 2014-05-05 07:05:53 UTC (rev 23550) +++ csw/mgar/pkg/augeas/trunk/Makefile 2014-05-05 11:57:44 UTC (rev 23551) @@ -1,5 +1,5 @@ NAME = augeas -VERSION = 0.10.0 +VERSION = 1.2.0 GARTYPE = v2 DESCRIPTION = A configuration editing tool @@ -10,7 +10,7 @@ files. endef -MASTER_SITES = http://augeas.net/download/ +MASTER_SITES = http://download.augeas.net/ DISTFILES = $(NAME)-$(VERSION).tar.gz VENDOR_URL = http://augeas.net @@ -20,9 +20,9 @@ GARCOMPILER = GCC4 EXTRA_LDFLAGS = -lgnugetopt PATCHFILES += 0001-fix-compiling-on-solaris.patch \ - 0002-regexp-escape.patch \ - 0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch \ - 0004-pkg-config-Augeas-requires-libxml2.patch + 0002-regexp-escape.patch \ + 0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch \ + 0004-pkg-config-Augeas-requires-libxml2.patch # Building on Solaris 10 doesn't work as it support C99 and the above fixes are # not necessary there. Modified: csw/mgar/pkg/augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/augeas/trunk/checksums 2014-05-05 07:05:53 UTC (rev 23550) +++ csw/mgar/pkg/augeas/trunk/checksums 2014-05-05 11:57:44 UTC (rev 23551) @@ -5,3 +5,4 @@ 62d47bdc60e175f93aed3b81cb8e2785 augeas-0.8.1.tar.gz 5ef0ce53ce4c75f59ab2523506731084 augeas-0.9.0.tar.gz fe1834e90a066c3208ac0214622c7352 augeas-0.10.0.tar.gz +dce2f52cbd20f72c7da48e014ad48076 augeas-1.2.0.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 Mon May 5 15:51:54 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 5 May 2014 13:51:54 +0000 Subject: SF.net SVN: gar:[23552] csw/mgar/pkg/glib2/trunk Message-ID: <3gMlqf0nbDz165@mail.opencsw.org> Revision: 23552 http://sourceforge.net/p/gar/code/23552 Author: slowfranklin Date: 2014-05-05 13:51:51 +0000 (Mon, 05 May 2014) Log Message: ----------- Begin working on update to version 2.40.0 Fix several patches for new version. Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glib2/trunk/checksums csw/mgar/pkg/glib2/trunk/files/0001-Fix-POSIX-and-XOPEN-defines.patch csw/mgar/pkg/glib2/trunk/files/0005-Disable-test-gobject-param-implement.patch csw/mgar/pkg/glib2/trunk/files/0009-Disable-file-async-create-delete-checks.patch csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch csw/mgar/pkg/glib2/trunk/files/0019-Disable-some-gdbus-tests.patch csw/mgar/pkg/glib2/trunk/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2014-05-05 11:57:44 UTC (rev 23551) +++ csw/mgar/pkg/glib2/trunk/Makefile 2014-05-05 13:51:51 UTC (rev 23552) @@ -8,7 +8,7 @@ # Set max open files to 1024 NAME = glib -VERSION = 2.36.3 +VERSION = 2.40.0 GARTYPE = v2 # for memory synchronisation primitives like __sync_synchronize we need gcc GARCOMPILER = GNU @@ -28,9 +28,9 @@ BUILD_DEP_PKGS = CSWggettext-dev CSWlibiconv-dev CSWlibffi-dev BUILD_DEP_PKGS += CSWlibdbus-dev CSWdbus CSWlibgamin-dev CSWgamin -BUILD_DEP_PKGS += CSWpy-gobject CSWpkgconfig CSWlibpcre-dev CSWdskutl +BUILD_DEP_PKGS += CSWpy-gobject CSWpkgconfig CSWlibpcre-dev # To make the tests working -BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo +BUILD_DEP_PKGS += CSWpython CSWsharedmimeinfo # This is used to adjust paths in documentation BUILD_DEP_PKGS += CSWgsed BUILD_DEP_PKGS += CSWlibz-dev @@ -46,7 +46,6 @@ PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch PATCHFILES += 0029-Don-t-undefine-_XOPEN_SOURCE.patch PATCHFILES += 0030-Move-around-statfs_result.patch -PATCHFILES += 0034-Reorder-link-objects-glib2-must-come-first-otherwise.patch # # Test patches Modified: csw/mgar/pkg/glib2/trunk/checksums =================================================================== --- csw/mgar/pkg/glib2/trunk/checksums 2014-05-05 11:57:44 UTC (rev 23551) +++ csw/mgar/pkg/glib2/trunk/checksums 2014-05-05 13:51:51 UTC (rev 23552) @@ -1 +1 @@ -89180c7354b0acd3efb0a36ac05ca39c glib-2.36.3.tar.xz +05fb7cb17eacbc718e90366a1eae60d9 glib-2.40.0.tar.xz Modified: csw/mgar/pkg/glib2/trunk/files/0001-Fix-POSIX-and-XOPEN-defines.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0001-Fix-POSIX-and-XOPEN-defines.patch 2014-05-05 11:57:44 UTC (rev 23551) +++ csw/mgar/pkg/glib2/trunk/files/0001-Fix-POSIX-and-XOPEN-defines.patch 2014-05-05 13:51:51 UTC (rev 23552) @@ -1,17 +1,17 @@ -From 5732b4f00b153318dd9d7e10979c81f64da1a534 Mon Sep 17 00:00:00 2001 +From 14de0bf2c22ad53e3e57776e71e696f8f6068b2c Mon Sep 17 00:00:00 2001 From: Ralph Boehme -Date: Mon, 1 Jul 2013 16:42:06 +0200 +Date: Mon, 5 May 2014 15:05:03 +0200 Subject: [PATCH] Fix POSIX and XOPEN defines --- - configure | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 0537a4c..3e88334 100755 +index 17b0a17..00bda6a 100755 --- a/configure +++ b/configure -@@ -23808,10 +23808,10 @@ fi +@@ -23796,10 +23796,10 @@ fi case $host in *-*-solaris* ) @@ -24,15 +24,6 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h -@@ -26092,7 +26092,7 @@ if test "x$with_threads" = xyes || test "x$with_threads" = xposix; then : - # -U_OSF_SOURCE is for Digital UNIX 4.0d - GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE" - glib_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" -+# CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" - if test "x$have_threads" = xno; then : - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -- -1.8.3.1 +1.8.4.1 Modified: csw/mgar/pkg/glib2/trunk/files/0005-Disable-test-gobject-param-implement.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0005-Disable-test-gobject-param-implement.patch 2014-05-05 11:57:44 UTC (rev 23551) +++ csw/mgar/pkg/glib2/trunk/files/0005-Disable-test-gobject-param-implement.patch 2014-05-05 13:51:51 UTC (rev 23552) @@ -1,25 +1,27 @@ -From b936bfdf3c84464552981b535ae41185027588ad Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Thu, 23 Aug 2012 18:09:26 +0200 +From 4cda841e37fc05440d2be3cfe89493384e06fda0 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 5 May 2014 15:22:38 +0200 Subject: [PATCH] Disable test gobject/param/implement --- - gobject/tests/param.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + gobject/tests/param.c | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/gobject/tests/param.c b/gobject/tests/param.c -index 671642e..80871d9 100644 +index 40f453e..e865f01 100644 --- a/gobject/tests/param.c +++ b/gobject/tests/param.c -@@ -797,7 +797,7 @@ main (int argc, char *argv[]) - g_test_add_func ("/param/qdata", test_param_qdata); +@@ -840,8 +840,10 @@ main (int argc, char *argv[]) g_test_add_func ("/param/validate", test_param_validate); g_test_add_func ("/param/convert", test_param_convert); -- g_test_add_func ("/param/implement", test_param_implement); -+ /* g_test_add_func ("/param/implement", test_param_implement); */ - g_test_add_func ("/value/transform", test_value_transform); - return g_test_run (); ++#if 0 + if (g_test_slow ()) + g_test_add_func ("/param/implement", test_param_implement); ++#endif + + for (data.change_this_flag = 0; data.change_this_flag < 16; data.change_this_flag++) + for (data.change_this_type = 0; data.change_this_type < 3; data.change_this_type++) -- -1.7.11.3 +1.8.4.1 Modified: csw/mgar/pkg/glib2/trunk/files/0009-Disable-file-async-create-delete-checks.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0009-Disable-file-async-create-delete-checks.patch 2014-05-05 11:57:44 UTC (rev 23551) +++ csw/mgar/pkg/glib2/trunk/files/0009-Disable-file-async-create-delete-checks.patch 2014-05-05 13:51:51 UTC (rev 23552) @@ -1,6 +1,6 @@ -From 534ad61163d5e0a59fbfe1f27a969e676d2ff4b0 Mon Sep 17 00:00:00 2001 +From 35536dce4c0a69ced128d9bb10ce19bf50bfd0d4 Mon Sep 17 00:00:00 2001 From: Ralph Boehme -Date: Fri, 28 Jun 2013 17:59:39 +0200 +Date: Mon, 5 May 2014 15:29:49 +0200 Subject: [PATCH] Disable /file/async-create-delete/* checks. --- @@ -8,23 +8,23 @@ 1 file changed, 2 insertions(+) diff --git a/gio/tests/file.c b/gio/tests/file.c -index bca461a..e590af1 100644 +index cab1835..57d4f10 100644 --- a/gio/tests/file.c +++ b/gio/tests/file.c -@@ -794,11 +794,13 @@ main (int argc, char *argv[]) - g_test_add_func ("/file/parent", test_parent); +@@ -1009,11 +1009,13 @@ main (int argc, char *argv[]) g_test_add_func ("/file/child", test_child); g_test_add_func ("/file/type", test_type); -+/* + g_test_add_func ("/file/parse-name", test_parse_name); ++#if 0 g_test_add_data_func ("/file/async-create-delete/0", GINT_TO_POINTER (0), test_create_delete); g_test_add_data_func ("/file/async-create-delete/1", GINT_TO_POINTER (1), test_create_delete); g_test_add_data_func ("/file/async-create-delete/10", GINT_TO_POINTER (10), test_create_delete); g_test_add_data_func ("/file/async-create-delete/25", GINT_TO_POINTER (25), test_create_delete); g_test_add_data_func ("/file/async-create-delete/4096", GINT_TO_POINTER (4096), test_create_delete); -+*/ ++#endif g_test_add_func ("/file/replace-load", test_replace_load); g_test_add_func ("/file/replace-cancel", test_replace_cancel); g_test_add_func ("/file/async-delete", test_async_delete); -- -1.8.3.1 +1.8.4.1 Modified: csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch 2014-05-05 11:57:44 UTC (rev 23551) +++ csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch 2014-05-05 13:51:51 UTC (rev 23552) @@ -1,77 +1,33 @@ -From 32edd15a61dee58fe9dc3547147d99a7a9d923fe Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Thu, 29 Sep 2011 14:08:06 +0200 +From 1a355874686c4a221edf429270e8e8c1c0956c3b Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 5 May 2014 15:36:31 +0200 Subject: [PATCH] Fix/disable testglib tests --- - tests/testglib.c | 55 +++++++++++++++++++++++++++-------------------------- - 1 files changed, 28 insertions(+), 27 deletions(-) + tests/testglib.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/testglib.c b/tests/testglib.c -index 158808a..c012d04 100644 +index 7ccdc05..da2e7e1 100644 --- a/tests/testglib.c +++ b/tests/testglib.c -@@ -533,32 +533,33 @@ test_g_parse_debug_string (void) +@@ -548,6 +548,7 @@ test_g_parse_debug_string (void) static void log_warning_error_tests (void) { -- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) -- { -- g_message ("this is a g_message test."); -- g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\""); -- g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\""); -- exit (0); -- } -- g_test_trap_assert_passed(); -- g_test_trap_assert_stderr ("*is a g_message test*"); -- g_test_trap_assert_stderr ("*non-printable UTF-8*"); -- g_test_trap_assert_stderr ("*unsafe chars*"); -- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) -- { -- g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345); -- exit (0); -- } -- g_test_trap_assert_failed(); /* we have fatal-warnings enabled */ -- g_test_trap_assert_stderr ("*harmless warning*"); -- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) -- { -- g_print (NULL); -- exit (0); -- } -- g_test_trap_assert_failed(); /* we have fatal-warnings enabled */ -- g_test_trap_assert_stderr ("*g_print*assertion*failed*"); -- g_test_trap_assert_stderr ("*NULL*"); -+ /* Disabled: Won't work */ -+ /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */ -+ /* { */ -+ /* g_message ("this is a g_message test."); */ -+ /* g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\""); */ -+ /* g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\""); */ -+ /* exit (0); */ -+ /* } */ -+ /* g_test_trap_assert_passed(); */ -+ /* g_test_trap_assert_stderr ("*is a g_message test*"); */ -+ /* g_test_trap_assert_stderr ("*non-printable UTF-8*"); */ -+ /* g_test_trap_assert_stderr ("*unsafe chars*"); */ -+ /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */ -+ /* { */ -+ /* g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345); */ -+ /* exit (0); */ -+ /* } */ -+ /* g_test_trap_assert_failed(); /\* we have fatal-warnings enabled *\/ */ -+ /* g_test_trap_assert_stderr ("*harmless warning*"); */ -+ /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */ -+ /* { */ -+ /* g_print (NULL); */ -+ /* exit (0); */ -+ /* } */ -+ /* g_test_trap_assert_failed(); /\* we have fatal-warnings enabled *\/ */ -+ /* g_test_trap_assert_stderr ("*g_print*assertion*failed*"); */ -+ /* g_test_trap_assert_stderr ("*NULL*"); */ ++#if 0 + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, + "*is a g_message test*"); + g_message ("this is a g_message test."); +@@ -572,6 +573,7 @@ log_warning_error_tests (void) + "*g_print*assertion*failed*"); + g_print (NULL); + g_test_assert_expected_messages (); ++#endif } static void -@@ -1130,7 +1131,7 @@ gstring_tests (void) +@@ -1168,7 +1170,7 @@ gstring_tests (void) for (i = 0; i < 10000; i++) g_string_append_c (string1, 'a'+(i%26)); @@ -81,5 +37,5 @@ the %10000.10000f format... */ g_string_printf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%10000.10000f", -- -1.7.6.1 +1.8.4.1 Modified: csw/mgar/pkg/glib2/trunk/files/0019-Disable-some-gdbus-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0019-Disable-some-gdbus-tests.patch 2014-05-05 11:57:44 UTC (rev 23551) +++ csw/mgar/pkg/glib2/trunk/files/0019-Disable-some-gdbus-tests.patch 2014-05-05 13:51:51 UTC (rev 23552) @@ -1,17 +1,17 @@ -From ca7fea45d4b7d3afbd413cc4a9a2792892efbb91 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 26 Aug 2012 16:31:53 +0200 +From a34a857955c3fd58a2da9c35568bbd800762745c Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 5 May 2014 15:26:54 +0200 Subject: [PATCH] Disable some gdbus/* tests --- - gio/tests/gdbus-peer.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) + gio/tests/gdbus-peer.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c -index 926010a..b502b28 100644 +index 6c6f3b0..c583e60 100644 --- a/gio/tests/gdbus-peer.c +++ b/gio/tests/gdbus-peer.c -@@ -1828,12 +1828,18 @@ main (int argc, +@@ -1731,12 +1731,16 @@ main (int argc, /* all the tests rely on a shared main loop */ loop = g_main_loop_new (NULL, FALSE); @@ -19,20 +19,17 @@ + /* g_test_add_func ("/gdbus/peer-to-peer", test_peer); */ g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing); g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp); + g_test_add_func ("/gdbus/tcp-anonymous", test_tcp_anonymous); - g_test_add_func ("/gdbus/credentials", test_credentials); -- g_test_add_func ("/gdbus/overflow", test_overflow); + /* + * According gcredentials.c, this is not implemented on Solaris, i.e. everything no + * FreeBSD, OpenBSD, or Linux. -+ * + */ + /* g_test_add_func ("/gdbus/credentials", test_credentials); */ -+ -+ /*g_test_add_func ("/gdbus/overflow", test_overflow);*/ g_test_add_func ("/gdbus/codegen-peer-to-peer", codegen_test_peer); ret = g_test_run(); -- -1.7.11.3 +1.8.4.1 Modified: csw/mgar/pkg/glib2/trunk/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch 2014-05-05 11:57:44 UTC (rev 23551) +++ csw/mgar/pkg/glib2/trunk/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch 2014-05-05 13:51:51 UTC (rev 23552) @@ -1,6 +1,6 @@ -From ebf6b06ed4aabe24425b09bd145c0191c431aa7d Mon Sep 17 00:00:00 2001 +From 6c908148118b5197ae44dd54209d9bf84faf7cc5 Mon Sep 17 00:00:00 2001 From: Ralph Boehme -Date: Sat, 29 Jun 2013 08:28:38 +0200 +Date: Mon, 5 May 2014 15:10:53 +0200 Subject: [PATCH] Change shell to bash in test shell scripts --- @@ -9,7 +9,7 @@ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/run-assert-msg-test.sh b/tests/run-assert-msg-test.sh -index 58305b0..2c162bc 100755 +index d4a5111..fe0d6ec 100755 --- a/tests/run-assert-msg-test.sh +++ b/tests/run-assert-msg-test.sh @@ -1,4 +1,10 @@ @@ -28,8 +28,8 @@ echo_v "Running assert-msg-test" OUT=$(./assert-msg-test 2>&1) && fail "assert-msg-test should abort" --echo "$OUT" | grep -q '^ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \ -+echo "$OUT" | ggrep -q '^ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \ +-echo "$OUT" | grep -q '^GLib:ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \ ++echo "$OUT" | ggrep -q '^GLib:ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \ fail "does not print assertion message" if ! type gdb >/dev/null 2>&1; then @@ -37,8 +37,8 @@ OUT=$($LIBTOOL --mode=execute gdb --batch -x ${srcdir:-.}/assert-msg-test.gdb ./assert-msg-test 2> $error_out) || fail "failed to run gdb" echo_v "Checking if assert message is in __glib_assert_msg" --if ! echo "$OUT" | grep -q '^$1.*"ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then -+if ! echo "$OUT" | ggrep -q '^$1.*"ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then +-if ! echo "$OUT" | grep -q '^$1.*"GLib:ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then ++if ! echo "$OUT" | ggrep -q '^$1.*"GLib:ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then fail "__glib_assert_msg does not have assertion message" fi @@ -53,5 +53,5 @@ fail () { -- -1.8.3.1 +1.8.4.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon May 5 15:56:22 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 5 May 2014 13:56:22 +0000 Subject: SF.net SVN: gar:[23553] csw/mgar/pkg/flex/trunk Message-ID: <3gMlwc1T7Wz19S@mail.opencsw.org> Revision: 23553 http://sourceforge.net/p/gar/code/23553 Author: dmichelsen Date: 2014-05-05 13:56:19 +0000 (Mon, 05 May 2014) Log Message: ----------- flex/trunk: Update to 2.5.39 Modified Paths: -------------- csw/mgar/pkg/flex/trunk/Makefile csw/mgar/pkg/flex/trunk/checksums Added Paths: ----------- csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch Modified: csw/mgar/pkg/flex/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex/trunk/Makefile 2014-05-05 13:51:51 UTC (rev 23552) +++ csw/mgar/pkg/flex/trunk/Makefile 2014-05-05 13:56:19 UTC (rev 23553) @@ -1,7 +1,7 @@ # $Id$ NAME = flex -VERSION = 2.5.37 +VERSION = 2.5.39 GARTYPE = v2 DESCRIPTION = A tool for generating text-scanning programs @@ -14,13 +14,19 @@ endef MASTER_SITES += $(SF_MIRRORS) -DISTFILES += $(DISTNAME).tar.bz2 +DISTFILES += $(DISTNAME).tar.xz +# This is probably the same cause as the bug reported here: +# https://sourceforge.net/p/flex/bugs/170/ +PATCHFILES += 0001-Allow-undefined-symbols-in-shared-libs.patch + VENDOR_URL = http://flex.sourceforge.net/ PACKAGES += CSWflex SPKG_DESC_CSWflex = A tool for generating text-scanning programs # PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWflex += CSWlibfl-pic2 +RUNTIME_DEP_PKGS_CSWflex += CSWlibfl2 RUNTIME_DEP_PKGS_CSWflex += CSWlibintl8 # Previously the default flex was 2.5.4a and 2.5.35 was in /opt/csw/libexec/flex-2.5.35/bin @@ -28,9 +34,27 @@ CATALOGNAME_CSWflex-new += flex_new_stub PKGFILES_CSWflex-new += $(bindir)/newflex +PACKAGES += CSWlibfl2 +SPKG_DESC_CSWlibfl2 = Library for Flex, libfl.so.2 +PKGFILES_CSWlibfl2 += $(call pkgfiles_lib,libfl.so.2) + +PACKAGES += CSWlibfl-pic2 +SPKG_DESC_CSWlibfl-pic2 = Library for Flex, libfl_pic.so.2 +PKGFILES_CSWlibfl-pic2 += $(call pkgfiles_lib,libfl_pic.so.2) + # Must use GNU diff for option '-q' or two tests fail due to bailing out Sun diff TEST_ENV_PATH = $(prefix)/gnu:$(PATH) +# There are two tests failing, this is a known issue: +# Executing test test-bison-yylloc +# Test test-bison-yylloc FAILED. See test-bison-yylloc/OUTPUT for details. +# Executing test test-bison-yylval +# Test test-bison-yylval FAILED. See test-bison-yylval/OUTPUT for details. +# See for details +# https://sourceforge.net/p/flex/bugs/144/ + +SKIPTEST ?= 1 + include gar/category.mk post-install: Modified: csw/mgar/pkg/flex/trunk/checksums =================================================================== --- csw/mgar/pkg/flex/trunk/checksums 2014-05-05 13:51:51 UTC (rev 23552) +++ csw/mgar/pkg/flex/trunk/checksums 2014-05-05 13:56:19 UTC (rev 23553) @@ -1 +1 @@ -c75940e1fc25108f2a7b3ef42abdae06 flex-2.5.37.tar.bz2 +477679c37ff8b28248a9b05f1da29a82 flex-2.5.39.tar.xz Added: csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch =================================================================== --- csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch (rev 0) +++ csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch 2014-05-05 13:56:19 UTC (rev 23553) @@ -0,0 +1,31 @@ +From a7dde1d6fa77d36ce1b6f87f48f5d0ed731a12be Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 5 May 2014 15:36:28 +0200 +Subject: [PATCH] Allow undefined symbols in shared libs + +--- + Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 86e31c1..ec16e01 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -435,12 +435,12 @@ libfl_la_SOURCES = \ + libmain.c \ + libyywrap.c + +-libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ ++libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ + libfl_pic_la_SOURCES = \ + libmain.c \ + libyywrap.c + +-libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ ++libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ + noinst_HEADERS = \ + flexdef.h \ + flexint.h \ +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon May 5 16:01:04 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 5 May 2014 14:01:04 +0000 Subject: SF.net SVN: gar:[23554] csw/mgar/pkg/squid/trunk Message-ID: <3gMm3G6V4jz1FV@mail.opencsw.org> Revision: 23554 http://sourceforge.net/p/gar/code/23554 Author: dmichelsen Date: 2014-05-05 14:01:00 +0000 (Mon, 05 May 2014) Log Message: ----------- squid/trunk: Update to 3.4.5, remove old patches Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/squid/trunk/files/0002-Link-against-OpenSSL-from-OpenCSW.patch csw/mgar/pkg/squid/trunk/files/0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch csw/mgar/pkg/squid/trunk/files/0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch csw/mgar/pkg/squid/trunk/files/0006-Use-default-cache_dir.patch csw/mgar/pkg/squid/trunk/files/0006-Use-usr-xpg4-bin-egrep.patch csw/mgar/pkg/squid/trunk/files/0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch csw/mgar/pkg/squid/trunk/files/0008-Rename-IpAddress-to-SquidIpAddress-to-make-mib2.h-ha.patch Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2014-05-05 13:56:19 UTC (rev 23553) +++ csw/mgar/pkg/squid/trunk/Makefile 2014-05-05 14:01:00 UTC (rev 23554) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 3.4.4 +VERSION = 3.4.5 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache @@ -30,6 +30,7 @@ RUNTIME_DEP_PKGS_CSWsquid += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsquid += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWsquid += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWsquid += CSWlibnettle4 # Linker anomaly CHECKPKG_OVERRIDES_CSWsquid += surplus-dependency|CSWlibintl8 @@ -48,17 +49,6 @@ MIGRATE_FILES += mime.conf MIGRATE_FILES += squid.conf -##PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch -##PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch -#PATCHFILES += 0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch -##PATCHFILES += 0006-Use-default-cache_dir.patch -##PATCHFILES += 0006-Use-usr-xpg4-bin-egrep.patch -#PATCHFILES += 0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch -# -## Use patch until this is fixed: -## http://bugs.squid-cache.org/show_bug.cgi?id=3572 -#PATCHFILES += 0008-Rename-IpAddress-to-SquidIpAddress-to-make-mib2.h-ha.patch - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/$(NAME) CONFIGURE_ARGS += --datadir=$(datadir)/$(NAME) @@ -117,6 +107,9 @@ EXTRA_CPPFLAGS += -DKRB5_DEPRECATED=1 CONFIGURE_ARGS += --disable-strict-error-checking +# configure tests with 'id -u' and expects a uidnumber +CONFIGURE_ENV_PATH = /usr/xpg4/bin:$(PATH) + GARCOMPILER = GNU EXTRA_LIB += $(prefix)/bdb48/lib Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2014-05-05 13:56:19 UTC (rev 23553) +++ csw/mgar/pkg/squid/trunk/checksums 2014-05-05 14:01:00 UTC (rev 23554) @@ -1 +1 @@ -f9c7dd495e45042cc162d89cfbb97cc0 squid-3.4.4.tar.bz2 +b6bee84755c9bd08a119a386c26c9189 squid-3.4.5.tar.bz2 Deleted: csw/mgar/pkg/squid/trunk/files/0002-Link-against-OpenSSL-from-OpenCSW.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/0002-Link-against-OpenSSL-from-OpenCSW.patch 2014-05-05 13:56:19 UTC (rev 23553) +++ csw/mgar/pkg/squid/trunk/files/0002-Link-against-OpenSSL-from-OpenCSW.patch 2014-05-05 14:01:00 UTC (rev 23554) @@ -1,25 +0,0 @@ -From bbdd76dd83f1e18436b41127f709aa0958753a7d Mon Sep 17 00:00:00 2001 -From: builder user -Date: Mon, 19 Sep 2011 16:25:15 +0200 -Subject: [PATCH] Link against OpenSSL from OpenCSW. - ---- - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 136a5cd..00ffb43 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -116,6 +116,8 @@ SUBDIRS += ssl - SSL_LIBS = \ - ssl/libsslutil.la \ - ssl/libsslsquid.la -+XTRA_LIBS += -lssl -lcrypto -+LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - else - SSL_SOURCE = - SSL_LIBS = --- -1.7.6 - Deleted: csw/mgar/pkg/squid/trunk/files/0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch 2014-05-05 13:56:19 UTC (rev 23553) +++ csw/mgar/pkg/squid/trunk/files/0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch 2014-05-05 14:01:00 UTC (rev 23554) @@ -1,25 +0,0 @@ -From c071545192850fba9a024d2ed9e37fe9fad76604 Mon Sep 17 00:00:00 2001 -From: builder user -Date: Mon, 19 Sep 2011 16:56:57 +0200 -Subject: [PATCH] Check for ber_pvt_opt_on instead of main in libber. - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e7df9ed..25b2c17 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2875,7 +2875,7 @@ mingw|mingw32) - *) - LIB_LDAP="-lldap" - dnl LDAP helpers need to know if -llber is needed or not -- AC_CHECK_LIB(lber, main, [LIB_LBER="-llber"]) -+ AC_CHECK_LIB(lber, ber_pvt_opt_on, [LIB_LBER="-llber"]) - ;; - esac - AC_SUBST(LIB_LDAP) --- -1.7.6 - Deleted: csw/mgar/pkg/squid/trunk/files/0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch 2014-05-05 13:56:19 UTC (rev 23553) +++ csw/mgar/pkg/squid/trunk/files/0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch 2014-05-05 14:01:00 UTC (rev 23554) @@ -1,26 +0,0 @@ -From 6f0024035fe0aa19409203614e724b5a386849b7 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 21 Sep 2011 14:59:31 +0200 -Subject: [PATCH 6/7] Replace /usr/local/squid/libexec with - /opt/csw/libexec/squid3. - ---- - helpers/external_acl/unix_group/squid_unix_group.8 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/helpers/external_acl/unix_group/squid_unix_group.8 b/helpers/external_acl/unix_group/squid_unix_group.8 -index 72aa1a3..66c2d52 100644 ---- a/helpers/external_acl/unix_group/squid_unix_group.8 -+++ b/helpers/external_acl/unix_group/squid_unix_group.8 -@@ -27,7 +27,7 @@ Strip NT domain name component from user names (/ or \\ separated) - This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 - matches users in group2 or group3 - .IP --external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p -+external_acl_type unix_group %LOGIN /opt/csw/libexec/squid3/squid_unix_group -p - .IP - acl usergroup1 external unix_group group1 - .IP --- -1.7.6.1 - Deleted: csw/mgar/pkg/squid/trunk/files/0006-Use-default-cache_dir.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/0006-Use-default-cache_dir.patch 2014-05-05 13:56:19 UTC (rev 23553) +++ csw/mgar/pkg/squid/trunk/files/0006-Use-default-cache_dir.patch 2014-05-05 14:01:00 UTC (rev 23554) @@ -1,25 +0,0 @@ -From 7b2c6d4e46b124924a82474d21ab51db5de64830 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 21 Sep 2011 16:06:58 +0200 -Subject: [PATCH] Use default cache_dir. - ---- - src/cf.data.pre | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/cf.data.pre b/src/cf.data.pre -index a5aaefc..8301b58 100644 ---- a/src/cf.data.pre -+++ b/src/cf.data.pre -@@ -2412,7 +2412,7 @@ DOC_START - NOCOMMENT_START - - # Uncomment and adjust the following to add a disk cache directory. --#cache_dir ufs @DEFAULT_SWAP_DIR@ 100 16 256 -+cache_dir ufs @DEFAULT_SWAP_DIR@ 100 16 256 - NOCOMMENT_END - DOC_END - --- -1.7.6.1 - Deleted: csw/mgar/pkg/squid/trunk/files/0006-Use-usr-xpg4-bin-egrep.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/0006-Use-usr-xpg4-bin-egrep.patch 2014-05-05 13:56:19 UTC (rev 23553) +++ csw/mgar/pkg/squid/trunk/files/0006-Use-usr-xpg4-bin-egrep.patch 2014-05-05 14:01:00 UTC (rev 23554) @@ -1,53 +0,0 @@ -From 0badaafded0de5167f5dac91253c15ac222ad839 Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 23 May 2012 12:29:43 +0200 -Subject: [PATCH] Use /usr/xpg4/bin/egrep - ---- - bootstrap.sh | 2 +- - configure | 2 +- - configure.ac | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bootstrap.sh b/bootstrap.sh -index e079783..4736194 100755 ---- a/bootstrap.sh -+++ b/bootstrap.sh -@@ -76,7 +76,7 @@ bootstrap_libtoolize() { - - # TODO: when we have libtool2, tell libtoolize where to put its files - # instead of manualy moving files from ltdl to lib/libLtdl -- if egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.ac -+ if /usr/xpg4/bin/egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.ac - then - ltdl="--ltdl" - else -diff --git a/configure b/configure -index 02fc78c..47d339f 100755 ---- a/configure -+++ b/configure -@@ -26652,7 +26652,7 @@ $as_echo "$SQUID_MAXFD (user-forced)" >&6; } - else - case $host in - i386-unknown-freebsd*) -- if echo "$LDFLAGS" | grep -q pthread; then -+ if echo "$LDFLAGS" | /usr/xpg4/bin/egrep -q pthread; then - LDFLAGS=`echo $LDFLAGS | sed -e "s/-pthread//"` - fi - esac -diff --git a/configure.ac b/configure.ac -index 61cef5d..131ae1a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3492,7 +3492,7 @@ if test -n "$squid_filedescriptors_num" ; then - else - case $host in - i386-unknown-freebsd*) -- if echo "$LDFLAGS" | grep -q pthread; then -+ if echo "$LDFLAGS" | /usr/xpg4/bin/egrep -q pthread; then - LDFLAGS=`echo $LDFLAGS | sed -e "s/-pthread//"` - fi - esac --- -1.7.10 - Deleted: csw/mgar/pkg/squid/trunk/files/0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch 2014-05-05 13:56:19 UTC (rev 23553) +++ csw/mgar/pkg/squid/trunk/files/0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch 2014-05-05 14:01:00 UTC (rev 23554) @@ -1,127 +0,0 @@ -From 53850c51d38b55e7fb0180a04d5ffb9cb99108ca Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 23 May 2012 13:13:09 +0200 -Subject: [PATCH] Use OpenCSW-specific paths for various helper tests. - ---- - helpers/basic_auth/LDAP/config.test | 6 ++---- - helpers/basic_auth/SASL/config.test | 5 +---- - helpers/digest_auth/eDirectory/config.test | 5 +---- - helpers/digest_auth/ldap/config.test | 5 +---- - helpers/external_acl/ldap_group/config.test | 5 +---- - helpers/external_acl/session/config.test | 4 ++-- - helpers/external_acl/wbinfo_group/config.test | 4 ++-- - 7 files changed, 10 insertions(+), 24 deletions(-) - -diff --git a/helpers/basic_auth/LDAP/config.test b/helpers/basic_auth/LDAP/config.test -index 5c354f8..f22847e 100755 ---- a/helpers/basic_auth/LDAP/config.test -+++ b/helpers/basic_auth/LDAP/config.test -@@ -1,8 +1,6 @@ - #!/bin/sh --if [ -f /usr/include/ldap.h ]; then -- exit 0 --fi --if [ -f /usr/include/winldap.h ]; then -+# Use ldap.h from OpenLDAP -+if [ -f /opt/csw/include/ldap.h ]; then - exit 0 - fi - exit 1 -diff --git a/helpers/basic_auth/SASL/config.test b/helpers/basic_auth/SASL/config.test -index 8054c95..64fe038 100755 ---- a/helpers/basic_auth/SASL/config.test -+++ b/helpers/basic_auth/SASL/config.test -@@ -1,8 +1,5 @@ - #!/bin/sh --if [ -f /usr/include/sasl.h ]; then -- exit 0 --fi --if [ -f /usr/include/sasl/sasl.h ]; then -+if [ -f /opt/csw/include/sasl/sasl.h ]; then - exit 0 - fi - exit 1 -diff --git a/helpers/digest_auth/eDirectory/config.test b/helpers/digest_auth/eDirectory/config.test -index 5c354f8..b3a8960 100755 ---- a/helpers/digest_auth/eDirectory/config.test -+++ b/helpers/digest_auth/eDirectory/config.test -@@ -1,8 +1,5 @@ - #!/bin/sh --if [ -f /usr/include/ldap.h ]; then -- exit 0 --fi --if [ -f /usr/include/winldap.h ]; then -+if [ -f /opt/csw/include/ldap.h ]; then - exit 0 - fi - exit 1 -diff --git a/helpers/digest_auth/ldap/config.test b/helpers/digest_auth/ldap/config.test -index 5c354f8..b3a8960 100755 ---- a/helpers/digest_auth/ldap/config.test -+++ b/helpers/digest_auth/ldap/config.test -@@ -1,8 +1,5 @@ - #!/bin/sh --if [ -f /usr/include/ldap.h ]; then -- exit 0 --fi --if [ -f /usr/include/winldap.h ]; then -+if [ -f /opt/csw/include/ldap.h ]; then - exit 0 - fi - exit 1 -diff --git a/helpers/external_acl/ldap_group/config.test b/helpers/external_acl/ldap_group/config.test -index 5c354f8..b3a8960 100755 ---- a/helpers/external_acl/ldap_group/config.test -+++ b/helpers/external_acl/ldap_group/config.test -@@ -1,8 +1,5 @@ - #!/bin/sh --if [ -f /usr/include/ldap.h ]; then -- exit 0 --fi --if [ -f /usr/include/winldap.h ]; then -+if [ -f /opt/csw/include/ldap.h ]; then - exit 0 - fi - exit 1 -diff --git a/helpers/external_acl/session/config.test b/helpers/external_acl/session/config.test -index 83b0f99..f41a6d8 100755 ---- a/helpers/external_acl/session/config.test -+++ b/helpers/external_acl/session/config.test -@@ -1,10 +1,10 @@ - #!/bin/sh - - # Actual intended test --if [ -f /usr/include/db_185.h ]; then -+if [ -f /opt/csw/bdb48/include/db_185.h ]; then - exit 0 - fi --if [ -f /usr/include/db.h ] && grep dbopen /usr/include/db.h; then -+if [ -f /opt/csw/bdb48/include/db.h ] && grep dbopen /opt/csw/bdb48/include/db.h; then - exit 0 - fi - exit 1 -diff --git a/helpers/external_acl/wbinfo_group/config.test b/helpers/external_acl/wbinfo_group/config.test -index d361121..6f60f8f 100755 ---- a/helpers/external_acl/wbinfo_group/config.test -+++ b/helpers/external_acl/wbinfo_group/config.test -@@ -1,6 +1,6 @@ - #!/bin/sh - samba_found="no" --for sambaprefix in /usr/local /opt /opt/samba /usr/local/samba /usr -+for sambaprefix in /opt/csw /usr/local /opt /opt/samba /usr/local/samba /usr - do - if [ -x $sambaprefix/bin/wbinfo ]; then - samba_found="yes" -@@ -9,7 +9,7 @@ done - if test "$samba_found" = "no"; then - echo "WARNING: Samba wbinfo not found in default location. wbinfo_group.pl may not work on this machine" - fi --for perlprefix in /usr /usr/local /opt /opt/perl -+for perlprefix in /opt/csw /usr /usr/local /opt /opt/perl - do - if [ -x $perlprefix/bin/perl ]; then - exit 0 --- -1.7.10 - Deleted: csw/mgar/pkg/squid/trunk/files/0008-Rename-IpAddress-to-SquidIpAddress-to-make-mib2.h-ha.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/0008-Rename-IpAddress-to-SquidIpAddress-to-make-mib2.h-ha.patch 2014-05-05 13:56:19 UTC (rev 23553) +++ csw/mgar/pkg/squid/trunk/files/0008-Rename-IpAddress-to-SquidIpAddress-to-make-mib2.h-ha.patch 2014-05-05 14:01:00 UTC (rev 23554) @@ -1,4648 +0,0 @@ -From a5b58ab2e6c0def501de7d2b44435925ef1facac Mon Sep 17 00:00:00 2001 -From: Juraj Lutter -Date: Wed, 23 May 2012 14:30:09 +0200 -Subject: [PATCH] Rename IpAddress to SquidIpAddress to make mib2.h happy. - ---- - ChangeLog | 2 +- - snmplib/parse.c | 2 +- - src/AccessLogEntry.h | 4 +- - src/ClientInfo.h | 2 +- - src/CompositePoolNode.h | 2 +- - src/ConnectionDetail.h | 4 +- - src/DiskIO/DiskDaemon/DiskdIOStrategy.cc | 2 +- - src/HierarchyLogEntry.h | 2 +- - src/HttpRequest.h | 8 +- - src/ICP.h | 18 ++-- - src/PeerSelectState.h | 6 +- - src/ProtoPort.h | 2 +- - src/acl/Arp.cc | 8 +- - src/acl/Asn.cc | 28 +++--- - src/acl/Asn.h | 12 +-- - src/acl/DestinationAsn.h | 2 +- - src/acl/FilledChecklist.h | 6 +- - src/acl/Ip.cc | 14 +-- - src/acl/Ip.h | 12 +-- - src/acl/SourceAsn.h | 2 +- - src/adaptation/icap/ModXact.cc | 2 +- - src/adaptation/icap/Xaction.cc | 6 +- - src/auth/AclMaxUserIp.cc | 2 +- - src/auth/AclMaxUserIp.h | 2 +- - src/auth/User.cc | 4 +- - src/auth/User.h | 4 +- - src/auth/UserRequest.cc | 8 +- - src/auth/UserRequest.h | 8 +- - src/auth/digest/auth_digest.cc | 2 +- - src/cache_cf.cc | 8 +- - src/client_db.cc | 16 ++-- - src/client_side.cc | 6 +- - src/client_side.h | 6 +- - src/client_side_reply.cc | 10 +- - src/client_side_reply.h | 4 +- - src/client_side_request.cc | 6 +- - src/comm.cc | 20 ++-- - src/comm.h | 12 +-- - src/delay_pools.cc | 18 ++-- - src/dns_internal.cc | 20 ++-- - src/errorpage.h | 2 +- - src/esi/Esi.cc | 2 +- - src/external_acl.cc | 2 +- - src/fde.h | 4 +- - src/forward.cc | 14 +-- - src/forward.h | 4 +- - src/fqdncache.cc | 6 +- - src/ftp.cc | 12 +-- - src/globals.h | 4 +- - src/helper.h | 8 +- - src/htcp.cc | 62 ++++++------ - src/htcp.h | 4 +- - src/http.cc | 2 +- - src/icmp/Icmp.cc | 2 +- - src/icmp/Icmp.h | 8 +- - src/icmp/Icmp4.cc | 2 +- - src/icmp/Icmp4.h | 2 +- - src/icmp/Icmp6.cc | 2 +- - src/icmp/Icmp6.h | 2 +- - src/icmp/IcmpPinger.h | 2 +- - src/icmp/IcmpSquid.cc | 8 +- - src/icmp/IcmpSquid.h | 4 +- - src/icmp/net_db.cc | 32 +++---- - src/icmp/net_db.h | 10 +- - src/icmp/testIcmp.h | 2 +- - src/icp_v2.cc | 30 +++--- - src/icp_v3.cc | 4 +- - src/ident/Ident.cc | 8 +- - src/ident/Ident.h | 4 +- - src/internal.cc | 2 +- - src/ip/IpAddress.cc | 150 +++++++++++++++--------------- - src/ip/IpAddress.h | 74 +++++++-------- - src/ip/IpIntercept.cc | 22 ++--- - src/ip/IpIntercept.h | 18 ++-- - src/ip/testIpAddress.cc | 52 +++++------ - src/ipc.cc | 6 +- - src/ipc_win32.cc | 16 ++-- - src/ipcache.cc | 38 ++++---- - src/neighbors.cc | 14 +-- - src/pconn.cc | 6 +- - src/pconn.h | 8 +- - src/protos.h | 32 +++---- - src/redirect.cc | 4 +- - src/send-announce.cc | 2 +- - src/snmp_agent.cc | 2 +- - src/snmp_core.cc | 12 +-- - src/ssl/context_storage.cc | 20 ++-- - src/ssl/context_storage.h | 8 +- - src/structs.h | 28 +++--- - src/tests/stub_comm.cc | 2 +- - src/tools.cc | 2 +- - src/tunnel.cc | 2 +- - src/unlinkd.cc | 2 +- - src/wccp.cc | 4 +- - src/wccp2.cc | 6 +- - src/win32.cc | 6 +- - tools/cachemgr.cc | 2 +- - tools/squidclient.cc | 10 +- - 98 files changed, 550 insertions(+), 550 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 659c70c..c4dd31f 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -306,7 +306,7 @@ Changes to squid-3.1.4 (30 May 2010): - - Bug 2633: Fix Ecap::HeaderRep::value(name) fails when there is no named header field - - Change LDAP helpers to default to LDAP version 3 if available - - Add Joomla and Salted Hash support to squid_db_auth helper -- - Fixed IpAddress port printing for ports higher than 9999 -+ - Fixed SquidIpAddress port printing for ports higher than 9999 - - Disable chunked memory pooling by default. - - ... and several build errors. - -diff --git a/snmplib/parse.c b/snmplib/parse.c -index 517b01d..c41eadb 100644 ---- a/snmplib/parse.c -+++ b/snmplib/parse.c -@@ -186,7 +186,7 @@ struct tok tokens[] = { - {"OF", sizeof("OF") - 1, OF}, - {"SEQUENCE", sizeof("SEQUENCE") - 1, SEQUENCE}, - {"NULL", sizeof("NULL") - 1, NUL}, -- {"IpAddress", sizeof("IpAddress") - 1, IPADDR}, -+ {"SquidIpAddress", sizeof("SquidIpAddress") - 1, IPADDR}, - {"INTEGER", sizeof("INTEGER") - 1, INTEGER}, - {"Counter", sizeof("Counter") - 1, COUNTER}, - {"read-only", sizeof("read-only") - 1, READONLY}, -diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h -index cd5e3c2..bc0e76a 100644 ---- a/src/AccessLogEntry.h -+++ b/src/AccessLogEntry.h -@@ -103,7 +103,7 @@ public: - {; - } - -- IpAddress caddr; -+ SquidIpAddress caddr; - int64_t requestSize; - int64_t replySize; - int requestHeadersSize; ///< received, including request line -@@ -170,7 +170,7 @@ public: - public: - IcapLogEntry():request(NULL),reply(NULL),outcome(Adaptation::Icap::xoUnknown),trTime(0),ioTime(0),resStatus(HTTP_STATUS_NONE) {} - -- IpAddress hostAddr; ///< ICAP server IP address -+ SquidIpAddress hostAddr; ///< ICAP server IP address - String serviceName; ///< ICAP service name - String reqUri; ///< ICAP Request-URI - Adaptation::Icap::ICAP::Method reqMethod; ///< ICAP request method -diff --git a/src/ClientInfo.h b/src/ClientInfo.h -index 52c63d0..1e27613 100644 ---- a/src/ClientInfo.h -+++ b/src/ClientInfo.h -@@ -11,7 +11,7 @@ class ClientInfo - public: - hash_link hash; /* must be first */ - -- IpAddress addr; -+ SquidIpAddress addr; - - struct { - int result_hist[LOG_TYPE_MAX]; -diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h -index ccecf4a..69843e8 100644 ---- a/src/CompositePoolNode.h -+++ b/src/CompositePoolNode.h -@@ -76,7 +76,7 @@ public: - public: - CompositeSelectionDetails() {} - -- IpAddress src_addr; -+ SquidIpAddress src_addr; - AuthUserRequest *user; - String tag; - }; -diff --git a/src/ConnectionDetail.h b/src/ConnectionDetail.h -index 519a5a1..f3e7027 100644 ---- a/src/ConnectionDetail.h -+++ b/src/ConnectionDetail.h -@@ -44,9 +44,9 @@ public: - - ConnectionDetail(); - -- IpAddress me; -+ SquidIpAddress me; - -- IpAddress peer; -+ SquidIpAddress peer; - }; - - #endif -diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc -index 54ba1a0..f443e79 100644 ---- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc -+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc -@@ -157,7 +157,7 @@ DiskdIOStrategy::init() - char skey1[32]; - char skey2[32]; - char skey3[32]; -- IpAddress localhost; -+ SquidIpAddress localhost; - - ikey = (getpid() << 10) + (instanceID << 2); - ikey &= 0x7fffffff; -diff --git a/src/HierarchyLogEntry.h b/src/HierarchyLogEntry.h -index ebeba2b..f57c9c7 100644 ---- a/src/HierarchyLogEntry.h -+++ b/src/HierarchyLogEntry.h -@@ -63,7 +63,7 @@ public: - int64_t peer_response_time; ///< last peer response delay - timeval first_conn_start; ///< first connection use among all peers - int64_t total_response_time; ///< cumulative for all peers -- IpAddress peer_local_addr; ///< local IP:port of the last server-side connection -+ SquidIpAddress peer_local_addr; ///< local IP:port of the last server-side connection - }; - - extern void hierarchyNote(HierarchyLogEntry *, hier_code, const char *); -diff --git a/src/HttpRequest.h b/src/HttpRequest.h -index efd3063..5c1a8d2 100644 ---- a/src/HttpRequest.h -+++ b/src/HttpRequest.h -@@ -147,7 +147,7 @@ private: - #endif - - public: -- IpAddress host_addr; -+ SquidIpAddress host_addr; - - AuthUserRequest *auth_user_request; - -@@ -165,13 +165,13 @@ public: - - int imslen; - -- IpAddress client_addr; -+ SquidIpAddress client_addr; - - #if FOLLOW_X_FORWARDED_FOR -- IpAddress indirect_client_addr; -+ SquidIpAddress indirect_client_addr; - #endif /* FOLLOW_X_FORWARDED_FOR */ - -- IpAddress my_addr; -+ SquidIpAddress my_addr; - - HierarchyLogEntry hier; - -diff --git a/src/ICP.h b/src/ICP.h -index 3864f70..14fe535 100644 ---- a/src/ICP.h -+++ b/src/ICP.h -@@ -68,7 +68,7 @@ struct _icp_common_t { - _icp_common_t(); - _icp_common_t(char *buf, unsigned int len); - -- void handleReply(char *buf, IpAddress &from); -+ void handleReply(char *buf, SquidIpAddress &from); - static _icp_common_t *createMessage(icp_opcode opcode, int flags, const char *url, int reqnum, int pad); - icp_opcode getOpCode() const; - #endif -@@ -99,7 +99,7 @@ public: - HttpRequest *request; - int fd; - -- IpAddress from; -+ SquidIpAddress from; - char *url; - }; - -@@ -107,7 +107,7 @@ public: - - /// \ingroup ServerProtocolICPAPI - struct icpUdpData { -- IpAddress address; -+ SquidIpAddress address; - void *msg; - size_t len; - icpUdpData *next; -@@ -122,25 +122,25 @@ struct icpUdpData { - }; - - /// \ingroup ServerProtocolICPAPI --HttpRequest* icpGetRequest(char *url, int reqnum, int fd, IpAddress &from); -+HttpRequest* icpGetRequest(char *url, int reqnum, int fd, SquidIpAddress &from); - - /// \ingroup ServerProtocolICPAPI --int icpAccessAllowed(IpAddress &from, HttpRequest * icp_request); -+int icpAccessAllowed(SquidIpAddress &from, HttpRequest * icp_request); - - /// \ingroup ServerProtocolICPAPI --SQUIDCEXTERN void icpCreateAndSend(icp_opcode, int flags, char const *url, int reqnum, int pad, int fd, const IpAddress &from); -+SQUIDCEXTERN void icpCreateAndSend(icp_opcode, int flags, char const *url, int reqnum, int pad, int fd, const SquidIpAddress &from); - - /// \ingroup ServerProtocolICPAPI - extern icp_opcode icpGetCommonOpcode(); - - /// \ingroup ServerProtocolICPAPI --SQUIDCEXTERN int icpUdpSend(int, const IpAddress &, icp_common_t *, log_type, int); -+SQUIDCEXTERN int icpUdpSend(int, const SquidIpAddress &, icp_common_t *, log_type, int); - - /// \ingroup ServerProtocolICPAPI - SQUIDCEXTERN log_type icpLogFromICPCode(icp_opcode opcode); - - /// \ingroup ServerProtocolICPAPI --void icpDenyAccess(IpAddress &from, char *url, int reqnum, int fd); -+void icpDenyAccess(SquidIpAddress &from, char *url, int reqnum, int fd); - - /// \ingroup ServerProtocolICPAPI - SQUIDCEXTERN PF icpHandleUdp; -@@ -149,7 +149,7 @@ SQUIDCEXTERN PF icpHandleUdp; - SQUIDCEXTERN PF icpUdpSendQueue; - - /// \ingroup ServerProtocolICPAPI --SQUIDCEXTERN void icpHandleIcpV3(int, IpAddress &, char *, int); -+SQUIDCEXTERN void icpHandleIcpV3(int, SquidIpAddress &, char *, int); - - /// \ingroup ServerProtocolICPAPI - SQUIDCEXTERN int icpCheckUdpHit(StoreEntry *, HttpRequest * request); -diff --git a/src/PeerSelectState.h b/src/PeerSelectState.h -index b56e9db..f6fc3f4 100644 ---- a/src/PeerSelectState.h -+++ b/src/PeerSelectState.h -@@ -52,16 +52,16 @@ public: - void *callback_data; - FwdServer *servers; - /* -- * Why are these IpAddress instead of peer *? Because a -+ * Why are these SquidIpAddress instead of peer *? Because a - * peer structure can become invalid during the peer selection - * phase, specifically after a reconfigure. Thus we need to lookup - * the peer * based on the address when we are finally ready to - * reference the peer structure. - */ - -- IpAddress first_parent_miss; -+ SquidIpAddress first_parent_miss; - -- IpAddress closest_parent_miss; -+ SquidIpAddress closest_parent_miss; - /* - * ->hit can be peer* because it should only be - * accessed during the thread when it is set -diff --git a/src/ProtoPort.h b/src/ProtoPort.h -index e280b67..73a734e 100644 ---- a/src/ProtoPort.h -+++ b/src/ProtoPort.h -@@ -16,7 +16,7 @@ struct http_port_list { - - http_port_list *next; - -- IpAddress s; -+ SquidIpAddress s; - char *protocol; /* protocol name */ - char *name; /* visible name */ - char *defaultsite; /* default web site */ -diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc -index dd4e971..cc81230 100644 ---- a/src/acl/Arp.cc -+++ b/src/acl/Arp.cc -@@ -43,7 +43,7 @@ - - struct arpreq { - -- IpAddress arp_pa; /* protocol address */ -+ SquidIpAddress arp_pa; /* protocol address */ - - struct sockaddr arp_ha; /* hardware address */ - int arp_flags; /* flags */ -@@ -82,7 +82,7 @@ struct arpreq { - #endif - static void aclParseArpList(SplayNode **curlist); - static int decode_eth(const char *asc, char *eth); --static int aclMatchArp(SplayNode **dataptr, IpAddress &c); -+static int aclMatchArp(SplayNode **dataptr, SquidIpAddress &c); - static SplayNode::SPLAYCMP aclArpCompare; - static SplayNode::SPLAYWALKEE aclDumpArpListWalkee; - -@@ -240,14 +240,14 @@ ACLARP::match(ACLChecklist *cl) - /* aclMatchArp */ - /***************/ - int --aclMatchArp(SplayNode **dataptr, IpAddress &c) -+aclMatchArp(SplayNode **dataptr, SquidIpAddress &c) - { - struct arpreq arpReq; - #if !defined(_SQUID_WIN32_) - struct sockaddr_in *sa = NULL; - #endif - -- IpAddress ipAddr = c; -+ SquidIpAddress ipAddr = c; - ipAddr.SetPort(0); // ARP will fail if the port is included in the match. - - #if defined(_SQUID_LINUX_) -diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc -index 6442a8a..378ba45 100644 ---- a/src/acl/Asn.cc -+++ b/src/acl/Asn.cc -@@ -60,9 +60,9 @@ class m_ADDR - { - public: - uint8_t len; -- IpAddress addr; -+ SquidIpAddress addr; - -- m_ADDR() : len(sizeof(IpAddress)) {}; -+ m_ADDR() : len(sizeof(SquidIpAddress)) {}; - }; - - /* END of definitions for radix tree entries */ -@@ -135,7 +135,7 @@ static OBJH asnStats; - /* PUBLIC */ - - int --asnMatchIp(CbDataList *data, IpAddress &addr) -+asnMatchIp(CbDataList *data, SquidIpAddress &addr) - { - struct squid_radix_node *rn; - as_info *e; -@@ -401,8 +401,8 @@ asnAddNet(char *as_string, int as_number) - CbDataList *q = NULL; - as_info *asinfo = NULL; - -- IpAddress mask; -- IpAddress addr; -+ SquidIpAddress mask; -+ SquidIpAddress addr; - char *t; - int bitl; - -@@ -520,8 +520,8 @@ printRadixNode(struct squid_radix_node *rn, void *_sentry) - CbDataList *q; - as_info *asinfo; - char buf[MAX_IPSTRLEN]; -- IpAddress addr; -- IpAddress mask; -+ SquidIpAddress addr; -+ SquidIpAddress mask; - - assert(e); - assert(e->e_info); -@@ -549,7 +549,7 @@ ACLASN::~ACLASN() - - bool - --ACLASN::match(IpAddress toMatch) -+ACLASN::match(SquidIpAddress toMatch) - { - return asnMatchIp(data, toMatch); - } -@@ -592,7 +592,7 @@ ACLASN::parse() - } - } - --ACLData * -+ACLData * - ACLASN::clone() const - { - if (data) -@@ -603,18 +603,18 @@ ACLASN::clone() const - - /* explicit template instantiation required for some systems */ - --template class ACLStrategised; -+template class ACLStrategised; - - ACL::Prototype ACLASN::SourceRegistryProtoype(&ACLASN::SourceRegistryEntry_, "src_as"); - --ACLStrategised ACLASN::SourceRegistryEntry_(new ACLASN, ACLSourceASNStrategy::Instance(), "src_as"); -+ACLStrategised ACLASN::SourceRegistryEntry_(new ACLASN, ACLSourceASNStrategy::Instance(), "src_as"); - - ACL::Prototype ACLASN::DestinationRegistryProtoype(&ACLASN::DestinationRegistryEntry_, "dst_as"); - --ACLStrategised ACLASN::DestinationRegistryEntry_(new ACLASN, ACLDestinationASNStrategy::Instance(), "dst_as"); -+ACLStrategised ACLASN::DestinationRegistryEntry_(new ACLASN, ACLDestinationASNStrategy::Instance(), "dst_as"); - - int --ACLSourceASNStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) -+ACLSourceASNStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) - { - return data->match(checklist->src_addr); - } -@@ -647,7 +647,7 @@ ACLDestinationASNStrategy::match (ACLData * &data, ACLFilledChecklist - debugs(28, 3, "asnMatchAcl: Can't yet compare '" << "unknown" /*name*/ << "' ACL for '" << checklist->request->GetHost() << "'"); - checklist->changeState (DestinationIPLookup::Instance()); - } else { -- IpAddress noaddr; -+ SquidIpAddress noaddr; - noaddr.SetNoAddr(); - return data->match(noaddr); - } -diff --git a/src/acl/Asn.h b/src/acl/Asn.h -index 557249a..8a8b996 100644 ---- a/src/acl/Asn.h -+++ b/src/acl/Asn.h -@@ -38,7 +38,7 @@ - #include "acl/Checklist.h" - #include "ip/IpAddress.h" - --SQUIDCEXTERN int asnMatchIp(CbDataList *, IpAddress &); -+SQUIDCEXTERN int asnMatchIp(CbDataList *, SquidIpAddress &); - - /// \ingroup ACLAPI - SQUIDCEXTERN void asnInit(void); -@@ -47,7 +47,7 @@ SQUIDCEXTERN void asnInit(void); - SQUIDCEXTERN void asnFreeMemory(void); - - /// \ingroup ACLAPI --class ACLASN : public ACLData -+class ACLASN : public ACLData - { - - public: -@@ -55,18 +55,18 @@ public: - - virtual ~ACLASN(); - -- virtual bool match(IpAddress); -+ virtual bool match(SquidIpAddress); - virtual wordlist *dump(); - virtual void parse(); - bool empty() const; -- virtual ACLData *clone() const; -+ virtual ACLData *clone() const; - virtual void prepareForUse(); - - private: - static ACL::Prototype SourceRegistryProtoype; -- static ACLStrategised SourceRegistryEntry_; -+ static ACLStrategised SourceRegistryEntry_; - static ACL::Prototype DestinationRegistryProtoype; -- static ACLStrategised DestinationRegistryEntry_; -+ static ACLStrategised DestinationRegistryEntry_; - CbDataList *data; - }; - -diff --git a/src/acl/DestinationAsn.h b/src/acl/DestinationAsn.h -index efaaade..e50fc26 100644 ---- a/src/acl/DestinationAsn.h -+++ b/src/acl/DestinationAsn.h -@@ -37,7 +37,7 @@ - #include "ip/IpAddress.h" - - /// \ingroup ACLAPI --class ACLDestinationASNStrategy : public ACLStrategy -+class ACLDestinationASNStrategy : public ACLStrategy - { - - public: -diff --git a/src/acl/FilledChecklist.h b/src/acl/FilledChecklist.h -index dd95724..b340914 100644 ---- a/src/acl/FilledChecklist.h -+++ b/src/acl/FilledChecklist.h -@@ -43,9 +43,9 @@ public: - virtual bool hasReply() const { return reply != NULL; } - - public: -- IpAddress src_addr; -- IpAddress dst_addr; -- IpAddress my_addr; -+ SquidIpAddress src_addr; -+ SquidIpAddress dst_addr; -+ SquidIpAddress my_addr; - struct peer *dst_peer; - char *dst_rdns; - -diff --git a/src/acl/Ip.cc b/src/acl/Ip.cc -index 14be32b..32a5242 100644 ---- a/src/acl/Ip.cc -+++ b/src/acl/Ip.cc -@@ -125,7 +125,7 @@ acl_ip_data::toStr(char *buf, int len) const - int - aclIpAddrNetworkCompare(acl_ip_data * const &p, acl_ip_data * const &q) - { -- IpAddress A = p->addr1; -+ SquidIpAddress A = p->addr1; - - /* apply netmask */ - A.ApplyMask(q->mask); -@@ -192,7 +192,7 @@ acl_ip_data::NetworkCompare(acl_ip_data * const & a, acl_ip_data * const &b) - * This function should NOT be called if 'asc' is a hostname! - */ - bool --acl_ip_data::DecodeMask(const char *asc, IpAddress &mask, int ctype) -+acl_ip_data::DecodeMask(const char *asc, SquidIpAddress &mask, int ctype) - { - char junk; - int a1 = 0; -@@ -252,7 +252,7 @@ acl_ip_data::FactoryParse(const char *t) - LOCAL_ARRAY(char, mask, 256); - acl_ip_data *r = NULL; - acl_ip_data **Q = NULL; -- IpAddress temp; -+ SquidIpAddress temp; - char c; - unsigned int changed; - acl_ip_data *q = new acl_ip_data; -@@ -400,13 +400,13 @@ acl_ip_data::FactoryParse(const char *t) - /* - * Note, must use plain xgetaddrinfo() here because at startup - * ipcache hasn't been initialized -- * TODO: offload this to one of the IpAddress lookups. -+ * TODO: offload this to one of the SquidIpAddress lookups. - */ - - debugs(28, 5, "aclIpParseIpData: Lookup Host/IP " << addr1); - struct addrinfo *hp = NULL, *x = NULL; - struct addrinfo hints; -- IpAddress *prev_addr = NULL; -+ SquidIpAddress *prev_addr = NULL; - - memset(&hints, 0, sizeof(struct addrinfo)); - -@@ -552,7 +552,7 @@ ACLIP::empty () const - } - - int --ACLIP::match(IpAddress &clientip) -+ACLIP::match(SquidIpAddress &clientip) - { - static acl_ip_data ClientAddress; - /* -@@ -572,4 +572,4 @@ ACLIP::match(IpAddress &clientip) - - acl_ip_data::acl_ip_data () :addr1(), addr2(), mask(), next (NULL) {} - --acl_ip_data::acl_ip_data (IpAddress const &anAddress1, IpAddress const &anAddress2, IpAddress const &aMask, acl_ip_data *aNext) : addr1(anAddress1), addr2(anAddress2), mask(aMask), next(aNext) {} -+acl_ip_data::acl_ip_data (SquidIpAddress const &anAddress1, SquidIpAddress const &anAddress2, SquidIpAddress const &aMask, acl_ip_data *aNext) : addr1(anAddress1), addr2(anAddress2), mask(aMask), next(aNext) {} -diff --git a/src/acl/Ip.h b/src/acl/Ip.h -index 9ff8cea..8cac599 100644 ---- a/src/acl/Ip.h -+++ b/src/acl/Ip.h -@@ -47,20 +47,20 @@ public: - - acl_ip_data (); - -- acl_ip_data (IpAddress const &, IpAddress const &, IpAddress const &, acl_ip_data *); -+ acl_ip_data (SquidIpAddress const &, SquidIpAddress const &, SquidIpAddress const &, acl_ip_data *); - void toStr(char *buf, int len) const; - -- IpAddress addr1; -+ SquidIpAddress addr1; - -- IpAddress addr2; -+ SquidIpAddress addr2; - -- IpAddress mask; /**< \todo This should perhapse be stored as a CIDR range now instead of a full IP mask. */ -+ SquidIpAddress mask; /**< \todo This should perhapse be stored as a CIDR range now instead of a full IP mask. */ - - acl_ip_data *next; /**< used for parsing, not for storing */ - - private: - -- static bool DecodeMask(const char *asc, IpAddress &mask, int string_format_type); -+ static bool DecodeMask(const char *asc, SquidIpAddress &mask, int string_format_type); - }; - - MEMPROXY_CLASS_INLINE(acl_ip_data); -@@ -88,7 +88,7 @@ public: - - protected: - -- int match(IpAddress &); -+ int match(SquidIpAddress &); - IPSplay *data; - - private: -diff --git a/src/acl/SourceAsn.h b/src/acl/SourceAsn.h -index ffd8abc..cfb86f4 100644 ---- a/src/acl/SourceAsn.h -+++ b/src/acl/SourceAsn.h -@@ -40,7 +40,7 @@ class ACLChecklist; - #include "acl/Strategy.h" - #include "ip/IpAddress.h" - --class ACLSourceASNStrategy : public ACLStrategy -+class ACLSourceASNStrategy : public ACLStrategy - { - - public: -diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc -index c719cbd..f86e70a 100644 ---- a/src/adaptation/icap/ModXact.cc -+++ b/src/adaptation/icap/ModXact.cc -@@ -1271,7 +1271,7 @@ void Adaptation::Icap::ModXact::makeRequestHeaders(MemBuf &buf) - } - - if (TheConfig.send_client_ip && request) { -- IpAddress client_addr; -+ SquidIpAddress client_addr; - #if FOLLOW_X_FORWARDED_FOR - if (TheConfig.icap_uses_indirect_client) { - client_addr = request->indirect_client_addr; -diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc -index ba7d6a7..1e90830 100644 ---- a/src/adaptation/icap/Xaction.cc -+++ b/src/adaptation/icap/Xaction.cc -@@ -88,7 +88,7 @@ void Adaptation::Icap::Xaction::start() - // TODO: obey service-specific, OPTIONS-reported connection limit - void Adaptation::Icap::Xaction::openConnection() - { -- IpAddress client_addr; -+ SquidIpAddress client_addr; - - Must(connection < 0); - -@@ -117,7 +117,7 @@ void Adaptation::Icap::Xaction::openConnection() - - disableRetries(); // we only retry pconn failures - -- IpAddress outgoing; -+ SquidIpAddress outgoing; - if (!Ip::EnableIpv6 && !outgoing.SetIPv4()) { - debugs(31, DBG_CRITICAL, "ERROR: IPv6 is disabled. " << outgoing << " is not an IPv4 address."); - dieOnConnectionFailure(); // throws -@@ -185,7 +185,7 @@ void Adaptation::Icap::Xaction::closeConnection() - } - - if (reuseConnection) { -- IpAddress client_addr; -+ SquidIpAddress client_addr; - //status() adds leading spaces. - debugs(93,3, HERE << "pushing pconn" << status()); - AsyncCall::Pointer call = NULL; -diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc -index 881ea82..2a5bcd3 100644 ---- a/src/auth/AclMaxUserIp.cc -+++ b/src/auth/AclMaxUserIp.cc -@@ -114,7 +114,7 @@ ACLMaxUserIP::parse() - int - ACLMaxUserIP::match(AuthUserRequest * auth_user_request, - -- IpAddress const &src_addr) -+ SquidIpAddress const &src_addr) - { - /* - * the logic for flush the ip list when the limit is hit vs keep -diff --git a/src/auth/AclMaxUserIp.h b/src/auth/AclMaxUserIp.h -index 9b9bcf0..199d83e 100644 ---- a/src/auth/AclMaxUserIp.h -+++ b/src/auth/AclMaxUserIp.h -@@ -69,7 +69,7 @@ private: - static Prototype RegistryProtoype; - static ACLMaxUserIP RegistryEntry_; - -- int match(AuthUserRequest *, IpAddress const &); -+ int match(AuthUserRequest *, SquidIpAddress const &); - char const *class_; - int maximum; - -diff --git a/src/auth/User.cc b/src/auth/User.cc -index a972018..8a222cf 100644 ---- a/src/auth/User.cc -+++ b/src/auth/User.cc -@@ -238,7 +238,7 @@ AuthUser::clearIp() - } - - void --AuthUser::removeIp(IpAddress ipaddr) -+AuthUser::removeIp(SquidIpAddress ipaddr) - { - auth_user_ip_t *ipdata = (auth_user_ip_t *) ip_list.head; - -@@ -261,7 +261,7 @@ AuthUser::removeIp(IpAddress ipaddr) - } - - void --AuthUser::addIp(IpAddress ipaddr) -+AuthUser::addIp(SquidIpAddress ipaddr) - { - auth_user_ip_t *ipdata = (auth_user_ip_t *) ip_list.head; - int found = 0; -diff --git a/src/auth/User.h b/src/auth/User.h -index 47a9933..70bc267 100644 ---- a/src/auth/User.h -+++ b/src/auth/User.h -@@ -85,8 +85,8 @@ public: - _SQUID_INLINE_ char const *username() const; - _SQUID_INLINE_ void username(char const *); - void clearIp(); -- void removeIp(IpAddress); -- void addIp(IpAddress); -+ void removeIp(SquidIpAddress); -+ void addIp(SquidIpAddress); - _SQUID_INLINE_ void addRequest(AuthUserRequest *); - - void lock(); -diff --git a/src/auth/UserRequest.cc b/src/auth/UserRequest.cc -index 285e19c..ab15343 100644 ---- a/src/auth/UserRequest.cc -+++ b/src/auth/UserRequest.cc -@@ -200,7 +200,7 @@ AuthUserRequest::denyMessage(char const * const default_message) - } - - static void --authenticateAuthUserRequestSetIp(AuthUserRequest * auth_user_request, IpAddress &ipaddr) -+authenticateAuthUserRequestSetIp(AuthUserRequest * auth_user_request, SquidIpAddress &ipaddr) - { - AuthUser *auth_user = auth_user_request->user(); - -@@ -211,7 +211,7 @@ authenticateAuthUserRequestSetIp(AuthUserRequest * auth_user_request, IpAddress - } - - void --authenticateAuthUserRequestRemoveIp(AuthUserRequest * auth_user_request, IpAddress const &ipaddr) -+authenticateAuthUserRequestRemoveIp(AuthUserRequest * auth_user_request, SquidIpAddress const &ipaddr) - { - AuthUser *auth_user = auth_user_request->user(); - -@@ -328,7 +328,7 @@ authTryGetUser (AuthUserRequest **auth_user_request, ConnStateData * conn, HttpR - * Caller is responsible for locking and unlocking their *auth_user_request! - */ - auth_acl_t --AuthUserRequest::authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, IpAddress &src_addr) -+AuthUserRequest::authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, SquidIpAddress &src_addr) - { - const char *proxy_auth; - assert(headertype != 0); -@@ -503,7 +503,7 @@ AuthUserRequest::authenticate(AuthUserRequest ** auth_user_request, http_hdr_typ - - auth_acl_t - --AuthUserRequest::tryToAuthenticateAndSetAuthUser(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, IpAddress &src_addr) -+AuthUserRequest::tryToAuthenticateAndSetAuthUser(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, SquidIpAddress &src_addr) - { - /* If we have already been called, return the cached value */ - AuthUserRequest *t = authTryGetUser (auth_user_request, conn, request); -diff --git a/src/auth/UserRequest.h b/src/auth/UserRequest.h -index 6119176..8ca1488 100644 ---- a/src/auth/UserRequest.h -+++ b/src/auth/UserRequest.h -@@ -48,7 +48,7 @@ struct AuthUserIP { - dlink_node node; - /* IP addr this user authenticated from */ - -- IpAddress ipaddr; -+ SquidIpAddress ipaddr; - time_t ip_expiretime; - }; - -@@ -108,7 +108,7 @@ public: - - virtual void user(AuthUser *aUser) {_auth_user=aUser;} - -- static auth_acl_t tryToAuthenticateAndSetAuthUser(AuthUserRequest **, http_hdr_type, HttpRequest *, ConnStateData *, IpAddress &); -+ static auth_acl_t tryToAuthenticateAndSetAuthUser(AuthUserRequest **, http_hdr_type, HttpRequest *, ConnStateData *, SquidIpAddress &); - static void addReplyAuthHeader(HttpReply * rep, AuthUserRequest * auth_user_request, HttpRequest * request, int accelerated, int internal); - - AuthUserRequest(); -@@ -146,7 +146,7 @@ public: - - private: - -- static auth_acl_t authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, IpAddress &src_addr); -+ static auth_acl_t authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, SquidIpAddress &src_addr); - - /** return a message on the 407 error pages */ - char *message; -@@ -176,7 +176,7 @@ extern void authenticateFixHeader(HttpReply *, AuthUserRequest *, HttpRequest *, - extern void authenticateAddTrailer(HttpReply *, AuthUserRequest *, HttpRequest *, int); - - /// \ingroup AuthAPI --extern void authenticateAuthUserRequestRemoveIp(AuthUserRequest *, IpAddress const &); -+extern void authenticateAuthUserRequestRemoveIp(AuthUserRequest *, SquidIpAddress const &); - /// \ingroup AuthAPI - extern void authenticateAuthUserRequestClearIp(AuthUserRequest *); - /// \ingroup AuthAPI -diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc -index 933ad0a..87f5c87 100644 ---- a/src/auth/digest/auth_digest.cc -+++ b/src/auth/digest/auth_digest.cc -@@ -678,7 +678,7 @@ AuthDigestUserRequest::authenticate(HttpRequest * request, ConnStateData * conn, - } else { - const char *useragent = request->header.getStr(HDR_USER_AGENT); - -- static IpAddress last_broken_addr; -+ static SquidIpAddress last_broken_addr; - static int seen_broken_client = 0; - - if (!seen_broken_client) { -diff --git a/src/cache_cf.cc b/src/cache_cf.cc -index 17d11db..088460b 100644 ---- a/src/cache_cf.cc -+++ b/src/cache_cf.cc -@@ -1107,14 +1107,14 @@ free_acl_access(acl_access ** head) - } - - static void --dump_address(StoreEntry * entry, const char *name, IpAddress &addr) -+dump_address(StoreEntry * entry, const char *name, SquidIpAddress &addr) - { - char buf[MAX_IPSTRLEN]; - storeAppendPrintf(entry, "%s %s\n", name, addr.NtoA(buf,MAX_IPSTRLEN) ); - } - - static void --parse_address(IpAddress *addr) -+parse_address(SquidIpAddress *addr) - { - char *token = strtok(NULL, w_space); - -@@ -1134,7 +1134,7 @@ parse_address(IpAddress *addr) - } - - static void --free_address(IpAddress *addr) -+free_address(SquidIpAddress *addr) - { - addr->SetEmpty(); - } -@@ -2956,7 +2956,7 @@ parse_IpAddress_list_token(IpAddress_list ** head, char *token) - char *host; - char *tmp; - -- IpAddress ipa; -+ SquidIpAddress ipa; - unsigned short port; - IpAddress_list *s; - -diff --git a/src/client_db.cc b/src/client_db.cc -index b91c034..1aea7c0 100644 ---- a/src/client_db.cc -+++ b/src/client_db.cc -@@ -44,7 +44,7 @@ - - static hash_table *client_table = NULL; - --static ClientInfo *clientdbAdd(const IpAddress &addr); -+static ClientInfo *clientdbAdd(const SquidIpAddress &addr); - static FREE clientdbFreeItem; - static void clientdbStartGC(void); - static void clientdbScheduledGC(void *); -@@ -58,7 +58,7 @@ static int cleanup_removed; - - static ClientInfo * - --clientdbAdd(const IpAddress &addr) -+clientdbAdd(const SquidIpAddress &addr) - { - ClientInfo *c; - char *buf = new char[MAX_IPSTRLEN]; -@@ -96,7 +96,7 @@ clientdbInit(void) - } - - void --clientdbUpdate(const IpAddress &addr, log_type ltype, protocol_t p, size_t size) -+clientdbUpdate(const SquidIpAddress &addr, log_type ltype, protocol_t p, size_t size) - { - char key[MAX_IPSTRLEN]; - ClientInfo *c; -@@ -140,7 +140,7 @@ clientdbUpdate(const IpAddress &addr, log_type ltype, protocol_t p, size_t size) - * -1. To get the current value, simply call with delta = 0. - */ - int --clientdbEstablished(const IpAddress &addr, int delta) -+clientdbEstablished(const SquidIpAddress &addr, int delta) - { - char key[MAX_IPSTRLEN]; - ClientInfo *c; -@@ -167,7 +167,7 @@ clientdbEstablished(const IpAddress &addr, int delta) - #define CUTOFF_SECONDS 3600 - int - --clientdbCutoffDenied(const IpAddress &addr) -+clientdbCutoffDenied(const SquidIpAddress &addr) - { - char key[MAX_IPSTRLEN]; - int NR; -@@ -381,8 +381,8 @@ clientdbStartGC(void) - - #if SQUID_SNMP - --IpAddress * --client_entry(IpAddress *current) -+SquidIpAddress * -+client_entry(SquidIpAddress *current) - { - ClientInfo *c = NULL; - char key[MAX_IPSTRLEN]; -@@ -415,7 +415,7 @@ snmp_meshCtblFn(variable_list * Var, snint * ErrP) - { - char key[MAX_IPSTRLEN]; - ClientInfo *c = NULL; -- IpAddress keyIp; -+ SquidIpAddress keyIp; - - *ErrP = SNMP_ERR_NOERROR; - MemBuf tmp; -diff --git a/src/client_side.cc b/src/client_side.cc -index d156b88..1338880 100644 ---- a/src/client_side.cc -+++ b/src/client_side.cc -@@ -183,7 +183,7 @@ static void connNoteUseOfBuffer(ConnStateData* conn, size_t byteCount); - static int connKeepReadingIncompleteRequest(ConnStateData * conn); - static void connCancelIncompleteRequests(ConnStateData * conn); - --static ConnStateData *connStateCreate(const IpAddress &peer, const IpAddress &me, int fd, http_port_list *port); -+static ConnStateData *connStateCreate(const SquidIpAddress &peer, const SquidIpAddress &me, int fd, http_port_list *port); - - - int -@@ -3078,7 +3078,7 @@ okToAccept() - } - - ConnStateData * --connStateCreate(const IpAddress &peer, const IpAddress &me, int fd, http_port_list *port) -+connStateCreate(const SquidIpAddress &peer, const SquidIpAddress &me, int fd, http_port_list *port) - { - ConnStateData *result = new ConnStateData; - -@@ -3091,7 +3091,7 @@ connStateCreate(const IpAddress &peer, const IpAddress &me, int fd, http_port_li - result->port = cbdataReference(port); - - if (port->intercepted || port->spoof_client_ip) { -- IpAddress client, dst; -+ SquidIpAddress client, dst; - - if (IpInterceptor.NatLookup(fd, me, peer, client, dst) == 0) { - result->me = client; -diff --git a/src/client_side.h b/src/client_side.h -index 9f5f07a..fb9577d 100644 ---- a/src/client_side.h -+++ b/src/client_side.h -@@ -185,11 +185,11 @@ public: - */ - ClientSocketContext::Pointer currentobject; - -- IpAddress peer; -+ SquidIpAddress peer; - -- IpAddress me; -+ SquidIpAddress me; - -- IpAddress log_addr; -+ SquidIpAddress log_addr; - char rfc931[USER_IDENT_SZ]; - int nrequests; - -diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc -index c7e3f81..75fa608 100644 ---- a/src/client_side_reply.cc -+++ b/src/client_side_reply.cc -@@ -64,7 +64,7 @@ CBDATA_CLASS_INIT(clientReplyContext); - - /* Local functions */ - extern "C" CSS clientReplyStatus; --extern ErrorState *clientBuildError(err_type, http_status, char const *, IpAddress &, HttpRequest *); -+extern ErrorState *clientBuildError(err_type, http_status, char const *, SquidIpAddress &, HttpRequest *); - - /* privates */ - -@@ -94,7 +94,7 @@ clientReplyContext::clientReplyContext(ClientHttpRequest *clientContext) : http - void - clientReplyContext::setReplyToError( - err_type err, http_status status, const HttpRequestMethod& method, char const *uri, -- IpAddress &addr, HttpRequest * failedrequest, const char *unparsedrequest, -+ SquidIpAddress &addr, HttpRequest * failedrequest, const char *unparsedrequest, - AuthUserRequest * auth_user_request) - { - ErrorState *errstate = -@@ -1797,7 +1797,7 @@ clientReplyContext::next() const - void - clientReplyContext::sendBodyTooLargeError() - { -- IpAddress tmp_noaddr; -+ SquidIpAddress tmp_noaddr; - tmp_noaddr.SetNoAddr(); // TODO: make a global const - http->logType = LOG_TCP_DENIED_REPLY; - ErrorState *err = clientBuildError(ERR_TOO_BIG, HTTP_FORBIDDEN, NULL, -@@ -1920,7 +1920,7 @@ clientReplyContext::processReplyAccessResult(bool accessAllowed) - if (page_id == ERR_NONE) - page_id = ERR_ACCESS_DENIED; - -- IpAddress tmp_noaddr; -+ SquidIpAddress tmp_noaddr; - tmp_noaddr.SetNoAddr(); - err = clientBuildError(page_id, HTTP_FORBIDDEN, NULL, - http->getConn() != NULL ? http->getConn()->peer : tmp_noaddr, -@@ -2151,7 +2151,7 @@ clientReplyContext::createStoreEntry(const HttpRequestMethod& m, request_flags r - - ErrorState * - clientBuildError(err_type page_id, http_status status, char const *url, -- IpAddress &src_addr, HttpRequest * request) -+ SquidIpAddress &src_addr, HttpRequest * request) - { - ErrorState *err = errorCon(page_id, status, request); - err->src_addr = src_addr; -diff --git a/src/client_side_reply.h b/src/client_side_reply.h -index c979fe4..221161f 100644 ---- a/src/client_side_reply.h -+++ b/src/client_side_reply.h -@@ -38,7 +38,7 @@ - #include "client_side_request.h" - - class ErrorState; --class IpAddress; -+class SquidIpAddress; - - /* XXX make static method */ - -@@ -72,7 +72,7 @@ public: - int storeOKTransferDone() const; - int storeNotOKTransferDone() const; - -- void setReplyToError(err_type, http_status, const HttpRequestMethod&, char const *, IpAddress &, HttpRequest *, const char *, AuthUserRequest *); -+ void setReplyToError(err_type, http_status, const HttpRequestMethod&, char const *, SquidIpAddress &, HttpRequest *, const char *, AuthUserRequest *); - void createStoreEntry(const HttpRequestMethod& m, request_flags flags); - void removeStoreReference(store_client ** scp, StoreEntry ** ep); - void removeClientStoreReference(store_client **scp, ClientHttpRequest *http); -diff --git a/src/client_side_request.cc b/src/client_side_request.cc -index 531e437..803feb4 100644 ---- a/src/client_side_request.cc -+++ b/src/client_side_request.cc -@@ -452,7 +452,7 @@ clientFollowXForwardedForCheck(int answer, void *data) - const char *p; - const char *asciiaddr; - int l; -- IpAddress addr; -+ SquidIpAddress addr; - p = request->x_forwarded_for_iterator.termedBuf(); - l = request->x_forwarded_for_iterator.size(); - -@@ -628,7 +628,7 @@ ClientRequestContext::clientAccessCheckDone(int answer) - clientStreamNode *node = (clientStreamNode *)http->client_stream.tail->prev->data; - clientReplyContext *repContext = dynamic_cast(node->data.getRaw()); - assert (repContext); -- IpAddress tmpnoaddr; -+ SquidIpAddress tmpnoaddr; - tmpnoaddr.SetNoAddr(); - repContext->setReplyToError(page_id, status, - http->request->method, NULL, -@@ -1579,7 +1579,7 @@ ClientHttpRequest::handleAdaptationFailure(bool bypassable) - // The original author of the code also wanted to pass an errno to - // setReplyToError, but it seems unlikely that the errno reflects the - // true cause of the error at this point, so I did not pass it. -- IpAddress noAddr; -+ SquidIpAddress noAddr; - noAddr.SetNoAddr(); - ConnStateData * c = getConn(); - repContext->setReplyToError(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR, -diff --git a/src/comm.cc b/src/comm.cc -index aff238b..c864653 100644 ---- a/src/comm.cc -+++ b/src/comm.cc -@@ -208,11 +208,11 @@ public: - // defaults given by client - char *host; - unsigned short default_port; -- IpAddress default_addr; -+ SquidIpAddress default_addr; - // NP: CANNOT store the default addr:port together as it gets set/reset differently. - - DnsLookupDetails dns; ///< host lookup details -- IpAddress S; -+ SquidIpAddress S; - AsyncCall::Pointer callback; - - int fd; -@@ -498,7 +498,7 @@ comm_read_cancel(int fd, AsyncCall::Pointer &callback) - * synchronous wrapper around udp socket functions - */ - int --comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, IpAddress &from) -+comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, SquidIpAddress &from) - { - statCounter.syscalls.sock.recvfroms++; - int x = 0; -@@ -522,7 +522,7 @@ comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, IpAddress &from) - int - comm_udp_recv(int fd, void *buf, size_t len, int flags) - { -- IpAddress nul; -+ SquidIpAddress nul; - return comm_udp_recvfrom(fd, buf, len, flags, nul); - } - -@@ -549,7 +549,7 @@ comm_has_incomplete_write(int fd) - unsigned short - comm_local_port(int fd) - { -- IpAddress temp; -+ SquidIpAddress temp; - struct addrinfo *addr = NULL; - fde *F = &fd_table[fd]; - -@@ -614,7 +614,7 @@ commBind(int s, struct addrinfo &inaddr) - int - comm_open(int sock_type, - int proto, -- IpAddress &addr, -+ SquidIpAddress &addr, - int flags, - const char *note) - { -@@ -624,7 +624,7 @@ comm_open(int sock_type, - int - comm_open_listener(int sock_type, - int proto, -- IpAddress &addr, -+ SquidIpAddress &addr, - int flags, - const char *note) - { -@@ -699,7 +699,7 @@ comm_set_transparent(int fd) - int - comm_openex(int sock_type, - int proto, -- IpAddress &addr, -+ SquidIpAddress &addr, - int flags, - unsigned char TOS, - const char *note) -@@ -1229,7 +1229,7 @@ int commSetTimeout(int fd, int timeout, AsyncCall::Pointer &callback) - } - - int --comm_connect_addr(int sock, const IpAddress &address) -+comm_connect_addr(int sock, const SquidIpAddress &address) - { - comm_err_t status = COMM_OK; - fde *F = &fd_table[sock]; -@@ -1653,7 +1653,7 @@ _comm_close(int fd, char const *file, int line) - /* Send a udp datagram to specified TO_ADDR. */ - int - comm_udp_sendto(int fd, -- const IpAddress &to_addr, -+ const SquidIpAddress &to_addr, - const void *buf, - int len) - { -diff --git a/src/comm.h b/src/comm.h -index 2c9a5bc..d1e58ef 100644 ---- a/src/comm.h -+++ b/src/comm.h -@@ -49,11 +49,11 @@ SQUIDCEXTERN void comm_lingering_close(int fd); - SQUIDCEXTERN void commConnectStart(int fd, const char *, unsigned short, CNCB *, void *); - void commConnectStart(int fd, const char *, unsigned short, AsyncCall::Pointer &cb); - --SQUIDCEXTERN int comm_connect_addr(int sock, const IpAddress &addr); -+SQUIDCEXTERN int comm_connect_addr(int sock, const SquidIpAddress &addr); - SQUIDCEXTERN void comm_init(void); - SQUIDCEXTERN void comm_exit(void); - --SQUIDCEXTERN int comm_open(int, int, IpAddress &, int, const char *note); -+SQUIDCEXTERN int comm_open(int, int, SquidIpAddress &, int, const char *note); - - /** - * Open a port specially bound for listening or sending through a specific port. -@@ -70,16 +70,16 @@ SQUIDCEXTERN int comm_open(int, int, IpAddress &, int, const char *note); - * (in debugs or cachemgr) will occur in Native IPv4 format. - * A reconfigure is needed to reset the stored IP in most cases and attempt a port re-open. - */ --SQUIDCEXTERN int comm_open_listener(int sock_type, int proto, IpAddress &addr, int flags, const char *note); -+SQUIDCEXTERN int comm_open_listener(int sock_type, int proto, SquidIpAddress &addr, int flags, const char *note); - --SQUIDCEXTERN int comm_openex(int, int, IpAddress &, int, unsigned char TOS, const char *); -+SQUIDCEXTERN int comm_openex(int, int, SquidIpAddress &, int, unsigned char TOS, const char *); - SQUIDCEXTERN unsigned short comm_local_port(int fd); - SQUIDCEXTERN int comm_set_tos(int fd, int tos); - - SQUIDCEXTERN void commSetSelect(int, unsigned int, PF *, void *, time_t); - SQUIDCEXTERN void commResetSelect(int); - --SQUIDCEXTERN int comm_udp_sendto(int sock, const IpAddress &to, const void *buf, int buflen); -+SQUIDCEXTERN int comm_udp_sendto(int sock, const SquidIpAddress &to, const void *buf, int buflen); - extern void comm_write(int fd, const char *buf, int len, IOCB *callback, void *callback_data, FREE *func); - extern void comm_write(int fd, const char *buf, int size, AsyncCall::Pointer &callback, FREE * free_func = NULL); - SQUIDCEXTERN void comm_write_mbuf(int fd, MemBuf *mb, IOCB * handler, void *handler_data); -@@ -115,7 +115,7 @@ extern void comm_read(int fd, char *buf, int len, IOCB *handler, void *data); - extern void comm_read(int fd, char *buf, int len, AsyncCall::Pointer &callback); - extern void comm_read_cancel(int fd, IOCB *callback, void *data); - extern void comm_read_cancel(int fd, AsyncCall::Pointer &callback); --extern int comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, IpAddress &from); -+extern int comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, SquidIpAddress &from); - extern int comm_udp_recv(int fd, void *buf, size_t len, int flags); - extern ssize_t comm_udp_send(int s, const void *buf, size_t len, int flags); - extern bool comm_has_incomplete_write(int); -diff --git a/src/delay_pools.cc b/src/delay_pools.cc -index da7c0b3..6cf8fc9 100644 ---- a/src/delay_pools.cc -+++ b/src/delay_pools.cc -@@ -159,7 +159,7 @@ protected: - - virtual char const *label() const = 0; - -- virtual unsigned int makeKey(IpAddress &src_addr) const = 0; -+ virtual unsigned int makeKey(SquidIpAddress &src_addr) const = 0; - - DelaySpec spec; - -@@ -190,7 +190,7 @@ public: - - protected: - virtual char const *label() const {return "Individual";} -- virtual unsigned int makeKey(IpAddress &src_addr) const; -+ virtual unsigned int makeKey(SquidIpAddress &src_addr) const; - }; - - /// \ingroup DelayPoolsInternal -@@ -203,7 +203,7 @@ public: - - protected: - virtual char const *label() const {return "Network";} -- virtual unsigned int makeKey (IpAddress &src_addr) const; -+ virtual unsigned int makeKey (SquidIpAddress &src_addr) const; - }; - - /* don't use remote storage for these */ -@@ -247,9 +247,9 @@ protected: - - virtual char const *label() const {return "Individual";} - -- virtual unsigned int makeKey (IpAddress &src_addr) const; -+ virtual unsigned int makeKey (SquidIpAddress &src_addr) const; - -- unsigned char makeHostKey (IpAddress &src_addr) const; -+ unsigned char makeHostKey (SquidIpAddress &src_addr) const; - - DelaySpec spec; - VectorMap buckets; -@@ -855,7 +855,7 @@ VectorPool::Id::bytesIn(int qty) - } - - unsigned int --IndividualPool::makeKey (IpAddress &src_addr) const -+IndividualPool::makeKey (SquidIpAddress &src_addr) const - { - /* IPv4 required for this pool */ - if ( !src_addr.IsIPv4() ) -@@ -881,7 +881,7 @@ ClassCNetPool::operator delete (void *address) - } - - unsigned int --ClassCNetPool::makeKey (IpAddress &src_addr) const -+ClassCNetPool::makeKey (SquidIpAddress &src_addr) const - { - /* IPv4 required for this pool */ - if ( !src_addr.IsIPv4() ) -@@ -954,7 +954,7 @@ ClassCHostPool::keyAllocated (unsigned char const key) const - } - - unsigned char --ClassCHostPool::makeHostKey (IpAddress &src_addr) const -+ClassCHostPool::makeHostKey (SquidIpAddress &src_addr) const - { - /* IPv4 required for this pool */ - if ( !src_addr.IsIPv4() ) -@@ -967,7 +967,7 @@ ClassCHostPool::makeHostKey (IpAddress &src_addr) const - } - - unsigned int --ClassCHostPool::makeKey (IpAddress &src_addr) const -+ClassCHostPool::makeKey (SquidIpAddress &src_addr) const - { - /* IPv4 required for this pool */ - if ( !src_addr.IsIPv4() ) -diff --git a/src/dns_internal.cc b/src/dns_internal.cc -index 52087de..06d5e1a 100644 ---- a/src/dns_internal.cc -+++ b/src/dns_internal.cc -@@ -138,7 +138,7 @@ struct _nsvc { - }; - - struct _ns { -- IpAddress S; -+ SquidIpAddress S; - int nqueries; - int nreplies; - nsvc *vc; -@@ -181,7 +181,7 @@ static void idnsSendQuery(idns_query * q); - static IOCB idnsReadVCHeader; - static void idnsDoSendQueryVC(nsvc *vc); - --static int idnsFromKnownNameserver(IpAddress const &from); -+static int idnsFromKnownNameserver(SquidIpAddress const &from); - static idns_query *idnsFindQuery(unsigned short id); - static void idnsGrokReply(const char *buf, size_t sz); - static PF idnsRead; -@@ -192,7 +192,7 @@ static void idnsRcodeCount(int, int); - static void - idnsAddNameserver(const char *buf) - { -- IpAddress A; -+ SquidIpAddress A; - - if (!(A = buf)) { - debugs(78, 0, "WARNING: rejecting '" << buf << "' as a name server, because it is not a numeric IP address"); -@@ -745,7 +745,7 @@ idnsInitVC(int ns) - nameservers[ns].vc = vc; - vc->ns = ns; - -- IpAddress addr; -+ SquidIpAddress addr; - - if (!Config.Addrs.udp_outgoing.IsNoAddr()) - addr = Config.Addrs.udp_outgoing; -@@ -863,7 +863,7 @@ idnsSendQuery(idns_query * q) - } - - static int --idnsFromKnownNameserver(IpAddress const &from) -+idnsFromKnownNameserver(SquidIpAddress const &from) - { - int i; - -@@ -1163,7 +1163,7 @@ idnsRead(int fd, void *data) - int max = INCOMING_DNS_MAX; - static char rbuf[SQUID_UDP_SO_RCVBUF]; - int ns; -- IpAddress from; -+ SquidIpAddress from; - - debugs(78, 3, "idnsRead: starting with FD " << fd); - -@@ -1178,7 +1178,7 @@ idnsRead(int fd, void *data) - * The cause of this is still unknown, however copying the data appears - * to allow it to be passed further without this erasure. - */ -- IpAddress bugbypass; -+ SquidIpAddress bugbypass; - - while (max--) { - len = comm_udp_recvfrom(fd, rbuf, SQUID_UDP_SO_RCVBUF, 0, bugbypass); -@@ -1386,14 +1386,14 @@ idnsInit(void) - CBDATA_INIT_TYPE(idns_query); - - if (DnsSocketA < 0 && DnsSocketB < 0) { -- IpAddress addrA; // since we don't want to alter Config.Addrs.udp_* and dont have one of our own. -+ SquidIpAddress addrA; // since we don't want to alter Config.Addrs.udp_* and dont have one of our own. - - if (!Config.Addrs.udp_outgoing.IsNoAddr()) - addrA = Config.Addrs.udp_outgoing; - else - addrA = Config.Addrs.udp_incoming; - -- IpAddress addrB = addrA; -+ SquidIpAddress addrB = addrA; - addrA.SetIPv4(); - - if (Ip::EnableIpv6 && addrB.IsIPv6()) { -@@ -1591,7 +1591,7 @@ idnsALookup(const char *name, IDNSCB * callback, void *data) - } - - void --idnsPTRLookup(const IpAddress &addr, IDNSCB * callback, void *data) -+idnsPTRLookup(const SquidIpAddress &addr, IDNSCB * callback, void *data) - { - idns_query *q; - -diff --git a/src/errorpage.h b/src/errorpage.h -index 4d58370..1b9e8df 100644 ---- a/src/errorpage.h -+++ b/src/errorpage.h -@@ -136,7 +136,7 @@ public: - String dnsError; ///< DNS lookup error message - time_t ttl; - -- IpAddress src_addr; -+ SquidIpAddress src_addr; - char *redirect_url; - ERCB *callback; - void *callback_data; -diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc -index a456bdb..cbbef95 100644 ---- a/src/esi/Esi.cc -+++ b/src/esi/Esi.cc -@@ -1441,7 +1441,7 @@ ESIContext::freeResources () - /* don't touch incoming, it's a pointer into buffered anyway */ - } - --extern ErrorState *clientBuildError (err_type, http_status, char const *, IpAddress &, HttpRequest *); -+extern ErrorState *clientBuildError (err_type, http_status, char const *, SquidIpAddress &, HttpRequest *); - - - /* This can ONLY be used before we have sent *any* data to the client */ -diff --git a/src/external_acl.cc b/src/external_acl.cc -index 10da9d8..d749718 100644 ---- a/src/external_acl.cc -+++ b/src/external_acl.cc -@@ -131,7 +131,7 @@ public: - QUOTE_METHOD_URL - } quote; - -- IpAddress local_addr; -+ SquidIpAddress local_addr; - }; - - struct _external_acl_format { -diff --git a/src/fde.h b/src/fde.h -index 8bad6ca..435f9ec 100644 ---- a/src/fde.h -+++ b/src/fde.h -@@ -55,7 +55,7 @@ public: - unsigned int type; - unsigned short remote_port; - -- IpAddress local_addr; -+ SquidIpAddress local_addr; - unsigned char tos; - int sock_family; - char ipaddr[MAX_IPSTRLEN]; /* dotted decimal address of peer */ -@@ -121,7 +121,7 @@ private: - halfClosedReader = NULL; - // XXX: the following memset may corrupt or leak new or changed members - memset(this, 0, sizeof(fde)); -- local_addr.SetEmpty(); // IpAddress likes to be setup nicely. -+ local_addr.SetEmpty(); // SquidIpAddress likes to be setup nicely. - } - - }; -diff --git a/src/forward.cc b/src/forward.cc -index 7645324..a011649 100644 ---- a/src/forward.cc -+++ b/src/forward.cc -@@ -798,9 +798,9 @@ FwdState::connectStart() - int ctimeout; - int ftimeout = Config.Timeout.forward - (squid_curtime - start_t); - -- IpAddress outgoing; -+ SquidIpAddress outgoing; - unsigned short tos; -- IpAddress client_addr; -+ SquidIpAddress client_addr; - assert(fs); - assert(server_fd == -1); - debugs(17, 3, "fwdConnectStart: " << url); -@@ -1266,7 +1266,7 @@ FwdState::reforwardableStatus(http_status s) - * - address of the client for which we made the connection - */ - void --FwdState::pconnPush(int fd, const peer *_peer, const HttpRequest *req, const char *domain, IpAddress &client_addr) -+FwdState::pconnPush(int fd, const peer *_peer, const HttpRequest *req, const char *domain, SquidIpAddress &client_addr) - { - if (_peer) { - fwdPconnPool->push(fd, _peer->name, _peer->http_port, domain, client_addr); -@@ -1380,12 +1380,12 @@ fwdServerFree(FwdServer * fs) - memFree(fs, MEM_FWD_SERVER); - } - --static IpAddress -+static SquidIpAddress - aclMapAddr(acl_address * head, ACLChecklist * ch) - { - acl_address *l; - -- IpAddress addr; -+ SquidIpAddress addr; - - for (l = head; l; l = l->next) { - if (!l->aclList || ch->matchAclListFast(l->aclList)) -@@ -1413,7 +1413,7 @@ aclMapTOS(acl_tos * head, ACLChecklist * ch) - return 0; - } - --IpAddress -+SquidIpAddress - getOutgoingAddr(HttpRequest * request, struct peer *dst_peer) - { - if (request && request->flags.spoof_client_ip) { -@@ -1423,7 +1423,7 @@ getOutgoingAddr(HttpRequest * request, struct peer *dst_peer) - } - - if (!Config.accessList.outgoing_address) { -- return IpAddress(); // anything will do. -+ return SquidIpAddress(); // anything will do. - } - - ACLFilledChecklist ch(NULL, request, NULL); -diff --git a/src/forward.h b/src/forward.h -index 4023774..a217f65 100644 ---- a/src/forward.h -+++ b/src/forward.h -@@ -44,7 +44,7 @@ public: - bool checkRetry(); - bool checkRetriable(); - void dispatch(); -- void pconnPush(int fd, const peer *_peer, const HttpRequest *req, const char *domain, IpAddress &client_addr); -+ void pconnPush(int fd, const peer *_peer, const HttpRequest *req, const char *domain, SquidIpAddress &client_addr); - - bool dontRetry() { return flags.dont_retry; } - -@@ -101,7 +101,7 @@ private: - unsigned int forward_completed:1; - } flags; - -- IpAddress src; /* Client address for this connection. Needed for transparent operations. */ -+ SquidIpAddress src; /* Client address for this connection. Needed for transparent operations. */ - - // NP: keep this last. It plays with private/public - CBDATA_CLASS2(FwdState); -diff --git a/src/fqdncache.cc b/src/fqdncache.cc -index 6a79b5f..4fae189 100644 ---- a/src/fqdncache.cc -+++ b/src/fqdncache.cc -@@ -526,7 +526,7 @@ fqdncacheHandleReply(void *data, rfc1035_rr * answers, int na, const char *error - * and does not affect the FQDN cache. - */ - void --fqdncache_nbgethostbyaddr(IpAddress &addr, FQDNH * handler, void *handlerData) -+fqdncache_nbgethostbyaddr(SquidIpAddress &addr, FQDNH * handler, void *handlerData) - { - fqdncache_entry *f = NULL; - char name[MAX_IPSTRLEN]; -@@ -644,7 +644,7 @@ fqdncache_init(void) - * - */ - const char * --fqdncache_gethostbyaddr(IpAddress &addr, int flags) -+fqdncache_gethostbyaddr(SquidIpAddress &addr, int flags) - { - char name[MAX_IPSTRLEN]; - fqdncache_entry *f = NULL; -@@ -752,7 +752,7 @@ dummy_handler(const char *, const DnsLookupDetails &, void *) - - /// \ingroup FQDNCacheAPI - const char * --fqdnFromAddr(IpAddress &addr) -+fqdnFromAddr(SquidIpAddress &addr) - { - const char *n; - static char buf[MAX_IPSTRLEN]; -diff --git a/src/ftp.cc b/src/ftp.cc -index 5d4f5cd..a1eb048 100644 ---- a/src/ftp.cc -+++ b/src/ftp.cc -@@ -2453,7 +2453,7 @@ ftpReadEPSV(FtpStateData* ftpState) - int code = ftpState->ctrl.replycode; - char h1, h2, h3, h4; - unsigned short port; -- IpAddress ipa_remote; -+ SquidIpAddress ipa_remote; - int fd = ftpState->data.fd; - char *buf; - debugs(9, 3, HERE); -@@ -2575,7 +2575,7 @@ ftpReadEPSV(FtpStateData* ftpState) - static void - ftpSendPassive(FtpStateData * ftpState) - { -- IpAddress addr; -+ SquidIpAddress addr; - struct addrinfo *AI = NULL; - - /** Checks the server control channel is still available before running. */ -@@ -2758,7 +2758,7 @@ ftpReadPasv(FtpStateData * ftpState) - int p1, p2; - int n; - unsigned short port; -- IpAddress ipa_remote; -+ SquidIpAddress ipa_remote; - int fd = ftpState->data.fd; - char *buf; - LOCAL_ARRAY(char, ipaddr, 1024); -@@ -2866,7 +2866,7 @@ ftpOpenListenSocket(FtpStateData * ftpState, int fallback) - { - int fd; - -- IpAddress addr; -+ SquidIpAddress addr; - struct addrinfo *AI = NULL; - int on = 1; - int x = 0; -@@ -2933,7 +2933,7 @@ ftpSendPORT(FtpStateData * ftpState) - { - int fd; - -- IpAddress ipa; -+ SquidIpAddress ipa; - struct addrinfo *AI = NULL; - unsigned char *addrptr; - unsigned char *portptr; -@@ -3014,7 +3014,7 @@ ftpSendEPRT(FtpStateData * ftpState) - } - - int fd; -- IpAddress addr; -+ SquidIpAddress addr; - struct addrinfo *AI = NULL; - char buf[MAX_IPSTRLEN]; - -diff --git a/src/globals.h b/src/globals.h -index 5145c5a..a3b364a 100644 ---- a/src/globals.h -+++ b/src/globals.h -@@ -114,8 +114,8 @@ extern "C" { - - extern struct acl_deny_info_list *DenyInfoList; /* NULL */ - --//MOVED:icp_v2.cc extern IpAddress theOutICPAddr; --//MOVED:snmp_core.cc extern IpAddress theOutSNMPAddr; -+//MOVED:icp_v2.cc extern SquidIpAddress theOutICPAddr; -+//MOVED:snmp_core.cc extern SquidIpAddress theOutSNMPAddr; - - extern struct timeval squid_start; - extern int shutting_down; /* 0 */ -diff --git a/src/helper.h b/src/helper.h -index 317f024..4573b58 100644 ---- a/src/helper.h -+++ b/src/helper.h -@@ -62,7 +62,7 @@ struct _helper { - int n_running; ///< Total helper children objects currently existing - int n_active; ///< Count of helper children active (not shutting down) - int ipc_type; -- IpAddress addr; -+ SquidIpAddress addr; - unsigned int concurrency; - time_t last_queue_warn; - time_t last_restart; -@@ -85,7 +85,7 @@ struct _helper_stateful { - int n_running; ///< Total helper children objects currently existing - int n_active; ///< Count of helper children active (not shutting down) - int ipc_type; -- IpAddress addr; -+ SquidIpAddress addr; - MemAllocator *datapool; - HLPSAVAIL *IsAvailable; - HLPSONEQ *OnEmptyQueue; -@@ -104,7 +104,7 @@ struct _helper_stateful { - struct _helper_server { - int index; - int pid; -- IpAddress addr; -+ SquidIpAddress addr; - int rfd; - int wfd; - MemBuf *wqueue; -@@ -140,7 +140,7 @@ class helper_stateful_request; - struct _helper_stateful_server { - int index; - int pid; -- IpAddress addr; -+ SquidIpAddress addr; - int rfd; - int wfd; - /* MemBuf wqueue; */ -diff --git a/src/htcp.cc b/src/htcp.cc -index e3b0e89..9c423f3 100644 ---- a/src/htcp.cc -+++ b/src/htcp.cc -@@ -154,7 +154,7 @@ public: - void checkHit(); - void checkedHit(StoreEntry *e); - -- void setFrom (IpAddress &from); -+ void setFrom (SquidIpAddress &from); - void setDataHeader (htcpDataHeader *); - char *method; - char *uri; -@@ -165,7 +165,7 @@ public: - private: - HttpRequest *checkHitRequest; - -- IpAddress from; // was a ptr. return to such IFF needed. otherwise copy should do. -+ SquidIpAddress from; // was a ptr. return to such IFF needed. otherwise copy should do. - htcpDataHeader *dhdr; - }; - -@@ -233,7 +233,7 @@ static int htcpOutSocket = -1; - static u_int32_t queried_id[N_QUERIED_KEYS]; - static cache_key queried_keys[N_QUERIED_KEYS][SQUID_MD5_DIGEST_LENGTH]; - --static IpAddress queried_addr[N_QUERIED_KEYS]; -+static SquidIpAddress queried_addr[N_QUERIED_KEYS]; - static MemAllocator *htcpDetailPool = NULL; - - static int old_squid_format = 0; -@@ -252,26 +252,26 @@ static ssize_t htcpBuildTstOpData(char *buf, size_t buflen, htcpStuff * stuff); - static void htcpFreeSpecifier(htcpSpecifier * s); - static void htcpFreeDetail(htcpDetail * s); - --static void htcpHandleMsg(char *buf, int sz, IpAddress &from); -+static void htcpHandleMsg(char *buf, int sz, SquidIpAddress &from); - --static void htcpLogHtcp(IpAddress &, int, log_type, const char *); --static void htcpHandleMon(htcpDataHeader *, char *buf, int sz, IpAddress &from); -+static void htcpLogHtcp(SquidIpAddress &, int, log_type, const char *); -+static void htcpHandleMon(htcpDataHeader *, char *buf, int sz, SquidIpAddress &from); - --static void htcpHandleNop(htcpDataHeader *, char *buf, int sz, IpAddress &from); -+static void htcpHandleNop(htcpDataHeader *, char *buf, int sz, SquidIpAddress &from); - --static void htcpHandleSet(htcpDataHeader *, char *buf, int sz, IpAddress &from); -+static void htcpHandleSet(htcpDataHeader *, char *buf, int sz, SquidIpAddress &from); - --static void htcpHandleTst(htcpDataHeader *, char *buf, int sz, IpAddress &from); -+static void htcpHandleTst(htcpDataHeader *, char *buf, int sz, SquidIpAddress &from); - - static void htcpRecv(int fd, void *data); - --static void htcpSend(const char *buf, int len, IpAddress &to); -+static void htcpSend(const char *buf, int len, SquidIpAddress &to); - --static void htcpTstReply(htcpDataHeader *, StoreEntry *, htcpSpecifier *, IpAddress &); -+static void htcpTstReply(htcpDataHeader *, StoreEntry *, htcpSpecifier *, SquidIpAddress &); - --static void htcpHandleTstRequest(htcpDataHeader *, char *buf, int sz, IpAddress &from); -+static void htcpHandleTstRequest(htcpDataHeader *, char *buf, int sz, SquidIpAddress &from); - --static void htcpHandleTstResponse(htcpDataHeader *, char *, int, IpAddress &); -+static void htcpHandleTstResponse(htcpDataHeader *, char *, int, SquidIpAddress &); - - static void - htcpHexdump(const char *tag, const char *s, int sz) -@@ -594,7 +594,7 @@ htcpBuildPacket(char *buf, size_t buflen, htcpStuff * stuff) - - static void - --htcpSend(const char *buf, int len, IpAddress &to) -+htcpSend(const char *buf, int len, SquidIpAddress &to) - { - int x; - -@@ -618,7 +618,7 @@ htcpSend(const char *buf, int len, IpAddress &to) - - void - --htcpSpecifier::setFrom (IpAddress &aSocket) -+htcpSpecifier::setFrom (SquidIpAddress &aSocket) - { - from = aSocket; - } -@@ -848,7 +848,7 @@ htcpUnpackDetail(char *buf, int sz) - } - - static int --htcpAccessCheck(acl_access * acl, htcpSpecifier * s, IpAddress &from) -+htcpAccessCheck(acl_access * acl, htcpSpecifier * s, SquidIpAddress &from) - { - /* default deny if no access list present */ - if (!acl) -@@ -862,7 +862,7 @@ htcpAccessCheck(acl_access * acl, htcpSpecifier * s, IpAddress &from) - } - - static void --htcpTstReply(htcpDataHeader * dhdr, StoreEntry * e, htcpSpecifier * spec, IpAddress &from) -+htcpTstReply(htcpDataHeader * dhdr, StoreEntry * e, htcpSpecifier * spec, SquidIpAddress &from) - { - htcpStuff stuff; - static char pkt[8192]; -@@ -951,7 +951,7 @@ htcpTstReply(htcpDataHeader * dhdr, StoreEntry * e, htcpSpecifier * spec, IpAddr - - static void - --htcpClrReply(htcpDataHeader * dhdr, int purgeSucceeded, IpAddress &from) -+htcpClrReply(htcpDataHeader * dhdr, int purgeSucceeded, SquidIpAddress &from) - { - htcpStuff stuff; - static char pkt[8192]; -@@ -988,7 +988,7 @@ htcpClrReply(htcpDataHeader * dhdr, int purgeSucceeded, IpAddress &from) - - static void - --htcpHandleNop(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from) -+htcpHandleNop(htcpDataHeader * hdr, char *buf, int sz, SquidIpAddress &from) - { - debugs(31, 3, "htcpHandleNop: Unimplemented"); - } -@@ -1085,7 +1085,7 @@ htcpClrStore(const htcpSpecifier * s) - - static void - --htcpHandleTst(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from) -+htcpHandleTst(htcpDataHeader * hdr, char *buf, int sz, SquidIpAddress &from) - { - debugs(31, 3, "htcpHandleTst: sz = " << sz); - -@@ -1100,12 +1100,12 @@ HtcpReplyData::HtcpReplyData() : hdr(hoHtcpReply) - - static void - --htcpHandleTstResponse(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from) -+htcpHandleTstResponse(htcpDataHeader * hdr, char *buf, int sz, SquidIpAddress &from) - { - htcpReplyData htcpReply; - cache_key *key = NULL; - -- IpAddress *peer; -+ SquidIpAddress *peer; - htcpDetail *d = NULL; - char *t; - -@@ -1172,7 +1172,7 @@ htcpHandleTstResponse(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from) - - static void - --htcpHandleTstRequest(htcpDataHeader * dhdr, char *buf, int sz, IpAddress &from) -+htcpHandleTstRequest(htcpDataHeader * dhdr, char *buf, int sz, SquidIpAddress &from) - { - /* buf should be a SPECIFIER */ - htcpSpecifier *s; -@@ -1233,20 +1233,20 @@ htcpSpecifier::checkedHit(StoreEntry *e) - - static void - --htcpHandleMon(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from) -+htcpHandleMon(htcpDataHeader * hdr, char *buf, int sz, SquidIpAddress &from) - { - debugs(31, 3, "htcpHandleMon: Unimplemented"); - } - - static void - --htcpHandleSet(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from) -+htcpHandleSet(htcpDataHeader * hdr, char *buf, int sz, SquidIpAddress &from) - { - debugs(31, 3, "htcpHandleSet: Unimplemented"); - } - - static void --htcpHandleClr(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from) -+htcpHandleClr(htcpDataHeader * hdr, char *buf, int sz, SquidIpAddress &from) - { - htcpSpecifier *s; - /* buf[0/1] is reserved and reason */ -@@ -1341,7 +1341,7 @@ htcpForwardClr(char *buf, int sz) - * hands it off to other functions to break apart message-specific data. - */ - static void --htcpHandleMsg(char *buf, int sz, IpAddress &from) -+htcpHandleMsg(char *buf, int sz, SquidIpAddress &from) - { - htcpHeader htcpHdr; - htcpDataHeader hdr; -@@ -1461,7 +1461,7 @@ htcpRecv(int fd, void *data) - { - static char buf[8192]; - int len; -- static IpAddress from; -+ static SquidIpAddress from; - - /* Receive up to 8191 bytes, leaving room for a null */ - -@@ -1491,7 +1491,7 @@ htcpInit(void) - return; - } - -- IpAddress incomingAddr = Config.Addrs.udp_incoming; -+ SquidIpAddress incomingAddr = Config.Addrs.udp_incoming; - incomingAddr.SetPort(Config.Port.htcp); - - if (!Ip::EnableIpv6 && !incomingAddr.SetIPv4()) { -@@ -1519,7 +1519,7 @@ htcpInit(void) - debugs(31, 1, "Accepting HTCP messages on port " << Config.Port.htcp << ", FD " << htcpInSocket << "."); - - if (!Config.Addrs.udp_outgoing.IsNoAddr()) { -- IpAddress outgoingAddr = Config.Addrs.udp_outgoing; -+ SquidIpAddress outgoingAddr = Config.Addrs.udp_outgoing; - outgoingAddr.SetPort(Config.Port.htcp); - - if (!Ip::EnableIpv6 && !outgoingAddr.SetIPv4()) { -@@ -1730,7 +1730,7 @@ htcpSocketClose(void) - } - - static void --htcpLogHtcp(IpAddress &caddr, int opcode, log_type logcode, const char *url) -+htcpLogHtcp(SquidIpAddress &caddr, int opcode, log_type logcode, const char *url) - { - AccessLogEntry al; - if (LOG_TAG_NONE == logcode) -diff --git a/src/htcp.h b/src/htcp.h -index bcbc00b..d7228a6 100644 ---- a/src/htcp.h -+++ b/src/htcp.h -@@ -35,7 +35,7 @@ - #include "HttpHeader.h" - #include "typedefs.h" - --class IpAddress; -+class SquidIpAddress; - - /// \ingroup ServerProtocolHTCP - class HtcpReplyData -@@ -60,7 +60,7 @@ public: - typedef class HtcpReplyData htcpReplyData; - - /// \ingroup ServerProtocolHTCP --SQUIDCEXTERN void neighborsHtcpReply(const cache_key *, htcpReplyData *, const IpAddress &); -+SQUIDCEXTERN void neighborsHtcpReply(const cache_key *, htcpReplyData *, const SquidIpAddress &); - - /// \ingroup ServerProtocolHTCP - SQUIDCEXTERN void htcpInit(void); -diff --git a/src/http.cc b/src/http.cc -index 4352b5e..4f052f6 100644 ---- a/src/http.cc -+++ b/src/http.cc -@@ -1296,7 +1296,7 @@ void - HttpStateData::processReplyBody() - { - AsyncCall::Pointer call; -- IpAddress client_addr; -+ SquidIpAddress client_addr; - bool ispinned = false; - - if (!flags.headers_parsed) { -diff --git a/src/icmp/Icmp.cc b/src/icmp/Icmp.cc -index c660197..94d1ff2 100644 ---- a/src/icmp/Icmp.cc -+++ b/src/icmp/Icmp.cc -@@ -107,7 +107,7 @@ Icmp::ipHops(int ttl) - } - - void --Icmp::Log(const IpAddress &addr, const u_int8_t type, const char* pkt_str, const int rtt, const int hops) -+Icmp::Log(const SquidIpAddress &addr, const u_int8_t type, const char* pkt_str, const int rtt, const int hops) - { - debugs(42, 2, "pingerLog: " << std::setw(9) << current_time.tv_sec << - "." << std::setfill('0') << std::setw(6) << -diff --git a/src/icmp/Icmp.h b/src/icmp/Icmp.h -index f30d7f6..da936b0 100644 ---- a/src/icmp/Icmp.h -+++ b/src/icmp/Icmp.h -@@ -45,7 +45,7 @@ - - /* This is a line-data format struct. DO NOT alter. */ - struct pingerEchoData { -- IpAddress to; -+ SquidIpAddress to; - unsigned char opcode; - int psize; - char payload[PINGER_PAYLOAD_SZ]; -@@ -53,7 +53,7 @@ struct pingerEchoData { - - /* This is a line-data format struct. DO NOT alter. */ - struct pingerReplyData { -- IpAddress from; -+ SquidIpAddress from; - unsigned char opcode; - int rtt; - int hops; -@@ -107,7 +107,7 @@ public: - * Content longer than MAX_PAYLOAD will be truncated. - \param len Length of the payload in bytes if any is to be sent or 0. - */ -- virtual void SendEcho(IpAddress &to, int opcode, const char *payload=NULL, int len=0) =0; -+ virtual void SendEcho(SquidIpAddress &to, int opcode, const char *payload=NULL, int len=0) =0; - - /// Handle ICMP responses. - virtual void Recv(void) =0; -@@ -135,7 +135,7 @@ protected: - int ipHops(int ttl); - - /// Log the packet. -- void Log(const IpAddress &addr, const u_int8_t type, const char* pkt_str, const int rtt, const int hops); -+ void Log(const SquidIpAddress &addr, const u_int8_t type, const char* pkt_str, const int rtt, const int hops); - - /* no use wasting memory */ - int icmp_sock; -diff --git a/src/icmp/Icmp4.cc b/src/icmp/Icmp4.cc -index 20382d0..92bb2b2 100644 ---- a/src/icmp/Icmp4.cc -+++ b/src/icmp/Icmp4.cc -@@ -90,7 +90,7 @@ Icmp4::Open(void) - } - - void --Icmp4::SendEcho(IpAddress &to, int opcode, const char *payload, int len) -+Icmp4::SendEcho(SquidIpAddress &to, int opcode, const char *payload, int len) - { - int x; - LOCAL_ARRAY(char, pkt, MAX_PKT4_SZ); -diff --git a/src/icmp/Icmp4.h b/src/icmp/Icmp4.h -index 101d563..b67f25c 100644 ---- a/src/icmp/Icmp4.h -+++ b/src/icmp/Icmp4.h -@@ -170,7 +170,7 @@ public: - virtual int Open(); - - #if USE_ICMP -- virtual void SendEcho(IpAddress &, int, const char*, int); -+ virtual void SendEcho(SquidIpAddress &, int, const char*, int); - virtual void Recv(void); - #endif - }; -diff --git a/src/icmp/Icmp6.cc b/src/icmp/Icmp6.cc -index 945916d..cb84858 100644 ---- a/src/icmp/Icmp6.cc -+++ b/src/icmp/Icmp6.cc -@@ -133,7 +133,7 @@ Icmp6::Open(void) - * Generates an RFC 4443 Icmp6 ECHO Packet and sends into the network. - */ - void --Icmp6::SendEcho(IpAddress &to, int opcode, const char *payload, int len) -+Icmp6::SendEcho(SquidIpAddress &to, int opcode, const char *payload, int len) - { - int x; - LOCAL_ARRAY(char, pkt, MAX_PKT6_SZ); -diff --git a/src/icmp/Icmp6.h b/src/icmp/Icmp6.h -index 7b688f1..24599cd 100644 ---- a/src/icmp/Icmp6.h -+++ b/src/icmp/Icmp6.h -@@ -74,7 +74,7 @@ public: - virtual int Open(); - - #if USE_ICMP -- virtual void SendEcho(IpAddress &, int, const char*, int); -+ virtual void SendEcho(SquidIpAddress &, int, const char*, int); - virtual void Recv(void); - #endif - }; -diff --git a/src/icmp/IcmpPinger.h b/src/icmp/IcmpPinger.h -index f51609e..6bd1d8b 100644 ---- a/src/icmp/IcmpPinger.h -+++ b/src/icmp/IcmpPinger.h -@@ -62,7 +62,7 @@ public: - - private: - // unused in IcmpPinger -- virtual void SendEcho(IpAddress &to, int opcode, const char *payload, int len) {}; -+ virtual void SendEcho(SquidIpAddress &to, int opcode, const char *payload, int len) {}; - - /** - * Control channel(s) to squid. -diff --git a/src/icmp/IcmpSquid.cc b/src/icmp/IcmpSquid.cc -index 6250a67..d9ec784 100644 ---- a/src/icmp/IcmpSquid.cc -+++ b/src/icmp/IcmpSquid.cc -@@ -70,7 +70,7 @@ IcmpSquid::~IcmpSquid() - #if USE_ICMP - - void --IcmpSquid::SendEcho(IpAddress &to, int opcode, const char *payload, int len) -+IcmpSquid::SendEcho(SquidIpAddress &to, int opcode, const char *payload, int len) - { - static pingerEchoData pecho; - int x, slen; -@@ -142,7 +142,7 @@ IcmpSquid::Recv() - int n; - static int fail_count = 0; - pingerReplyData preply; -- static IpAddress F; -+ static SquidIpAddress F; - - commSetSelect(icmp_sock, COMM_SELECT_READ, icmpSquidRecv, NULL, 0); - memset(&preply, '\0', sizeof(pingerReplyData)); -@@ -197,7 +197,7 @@ IcmpSquid::Recv() - #endif /* USE_ICMP */ - - void --IcmpSquid::DomainPing(IpAddress &to, const char *domain) -+IcmpSquid::DomainPing(SquidIpAddress &to, const char *domain) - { - #if USE_ICMP - debugs(37, 4, HERE << "'" << domain << "' (" << to << ")"); -@@ -212,7 +212,7 @@ IcmpSquid::Open(void) - const char *args[2]; - int rfd; - int wfd; -- IpAddress localhost; -+ SquidIpAddress localhost; - - /* User configured disabled. */ - if (!Config.pinger.enable) { -diff --git a/src/icmp/IcmpSquid.h b/src/icmp/IcmpSquid.h -index 108e081..886e0e9 100644 ---- a/src/icmp/IcmpSquid.h -+++ b/src/icmp/IcmpSquid.h -@@ -52,10 +52,10 @@ public: - virtual int Open(); - virtual void Close(); - -- void DomainPing(IpAddress &to, const char *domain); -+ void DomainPing(SquidIpAddress &to, const char *domain); - - #if USE_ICMP -- virtual void SendEcho(IpAddress &to, int opcode, const char* payload=NULL, int len=0); -+ virtual void SendEcho(SquidIpAddress &to, int opcode, const char* payload=NULL, int len=0); - virtual void Recv(void); - #endif - }; -diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc -index 009ab31..1241167 100644 ---- a/src/icmp/net_db.cc -+++ b/src/icmp/net_db.cc -@@ -81,10 +81,10 @@ typedef struct { - static hash_table *addr_table = NULL; - static hash_table *host_table = NULL; - --IpAddress networkFromInaddr(const IpAddress &a); -+SquidIpAddress networkFromInaddr(const SquidIpAddress &a); - static void netdbRelease(netdbEntry * n); - --static void netdbHashInsert(netdbEntry * n, IpAddress &addr); -+static void netdbHashInsert(netdbEntry * n, SquidIpAddress &addr); - static void netdbHashDelete(const char *key); - static void netdbHostInsert(netdbEntry * n, const char *hostname); - static void netdbHostDelete(const net_db_name * x); -@@ -109,7 +109,7 @@ static void netdbExchangeDone(void *); - static wordlist *peer_names = NULL; - - static void --netdbHashInsert(netdbEntry * n, IpAddress &addr) -+netdbHashInsert(netdbEntry * n, SquidIpAddress &addr) - { - networkFromInaddr(addr).NtoA(n->network, MAX_IPSTRLEN); - n->hash.key = n->network; -@@ -245,7 +245,7 @@ netdbPurgeLRU(void) - } - - static netdbEntry * --netdbLookupAddr(const IpAddress &addr) -+netdbLookupAddr(const SquidIpAddress &addr) - { - netdbEntry *n; - char *key = new char[MAX_IPSTRLEN]; -@@ -256,7 +256,7 @@ netdbLookupAddr(const IpAddress &addr) - } - - static netdbEntry * --netdbAdd(IpAddress &addr) -+netdbAdd(SquidIpAddress &addr) - { - netdbEntry *n; - -@@ -274,7 +274,7 @@ netdbAdd(IpAddress &addr) - static void - netdbSendPing(const ipcache_addrs *ia, const DnsLookupDetails &, void *data) - { -- IpAddress addr; -+ SquidIpAddress addr; - char *hostname = NULL; - static_cast(data)->unwrap(&hostname); - netdbEntry *n; -@@ -339,10 +339,10 @@ netdbSendPing(const ipcache_addrs *ia, const DnsLookupDetails &, void *data) - xfree(hostname); - } - --IpAddress --networkFromInaddr(const IpAddress &in) -+SquidIpAddress -+networkFromInaddr(const SquidIpAddress &in) - { -- IpAddress out; -+ SquidIpAddress out; - - out = in; - -@@ -532,7 +532,7 @@ netdbReloadState(void) - netdbEntry *n; - netdbEntry N; - -- IpAddress addr; -+ SquidIpAddress addr; - int count = 0; - - struct timeval start = current_time; -@@ -673,7 +673,7 @@ netdbFreeNameEntry(void *data) - static void - netdbExchangeHandleReply(void *data, StoreIOBuffer receivedData) - { -- IpAddress addr; -+ SquidIpAddress addr; - - netdbExchangeState *ex = (netdbExchangeState *)data; - int rec_sz = 0; -@@ -933,7 +933,7 @@ netdbPingSite(const char *hostname) - } - - void --netdbHandlePingReply(const IpAddress &from, int hops, int rtt) -+netdbHandlePingReply(const SquidIpAddress &from, int hops, int rtt) - { - #if USE_ICMP - netdbEntry *n; -@@ -980,7 +980,7 @@ netdbFreeMemory(void) - - #if 0 // AYJ: Looks to be unused code. - int --netdbHops(IpAddress &addr) -+netdbHops(SquidIpAddress &addr) - { - #if USE_ICMP - netdbEntry *n = netdbLookupAddr(addr); -@@ -1147,7 +1147,7 @@ netdbUpdatePeer(HttpRequest * r, peer * e, int irtt, int ihops) - } - - void --netdbExchangeUpdatePeer(IpAddress &addr, peer * e, double rtt, double hops) -+netdbExchangeUpdatePeer(SquidIpAddress &addr, peer * e, double rtt, double hops) - { - #if USE_ICMP - netdbEntry *n; -@@ -1189,7 +1189,7 @@ netdbExchangeUpdatePeer(IpAddress &addr, peer * e, double rtt, double hops) - } - - void --netdbDeleteAddrNetwork(IpAddress &addr) -+netdbDeleteAddrNetwork(SquidIpAddress &addr) - { - #if USE_ICMP - netdbEntry *n = netdbLookupAddr(addr); -@@ -1210,7 +1210,7 @@ netdbBinaryExchange(StoreEntry * s) - HttpReply *reply = new HttpReply; - #if USE_ICMP - -- IpAddress addr; -+ SquidIpAddress addr; - - netdbEntry *n; - int i; -diff --git a/src/icmp/net_db.h b/src/icmp/net_db.h -index 151f50d..2db8bc4 100644 ---- a/src/icmp/net_db.h -+++ b/src/icmp/net_db.h -@@ -3,7 +3,7 @@ - - #include "config.h" - --class IpAddress; -+class SquidIpAddress; - class StoreEntry; - class HttpRequest; - -@@ -13,12 +13,12 @@ class HttpRequest; - - SQUIDCEXTERN void netdbInit(void); - --SQUIDCEXTERN void netdbHandlePingReply(const IpAddress &from, int hops, int rtt); -+SQUIDCEXTERN void netdbHandlePingReply(const SquidIpAddress &from, int hops, int rtt); - SQUIDCEXTERN void netdbPingSite(const char *hostname); - SQUIDCEXTERN void netdbDump(StoreEntry *); - - #if 0 // AYJ: Looks to be unused now. --SQUIDCEXTERN int netdbHops(IpAddress &); -+SQUIDCEXTERN int netdbHops(SquidIpAddress &); - #endif - - SQUIDCEXTERN void netdbFreeMemory(void); -@@ -26,11 +26,11 @@ SQUIDCEXTERN int netdbHostHops(const char *host); - SQUIDCEXTERN int netdbHostRtt(const char *host); - SQUIDCEXTERN void netdbUpdatePeer(HttpRequest *, peer * e, int rtt, int hops); - --SQUIDCEXTERN void netdbDeleteAddrNetwork(IpAddress &addr); -+SQUIDCEXTERN void netdbDeleteAddrNetwork(SquidIpAddress &addr); - SQUIDCEXTERN void netdbBinaryExchange(StoreEntry *); - SQUIDCEXTERN void netdbExchangeStart(void *); - --SQUIDCEXTERN void netdbExchangeUpdatePeer(IpAddress &, peer *, double, double); -+SQUIDCEXTERN void netdbExchangeUpdatePeer(SquidIpAddress &, peer *, double, double); - SQUIDCEXTERN peer *netdbClosestParent(HttpRequest *); - SQUIDCEXTERN void netdbHostData(const char *host, int *samp, int *rtt, int *hops); - -diff --git a/src/icmp/testIcmp.h b/src/icmp/testIcmp.h -index e0692bf..cf99bbf 100644 ---- a/src/icmp/testIcmp.h -+++ b/src/icmp/testIcmp.h -@@ -15,7 +15,7 @@ public: - virtual void Close() {}; - - /// Construct ECHO request -- virtual void SendEcho(IpAddress &to, int opcode, const char *payload, int len) {}; -+ virtual void SendEcho(SquidIpAddress &to, int opcode, const char *payload, int len) {}; - - /// Handle ICMP responses. - virtual void Recv(void) {}; -diff --git a/src/icp_v2.cc b/src/icp_v2.cc -index bb8143b..0fbd544 100644 ---- a/src/icp_v2.cc -+++ b/src/icp_v2.cc -@@ -52,10 +52,10 @@ - #include "rfc1738.h" - - /// \ingroup ServerProtocolICPInternal2 --static void icpLogIcp(const IpAddress &, log_type, int, const char *, int); -+static void icpLogIcp(const SquidIpAddress &, log_type, int, const char *, int); - - /// \ingroup ServerProtocolICPInternal2 --static void icpHandleIcpV2(int, IpAddress &, char *, int); -+static void icpHandleIcpV2(int, SquidIpAddress &, char *, int); - - /// \ingroup ServerProtocolICPInternal2 - static void icpCount(void *, int, size_t, int); -@@ -70,7 +70,7 @@ static icpUdpData *IcpQueueHead = NULL; - static icpUdpData *IcpQueueTail = NULL; - - /// \ingroup ServerProtocolICPInternal2 --IpAddress theOutICPAddr; -+SquidIpAddress theOutICPAddr; - - /* icp_common_t */ - _icp_common_t::_icp_common_t() : opcode(ICP_INVALID), version(0), length(0), reqnum(0), flags(0), pad(0), shostid(0) -@@ -175,7 +175,7 @@ ICP2State::created(StoreEntry *newEntry) - - /// \ingroup ServerProtocolICPInternal2 - static void --icpLogIcp(const IpAddress &caddr, log_type logcode, int len, const char *url, int delay) -+icpLogIcp(const SquidIpAddress &caddr, log_type logcode, int len, const char *url, int delay) - { - AccessLogEntry al; - -@@ -272,7 +272,7 @@ _icp_common_t::createMessage( - - int - icpUdpSend(int fd, -- const IpAddress &to, -+ const SquidIpAddress &to, - icp_common_t * msg, - log_type logcode, - int delay) -@@ -382,14 +382,14 @@ icpLogFromICPCode(icp_opcode opcode) - } - - void --icpCreateAndSend(icp_opcode opcode, int flags, char const *url, int reqnum, int pad, int fd, const IpAddress &from) -+icpCreateAndSend(icp_opcode opcode, int flags, char const *url, int reqnum, int pad, int fd, const SquidIpAddress &from) - { - icp_common_t *reply = _icp_common_t::createMessage(opcode, flags, url, reqnum, pad); - icpUdpSend(fd, from, reply, icpLogFromICPCode(opcode), 0); - } - - void --icpDenyAccess(IpAddress &from, char *url, int reqnum, int fd) -+icpDenyAccess(SquidIpAddress &from, char *url, int reqnum, int fd) - { - debugs(12, 2, "icpDenyAccess: Access Denied for " << from << " by " << AclMatchedName << "."); - -@@ -405,7 +405,7 @@ icpDenyAccess(IpAddress &from, char *url, int reqnum, int fd) - } - - int --icpAccessAllowed(IpAddress &from, HttpRequest * icp_request) -+icpAccessAllowed(SquidIpAddress &from, HttpRequest * icp_request) - { - /* absent an explicit allow, we deny all */ - if (!Config.accessList.icp) -@@ -428,7 +428,7 @@ icpGetUrlToSend(char *url) - } - - HttpRequest * --icpGetRequest(char *url, int reqnum, int fd, IpAddress &from) -+icpGetRequest(char *url, int reqnum, int fd, SquidIpAddress &from) - { - if (strpbrk(url, w_space)) { - url = rfc1738_escape(url); -@@ -446,7 +446,7 @@ icpGetRequest(char *url, int reqnum, int fd, IpAddress &from) - } - - static void --doV2Query(int fd, IpAddress &from, char *buf, icp_common_t header) -+doV2Query(int fd, SquidIpAddress &from, char *buf, icp_common_t header) - { - int rtt = 0; - int src_rtt = 0; -@@ -497,7 +497,7 @@ doV2Query(int fd, IpAddress &from, char *buf, icp_common_t header) - } - - void --_icp_common_t::handleReply(char *buf, IpAddress &from) -+_icp_common_t::handleReply(char *buf, SquidIpAddress &from) - { - if (neighbors_do_private_keys && reqnum == 0) { - debugs(12, 0, "icpHandleIcpV2: Neighbor " << from << " returned reqnum = 0"); -@@ -514,7 +514,7 @@ _icp_common_t::handleReply(char *buf, IpAddress &from) - } - - static void --icpHandleIcpV2(int fd, IpAddress &from, char *buf, int len) -+icpHandleIcpV2(int fd, SquidIpAddress &from, char *buf, int len) - { - if (len <= 0) { - debugs(12, 3, "icpHandleIcpV2: ICP message is too small"); -@@ -567,7 +567,7 @@ static void - icpPktDump(icp_common_t * pkt) - { - -- IpAddress a; -+ SquidIpAddress a; - - debugs(12, 9, "opcode: " << std::setw(3) << pkt->opcode << " " << icp_opcode_str[pkt->opcode]); - debugs(12, 9, "version: "<< std::left << std::setw(8) << pkt->version); -@@ -586,7 +586,7 @@ icpHandleUdp(int sock, void *data) - { - int *N = &incoming_sockets_accepted; - @@ 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 Mon May 5 16:13:55 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 5 May 2014 14:13:55 +0000 Subject: SF.net SVN: gar:[23555] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: <3gMmJv2Mf5z1KQ@mail.opencsw.org> Revision: 23555 http://sourceforge.net/p/gar/code/23555 Author: slowfranklin Date: 2014-05-05 14:13:55 +0000 (Mon, 05 May 2014) Log Message: ----------- Disable tests (and all test patches) and one build patch Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2014-05-05 14:01:00 UTC (rev 23554) +++ csw/mgar/pkg/glib2/trunk/Makefile 2014-05-05 14:13:55 UTC (rev 23555) @@ -45,55 +45,62 @@ PATCHFILES_5.11 += 0020-Adjust-path-to-zoneinfo-database.patch PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch PATCHFILES += 0029-Don-t-undefine-_XOPEN_SOURCE.patch -PATCHFILES += 0030-Move-around-statfs_result.patch +# Seems to be fixed in 2.40.0 +# PATCHFILES += 0030-Move-around-statfs_result.patch # +# Until someone invests some real resources into checking all test patches, +# disable tests. Updating the patches between versions is a major pita. +# +SKIPTEST = 1 + +# # Test patches # -PATCHFILES += 0003-Ad-hoc-macro-for-comparing-double.patch +#PATCHFILES += 0003-Ad-hoc-macro-for-comparing-double.patch # Needs to be reported -PATCHFILES += 0005-Disable-test-gobject-param-implement.patch +#PATCHFILES += 0005-Disable-test-gobject-param-implement.patch # gdbus/peer-to-peer and /gdbus/overflow need to be reported -PATCHFILES += 0019-Disable-some-gdbus-tests.patch +#PATCHFILES += 0019-Disable-some-gdbus-tests.patch # Needs to be reported -PATCHFILES += 0009-Disable-file-async-create-delete-checks.patch +#PATCHFILES += 0009-Disable-file-async-create-delete-checks.patch # Needs to be reported -PATCHFILES += 0017-Fix-disable-testglib-tests.patch +#PATCHFILES += 0017-Fix-disable-testglib-tests.patch # Needs to be reported -PATCHFILES += 0014-Disable-gvariant-varargs.patch +#PATCHFILES += 0014-Disable-gvariant-varargs.patch # This test fails sporadically... -PATCHFILES += 0020-Disable-desktop-app-info-tests.patch +#PATCHFILES += 0020-Disable-desktop-app-info-tests.patch # Needs to be reported -PATCHFILES += 0017-Disable-gdbus-connection-loss-test.patch +#PATCHFILES += 0017-Disable-gdbus-connection-loss-test.patch # Needs to be reported -PATCHFILES += 0018-Disable-all-gdbus-thread-tests.patch +#PATCHFILES += 0018-Disable-all-gdbus-thread-tests.patch # Needs to be reported -PATCHFILES += 0023-Disable-failing-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 +#PATCHFILES_isa-sparcv9 += 0021-Disable-buffered-input-stream-set-buffer-size-test.patch # Needs to be reported -PATCHFILES += 0020-Disable-gsettings-strinfo-test.patch -PATCHFILES += 0010-Fix-locale-for-unicode-collate-test.patch -PATCHFILES_5.10 += 0015-Fix-locale-for-collate-test.patch -PATCHFILES_5.10 += 0022-Disable-failing-collation-test.patch +#PATCHFILES += 0020-Disable-gsettings-strinfo-test.patch +#PATCHFILES += 0010-Fix-locale-for-unicode-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 -PATCHFILES += 0022-Increase-timedwait-tolerance.patch +#PATCHFILES += 0013-Disable-IPv6-tests.patch +#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 -PATCHFILES += 0031-Remove-failing-gvariant-test.patch -PATCHFILES += 0032-Disable-failing-regex-test.patch -PATCHFILES += 0033-Disable-strange-failing-strtod-test.patch -PATCHFILES += 0026-Disable-failing-glib-mainloop-tests.patch -PATCHFILES += 0023-Disable-sporically-failing-cancellable-test.patch +#PATCHFILES_5.11 += 0024-Fix-unicode-collation-order-of-teststrings.patch +#PATCHFILES += 0031-Remove-failing-gvariant-test.patch +#PATCHFILES += 0032-Disable-failing-regex-test.patch +#PATCHFILES += 0033-Disable-strange-failing-strtod-test.patch +#PATCHFILES += 0026-Disable-failing-glib-mainloop-tests.patch +#PATCHFILES += 0023-Disable-sporically-failing-cancellable-test.patch # cf https://bugzilla.gnome.org/show_bug.cgi?id=700123 -PATCHFILES += 0035-Disable-g_inet_socket_address_get_scope_id-test-does.patch +#PATCHFILES += 0035-Disable-g_inet_socket_address_get_scope_id-test-does.patch # needs further investigtion, cf http://osdir.com/ml/freedesktop.dbus/2005-10/msg00058.html -PATCHFILES += 0036-Disable-failing-gdbus-external-auth-tests.patch -PATCHFILES += 0037-Remove-failing-tests-linking-is-broken.patch -PATCHFILES_5.11 += 0038-Disable-appinfo-launch-test-fails-on-s11x86.patch +#PATCHFILES += 0036-Disable-failing-gdbus-external-auth-tests.patch +#PATCHFILES += 0037-Remove-failing-tests-linking-is-broken.patch +#PATCHFILES_5.11 += 0038-Disable-appinfo-launch-test-fails-on-s11x86.patch PATCHFILES += $(PATCHFILES_$(GAROSREL)) 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 5 16:15:16 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 5 May 2014 14:15:16 +0000 Subject: SF.net SVN: gar:[23556] csw/mgar/pkg/flex/trunk/Makefile Message-ID: <3gMmLM1MmQz1Ns@mail.opencsw.org> Revision: 23556 http://sourceforge.net/p/gar/code/23556 Author: dmichelsen Date: 2014-05-05 14:15:15 +0000 (Mon, 05 May 2014) Log Message: ----------- flex/trunk: Enable 64 bit Modified Paths: -------------- csw/mgar/pkg/flex/trunk/Makefile Modified: csw/mgar/pkg/flex/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex/trunk/Makefile 2014-05-05 14:13:55 UTC (rev 23555) +++ csw/mgar/pkg/flex/trunk/Makefile 2014-05-05 14:15:15 UTC (rev 23556) @@ -42,6 +42,8 @@ SPKG_DESC_CSWlibfl-pic2 = Library for Flex, libfl_pic.so.2 PKGFILES_CSWlibfl-pic2 += $(call pkgfiles_lib,libfl_pic.so.2) +BUILD64 = 1 + # Must use GNU diff for option '-q' or two tests fail due to bailing out Sun diff TEST_ENV_PATH = $(prefix)/gnu:$(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 Tue May 6 11:21:10 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 6 May 2014 09:21:10 +0000 Subject: SF.net SVN: gar:[23557] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: <3gNFmp6pcGz1Db@mail.opencsw.org> Revision: 23557 http://sourceforge.net/p/gar/code/23557 Author: slowfranklin Date: 2014-05-06 09:21:06 +0000 (Tue, 06 May 2014) Log Message: ----------- glib2/trunk: Update dependencies and overrides Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2014-05-05 14:15:15 UTC (rev 23556) +++ csw/mgar/pkg/glib2/trunk/Makefile 2014-05-06 09:21:06 UTC (rev 23557) @@ -117,11 +117,7 @@ RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWglib2 += CSWpython -CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWgio-fam-backend -CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgio2-0-0 -CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8 CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/utils.pyo CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/parser.pyc CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/utils.pyc @@ -147,6 +143,13 @@ RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += $(RUNTIME_DEP_PKGS_CSWgio-fam-backend_$(GAROSREL)_$(GARCH)) PACKAGES += CSWlibgio2-0-0 SPKG_DESC_CSWlibgio2-0-0 += $(DESCRIPTION), libgio-2.0.so.0 @@ -158,15 +161,19 @@ RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWsharedmimeinfo RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgio2-0-0_5.10_sparc += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWlibgio2-0-0_5.10_sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgio2-0-0_5.10_sparc += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgio2-0-0_$(GAROSREL)_$(GARCH)) # 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.3600.3 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.4000.0 # libgio uses the mime info for determining the type of files CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += surplus-dependency|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3600.3 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.4000.0 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibgio2-0-0_$(GARCH)) @@ -177,12 +184,12 @@ RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3600.3 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.4000.0 # 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.3600.3|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.3600.3|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.3600.3|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/libglib-2.0.so.0.4000.0|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.4000.0|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.4000.0|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibglib2-0-0_$(GAROSREL)) @@ -191,27 +198,39 @@ SPKG_DESC_CSWlibgmodule2-0-0 += $(DESCRIPTION), libgmodule-2.0.so.0 RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_5.10_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_5.10_sparc += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_5.10_sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_$(GAROSREL)_$(GARCH)) # 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.3600.3 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3600.3 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3600.3 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3600.3 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.3600.3 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.3600.3 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.4000.0 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 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi4 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWlibgobject2-0-0_5.10_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgobject2-0-0_5.10_sparc += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWlibgobject2-0-0_5.10_sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgobject2-0-0_$(GAROSREL)_$(GARCH)) 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 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgthread2-0-0_5.10_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgthread2-0-0_5.10_sparc += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWlibgthread2-0-0_5.10_sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgthread2-0-0_$(GAROSREL)_$(GARCH)) PACKAGES += CSWlibglib2-dev SPKG_DESC_CSWlibglib2-dev = Development files for libglib-2.0.so.0 and assorted libglib, libgmodule, libgobject and libgthread 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 6 11:23:35 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 6 May 2014 09:23:35 +0000 Subject: SF.net SVN: gar:[23558] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: <3gNFqL6tCmz1Hv@mail.opencsw.org> Revision: 23558 http://sourceforge.net/p/gar/code/23558 Author: dmichelsen Date: 2014-05-06 09:23:34 +0000 (Tue, 06 May 2014) Log Message: ----------- ruby18/trunk: Add performance enhancements when pthreads are enabled Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2014-05-06 09:21:06 UTC (rev 23557) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2014-05-06 09:23:34 UTC (rev 23558) @@ -128,6 +128,12 @@ CONFIGURE_ARGS += --program-suffix=18 # Needed for conformity with Tk CONFIGURE_ARGS += --enable-pthread +# As a result of pthreads getcontext/setcontext is used massively. These two presets are the essence of the proposed patch: +# http://timetobleed.com/fix-a-bug-in-rubys-configurein-and-get-a-30-performance-boost/ +# https://github.com/ice799/matzruby/commit/0b9b69f9653782a33aee2b8937d405eae245b60c +CONFIGURE_ARGS += ac_cv_func_getcontext=no +CONFIGURE_ARGS += ac_cv_func_setcontext=no + EXTRA_CONFIGURE_ARGS_isa-default-compiler-sun = --enable-install-doc INSTALL_ARGS = install 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 6 13:12:40 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 6 May 2014 11:12:40 +0000 Subject: SF.net SVN: gar:[23559] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: <3gNJFF6DCSz1Vs@mail.opencsw.org> Revision: 23559 http://sourceforge.net/p/gar/code/23559 Author: slowfranklin Date: 2014-05-06 11:12:39 +0000 (Tue, 06 May 2014) Log Message: ----------- glib2/trunk: Fix remaining overrides and move gsettings binary to CSWglib2 package Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2014-05-06 09:23:34 UTC (rev 23558) +++ csw/mgar/pkg/glib2/trunk/Makefile 2014-05-06 11:12:39 UTC (rev 23559) @@ -45,8 +45,6 @@ PATCHFILES_5.11 += 0020-Adjust-path-to-zoneinfo-database.patch PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch PATCHFILES += 0029-Don-t-undefine-_XOPEN_SOURCE.patch -# Seems to be fixed in 2.40.0 -# PATCHFILES += 0030-Move-around-statfs_result.patch # # Until someone invests some real resources into checking all test patches, @@ -102,7 +100,7 @@ #PATCHFILES += 0037-Remove-failing-tests-linking-is-broken.patch #PATCHFILES_5.11 += 0038-Disable-appinfo-launch-test-fails-on-s11x86.patch -PATCHFILES += $(PATCHFILES_$(GAROSREL)) +# PATCHFILES += $(PATCHFILES_$(GAROSREL)) # Solaris 11 specific package for FEN support PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -112,7 +110,6 @@ PACKAGES += CSWglib2 SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWglib2 += CSWgio-fam-backend RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0 @@ -186,11 +183,6 @@ RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4000.0 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.4000.0 -# 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.4000.0|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.4000.0|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.4000.0|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 @@ -243,7 +235,7 @@ RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) -# FIXME: at least glib-compile-schemas and gsettings should be moved to CSWglib2 +# FIXME: glib-compile-schemas should possibly be moved to CSWglib2 PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.* PKGFILES_CSWlibglib2-dev += .*/gdbus-2.0.* PKGFILES_CSWlibglib2-dev += .*/bash-completion.* @@ -251,7 +243,6 @@ PKGFILES_CSWlibglib2-dev += .*/bin.*/glib.* PKGFILES_CSWlibglib2-dev += .*/bin.*/gobject-query PKGFILES_CSWlibglib2-dev += .*/bin.*/gresource -PKGFILES_CSWlibglib2-dev += .*/bin.*/gsettings PKGFILES_CSWlibglib2-dev += .*/bin.*/gtester.* PKGFILES_CSWlibglib2-dev += .*/man1/gdbus.* PKGFILES_CSWlibglib2-dev += .*/man1/glib.* 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 6 15:10:58 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 6 May 2014 13:10:58 +0000 Subject: SF.net SVN: gar:[23560] csw/mgar/pkg/php5/branches/php-5.5.x/Makefile Message-ID: <3gNLsm0qRtz8B@mail.opencsw.org> Revision: 23560 http://sourceforge.net/p/gar/code/23560 Author: dmichelsen Date: 2014-05-06 13:10:57 +0000 (Tue, 06 May 2014) Log Message: ----------- php5/branches/php-5.5.x: Enable external PCRE, this is important as it allows non-stack recursion Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile Modified: csw/mgar/pkg/php5/branches/php-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-05-06 11:12:39 UTC (rev 23559) +++ csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-05-06 13:10:57 UTC (rev 23560) @@ -351,7 +351,7 @@ CONFIGURE_ARGS += --with-ndbm CONFIGURE_ARGS += --with-openssl=shared,$(prefix) CONFIGURE_ARGS += --with-pcre-dir=$(prefix) -CONFIGURE_ARGS += --with-pcre-regex +CONFIGURE_ARGS += --with-pcre-regex=$(prefix) # not documented, but you can pass the path to mysql_config directly # we need the 32-bit version, so we have to force this CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/bin/mysql_config @@ -379,6 +379,10 @@ CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs endif + +# XXX TBD: +# configure: WARNING: unrecognized options: --enable-magic-quotes, --enable-sqlite-utf8, --enable-sqlite3, --with-curlwrappers, --with-exec-dir, --with-sqlite + # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 #ENABLE_CHECK = 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue May 6 15:35:17 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 6 May 2014 13:35:17 +0000 Subject: SF.net SVN: gar:[23561] csw/mgar/pkg Message-ID: <3gNMPq4lckzH8@mail.opencsw.org> Revision: 23561 http://sourceforge.net/p/gar/code/23561 Author: slowfranklin Date: 2014-05-06 13:35:15 +0000 (Tue, 06 May 2014) Log Message: ----------- libmediaart/trunk: Initial makefile for 1.0.0 Added Paths: ----------- csw/mgar/pkg/libmediaart/ csw/mgar/pkg/libmediaart/Makefile csw/mgar/pkg/libmediaart/branches/ csw/mgar/pkg/libmediaart/tags/ csw/mgar/pkg/libmediaart/trunk/ csw/mgar/pkg/libmediaart/trunk/Makefile csw/mgar/pkg/libmediaart/trunk/checksums csw/mgar/pkg/libmediaart/trunk/files/ Added: csw/mgar/pkg/libmediaart/Makefile =================================================================== --- csw/mgar/pkg/libmediaart/Makefile (rev 0) +++ csw/mgar/pkg/libmediaart/Makefile 2014-05-06 13:35:15 UTC (rev 23561) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/libmediaart/trunk =================================================================== --- csw/mgar/pkg/libmediaart/trunk 2014-05-06 13:10:57 UTC (rev 23560) +++ csw/mgar/pkg/libmediaart/trunk 2014-05-06 13:35:15 UTC (rev 23561) Property changes on: csw/mgar/pkg/libmediaart/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/libmediaart/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmediaart/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmediaart/trunk/Makefile 2014-05-06 13:35:15 UTC (rev 23561) @@ -0,0 +1,33 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libmediaart +VERSION = 0.1.0 +GARTYPE = v2 + +DESCRIPTION = libmediaart, manage, extract and handle media art caches +define BLURB + Library tasked with managing, extracting and handling media art caches. + The code for this project has been extracted from Tracker and inserted + into its own library because there is call for this functionality in + other places on the desktop. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(DISTNAME).tar.xz +GARCOMPILER = GNU + +PACKAGES += CSWlibmediaart-0-1-0 +SPKG_DESC_CSWlibmediaart-0-1-0 = $(DESCRIPTION) + +PACKAGES += CSWlibmediaart-dev +SPKG_DESC_CSWlibmediaart-dev = $(DESCRIPTION), development files +PKGFILES_CSWlibmediaart-dev = $(PKGFILES_DEVEL) + +# For gettext +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/libmediaart/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/libmediaart/trunk/checksums =================================================================== --- csw/mgar/pkg/libmediaart/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmediaart/trunk/checksums 2014-05-06 13:35:15 UTC (rev 23561) @@ -0,0 +1 @@ +c9b873f63ea621f2ae339163782b3f79 libmediaart-0.1.0.tar.xz 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 6 16:02:25 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 6 May 2014 14:02:25 +0000 Subject: SF.net SVN: gar:[23562] csw/mgar/pkg/libmediaart/trunk Message-ID: <3gNN144Vp6zQ7@mail.opencsw.org> Revision: 23562 http://sourceforge.net/p/gar/code/23562 Author: slowfranklin Date: 2014-05-06 14:02:23 +0000 (Tue, 06 May 2014) Log Message: ----------- libmediaart/trunk: Library SO version is 0.2.0 and a patch from upstream Modified Paths: -------------- csw/mgar/pkg/libmediaart/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libmediaart/trunk/files/eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch Modified: csw/mgar/pkg/libmediaart/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmediaart/trunk/Makefile 2014-05-06 13:35:15 UTC (rev 23561) +++ csw/mgar/pkg/libmediaart/trunk/Makefile 2014-05-06 14:02:23 UTC (rev 23562) @@ -16,10 +16,14 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.xz GARCOMPILER = GNU +# Tests fail left and right +SKIPTEST = 1 -PACKAGES += CSWlibmediaart-0-1-0 -SPKG_DESC_CSWlibmediaart-0-1-0 = $(DESCRIPTION) +PATCHFILES += eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch +PACKAGES += CSWlibmediaart-0-2-0 +SPKG_DESC_CSWlibmediaart-0-2-0 = $(DESCRIPTION) + PACKAGES += CSWlibmediaart-dev SPKG_DESC_CSWlibmediaart-dev = $(DESCRIPTION), development files PKGFILES_CSWlibmediaart-dev = $(PKGFILES_DEVEL) Added: csw/mgar/pkg/libmediaart/trunk/files/eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch =================================================================== --- csw/mgar/pkg/libmediaart/trunk/files/eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch (rev 0) +++ csw/mgar/pkg/libmediaart/trunk/files/eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch 2014-05-06 14:02:23 UTC (rev 23562) @@ -0,0 +1,34 @@ +From eba1a1f1276e40b68e7b7084863469a0c97ef41a Mon Sep 17 00:00:00 2001 +From: Martyn Russell +Date: Fri, 7 Mar 2014 09:23:23 +0000 +Subject: [PATCH] extract: Don't break on dummy implementation due to incorrect + args in init() + +--- + libmediaart/extractdummy.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libmediaart/extractdummy.c b/libmediaart/extractdummy.c +index 8d25b74..195de31 100644 +--- a/libmediaart/extractdummy.c ++++ b/libmediaart/extractdummy.c +@@ -23,13 +23,15 @@ + #include "extractgeneric.h" + + void +-media_art_plugin_init (void) ++media_art_plugin_init (gint max_width) + { ++ /* Initialize something */ + } + + void + media_art_plugin_shutdown (void) + { ++ /* Shutdown something */ + } + + gboolean +-- +1.9.1 + 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 6 16:51:34 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 6 May 2014 14:51:34 +0000 Subject: SF.net SVN: gar:[23563] csw/mgar/pkg/libmediaart/trunk/Makefile Message-ID: <3gNP5q43ZRzd2@mail.opencsw.org> Revision: 23563 http://sourceforge.net/p/gar/code/23563 Author: slowfranklin Date: 2014-05-06 14:51:31 +0000 (Tue, 06 May 2014) Log Message: ----------- libmediaart/trunk: Fix package name and add runtime deps Modified Paths: -------------- csw/mgar/pkg/libmediaart/trunk/Makefile Modified: csw/mgar/pkg/libmediaart/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmediaart/trunk/Makefile 2014-05-06 14:02:23 UTC (rev 23562) +++ csw/mgar/pkg/libmediaart/trunk/Makefile 2014-05-06 14:51:31 UTC (rev 23563) @@ -5,7 +5,7 @@ VERSION = 0.1.0 GARTYPE = v2 -DESCRIPTION = libmediaart, manage, extract and handle media art caches +DESCRIPTION = Libmediaart, manage, extract and handle media art caches define BLURB Library tasked with managing, extracting and handling media art caches. The code for this project has been extracted from Tracker and inserted @@ -21,16 +21,27 @@ PATCHFILES += eba1a1f1276e40b68e7b7084863469a0c97ef41a.patch -PACKAGES += CSWlibmediaart-0-2-0 -SPKG_DESC_CSWlibmediaart-0-2-0 = $(DESCRIPTION) +PACKAGES += CSWlibmediaart0-2-0 +CATALOGNAME_CSWlibmediaart0-2-0 = libmediaart0_2_0 +SPKG_DESC_CSWlibmediaart0-2-0 += $(DESCRIPTION), libmediaart-0.2.so.0 +PKGFILES_CSWlibmediaart0-2-0 += $(call baseisadirs,$(libdir),libmediaart-0\.2\.so\.0\.100\.0) +PKGFILES_CSWlibmediaart0-2-0 += $(call baseisadirs,$(libdir),libmediaart-0\.2\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmediaart-dev += CSWlibmediaart0-2-0 PACKAGES += CSWlibmediaart-dev SPKG_DESC_CSWlibmediaart-dev = $(DESCRIPTION), development files PKGFILES_CSWlibmediaart-dev = $(PKGFILES_DEVEL) -# For gettext -CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) - 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 slowfranklin at users.sourceforge.net Tue May 6 17:02:15 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 6 May 2014 15:02:15 +0000 Subject: SF.net SVN: gar:[23564] csw/mgar/pkg/libmediaart/trunk/Makefile Message-ID: <3gNPL75301zj5@mail.opencsw.org> Revision: 23564 http://sourceforge.net/p/gar/code/23564 Author: slowfranklin Date: 2014-05-06 15:02:13 +0000 (Tue, 06 May 2014) Log Message: ----------- libmediaart/trunk: Fix runtime deps across platforms Modified Paths: -------------- csw/mgar/pkg/libmediaart/trunk/Makefile Modified: csw/mgar/pkg/libmediaart/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmediaart/trunk/Makefile 2014-05-06 14:51:31 UTC (rev 23563) +++ csw/mgar/pkg/libmediaart/trunk/Makefile 2014-05-06 15:02:13 UTC (rev 23564) @@ -26,16 +26,17 @@ SPKG_DESC_CSWlibmediaart0-2-0 += $(DESCRIPTION), libmediaart-0.2.so.0 PKGFILES_CSWlibmediaart0-2-0 += $(call baseisadirs,$(libdir),libmediaart-0\.2\.so\.0\.100\.0) PKGFILES_CSWlibmediaart0-2-0 += $(call baseisadirs,$(libdir),libmediaart-0\.2\.so\.0(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibqtcore4 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0 += $(RUNTIME_DEP_PKGS_CSWlibmediaart0-2-0_$(GARCH)) RUNTIME_DEP_PKGS_CSWlibmediaart-dev += CSWlibmediaart0-2-0 PACKAGES += CSWlibmediaart-dev 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 6 18:04:10 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 6 May 2014 16:04:10 +0000 Subject: SF.net SVN: gar:[23565] csw/mgar/pkg/tor Message-ID: <3gNQjf3KG0zxQ@mail.opencsw.org> Revision: 23565 http://sourceforge.net/p/gar/code/23565 Author: jake_goerzen Date: 2014-05-06 16:04:08 +0000 (Tue, 06 May 2014) Log Message: ----------- tor: re-create branch to test alpha release Modified Paths: -------------- csw/mgar/pkg/tor/branches/alpha/Makefile csw/mgar/pkg/tor/branches/alpha/checksums Added Paths: ----------- csw/mgar/pkg/tor/branches/ csw/mgar/pkg/tor/branches/alpha/ csw/mgar/pkg/tor/branches/alpha/files/0001-add-test-to-detech-we-are-on-Solaris.patch csw/mgar/pkg/tor/branches/alpha/files/pulled-from-gitrepo-fixes-bug11426.patch Modified: csw/mgar/pkg/tor/branches/alpha/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2014-05-01 15:40:50 UTC (rev 23532) +++ csw/mgar/pkg/tor/branches/alpha/Makefile 2014-05-06 16:04:08 UTC (rev 23565) @@ -1,6 +1,6 @@ # $Id$ NAME = tor -VERSION = 0.2.4.21 +VERSION = 0.2.5.3-alpha GARTYPE = v2 DESCRIPTION = Secure network traffic router @@ -8,9 +8,16 @@ Basically tor provides a distributed network of servers (onion routers). Users bounce their TCP streams (web traffic, ftp, ssh, etc) around the routers, and recipients, observers, and even the routers themselves have difficulty tracking the source of the stream. endef +# This is where the source git repo is located but we are building from the +# official alpha release tar.gz distfile downloaded from MATER_SITES. +# GIT_REPOS = git://git.torproject.org/tor.git + MASTER_SITES = http://www.torproject.org/dist/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += pulled-from-gitrepo-fixes-bug11426.patch +PATCHFILES += 0001-add-test-to-detech-we-are-on-Solaris.patch + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/tor/branches/alpha/checksums =================================================================== --- csw/mgar/pkg/tor/trunk/checksums 2014-05-01 15:40:50 UTC (rev 23532) +++ csw/mgar/pkg/tor/branches/alpha/checksums 2014-05-06 16:04:08 UTC (rev 23565) @@ -1 +1 @@ -bde981d10e8faf1e171ef1ebbb7b398a tor-0.2.4.21.tar.gz +8714ea9ceaa7477534c88385edfdf7df tor-0.2.5.3-alpha.tar.gz Added: csw/mgar/pkg/tor/branches/alpha/files/0001-add-test-to-detech-we-are-on-Solaris.patch =================================================================== --- csw/mgar/pkg/tor/branches/alpha/files/0001-add-test-to-detech-we-are-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/tor/branches/alpha/files/0001-add-test-to-detech-we-are-on-Solaris.patch 2014-05-06 16:04:08 UTC (rev 23565) @@ -0,0 +1,28 @@ +From 12209beaed0135b2bf11669cfc7ea27c2b36094f Mon Sep 17 00:00:00 2001 +From: Jake Goerzen +Date: Thu, 24 Apr 2014 18:57:38 +0200 +Subject: [PATCH] add test to detech we are on Solaris + +--- + src/test/test_bt_cl.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c +index 45ae82f..7352e9e 100644 +--- a/src/test/test_bt_cl.c ++++ b/src/test/test_bt_cl.c +@@ -20,6 +20,11 @@ static int crashtype = 0; + #define NORETURN __attribute__((noreturn)) + #endif + ++#if defined(__sun) && defined(__SVR4) ++#define NOINLINE __attribute__((noinline)) ++#define NORETURN __attribute__((noreturn)) ++#endif ++ + int crash(int x) NOINLINE; + int oh_what(int x) NOINLINE; + int a_tangled_web(int x) NOINLINE; +-- +1.8.4.1 + Added: csw/mgar/pkg/tor/branches/alpha/files/pulled-from-gitrepo-fixes-bug11426.patch =================================================================== --- csw/mgar/pkg/tor/branches/alpha/files/pulled-from-gitrepo-fixes-bug11426.patch (rev 0) +++ csw/mgar/pkg/tor/branches/alpha/files/pulled-from-gitrepo-fixes-bug11426.patch 2014-05-06 16:04:08 UTC (rev 23565) @@ -0,0 +1,41 @@ +From 9ccedbece0052cf743d5e5703e1676cda6cab733 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson +Date: Mon, 7 Apr 2014 13:07:14 -0400 +Subject: [PATCH 1/1] Make csiphash use the proper endian-converter on solaris + +fixes bug 11426; bugfix on 0.2.5.3-alpha, where csiphash was +introduced. +--- + changes/bug11426 | 3 +++ + src/ext/csiphash.c | 4 ++++ + 2 files changed, 7 insertions(+) + create mode 100644 changes/bug11426 + +diff --git a/changes/bug11426 b/changes/bug11426 +new file mode 100644 +index 0000000..23b1e7d +--- /dev/null ++++ b/changes/bug11426 +@@ -0,0 +1,3 @@ ++ o Minor bugfixes: ++ - Fix compilation on Solaris, which does not have . ++ Fixes bug 11426; bugfix on 0.2.5.3-alpha. +diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c +index 2a96f28..c247886 100644 +--- a/src/ext/csiphash.c ++++ b/src/ext/csiphash.c +@@ -46,6 +46,10 @@ + #elif defined(__APPLE__) + # include + # define _le64toh(x) OSSwapLittleToHostInt64(x) ++#elif defined(sun) || defined(__sun) ++# include ++# define _le64toh(x) LE_64(x) ++ + #else + + /* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ +-- +1.7.10.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 7 07:11:47 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 7 May 2014 05:11:47 +0000 Subject: SF.net SVN: gar:[23566] csw/mgar/pkg/tracker/trunk Message-ID: <3gNmBh0nwPzSn@mail.opencsw.org> Revision: 23566 http://sourceforge.net/p/gar/code/23566 Author: slowfranklin Date: 2014-05-07 05:11:45 +0000 (Wed, 07 May 2014) Log Message: ----------- tracker/trunk: Update to 1.0.0 Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile csw/mgar/pkg/tracker/trunk/checksums Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-06 16:04:08 UTC (rev 23565) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 05:11:45 UTC (rev 23566) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = tracker -VERSION = 0.16.3 +VERSION = 1.0.0 GARTYPE = v2 DESCRIPTION = Gnome Tracker, semantic data storage @@ -39,8 +39,11 @@ BUILD_DEP_PKGS += CSWlibuuid-dev BUILD_DEP_PKGS += CSWlibiptcdata BUILD_DEP_PKGS += CSWpoppler-dev -# BUILD_DEP_PKGS += CSWexempidevel BUILD_DEP_PKGS += CSWlibexif-dev +BUILD_DEP_PKGS += CSWlibmediaart-dev +BUILD_DEP_PKGS += CSWpm-xml-parser +BUILD_DEP_PKGS += CSWlibcairo-dev +BUILD_DEP_PKGS += CSWfontconfig-dev CSWlibfreetype-dev CSWxproto CSWsunx11devel CSWintltool RUNTIME_DEP_PKGS_CSWtracker += CSWlibgsf1-114 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgmodule2-0-0 @@ -52,9 +55,9 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev # for glib-compile-schemas # RUNTIME_DEP_PKGS_CSWtracker += CSWexempi -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql0-16-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner0-16-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract0-16-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner1-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract1-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWtracker += CSWdbus RUNTIME_DEP_PKGS_CSWtracker += CSWdconf @@ -63,54 +66,54 @@ RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibz1 RUNTIME_DEP_PKGS_CSWtracker += $(RUNTIME_DEP_PKGS_CSWtracker_$(GARCH)) -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibuuid1 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibtracker-common -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0_sparc += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0_sparc += CSWlibicudata51 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0_sparc += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0_sparc += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0_sparc += CSWlibicuuc51 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0_sparc += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0_$(GARCH)) +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibicudata51 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_$(GARCH)) -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibexif12 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgsf1-114 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtiff5 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgif4 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibiptcdata -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibpoppler-glib8 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-sparql0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-common -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0_sparc += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0_sparc += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0_sparc += CSWlibicuuc51 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0_sparc += CSWlibicudata51 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0_sparc += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0_$(GARCH)) +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibexif12 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgsf1-114 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibtiff5 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibiptcdata +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibpoppler-glib8 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibicudata51 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_$(GARCH)) -RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-sparql0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-common -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-extract0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-sparql0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-extract1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-sparql1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0 @@ -126,12 +129,10 @@ RUNTIME_DEP_PKGS_CSWlibtracker-common_sparc += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibtracker-common += $(RUNTIME_DEP_PKGS_CSWlibtracker-common_$(GARCH)) -PATCHFILES += 0001-Force-linking-with-CC-not-CXX.patch +# 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 PATCHFILES += 0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch -# Submitted upstream, should be in 0.16.4 -PATCHFILES += 0002-strnlen-replacement-function.patch # Packages PACKAGES += CSWtracker @@ -142,32 +143,35 @@ PACKAGES += CSWlibtracker-common SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common -PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-0.16/libtracker-common.so.0) -PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-0.16/libtracker-data.so.0) +PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-common.so.0) +PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-data.so.0) -PACKAGES += CSWlibtracker-extract0-16-0 -SPKG_DESC_CSWlibtracker-extract0-16-0 += $(DESCRIPTION), libtracker-extract-0.16.so.0 -PKGFILES_CSWlibtracker-extract0-16-0 += $(call pkgfiles_lib,libtracker-extract-0.16.so.0) -PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),tracker-0\.16/extract-modules/libextract-.*\.so) +PACKAGES += CSWlibtracker-extract1-0-0 +SPKG_DESC_CSWlibtracker-extract1-0-0 += $(DESCRIPTION), libtracker-extract-1.0.so.0 +PKGFILES_CSWlibtracker-extract1-0-0 += $(call pkgfiles_lib,libtracker-extract-1.0.so.0) +PKGFILES_CSWlibtracker-extract1-0-0 += $(call baseisadirs,$(libdir),tracker-1\.0/extract-modules/libextract-.*\.so) -PACKAGES += CSWlibtracker-miner0-16-0 -SPKG_DESC_CSWlibtracker-miner0-16-0 += $(DESCRIPTION), libtracker-miner-0.16.so.0 -PKGFILES_CSWlibtracker-miner0-16-0 += $(call pkgfiles_lib,libtracker-miner-0.16.so.0) +PACKAGES += CSWlibtracker-miner1-0-0 +SPKG_DESC_CSWlibtracker-miner1-0-0 += $(DESCRIPTION), libtracker-miner-1.0.so.0 +PKGFILES_CSWlibtracker-miner1-0-0 += $(call pkgfiles_lib,libtracker-miner-1.0.so.0) -PACKAGES += CSWlibtracker-sparql0-16-0 -SPKG_DESC_CSWlibtracker-sparql0-16-0 += $(DESCRIPTION), libtracker-sparql-0.16.so.0 -PKGFILES_CSWlibtracker-sparql0-16-0 += $(call pkgfiles_lib,libtracker-sparql-0.16.so.0) +PACKAGES += CSWlibtracker-sparql1-0-0 +SPKG_DESC_CSWlibtracker-sparql1-0-0 += $(DESCRIPTION), libtracker-sparql-1.0.so.0 +PKGFILES_CSWlibtracker-sparql1-0-0 += $(call pkgfiles_lib,libtracker-sparql-1.0.so.0) PACKAGES += CSWlibtracker-dev SPKG_DESC_CSWlibtracker-dev += $(DESCRIPTION), development files PKGFILES_CSWlibtracker-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so) -PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so) +PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-1\.0/libtracker-common\.so) +PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-1\.0/libtracker-data\.so) PKGFILES_CSWlibtracker-dev += $(datadir)/vala/vapi/tracker-.* # For gettext CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) +# For xproto and stuff +PKG_CONFIG_DIRS += /opt/csw/X11/lib/pkgconfig/ + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-tracker-fts CONFIGURE_ARGS += --disable-unit-tests @@ -185,45 +189,45 @@ # after spending a day trying to figure out why all these libs are linked unneededly only on SPARC # I gave up and applied the overrides -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-mplayer.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-mp3.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-jpeg.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-icon.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-html.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-gif.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libxml2.so.2|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libgsf-1.so.114|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libgobject-2.0.so.0|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-dvi.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-dvi.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-abw.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libthread.so.1|is|needed|by|/opt/csw/lib/libtracker-extract-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/libtracker-extract-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/lib/libtracker-extract-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/lib/libtracker-extract-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libicudata.so.51|is|needed|by|/opt/csw/lib/libtracker-extract-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-msoffice-xml.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-msoffice-xml.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-msoffice.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libxml2.so.2|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-msoffice.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libgobject-2.0.so.0|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libgsf-1.so.114|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libxml2.so.2|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libcairo.so.2|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-pdf.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-pdf.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-png.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-ps.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-text.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-tiff.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/extract-modules/libextract-totem.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0 += $(CHECKPKG_OVERRIDES_CSWlibtracker-extract0-16-0_$(GARCH)) +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-mplayer.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-mp3.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-jpeg.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-icon.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-html.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-gif.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libxml2.so.2|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libgsf-1.so.114|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libgobject-2.0.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-dvi.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-dvi.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-abw.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libthread.so.1|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libicudata.so.51|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-msoffice-xml.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-msoffice-xml.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-msoffice.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libxml2.so.2|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-msoffice.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libgobject-2.0.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libgsf-1.so.114|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libxml2.so.2|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libcairo.so.2|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-pdf.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-pdf.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-png.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-ps.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-text.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-tiff.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-totem.so|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0 += $(CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_$(GARCH)) CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-control|but|never|used CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/bin/tracker-control|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libtracker-sparql-0.16.so.0|is|needed|by|/opt/csw/bin/tracker-control|but|never|used +CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libtracker-sparql-1.0.so.0|is|needed|by|/opt/csw/bin/tracker-control|but|never|used CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-import|but|never|used CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/bin/tracker-import|but|never|used CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-info|but|never|used @@ -250,16 +254,16 @@ CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/libexec/tracker-writeback|but|never|used CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libthread.so.1|is|needed|by|/opt/csw/libexec/tracker-writeback|but|never|used CHECKPKG_OVERRIDES_CSWtracker += $(CHECKPKG_OVERRIDES_CSWtracker_$(GARCH)) -CHECKPKG_OVERRIDES_CSWlibtracker-common_sparc += soname-unused|libicudata.so.51|is|needed|by|/opt/csw/lib/tracker-0.16/libtracker-data.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-common_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-0.16/libtracker-data.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-common_sparc += soname-unused|libz.so.1|is|needed|by|/opt/csw/lib/tracker-0.16/libtracker-data.so.0.1600.3|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-common_sparc += soname-unused|libicudata.so.51|is|needed|by|/opt/csw/lib/tracker-1.0/libtracker-data.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-common_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/libtracker-data.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-common_sparc += soname-unused|libz.so.1|is|needed|by|/opt/csw/lib/tracker-1.0/libtracker-data.so.0.0.0|but|never|used CHECKPKG_OVERRIDES_CSWlibtracker-common += $(CHECKPKG_OVERRIDES_CSWlibtracker-common_$(GARCH)) -CHECKPKG_OVERRIDES_CSWlibtracker-sparql0-16-0_sparc += soname-unused|libicudata.so.51|is|needed|by|/opt/csw/lib/libtracker-sparql-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql0-16-0_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/lib/libtracker-sparql-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql0-16-0_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/lib/libtracker-sparql-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql0-16-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/libtracker-sparql-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql0-16-0_sparc += soname-unused|libsqlite3.so.0|is|needed|by|/opt/csw/lib/libtracker-sparql-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql0-16-0_sparc += soname-unused|libz.so.1|is|needed|by|/opt/csw/lib/libtracker-sparql-0.16.so.0.1600.3|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql0-16-0 += $(CHECKPKG_OVERRIDES_CSWlibtracker-sparql0-16-0_$(GARCH)) +CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libicudata.so.51|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libsqlite3.so.0|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libz.so.1|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used +CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0 += $(CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_$(GARCH)) include gar/category.mk Modified: csw/mgar/pkg/tracker/trunk/checksums =================================================================== --- csw/mgar/pkg/tracker/trunk/checksums 2014-05-06 16:04:08 UTC (rev 23565) +++ csw/mgar/pkg/tracker/trunk/checksums 2014-05-07 05:11:45 UTC (rev 23566) @@ -1 +1 @@ -060cef194a4ac9e28927a33bec8cce54 tracker-0.16.3.tar.xz +a234c5a6d3a22120a1eeaef0c71a57fb tracker-1.0.0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 7 10:45:50 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 7 May 2014 08:45:50 +0000 Subject: SF.net SVN: gar:[23567] csw/mgar/pkg/libcheck/trunk/Makefile Message-ID: <3gNrxL6rTmz10N@mail.opencsw.org> Revision: 23567 http://sourceforge.net/p/gar/code/23567 Author: dmichelsen Date: 2014-05-07 08:45:48 +0000 (Wed, 07 May 2014) Log Message: ----------- libcheck/trunk: Initial commit Modified Paths: -------------- csw/mgar/pkg/libcheck/trunk/Makefile Modified: csw/mgar/pkg/libcheck/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcheck/trunk/Makefile 2014-05-07 05:11:45 UTC (rev 23566) +++ csw/mgar/pkg/libcheck/trunk/Makefile 2014-05-07 08:45:48 UTC (rev 23567) @@ -10,9 +10,20 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz -# Needed for floor() -EXTRA_LINKER_FLAGS += -lm +PACKAGES += CSWlibcheck0 +SPKG_DESC_CSWlibcheck0 = A unit test framework for C, libcheck.so.0 +PKGFILES_CSWlibcheck0 += $(call pkgfiles_lib,libcheck.so.0) +PACKAGES += CSWlibcheck-dev +SPKG_DESC_CSWlibcheck-dev = Development files for libckeck.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibcheck-dev += CSWlibcheck0 + +REINPLACEMENTS += bash +REINPLACE_MATCH_bash = /bin/sh +REINPLACE_WITH_bash = /bin/bash +REINPLACE_FILES_bash += checkmk/test/check_checkmk + BUILD64 = 1 CONFIGURE_ARGS += $(DIRPATHS) @@ -20,5 +31,7 @@ # http://wiki.opencsw.org/porting-faq#toc8 CONFIGURE_ARGS += ax_cv_c_check_flag__pedantic=no +BUILD_ENV_PATH = /opt/csw/gnu:$(PATH) + 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 7 13:25:57 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 7 May 2014 11:25:57 +0000 Subject: SF.net SVN: gar:[23568] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: <3gNwVS4WT5z1M1@mail.opencsw.org> Revision: 23568 http://sourceforge.net/p/gar/code/23568 Author: slowfranklin Date: 2014-05-07 11:25:56 +0000 (Wed, 07 May 2014) Log Message: ----------- tracker/trunk: Fix deps, add package for tracker-control, remove tracker-extract Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 08:45:48 UTC (rev 23567) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 11:25:56 UTC (rev 23568) @@ -45,126 +45,133 @@ BUILD_DEP_PKGS += CSWlibcairo-dev BUILD_DEP_PKGS += CSWfontconfig-dev CSWlibfreetype-dev CSWxproto CSWsunx11devel CSWintltool +PATCHFILES += 0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch +PATCHFILES += 0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch +PATCHFILES += 0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch + +# Packages +PACKAGES += CSWtracker +SPKG_DESC_CSWtracker = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWtracker += CSWlibgsf1-114 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev # for glib-compile-schemas -# RUNTIME_DEP_PKGS_CSWtracker += CSWexempi +RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql1-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner1-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract1-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWtracker += CSWdbus RUNTIME_DEP_PKGS_CSWtracker += CSWdconf -RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-control1-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibiptcdata +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtiff5 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibpoppler-glib8 +RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibexif12 +RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibicudata52 RUNTIME_DEP_PKGS_CSWtracker += $(RUNTIME_DEP_PKGS_CSWtracker_$(GARCH)) - -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibuuid1 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibtracker-common -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibicudata51 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibicuuc51 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_$(GARCH)) - -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibexif12 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgsf1-114 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibtiff5 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibgif4 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibiptcdata -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibpoppler-glib8 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibtracker-sparql1-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += CSWlibtracker-common -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibicuuc51 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibicudata51 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_sparc += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-extract1-0-0_$(GARCH)) - -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-sparql1-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-common - -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner1-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-extract1-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-sparql1-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-common - -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicuuc51 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibuuid1 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common_sparc += CSWlibicudata51 -RUNTIME_DEP_PKGS_CSWlibtracker-common_sparc += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibtracker-common += $(RUNTIME_DEP_PKGS_CSWlibtracker-common_$(GARCH)) - -# 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 -PATCHFILES += 0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch - -# Packages -PACKAGES += CSWtracker -SPKG_DESC_CSWtracker = $(DESCRIPTION) +# For glib-compile-shemas +CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWlibglib2-dev +# Tracker needs dbus CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdbus +# Configuration backend for Gnome stuff, used by Tracker and dbus CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdconf -CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWlibglib2-dev PACKAGES += CSWlibtracker-common SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-common.so.0) PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-data.so.0) +PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-extract.so.0) +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibexif12 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibiptcdata +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWtracker +RUNTIME_DEP_PKGS_CSWlibtracker-common_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibtracker-common_sparc += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSWlibtracker-common += $(RUNTIME_DEP_PKGS_CSWlibtracker-common_$(GARCH)) -PACKAGES += CSWlibtracker-extract1-0-0 -SPKG_DESC_CSWlibtracker-extract1-0-0 += $(DESCRIPTION), libtracker-extract-1.0.so.0 -PKGFILES_CSWlibtracker-extract1-0-0 += $(call pkgfiles_lib,libtracker-extract-1.0.so.0) -PKGFILES_CSWlibtracker-extract1-0-0 += $(call baseisadirs,$(libdir),tracker-1\.0/extract-modules/libextract-.*\.so) - PACKAGES += CSWlibtracker-miner1-0-0 SPKG_DESC_CSWlibtracker-miner1-0-0 += $(DESCRIPTION), libtracker-miner-1.0.so.0 PKGFILES_CSWlibtracker-miner1-0-0 += $(call pkgfiles_lib,libtracker-miner-1.0.so.0) +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_$(GARCH)) PACKAGES += CSWlibtracker-sparql1-0-0 SPKG_DESC_CSWlibtracker-sparql1-0-0 += $(DESCRIPTION), libtracker-sparql-1.0.so.0 PKGFILES_CSWlibtracker-sparql1-0-0 += $(call pkgfiles_lib,libtracker-sparql-1.0.so.0) +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_$(GARCH)) +PACKAGES += CSWlibtracker-control1-0-0 +SPKG_DESC_CSWlibtracker-control1-0-0 += $(DESCRIPTION), libtracker-control-1.0.so.0 +PKGFILES_CSWlibtracker-control1-0-0 += $(call baseisadirs,$(libdir),libtracker-control-1\.0\.so\.0\.0\.0) +PKGFILES_CSWlibtracker-control1-0-0 += $(call baseisadirs,$(libdir),libtracker-control-1\.0\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0_$(GARCH)) + PACKAGES += CSWlibtracker-dev SPKG_DESC_CSWlibtracker-dev += $(DESCRIPTION), development files PKGFILES_CSWlibtracker-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-1\.0/libtracker-common\.so) PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-1\.0/libtracker-data\.so) +PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-1\.0/libtracker-extract\.so) PKGFILES_CSWlibtracker-dev += $(datadir)/vala/vapi/tracker-.* +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-control1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWtracker # For gettext CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) @@ -187,83 +194,5 @@ CONFIGURE_ARGS += --disable-miner-thunderbird CONFIGURE_ARGS += --disable-miner-firefox -# after spending a day trying to figure out why all these libs are linked unneededly only on SPARC -# I gave up and applied the overrides -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-mplayer.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-mp3.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-jpeg.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-icon.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-html.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-gif.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libxml2.so.2|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libgsf-1.so.114|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libgobject-2.0.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-epub.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-dvi.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-dvi.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-abw.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libthread.so.1|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libicudata.so.51|is|needed|by|/opt/csw/lib/libtracker-extract-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-msoffice-xml.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-msoffice-xml.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-msoffice.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libxml2.so.2|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-msoffice.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libgobject-2.0.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libgsf-1.so.114|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libtracker-common.so.0|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libxml2.so.2|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-oasis.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libcairo.so.2|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-pdf.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-pdf.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-png.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-ps.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-text.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-tiff.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/extract-modules/libextract-totem.so|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0 += $(CHECKPKG_OVERRIDES_CSWlibtracker-extract1-0-0_$(GARCH)) -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-control|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/bin/tracker-control|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libtracker-sparql-1.0.so.0|is|needed|by|/opt/csw/bin/tracker-control|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-import|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/bin/tracker-import|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-info|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/bin/tracker-info|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-search|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/bin/tracker-search|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-sparql|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/bin/tracker-sparql|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-stats|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/bin/tracker-stats|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/bin/tracker-tag|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/bin/tracker-tag|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/libexec/tracker-extract|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/libexec/tracker-extract|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libthread.so.1|is|needed|by|/opt/csw/libexec/tracker-extract|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libz.so.1|is|needed|by|/opt/csw/libexec/tracker-extract|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/libexec/tracker-miner-fs|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/libexec/tracker-miner-fs|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libthread.so.1|is|needed|by|/opt/csw/libexec/tracker-miner-fs|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/libexec/tracker-store|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/libexec/tracker-store|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libthread.so.1|is|needed|by|/opt/csw/libexec/tracker-store|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/libexec/tracker-writeback|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/libexec/tracker-writeback|but|never|used -CHECKPKG_OVERRIDES_CSWtracker_sparc += soname-unused|libthread.so.1|is|needed|by|/opt/csw/libexec/tracker-writeback|but|never|used -CHECKPKG_OVERRIDES_CSWtracker += $(CHECKPKG_OVERRIDES_CSWtracker_$(GARCH)) -CHECKPKG_OVERRIDES_CSWlibtracker-common_sparc += soname-unused|libicudata.so.51|is|needed|by|/opt/csw/lib/tracker-1.0/libtracker-data.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-common_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/tracker-1.0/libtracker-data.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-common_sparc += soname-unused|libz.so.1|is|needed|by|/opt/csw/lib/tracker-1.0/libtracker-data.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-common += $(CHECKPKG_OVERRIDES_CSWlibtracker-common_$(GARCH)) -CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libicudata.so.51|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libicui18n.so.51|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libsqlite3.so.0|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_sparc += soname-unused|libz.so.1|is|needed|by|/opt/csw/lib/libtracker-sparql-1.0.so.0.0.0|but|never|used -CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0 += $(CHECKPKG_OVERRIDES_CSWlibtracker-sparql1-0-0_$(GARCH)) 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 7 14:55:29 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 7 May 2014 12:55:29 +0000 Subject: SF.net SVN: gar:[23569] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: <3gNyTQ6qWkz1V9@mail.opencsw.org> Revision: 23569 http://sourceforge.net/p/gar/code/23569 Author: slowfranklin Date: 2014-05-07 12:55:27 +0000 (Wed, 07 May 2014) Log Message: ----------- tracker/trunk: Attempt to fix cyclic dependency issue Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 11:25:56 UTC (rev 23568) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 12:55:27 UTC (rev 23569) @@ -52,27 +52,27 @@ # Packages PACKAGES += CSWtracker SPKG_DESC_CSWtracker = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgsf1-114 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWtracker += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibpoppler-glib8 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-control1-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibiptcdata RUNTIME_DEP_PKGS_CSWtracker += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner1-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev RUNTIME_DEP_PKGS_CSWtracker += CSWdbus RUNTIME_DEP_PKGS_CSWtracker += CSWdconf -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-control1-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibiptcdata -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtiff5 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibgif4 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibpoppler-glib8 RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibz1 RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibstdc++6 @@ -95,20 +95,19 @@ PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-common.so.0) PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-data.so.0) PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-extract.so.0) -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibexif12 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibiptcdata +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibexif12 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibiptcdata -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibtracker-sparql1-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibuuid1 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWtracker +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-common_sparc += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibtracker-common_sparc += CSWlibicudata52 RUNTIME_DEP_PKGS_CSWlibtracker-common += $(RUNTIME_DEP_PKGS_CSWlibtracker-common_$(GARCH)) @@ -119,10 +118,10 @@ RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-sparql1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-sparql1-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibuuid1 @@ -136,10 +135,10 @@ PKGFILES_CSWlibtracker-sparql1-0-0 += $(call pkgfiles_lib,libtracker-sparql-1.0.so.0) RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibintl8 @@ -167,11 +166,10 @@ PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-1\.0/libtracker-data\.so) PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-1\.0/libtracker-extract\.so) PKGFILES_CSWlibtracker-dev += $(datadir)/vala/vapi/tracker-.* -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-control1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-sparql1-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-control1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-common -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWtracker +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner1-0-0 # For gettext CONFIGURE_ENV_PATH = /opt/csw/gnu:$(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 Wed May 7 16:40:49 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 7 May 2014 14:40:49 +0000 Subject: SF.net SVN: gar:[23570] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: <3gP0pz6sTgzBP@mail.opencsw.org> Revision: 23570 http://sourceforge.net/p/gar/code/23570 Author: slowfranklin Date: 2014-05-07 14:40:49 +0000 (Wed, 07 May 2014) Log Message: ----------- tracker/trunk: Cyclic deps: manual cleanup, checkpkg suggestions didn't cut it Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 12:55:27 UTC (rev 23569) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 14:40:49 UTC (rev 23570) @@ -52,6 +52,10 @@ # Packages PACKAGES += CSWtracker SPKG_DESC_CSWtracker = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-control1-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner1-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWtracker += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgsf1-114 RUNTIME_DEP_PKGS_CSWtracker += CSWlibpng15-15 @@ -59,16 +63,12 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWtracker += CSWlibintl8 RUNTIME_DEP_PKGS_CSWtracker += CSWlibpoppler-glib8 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-control1-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibiptcdata RUNTIME_DEP_PKGS_CSWtracker += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql1-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner1-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgif4 RUNTIME_DEP_PKGS_CSWtracker += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev RUNTIME_DEP_PKGS_CSWtracker += CSWdbus @@ -103,7 +103,6 @@ RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicui18n52 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibtracker-sparql1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibexif12 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicuuc52 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgcc-s1 @@ -115,12 +114,12 @@ PACKAGES += CSWlibtracker-miner1-0-0 SPKG_DESC_CSWlibtracker-miner1-0-0 += $(DESCRIPTION), libtracker-miner-1.0.so.0 PKGFILES_CSWlibtracker-miner1-0-0 += $(call pkgfiles_lib,libtracker-miner-1.0.so.0) +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-sparql1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-sparql1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner1-0-0_sparc += CSWlibz1 @@ -133,11 +132,11 @@ PACKAGES += CSWlibtracker-sparql1-0-0 SPKG_DESC_CSWlibtracker-sparql1-0-0 += $(DESCRIPTION), libtracker-sparql-1.0.so.0 PKGFILES_CSWlibtracker-sparql1-0-0 += $(call pkgfiles_lib,libtracker-sparql-1.0.so.0) +RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql1-0-0_sparc += CSWlibz1 @@ -151,10 +150,10 @@ SPKG_DESC_CSWlibtracker-control1-0-0 += $(DESCRIPTION), libtracker-control-1.0.so.0 PKGFILES_CSWlibtracker-control1-0-0 += $(call baseisadirs,$(libdir),libtracker-control-1\.0\.so\.0\.0\.0) PKGFILES_CSWlibtracker-control1-0-0 += $(call baseisadirs,$(libdir),libtracker-control-1\.0\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0_sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0 += $(RUNTIME_DEP_PKGS_CSWlibtracker-control1-0-0_$(GARCH)) @@ -168,7 +167,6 @@ PKGFILES_CSWlibtracker-dev += $(datadir)/vala/vapi/tracker-.* RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-control1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-sparql1-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner1-0-0 # For gettext 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 7 17:50:24 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 7 May 2014 15:50:24 +0000 Subject: SF.net SVN: gar:[23571] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: <3gP2MD6cDszNX@mail.opencsw.org> Revision: 23571 http://sourceforge.net/p/gar/code/23571 Author: slowfranklin Date: 2014-05-07 15:50:22 +0000 (Wed, 07 May 2014) Log Message: ----------- tracker/trunk: Cyclic dep: add new package CSWlibtracker-extract to break it Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 14:40:49 UTC (rev 23570) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 15:50:22 UTC (rev 23571) @@ -56,6 +56,7 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql1-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner1-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract RUNTIME_DEP_PKGS_CSWtracker += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgsf1-114 RUNTIME_DEP_PKGS_CSWtracker += CSWlibpng15-15 @@ -94,7 +95,6 @@ SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-common.so.0) PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-data.so.0) -PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-extract.so.0) RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibintl8 @@ -111,6 +111,20 @@ RUNTIME_DEP_PKGS_CSWlibtracker-common_sparc += CSWlibicudata52 RUNTIME_DEP_PKGS_CSWlibtracker-common += $(RUNTIME_DEP_PKGS_CSWlibtracker-common_$(GARCH)) +PACKAGES += CSWlibtracker-extract +SPKG_DESC_CSWlibtracker-extract += $(DESCRIPTION), libtracker-extract +PKGFILES_CSWlibtracker-extract += $(call pkgfiles_lib,tracker-1.0/libtracker-extract.so.0) +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibiptcdata +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibexif12 +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibglib2-0-0 + PACKAGES += CSWlibtracker-miner1-0-0 SPKG_DESC_CSWlibtracker-miner1-0-0 += $(DESCRIPTION), libtracker-miner-1.0.so.0 PKGFILES_CSWlibtracker-miner1-0-0 += $(call pkgfiles_lib,libtracker-miner-1.0.so.0) @@ -168,6 +182,8 @@ RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-control1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-sparql1-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner1-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-extract # For gettext CONFIGURE_ENV_PATH = /opt/csw/gnu:$(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 Wed May 7 18:04:31 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 7 May 2014 16:04:31 +0000 Subject: SF.net SVN: gar:[23572] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: <3gP2gZ1tznzSh@mail.opencsw.org> Revision: 23572 http://sourceforge.net/p/gar/code/23572 Author: slowfranklin Date: 2014-05-07 16:04:28 +0000 (Wed, 07 May 2014) Log Message: ----------- libtracker-common: remove unneeded deps Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 15:50:22 UTC (rev 23571) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 16:04:28 UTC (rev 23572) @@ -96,14 +96,11 @@ PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-common.so.0) PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-1.0/libtracker-data.so.0) RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibiptcdata RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicui18n52 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibexif12 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicuuc52 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgio2-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed May 7 18:22:40 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 7 May 2014 16:22:40 +0000 Subject: SF.net SVN: gar:[23573] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: <3gP34S5pmFzYM@mail.opencsw.org> Revision: 23573 http://sourceforge.net/p/gar/code/23573 Author: slowfranklin Date: 2014-05-07 16:22:40 +0000 (Wed, 07 May 2014) Log Message: ----------- libtracker-extract: add platform specific deps Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 16:04:28 UTC (rev 23572) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-07 16:22:40 UTC (rev 23573) @@ -121,6 +121,13 @@ RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibexif12 RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibtracker-extract += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract_sparc += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibtracker-extract_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-extract_sparc += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWlibtracker-extract_sparc += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibtracker-extract_sparc += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSWlibtracker-extract += $(RUNTIME_DEP_PKGS_CSWlibtracker-extract_$(GARCH)) PACKAGES += CSWlibtracker-miner1-0-0 SPKG_DESC_CSWlibtracker-miner1-0-0 += $(DESCRIPTION), libtracker-miner-1.0.so.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu May 8 07:26:50 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 8 May 2014 05:26:50 +0000 Subject: SF.net SVN: gar:[23574] csw/mgar/pkg/netatalk/trunk Message-ID: <3gPNTK12SXz4@mail.opencsw.org> Revision: 23574 http://sourceforge.net/p/gar/code/23574 Author: slowfranklin Date: 2014-05-08 05:26:47 +0000 (Thu, 08 May 2014) Log Message: ----------- netatalk/trunk: Update Tracker deps and add upstream patch Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/netatalk/trunk/files/33dd614058f32bbe3c88734654228d8715f2403e.patch Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-07 16:22:40 UTC (rev 23573) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-08 05:26:47 UTC (rev 23574) @@ -31,6 +31,7 @@ BUILD_DEP_PKGS += CSWlibtracker-dev BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWopenldap-dev +BUILD_DEP_PKGS += CSWlibpcre-dev RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS += CSWlibgcrypt11 @@ -41,8 +42,8 @@ RUNTIME_DEP_PKGS += CSWlibdbus-glib1-2 RUNTIME_DEP_PKGS += CSWlibiconv2 RUNTIME_DEP_PKGS += CSWbdb48 -RUNTIME_DEP_PKGS += CSWlibtracker-sparql0-16-0 -RUNTIME_DEP_PKGS += CSWlibtracker-miner0-16-0 +RUNTIME_DEP_PKGS += CSWlibtracker-sparql1-0-0 +RUNTIME_DEP_PKGS += CSWlibtracker-miner1-0-0 RUNTIME_DEP_PKGS += CSWlibgio2-0-0 RUNTIME_DEP_PKGS += CSWlibgcc-s1 RUNTIME_DEP_PKGS += CSWlibldap2-4-2 @@ -53,6 +54,8 @@ PATCHFILES += 0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch PATCHFILES += 0004-Ensure-gsettings-is-called-from-opt-csw-bin.patch +# will be in 3.1.2: +PATCHFILES += 33dd614058f32bbe3c88734654228d8715f2403e.patch REINPLACEMENTS += manifest1 REINPLACE_MATCH_manifest1 = network/netatalk @@ -76,7 +79,7 @@ CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/run/netatalk CONFIGURE_ARGS += --enable-krbV-uam CONFIGURE_ARGS += --with-tracker-prefix=/opt/csw -CONFIGURE_ARGS += --with-tracker-pkgconfig-version=0.16 +CONFIGURE_ARGS += --with-tracker-pkgconfig-version=1.0 CONFIGURE_ARGS += --with-ssl-dir=/opt/csw CONFIGURE_ARGS += --with-ldap=/opt/csw # compiling with MySQL on opencsw is a major pita atm :) Added: csw/mgar/pkg/netatalk/trunk/files/33dd614058f32bbe3c88734654228d8715f2403e.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/33dd614058f32bbe3c88734654228d8715f2403e.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/33dd614058f32bbe3c88734654228d8715f2403e.patch 2014-05-08 05:26:47 UTC (rev 23574) @@ -0,0 +1,73 @@ +From 33dd614058f32bbe3c88734654228d8715f2403e Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Tue, 22 Apr 2014 16:25:34 +0200 +Subject: [PATCH] Remove tracker miner code + +tracker_miner_manager_new_full() was reported to be potentially +locking up for an unknown reason. + +As we diddn't use the miner anyway for other reasons (see comment in +the code), simply #ifdef 0 the whole code. +--- + etc/spotlight/slmod_sparql.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/etc/spotlight/slmod_sparql.c b/etc/spotlight/slmod_sparql.c +index 11b1dac..e59db5a 100644 +--- a/etc/spotlight/slmod_sparql.c ++++ b/etc/spotlight/slmod_sparql.c +@@ -34,7 +34,9 @@ + #define MAX_SL_RESULTS 20 + + static TrackerSparqlConnection *connection; ++#if 0 + static TrackerMinerManager *manager; ++#endif + + static char *tracker_to_unix_path(const char *uri) + { +@@ -73,7 +75,9 @@ static int sl_mod_init(void *p) + + become_root(); + connection = tracker_sparql_connection_get(NULL, &error); ++#if 0 /* this may hang, so disable it as we don't use the miner anyway */ + manager = tracker_miner_manager_new_full(FALSE, &error); ++#endif + unbecome_root(); + + if (!connection) { +@@ -83,11 +87,13 @@ static int sl_mod_init(void *p) + EC_FAIL; + } + ++#if 0 + if (!manager) { + LOG(log_error, logtype_sl, "Couldn't connect to Tracker miner"); + g_clear_error(&error); + EC_FAIL; + } ++#endif + + EC_CLEANUP: + EC_EXIT; +@@ -387,6 +393,7 @@ static int sl_mod_index_file(const void *p) + */ + return 0; + ++#if 0 + #ifdef HAVE_TRACKER_MINER + EC_INIT; + const char *f = p; +@@ -414,7 +421,8 @@ static int sl_mod_index_file(const void *p) + EC_EXIT; + #else + return 0; +-#endif ++#endif /* HAVE_TRACKER_MINER */ ++#endif /* 0 */ + } + + struct sl_module_export sl_mod = { +-- +1.9.1 + 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 8 10:19:07 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 8 May 2014 08:19:07 +0000 Subject: SF.net SVN: gar:[23575] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: <3gPSJ34LQlzWV@mail.opencsw.org> Revision: 23575 http://sourceforge.net/p/gar/code/23575 Author: slowfranklin Date: 2014-05-08 08:19:07 +0000 (Thu, 08 May 2014) Log Message: ----------- Tracker: remove unneeded dep Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-08 05:26:47 UTC (rev 23574) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-08 08:19:07 UTC (rev 23575) @@ -43,7 +43,6 @@ RUNTIME_DEP_PKGS += CSWlibiconv2 RUNTIME_DEP_PKGS += CSWbdb48 RUNTIME_DEP_PKGS += CSWlibtracker-sparql1-0-0 -RUNTIME_DEP_PKGS += CSWlibtracker-miner1-0-0 RUNTIME_DEP_PKGS += CSWlibgio2-0-0 RUNTIME_DEP_PKGS += CSWlibgcc-s1 RUNTIME_DEP_PKGS += CSWlibldap2-4-2 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 8 22:21:11 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 8 May 2014 20:21:11 +0000 Subject: SF.net SVN: gar:[23576] csw/mgar/pkg/bind/trunk Message-ID: <3gPmKH20M7zD3@mail.opencsw.org> Revision: 23576 http://sourceforge.net/p/gar/code/23576 Author: bonivart Date: 2014-05-08 20:21:11 +0000 (Thu, 08 May 2014) Log Message: ----------- bind/trunk: update to 9.9.5 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 2014-05-08 08:19:07 UTC (rev 23575) +++ csw/mgar/pkg/bind/trunk/Makefile 2014-05-08 20:21:11 UTC (rev 23576) @@ -2,27 +2,27 @@ # owner/group for device files? (root:sys) NAME = bind -VERSION = 9.9.4 +VERSION = 9.9.5 GARTYPE = v2 # Enable these for Px-releases -RELEASE = P2 -DISTVERSION = $(VERSION)-$(RELEASE) -SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) +#RELEASE = P2 +#DISTVERSION = $(VERSION)-$(RELEASE) +#SPKG_VERSION = $(VERSION)$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB endef # Enable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -DISTFILES = $(DISTNAME).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +#DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -#DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall @@ -83,14 +83,17 @@ CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named CONFIGURE_ARGS += --with-dlz-ldap=/opt/csw -EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la +EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la $(mandir)/man1/isc-config.sh.1 $(bindir)/isc-config.sh #EXTRA_INC = /opt/csw/include +PKGFILES_CSWbindutils = $(bindir)/dig +PKGFILES_CSWbindutils += $(bindir)/host +PKGFILES_CSWbindutils += $(bindir)/nslookup +PKGFILES_CSWbindutils += $(bindir)/nsupdate PKGFILES_CSWbind-dev = $(PKGFILES_DEVEL) PKGFILES_CSWbind-dev += .*\.so PKGFILES_CSWlibbind = .*\.so\..* -PKGFILES_CSWbindutils = $(bindir)/.* PKGFILES_CSWbindchroot = .*chroot.* TEST_SCRIPTS = custom @@ -118,12 +121,12 @@ CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot # Will not split out all these libs -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.8|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.100.1.1|soname=libdns.so.100|pkgname=CSWlibbind|expected=CSWlibdns100 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.95.2.1|soname=libisc.so.95|pkgname=CSWlibbind|expected=CSWlibisc95 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.90.0.4|soname=libisccc.so.90|pkgname=CSWlibbind|expected=CSWlibisccc90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.0.7|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.90.0.5|soname=liblwres.so.90|pkgname=CSWlibbind|expected=CSWliblwres90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.95.5.0|soname=libisc.so.95|pkgname=CSWlibbind|expected=CSWlibisc95 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.9|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.100.2.2|soname=libdns.so.100|pkgname=CSWlibbind|expected=CSWlibdns100 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.1.0|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.90.0.6|soname=libisccc.so.90|pkgname=CSWlibbind|expected=CSWlibisccc90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.90.0.7|soname=liblwres.so.90|pkgname=CSWlibbind|expected=CSWliblwres90 # Some new checks, have no idea about their relevance CHECKPKG_OVERRIDES_CSWlibbind += no-direct-binding Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2014-05-08 08:19:07 UTC (rev 23575) +++ csw/mgar/pkg/bind/trunk/checksums 2014-05-08 20:21:11 UTC (rev 23576) @@ -1 +1 @@ -aa8e351e3e28d148e1717f8a0361d191 bind-9.9.4-P2.tar.gz +e676c65cad5234617ee22f48e328c24e bind-9.9.5.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 9 10:56:03 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 9 May 2014 08:56:03 +0000 Subject: SF.net SVN: gar:[23577] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: <3gQ54B0czQz14N@mail.opencsw.org> Revision: 23577 http://sourceforge.net/p/gar/code/23577 Author: slowfranklin Date: 2014-05-09 08:55:58 +0000 (Fri, 09 May 2014) Log Message: ----------- tracker/trunk: Add CSWglib2 dependency, needed for gesettings Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-08 20:21:11 UTC (rev 23576) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-09 08:55:58 UTC (rev 23577) @@ -74,6 +74,7 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev RUNTIME_DEP_PKGS_CSWtracker += CSWdbus RUNTIME_DEP_PKGS_CSWtracker += CSWdconf +RUNTIME_DEP_PKGS_CSWtracker += CSWglib2 RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibz1 RUNTIME_DEP_PKGS_CSWtracker_sparc += CSWlibstdc++6 @@ -90,6 +91,8 @@ CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdbus # Configuration backend for Gnome stuff, used by Tracker and dbus CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdconf +# For gsettings +CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWglib2 PACKAGES += CSWlibtracker-common SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common 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 9 11:08:41 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 9 May 2014 09:08:41 +0000 Subject: SF.net SVN: gar:[23578] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: <3gQ5Ll2GtYz18V@mail.opencsw.org> Revision: 23578 http://sourceforge.net/p/gar/code/23578 Author: slowfranklin Date: 2014-05-09 09:08:34 +0000 (Fri, 09 May 2014) Log Message: ----------- tracker/trunk: Update to 1.0.1 Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-09 08:55:58 UTC (rev 23577) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-09 09:08:34 UTC (rev 23578) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = tracker -VERSION = 1.0.0 +VERSION = 1.0.1 GARTYPE = v2 DESCRIPTION = Gnome Tracker, semantic data storage 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 9 11:10:03 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 9 May 2014 09:10:03 +0000 Subject: SF.net SVN: gar:[23579] csw/mgar/pkg/tracker/trunk/checksums Message-ID: <3gQ5NK2vl1z1Cn@mail.opencsw.org> Revision: 23579 http://sourceforge.net/p/gar/code/23579 Author: slowfranklin Date: 2014-05-09 09:10:02 +0000 (Fri, 09 May 2014) Log Message: ----------- tracker/trunk: 1.0.1 checksum Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/checksums Modified: csw/mgar/pkg/tracker/trunk/checksums =================================================================== --- csw/mgar/pkg/tracker/trunk/checksums 2014-05-09 09:08:34 UTC (rev 23578) +++ csw/mgar/pkg/tracker/trunk/checksums 2014-05-09 09:10:02 UTC (rev 23579) @@ -1 +1 @@ -a234c5a6d3a22120a1eeaef0c71a57fb tracker-1.0.0.tar.xz +e2a6999c2017c66554e914fc4cb9c20f tracker-1.0.1.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri May 9 13:25:35 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 9 May 2014 11:25:35 +0000 Subject: SF.net SVN: gar:[23580] csw/mgar/pkg/gnupg/trunk Message-ID: <3gQ8Nl4wfKz4y@mail.opencsw.org> Revision: 23580 http://sourceforge.net/p/gar/code/23580 Author: lblume Date: 2014-05-09 11:25:34 +0000 (Fri, 09 May 2014) Log Message: ----------- gnupg/trunk: Version bump to 1.4.16 Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2014-05-09 09:10:02 UTC (rev 23579) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2014-05-09 11:25:34 UTC (rev 23580) @@ -1,5 +1,5 @@ NAME = gnupg -VERSION = 1.4.14 +VERSION = 1.4.16 GARTYPE = v2 DESCRIPTION = GnuPG is a complete and free replacement for PGP Modified: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums 2014-05-09 09:10:02 UTC (rev 23579) +++ csw/mgar/pkg/gnupg/trunk/checksums 2014-05-09 11:25:34 UTC (rev 23580) @@ -1 +1 @@ -99dede468204cb6ee22de7e3e3772ab1 gnupg-1.4.14.tar.bz2 +6df73c57d3ece1dd36dc2a7679f00fb0 gnupg-1.4.16.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 9 14:00:53 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 9 May 2014 12:00:53 +0000 Subject: SF.net SVN: gar:[23581] csw/mgar/pkg/libgpg_error/trunk Message-ID: <3gQ99R5QHRzBC@mail.opencsw.org> Revision: 23581 http://sourceforge.net/p/gar/code/23581 Author: lblume Date: 2014-05-09 12:00:48 +0000 (Fri, 09 May 2014) Log Message: ----------- libgpg_error/trunk: Bump version to 1.13; add new linker requirement Modified Paths: -------------- csw/mgar/pkg/libgpg_error/trunk/Makefile csw/mgar/pkg/libgpg_error/trunk/checksums Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/Makefile 2014-05-09 11:25:34 UTC (rev 23580) +++ csw/mgar/pkg/libgpg_error/trunk/Makefile 2014-05-09 12:00:48 UTC (rev 23581) @@ -1,5 +1,5 @@ NAME = libgpg-error -VERSION = 1.12 +VERSION = 1.13 GARTYPE = v2 DESCRIPTION = GNU gpg related library @@ -40,4 +40,6 @@ BUILD64_LIBS_ONLY = 1 +EXTRA_LINKER_FLAGS = -lrt + include gar/category.mk Modified: csw/mgar/pkg/libgpg_error/trunk/checksums =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/checksums 2014-05-09 11:25:34 UTC (rev 23580) +++ csw/mgar/pkg/libgpg_error/trunk/checksums 2014-05-09 12:00:48 UTC (rev 23581) @@ -1 +1 @@ -8f0eb41a344d19ac2aa9bd101dfb9ce6 libgpg-error-1.12.tar.bz2 +fe0cfa7e15262ef8fdeee366109e9ff6 libgpg-error-1.13.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 9 14:18:04 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 9 May 2014 12:18:04 +0000 Subject: SF.net SVN: gar:[23582] csw/mgar/pkg/gnupg2/trunk Message-ID: <3gQ9YK0y47zJY@mail.opencsw.org> Revision: 23582 http://sourceforge.net/p/gar/code/23582 Author: lblume Date: 2014-05-09 12:18:03 +0000 (Fri, 09 May 2014) Log Message: ----------- gnupg2/trunk: Bump version to 2.0.22; switch compiler to GCC4 so it builds; add gpgtar Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile csw/mgar/pkg/gnupg2/trunk/checksums Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2014-05-09 12:00:48 UTC (rev 23581) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2014-05-09 12:18:03 UTC (rev 23582) @@ -3,7 +3,7 @@ # $Id$ NAME = gnupg -VERSION = 2.0.21 +VERSION = 2.0.22 GARTYPE = v2 DESCRIPTION = GnuPG is a complete and free replacement for PGP @@ -18,6 +18,8 @@ VENDOR_URL = http://www.gnupg.org/ +GARCOMPILER = GCC4 + BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_common) BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWgnupg2) @@ -34,6 +36,7 @@ PACKAGES += CSWgnupg2 SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP # PKGFILES is catchall + RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibksba8 RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibiconv2 @@ -78,6 +81,7 @@ CONFIGURE_ARGS += --with-readline=$(prefix) CONFIGURE_ARGS += --with-pinentry-pgm=$(prefix)/bin/pinentry-curses CONFIGURE_ARGS += --with-pth-prefix=$(prefix) +CONFIGURE_ARGS += --enable-gpgtar PROTOTYPE_MODIFIERS = suid PROTOTYPE_FILES_suid = .*/gpg2 Modified: csw/mgar/pkg/gnupg2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg2/trunk/checksums 2014-05-09 12:00:48 UTC (rev 23581) +++ csw/mgar/pkg/gnupg2/trunk/checksums 2014-05-09 12:18:03 UTC (rev 23582) @@ -1 +1 @@ -48c05f5dfe97cf21ae0ced811aaad750 gnupg-2.0.21.tar.bz2 +ee22e7b4fdbfcb50229c2e6db6db291e gnupg-2.0.22.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Fri May 9 22:22:12 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Fri, 9 May 2014 20:22:12 +0000 Subject: SF.net SVN: gar:[23583] csw/mgar/pkg Message-ID: <3gQNJ34pbgz1Ng@mail.opencsw.org> Revision: 23583 http://sourceforge.net/p/gar/code/23583 Author: rmottola Date: 2014-05-09 20:22:10 +0000 (Fri, 09 May 2014) Log Message: ----------- gnustep-make/trunk: first version for gnustep make Added Paths: ----------- csw/mgar/pkg/gnustep-make/ csw/mgar/pkg/gnustep-make/Makefile csw/mgar/pkg/gnustep-make/branches/ csw/mgar/pkg/gnustep-make/tags/ csw/mgar/pkg/gnustep-make/trunk/ csw/mgar/pkg/gnustep-make/trunk/Makefile csw/mgar/pkg/gnustep-make/trunk/checksums csw/mgar/pkg/gnustep-make/trunk/files/ Added: csw/mgar/pkg/gnustep-make/Makefile =================================================================== --- csw/mgar/pkg/gnustep-make/Makefile (rev 0) +++ csw/mgar/pkg/gnustep-make/Makefile 2014-05-09 20:22:10 UTC (rev 23583) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gnustep-make/trunk =================================================================== --- csw/mgar/pkg/gnustep-make/trunk 2014-05-09 12:18:03 UTC (rev 23582) +++ csw/mgar/pkg/gnustep-make/trunk 2014-05-09 20:22:10 UTC (rev 23583) Property changes on: csw/mgar/pkg/gnustep-make/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gnustep-make/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-make/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnustep-make/trunk/Makefile 2014-05-09 20:22:10 UTC (rev 23583) @@ -0,0 +1,30 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gnustep-make +VERSION = 2.6.6 +GARTYPE = v2 + +DESCRIPTION = GNUstep-core make +define BLURB + GNUstep-core make infrastructure and configuration files. Needed for all GNUstep setups. +endef + +BUILD_DEP_PKGS = CSWgmake CSWgcc4objc + +MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/core/ +DISTFILES = $(DISTNAME).tar.gz + +#we absolutely need GCC for Objective-C support. The only alternative in the future would be clang +GARCOMPILER = GNU + +#we have no tests anyway +SKIPTEST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-layout=gnustep +#CONFIGURE_ARGS += LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" +#CONFIGURE_ARGS += CPPFLAGS=-I/opt/csw/include + +include gar/category.mk + Property changes on: csw/mgar/pkg/gnustep-make/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gnustep-make/trunk/checksums =================================================================== --- csw/mgar/pkg/gnustep-make/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnustep-make/trunk/checksums 2014-05-09 20:22:10 UTC (rev 23583) @@ -0,0 +1 @@ +e9ddf251e31c54545e70b0521b73a48e gnustep-make-2.6.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Fri May 9 22:22:42 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Fri, 9 May 2014 20:22:42 +0000 Subject: SF.net SVN: gar:[23584] csw/mgar/pkg Message-ID: <3gQNJX0pvqz1Rv@mail.opencsw.org> Revision: 23584 http://sourceforge.net/p/gar/code/23584 Author: rmottola Date: 2014-05-09 20:22:40 +0000 (Fri, 09 May 2014) Log Message: ----------- gnustep-base/trunk: first version for gnustep base Added Paths: ----------- csw/mgar/pkg/gnustep-base/ csw/mgar/pkg/gnustep-base/Makefile csw/mgar/pkg/gnustep-base/branches/ csw/mgar/pkg/gnustep-base/tags/ csw/mgar/pkg/gnustep-base/trunk/ csw/mgar/pkg/gnustep-base/trunk/Makefile csw/mgar/pkg/gnustep-base/trunk/checksums csw/mgar/pkg/gnustep-base/trunk/files/ Added: csw/mgar/pkg/gnustep-base/Makefile =================================================================== --- csw/mgar/pkg/gnustep-base/Makefile (rev 0) +++ csw/mgar/pkg/gnustep-base/Makefile 2014-05-09 20:22:40 UTC (rev 23584) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gnustep-base/trunk =================================================================== --- csw/mgar/pkg/gnustep-base/trunk 2014-05-09 20:22:10 UTC (rev 23583) +++ csw/mgar/pkg/gnustep-base/trunk 2014-05-09 20:22:40 UTC (rev 23584) Property changes on: csw/mgar/pkg/gnustep-base/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gnustep-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-base/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-05-09 20:22:40 UTC (rev 23584) @@ -0,0 +1,45 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gnustep-base +VERSION = 1.24.6 +GARTYPE = v2 + +DESCRIPTION = GNUstep-core base +define BLURB + GNUstep-core base framework, which provides all Foundation equivalent classes, useful for all non-gui objective-c development. A prerequisite for all GNUstep tools as well as applications. +endef + +BUILD_DEP_PKGS = CSWgmake CSWgcc4objc CSWlibgnutls-dev CSWlibffi-dev CSWlibicu-dev +DEP_PKGS = CSWgnustep-make CSWlibgnutls28 CSWlibssl1-0-0 CSWlibffi5 CSWlibicuuc52 + +MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/core/ +DISTFILES = $(DISTNAME).tar.gz + +#we absolutely need GCC for Objective-C support. The only alternative in the future would be clang +GARCOMPILER = GNU + +#we disable linker maps (needed for gnutls) +LINKER_MAPS = + +# now special targets for configure, build and install so that we can source +# GNUstep.sh before +CONFIGURE_SCRIPTS = sourcegs +BUILD_SCRIPTS = sourcegs +INSTALL_SCRIPTS = sourcegs + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +configure-sourcegs: + . /opt/csw/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) ; $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +build-sourcegs: + . /opt/csw/System/Library/Makefiles/GNUstep.sh && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -C $(OBJDIR) + @$(MAKECOOKIE) + +install-sourcegs: + . /opt/csw/System/Library/Makefiles/GNUstep.sh && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -C $(OBJDIR) install + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gnustep-base/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gnustep-base/trunk/checksums =================================================================== --- csw/mgar/pkg/gnustep-base/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnustep-base/trunk/checksums 2014-05-09 20:22:40 UTC (rev 23584) @@ -0,0 +1 @@ +02e45ae9a7e5e75bf32cc1a6e8381bc1 gnustep-base-1.24.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 9 23:08:50 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 9 May 2014 21:08:50 +0000 Subject: SF.net SVN: gar:[23585] csw/mgar/pkg/gnustep-base/trunk/Makefile Message-ID: <3gQPKj2PN4z6J@mail.opencsw.org> Revision: 23585 http://sourceforge.net/p/gar/code/23585 Author: dmichelsen Date: 2014-05-09 21:08:50 +0000 (Fri, 09 May 2014) Log Message: ----------- gnustep-base/trunk: Invoke make in the working directory Modified Paths: -------------- csw/mgar/pkg/gnustep-base/trunk/Makefile Modified: csw/mgar/pkg/gnustep-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-05-09 20:22:40 UTC (rev 23584) +++ csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-05-09 21:08:50 UTC (rev 23585) @@ -37,9 +37,9 @@ @$(MAKECOOKIE) build-sourcegs: - . /opt/csw/System/Library/Makefiles/GNUstep.sh && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -C $(OBJDIR) + . /opt/csw/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) @$(MAKECOOKIE) install-sourcegs: - . /opt/csw/System/Library/Makefiles/GNUstep.sh && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -C $(OBJDIR) install + . /opt/csw/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) install @$(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 Fri May 9 23:50:52 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 9 May 2014 21:50:52 +0000 Subject: SF.net SVN: gar:[23586] csw/mgar/pkg/spamassassin/trunk Message-ID: <3gQQGF1v4HzHs@mail.opencsw.org> Revision: 23586 http://sourceforge.net/p/gar/code/23586 Author: bonivart Date: 2014-05-09 21:50:52 +0000 (Fri, 09 May 2014) Log Message: ----------- spamassassin/trunk: update to 3.4.0 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2014-05-09 21:08:50 UTC (rev 23585) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2014-05-09 21:50:52 UTC (rev 23586) @@ -1,6 +1,6 @@ NAME = spamassassin SPKG_NAME = Mail-SpamAssassin -VERSION = 3.3.2 +VERSION = 3.4.0 GARTYPE = v2 DESCRIPTION = Mail filter with a wide range of tests @@ -21,8 +21,7 @@ RUNTIME_DEP_PKGS += CSWpm-dbi RUNTIME_DEP_PKGS += CSWpm-html-parser RUNTIME_DEP_PKGS += CSWpm-io-socket-inet6 -RUNTIME_DEP_PKGS += CSWpmiozlib -RUNTIME_DEP_PKGS += CSWpmipcountry +RUNTIME_DEP_PKGS += CSWpm-io-zlib RUNTIME_DEP_PKGS += CSWpm-ldap RUNTIME_DEP_PKGS += CSWpm-libwww-perl RUNTIME_DEP_PKGS += CSWpmmaildkim @@ -91,13 +90,14 @@ CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-io-socket-inet6 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailtools CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-libwww-perl -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiozlib -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmipcountry +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-io-zlib CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-uri CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-net-dns include gar/category.mk +PATH:=/opt/csw/gnu:$(PATH) + configure-custom: @echo " ==> Configuring $(NAME) (custom)" @( cd $(WORKSRC) ; \ @@ -113,7 +113,7 @@ test-custom: @echo " ==> Testing $(NAME) (custom)" @( cd $(WORKSRC) ; \ - gmake test ) + $(BUILD_ENV) gmake test ) @$(MAKECOOKIE) install-custom: @@ -141,6 +141,7 @@ mv v310.pre v310.pre.CSW ; \ mv v312.pre v312.pre.CSW ; \ mv v330.pre v330.pre.CSW ; \ + mv v340.pre v340.pre.CSW ; \ mv v320.pre v320.pre.CSW ) @rm -rf $(DESTDIR)/opt/csw/lib @$(MAKECOOKIE) Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2014-05-09 21:08:50 UTC (rev 23585) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2014-05-09 21:50:52 UTC (rev 23586) @@ -1 +1 @@ -d1d62cc5c6eac57e88c4006d9633b81e Mail-SpamAssassin-3.3.2.tar.gz +5d0b50cee3bfa905cca35c33296c8c2a Mail-SpamAssassin-3.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 10 11:31:52 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 May 2014 09:31:52 +0000 Subject: SF.net SVN: gar:[23587] csw/mgar/pkg/gpgme/trunk/Makefile Message-ID: <3gQjq44qRZzlx@mail.opencsw.org> Revision: 23587 http://sourceforge.net/p/gar/code/23587 Author: wahwah Date: 2014-05-10 09:31:52 +0000 (Sat, 10 May 2014) Log Message: ----------- gpgme/trunk: Remove unnecessary lines Modified Paths: -------------- csw/mgar/pkg/gpgme/trunk/Makefile Modified: csw/mgar/pkg/gpgme/trunk/Makefile =================================================================== --- csw/mgar/pkg/gpgme/trunk/Makefile 2014-05-09 21:50:52 UTC (rev 23586) +++ csw/mgar/pkg/gpgme/trunk/Makefile 2014-05-10 09:31:52 UTC (rev 23587) @@ -33,7 +33,6 @@ PACKAGES += CSWlibgpgme-pthread11 CATALOGNAME_CSWlibgpgme-pthread11 = libgpgme_pthread11 -PKGFILES_CSWlibgpgme-pthread11 += $(call baseisadirs,$(libdir),libgpgme-pthread\.so\.11\.11\.0) PKGFILES_CSWlibgpgme-pthread11 += $(call baseisadirs,$(libdir),libgpgme-pthread\.so\.11(\.\d+)*) SPKG_DESC_CSWlibgpgme-pthread11 += $(DESCRIPTION), libgpgme-pthread.so.11 RUNTIME_DEP_PKGS_CSWlibgpgme-pthread11 += CSWlibassuan0 @@ -42,7 +41,6 @@ PACKAGES += CSWlibgpgme11 CATALOGNAME_CSWlibgpgme11 = libgpgme11 -PKGFILES_CSWlibgpgme11 += $(call baseisadirs,$(libdir),libgpgme\.so\.11\.11\.0) PKGFILES_CSWlibgpgme11 += $(call baseisadirs,$(libdir),libgpgme\.so\.11(\.\d+)*) SPKG_DESC_CSWlibgpgme11 += $(DESCRIPTION), libgpgme.so.11 RUNTIME_DEP_PKGS_CSWlibgpgme11 += CSWlibassuan0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat May 10 13:09:14 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 10 May 2014 11:09:14 +0000 Subject: SF.net SVN: gar:[23588] csw/mgar/pkg/nicstat/trunk Message-ID: <3gQlzR51gRzw5@mail.opencsw.org> Revision: 23588 http://sourceforge.net/p/gar/code/23588 Author: bonivart Date: 2014-05-10 11:09:11 +0000 (Sat, 10 May 2014) Log Message: ----------- nicstat/trunk: update to 1.95 Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile csw/mgar/pkg/nicstat/trunk/checksums Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2014-05-10 09:31:52 UTC (rev 23587) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2014-05-10 11:09:11 UTC (rev 23588) @@ -1,5 +1,5 @@ NAME = nicstat -VERSION = 1.90 +VERSION = 1.95 GARTYPE = v2 WORKSRC = $(WORKDIR)/$(NAME)-src-$(VERSION) @@ -15,7 +15,7 @@ VENDOR_URL = http://blogs.oracle.com/timc/entry/nicstat_the_solaris_and_linux # Harmless build example not relevant to usage -CHECKPKG_OVERRIDES_CSWnicstat += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nicstat/README.txt +CHECKPKG_OVERRIDES_CSWnicstat += no-direct-binding|/opt/csw/bin/nicstat|is|not|directly|bound|to|soname|libkstat.so.1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/nicstat/trunk/checksums =================================================================== --- csw/mgar/pkg/nicstat/trunk/checksums 2014-05-10 09:31:52 UTC (rev 23587) +++ csw/mgar/pkg/nicstat/trunk/checksums 2014-05-10 11:09:11 UTC (rev 23588) @@ -1 +1 @@ -aebcc902fb5794c60d78b19b9e93752c nicstat-src-1.90.tar.gz +04d80ba376d1b503145ba631a1428b45 nicstat-src-1.95.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 Sat May 10 13:20:35 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 10 May 2014 11:20:35 +0000 Subject: SF.net SVN: gar:[23589] csw/mgar/pkg/memconf/trunk Message-ID: <3gQmDV1VbHz10q@mail.opencsw.org> Revision: 23589 http://sourceforge.net/p/gar/code/23589 Author: bonivart Date: 2014-05-10 11:20:31 +0000 (Sat, 10 May 2014) Log Message: ----------- memconf/trunk: update to 3.04 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2014-05-10 11:09:11 UTC (rev 23588) +++ csw/mgar/pkg/memconf/trunk/Makefile 2014-05-10 11:20:31 UTC (rev 23589) @@ -1,11 +1,12 @@ +# Delete source files first since they are not versioned +# rm /home/src/memconf* + NAME = memconf -VERSION = 3.02 +VERSION = 3.04 GARTYPE = v2 DESCRIPTION = Perl script that displays memory modules installed define BLURB - memconf reports the size of each SIMM/DIMM memory module installed in - a system. It also reports the system type and any empty memory sockets. endef MASTER_SITES = http://www.4schmidts.com/unix/ Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2014-05-10 11:09:11 UTC (rev 23588) +++ csw/mgar/pkg/memconf/trunk/checksums 2014-05-10 11:20:31 UTC (rev 23589) @@ -1,2 +1,2 @@ -11245b2536eeddf681003ca973421e4e memconf.gz -3e3e6b964502d00227b381704d0d5b72 memconf.man +849f366f3fa4064e498ddfaea86516e5 memconf.gz +4a8ea01482cd757fb63a3dd45b85d4e9 memconf.man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat May 10 13:35:13 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 10 May 2014 11:35:13 +0000 Subject: SF.net SVN: gar:[23590] csw/mgar/pkg/tnef/trunk Message-ID: <3gQmYN2whPz159@mail.opencsw.org> Revision: 23590 http://sourceforge.net/p/gar/code/23590 Author: bonivart Date: 2014-05-10 11:35:09 +0000 (Sat, 10 May 2014) Log Message: ----------- tnef/trunk: update to 1.4.10 Modified Paths: -------------- csw/mgar/pkg/tnef/trunk/Makefile csw/mgar/pkg/tnef/trunk/checksums Modified: csw/mgar/pkg/tnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/tnef/trunk/Makefile 2014-05-10 11:20:31 UTC (rev 23589) +++ csw/mgar/pkg/tnef/trunk/Makefile 2014-05-10 11:35:09 UTC (rev 23590) @@ -1,19 +1,14 @@ NAME = tnef -VERSION = 1.4.8 +VERSION = 1.4.10 GARTYPE = v2 DESCRIPTION = Unpacks Microsoft TNEF MIME attachments define BLURB - TNEF provides a way to unpack those pesky Microsoft MS-TNEF MIME attachments. - It operates like tar in order to upack any files which may have been put into - the MS-TNEF attachment instead of being attached seperately. endef MASTER_SITES = http://downloads.sourceforge.net/tnef/ DISTFILES = $(NAME)-$(VERSION).tar.gz -RUNTIME_DEP_PKGS_CSWtnef += CSWlibintl8 - CONFIGURE_ARGS = $(DIRPATHS) NOISALIST = 1 Modified: csw/mgar/pkg/tnef/trunk/checksums =================================================================== --- csw/mgar/pkg/tnef/trunk/checksums 2014-05-10 11:20:31 UTC (rev 23589) +++ csw/mgar/pkg/tnef/trunk/checksums 2014-05-10 11:35:09 UTC (rev 23590) @@ -1 +1 @@ -cc6443ac5f30913394c0c16ae7941e4f tnef-1.4.8.tar.gz +02e2b7a01aec686d4492f4aca33c083f tnef-1.4.10.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 Sat May 10 13:48:59 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 10 May 2014 11:48:59 +0000 Subject: SF.net SVN: gar:[23591] csw/mgar/pkg/tnef/trunk/Makefile Message-ID: <3gQmsG6x95z18c@mail.opencsw.org> Revision: 23591 http://sourceforge.net/p/gar/code/23591 Author: bonivart Date: 2014-05-10 11:48:57 +0000 (Sat, 10 May 2014) Log Message: ----------- tnef/trunk: sparc needs a dep Modified Paths: -------------- csw/mgar/pkg/tnef/trunk/Makefile Modified: csw/mgar/pkg/tnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/tnef/trunk/Makefile 2014-05-10 11:35:09 UTC (rev 23590) +++ csw/mgar/pkg/tnef/trunk/Makefile 2014-05-10 11:48:57 UTC (rev 23591) @@ -9,6 +9,8 @@ MASTER_SITES = http://downloads.sourceforge.net/tnef/ DISTFILES = $(NAME)-$(VERSION).tar.gz +RUNTIME_DEP_PKGS_CSWtnef += CSWlibintl8 + CONFIGURE_ARGS = $(DIRPATHS) NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat May 10 14:00:56 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 10 May 2014 12:00:56 +0000 Subject: SF.net SVN: gar:[23592] csw/mgar/pkg/tnef/trunk/Makefile Message-ID: <3gQn733W1kz1Cx@mail.opencsw.org> Revision: 23592 http://sourceforge.net/p/gar/code/23592 Author: bonivart Date: 2014-05-10 12:00:55 +0000 (Sat, 10 May 2014) Log Message: ----------- tnef/trunk: i386 needs an override Modified Paths: -------------- csw/mgar/pkg/tnef/trunk/Makefile Modified: csw/mgar/pkg/tnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/tnef/trunk/Makefile 2014-05-10 11:48:57 UTC (rev 23591) +++ csw/mgar/pkg/tnef/trunk/Makefile 2014-05-10 12:00:55 UTC (rev 23592) @@ -9,7 +9,9 @@ MASTER_SITES = http://downloads.sourceforge.net/tnef/ DISTFILES = $(NAME)-$(VERSION).tar.gz +# Only Sparc needs this dep RUNTIME_DEP_PKGS_CSWtnef += CSWlibintl8 +CHECKPKG_OVERRIDES_CSWtnef += surplus-dependency|CSWlibintl8 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat May 10 14:50:44 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 10 May 2014 12:50:44 +0000 Subject: SF.net SVN: gar:[23593] csw/mgar/pkg/phpsysinfo/trunk Message-ID: <3gQpDX24Wcz1JN@mail.opencsw.org> Revision: 23593 http://sourceforge.net/p/gar/code/23593 Author: bonivart Date: 2014-05-10 12:50:43 +0000 (Sat, 10 May 2014) Log Message: ----------- phpsysinfo/trunk: update to 3.1.12 Modified Paths: -------------- csw/mgar/pkg/phpsysinfo/trunk/Makefile csw/mgar/pkg/phpsysinfo/trunk/checksums Modified: csw/mgar/pkg/phpsysinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/Makefile 2014-05-10 12:00:55 UTC (rev 23592) +++ csw/mgar/pkg/phpsysinfo/trunk/Makefile 2014-05-10 12:50:43 UTC (rev 23593) @@ -1,10 +1,9 @@ NAME = phpsysinfo -VERSION = 3.0.11 +VERSION = 3.1.12 GARTYPE = v2 DESCRIPTION = Displays information about the host being accessed define BLURB - Displays information about the host being accessed endef SF_PROJECT = $(NAME) @@ -28,14 +27,14 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -WORKSRC = $(WORKDIR)/$(NAME) +EXTRA_MERGE_EXCLUDE_FILES += .*/.git/.* .*/.git .*/.gitignore -SAMPLECONF = .*config.php +SAMPLECONF = .*phpsysinfo.ini CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWap2modphp5 CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWphpsysinfo += file-with-bad-content|/usr/local|root/opt/csw/share/www/phpsysinfo/includes/class.CommonFunctions.inc.php +CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWphp5-mbstring include gar/category.mk @@ -46,8 +45,6 @@ @ginstall -d $(DESTDIR)$(prefix)/share/www @cp -R $(WORKSRC) $(DESTDIR)$(prefix)/share/www/phpsysinfo @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo ; \ - mv config.php.new config.php ; \ + mv phpsysinfo.ini.new phpsysinfo.ini ; \ mv COPYING $(DESTDIR)$(docdir)/$(NAME)/license ) -# @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo/includes/os ; \ -# gpatch < ../../../../../../../../../$(FILEDIR)/CSWphpsysinfo.class.SunOS.inc.php.p ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/phpsysinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/checksums 2014-05-10 12:00:55 UTC (rev 23592) +++ csw/mgar/pkg/phpsysinfo/trunk/checksums 2014-05-10 12:50:43 UTC (rev 23593) @@ -1 +1 @@ -e07b4bc9da80466bee9bf9ee4bea727b phpsysinfo-3.0.11.tar.gz +accfbc92041dfbb0f28d7dc96af6f56c phpsysinfo-3.1.12.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 Sat May 10 20:25:53 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 10 May 2014 18:25:53 +0000 Subject: SF.net SVN: gar:[23594] csw/mgar/pkg/phpsysinfo/trunk/Makefile Message-ID: <3gQxgF55GWz9s@mail.opencsw.org> Revision: 23594 http://sourceforge.net/p/gar/code/23594 Author: bonivart Date: 2014-05-10 18:25:52 +0000 (Sat, 10 May 2014) Log Message: ----------- phpsysinfo/trunk: change dep name och add another dep Modified Paths: -------------- csw/mgar/pkg/phpsysinfo/trunk/Makefile Modified: csw/mgar/pkg/phpsysinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/Makefile 2014-05-10 12:50:43 UTC (rev 23593) +++ csw/mgar/pkg/phpsysinfo/trunk/Makefile 2014-05-10 18:25:52 UTC (rev 23594) @@ -16,9 +16,10 @@ SPKG_SOURCEURL = http://phpsysinfo.sourceforge.net RUNTIME_DEP_PKGS = CSWapache2 -RUNTIME_DEP_PKGS += CSWap2modphp5 +RUNTIME_DEP_PKGS += CSWap2-modphp5 RUNTIME_DEP_PKGS += CSWphp5 RUNTIME_DEP_PKGS += CSWphp5-mbstring +RUNTIME_DEP_PKGS += CSWphp5-dom ARCHALL = 1 @@ -32,9 +33,10 @@ SAMPLECONF = .*phpsysinfo.ini CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWphp5 -CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWap2modphp5 +CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWap2-modphp5 CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWphp5-mbstring +CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWphp5-dom 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 Sun May 11 17:51:48 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 11 May 2014 15:51:48 +0000 Subject: SF.net SVN: gar:[23595] csw/mgar/gar/v2/bin/cswch Message-ID: <3gRVCP0c4jzs0@mail.opencsw.org> Revision: 23595 http://sourceforge.net/p/gar/code/23595 Author: guengel Date: 2014-05-11 15:51:47 +0000 (Sun, 11 May 2014) Log Message: ----------- bin/cswch: * Paragraph can now be plain or 'itemized' (starting with ' *'). * Added new class ChangeLogFile. * New changelog files will be scheduled for commit when containing directory is svn working directory. * command line argument '--log-item' is used to add itemized paragraphs. * command line argument '--log-plain' is used to add plain paragraphs. * command line argument '--no-svn' prevents new changelog files to be added to svn. * new command 'update' allows to add paragraphs to the latest changelog entry. Modified Paths: -------------- csw/mgar/gar/v2/bin/cswch Modified: csw/mgar/gar/v2/bin/cswch =================================================================== --- csw/mgar/gar/v2/bin/cswch 2014-05-10 18:25:52 UTC (rev 23594) +++ csw/mgar/gar/v2/bin/cswch 2014-05-11 15:51:47 UTC (rev 23595) @@ -21,13 +21,15 @@ import datetime import dateutil.tz import email.utils +import logging import os import pwd +import pysvn import re import sys import time import unittest -import logging +import errno ### T E S T S ### @@ -90,7 +92,7 @@ class TestChangeLogParagraph(unittest.TestCase): """Test ChangeLogParagraph.""" - def test_init_single_line(self): + def test_init_single_line_bullet(self): """initialize ChangeLog paragraph with one line""" line = ' * Lorem ipsum dolor sit amet, consectetur adipiscing' chpg = ChangeLogParagraph(line) @@ -98,7 +100,38 @@ self.assertEqual('Lorem ipsum dolor sit amet, consectetur adipiscing', repr(chpg)) - def test_newline_handling(self): + def test_init_single_line_plain(self): + """initialize ChangeLog paragraph with one line""" + line = ' Lorem ipsum dolor sit amet, consectetur adipiscing' + chpg = ChangeLogParagraph(line) + self.assertEqual(line, str(chpg)) + self.assertEqual('Lorem ipsum dolor sit amet, consectetur adipiscing', + repr(chpg)) + + def test_line_add_bullet(self): + """Test adding a new line to an existing paragraph""" + line = " * short line" + chpg = ChangeLogParagraph(line) + + chpg.add_line("and another line appended") + + self.assertEqual('short line and another line appended', repr(chpg)) + self.assertEqual(' * short line and another line appended', + str(chpg)) + + def test_line_add_plain(self): + """Test adding a new line to an existing paragraph""" + line = " short line" + chpg = ChangeLogParagraph(line) + + chpg.add_line("and another line appended") + + self.assertEqual('short line and another line appended', repr(chpg)) + self.assertEqual(' short line and another line appended', + str(chpg)) + + + def test_newline_handling_bullet(self): """test newline handling of ChangeLogParagraph""" lines = """ * Lorem ipsum dolor sit amet, consectetur adipiscing""" @@ -106,10 +139,18 @@ self.assertEqual(' * Lorem ipsum dolor sit amet, consectetur adipiscing', str(chpg)) self.assertEqual('Lorem ipsum dolor sit amet, consectetur adipiscing', repr(chpg)) + def test_newline_handling_plain(self): + """test newline handling of ChangeLogParagraph""" + lines = """ Lorem ipsum dolor sit amet, + consectetur adipiscing""" + chpg = ChangeLogParagraph(lines) + self.assertEqual(' Lorem ipsum dolor sit amet, consectetur adipiscing', str(chpg)) + self.assertEqual('Lorem ipsum dolor sit amet, consectetur adipiscing', repr(chpg)) + def test_init_from_multiple_lines(self): """Test initialization from multiple lines""" - lines = ['Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent posuere est a pellentesque imperdiet.', + lines = [' * Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent posuere est a pellentesque imperdiet.', 'Vivamus dapibus enim eu magna vehicula posuere. Pellentesque adipiscing purus id diam auctor gravida. Sed leo odio,', 'molestie quis ante sed, commodo consequat nulla. Vivamus interdum vel lorem eget faucibus. Suspendisse dignissim orci sit amet dolor venenatis convallis.', 'Suspendisse fringilla tortor vitae dolor blandit ullamcorper. Cras sed mauris eu lorem scelerisque blandit quis vel mauris. Nam a urna aliquet, cursus erat a, fermentum justo. Sed hendrerit dui magna, ac tempus est vestibulum at.', @@ -132,6 +173,30 @@ self.assertEqual(formatted, str(chpg)) +class TestChangeLogEntry(unittest.TestCase): + """Test ChangeLogEntry class""" + + def test_entry(self): + """Test a simple changelog entry""" + clg_entry = ChangeLogEntry() + clg_header = ChangeLogHeader(package='cswch', version='0.1') + clg_paragraph1 = ChangeLogParagraph(" * One Line") + clg_paragraph2 = ChangeLogParagraph(" * Two Lines") + clg_footer = ChangeLogFooter() + + clg_entry.add_header(clg_header) + clg_entry.add_footer(clg_footer) + clg_entry.add_paragraph(clg_paragraph1) + clg_entry.add_paragraph(clg_paragraph2) + + expected_string = str(clg_header) + '\n\n' +\ + str(clg_paragraph1) + '\n\n' +\ + str(clg_paragraph2) + '\n\n' +\ + str(clg_footer) + '\n\n\n' + + self.assertEqual(expected_string, str(clg_entry)) + + ### C O D E ### class GarbledChangeLogHeader(Exception): @@ -168,6 +233,24 @@ return str(self) +class EmptyChangeLogFile(Exception): + """Empty ChangeLog File + + Raised if operation expect existing entries in the ChangeLog File + but none is found. + + """ + def __init__(self, filename): + super(EmptyChangeLogFile, self).__init__() + self.filename = filename + + def __str__(self): + return "Empty ChangeLog: %s" % (self.filename,) + + def __repr__(self): + return str(self) + + class ChangeLogHeader(object): """Constitutes a changelog header. @@ -207,8 +290,8 @@ def __str__(self): """Get the ChangeLog header""" return ChangeLogHeader.format_str % {'package': self.package, - 'version': self.version, - 'rev': self.rev} + 'version': self.version, + 'rev': self.rev} def parse_line(self, line): """Parse ChangeLog header @@ -301,7 +384,7 @@ The proper format is a timestamp in the format specified in RFC 2822. - :param dt: datetime object or none, in which case the current time + :param date_obj: datetime object or none, in which case the current time will be taken. """ @@ -340,6 +423,15 @@ [two spaces]* change details more change details + + or + + [two spaces]line1 + line2 + + The first line added is analyzed to find out which type of + paragraph we're dealing with. + """ def __init__(self, *args, **kwargs): """Initialize ChangeLog paragraph. @@ -355,10 +447,24 @@ else: self.maxcol = 72 + # will be set according to the style of the first line + self.bullet_style = False + self.paragraph = "" + [self.add_line(l) for l in args] + + def add_line(self, line): + """Add another line to the paragraph""" + + # Analyze the first line in order to find out the type of + # paragraph, i.e. bullet style or plain style + if self.paragraph == "" and ChangeLogParagraph.sanitize_re_c.match(line): + # it's a bullet style paragraph + self.bullet_style = True + # Get rid of all leading '\s+\*?\s+' and concatenate all # arguments. - self.paragraph = " ".join([ChangeLogParagraph.sanitize_re_c.sub("", l) for l in args]) + self.paragraph = " ".join([self.paragraph, ChangeLogParagraph.sanitize_re_c.sub("", line)]) # Some sanitation self.paragraph = self.paragraph.strip() @@ -371,20 +477,30 @@ def __str__(self): words = self.paragraph.split() - # line length starts at 4, because we have to take ' * ' into - # account for the first line. - line_len = 4 - formatted_paragraph = ' * ' + if self.bullet_style: + # line length starts at 4, because we have to take ' * ' into + # account for the first line. + line_indent = 4 + continuation_indent = 4 + formatted_paragraph = ' * ' + else: + line_indent = 2 + continuation_indent = 2 + formatted_paragraph = ' ' + + line_length = line_indent + for word in words: - if len(word) + line_len <= self.maxcol: + if len(word) + line_length < self.maxcol: formatted_paragraph = formatted_paragraph + word + ' ' - line_len = line_len + len(word) + 1 + line_length = line_length + len(word) + 1 else: # chop off the last space formatted_paragraph = formatted_paragraph.rstrip() # add newline and reset line length counter - formatted_paragraph = formatted_paragraph + '\n ' + word + ' ' - line_len = 5 + len(word) + formatted_paragraph = formatted_paragraph + '\n' +\ + ' ' * continuation_indent + word + ' ' + line_length = continuation_indent + len(word) formatted_paragraph = formatted_paragraph.rstrip() return formatted_paragraph @@ -403,8 +519,19 @@ """ - def __init__(self): - self.paragaphs = list() + def __init__(self, *args): + if len(args) == 3: + assert len(args) == 3 + assert isinstance(args[0], ChangeLogHeader) + assert isinstance(args[1], list) + assert isinstance(args[2], ChangeLogFooter) + self.header = args[0] + self.paragraphs = args[1] + self.footer = args[2] + else: + self.header = None + self.footer = None + self.paragraphs = list() def add_header(self, cl_header): """Add a ChangeLog Entry header. @@ -424,7 +551,7 @@ assert cl_footer is not None self.footer = cl_footer - def add_paragraph(self, cl_paragraph, infront=True): + def add_paragraph(self, cl_paragraph, infront=False): """Add a ChangeLog Entry paragraph. Add another ChangeLog Entry paragraph. @@ -436,7 +563,7 @@ assert cl_paragraph is not None if infront: - self.paragraphs.insert(0, cl_pargraph) + self.paragraphs.insert(0, cl_paragraph) else: self.paragraphs.append(cl_paragraph) @@ -452,131 +579,238 @@ return chlogp def __str__(self): - pass + return str(self.header) + '\n\n' +\ + "\n\n".join([str(paragraph) for paragraph in + self.paragraphs]) + '\n\n' +\ + str(self.footer) + '\n\n\n' -def slurpin_changelog(filename): - """Load existing changelog""" +class ChangeLogFile(object): + """A ChangeLog file""" - with open(filename, "r") as fobj: - changelog_entries = list() - paragraph = list() + def __init__(self, filename): + self.filename = filename + self.changelog_entries = list() - only_whitespace_re = re.compile(r'^\s+$') - entry_start_re = re.compile(r'^[\w\d\.=(),]+') + def read(self): + changelog_entry = None + current_paragraph = None + with open(self.filename, "r") as fobj: + only_whitespace_re = re.compile(r'^\s+$') + entry_start_re = re.compile(r'^[\w\d\.=(),]+') - for line in fobj: - line = line.rstrip('\n') + for line in fobj: + line = line.rstrip('\n') - if only_whitespace_re.match(line) or line == "": - continue + if only_whitespace_re.match(line) or line == "": + if current_paragraph is not None: + # This ends the current paragraph + changelog_entry.add_paragraph(current_paragraph) + current_paragraph = None - # is it the start of an entry? - if entry_start_re.match(line): - entry_dict = {'header': ChangeLogHeader(line=line)} - continue + continue - # is it the footer, and thus marks the end of a entry? - if line.startswith(' -- '): - # is there a paragraph pending? - if len(paragraph) > 0: - # add that paragraph to the dict and start a new - # one - if 'paragraphs' in entry_dict: - entry_dict['paragraphs'].append(ChangeLogParagraph(*paragraph)) - else: - entry_dict['paragraphs'] = [ChangeLogParagraph(*paragraph)] - paragraph = list() + # is it the start of an entry? + if entry_start_re.match(line): + assert changelog_entry is None - entry_dict['footer'] = ChangeLogFooter(line=line) - # append to the list - changelog_entries.append(entry_dict) - continue + changelog_entry = ChangeLogEntry() + changelog_entry.add_header(ChangeLogHeader(line=line)) + continue - # is it the start of an entry paragraph? - if line.startswith(' * '): - # is the first item of the paragraph list a paragraph - # start? - if len(paragraph) > 0 and paragraph[0].startswith(' * '): - # add that paragraph to the dict and start a new - # one - if 'paragraphs' in entry_dict: - entry_dict['paragraphs'].append(ChangeLogParagraph(*paragraph)) - else: - entry_dict['paragraphs'] = [ChangeLogParagraph(*paragraph)] + # is it the footer, and thus marks the end of a entry? + if line.startswith(' -- '): + # is there a paragraph pending? + if current_paragraph is not None: + changelog_entry.add_paragraph(current_paragraph) - paragraph = [line] - continue + changelog_entry.add_footer(ChangeLogFooter(line=line)) + # append entry to the list + self.changelog_entries.append(changelog_entry) - # It's not, the start, end, or start of entry paragraph, - # thus it must be a continuation of a paragraph - paragraph.append(line) + changelog_entry = None + current_paragraph = None + continue - return changelog_entries + if current_paragraph is None: + current_paragraph = ChangeLogParagraph(line) + else: + current_paragraph.add_line(line) + def save(self): + """Save ChangeLog entries to file""" + with open(self.filename, 'w') as fobj: + [fobj.write(str(changelog_entry)) for changelog_entry in + self.changelog_entries] -def dump_entries(filename, entries): - with open(filename, 'w') as fobj: - for entry in entries: - fobj.write(str(entry['header'])) - fobj.write('\n\n') - for paragraph in entry['paragraphs']: - fobj.write(str(paragraph)) - fobj.write('\n\n') - fobj.write(str(entry['footer'])) - fobj.write('\n\n') + def versions(self): + """Return a list of all versions in the ChangeLog file""" + if (len(self.changelog_entries) < 1): + return None + return [changelog_entry.header.version for changelog_entry in + self.changelog_entries] + + def count_entries(self): + """Return the number of ChangeLog entries""" + return len(self.changelog_entries) + + def get_package(self): + """Get the package name + + Package name is returned as defined by the first entry of the + ChangeLog file. + + """ + if len(self.changelog_entries) < 1: + return "" + + return self.changelog_entries[0].header.package + + def add_entry(self, *args): + """Add an entry to the ChangeLog. + + If only one argument is passed, it has to be a + ChangeLogEntry. Else three arguments are expected, which have + to be of the type ChangeLogHeader, ChangeLogParagraphs list, + ChangeLogFooter + + """ + if len(args) == 1: + assert args[0] is ChangeLogEntry + changelog_entry = args[0] + else: + assert len(args) == 3 + assert isinstance(args[0], ChangeLogHeader) + assert isinstance(args[1], list) + assert isinstance(args[2], ChangeLogFooter) + changelog_entry = ChangeLogEntry(args[0], args[1], + args[2]) + + self.changelog_entries.insert(0, changelog_entry) + + def create(self, *args): + """Create a new ChangeLog file + + Create a new ChangeLog file. Any existing entries will be + overwritten. + + """ + + self.changelog_entries = list() + self.add_entry(*args) + self.save() + + def update_latest(self, paragraph): + """Add paragraph(s) to the latest entry. + + :param paragraph: can be a list of ChangeLogParagraph or a + single ChangeLogParagrph. + + """ + + assert len(self.changelog_entries) > 0 + + if paragraph is list: + [self.changelog_entries[0].add_paragraph(par, True) for par + in paragraph] + else: + self.changelog_entries[0].add_paragraph(paragraph, True) + + latest_header = self.changelog_entries[0].header + latest_header.rev = ChangeLogHeader.opencsw_rev() + self.changelog_entries[0].add_header(latest_header) + self.changelog_entries[0].add_footer(ChangeLogFooter()) + + + def svn_add(self): + """Add file to svn repository + + Has only effect if the directory is a subversion working + directory. Else it does nothing. + + """ + assert len(self.changelog_entries) > 0 + + # First of all, make sure the file exists + if not os.path.exists(self.filename): + raise OSError((errno.ENOENT, 'No such file: %s' % self.filename)) + + svnclient = pysvn.Client() + + # see if directory holding the file is part of a SVN + # repo + directory = os.path.dirname(self.filename) + if directory == "": + directory = './' + + try: + svnentry = svnclient.info(directory) + except pysvn.ClientError: + # Most likely it is not a working directory, so we bail out + logging.warning("'%s' is not a SVN working directory. Cannot add file '%s'.", + directory, self.filename) + return + + svnclient.add([self.filename]) + logging.info("Scheduled file '%s' for addition to SVN repository", self.filename) + + def new_changelog_entry(filename, version, log): - existing_entries = slurpin_changelog(filename) + changelog_file = ChangeLogFile(filename) + changelog_file.read() - assert len(existing_entries) > 0 + if changelog_file.versions() is None: + raise EmptyChangeLogFile(filename) # get the package from the first entry - package = existing_entries[0]['header'].package + package = changelog_file.get_package() header = ChangeLogHeader(package=package, version=version) paragraphs = [ChangeLogParagraph(log_para) for log_para in log] footer = ChangeLogFooter() - existing_entries.insert(0, {'header': header, - 'paragraphs': paragraphs, - 'footer': footer}) + changelog_file.add_entry(header, paragraphs, footer) + changelog_file.save() - dump_entries(filename, existing_entries) +def update_changelog_entry(filename, log): + changelog_file = ChangeLogFile(filename) + changelog_file.read() + if changelog_file.versions() is None: + raise EmptyChangeLogFile(filename) -def create_changelog_file(filename, overwrite, package, version, log): - chlg_header = ChangeLogHeader(package=package, + [changelog_file.update_latest(ChangeLogParagraph(l)) for l in + log] + changelog_file.save() + +def create_changelog_file(filename, overwrite, package, version, log, register_svn): + header = ChangeLogHeader(package=package, version=version) - chlg_footer = ChangeLogFooter() - chlg_paragraphs = [ChangeLogParagraph(log_para) for log_para in log] + footer = ChangeLogFooter() + paragraphs = [ChangeLogParagraph(log_para) for log_para in log] - if os.access(filename, os.F_OK) and not overwrite: + if os.path.exists(filename) and not overwrite: logging.error("Changelog '%s' already exists. Won't overwrite", filename) sys.exit(1) - with open(filename,'w+') as fobj: - fobj.write(str(chlg_header)) - fobj.write('\n\n') - for paragraph in chlg_paragraphs: - fobj.write(str(paragraph)) - fobj.write('\n\n') - fobj.write(str(chlg_footer)) - fobj.write('\n\n') + changelog_file = ChangeLogFile(filename) + changelog_file.create(header, paragraphs, footer) + if (register_svn): + changelog_file.svn_add() def get_version(logfile, allversions): - chlg_entries = slurpin_changelog(logfile) + changelog_file = ChangeLogFile(logfile) + changelog_file.read() if allversions: - for entry in chlg_entries: - print entry['header'].version + print("\n".join(changelog_file.versions())) else: - print chlg_entries[0]['header'].version + print(changelog_file.versions()[0]) - def cmdline_parse(): """Parse the command line @@ -596,21 +830,40 @@ help="package name") parser_create.add_argument('version', help="package version") - parser_create.add_argument('--log', - help="the log entry", - nargs='+') + parser_create.add_argument('--log-item', + help="the log entry to be recorded as list item", + nargs='*') + parser_create.add_argument('--log-paragraph', + help="the log entry to be recorded as plain paragraph", + nargs='*') parser_create.add_argument('--force', help="force creation of file. Overwrite existing file.", default=False, action='store_const', const=True) + parser_create.add_argument('--no-svn', help="Do not add file to SVN repository.", + default=False, action='store_const', + const=True) parser_new = subparser.add_parser('new', help="new changelog entry") parser_new.add_argument('version', help="new version") - parser_new.add_argument('--log', - help="the log entry", - nargs='+') + parser_new.add_argument('--log-item', + help="the log entry to be recorded as list item", + nargs='*') + parser_new.add_argument('--log-paragraph', + help="the log entry to be recorded as plain paragraph", + nargs='*') + + parser_update = subparser.add_parser('update', + help="update the latest changelog entry") + parser_update.add_argument('--log-item', + help="the log entry to be recorded as list item", + nargs='*') + parser_update.add_argument('--log-paragraph', + help="the log entry to be recorded as plain paragraph", + nargs='*') + parser_version = subparser.add_parser('version', help="retrieve version from changelog.CSW") parser_version.add_argument('--all-versions', @@ -620,29 +873,52 @@ parser_test = subparser.add_parser('test', help="test cswch") - return parser.parse_args() + arguments = parser.parse_args() + if arguments.command in ['create', 'new', 'update'] and\ + arguments.log_paragraph is None and\ + arguments.log_item is None: + parser.error("'%s' requires either '--log-paragraph' or '--log-item'" % arguments.command) + return arguments + +def compile_log(logitem, logparagraph): + log = list() + if logitem: + log = [' * ' + item for item in logitem] + + if logparagraph: + log.extend(logparagraph) + + return log + + if __name__ == '__main__': - cmdline = cmdline_parse() + arguments = cmdline_parse() - if cmdline.command == "test": + if arguments.command == "test": # cheat unittest into thinking that there are no command line # arguments. del sys.argv[1:] unittest.main() - if cmdline.command == "create": - create_changelog_file(cmdline.logfile, - cmdline.force, - cmdline.package, - cmdline.version, - cmdline.log) + if arguments.command == "create": + log = compile_log(arguments.log_item, arguments.log_paragraph) + create_changelog_file(arguments.logfile, + arguments.force, + arguments.package, + arguments.version, + log, + not arguments.no_svn) - if cmdline.command == "new": - new_changelog_entry(cmdline.logfile, - cmdline.version, - cmdline.log) + if arguments.command == "new": + log = compile_log(arguments.log_item, arguments.log_paragraph) + new_changelog_entry(arguments.logfile, + arguments.version, + log) - if cmdline.command == "version": - get_version(cmdline.logfile, cmdline.all_versions) + if arguments.command == "update": + update_changelog_entry(arguments.logfile, log) + + if arguments.command == "version": + get_version(arguments.logfile, arguments.all_versions) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun May 11 18:26:31 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 11 May 2014 16:26:31 +0000 Subject: SF.net SVN: gar:[23596] csw/mgar/pkg/gtk2/trunk Message-ID: <3gRVz53tllz12w@mail.opencsw.org> Revision: 23596 http://sourceforge.net/p/gar/code/23596 Author: guengel Date: 2014-05-11 16:26:30 +0000 (Sun, 11 May 2014) Log Message: ----------- gtk2/trunk: Use the proper cache file for IM modules. Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall Added Paths: ----------- csw/mgar/pkg/gtk2/trunk/files/changelog.CSW Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2014-05-11 15:51:47 UTC (rev 23595) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2014-05-11 16:26:30 UTC (rev 23596) @@ -34,8 +34,6 @@ PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch -PATCHFILES += 0001-Add-update-modules-cmd-line-option.patch - PATCHFILES += 0003-Adjust-hardcoded-path-to-opt-csw-share.patch PATCHFILES += 0004-Initialize-pap_status_t-with-PAPI_OK-instead-of-NULL.patch Modified: csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2014-05-11 15:51:47 UTC (rev 23595) +++ csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2014-05-11 16:26:30 UTC (rev 23596) @@ -41,9 +41,9 @@ echo "** Done Updating Icon cache" BIN=gtk-query-immodules-2.0 -BIN_OPTS="--update-modules" +BIN_OPTS="--update-cache" -echo "** Querying IM Modules" +echo "** Querying IM Modules and update IM Cache" # Now, do all other for i in @NEEDED_ISAS@ @@ -60,16 +60,12 @@ /usr/bin/printf "- ${isa} ISA... " fi - # Figure out the default file path (binary has to be patched for this) - gtk_immodules="`${ISABIN} | /usr/bin/awk '/DefaultFile =/ { print $4 }`" - - /usr/sbin/chroot "${PKG_ROOT_DIR}" "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1 if [ $? -ne 0 ] then echo "Error" else - /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${gtk_immodules} f 0644 root bin + /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} @prefix@/lib/${isa}/gtk-2.0/2.10.0/immodules.cache f 0644 root bin echo "OK" fi fi @@ -77,4 +73,4 @@ /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST} -echo "** Done querying IM Modules" \ No newline at end of file +echo "** Done querying IM Modules" Added: csw/mgar/pkg/gtk2/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/gtk2/trunk/files/changelog.CSW 2014-05-11 16:26:30 UTC (rev 23596) @@ -0,0 +1,9 @@ +gtk2 (2.24.22,REV=2014.05.11) + + * let gtk-query-immodules-2.0 write + /opt/csw/lib/gtk-2.0/2.10.0/immodules.cache in postinstall script + instead of /etc/opt/csw/gtk-2.0/gtk.immodules, which had no effect. + + -- Rafael Ostertag Sun, 11 May 2014 18:25:18 +0200 + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun May 11 18:28:24 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 11 May 2014 16:28:24 +0000 Subject: SF.net SVN: gar:[23597] csw/mgar/gar/v2/bin/cswch Message-ID: <3gRW1C0Tqcz168@mail.opencsw.org> Revision: 23597 http://sourceforge.net/p/gar/code/23597 Author: guengel Date: 2014-05-11 16:28:23 +0000 (Sun, 11 May 2014) Log Message: ----------- v2/bin/cswch: fix 'update' command. Modified Paths: -------------- csw/mgar/gar/v2/bin/cswch Modified: csw/mgar/gar/v2/bin/cswch =================================================================== --- csw/mgar/gar/v2/bin/cswch 2014-05-11 16:26:30 UTC (rev 23596) +++ csw/mgar/gar/v2/bin/cswch 2014-05-11 16:28:23 UTC (rev 23597) @@ -918,6 +918,7 @@ log) if arguments.command == "update": + log = compile_log(arguments.log_item, arguments.log_paragraph) update_changelog_entry(arguments.logfile, log) if arguments.command == "version": This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Sun May 11 20:01:31 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Sun, 11 May 2014 18:01:31 +0000 Subject: SF.net SVN: gar:[23598] csw/mgar/pkg/gnustep-base/trunk/Makefile Message-ID: <3gRY4f2yNlz1Bv@mail.opencsw.org> Revision: 23598 http://sourceforge.net/p/gar/code/23598 Author: rmottola Date: 2014-05-11 18:01:29 +0000 (Sun, 11 May 2014) Log Message: ----------- gnustep-base/trunk: skip tests Modified Paths: -------------- csw/mgar/pkg/gnustep-base/trunk/Makefile Modified: csw/mgar/pkg/gnustep-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-05-11 16:28:23 UTC (rev 23597) +++ csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-05-11 18:01:29 UTC (rev 23598) @@ -28,6 +28,9 @@ BUILD_SCRIPTS = sourcegs INSTALL_SCRIPTS = sourcegs +# Disable test scripts for now +TEST_SCRIPTS = none + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk @@ -43,3 +46,6 @@ install-sourcegs: . /opt/csw/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) install @$(MAKECOOKIE) + +test-none : + @$(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 Mon May 12 11:02:35 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 May 2014 09:02:35 +0000 Subject: SF.net SVN: gar:[23599] csw/mgar/pkg/rbgems Message-ID: <3gRx4M09Ntzq4@mail.opencsw.org> Revision: 23599 http://sourceforge.net/p/gar/code/23599 Author: dmichelsen Date: 2014-05-12 09:02:32 +0000 (Mon, 12 May 2014) Log Message: ----------- rbgems/daemon_controller: Initial commit Modified Paths: -------------- csw/mgar/pkg/rbgems/daemon_controller/trunk/Makefile csw/mgar/pkg/rbgems/daemon_controller/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rbgems/daemon_controller/ Modified: csw/mgar/pkg/rbgems/daemon_controller/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/daemons/trunk/Makefile 2014-03-18 11:21:34 UTC (rev 23249) +++ csw/mgar/pkg/rbgems/daemon_controller/trunk/Makefile 2014-05-12 09:02:32 UTC (rev 23599) @@ -1,17 +1,14 @@ -NAME = daemons -VERSION = 1.1.0 +NAME = daemon_controller +VERSION = 1.2.0 CATEGORIES = rbgems GARTYPE = v2 -DESCRIPTION = Brief description -define BLURB - Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server) to be run as a daemon and to be controlled by simple start/stop/restart commands. You can also call blocks as daemons and control them from the parent or just daemonize the current process. Besides this basic functionality, daemons offers many advanced features like exception backtracing and logging (in case your ruby script crashes) and monitoring and automatic restarting of your processes if they crash. -endef +DESCRIPTION = A library for robust daemon management -PACKAGES = CSWgem-daemons -CATALOGNAME = gem_daemons +PACKAGES = CSWgem-daemon-controller +CATALOGNAME = gem_daemon_controller -LICENSE = LICENSE +LICENSE = LICENSE.txt ARCHALL = 1 Modified: csw/mgar/pkg/rbgems/daemon_controller/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/daemons/trunk/checksums 2014-03-18 11:21:34 UTC (rev 23249) +++ csw/mgar/pkg/rbgems/daemon_controller/trunk/checksums 2014-05-12 09:02:32 UTC (rev 23599) @@ -1 +1 @@ -6c50720bab6a19d88b401a98a79c49ce daemons-1.1.0.gem +4c06909504732c365d0792d6f51db030 daemon_controller-1.2.0.gem 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 12 11:07:54 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 May 2014 09:07:54 +0000 Subject: SF.net SVN: gar:[23600] csw/mgar/pkg/rbgems/rack/trunk Message-ID: <3gRxBV5lYSztX@mail.opencsw.org> Revision: 23600 http://sourceforge.net/p/gar/code/23600 Author: dmichelsen Date: 2014-05-12 09:07:53 +0000 (Mon, 12 May 2014) Log Message: ----------- rbgems/rack/trunk: Update to 1.5.2 Modified Paths: -------------- csw/mgar/pkg/rbgems/rack/trunk/Makefile csw/mgar/pkg/rbgems/rack/trunk/checksums Modified: csw/mgar/pkg/rbgems/rack/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/rack/trunk/Makefile 2014-05-12 09:02:32 UTC (rev 23599) +++ csw/mgar/pkg/rbgems/rack/trunk/Makefile 2014-05-12 09:07:53 UTC (rev 23600) @@ -1,5 +1,5 @@ NAME = rack -VERSION = 1.1.0 +VERSION = 1.5.2 CATEGORIES = rbgems GARTYPE = v2 @@ -18,14 +18,7 @@ ARCHALL = 1 -# These are all developer dependencies -GEM_DEPS = -# ==> Verifying installed package CSWgem-bacon: MISSING -# ==> Verifying installed package CSWgem-rake: MISSING -# ==> Verifying installed package CSWgem-fcgi: MISSING -# ==> Verifying installed package CSWgem-memcache-client: MISSING -# ==> Verifying installed package CSWgem-mongrel: MISSING -# ==> Verifying installed package CSWgem-thin: MISSING +CHECKPKG_OVERRIDES_CSWgem-rack += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/rack-1.5.2/README.rdoc +CHECKPKG_OVERRIDES_CSWgem-rack += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/doc/rack-1.5.2/rdoc/files/README_rdoc.html - include gar/category.mk Modified: csw/mgar/pkg/rbgems/rack/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/rack/trunk/checksums 2014-05-12 09:02:32 UTC (rev 23599) +++ csw/mgar/pkg/rbgems/rack/trunk/checksums 2014-05-12 09:07:53 UTC (rev 23600) @@ -1 +1 @@ -f5ff2d6d348f41bb3833847223f792ce rack-1.1.0.gem +02067ea717f5d2e4b8e0bcd5155fcbc5 rack-1.5.2.gem 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 12 11:17:37 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 May 2014 09:17:37 +0000 Subject: SF.net SVN: gar:[23601] csw/mgar/pkg/rbgems/rake/trunk Message-ID: <3gRxPh1mcczyt@mail.opencsw.org> Revision: 23601 http://sourceforge.net/p/gar/code/23601 Author: dmichelsen Date: 2014-05-12 09:17:35 +0000 (Mon, 12 May 2014) Log Message: ----------- rbgems/rake/trunk: Update to 10.3.1 Modified Paths: -------------- csw/mgar/pkg/rbgems/rake/trunk/Makefile csw/mgar/pkg/rbgems/rake/trunk/checksums Modified: csw/mgar/pkg/rbgems/rake/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/rake/trunk/Makefile 2014-05-12 09:07:53 UTC (rev 23600) +++ csw/mgar/pkg/rbgems/rake/trunk/Makefile 2014-05-12 09:17:35 UTC (rev 23601) @@ -1,5 +1,5 @@ NAME = rake -VERSION = 0.8.7 +VERSION = 10.3.1 CATEGORIES = rbgems GARTYPE = v2 Modified: csw/mgar/pkg/rbgems/rake/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/rake/trunk/checksums 2014-05-12 09:07:53 UTC (rev 23600) +++ csw/mgar/pkg/rbgems/rake/trunk/checksums 2014-05-12 09:17:35 UTC (rev 23601) @@ -1 +1 @@ -d9eb83525310ad1a0e8a3eeddfe3c65f rake-0.8.7.gem +f16e125ac5a0bee98a9c386d635b2ee8 rake-10.3.1.gem 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 12 15:17:07 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 12 May 2014 13:17:07 +0000 Subject: SF.net SVN: gar:[23602] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: <3gS2k46CB8zGv@mail.opencsw.org> Revision: 23602 http://sourceforge.net/p/gar/code/23602 Author: slowfranklin Date: 2014-05-12 13:17:07 +0000 (Mon, 12 May 2014) Log Message: ----------- glib2/trunk: Add CSWlibpcre-dev dep to CSWlibglib2-dev Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2014-05-12 09:17:35 UTC (rev 23601) +++ csw/mgar/pkg/glib2/trunk/Makefile 2014-05-12 13:17:07 UTC (rev 23602) @@ -233,7 +233,9 @@ RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend +RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibpcre-dev CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend +CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWlibpcre-dev PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) # FIXME: glib-compile-schemas should possibly be moved to CSWglib2 PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon May 12 18:18:10 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 12 May 2014 16:18:10 +0000 Subject: SF.net SVN: gar:[23603] csw/mgar/pkg/dovecot/trunk Message-ID: <3gS6l338tfzkr@mail.opencsw.org> Revision: 23603 http://sourceforge.net/p/gar/code/23603 Author: jake_goerzen Date: 2014-05-12 16:18:10 +0000 (Mon, 12 May 2014) Log Message: ----------- dovecot: update to version 2.2.13 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2014-05-12 13:17:07 UTC (rev 23602) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2014-05-12 16:18:10 UTC (rev 23603) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.2.12 +VERSION = 2.2.13 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2014-05-12 13:17:07 UTC (rev 23602) +++ csw/mgar/pkg/dovecot/trunk/checksums 2014-05-12 16:18:10 UTC (rev 23603) @@ -1 +1 @@ -25395269fa2e0525e2d144d71d0450eb dovecot-2.2.12.tar.gz +a3eb1c0b1822c4f2b0fe9247776baa71 dovecot-2.2.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon May 12 23:24:36 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 May 2014 21:24:36 +0000 Subject: SF.net SVN: gar:[23604] csw/mgar/pkg/php5/branches/php-5.5.x/Makefile Message-ID: <3gSFXd6SXpz1CS@mail.opencsw.org> Revision: 23604 http://sourceforge.net/p/gar/code/23604 Author: dmichelsen Date: 2014-05-12 21:24:34 +0000 (Mon, 12 May 2014) Log Message: ----------- php5/branches/php-5.5.x: Update dependencies Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile Modified: csw/mgar/pkg/php5/branches/php-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-05-12 16:18:10 UTC (rev 23603) +++ csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-05-12 21:24:34 UTC (rev 23604) @@ -84,12 +84,10 @@ PACKAGES += CSWphp5-$(subst _,-,$(1)) CATALOGNAME_CSWphp5-$(subst _,-,$(1)) ?= php5_$(subst -,_,$(1)) SPKG_DESC_CSWphp5-$(subst _,-,$(1)) ?= The $(1) extention for PHP5 -RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5 $(2) +RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5 CSWlibz1 $(2) OBSOLETED_BY_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5$(subst _,-,$(1)) PKGFILES_CSWphp5-$(subst _,-,$(1)) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1) CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5 -RUNTIME_DEP_PKGS_sparc_CSWphp5-$(subst _,-,$(1)) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) += $(RUNTIME_DEP_PKGS_$(GARCH)_CSWphp5-$(subst _,-,$(1))) endef PACKAGES = CSWphp5 @@ -101,10 +99,9 @@ RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc52 RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n52 RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuio52 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibpcre1 INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 -# This is an example -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/php/man/man1/php-config.1 # embeded 'magic' information to detect file types...odd, but... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php @@ -112,6 +109,14 @@ # verify these... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php.ini.CSW +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/php/man/man1/php-config.1 + +CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php +CHECKPKG_OVERRIDES_CSWphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/php5/bin/php-cgi + +CHECKPKG_OVERRIDES_CSWphp5 += forbidden-version-interface-dependencies|/opt/csw/php5/bin/php|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWphp5 += forbidden-version-interface-dependencies|/opt/csw/php5/bin/php-cgi|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 + PACKAGES += CSWphp5-dev CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 @@ -153,22 +158,27 @@ RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuio52 RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n52 RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicudata52 OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so +CHECKPKG_OVERRIDES_CSWap2-modphp5 += bad-rpath-entry|/usr/ucblib|opt/csw/apache2/libexec/libphp5.so +CHECKPKG_OVERRIDES_CSWap2-modphp5 += forbidden-version-interface-dependencies|/opt/csw/apache2/libexec/libphp5.so|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 $(eval $(call php5_subpackage,bcmath,)) $(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0)) $(eval $(call php5_subpackage,calendar,)) $(eval $(call php5_subpackage,ctype,)) -$(eval $(call php5_subpackage,curl,CSWlibcurl4)) +$(eval $(call php5_subpackage,curl,CSWlibcurl4 CSWlibidn11 CSWlibssl1-0-0)) $(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42)) -$(eval $(call php5_subpackage,dom,CSWlibxml2-2)) +$(eval $(call php5_subpackage,dom,CSWlibxml2-2 CSWlibiconv2)) PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* $(eval $(call php5_subpackage,exif,)) $(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0)) -$(eval $(call php5_subpackage,gd,CSWlibgd3 CSWlibxpm4 CSWlibt1-5)) +$(eval $(call php5_subpackage,gd,CSWlibgd3 CSWlibxpm4 CSWlibt1-5 CSWlibbz2-1-0 CSWlibpng15-15 CSWlibjpeg7 CSWlibfreetype6)) PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* $(eval $(call php5_subpackage,gettext,CSWlibintl8)) $(eval $(call php5_subpackage,gmp,CSWlibgmp10)) @@ -176,23 +186,23 @@ PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* $(eval $(call php5_subpackage,iconv,CSWlibiconv2)) PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* -$(eval $(call php5_subpackage,imap,CSWlibc-client2007f)) +$(eval $(call php5_subpackage,imap,CSWlibc-client2007f CSWlibssl1-0-0)) $(eval $(call php5_subpackage,json,)) -$(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2)) +$(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2 CSWlibsasl2-2)) $(eval $(call php5_subpackage,mbstring,)) PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* -$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4)) +$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4 CSWlibltdl7)) $(eval $(call php5_subpackage,mssql,CSWlibsybdb5)) $(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibssl1-0-0)) # likely a checkpkg glitch (uses sparcv8plus+vis path for the library) CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibssl1-0-0 -$(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18)) +$(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18 CSWlibssl1-0-0)) $(eval $(call php5_subpackage,odbc,CSWlibodbc2)) $(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0)) $(eval $(call php5_subpackage,pcntl,)) $(eval $(call php5_subpackage,pdo,)) PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* -$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo)) +$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo CSWlibssl1-0-0)) PKGFILES_CSWphp5-pdomysql += .*/lib/php/extensions/.*/pdo_mysql.so PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo @@ -215,34 +225,28 @@ $(eval $(call php5_subpackage,pgsql,CSWlibpq5)) $(eval $(call php5_subpackage,posix,)) $(eval $(call php5_subpackage,pspell,CSWlibaspell15)) -$(eval $(call php5_subpackage,readline,CSWlibreadline6)) +$(eval $(call php5_subpackage,readline,CSWlibreadline6 CSWlibncurses5)) $(eval $(call php5_subpackage,session,CSWlibmm)) PKGFILES_CSWphp5-session += .*/include/php/ext/session.* $(eval $(call php5_subpackage,shmop,)) -$(eval $(call php5_subpackage,snmp,CSWlibnetsnmp25)) -$(eval $(call php5_subpackage,soap,CSWlibxml2-2)) +$(eval $(call php5_subpackage,snmp,CSWlibnetsnmp25 CSWlibssl1-0-0)) +$(eval $(call php5_subpackage,soap,CSWlibxml2-2 CSWlibiconv2)) $(eval $(call php5_subpackage,sockets,)) -$(eval $(call php5_subpackage,sqlite,CSWsqlite)) +$(eval $(call php5_subpackage,sqlite3,CSWlibsqlite3-0)) +OBSOLETED_BY_CSWphp5-sqlite3 += CSWphp5-sqlite $(eval $(call php5_subpackage,sysvmsg,)) $(eval $(call php5_subpackage,sysvsem,)) $(eval $(call php5_subpackage,sysvshm,)) $(eval $(call php5_subpackage,tidy,CSWlibtidy0-99-0)) $(eval $(call php5_subpackage,tokenizer,)) $(eval $(call php5_subpackage,wddx,)) -$(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2)) +$(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2 CSWlibiconv2)) $(eval $(call php5_subpackage,xmlrpc,CSWlibiconv2 CSWlibexpat1)) -$(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2)) -$(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0)) -$(eval $(call php5_subpackage,zip,CSWlibz1)) +$(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2 CSWlibiconv2)) +$(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0 CSWlibiconv2)) +$(eval $(call php5_subpackage,zip,)) #$(eval $(call php5_subpackage,ibm_db2,)) -# Use reinplacement until this is fixed: -# https://bugs.php.net/bug.php?id=66298 -#REINPLACEMENTS += dos -REINPLACE_MATCH_dos = \r$$ -REINPLACE_WITH_dos = -REINPLACE_FILES_dos += ext/opcache/Optimizer/zend_optimizer.c - EXTRA_CFLAGS = -I$(prefix)/include/ncursesw EXTRA_LIB = /opt/csw/postgresql/lib @@ -302,7 +306,6 @@ CONFIGURE_ARGS += --enable-gd-native-ttf CONFIGURE_ARGS += --enable-hash=shared CONFIGURE_ARGS += --enable-json=shared -CONFIGURE_ARGS += --enable-magic-quotes CONFIGURE_ARGS += --enable-mbstring=shared CONFIGURE_ARGS += --enable-pcntl=shared CONFIGURE_ARGS += --enable-pdo=shared @@ -312,8 +315,6 @@ CONFIGURE_ARGS += --enable-shmop=shared CONFIGURE_ARGS += --enable-soap=shared CONFIGURE_ARGS += --enable-sockets=shared -CONFIGURE_ARGS += --enable-sqlite-utf8 -CONFIGURE_ARGS += --enable-sqlite3=shared,$(prefix) CONFIGURE_ARGS += --enable-sysvmsg=shared CONFIGURE_ARGS += --enable-sysvsem=shared CONFIGURE_ARGS += --enable-sysvshm=shared @@ -324,9 +325,8 @@ CONFIGURE_ARGS += --enable-zip=shared CONFIGURE_ARGS += --with-bz2=shared,$(prefix) CONFIGURE_ARGS += --with-curl=shared,$(prefix) -CONFIGURE_ARGS += --with-curlwrappers CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 -CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin +#CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin CONFIGURE_ARGS += --with-freetype-dir=$(prefix) CONFIGURE_ARGS += --with-gd=shared,$(prefix) CONFIGURE_ARGS += --with-gdbm=$(prefix) @@ -364,7 +364,7 @@ CONFIGURE_ARGS += --with-pspell=shared,$(prefix) CONFIGURE_ARGS += --with-readline=shared,/opt/csw CONFIGURE_ARGS += --with-snmp=shared,$(prefix) -CONFIGURE_ARGS += --with-sqlite=shared,$(prefix) +CONFIGURE_ARGS += --with-sqlite3=shared,$(prefix) CONFIGURE_ARGS += --with-t1lib=$(prefix) CONFIGURE_ARGS += --with-tidy=shared,$(prefix) CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) 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 13 10:36:10 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 May 2014 08:36:10 +0000 Subject: SF.net SVN: gar:[23605] csw/mgar/pkg/file/trunk Message-ID: <3gSXRQ0jl8zLM@mail.opencsw.org> Revision: 23605 http://sourceforge.net/p/gar/code/23605 Author: dmichelsen Date: 2014-05-13 08:36:05 +0000 (Tue, 13 May 2014) Log Message: ----------- file/trunk: Update to 5.18 Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Added Paths: ----------- csw/mgar/pkg/file/trunk/files/0001-Add-missing-include.patch Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2014-05-12 21:24:34 UTC (rev 23604) +++ csw/mgar/pkg/file/trunk/Makefile 2014-05-13 08:36:05 UTC (rev 23605) @@ -1,7 +1,7 @@ # $Id$ NAME = file -VERSION = 5.16 +VERSION = 5.18 GARTYPE = v2 define BLURB @@ -17,6 +17,7 @@ PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch PATCHFILES += 0001-Use-PCRE.patch +PATCHFILES += 0001-Add-missing-include.patch VENDOR_URL = http://www.darwinsys.com/file/ Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2014-05-12 21:24:34 UTC (rev 23604) +++ csw/mgar/pkg/file/trunk/checksums 2014-05-13 08:36:05 UTC (rev 23605) @@ -1 +1 @@ -359c0cf41c3d438d17b4d293f3b950dc file-5.16.tar.gz +d420d8f2990cd344673acfbf8d76ff5a file-5.18.tar.gz Added: csw/mgar/pkg/file/trunk/files/0001-Add-missing-include.patch =================================================================== --- csw/mgar/pkg/file/trunk/files/0001-Add-missing-include.patch (rev 0) +++ csw/mgar/pkg/file/trunk/files/0001-Add-missing-include.patch 2014-05-13 08:36:05 UTC (rev 23605) @@ -0,0 +1,24 @@ +From b5dc5a6163074a7d92a4a239eafdeedce4fb07f6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 13 May 2014 10:25:27 +0200 +Subject: [PATCH] Add missing include + +--- + src/strcasestr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/strcasestr.c b/src/strcasestr.c +index 546ed3f..38d9012 100644 +--- a/src/strcasestr.c ++++ b/src/strcasestr.c +@@ -40,6 +40,7 @@ __RCSID("$NetBSD: strncasecmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $"); + #include + #include + #include ++#include + + static int + _strncasecmp(const char *s1, const char *s2, size_t n) +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 13 10:39:44 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 May 2014 08:39:44 +0000 Subject: SF.net SVN: gar:[23606] csw/mgar/pkg/file/trunk/Makefile Message-ID: <3gSXWW1xvYzPr@mail.opencsw.org> Revision: 23606 http://sourceforge.net/p/gar/code/23606 Author: dmichelsen Date: 2014-05-13 08:39:41 +0000 (Tue, 13 May 2014) Log Message: ----------- file/trunk: Add comment about patch location Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2014-05-13 08:36:05 UTC (rev 23605) +++ csw/mgar/pkg/file/trunk/Makefile 2014-05-13 08:39:41 UTC (rev 23606) @@ -17,6 +17,9 @@ PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch PATCHFILES += 0001-Use-PCRE.patch + +# Use patch until this is fixed: +# http://bugs.gw.com/view.php?id=353 PATCHFILES += 0001-Add-missing-include.patch VENDOR_URL = http://www.darwinsys.com/file/ 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 13 10:41:56 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 May 2014 08:41:56 +0000 Subject: SF.net SVN: gar:[23607] csw/mgar/pkg/php5/branches/php-5.5.x/Makefile Message-ID: <3gSXZ50BFwzTC@mail.opencsw.org> Revision: 23607 http://sourceforge.net/p/gar/code/23607 Author: dmichelsen Date: 2014-05-13 08:41:55 +0000 (Tue, 13 May 2014) Log Message: ----------- php5/branches/php-5.5.x: Add overrides for linker inconsistency Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile Modified: csw/mgar/pkg/php5/branches/php-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-05-13 08:39:41 UTC (rev 23606) +++ csw/mgar/pkg/php5/branches/php-5.5.x/Makefile 2014-05-13 08:41:55 UTC (rev 23607) @@ -247,6 +247,79 @@ $(eval $(call php5_subpackage,zip,)) #$(eval $(call php5_subpackage,ibm_db2,)) +# These are all on i386 only because of the linker inconsistency +CHECKPKG_OVERRIDES_CSWphp5-openssl += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-dom += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-dom += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-soap += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWphp5-wddx += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-calendar += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWlibidn11 +CHECKPKG_OVERRIDES_CSWphp5-curl += surplus-dependency|CSWlibssl1-0-0 +CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWlibicudata52 +CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWphp5-dba += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-mysqli += surplus-dependency|CSWlibssl1-0-0 +CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibpng15-15 +CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibjpeg7 +CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibbz2-1-0 +CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWlibfreetype6 +CHECKPKG_OVERRIDES_CSWphp5-hash += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-posix += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-mcrypt += surplus-dependency|CSWlibltdl7 +CHECKPKG_OVERRIDES_CSWphp5-tokenizer += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-ctype += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-exif += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-sockets += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-session += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-json += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-pcntl += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-imap += surplus-dependency|CSWlibssl1-0-0 +CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-pgsql += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-sysvshm += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-iconv += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-xmlreader += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-odbc += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-mssql += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-readline += surplus-dependency|CSWlibncurses5 +CHECKPKG_OVERRIDES_CSWphp5-shmop += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-sysvsem += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-sqlite3 += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-sysvmsg += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-mbstring += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-xsl += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-ldap += surplus-dependency|CSWlibsasl2-2 +CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-xmlwriter += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-snmp += surplus-dependency|CSWlibssl1-0-0 +CHECKPKG_OVERRIDES_CSWphp5-gmp += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-pspell += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-ftp += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-bz2 += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-xmlrpc += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWlibssl1-0-0 +CHECKPKG_OVERRIDES_CSWphp5-tidy += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWphp5-gettext += surplus-dependency|CSWlibz1 + + EXTRA_CFLAGS = -I$(prefix)/include/ncursesw EXTRA_LIB = /opt/csw/postgresql/lib 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 13 15:46:58 2014 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 13 May 2014 13:46:58 +0000 Subject: SF.net SVN: gar:[23608] csw/mgar/pkg Message-ID: <3gSgL21Vjdzwv@mail.opencsw.org> Revision: 23608 http://sourceforge.net/p/gar/code/23608 Author: janholzh Date: 2014-05-13 13:46:56 +0000 (Tue, 13 May 2014) Log Message: ----------- tinyproxy/trunk: e Added Paths: ----------- csw/mgar/pkg/tinyproxy/ csw/mgar/pkg/tinyproxy/Makefile csw/mgar/pkg/tinyproxy/branches/ csw/mgar/pkg/tinyproxy/tags/ csw/mgar/pkg/tinyproxy/trunk/ csw/mgar/pkg/tinyproxy/trunk/Makefile csw/mgar/pkg/tinyproxy/trunk/checksums csw/mgar/pkg/tinyproxy/trunk/files/ Added: csw/mgar/pkg/tinyproxy/Makefile =================================================================== --- csw/mgar/pkg/tinyproxy/Makefile (rev 0) +++ csw/mgar/pkg/tinyproxy/Makefile 2014-05-13 13:46:56 UTC (rev 23608) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/tinyproxy/trunk =================================================================== --- csw/mgar/pkg/tinyproxy/trunk 2014-05-13 08:41:55 UTC (rev 23607) +++ csw/mgar/pkg/tinyproxy/trunk 2014-05-13 13:46:56 UTC (rev 23608) Property changes on: csw/mgar/pkg/tinyproxy/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/tinyproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/tinyproxy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tinyproxy/trunk/Makefile 2014-05-13 13:46:56 UTC (rev 23608) @@ -0,0 +1,23 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = tinyproxy +VERSION = 1.8.3 +GARTYPE = v2 + +DESCRIPTION = Tinyproxy is a light-weight HTTP/HTTPS proxy daemon for POSIX operating systems +define BLURB +Tinyproxy is a light-weight HTTP/HTTPS proxy daemon for POSIX operating systems. Designed from the ground up to be fast and yet small, it is an ideal solution for use cases such as embedded deployments where a full featured HTTP proxy is required, but the system resources for a larger proxy are unavailable. +endef + +MASTER_SITES = https://files.banu.com/tinyproxy/1.8/ +DISTFILES = $(DISTNAME).tar.bz2 + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) --disable-silent-rules --disable-regexcheck +CHECKPKG_OVERRIDES_CSWtinyproxy += file-with-bad-content|/usr/local|root/etc/opt/csw/tinyproxy.conf +CHECKPKG_OVERRIDES_CSWtinyproxy += file-with-bad-content|/usr/share|root/etc/opt/csw/tinyproxy.conf + +include gar/category.mk + Property changes on: csw/mgar/pkg/tinyproxy/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/tinyproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/tinyproxy/trunk/checksums (rev 0) +++ csw/mgar/pkg/tinyproxy/trunk/checksums 2014-05-13 13:46:56 UTC (rev 23608) @@ -0,0 +1 @@ +292ac51da8ad6ae883d4ebf56908400d tinyproxy-1.8.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue May 13 16:38:02 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 13 May 2014 14:38:02 +0000 Subject: SF.net SVN: gar:[23609] csw/mgar/pkg/libgcrypt/trunk Message-ID: <3gShSz4PkCz17P@mail.opencsw.org> Revision: 23609 http://sourceforge.net/p/gar/code/23609 Author: lblume Date: 2014-05-13 14:38:01 +0000 (Tue, 13 May 2014) Log Message: ----------- libgcrypt/trunk: Bump to 1.6.1; switch to GCC4 for better advenced CPU support; add some workaround for funky issues Modified Paths: -------------- csw/mgar/pkg/libgcrypt/trunk/Makefile csw/mgar/pkg/libgcrypt/trunk/checksums Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/Makefile 2014-05-13 13:46:56 UTC (rev 23608) +++ csw/mgar/pkg/libgcrypt/trunk/Makefile 2014-05-13 14:38:01 UTC (rev 23609) @@ -1,5 +1,5 @@ NAME = libgcrypt -VERSION = 1.5.3 +VERSION = 1.6.1 GARTYPE = v2 DESCRIPTION = GNU libgcrypt @@ -12,28 +12,45 @@ VENDOR_URL = http://www.gnupg.org/related_software/libraries.en.html#lib-libgcrypt +GARCOMPILER = GCC4 + BUILD_DEP_PKGS = CSWlibgpg-error-dev -PACKAGES += CSWlibgcrypt11 -SPKG_DESC_CSWlibgcrypt11 = GNU libgcrypt, libgcrypt.so.11 -PKGFILES_CSWlibgcrypt11 += $(call pkgfiles_lib,libgcrypt.so.11) -RUNTIME_DEP_PKGS_CSWlibgcrypt11 += CSWlibgpg-error0 - PACKAGES += CSWlibgcrypt-dev -SPKG_DESC_CSWlibgcrypt-dev = Development files for libgcrypt.so.11 +SPKG_DESC_CSWlibgcrypt-dev = Development files for libgcrypt.so PKGFILES_CSWlibgcrypt-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibgcrypt-dev += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWlibgcrypt-dev += CSWlibgcrypt20 RUNTIME_DEP_PKGS_CSWlibgcrypt-dev += $(BUILD_DEP_PKGS) +RUNTIME_DEP_PKGS_CSWlibgcrypt-dev += CSWlibgcrypt-utils +PACKAGES += CSWlibgcrypt20 +CATALOGNAME_CSWlibgcrypt20 = libgcrypt20 +PKGFILES_CSWlibgcrypt20 += $(call baseisadirs,$(libdir),libgcrypt\.so\.20\.0\.1) +PKGFILES_CSWlibgcrypt20 += $(call baseisadirs,$(libdir),libgcrypt\.so\.20(\.\d+)*) +SPKG_DESC_CSWlibgcrypt20 += $(DESCRIPTION), libgcrypt.so.20 +RUNTIME_DEP_PKGS_CSWlibgcrypt20 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgcrypt20 += CSWlibgpg-error0 + PACKAGES += CSWlibgcrypt-utils SPKG_DESC_CSWlibgcrypt-utils = Utility programs for libgcrypt +RUNTIME_DEP_PKGS_CSWlibgcrypt-utils += CSWlibgcrypt20 +RUNTIME_DEP_PKGS_CSWlibgcrypt-utils += CSWlibgpg-error0 # PKGFILES is catchall OBSOLETED_BY_CSWlibgcrypt-utils = CSWgcrypt CATALOGNAME_CSWgcrypt = libgcrypt_stub -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-amd64-as-feature-detection CONFIGURE_ARGS += --disable-asm +# Make some old bits of code happy +# http://mail-index.netbsd.org/tech-pkg/2004/08/19/0010.html +# https://www.choon.net/forum/read.php?21,794684 +EXTRA_CFLAGS_sparc = -DLONGLONG_STANDALONE + +EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) + include gar/category.mk Modified: csw/mgar/pkg/libgcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/checksums 2014-05-13 13:46:56 UTC (rev 23608) +++ csw/mgar/pkg/libgcrypt/trunk/checksums 2014-05-13 14:38:01 UTC (rev 23609) @@ -1 +1 @@ -993159b2924ae7b0e4eaff0743c2db35 libgcrypt-1.5.3.tar.bz2 +a5a5060dc2f80bcac700ab0236ea47dc libgcrypt-1.6.1.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 Tue May 13 17:45:35 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 13 May 2014 15:45:35 +0000 Subject: SF.net SVN: gar:[23610] csw/mgar/pkg/cpan Message-ID: <3gSjz04ByMz1TF@mail.opencsw.org> Revision: 23610 http://sourceforge.net/p/gar/code/23610 Author: bonivart Date: 2014-05-13 15:45:34 +0000 (Tue, 13 May 2014) Log Message: ----------- cpan/Math-Random-ISAAC/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Math-Random-ISAAC/ csw/mgar/pkg/cpan/Math-Random-ISAAC/Makefile csw/mgar/pkg/cpan/Math-Random-ISAAC/branches/ csw/mgar/pkg/cpan/Math-Random-ISAAC/tags/ csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/ csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/Makefile csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/checksums csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/files/ Added: csw/mgar/pkg/cpan/Math-Random-ISAAC/Makefile =================================================================== --- csw/mgar/pkg/cpan/Math-Random-ISAAC/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Math-Random-ISAAC/Makefile 2014-05-13 15:45:34 UTC (rev 23610) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk =================================================================== --- csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk 2014-05-13 14:38:01 UTC (rev 23609) +++ csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk 2014-05-13 15:45:34 UTC (rev 23610) Property changes on: csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/Makefile 2014-05-13 15:45:34 UTC (rev 23610) @@ -0,0 +1,18 @@ +NAME = Math-Random-ISAAC +VERSION = 1.004 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = JAWNSY + +DESCRIPTION = Perl interface to the ISAAC PRNG algorithm +define BLURB +endef + +LICENSE = LICENSE + +PACKAGES = CSWpm-math-random-isaac +CATALOGNAME = pm_math_random_isaac + +ARCHALL = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Math-Random-ISAAC/trunk/checksums 2014-05-13 15:45:34 UTC (rev 23610) @@ -0,0 +1,2 @@ +608826974d5644ee7967a713fa72cf36 COPYING +46110b9a7bb96fe641bdfaf35bdafec5 Math-Random-ISAAC-1.004.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 13 20:30:49 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 13 May 2014 18:30:49 +0000 Subject: SF.net SVN: gar:[23611] csw/mgar/pkg/cpan Message-ID: <3gSndf46jJzRF@mail.opencsw.org> Revision: 23611 http://sourceforge.net/p/gar/code/23611 Author: bonivart Date: 2014-05-13 18:30:48 +0000 (Tue, 13 May 2014) Log Message: ----------- cpan/Return-Value/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Return-Value/ csw/mgar/pkg/cpan/Return-Value/Makefile csw/mgar/pkg/cpan/Return-Value/branches/ csw/mgar/pkg/cpan/Return-Value/tags/ csw/mgar/pkg/cpan/Return-Value/trunk/ csw/mgar/pkg/cpan/Return-Value/trunk/Makefile csw/mgar/pkg/cpan/Return-Value/trunk/checksums csw/mgar/pkg/cpan/Return-Value/trunk/files/ Added: csw/mgar/pkg/cpan/Return-Value/Makefile =================================================================== --- csw/mgar/pkg/cpan/Return-Value/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Return-Value/Makefile 2014-05-13 18:30:48 UTC (rev 23611) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/cpan/Return-Value/trunk =================================================================== --- csw/mgar/pkg/cpan/Return-Value/trunk 2014-05-13 15:45:34 UTC (rev 23610) +++ csw/mgar/pkg/cpan/Return-Value/trunk 2014-05-13 18:30:48 UTC (rev 23611) Property changes on: csw/mgar/pkg/cpan/Return-Value/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/cpan/Return-Value/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Return-Value/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Return-Value/trunk/Makefile 2014-05-13 18:30:48 UTC (rev 23611) @@ -0,0 +1,18 @@ +NAME = Return-Value +VERSION = 1.666004 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = RJBS + +DESCRIPTION = Polymorphic return values +define BLURB +endef + +LICENSE = LICENSE + +PACKAGES = CSWpm-return-value +CATALOGNAME = pm_return_value + +ARCHALL = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/cpan/Return-Value/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/cpan/Return-Value/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Return-Value/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Return-Value/trunk/checksums 2014-05-13 18:30:48 UTC (rev 23611) @@ -0,0 +1 @@ +7029edc09f1c424ac63e82efb903c911 Return-Value-1.666004.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 13 23:15:43 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 13 May 2014 21:15:43 +0000 Subject: SF.net SVN: gar:[23612] csw/mgar/pkg/cpan Message-ID: <3gSsHr6mCjz10q@mail.opencsw.org> Revision: 23612 http://sourceforge.net/p/gar/code/23612 Author: bonivart Date: 2014-05-13 21:15:42 +0000 (Tue, 13 May 2014) Log Message: ----------- cpan/Email-Send/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Email-Send/ csw/mgar/pkg/cpan/Email-Send/Makefile csw/mgar/pkg/cpan/Email-Send/branches/ csw/mgar/pkg/cpan/Email-Send/tags/ csw/mgar/pkg/cpan/Email-Send/trunk/ csw/mgar/pkg/cpan/Email-Send/trunk/Makefile csw/mgar/pkg/cpan/Email-Send/trunk/checksums csw/mgar/pkg/cpan/Email-Send/trunk/files/ Added: csw/mgar/pkg/cpan/Email-Send/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Send/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Email-Send/Makefile 2014-05-13 21:15:42 UTC (rev 23612) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/cpan/Email-Send/trunk =================================================================== --- csw/mgar/pkg/cpan/Email-Send/trunk 2014-05-13 18:30:48 UTC (rev 23611) +++ csw/mgar/pkg/cpan/Email-Send/trunk 2014-05-13 21:15:42 UTC (rev 23612) Property changes on: csw/mgar/pkg/cpan/Email-Send/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/cpan/Email-Send/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Send/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Email-Send/trunk/Makefile 2014-05-13 21:15:42 UTC (rev 23612) @@ -0,0 +1,23 @@ +NAME = Email-Send +VERSION = 2.199 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = RJBS + +DESCRIPTION = Simply Sending Email +define BLURB +endef + +LICENSE = LICENSE + +PACKAGES = CSWpm-email-send +CATALOGNAME = pm_email_send + +RUNTIME_DEP_PKGS += CSWpm-email-abstract +RUNTIME_DEP_PKGS += CSWpm-email-address +RUNTIME_DEP_PKGS += CSWpm-email-simple +RUNTIME_DEP_PKGS += CSWpm-return-value + +ARCHALL = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/cpan/Email-Send/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/cpan/Email-Send/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-Send/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Email-Send/trunk/checksums 2014-05-13 21:15:42 UTC (rev 23612) @@ -0,0 +1,2 @@ +608826974d5644ee7967a713fa72cf36 COPYING +1865147aa1f63bb65bef8e4edc20a29d Email-Send-2.199.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Wed May 14 00:29:15 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Tue, 13 May 2014 22:29:15 +0000 Subject: SF.net SVN: gar:[23613] csw/mgar/pkg/gnustep-make/trunk/Makefile Message-ID: <3gStwf0DPjz1BH@mail.opencsw.org> Revision: 23613 http://sourceforge.net/p/gar/code/23613 Author: rmottola Date: 2014-05-13 22:29:13 +0000 (Tue, 13 May 2014) Log Message: ----------- gnustep-make/trunk: change prefix to /GNUstep Modified Paths: -------------- csw/mgar/pkg/gnustep-make/trunk/Makefile Modified: csw/mgar/pkg/gnustep-make/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-make/trunk/Makefile 2014-05-13 21:15:42 UTC (rev 23612) +++ csw/mgar/pkg/gnustep-make/trunk/Makefile 2014-05-13 22:29:13 UTC (rev 23613) @@ -21,10 +21,11 @@ #we have no tests anyway SKIPTEST = 1 +prefix = $(BUILD_PREFIX)/GNUstep + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-layout=gnustep #CONFIGURE_ARGS += LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" -#CONFIGURE_ARGS += CPPFLAGS=-I/opt/csw/include 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 Wed May 14 08:48:59 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 14 May 2014 06:48:59 +0000 Subject: SF.net SVN: gar:[23614] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: <3gT61G4g40z8y@mail.opencsw.org> Revision: 23614 http://sourceforge.net/p/gar/code/23614 Author: lblume Date: 2014-05-14 06:48:55 +0000 (Wed, 14 May 2014) Log Message: ----------- gnupg2/trunk: Rebuild for new libgcrypt Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2014-05-13 22:29:13 UTC (rev 23613) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2014-05-14 06:48:55 UTC (rev 23614) @@ -40,7 +40,7 @@ RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibksba8 RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibgcrypt20 RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibgpg-error0 @@ -58,7 +58,7 @@ PKGFILES_CSWgnupg-agent += .*gpgkey2ssh.* PKGFILES_CSWgnupg-agent += .*symcryptrun.* RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibgcrypt20 RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibpth20 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 14 14:43:37 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 May 2014 12:43:37 +0000 Subject: SF.net SVN: gar:[23615] csw/mgar/pkg/sudo/trunk Message-ID: <3gTFtW6Pk0zpC@mail.opencsw.org> Revision: 23615 http://sourceforge.net/p/gar/code/23615 Author: dmichelsen Date: 2014-05-14 12:43:37 +0000 (Wed, 14 May 2014) Log Message: ----------- sudo/trunk: Update to 1.8.10p3 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2014-05-14 06:48:55 UTC (rev 23614) +++ csw/mgar/pkg/sudo/trunk/Makefile 2014-05-14 12:43:37 UTC (rev 23615) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.10p2 +VERSION = 1.8.10p3 GARTYPE = v2 EXTRA_MODULATORS = LDAP Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2014-05-14 06:48:55 UTC (rev 23614) +++ csw/mgar/pkg/sudo/trunk/checksums 2014-05-14 12:43:37 UTC (rev 23615) @@ -1 +1 @@ -5e5eab1036a7cc2c088ab0d9b6b6a42e sudo-1.8.10p2.tar.gz +fcd8d0d9f9f0397d076ee901e242ed39 sudo-1.8.10p3.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 Wed May 14 17:43:24 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 14 May 2014 15:43:24 +0000 Subject: SF.net SVN: gar:[23616] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: <3gTKsx0vTnz1B1@mail.opencsw.org> Revision: 23616 http://sourceforge.net/p/gar/code/23616 Author: lblume Date: 2014-05-14 15:43:24 +0000 (Wed, 14 May 2014) Log Message: ----------- gnupg2/trunk: gnupg2 cannot work without the agent, separating it makes no sense anymore Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2014-05-14 12:43:37 UTC (rev 23615) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2014-05-14 15:43:24 UTC (rev 23616) @@ -50,24 +50,11 @@ RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibadns1 RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibldap2-4-2 +# For gpg-agent. Pinentry is not because of shared libraries. +RUNTIME_DEP_PKGS_CSWgnupg2 += CSWpinentry +CHECKPKG_OVERRIDES_CSWgnupg2 += surplus-dependency|CSWpinentry +OBSOLETED_BY_CSWgnupg2 = CSWgnupg-agent -PACKAGES += CSWgnupg-agent -SPKG_DESC_CSWgnupg-agent = GNU privacy guard - password agent -PKGFILES_CSWgnupg-agent += .*gpg-agent.* -PKGFILES_CSWgnupg-agent += .*gpg-connect-agent.* -PKGFILES_CSWgnupg-agent += .*gpgkey2ssh.* -PKGFILES_CSWgnupg-agent += .*symcryptrun.* -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibgcrypt20 -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibpth20 -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibassuan0 -# Pinentry is not because of shared libraries. -RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWpinentry -CHECKPKG_OVERRIDES_CSWgnupg-agent += surplus-dependency|CSWpinentry - NOISALIST = 1 BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Thu May 15 00:23:00 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Wed, 14 May 2014 22:23:00 +0000 Subject: SF.net SVN: gar:[23617] csw/mgar/pkg/gnustep-base/trunk/Makefile Message-ID: <3gTVl569WbzG9@mail.opencsw.org> Revision: 23617 http://sourceforge.net/p/gar/code/23617 Author: rmottola Date: 2014-05-14 22:22:53 +0000 (Wed, 14 May 2014) Log Message: ----------- use INSTALL_ENV Modified Paths: -------------- csw/mgar/pkg/gnustep-base/trunk/Makefile Modified: csw/mgar/pkg/gnustep-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-05-14 15:43:24 UTC (rev 23616) +++ csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-05-14 22:22:53 UTC (rev 23617) @@ -30,21 +30,22 @@ # Disable test scripts for now TEST_SCRIPTS = none +SKIPTEST = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk configure-sourcegs: - . /opt/csw/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) ; $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) ; $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) @$(MAKECOOKIE) build-sourcegs: - . /opt/csw/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) @$(MAKECOOKIE) install-sourcegs: - . /opt/csw/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) install + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install @$(MAKECOOKIE) test-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 Thu May 15 15:02:31 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 15 May 2014 13:02:31 +0000 Subject: SF.net SVN: gar:[23618] csw/mgar/pkg/openjpeg/trunk Message-ID: <3gTtFs4Jlfz1Hk@mail.opencsw.org> Revision: 23618 http://sourceforge.net/p/gar/code/23618 Author: lblume Date: 2014-05-15 13:02:28 +0000 (Thu, 15 May 2014) Log Message: ----------- openjpeg/trunk: Bump to 2.1.0; add patch for big endian issue Modified Paths: -------------- csw/mgar/pkg/openjpeg/trunk/Makefile csw/mgar/pkg/openjpeg/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openjpeg/trunk/files/0002-big-endian-uint16_t.patch Modified: csw/mgar/pkg/openjpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjpeg/trunk/Makefile 2014-05-14 22:22:53 UTC (rev 23617) +++ csw/mgar/pkg/openjpeg/trunk/Makefile 2014-05-15 13:02:28 UTC (rev 23618) @@ -1,5 +1,5 @@ NAME = openjpeg -VERSION = 2.0.0 +VERSION = 2.1.0 GARTYPE = v2 DESCRIPTION = Open-source JPEG 2000 codec written in C @@ -8,41 +8,39 @@ endef VENDOR_URL = http://code.google.com/p/openjpeg/ -MASTER_SITES = $(GOOGLE_MIRROR) +MASTER_SITES = $(SF_MIRROR) +SF_PROJECT = openjpeg.mirror DISTFILES = $(DISTNAME).tar.gz LICENSE = LICENSE -# .pc file needed at least for ImageMagick -# http://code.google.com/p/openjpeg/source/detail?spec=svn2250&r=2250# -PATCHFILES += 0001-add-pc-file.patch - GARCOMPILER = GCC4 -PACKAGES += CSWlibopenjp2-6 -CATALOGNAME_CSWlibopenjp2-6 = libopenjp2_6 -PKGFILES_CSWlibopenjp2-6 += $(call baseisadirs,$(libdir),libopenjp2\.so\.2\.0\.0) -PKGFILES_CSWlibopenjp2-6 += $(call baseisadirs,$(libdir),libopenjp2\.so\.6) -SPKG_DESC_CSWlibopenjp2-6 += $(DESCRIPTION), libopenjp2.so.6 -RUNTIME_DEP_PKGS_CSWlibopenjp2-6 += CSWlibgcc-s1 +PATCHFILES += 0002-big-endian-uint16_t.patch +PACKAGES += CSWlibopenjp2-7 +CATALOGNAME_CSWlibopenjp2-7 = libopenjp2_7 +PKGFILES_CSWlibopenjp2-7 += $(call baseisadirs,$(libdir),libopenjp2\.so\.2\.1\.0) +PKGFILES_CSWlibopenjp2-7 += $(call baseisadirs,$(libdir),libopenjp2\.so\.7(\.\d+)*) +SPKG_DESC_CSWlibopenjp2-7 += $(DESCRIPTION), libopenjp2.so.7 +RUNTIME_DEP_PKGS_CSWlibopenjp2-7 += CSWlibgcc-s1 +# For some reason the so.7 links to the so.2.1.0 +CHECKPKG_OVERRIDES_CSWlibopenjp2-7 += soname-not-part-of-filename|soname=libopenjp2.so.7|filename=libopenjp2.so.2.1.0 + PACKAGES += CSWopenjpeg-dev CATALOGNAME_CSWopenjpeg-dev = openjpeg_dev SPKG_DESC_CSWopenjpeg-dev += $(DESCRIPTION), development files PKGFILES_CSWopenjpeg-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWopenjpeg-dev += CSWlibopenjp2-6 +RUNTIME_DEP_PKGS_CSWopenjpeg-dev += CSWlibopenjp2-7 PACKAGES += CSWopenjpeg CATALOGNAME_CSWopenjpeg = openjpeg SPKG_DESC_CSWopenjpeg += $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibopenjp2-6 +RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibopenjp2-7 RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWopenjpeg += CSWliblcms2-2 RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibpng15-15 # PKGFILES is catchall -# For some reason the so.6 links to the so.2.0.0 -CHECKPKG_OVERRIDES_CSWlibopenjp2-6 += soname-not-part-of-filename|soname=libopenjp2.so.6|filename=libopenjp2.so.2.0.0 - CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" Modified: csw/mgar/pkg/openjpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/openjpeg/trunk/checksums 2014-05-14 22:22:53 UTC (rev 23617) +++ csw/mgar/pkg/openjpeg/trunk/checksums 2014-05-15 13:02:28 UTC (rev 23618) @@ -1 +1 @@ -d9be274bddc0f47f268e484bdcaaa6c5 openjpeg-2.0.0.tar.gz +f6419fcc233df84f9a81eb36633c6db6 openjpeg-2.1.0.tar.gz Added: csw/mgar/pkg/openjpeg/trunk/files/0002-big-endian-uint16_t.patch =================================================================== --- csw/mgar/pkg/openjpeg/trunk/files/0002-big-endian-uint16_t.patch (rev 0) +++ csw/mgar/pkg/openjpeg/trunk/files/0002-big-endian-uint16_t.patch 2014-05-15 13:02:28 UTC (rev 23618) @@ -0,0 +1,14 @@ +index 1b2d361..89a885a 100644 +--- a/src/bin/jp2/convert.c ++++ b/src/bin/jp2/convert.c +@@ -191,8 +191,8 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, + + static INLINE int16_t swap16(int16_t x) + { +- return((((u_int16_t)x & 0x00ffU) << 8) | +- (((u_int16_t)x & 0xff00U) >> 8)); ++ return((((uint16_t)x & 0x00ffU) << 8) | ++ (((uint16_t)x & 0xff00U) >> 8)); + } + + #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 15 16:09:21 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 15 May 2014 14:09:21 +0000 Subject: SF.net SVN: gar:[23619] csw/mgar/pkg/ImageMagick/trunk Message-ID: <3gTvkw5xVQz1Rs@mail.opencsw.org> Revision: 23619 http://sourceforge.net/p/gar/code/23619 Author: lblume Date: 2014-05-15 14:09:20 +0000 (Thu, 15 May 2014) Log Message: ----------- ImageMagick/trunk: Bump to 6.8.9-1 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-05-15 13:02:28 UTC (rev 23618) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-05-15 14:09:20 UTC (rev 23619) @@ -1,6 +1,6 @@ NAME = imagemagick -VERSION = 6.8.8 -GARSUBREV = 7 +VERSION = 6.8.9 +GARSUBREV = 1 GARTYPE = v2 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2014-05-15 13:02:28 UTC (rev 23618) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2014-05-15 14:09:20 UTC (rev 23619) @@ -1 +1 @@ -1ae0f7fdc0384b588241cdc851b1e097 ImageMagick-6.8.8-7.tar.xz +bde038ae05fb20d29cebf88ab9cbdce5 ImageMagick-6.8.9-1.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu May 15 23:45:26 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 15 May 2014 21:45:26 +0000 Subject: SF.net SVN: gar:[23620] csw/mgar/pkg/ImageMagick/trunk Message-ID: <3gV5sB2BM9z13W@mail.opencsw.org> Revision: 23620 http://sourceforge.net/p/gar/code/23620 Author: lblume Date: 2014-05-15 21:45:25 +0000 (Thu, 15 May 2014) Log Message: ----------- ImageMagick/trunk: Adjust dependencies for new version Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ImageMagick/trunk/files/map.ImageMagick Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-05-15 14:09:20 UTC (rev 23619) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-05-15 21:45:25 UTC (rev 23620) @@ -14,7 +14,11 @@ MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/ DISTNAME = ImageMagick-$(VERSION)-$(GARSUBREV) DISTFILES = $(DISTNAME).tar.xz +DISTFILES += map.ImageMagick +# libc 1.22.5 for gnutls +LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.ImageMagick)" + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 GARCOMPILER = GCC4 @@ -113,7 +117,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibdjvulibre21 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibopenjp2-6 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibopenjp2-7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgcc-s1 Added: csw/mgar/pkg/ImageMagick/trunk/files/map.ImageMagick =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/files/map.ImageMagick (rev 0) +++ csw/mgar/pkg/ImageMagick/trunk/files/map.ImageMagick 2014-05-15 21:45:25 UTC (rev 23620) @@ -0,0 +1 @@ +libc.so - SUNW_1.22.5 SUNWprivate_1.1; 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 16 10:11:58 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 16 May 2014 08:11:58 +0000 Subject: SF.net SVN: gar:[23621] csw/mgar/pkg/libfpx/trunk Message-ID: <3gVMmF5dDSz1XP@mail.opencsw.org> Revision: 23621 http://sourceforge.net/p/gar/code/23621 Author: lblume Date: 2014-05-16 08:11:55 +0000 (Fri, 16 May 2014) Log Message: ----------- libfpx/trunk: Bump to 1.3.1-4; switch to GCC4; try to remove patches to check them Modified Paths: -------------- csw/mgar/pkg/libfpx/trunk/Makefile csw/mgar/pkg/libfpx/trunk/checksums Modified: csw/mgar/pkg/libfpx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfpx/trunk/Makefile 2014-05-15 21:45:25 UTC (rev 23620) +++ csw/mgar/pkg/libfpx/trunk/Makefile 2014-05-16 08:11:55 UTC (rev 23621) @@ -1,21 +1,25 @@ -NAME = libfpx -VERSION = 1.3.1 -GARTYPE = v2 +NAME = libfpx +VERSION = 1.3.1 +GARSUBREV = 4 +GARTYPE = v2 DESCRIPTION = FlashPIX library define BLURB endef MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ -DISTFILES = $(DISTNAME).tar.xz +DISTNAME = libfpx-$(VERSION)-$(GARSUBREV) +DISTFILES = $(DISTNAME).tar.xz -PATCHFILES += olecomm.h.patch +GARCOMPILER = GCC4 + +###PATCHFILES += olecomm.h.patch # PATCHFILES += tchar.patch # PATCHFILES += 0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch -PATCHFILES += 0002-Fix-unresolved-symbols-part-1.patch -PATCHFILES += 0003-Fix-unresolved-symbols-part-2.patch +###PATCHFILES += 0002-Fix-unresolved-symbols-part-1.patch +###PATCHFILES += 0003-Fix-unresolved-symbols-part-2.patch VENDOR_URL = http://www.imagemagick.org LICENSE = flashpix.h @@ -38,15 +42,15 @@ DOCFILES += README # Fix for problem introduced between 12101[7-8]-17 and 12101[7-8]-20 -EXTRA_CPPFLAGS += -D_RWSTD_NO_WSTR=1 +###EXTRA_CPPFLAGS += -D_RWSTD_NO_WSTR=1 +### +###COMPILERLIBS-sparc-32 = /opt/SUNWspro/lib +###COMPILERLIBS-sparc-64 = /opt/SUNWspro/lib/v9 +###COMPILERLIBS-i386-32 = /opt/SUNWspro/lib +###COMPILERLIBS-i386-64 = /opt/SUNWspro/lib/amd64 -COMPILERLIBS-sparc-32 = /opt/SUNWspro/lib -COMPILERLIBS-sparc-64 = /opt/SUNWspro/lib/v9 -COMPILERLIBS-i386-32 = /opt/SUNWspro/lib -COMPILERLIBS-i386-64 = /opt/SUNWspro/lib/amd64 - # Make sure to include path or we link against libCrun.a -EXTRA_LINKER_FLAGS += -L$(COMPILERLIBS-$(GARCH)-$(MEMORYMODEL)) -lCrun -lCstd +###EXTRA_LINKER_FLAGS += -L$(COMPILERLIBS-$(GARCH)-$(MEMORYMODEL)) -lCrun -lCstd # For sqrt, atan2, pow EXTRA_LINKER_FLAGS += -lm Modified: csw/mgar/pkg/libfpx/trunk/checksums =================================================================== --- csw/mgar/pkg/libfpx/trunk/checksums 2014-05-15 21:45:25 UTC (rev 23620) +++ csw/mgar/pkg/libfpx/trunk/checksums 2014-05-16 08:11:55 UTC (rev 23621) @@ -1 +1 @@ -c66ab2b3e43edfe0ab2ca11ee67c98f3 libfpx-1.3.1.tar.xz +65e2cf8dcf230ad0b90aead35553bbda libfpx-1.3.1-4.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri May 16 10:58:20 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 16 May 2014 08:58:20 +0000 Subject: SF.net SVN: gar:[23622] csw/mgar/pkg/libfpx/trunk/Makefile Message-ID: <3gVNnZ56YVz7R@mail.opencsw.org> Revision: 23622 http://sourceforge.net/p/gar/code/23622 Author: lblume Date: 2014-05-16 08:58:19 +0000 (Fri, 16 May 2014) Log Message: ----------- libfpx/trunk: Reinstate one of the patches; update dependencies Modified Paths: -------------- csw/mgar/pkg/libfpx/trunk/Makefile Modified: csw/mgar/pkg/libfpx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfpx/trunk/Makefile 2014-05-16 08:11:55 UTC (rev 23621) +++ csw/mgar/pkg/libfpx/trunk/Makefile 2014-05-16 08:58:19 UTC (rev 23622) @@ -13,9 +13,9 @@ GARCOMPILER = GCC4 -###PATCHFILES += olecomm.h.patch +PATCHFILES += olecomm.h.patch + # PATCHFILES += tchar.patch - # PATCHFILES += 0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch ###PATCHFILES += 0002-Fix-unresolved-symbols-part-1.patch @@ -27,6 +27,8 @@ PACKAGES += CSWlibfpx1 SPKG_DESC_CSWlibfpx1 = FlashPIX library, libfpx.so.1 PKGFILES_CSWlibfpx1 += $(call pkgfiles_lib,libfpx.so.1) +RUNTIME_DEP_PKGS_CSWlibfpx1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibfpx1 += CSWlibstdc++6 OBSOLETED_BY_CSWlibfpx1 += CSWlibfpx PACKAGES += CSWlibfpx-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Fri May 16 11:38:13 2014 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Fri, 16 May 2014 09:38:13 +0000 Subject: SF.net SVN: gar:[23623] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: <3gVPgb5CSBzM9@mail.opencsw.org> Revision: 23623 http://sourceforge.net/p/gar/code/23623 Author: guillomovitch Date: 2014-05-16 09:38:11 +0000 (Fri, 16 May 2014) Log Message: ----------- fusioninventory-agent/trunk: new version 2.3.8 Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile csw/mgar/pkg/fusioninventory-agent/trunk/checksums Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-05-16 08:58:19 UTC (rev 23622) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-05-16 09:38:11 UTC (rev 23623) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = fusioninventory-agent -VERSION = 2.3.7.1 +VERSION = 2.3.8 GARTYPE = v2 CATEGORIES = cpan Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2014-05-16 08:58:19 UTC (rev 23622) +++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2014-05-16 09:38:11 UTC (rev 23623) @@ -1 +1 @@ -a785e4206c4f03eb4bd031d9c91a9106 FusionInventory-Agent-2.3.7.1.tar.gz +875c4d2e3479f518badbfde270754581 FusionInventory-Agent-2.3.8.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 16 15:02:40 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 16 May 2014 13:02:40 +0000 Subject: SF.net SVN: gar:[23624] csw/mgar/pkg/poppler/trunk Message-ID: <3gVVCY238czl4@mail.opencsw.org> Revision: 23624 http://sourceforge.net/p/gar/code/23624 Author: slowfranklin Date: 2014-05-16 13:02:40 +0000 (Fri, 16 May 2014) Log Message: ----------- Update to 0.26.0 Add LFS define to CFLAGS in order to circumvent missing config.h includes in several source files. Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile csw/mgar/pkg/poppler/trunk/checksums Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2014-05-16 09:38:11 UTC (rev 23623) +++ csw/mgar/pkg/poppler/trunk/Makefile 2014-05-16 13:02:40 UTC (rev 23624) @@ -1,7 +1,7 @@ # $Id$ NAME = poppler -VERSION = 0.24.0 +VERSION = 0.26.0 GARTYPE = v2 DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base @@ -29,7 +29,7 @@ PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0\.2\.0) PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0(\.\d+)*) SPKG_DESC_CSWlibpoppler-cpp0 += $(DESCRIPTION), libpoppler-cpp.so.0 -RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler43 +RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler46 RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibstdc++6 @@ -56,7 +56,7 @@ RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpoppler43 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpoppler46 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibstdc++6 @@ -75,23 +75,23 @@ CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibjpeg7 CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWliblcms2-2 -PACKAGES += CSWlibpoppler43 -PKGFILES_CSWlibpoppler43 += $(call baseisadirs,$(libdir),libpoppler\.so\.43\.0\.0) -PKGFILES_CSWlibpoppler43 += $(call baseisadirs,$(libdir),libpoppler\.so\.43(\.\d+)*) -SPKG_DESC_CSWlibpoppler43 += $(DESCRIPTION), libpoppler.so.43 -RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibtiff5 -RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibpoppler43 += CSWlibstdc++6 +PACKAGES += CSWlibpoppler46 +PKGFILES_CSWlibpoppler46 += $(call baseisadirs,$(libdir),libpoppler\.so\.46\.0\.0) +PKGFILES_CSWlibpoppler46 += $(call baseisadirs,$(libdir),libpoppler\.so\.46(\.\d+)*) +SPKG_DESC_CSWlibpoppler46 += $(DESCRIPTION), libpoppler.so.46 +RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibtiff5 +RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibstdc++6 PACKAGES += CSWpoppler-dev SPKG_DESC_CSWpoppler-dev += $(DESCRIPTION), development files PKGFILES_CSWpoppler-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler43 +RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler46 RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-cpp0 RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-glib8 @@ -117,7 +117,7 @@ CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftotext.1|CSWpoppler|CSWxpdf CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdffonts.1|CSWpoppler|CSWxpdf CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftohtml.1|CSWpdftohtml|CSWpoppler -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler43 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler46 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWpoppler += CSWliblcms2-2 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibcairo2 @@ -128,6 +128,7 @@ # when relinking libpoppler-glib during install phaze EXTRA_SOS_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs) # EXTRA_CXXFLAGS += -D__EXTENSIONS__ +EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64 CONFIGURE_ARGS = $(DIRPATHS) ### Install unsupported xpdf headers. Modified: csw/mgar/pkg/poppler/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler/trunk/checksums 2014-05-16 09:38:11 UTC (rev 23623) +++ csw/mgar/pkg/poppler/trunk/checksums 2014-05-16 13:02:40 UTC (rev 23624) @@ -1 +1 @@ -891000481f639e996d000d767d953a7f poppler-0.24.0.tar.xz +76c3b2f18002a0f1e2bbbc7cccd1b957 poppler-0.26.0.tar.xz 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 16 15:47:34 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 16 May 2014 13:47:34 +0000 Subject: SF.net SVN: gar:[23625] csw/mgar/pkg/poppler/trunk/Makefile Message-ID: <3gVWCJ638FzrT@mail.opencsw.org> Revision: 23625 http://sourceforge.net/p/gar/code/23625 Author: slowfranklin Date: 2014-05-16 13:47:30 +0000 (Fri, 16 May 2014) Log Message: ----------- Use right LD_FLAGS for GCC Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2014-05-16 13:02:40 UTC (rev 23624) +++ csw/mgar/pkg/poppler/trunk/Makefile 2014-05-16 13:47:30 UTC (rev 23625) @@ -126,7 +126,7 @@ # Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib # when relinking libpoppler-glib during install phaze -EXTRA_SOS_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs) +EXTRA_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs) # EXTRA_CXXFLAGS += -D__EXTENSIONS__ EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64 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 16 16:22:14 2014 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 16 May 2014 14:22:14 +0000 Subject: SF.net SVN: gar:[23626] csw/mgar/pkg/clamav/trunk Message-ID: <3gVWzM0DBmzxx@mail.opencsw.org> Revision: 23626 http://sourceforge.net/p/gar/code/23626 Author: bonivart Date: 2014-05-16 14:22:13 +0000 (Fri, 16 May 2014) Log Message: ----------- clamav/trunk: test build of 0.98.4-rc1 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2014-05-16 13:47:30 UTC (rev 23625) +++ csw/mgar/pkg/clamav/trunk/Makefile 2014-05-16 14:22:13 UTC (rev 23626) @@ -1,5 +1,5 @@ NAME = clamav -VERSION = 0.98.1 +VERSION = 0.98.4-rc1 GARTYPE = v2 DESCRIPTION = Clam AntiVirus @@ -17,6 +17,7 @@ RUNTIME_DEP_PKGS_CSWclamav += CSWlibz1 RUNTIME_DEP_PKGS_CSWclamav += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWclamav += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWclamav += CSWlibssl1-0-0 PACKAGES += CSWlibclam6 CATALOGNAME_CSWlibclam6 = libclam6 @@ -27,6 +28,8 @@ RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibssl1-0-0 INCOMPATIBLE_PKGS_CSWlibclam6 = CSWlibclamav PACKAGES += CSWlibclam6-dev @@ -53,6 +56,7 @@ #CONFIGURE_ARGS += --disable-llvm #CONFIGURE_ARGS += --enable-check CONFIGURE_ARGS += --enable-clamdtop +CONFIGURE_ARGS += --with-openssl=/opt/csw # Enable support for files > 2GB in size. #EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE @@ -88,13 +92,13 @@ CHECKPKG_OVERRIDES_CSWclamav += missing-dependency|CSWperl # These are harmless examples -CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.20 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW +CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.23 # We don't split to three separate packages -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.20|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.20|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.20|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.23|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.23|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.23|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 # Weirdly needed for sparc CHECKPKG_OVERRIDES_CSWlibclam6 += surplus-dependency|CSWlibstdc++6 Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2014-05-16 13:47:30 UTC (rev 23625) +++ csw/mgar/pkg/clamav/trunk/checksums 2014-05-16 14:22:13 UTC (rev 23626) @@ -1 +1 @@ -4ab14833d959d5d62c64ce8d9bd16a5e clamav-0.98.1.tar.gz +46e801719299b3d3c7a07b48a9c65b9d clamav-0.98.4-rc1.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 Sat May 17 12:50:11 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sat, 17 May 2014 10:50:11 +0000 Subject: SF.net SVN: gar:[23627] csw/mgar/pkg/netatalk/trunk Message-ID: <3gW3DN3PnfzJQ@mail.opencsw.org> Revision: 23627 http://sourceforge.net/p/gar/code/23627 Author: slowfranklin Date: 2014-05-17 10:50:08 +0000 (Sat, 17 May 2014) Log Message: ----------- Start and manage Tracker stuff via SMF 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/0006-Disable-Tracker-autostart.patch csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-16 14:22:13 UTC (rev 23626) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-17 10:50:08 UTC (rev 23627) @@ -34,7 +34,7 @@ BUILD_DEP_PKGS += CSWlibpcre-dev RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS += CSWlibgcrypt11 +RUNTIME_DEP_PKGS += CSWlibgcrypt20 RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS += CSWlibkrb5-3 @@ -53,6 +53,7 @@ PATCHFILES += 0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch PATCHFILES += 0004-Ensure-gsettings-is-called-from-opt-csw-bin.patch +PATCHFILES += 0006-Disable-Tracker-autostart.patch # will be in 3.1.2: PATCHFILES += 33dd614058f32bbe3c88734654228d8715f2403e.patch @@ -86,6 +87,8 @@ # Path to XML dtd CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml +CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-tracker-miner-fs.xml +CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-tracker-extract.xml CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/bin/afppasswd CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_pam.so CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_passwd.so @@ -97,4 +100,6 @@ 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 + ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-extract.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ + ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-miner-fs.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ @$(MAKECOOKIE) Added: csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch 2014-05-17 10:50:08 UTC (rev 23627) @@ -0,0 +1,24 @@ +From 7c7fc8caad4ff92b63962ed35f342a28e2c79398 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sat, 17 May 2014 09:56:50 +0200 +Subject: [PATCH] Disable Tracker autostart + +--- + etc/netatalk/netatalk.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c +index 4cdc466..1a304d1 100644 +--- a/etc/netatalk/netatalk.c ++++ b/etc/netatalk/netatalk.c +@@ -419,7 +419,6 @@ int main(int argc, char **argv) + setenv("TRACKER_LANGUAGE_STOPWORDS_DIR", TRACKER_PREFIX "/share/tracker/languages", 0); + #endif + set_sl_volumes(); +- system(TRACKER_PREFIX "/bin/tracker-control -s"); + #endif + + /* run the event loop */ +-- +1.8.4.1 + Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2014-05-16 14:22:13 UTC (rev 23626) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2014-05-17 10:50:08 UTC (rev 23627) @@ -1,2 +1,5 @@ #!/bin/sh chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk.xml > /dev/null 2>&1 + +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-tracker-extract.xml > /dev/null 2>&1 +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-tracker-miner-fs.xml > /dev/null 2>&1 Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2014-05-16 14:22:13 UTC (rev 23626) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2014-05-17 10:50:08 UTC (rev 23627) @@ -1,2 +1,4 @@ #!/bin/sh chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk-tracker-extract +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk-tracker-miner-fs Added: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml =================================================================== (Binary files differ) Index: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml 2014-05-16 14:22:13 UTC (rev 23626) +++ csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml 2014-05-17 10:50:08 UTC (rev 23627) Property changes on: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/xml \ No newline at end of property Added: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml =================================================================== (Binary files differ) Index: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml 2014-05-16 14:22:13 UTC (rev 23626) +++ csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml 2014-05-17 10:50:08 UTC (rev 23627) Property changes on: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/xml \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat May 17 14:34:45 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 May 2014 12:34:45 +0000 Subject: SF.net SVN: gar:[23628] csw/mgar/gar/v2/bin/cswch Message-ID: <3gW5Y60v21zQP@mail.opencsw.org> Revision: 23628 http://sourceforge.net/p/gar/code/23628 Author: guengel Date: 2014-05-17 12:34:43 +0000 (Sat, 17 May 2014) Log Message: ----------- v2/bin/cswch: * changelog specific exceptions now have a common base class * added support for Dam style changelog files * added new command 'refresh': update timestamps of latest changelog entry * complain if changelog file is not under version control (can be disabled with --no-svn) Modified Paths: -------------- csw/mgar/gar/v2/bin/cswch Modified: csw/mgar/gar/v2/bin/cswch =================================================================== --- csw/mgar/gar/v2/bin/cswch 2014-05-17 10:50:08 UTC (rev 23627) +++ csw/mgar/gar/v2/bin/cswch 2014-05-17 12:34:43 UTC (rev 23628) @@ -50,16 +50,34 @@ class TestChangeLogHeader(unittest.TestCase): """Test ChangeLogHeader""" - def test_changelogheader(self): - """initialize changelog header with keywords""" + def test_deb_changelogheader(self): + """initialize debian changelog header with keywords""" chlg = ChangeLogHeader(package='test', version='0.1', rev='1991.09.04') + self.assertEqual(ChangeLogHeader.STYLE_DEB, chlg.style) self.assertEqual('test (0.1,REV=1991.09.04)', str(chlg)) - def test_parser(self): - """initialize changelog header from line""" + def test_deb_parser(self): + """initialize debian changelog header from line""" chlg = ChangeLogHeader(line='test (0.1,REV=1991.09.04)') + self.assertEqual(ChangeLogHeader.STYLE_DEB, chlg.style) self.assertEqual('test (0.1,REV=1991.09.04)', str(chlg)) + def test_dam_changelogheader(self): + """initialize dam changelog header with keywords""" + ts = '2014-01-01T00:01:02+0000' + package = 'testdam' + header_str = ChangeLogHeader.format_str_dam % {'package': package, + 'timestamp': ts} + chlg = ChangeLogHeader(package=package, timestamp=ts) + self.assertEqual(ChangeLogHeader.STYLE_DAM, chlg.style) + self.assertEqual(header_str, str(chlg)) + + def test_dam_parser(self): + """initialize dam changelog header from line""" + line = 'testdam (2014-01-01T00:01:02+0300)' + chlg = ChangeLogHeader(line=line) + self.assertEqual(ChangeLogHeader.STYLE_DAM, chlg.style) + def test_garbled(self): """test garbled changelog header""" self.assertRaises(GarbledChangeLogHeader, @@ -199,7 +217,13 @@ ### C O D E ### -class GarbledChangeLogHeader(Exception): +class ChangeLogException(Exception): + """Exception Base class""" + def __init__(self): + super(ChangeLogException, self).__init__() + + +class GarbledChangeLogHeader(ChangeLogException): """Garbled ChangeLog header Raised if parsing of ChangeLog header fails. @@ -216,7 +240,7 @@ return str(self) -class GarbledChangeLogFooter(Exception): +class GarbledChangeLogFooter(ChangeLogException): """Garbled ChangeLog footer Raised if parsing of ChangeLog footer fails. @@ -233,7 +257,7 @@ return str(self) -class EmptyChangeLogFile(Exception): +class EmptyChangeLogFile(ChangeLogException): """Empty ChangeLog File Raised if operation expect existing entries in the ChangeLog File @@ -251,6 +275,19 @@ return str(self) +class OperationNotApplicable(ChangeLogException): + """Operation is not applicable to the given changelog file style""" + def __init__(self, style): + super(OperationNotApplicable, self).__init__() + self.style = style + + def __str__(self): + return "Operation not applicable to %s style change logs" % (self.style,) + + def __repr__(self): + return str(self) + + class ChangeLogHeader(object): """Constitutes a changelog header. @@ -277,21 +314,38 @@ self.parse_line(kwargs['line']) return - assert 'package' in kwargs and 'version' in kwargs + assert 'package' in kwargs - self.package = kwargs['package'] - self.version = kwargs['version'] + if 'version' in kwargs and kwargs['version'] is not None: + # Must be Debian style changelog + self.package = kwargs['package'] + self.version = kwargs['version'] - if 'rev' not in kwargs: - self.rev = ChangeLogHeader.opencsw_rev() + if 'rev' not in kwargs: + self.rev = ChangeLogHeader.opencsw_rev() + else: + self.rev = kwargs['rev'] + + self.style = ChangeLogHeader.STYLE_DEB else: - self.rev = kwargs['rev'] + # dam style changelog + self.package = kwargs['package'] + if 'timestamp' in kwargs: + self.timestamp = kwargs['timestamp'] + else: + self.timestamp = ChangeLogHeader.get_rfc3339timestamp() + self.style = ChangeLogHeader.STYLE_DAM + + def __str__(self): - """Get the ChangeLog header""" - return ChangeLogHeader.format_str % {'package': self.package, - 'version': self.version, - 'rev': self.rev} + """Get the ChangeLog header as string""" + if self.style == ChangeLogHeader.STYLE_DEB: + return ChangeLogHeader.format_str_deb % {'package': self.package, + 'version': self.version, + 'rev': self.rev} + return ChangeLogHeader.format_str_dam % {'package': self.package, + 'timestamp': self.timestamp} def parse_line(self, line): """Parse ChangeLog header @@ -299,16 +353,40 @@ Dissect a ChangeLog header into package, version, and revision. + It will try to parse Debian style and Dam style header lines + and set self.style according to the style. + """ - matches = ChangeLogHeader.compiled_re.match(line) + matches = ChangeLogHeader.compiled_re_deb.match(line) if matches is None: - raise GarbledChangeLogHeader(line) + # Now, try dam style + matches = ChangeLogHeader.compiled_re_dam.match(line) + if matches is None: + raise GarbledChangeLogHeader(line) + self.package = matches.group('package') + self.timestamp = matches.group('timestamp') + self.style = ChangeLogHeader.STYLE_DAM + ## Leave method! + return + + # Debian style log self.package = matches.group('package') self.version = matches.group('version') self.rev = matches.group('rev') + self.style = ChangeLogHeader.STYLE_DEB + def refresh_timestamp(self): + """Set timestamp to current date/time + + Just a convenience method. + """ + if self.style == ChangeLogHeader.STYLE_DEB: + self.rev = ChangeLogHeader.opencsw_rev() + else: + self.timestamp = ChangeLogHeader.get_rfc3339timestamp() + @classmethod def opencsw_rev(cls, date=None): """Convert a date to as string suitable for REV= @@ -321,11 +399,34 @@ return date.strftime('%Y.%m.%d') - format_str = r'%(package)s (%(version)s,REV=%(rev)s)' - parse_re = r'(?P[\w-]+) \((?P[\d\.]+),REV=(?P\d{4}\.\d{2}\.\d{2})\)' - compiled_re = re.compile(parse_re) + @classmethod + def get_rfc3339timestamp(cls, date_obj=None): + """Return a timestamp in the format specified in RFC3339, section 5.6 + :param date_obj: datetime object to be formatted. If None, the + current time will be taken. + :retval: datetime formatted as RFC3339 timestamp + + """ + if date_obj is None: + timezone = dateutil.tz.tzlocal() + date_obj = datetime.datetime.now(timezone) + + return date_obj.strftime('%Y-%m-%dT%H:%M:%S%z') + + format_str_deb = r'%(package)s (%(version)s,REV=%(rev)s)' + parse_re_deb = r'(?P[\w-]+) \((?P[\d\.]+),REV=(?P\d{4}\.\d{2}\.\d{2})\)' + compiled_re_deb = re.compile(parse_re_deb) + + format_str_dam = r'%(package)s (%(timestamp)s)' + parse_re_dam = r'(?P[\w-]+) \((?P[\d]{4}-[\d]{2}-[\d]{2}T[\d]{2}:[\d]{2}:[\d]{2}(?:\+|-)[\d]{4})\)' + compiled_re_dam = re.compile(parse_re_dam) + + STYLE_DEB = 'debian' + STYLE_DAM = 'dam' + + class ChangeLogFooter(object): """End a changelog entry. @@ -357,7 +458,7 @@ self.timestamp = ChangeLogFooter.get_rfc2822timestamp() def __str__(self): - return ChangeLogFooter.format_str % {'maintainer': self.maintainer, + return ChangeLogFooter.format_str_deb % {'maintainer': self.maintainer, 'email': self.email, 'timestamp': self.timestamp} @@ -368,7 +469,7 @@ timestamp. """ - matches = ChangeLogFooter.compiled_re.match(line) + matches = ChangeLogFooter.compiled_re_deb.match(line) if matches is None: raise GarbledChangeLogFooter(line) @@ -377,6 +478,13 @@ self.email = matches.group('email') self.timestamp = matches.group('timestamp') + def refresh_timestamp(self): + """Set timestamp to current date/time + + Just a convenience method. + """ + self.timestamp = ChangeLogFooter.get_rfc2822timestamp() + @classmethod def get_rfc2822timestamp(cls, date_obj=None): """Return a timestamp in the proper format. @@ -390,8 +498,7 @@ """ if date_obj is None: timezone = dateutil.tz.tzlocal() - today = datetime.datetime.now(timezone) - return email.utils.formatdate(time.mktime(today.timetuple()), True) + date_obj = datetime.datetime.now(timezone) return email.utils.formatdate(time.mktime(date_obj.timetuple()), True) @@ -411,9 +518,9 @@ return (fullname, m_email) - format_str = r' -- %(maintainer)s <%(email)s> %(timestamp)s' - parse_re = r' -- (?P[\w\d ]+) <(?P[\w\d@ \.]+)> (?P\w{3}, \d{1,2} \w{3} \d{4} \d{2}:\d{2}:\d{2} (\+|-)\d{4})' - compiled_re = re.compile(parse_re) + format_str_deb = r' -- %(maintainer)s <%(email)s> %(timestamp)s' + parse_re_deb = r' -- (?P[\w\d ]+) <(?P[\w\d@ \.]+)> (?P\w{3}, \d{1,2} \w{3} \d{4} \d{2}:\d{2}:\d{2} (\+|-)\d{4})' + compiled_re_deb = re.compile(parse_re_deb) class ChangeLogParagraph(object): @@ -593,6 +700,12 @@ self.changelog_entries = list() def read(self): + """Read the ChangeLogFile + + Raises an exception 'ChangeLogFileEmpty()' if the file is + empty, or no ChangeLogEnties could be extracted. + + """ changelog_entry = None current_paragraph = None with open(self.filename, "r") as fobj: @@ -637,6 +750,9 @@ else: current_paragraph.add_line(line) + if len(self.changelog_entries) < 1: + raise EmptyChangeLogFile(self.filename) + def save(self): """Save ChangeLog entries to file""" with open(self.filename, 'w') as fobj: @@ -644,11 +760,20 @@ self.changelog_entries] def versions(self): - """Return a list of all versions in the ChangeLog file""" + """Return a list of all versions in the ChangeLog file - if (len(self.changelog_entries) < 1): + When called on a Dam style changelog file, it throws an + exception, since Dam style changelog files do not have a + version. + + """ + + if len(self.changelog_entries) < 1: return None + if self.changelog_entries[0].header.style == ChangeLogHeader.STYLE_DAM: + raise OperationNotApplicable(ChangeLogHeader.STYLE_DAM) + return [changelog_entry.header.version for changelog_entry in self.changelog_entries] @@ -662,9 +787,11 @@ Package name is returned as defined by the first entry of the ChangeLog file. + None is returned if changelog file is empty. + """ if len(self.changelog_entries) < 1: - return "" + return None return self.changelog_entries[0].header.package @@ -718,12 +845,18 @@ else: self.changelog_entries[0].add_paragraph(paragraph, True) - latest_header = self.changelog_entries[0].header - latest_header.rev = ChangeLogHeader.opencsw_rev() - self.changelog_entries[0].add_header(latest_header) - self.changelog_entries[0].add_footer(ChangeLogFooter()) + self.refresh_timestamps() + def refresh_timestamps(self): + """Set the timestamps of the latest entry to the current date + Timestamps of ChangeLogHeader and ChangeLogFooter will updated. + """ + assert len(self.changelog_entries) > 0 + + self.changelog_entries[0].header.refresh_timestamp() + self.changelog_entries[0].footer.refresh_timestamp() + def svn_add(self): """Add file to svn repository @@ -731,8 +864,6 @@ directory. Else it does nothing. """ - assert len(self.changelog_entries) > 0 - # First of all, make sure the file exists if not os.path.exists(self.filename): raise OSError((errno.ENOENT, 'No such file: %s' % self.filename)) @@ -756,19 +887,59 @@ svnclient.add([self.filename]) logging.info("Scheduled file '%s' for addition to SVN repository", self.filename) + def in_svn(self): + """Checks if ChangeLogFile is added to SVN working directory. + :returns: True if the file is added to the SVN working + directory, else False. + + """ + # First of all, make sure the file exists + if not os.path.exists(self.filename): + raise OSError((errno.ENOENT, 'No such file: %s' % self.filename)) + + svnclient = pysvn.Client() + + try: + svnclient.info(self.filename) + except pysvn.ClientError: + return False + + return True + + def changelog_style(self): + """Get the type of the changelog + + Determines the style of the changelog by reading the first line. + """ + with open(self.filename, "r") as changelog_file: + # read and parse the first line + changelog_header = ChangeLogHeader(line=changelog_file.readline()) + return changelog_header.style + + def new_changelog_entry(filename, version, log): + """Create a new change log entry + + :param version: has to be None for Dam style log files. + """ changelog_file = ChangeLogFile(filename) + + style = changelog_file.changelog_style() + if style == ChangeLogHeader.STYLE_DAM and\ + version is not None: + logging.error("Changelog '%s' is Dam style. Version does not apply.", + filename) + sys.exit(1) + changelog_file.read() - if changelog_file.versions() is None: - raise EmptyChangeLogFile(filename) - # get the package from the first entry package = changelog_file.get_package() header = ChangeLogHeader(package=package, version=version) + paragraphs = [ChangeLogParagraph(log_para) for log_para in log] footer = ChangeLogFooter() @@ -776,19 +947,27 @@ changelog_file.save() def update_changelog_entry(filename, log): + changelog_file = ChangeLogFile(filename) changelog_file.read() - if changelog_file.versions() is None: - raise EmptyChangeLogFile(filename) - [changelog_file.update_latest(ChangeLogParagraph(l)) for l in log] changelog_file.save() -def create_changelog_file(filename, overwrite, package, version, log, register_svn): - header = ChangeLogHeader(package=package, - version=version) +def refresh_changelog(filename): + changelog_file = ChangeLogFile(filename) + changelog_file.read() + + changelog_file.refresh_timestamps() + + changelog_file.save() + +def create_changelog_file(filename, style, overwrite, package, + version, log, register_svn): + # For Dam style changelogs, version is expected to be None + header = ChangeLogHeader(package=package, version=version) + footer = ChangeLogFooter() paragraphs = [ChangeLogParagraph(log_para) for log_para in log] @@ -811,6 +990,33 @@ else: print(changelog_file.versions()[0]) +def compile_log(logitem, logparagraph): + """Create a list of strings having the proper format to be fed to + ChangeLogParagraph + + Returns a list of strings that is suitable for feeding to + ChangeLogParagraph, i.e. item style entries are prepended with ' * + ' and plain paragraphs are left alone. + + """ + log = list() + if logitem: + log = [' * ' + item for item in logitem] + + if logparagraph: + log.extend(logparagraph) + + return log + +def cond_complain_svn(filename, complain): + """Conditionally complain about changelog file not registered in SVN + + :param complain: if True and file is not in SVN, complain. Else do nothin. + """ + changelogfile = ChangeLogFile(filename) + if complain and not changelogfile.in_svn(): + logging.warn("%s is not under version control", changelogfile.filename) + def cmdline_parse(): """Parse the command line @@ -821,15 +1027,28 @@ parser.add_argument('--logfile', help='filename to use (default: %(default)s)', default='files/changelog.CSW') + parser.add_argument('--no-svn', help="Do not add file to SVN repository or stop complaining about file not registerd with svn.", + default=False, action='store_const', + const=True) subparser = parser.add_subparsers(help='sub-command help', dest='command') parser_create = subparser.add_parser('create', help="create new changelog.CSW file. Existing file will not be overwritten.") + group = parser_create.add_mutually_exclusive_group() + group.add_argument('--deb-style', + help='Create a Debian style changelog', + action='store_const', + dest='style', const=ChangeLogHeader.STYLE_DEB) + group.add_argument('--dam-style', + help='Create a Dam style changelog', + action='store_const', + dest='style', const=ChangeLogHeader.STYLE_DAM) parser_create.add_argument('package', help="package name") - parser_create.add_argument('version', - help="package version") + parser_create.add_argument('--version', + help="package version (only required for Debian style changelog)", + required=False) parser_create.add_argument('--log-item', help="the log entry to be recorded as list item", nargs='*') @@ -839,14 +1058,12 @@ parser_create.add_argument('--force', help="force creation of file. Overwrite existing file.", default=False, action='store_const', const=True) - parser_create.add_argument('--no-svn', help="Do not add file to SVN repository.", - default=False, action='store_const', - const=True) parser_new = subparser.add_parser('new', help="new changelog entry") - parser_new.add_argument('version', - help="new version") + parser_new.add_argument('--version', + help="new version (only required for Debian style changelog)", + required=False) parser_new.add_argument('--log-item', help="the log entry to be recorded as list item", nargs='*') @@ -864,6 +1081,9 @@ help="the log entry to be recorded as plain paragraph", nargs='*') + parser_refresh = subparser.add_parser('refresh', + help="refresh header and footer of latest changelog entry") + parser_version = subparser.add_parser('version', help="retrieve version from changelog.CSW") parser_version.add_argument('--all-versions', @@ -880,19 +1100,14 @@ arguments.log_item is None: parser.error("'%s' requires either '--log-paragraph' or '--log-item'" % arguments.command) + if arguments.command == "create" and\ + arguments.style == ChangeLogHeader.STYLE_DAM and\ + arguments.version is not None: + parser.error("Dam style changelogs do not take version") + return arguments -def compile_log(logitem, logparagraph): - log = list() - if logitem: - log = [' * ' + item for item in logitem] - if logparagraph: - log.extend(logparagraph) - - return log - - if __name__ == '__main__': arguments = cmdline_parse() @@ -902,24 +1117,34 @@ del sys.argv[1:] unittest.main() - if arguments.command == "create": - log = compile_log(arguments.log_item, arguments.log_paragraph) - create_changelog_file(arguments.logfile, - arguments.force, - arguments.package, - arguments.version, - log, - not arguments.no_svn) + try: + if arguments.command == "create": + log = compile_log(arguments.log_item, arguments.log_paragraph) + create_changelog_file(arguments.logfile, + arguments.style, + arguments.force, + arguments.package, + arguments.version, + log, + not arguments.no_svn) - if arguments.command == "new": - log = compile_log(arguments.log_item, arguments.log_paragraph) - new_changelog_entry(arguments.logfile, - arguments.version, - log) + if arguments.command == "new": + log = compile_log(arguments.log_item, arguments.log_paragraph) + new_changelog_entry(arguments.logfile, + arguments.version, + log) + cond_complain_svn(arguments.logfile, not arguments.no_svn) - if arguments.command == "update": - log = compile_log(arguments.log_item, arguments.log_paragraph) - update_changelog_entry(arguments.logfile, log) + if arguments.command == "update": + log = compile_log(arguments.log_item, arguments.log_paragraph) + update_changelog_entry(arguments.logfile, log) + cond_complain_svn(arguments.logfile, not arguments.no_svn) - if arguments.command == "version": - get_version(arguments.logfile, arguments.all_versions) + if arguments.command == "refresh": + refresh_changelog(arguments.logfile) + cond_complain_svn(arguments.logfile, not arguments.no_svn) + + if arguments.command == "version": + get_version(arguments.logfile, arguments.all_versions) + except ChangeLogException as ex: + logging.error(str(ex)) 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 17 17:24:24 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 May 2014 15:24:24 +0000 Subject: SF.net SVN: gar:[23629] csw/mgar/pkg/gtk2/trunk Message-ID: <3gW9Jn5T48zYS@mail.opencsw.org> Revision: 23629 http://sourceforge.net/p/gar/code/23629 Author: guengel Date: 2014-05-17 15:24:19 +0000 (Sat, 17 May 2014) Log Message: ----------- gtk2/trunk: Update dependencies and overrides. Added changelog.CSW Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile csw/mgar/pkg/gtk2/trunk/files/changelog.CSW Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2014-05-17 12:34:43 UTC (rev 23628) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2014-05-17 15:24:19 UTC (rev 23629) @@ -26,6 +26,7 @@ DISTFILES = $(DISTNAME).tar.xz DISTFILES += CSWgtk2.postinstall DISTFILES += README.CSW +DISTFILES += changelog.CSW EXPANDVARS = CSWgtk2.postinstall @@ -53,10 +54,13 @@ RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtk2 += CSWpango RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWgtk2 += CSWglib2 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWpango # This is used to so that pango-querymodules is run +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpangocairo1-0-0 # This is required for gtk-update-icon-cache, so that it doesn't fail in the # postinstall script. RUNTIME_DEP_PKGS_CSWgtk2 += CSWhicoloricontheme @@ -64,6 +68,7 @@ CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWgdkpixbuf CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWhicoloricontheme CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWglib2 +CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWpango # Remove after -z ignore issue has been resolved CHECKPKG_OVERRIDES_CSWgtk2 += soname-unused RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxrender @@ -74,7 +79,10 @@ CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibxrender CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibgio2-0-0 CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibfreetype6 +CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibpangoft2-1-0-0 +CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibpangocairo1-0-0 + PACKAGES += CSWgtk2-printbackends-papi ARCHALL_CSWgtk2-printbackends-papi = 1 SPKG_DESC_CSWgtk2-printbackends-papi = $(DESCRIPTION), Print Backend (OBSOLETE) @@ -91,6 +99,9 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpangocairo1-0-0 # Remove after -z ignore issue has been resolved CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += soname-unused RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgmodule2-0-0 @@ -99,16 +110,17 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibxrender RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWpango RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibfontconfig1 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibfontconfig1 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibgmodule2-0-0 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibintl8 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibxrender -CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWpango CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibatk1-0-0 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibgdk-pixbuf2-0-0 +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibpangoft2-1-0-0 +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibpangocairo1-0-0 +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibpango1-0-0 PACKAGES += CSWgtk2-printbackends-cups SPKG_DESC_CSWgtk2-printbackends-cups = $(DESCRIPTION), CUPS Print Backend @@ -121,6 +133,9 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpangocairo1-0-0 # Remove after -z ignore issue has been resolved CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += soname-unused RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgmodule2-0-0 @@ -131,7 +146,6 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibxrender RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWpango RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgio2-0-0 @@ -140,13 +154,15 @@ CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibintl8 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibxrender CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgpg-error0 -CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWpango CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibz1 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibatk1-0-0 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgdk-pixbuf2-0-0 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgnutls28 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgio2-0-0 +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibpangoft2-1-0-0 +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibpangocairo1-0-0 +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibpango1-0-0 PACKAGES += CSWgtk2-printbackends-lpr @@ -158,6 +174,9 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpangocairo1-0-0 # Remove once -z ignore issue has been resolved CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += soname-unused RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgmodule2-0-0 @@ -167,19 +186,20 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibxrender RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWpango RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibatk1-0-0 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibfontconfig1 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgmodule2-0-0 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibintl8 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibxrender -CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWpango CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgdk-x11-2-0-0 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibatk1-0-0 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgdk-pixbuf2-0-0 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgio2-0-0 +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibpangoft2-1-0-0 +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibpangocairo1-0-0 +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibpango1-0-0 PACKAGES += CSWlibgailutil18 SPKG_DESC_CSWlibgailutil18 = $(DESCRIPTION), libgailutil @@ -190,8 +210,10 @@ RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgtk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWpango RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpangocairo1-0-0 # Remove once -z ignore issue has been resolved CHECKPKG_OVERRIDES_CSWlibgailutil18 += soname-unused RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgmodule2-0-0 @@ -210,6 +232,8 @@ CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibgio2-0-0 CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibgdk-pixbuf2-0-0 +CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibpangoft2-1-0-0 +CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibpangocairo1-0-0 PACKAGES += CSWlibgdk-x11-2-0-0 SPKG_DESC_CSWlibgdk-x11-2-0-0 = $(DESCRIPTION), libgdk-x11-2.0 @@ -223,12 +247,15 @@ RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWpango RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibpangocairo1-0-0 # Remove once -z ignore issue has been resolved CHECKPKG_OVERRIDES_CSWlibgdk-x11-2-0-0 += soname-unused RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgmodule2-0-0 CHECKPKG_OVERRIDES_CSWlibgdk-x11-2-0-0 += surplus-dependency|CSWlibgmodule2-0-0 +CHECKPKG_OVERRIDES_CSWlibgdk-x11-2-0-0 += surplus-dependency|CSWlibfreetype6 PACKAGES += CSWlibgtk-x11-2-0-0 SPKG_DESC_CSWlibgtk-x11-2-0-0 = $(DESCRIPTION), libgtk-x11-2.0 @@ -244,14 +271,18 @@ RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWpango RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWpango # This is used so that pango-querymodules is run # remove after -z ignore issue has been resolved CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += soname-unused RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibxrender RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += surplus-dependency|CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += surplus-dependency|CSWlibxrender +CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += surplus-dependency|CSWpango PACKAGES += CSWlibgtk2-dev SPKG_DESC_CSWlibgtk2-dev = $(DESCRIPTION), Development files @@ -279,19 +310,22 @@ RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpango -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpangodevel +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpango-dev +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpangocairo1-0-0 OBSOLETED_BY_CSWlibgtk2-dev = CSWgtk2devel CATALOGNAME_CSWgtk2devel = gtk2_devel_stub CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibgdk-pixbuf-dev CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibcairo-dev CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibatk-dev CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibglib2-dev -CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWpangodevel +CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibpango-dev CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgtk2 CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgdkpixbuf CHECKPKG_OVERRIDES_CSWlibgtk2-dev += soname-unused CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibfreetype6 PACKAGES += CSWgtk2doc SPKG_DESC_CSWgtk2doc = $(DESCRIPTION), Documentation @@ -306,7 +340,7 @@ BUILD_DEP_PKGS += CSWcups-dev BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibatk-dev -BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibpango-dev BUILD_DEP_PKGS += CSWlibcairo-dev BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev BUILD_DEP_PKGS += CSWsunx11devel Modified: csw/mgar/pkg/gtk2/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/changelog.CSW 2014-05-17 12:34:43 UTC (rev 23628) +++ csw/mgar/pkg/gtk2/trunk/files/changelog.CSW 2014-05-17 15:24:19 UTC (rev 23629) @@ -1,9 +1,9 @@ -gtk2 (2.24.22,REV=2014.05.11) +gtk2 (2.24.22,REV=2014.05.17) * let gtk-query-immodules-2.0 write /opt/csw/lib/gtk-2.0/2.10.0/immodules.cache in postinstall script instead of /etc/opt/csw/gtk-2.0/gtk.immodules, which had no effect. - -- Rafael Ostertag Sun, 11 May 2014 18:25:18 +0200 + -- Rafael Ostertag Sat, 17 May 2014 15:02:48 +0200 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 17 19:18:29 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 17 May 2014 17:18:29 +0000 Subject: SF.net SVN: gar:[23630] csw/mgar/pkg/ImageMagick/trunk Message-ID: <3gWCrG5r7hzhZ@mail.opencsw.org> Revision: 23630 http://sourceforge.net/p/gar/code/23630 Author: lblume Date: 2014-05-17 17:18:28 +0000 (Sat, 17 May 2014) Log Message: ----------- ImageMagick/trunk: Bump to beta version for bug 5170 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-05-17 15:24:19 UTC (rev 23629) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-05-17 17:18:28 UTC (rev 23630) @@ -1,6 +1,7 @@ NAME = imagemagick VERSION = 6.8.9 -GARSUBREV = 1 +GARSUBREV = 2 +BETAREV = beta20140516 GARTYPE = v2 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -11,9 +12,9 @@ PhotoCD, and GIF. endef -MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/ +MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/beta/ DISTNAME = ImageMagick-$(VERSION)-$(GARSUBREV) -DISTFILES = $(DISTNAME).tar.xz +DISTFILES = $(DISTNAME)~$(BETAREV).tar.xz DISTFILES += map.ImageMagick # libc 1.22.5 for gnutls Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2014-05-17 15:24:19 UTC (rev 23629) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2014-05-17 17:18:28 UTC (rev 23630) @@ -1 +1 @@ -bde038ae05fb20d29cebf88ab9cbdce5 ImageMagick-6.8.9-1.tar.xz +763ffef97e3579f98926fe7be735138b ImageMagick-6.8.9-2~beta20140516.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 Sat May 17 19:33:22 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 17 May 2014 17:33:22 +0000 Subject: SF.net SVN: gar:[23631] csw/mgar/pkg/lang-python/sqlobject/trunk Message-ID: <3gWD9P4NfDzlv@mail.opencsw.org> Revision: 23631 http://sourceforge.net/p/gar/code/23631 Author: wahwah Date: 2014-05-17 17:33:21 +0000 (Sat, 17 May 2014) Log Message: ----------- lang-python/sqlobject/trunk: Version bump 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 2014-05-17 17:18:28 UTC (rev 23630) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2014-05-17 17:33:21 UTC (rev 23631) @@ -3,7 +3,7 @@ # $Id$ NAME = SQLObject -VERSION = 1.5.1 +VERSION = 1.6.0 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Object Relational Manager for Python Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2014-05-17 17:18:28 UTC (rev 23630) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2014-05-17 17:33:21 UTC (rev 23631) @@ -1 +1 @@ -0ac4aa31d89ea151ae66266420a1b521 SQLObject-1.5.1.tar.gz +ba05831da469d61e2ff6fb65f1060df9 SQLObject-1.6.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 Sun May 18 00:05:41 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 17 May 2014 22:05:41 +0000 Subject: SF.net SVN: gar:[23632] csw/mgar/pkg/lang-python Message-ID: <3gWLCg0hf3z1DS@mail.opencsw.org> Revision: 23632 http://sourceforge.net/p/gar/code/23632 Author: wahwah Date: 2014-05-17 22:05:37 +0000 (Sat, 17 May 2014) Log Message: ----------- asyncio: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/asyncio/ csw/mgar/pkg/lang-python/asyncio/trunk/Makefile csw/mgar/pkg/lang-python/asyncio/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/asyncio/trunk/Makefile csw/mgar/pkg/lang-python/asyncio/trunk/checksums Deleted: csw/mgar/pkg/lang-python/asyncio/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/requests/trunk/Makefile 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/asyncio/trunk/Makefile 2014-05-17 22:05:37 UTC (rev 23632) @@ -1,37 +0,0 @@ -# $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# -NAME = requests -# VERSION = 426734d -VERSION = 0.14.2 -GARTYPE = v2 -CATEGORIES = python - -DESCRIPTION = Python HTTP library -define BLURB - Long description -endef - -# MASTER_SITES = https://github.com/kennethreitz/requests/tarball/ -MASTER_SITES = http://pypi.python.org/packages/source/r/requests/ -DISTFILES = $(NAME)-$(VERSION).tar.gz - - -# GIT_REPOS = http://github.com/kennethreitz/requests.git -# GIT_TREEISH_requests.git = $(VERSION) -NOGITPATCH = 1 - -REINPLACE_USRLOCAL = requests/utils.py - -VENDOR_URL = https://github.com/kennethreitz/requests - -RUNTIME_DEP_PKGS += CSWpy-chardet -CHECKPKG_OVERRIDES_CSWpy-requests += surplus-dependency|CSWpy-chardet - -PACKAGES = CSWpy-requests -ARCHALL_CSWpy-requests = 1 - -SKIPTEST = 1 - -include gar/category.mk - Copied: csw/mgar/pkg/lang-python/asyncio/trunk/Makefile (from rev 22221, csw/mgar/pkg/lang-python/requests/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/asyncio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/asyncio/trunk/Makefile 2014-05-17 22:05:37 UTC (rev 23632) @@ -0,0 +1,21 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = asyncio +VERSION = 0.4.1 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Reference implementation of PEP 3156 + +DISTFILES = $(NAME)-$(VERSION).tar.gz + +VENDOR_URL = https://pypi.python.org/pypi/$(NAME) + +PACKAGES = CSWpy-asyncio +ARCHALL_CSWpy-asyncio = 1 + +SKIPTEST = 1 + +include gar/category.mk + Deleted: csw/mgar/pkg/lang-python/asyncio/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/requests/trunk/checksums 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/asyncio/trunk/checksums 2014-05-17 22:05:37 UTC (rev 23632) @@ -1 +0,0 @@ -488508ba3e8270992ad5b3fb54d364ca requests-0.14.2.tar.gz Copied: csw/mgar/pkg/lang-python/asyncio/trunk/checksums (from rev 22221, csw/mgar/pkg/lang-python/requests/trunk/checksums) =================================================================== --- csw/mgar/pkg/lang-python/asyncio/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/asyncio/trunk/checksums 2014-05-17 22:05:37 UTC (rev 23632) @@ -0,0 +1 @@ +c71b0ff195845047a98c9a8db66dbe0c asyncio-0.4.1.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 Sun May 18 08:04:15 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 18 May 2014 06:04:15 +0000 Subject: SF.net SVN: gar:[23633] csw/mgar/pkg/netatalk/trunk Message-ID: <3gWXrB4yVcz1XT@mail.opencsw.org> Revision: 23633 http://sourceforge.net/p/gar/code/23633 Author: slowfranklin Date: 2014-05-18 06:04:13 +0000 (Sun, 18 May 2014) Log Message: ----------- Add dbus SMF manifest Also delete unused patches Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml Added Paths: ----------- csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus.patch csw/mgar/pkg/netatalk/trunk/files/0001-Upstream-patch-to-make-dbus-optional.patch csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-dbus.xml csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml Removed Paths: ------------- csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch 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/0004-Prevent-SMF-manifest-import-on-install.patch csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch csw/mgar/pkg/netatalk/trunk/files/netatalk.xml Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-18 06:04:13 UTC (rev 23633) @@ -53,7 +53,8 @@ PATCHFILES += 0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch PATCHFILES += 0004-Ensure-gsettings-is-called-from-opt-csw-bin.patch -PATCHFILES += 0006-Disable-Tracker-autostart.patch +PATCHFILES += 0001-Upstream-patch-to-make-dbus-optional.patch +PATCHFILES += 0001-Disable-dbus.patch # will be in 3.1.2: PATCHFILES += 33dd614058f32bbe3c88734654228d8715f2403e.patch @@ -89,6 +90,7 @@ CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-tracker-miner-fs.xml CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-tracker-extract.xml +CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-dbus.xml CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/bin/afppasswd CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_pam.so CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_passwd.so @@ -98,8 +100,8 @@ 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 + ginstall -m 444 $(FILEDIR)/cswnetatalk.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ + ginstall -m 444 $(FILEDIR)/cswnetatalk-dbus.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-extract.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-miner-fs.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ @$(MAKECOOKIE) Deleted: csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch 2014-05-18 06:04:13 UTC (rev 23633) @@ -1,34 +0,0 @@ -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 - Added: csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0001-Disable-dbus.patch 2014-05-18 06:04:13 UTC (rev 23633) @@ -0,0 +1,48 @@ +From 0e56bd27a2801a7d7df210262adb2ec61e6dc03f Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sun, 18 May 2014 07:02:00 +0200 +Subject: [PATCH] Disable dbus + +--- + etc/netatalk/netatalk.c | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c +index 640d386..a0e6f80 100644 +--- a/etc/netatalk/netatalk.c ++++ b/etc/netatalk/netatalk.c +@@ -411,22 +411,12 @@ int main(int argc, char **argv) + sigdelset(&blocksigs, SIGHUP); + sigprocmask(SIG_SETMASK, &blocksigs, NULL); + +-#ifdef HAVE_TRACKER + if (obj.options.flags & OPTION_SPOTLIGHT) { ++#ifdef HAVE_TRACKER + setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=" _PATH_STATEDIR "spotlight.ipc", 1); + setenv("XDG_DATA_HOME", _PATH_STATEDIR, 0); + setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0); + setenv("TRACKER_USE_LOG_FILES", "1", 0); +- +- dbus_path = atalk_iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH); +- LOG(log_debug, logtype_default, "DBUS: '%s'", dbus_path); +- if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == NETATALK_SRV_ERROR) { +- LOG(log_error, logtype_default, "Error starting '%s'", dbus_path); +- netatalk_exit(EXITERR_CONF); +- } +- +- /* Allow dbus some time to start up */ +- sleep(1); + #endif + + #ifdef HAVE_TRACKER_SPARQL +@@ -437,7 +427,6 @@ int main(int argc, char **argv) + setenv("TRACKER_LANGUAGE_STOPWORDS_DIR", TRACKER_PREFIX "/share/tracker/languages", 0); + #endif + set_sl_volumes(); +- system(TRACKER_PREFIX "/bin/tracker-control -s"); + #endif + } + +-- +1.8.4.1 + Deleted: 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 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/files/0001-Fix-use-of-unnamed-union-inside-struct.patch 2014-05-18 06:04:13 UTC (rev 23633) @@ -1,181 +0,0 @@ -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/0001-Upstream-patch-to-make-dbus-optional.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0001-Upstream-patch-to-make-dbus-optional.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0001-Upstream-patch-to-make-dbus-optional.patch 2014-05-18 06:04:13 UTC (rev 23633) @@ -0,0 +1,224 @@ +From 7da8df4a160508ed323caca495f04db923064718 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sun, 18 May 2014 06:37:24 +0200 +Subject: [PATCH] Upstream patch to make dbus optional + +--- + etc/netatalk/netatalk.c | 97 +++++++++++++++++++++++++++++-------------------- + 1 file changed, 58 insertions(+), 39 deletions(-) + +diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c +index 4cdc466..640d386 100644 +--- a/etc/netatalk/netatalk.c ++++ b/etc/netatalk/netatalk.c +@@ -48,24 +48,37 @@ + /* how many seconds we wait to shutdown from SIGTERM before we send SIGKILL */ + #define KILL_GRACETIME 5 + ++/* defines that control whether services should run by default */ ++#define NETATALK_SRV_NEEDED -1 ++#define NETATALK_SRV_OPTIONAL 0 ++#define NETATALK_SRV_ERROR NETATALK_SRV_NEEDED ++ + /* forward declaration */ + static pid_t run_process(const char *path, ...); + static void kill_childs(int sig, ...); + + /* static variables */ + static AFPObj obj; +-static pid_t afpd_pid = -1, cnid_metad_pid = -1, dbus_pid = -1; +-static uint afpd_restarts, cnid_metad_restarts, dbus_restarts, trackerd_restarts; ++static pid_t afpd_pid = NETATALK_SRV_NEEDED; ++static pid_t cnid_metad_pid = NETATALK_SRV_NEEDED; ++static pid_t dbus_pid = NETATALK_SRV_OPTIONAL; ++static uint afpd_restarts, cnid_metad_restarts, dbus_restarts; + static struct event_base *base; + struct event *sigterm_ev, *sigquit_ev, *sigchld_ev, *timer_ev; + static int in_shutdown; + static const char *dbus_path; +-static char *trackerd_loglev; + + /****************************************************************** + * Misc stuff + ******************************************************************/ + ++static bool service_running(pid_t pid) ++{ ++ if ((pid != NETATALK_SRV_NEEDED) && (pid != NETATALK_SRV_OPTIONAL)) ++ return true; ++ return false; ++} ++ + /* Set Tracker Miners to index all our volumes */ + static int set_sl_volumes(void) + { +@@ -203,17 +216,21 @@ static void sigchld_cb(evutil_socket_t fd, short what, void *arg) + } + + if (pid == afpd_pid) +- afpd_pid = -1; ++ afpd_pid = NETATALK_SRV_ERROR; + else if (pid == cnid_metad_pid) +- cnid_metad_pid = -1; ++ cnid_metad_pid = NETATALK_SRV_ERROR; + else if (pid == dbus_pid) +- dbus_pid = -1; ++ dbus_pid = NETATALK_SRV_ERROR; + else + LOG(log_error, logtype_afpd, "Bad pid: %d", pid); + } + +- if (in_shutdown && afpd_pid == -1 && cnid_metad_pid == -1 && dbus_pid == -1) ++ if (in_shutdown ++ && !service_running(afpd_pid) ++ && !service_running(cnid_metad_pid) ++ && !service_running(dbus_pid)) { + event_base_loopbreak(base); ++ } + } + + /* timer callback */ +@@ -222,7 +239,7 @@ static void timer_cb(evutil_socket_t fd, short what, void *arg) + if (in_shutdown) + return; + +- if (afpd_pid == -1) { ++ if (afpd_pid == NETATALK_SRV_NEEDED) { + afpd_restarts++; + LOG(log_note, logtype_afpd, "Restarting 'afpd' (restarts: %u)", afpd_restarts); + if ((afpd_pid = run_process(_PATH_AFPD, "-d", "-F", obj.options.configfile, NULL)) == -1) { +@@ -230,7 +247,7 @@ static void timer_cb(evutil_socket_t fd, short what, void *arg) + } + } + +- if (cnid_metad_pid == -1) { ++ if (cnid_metad_pid == NETATALK_SRV_NEEDED) { + cnid_metad_restarts++; + LOG(log_note, logtype_afpd, "Restarting 'cnid_metad' (restarts: %u)", cnid_metad_restarts); + if ((cnid_metad_pid = run_process(_PATH_CNID_METAD, "-d", "-F", obj.options.configfile, NULL)) == -1) { +@@ -239,10 +256,10 @@ static void timer_cb(evutil_socket_t fd, short what, void *arg) + } + + #ifdef HAVE_TRACKER +- if (dbus_pid == -1) { ++ if (dbus_pid == NETATALK_SRV_NEEDED) { + dbus_restarts++; + LOG(log_note, logtype_afpd, "Restarting 'dbus' (restarts: %u)", dbus_restarts); +- if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus.session.conf", NULL)) == -1) { ++ if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == -1) { + LOG(log_error, logtype_default, "Error starting '%s'", dbus_path); + } + } +@@ -262,7 +279,7 @@ static void kill_childs(int sig, ...) + va_start(args, sig); + + while ((pid = va_arg(args, pid_t *)) != NULL) { +- if (*pid == -1) ++ if (*pid == NETATALK_SRV_ERROR || *pid == NETATALK_SRV_OPTIONAL) + continue; + kill(*pid, sig); + } +@@ -279,7 +296,7 @@ static void netatalk_exit(int ret) + /* this forks() and exec() "path" with varags as argc[] */ + static pid_t run_process(const char *path, ...) + { +- int ret, i = 0; ++ int i = 0; + #define MYARVSIZE 64 + char *myargv[MYARVSIZE]; + va_list args; +@@ -299,7 +316,7 @@ static pid_t run_process(const char *path, ...) + } + va_end(args); + +- ret = execv(path, myargv); ++ (void)execv(path, myargv); + + /* Yikes! We're still here, so exec failed... */ + LOG(log_error, logtype_cnid, "Fatal error in exec: %s", strerror(errno)); +@@ -358,12 +375,12 @@ int main(int argc, char **argv) + + LOG(log_note, logtype_default, "Netatalk AFP server starting"); + +- if ((afpd_pid = run_process(_PATH_AFPD, "-d", "-F", obj.options.configfile, NULL)) == -1) { ++ if ((afpd_pid = run_process(_PATH_AFPD, "-d", "-F", obj.options.configfile, NULL)) == NETATALK_SRV_ERROR) { + LOG(log_error, logtype_afpd, "Error starting 'afpd'"); + netatalk_exit(EXITERR_CONF); + } + +- if ((cnid_metad_pid = run_process(_PATH_CNID_METAD, "-d", "-F", obj.options.configfile, NULL)) == -1) { ++ if ((cnid_metad_pid = run_process(_PATH_CNID_METAD, "-d", "-F", obj.options.configfile, NULL)) == NETATALK_SRV_ERROR) { + LOG(log_error, logtype_afpd, "Error starting 'cnid_metad'"); + netatalk_exit(EXITERR_CONF); + } +@@ -395,42 +412,44 @@ int main(int argc, char **argv) + sigprocmask(SIG_SETMASK, &blocksigs, NULL); + + #ifdef HAVE_TRACKER +- setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=" _PATH_STATEDIR "spotlight.ipc", 1); +- setenv("XDG_DATA_HOME", _PATH_STATEDIR, 0); +- setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0); +- setenv("TRACKER_USE_LOG_FILES", "1", 0); +- +- dbus_path = atalk_iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH); +- LOG(log_debug, logtype_default, "DBUS: '%s'", dbus_path); +- if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == -1) { +- LOG(log_error, logtype_default, "Error starting '%s'", dbus_path); +- netatalk_exit(EXITERR_CONF); +- } ++ if (obj.options.flags & OPTION_SPOTLIGHT) { ++ setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=" _PATH_STATEDIR "spotlight.ipc", 1); ++ setenv("XDG_DATA_HOME", _PATH_STATEDIR, 0); ++ setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0); ++ setenv("TRACKER_USE_LOG_FILES", "1", 0); ++ ++ dbus_path = atalk_iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH); ++ LOG(log_debug, logtype_default, "DBUS: '%s'", dbus_path); ++ if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == NETATALK_SRV_ERROR) { ++ LOG(log_error, logtype_default, "Error starting '%s'", dbus_path); ++ netatalk_exit(EXITERR_CONF); ++ } + +- /* Allow dbus some time to start up */ +- sleep(1); ++ /* Allow dbus some time to start up */ ++ sleep(1); + #endif + + #ifdef HAVE_TRACKER_SPARQL + #ifdef SOLARIS +- setenv("XDG_DATA_DIRS", TRACKER_PREFIX "/share", 0); +- setenv("TRACKER_DB_ONTOLOGIES_DIR", TRACKER_PREFIX "/share/tracker/ontologies", 0); +- setenv("TRACKER_EXTRACTOR_RULES_DIR", TRACKER_PREFIX "/share/tracker/extract-rules", 0); +- setenv("TRACKER_LANGUAGE_STOPWORDS_DIR", TRACKER_PREFIX "/share/tracker/languages", 0); ++ setenv("XDG_DATA_DIRS", TRACKER_PREFIX "/share", 0); ++ setenv("TRACKER_DB_ONTOLOGIES_DIR", TRACKER_PREFIX "/share/tracker/ontologies", 0); ++ setenv("TRACKER_EXTRACTOR_RULES_DIR", TRACKER_PREFIX "/share/tracker/extract-rules", 0); ++ setenv("TRACKER_LANGUAGE_STOPWORDS_DIR", TRACKER_PREFIX "/share/tracker/languages", 0); + #endif +- set_sl_volumes(); +- system(TRACKER_PREFIX "/bin/tracker-control -s"); ++ set_sl_volumes(); ++ system(TRACKER_PREFIX "/bin/tracker-control -s"); + #endif ++ } + + /* run the event loop */ + ret = event_base_dispatch(base); + +- if (afpd_pid != -1 || cnid_metad_pid != -1 || dbus_pid != -1) { +- if (afpd_pid != -1) ++ if (service_running(afpd_pid) || service_running(cnid_metad_pid) || service_running(dbus_pid)) { ++ if (service_running(afpd_pid)) + LOG(log_error, logtype_afpd, "AFP service did not shutdown, killing it"); +- if (cnid_metad_pid != -1) ++ if (service_running(cnid_metad_pid)) + LOG(log_error, logtype_afpd, "CNID database service did not shutdown, killing it"); +- if (dbus_pid != -1) ++ if (service_running(dbus_pid)) + LOG(log_error, logtype_afpd, "DBUS session daemon still running, killing it"); + kill_childs(SIGKILL, &afpd_pid, &cnid_metad_pid, &dbus_pid, NULL); + } +-- +1.8.4.1 + Deleted: csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/files/0003-Fix-misspelled-compiler-variable.patch 2014-05-18 06:04:13 UTC (rev 23633) @@ -1,36 +0,0 @@ -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 - Deleted: 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 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/files/0004-Prevent-SMF-manifest-import-on-install.patch 2014-05-18 06:04:13 UTC (rev 23633) @@ -1,25 +0,0 @@ -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 - Deleted: csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/files/0006-Disable-Tracker-autostart.patch 2014-05-18 06:04:13 UTC (rev 23633) @@ -1,24 +0,0 @@ -From 7c7fc8caad4ff92b63962ed35f342a28e2c79398 Mon Sep 17 00:00:00 2001 -From: Ralph Boehme -Date: Sat, 17 May 2014 09:56:50 +0200 -Subject: [PATCH] Disable Tracker autostart - ---- - etc/netatalk/netatalk.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c -index 4cdc466..1a304d1 100644 ---- a/etc/netatalk/netatalk.c -+++ b/etc/netatalk/netatalk.c -@@ -419,7 +419,6 @@ int main(int argc, char **argv) - setenv("TRACKER_LANGUAGE_STOPWORDS_DIR", TRACKER_PREFIX "/share/tracker/languages", 0); - #endif - set_sl_volumes(); -- system(TRACKER_PREFIX "/bin/tracker-control -s"); - #endif - - /* run the event loop */ --- -1.8.4.1 - Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2014-05-18 06:04:13 UTC (rev 23633) @@ -1,5 +1,5 @@ #!/bin/sh chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk.xml > /dev/null 2>&1 - +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-dbus.xml > /dev/null 2>&1 chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-tracker-extract.xml > /dev/null 2>&1 chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-tracker-miner-fs.xml > /dev/null 2>&1 Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.preremove 2014-05-18 06:04:13 UTC (rev 23633) @@ -1,4 +1,5 @@ #!/bin/sh chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk-dbus chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk-tracker-extract chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg delete -f cswnetatalk-tracker-miner-fs Added: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-dbus.xml =================================================================== (Binary files differ) Index: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-dbus.xml =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-dbus.xml 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-dbus.xml 2014-05-18 06:04:13 UTC (rev 23633) Property changes on: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-dbus.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/xml \ No newline at end of property Modified: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml =================================================================== (Binary files differ) Modified: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml =================================================================== (Binary files differ) Added: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml =================================================================== (Binary files differ) Index: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml 2014-05-17 22:05:37 UTC (rev 23632) +++ csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml 2014-05-18 06:04:13 UTC (rev 23633) Property changes on: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/xml \ No newline at end of property Deleted: csw/mgar/pkg/netatalk/trunk/files/netatalk.xml =================================================================== (Binary files differ) 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 18 08:08:40 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 18 May 2014 06:08:40 +0000 Subject: SF.net SVN: gar:[23634] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: <3gWXwt0M22z3X@mail.opencsw.org> Revision: 23634 http://sourceforge.net/p/gar/code/23634 Author: slowfranklin Date: 2014-05-18 06:08:34 +0000 (Sun, 18 May 2014) Log Message: ----------- Remove reinplacements Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-18 06:04:13 UTC (rev 23633) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-18 06:08:34 UTC (rev 23634) @@ -58,16 +58,6 @@ # will be in 3.1.2: PATCHFILES += 33dd614058f32bbe3c88734654228d8715f2403e.patch -REINPLACEMENTS += manifest1 -REINPLACE_MATCH_manifest1 = network/netatalk -REINPLACE_WITH_manifest1 = network/cswnetatalk -REINPLACE_FILES_manifest1 += distrib/initscripts/netatalk.xml.tmpl - -REINPLACEMENTS += manifest2 -REINPLACE_MATCH_manifest2 = name="netatalk" -REINPLACE_WITH_manifest2 = name="cswnetatalk" -REINPLACE_FILES_manifest2 += distrib/initscripts/netatalk.xml.tmpl - PRESERVECONF += $(sysconfdir)/afp.conf PRESERVECONF += $(sysconfdir)/extmap.conf 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 18 08:49:57 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 18 May 2014 06:49:57 +0000 Subject: SF.net SVN: gar:[23635] csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-dbus. xml Message-ID: <3gWYrW3SNhz7F@mail.opencsw.org> Revision: 23635 http://sourceforge.net/p/gar/code/23635 Author: slowfranklin Date: 2014-05-18 06:49:56 +0000 (Sun, 18 May 2014) Log Message: ----------- Add missing dbus config file to SMF manifest Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-dbus.xml Modified: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-dbus.xml =================================================================== (Binary files differ) 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 18 09:07:52 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 18 May 2014 07:07:52 +0000 Subject: SF.net SVN: gar:[23636] csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml Message-ID: <3gWZFB0rJxzBv@mail.opencsw.org> Revision: 23636 http://sourceforge.net/p/gar/code/23636 Author: slowfranklin Date: 2014-05-18 07:07:50 +0000 (Sun, 18 May 2014) Log Message: ----------- Fix SMF service name by prefixing with csw Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml Modified: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml =================================================================== (Binary files differ) 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 18 12:27:38 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 May 2014 10:27:38 +0000 Subject: SF.net SVN: gar:[23637] csw/mgar/pkg/lang-python/WSGIProxy2/trunk Message-ID: <3gWfgj0TjrzLr@mail.opencsw.org> Revision: 23637 http://sourceforge.net/p/gar/code/23637 Author: wahwah Date: 2014-05-18 10:27:37 +0000 (Sun, 18 May 2014) Log Message: ----------- lang-python/WSGIProxy2/trunk: Version bump Modified Paths: -------------- csw/mgar/pkg/lang-python/WSGIProxy2/trunk/Makefile csw/mgar/pkg/lang-python/WSGIProxy2/trunk/checksums Modified: csw/mgar/pkg/lang-python/WSGIProxy2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/WSGIProxy2/trunk/Makefile 2014-05-18 07:07:50 UTC (rev 23636) +++ csw/mgar/pkg/lang-python/WSGIProxy2/trunk/Makefile 2014-05-18 10:27:37 UTC (rev 23637) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = WSGIProxy2 -VERSION = 0.1 +VERSION = 0.2 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/lang-python/WSGIProxy2/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/WSGIProxy2/trunk/checksums 2014-05-18 07:07:50 UTC (rev 23636) +++ csw/mgar/pkg/lang-python/WSGIProxy2/trunk/checksums 2014-05-18 10:27:37 UTC (rev 23637) @@ -1 +1 @@ -157049212f1c81a8790efa31146fbabf WSGIProxy2-0.1.tar.gz +d8c764aa68173e0d4851874ed6021211 WSGIProxy2-0.2.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 Sun May 18 12:52:33 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 18 May 2014 10:52:33 +0000 Subject: SF.net SVN: gar:[23638] csw/mgar/pkg/netatalk/trunk Message-ID: <3gWgDb6L39zQT@mail.opencsw.org> Revision: 23638 http://sourceforge.net/p/gar/code/23638 Author: slowfranklin Date: 2014-05-18 10:52:33 +0000 (Sun, 18 May 2014) Log Message: ----------- Fix SMF service types Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-18 10:27:37 UTC (rev 23637) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-18 10:52:33 UTC (rev 23638) @@ -78,9 +78,9 @@ # Path to XML dtd CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml -CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-tracker-miner-fs.xml -CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-tracker-extract.xml -CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk-dbus.xml +CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/system/cswnetatalk-tracker-miner-fs.xml +CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/system/cswnetatalk-tracker-extract.xml +CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/system/cswnetatalk-dbus.xml CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/bin/afppasswd CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_pam.so CHECKPKG_OVERRIDES_CSWnetatalk += bad-rpath-entry|/opt/csw|opt/csw/lib/netatalk/uams_dhx_passwd.so @@ -91,7 +91,7 @@ post-install-modulated: ginstall -d -m 755 $(DESTDIR)/var/opt/csw/svc/manifest/network ginstall -m 444 $(FILEDIR)/cswnetatalk.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ - ginstall -m 444 $(FILEDIR)/cswnetatalk-dbus.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ - ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-extract.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ - ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-miner-fs.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ + ginstall -m 444 $(FILEDIR)/cswnetatalk-dbus.xml $(DESTDIR)/var/opt/csw/svc/manifest/system/ + ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-extract.xml $(DESTDIR)/var/opt/csw/svc/manifest/system/ + ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-miner-fs.xml $(DESTDIR)/var/opt/csw/svc/manifest/system/ @$(MAKECOOKIE) Modified: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-extract.xml =================================================================== (Binary files differ) Modified: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml =================================================================== (Binary files differ) Modified: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml =================================================================== (Binary files differ) 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 18 13:14:25 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 18 May 2014 11:14:25 +0000 Subject: SF.net SVN: gar:[23639] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: <3gWgjj0WPkzV0@mail.opencsw.org> Revision: 23639 http://sourceforge.net/p/gar/code/23639 Author: lblume Date: 2014-05-18 11:14:25 +0000 (Sun, 18 May 2014) Log Message: ----------- ImageMagick/trunk: Bump the beta date; add needed dependency for sparc Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-05-18 10:52:33 UTC (rev 23638) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-05-18 11:14:25 UTC (rev 23639) @@ -1,7 +1,7 @@ NAME = imagemagick VERSION = 6.8.9 GARSUBREV = 2 -BETAREV = beta20140516 +BETAREV = beta20140517 GARTYPE = v2 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -157,6 +157,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgomp1 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibz1 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 18 13:16:46 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 May 2014 11:16:46 +0000 Subject: SF.net SVN: gar:[23640] csw/mgar/pkg/lang-python/pygments/trunk Message-ID: <3gWgmN4xqWzYK@mail.opencsw.org> Revision: 23640 http://sourceforge.net/p/gar/code/23640 Author: wahwah Date: 2014-05-18 11:16:46 +0000 (Sun, 18 May 2014) Log Message: ----------- lang-python/pygments/trunk: Version bump Modified Paths: -------------- csw/mgar/pkg/lang-python/pygments/trunk/Makefile csw/mgar/pkg/lang-python/pygments/trunk/checksums Modified: csw/mgar/pkg/lang-python/pygments/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygments/trunk/Makefile 2014-05-18 11:14:25 UTC (rev 23639) +++ csw/mgar/pkg/lang-python/pygments/trunk/Makefile 2014-05-18 11:16:46 UTC (rev 23640) @@ -3,7 +3,7 @@ # $Id$ NAME = Pygments -VERSION = 1.4 +VERSION = 1.6 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Syntax highlighting for Python Modified: csw/mgar/pkg/lang-python/pygments/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pygments/trunk/checksums 2014-05-18 11:14:25 UTC (rev 23639) +++ csw/mgar/pkg/lang-python/pygments/trunk/checksums 2014-05-18 11:16:46 UTC (rev 23640) @@ -1 +1 @@ -d77ac8c93a7fb27545f2522abe9cc462 Pygments-1.4.tar.gz +a18feedf6ffd0b0cc8c8b0fbdb2027b1 Pygments-1.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 18 13:17:57 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 May 2014 11:17:57 +0000 Subject: SF.net SVN: gar:[23641] csw/mgar/gar/v2 Message-ID: <3gWgnx5LVXzcf@mail.opencsw.org> Revision: 23641 http://sourceforge.net/p/gar/code/23641 Author: wahwah Date: 2014-05-18 11:17:56 +0000 (Sun, 18 May 2014) Log Message: ----------- uwatch: Use proxies Uwatch used urllib2.urlopen, which ignores the *_proxy env variable family. It's possible to use proxies with urllib2, but it's awkward. http://stackoverflow.com/questions/1450132/proxy-with-urllib2 Instead, we can set HTTP_PROXY and use the 'requests' module which supports them out of the box. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk csw/mgar/gar/v2/lib/python/uwatch.py Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2014-05-18 11:16:46 UTC (rev 23640) +++ csw/mgar/gar/v2/gar.conf.mk 2014-05-18 11:17:56 UTC (rev 23641) @@ -202,10 +202,11 @@ DEF_BASE_PKGS += CSWpy-cjson DEF_BASE_PKGS += CSWpy-dateutil DEF_BASE_PKGS += CSWpy-libmagic +DEF_BASE_PKGS += CSWpy-mysql DEF_BASE_PKGS += CSWpy-progressbar DEF_BASE_PKGS += CSWpy-pyelftools +DEF_BASE_PKGS += CSWpy-requests DEF_BASE_PKGS += CSWpy-sqlobject -DEF_BASE_PKGS += CSWpy-mysql DEF_BASE_PKGS += CSWpython DEF_BASE_PKGS += CSWwget DEF_BASE_PKGS += CSWxz Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2014-05-18 11:16:46 UTC (rev 23640) +++ csw/mgar/gar/v2/gar.lib.mk 2014-05-18 11:17:56 UTC (rev 23641) @@ -275,9 +275,9 @@ exit 1 ; \ fi ; \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - VERSIONLIST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-version-list --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)"` ; \ + VERSIONLIST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-version-list --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)"` ; \ else \ - VERSIONLIST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-version-list --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)"` ; \ + VERSIONLIST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-version-list --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)"` ; \ fi ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch get-upstream-version-list. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ @@ -318,9 +318,9 @@ exit 1 ; \ fi ; \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - LATEST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-latest-version --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)"` ; \ + LATEST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-latest-version --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)"` ; \ else \ - LATEST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-latest-version --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)"` ; \ + LATEST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-latest-version --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)"` ; \ fi ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch get-upstream-latest-version. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ @@ -357,9 +357,9 @@ exit 1 ; \ fi ; \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - LATEST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch check-upstream --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)" --current-version="$(VERSION)"` ; \ + LATEST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch check-upstream --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)" --current-version="$(VERSION)"` ; \ else \ - LATEST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch check-upstream --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --current-version="$(VERSION)"` ; \ + LATEST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch check-upstream --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --current-version="$(VERSION)"` ; \ fi ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch check-upstream. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ @@ -397,9 +397,9 @@ exit 1 ; \ fi ; \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - LATEST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch check-upstream --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)" --current-version="$(VERSION)"` ; \ + LATEST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch check-upstream --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)" --current-version="$(VERSION)"` ; \ else \ - LATEST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch check-upstream --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --current-version="$(VERSION)"` ; \ + LATEST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch check-upstream --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --current-version="$(VERSION)"` ; \ fi ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch check-upstream. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ @@ -410,7 +410,7 @@ if [ ! -d "../branches/upgrade_from_$(VERSION)_to_$$LATEST" ] ; then \ if [ -n "$$LATEST" ] ; then \ echo "$(NAME) : a new version of upstream files is available. Creating upgrade branch from version $(VERSION) to $$LATEST"; \ - VERSIONUPGRADE=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch upgrade-to-version --current-version="$(VERSION)" --target-version="$$LATEST"` ; \ + VERSIONUPGRADE=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch upgrade-to-version --current-version="$(VERSION)" --target-version="$$LATEST"` ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch upgrade-to-version. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ echo "$$VERSIONUPGRADE" ; \ @@ -444,7 +444,7 @@ GARPATH=`echo $$line | awk '{ print $$1 }'` ; \ CATALOGNAME=`echo $$line | awk '{ print $$2 }'` ; \ PKGNAME=`echo $$line | awk '{ print $$3 }'` ; \ - REPORTVERSION=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version="$(VERSION)" --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="Upstream Watch is disabled" --uwatch-deactivated` ; \ + REPORTVERSION=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version="$(VERSION)" --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="Upstream Watch is disabled" --uwatch-deactivated` ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch update-package-version-database --uwatch-deactivated. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ echo "$$REPORTVERSION" ; \ @@ -472,7 +472,7 @@ GARPATH=`echo $$line | awk '{ print $$1 }'` ; \ CATALOGNAME=`echo $$line | awk '{ print $$2 }'` ; \ PKGNAME=`echo $$line | awk '{ print $$3 }'` ; \ - REPORTVERSION=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version="$(VERSION)" --uwatch-error --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="Upstream Watch configuration error" ` ; \ + REPORTVERSION=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version="$(VERSION)" --uwatch-error --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="Upstream Watch configuration error" ` ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch update-package-version-database --uwatch-error. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ echo "$$REPORTVERSION" ; \ @@ -482,9 +482,9 @@ exit 1 ; \ fi ; \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - LATEST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-latest-version --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)"` ; \ + LATEST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-latest-version --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --catalog-name="$(CATALOGNAME)"` ; \ else \ - LATEST=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-latest-version --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)"` ; \ + LATEST=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch get-upstream-latest-version --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)"` ; \ fi ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch get-upstream-latest-version. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ @@ -493,7 +493,7 @@ GARPATH=`echo $$line | awk '{ print $$1 }'` ; \ CATALOGNAME=`echo $$line | awk '{ print $$2 }'` ; \ PKGNAME=`echo $$line | awk '{ print $$3 }'` ; \ - REPORTVERSION=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version="$(VERSION)" --uwatch-error --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="$$LATEST" ` ; \ + REPORTVERSION=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version="$(VERSION)" --uwatch-error --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="$$LATEST" ` ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch update-package-version-database --uwatch-error. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ echo "$$REPORTVERSION" ; \ @@ -507,14 +507,14 @@ CATALOGNAME=`echo $$line | awk '{ print $$2 }'` ; \ PKGNAME=`echo $$line | awk '{ print $$3 }'` ; \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - REPORTVERSION=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version=$(VERSION) --upstream-version="$$LATEST" --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --uwatch-output="Successful" ` ; \ + REPORTVERSION=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version=$(VERSION) --upstream-version="$$LATEST" --upstream-url="$(UPSTREAM_MASTER_SITES)" --gar-distfiles="$(DISTFILES)" --uwatch-output="Successful" ` ; \ else \ - REPORTVERSION=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version=$(VERSION) --upstream-version="$$LATEST" --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="Successful" ` ; \ + REPORTVERSION=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version=$(VERSION) --upstream-version="$$LATEST" --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="Successful" ` ; \ fi ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch update-package-version-database. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ echo "$$REPORTVERSION" ; \ - REPORTVERSION=`http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version="$(VERSION)" --uwatch-error --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="$$REPORTVERSION" ` ; \ + REPORTVERSION=`HTTPS_PROXY=$(https_proxy) HTTP_PROXY=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/uwatch update-package-version-database --catalog-name="$$CATALOGNAME" --package-name="$$PKGNAME" --execution-date="$$EXECUTIONDATE" --gar-path="$$GARPATH" --gar-version="$(VERSION)" --uwatch-error --upstream-url="$(UPSTREAM_MASTER_SITES)" --regexp="$(UFILES_REGEX)" --gar-distfiles="$(DISTFILES)" --uwatch-output="$$REPORTVERSION" ` ; \ if [ "$$?" -ne "0" ] ; then \ echo "Error occured while executing uwatch update-package-version-database --uwatch-error. Please check configuration with target get-uwatch-configuration. Here is the output of uwatch command :" ; \ echo "$$REPORTVERSION" ; \ Modified: csw/mgar/gar/v2/lib/python/uwatch.py =================================================================== --- csw/mgar/gar/v2/lib/python/uwatch.py 2014-05-18 11:16:46 UTC (rev 23640) +++ csw/mgar/gar/v2/lib/python/uwatch.py 2014-05-18 11:17:56 UTC (rev 23641) @@ -36,7 +36,6 @@ # Import all the needed modules import sys -import string import re import os import shutil @@ -46,8 +45,8 @@ import datetime import ConfigParser import logging +import requests -from urllib2 import Request, urlopen, URLError from optparse import OptionParser # --------------------------------------------------------------------------------------------------------------------- @@ -594,23 +593,18 @@ try: # Request the upstream URL and open it - req = Request(url) - response = urlopen(req) + # req = Request(url) + # response = urlopen(req) + response = requests.get(url) + response.raise_for_status() - except URLError, e: - if hasattr(e, 'reason'): - print 'We failed to reach a server during retrieval of : ' + url - print 'Reason: ', e.reason - elif hasattr(e, 'code'): - print 'The server couldn\'t fulfill the request during retrieval of : ' + url - print 'Error code: ', e.code - - # Check for response code value. We should get a 200 - raise UpstreamUrlRetrievalFailedException(url) - + except (requests.exceptions.ConnectionError, + requests.exceptions.HTTPError) as e: + print e + raise UpstreamUrlRetrievalFailedException(' '.join((url, unicode(e)))) else: # everything is fine, retrieve the page content - return response.read() + return response.text # ----------------------------------------------------------------------------------------------------------------- @@ -621,11 +615,11 @@ # an elements can be a string or a number # at each step we extract the next elements of the two version strings and compare them - if isinstance(version1, str) == False: + if isinstance(version1, basestring) == False: print "Version is not a string. Please check environnement variable UFILES_REGEX" print version1 - if isinstance(version2, str) == False: + if isinstance(version2, basestring) == False: print "Version is not a string. Please check environnement variable UFILES_REGEX" print version2 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 18 13:19:08 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 18 May 2014 11:19:08 +0000 Subject: SF.net SVN: gar:[23642] csw/mgar/pkg/ImageMagick/trunk/checksums Message-ID: <3gWgq60PZLzgs@mail.opencsw.org> Revision: 23642 http://sourceforge.net/p/gar/code/23642 Author: lblume Date: 2014-05-18 11:19:07 +0000 (Sun, 18 May 2014) Log Message: ----------- ImageMagick/trunk: Add checksum Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2014-05-18 11:17:56 UTC (rev 23641) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2014-05-18 11:19:07 UTC (rev 23642) @@ -1 +1 @@ -763ffef97e3579f98926fe7be735138b ImageMagick-6.8.9-2~beta20140516.tar.xz +ce58e16225382f55ee5b9ca53791f0b7 ImageMagick-6.8.9-2~beta20140517.tar.xz 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 18 13:31:36 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 18 May 2014 11:31:36 +0000 Subject: SF.net SVN: gar:[23643] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: <3gWh5X0ny7zlX@mail.opencsw.org> Revision: 23643 http://sourceforge.net/p/gar/code/23643 Author: slowfranklin Date: 2014-05-18 11:31:34 +0000 (Sun, 18 May 2014) Log Message: ----------- Create SMF directory Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-18 11:19:07 UTC (rev 23642) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2014-05-18 11:31:34 UTC (rev 23643) @@ -90,6 +90,7 @@ post-install-modulated: ginstall -d -m 755 $(DESTDIR)/var/opt/csw/svc/manifest/network + ginstall -d -m 755 $(DESTDIR)/var/opt/csw/svc/manifest/system ginstall -m 444 $(FILEDIR)/cswnetatalk.xml $(DESTDIR)/var/opt/csw/svc/manifest/network/ ginstall -m 444 $(FILEDIR)/cswnetatalk-dbus.xml $(DESTDIR)/var/opt/csw/svc/manifest/system/ ginstall -m 444 $(FILEDIR)/cswnetatalk-tracker-extract.xml $(DESTDIR)/var/opt/csw/svc/manifest/system/ 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 18 13:43:22 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 May 2014 11:43:22 +0000 Subject: SF.net SVN: gar:[23644] csw/mgar/pkg/lang-python/argparse/trunk/Makefile Message-ID: <3gWhM434ffzpr@mail.opencsw.org> Revision: 23644 http://sourceforge.net/p/gar/code/23644 Author: wahwah Date: 2014-05-18 11:43:21 +0000 (Sun, 18 May 2014) Log Message: ----------- lang-python/argparse/trunk: UPSTREAM_MASTER_SITES to check for newer versions Modified Paths: -------------- csw/mgar/pkg/lang-python/argparse/trunk/Makefile Modified: csw/mgar/pkg/lang-python/argparse/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/argparse/trunk/Makefile 2014-05-18 11:31:34 UTC (rev 23643) +++ csw/mgar/pkg/lang-python/argparse/trunk/Makefile 2014-05-18 11:43:21 UTC (rev 23644) @@ -13,6 +13,7 @@ DISTFILES = $(DISTNAME).tar.gz VENDOR_URL = http://pypi.python.org/pypi/argparse +UPSTREAM_MASTER_SITES = https://code.google.com/p/argparse/downloads/list PACKAGES = CSWpy-argparse ARCHALL_CSWpy-argparse = 1 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 18 14:09:26 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 18 May 2014 12:09:26 +0000 Subject: SF.net SVN: gar:[23645] csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk. postinstall Message-ID: <3gWhxB5DJdztc@mail.opencsw.org> Revision: 23645 http://sourceforge.net/p/gar/code/23645 Author: slowfranklin Date: 2014-05-18 12:09:26 +0000 (Sun, 18 May 2014) Log Message: ----------- Fix SMF paths Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall Modified: csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2014-05-18 11:43:21 UTC (rev 23644) +++ csw/mgar/pkg/netatalk/trunk/files/CSWnetatalk.postinstall 2014-05-18 12:09:26 UTC (rev 23645) @@ -1,5 +1,5 @@ #!/bin/sh chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk.xml > /dev/null 2>&1 -chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-dbus.xml > /dev/null 2>&1 -chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-tracker-extract.xml > /dev/null 2>&1 -chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/network/cswnetatalk-tracker-miner-fs.xml > /dev/null 2>&1 +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/system/cswnetatalk-dbus.xml > /dev/null 2>&1 +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/system/cswnetatalk-tracker-extract.xml > /dev/null 2>&1 +chroot ${PKG_INSTALL_ROOT:-/} /usr/sbin/svccfg import /var/opt/csw/svc/manifest/system/cswnetatalk-tracker-miner-fs.xml > /dev/null 2>&1 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 18 14:48:44 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 18 May 2014 12:48:44 +0000 Subject: SF.net SVN: gar:[23646] csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml Message-ID: <3gWjpV2x2pz14X@mail.opencsw.org> Revision: 23646 http://sourceforge.net/p/gar/code/23646 Author: slowfranklin Date: 2014-05-18 12:48:41 +0000 (Sun, 18 May 2014) Log Message: ----------- Add Tracker services as deps to Netatalk Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml Modified: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk.xml =================================================================== (Binary files differ) 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 18 14:53:45 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 18 May 2014 12:53:45 +0000 Subject: SF.net SVN: gar:[23647] csw/mgar/pkg/ghostscript/trunk Message-ID: <3gWjwL2qSnz17n@mail.opencsw.org> Revision: 23647 http://sourceforge.net/p/gar/code/23647 Author: lblume Date: 2014-05-18 12:53:43 +0000 (Sun, 18 May 2014) Log Message: ----------- ghostscript/trunk: Bump to 9.14; switch to GCC4; disable old workarounds Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile csw/mgar/pkg/ghostscript/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-18 12:48:41 UTC (rev 23646) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-18 12:53:43 UTC (rev 23647) @@ -1,26 +1,28 @@ # $Id$ NAME = ghostscript -VERSION = 9.07 +VERSION = 9.14 GARTYPE = v2 DESCRIPTION = PostScript and PDF interpreter define BLURB endef -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +MASTER_SITES = http://downloads.ghostscript.com/public/ +DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += map.ghostscript # See for details https://www.opencsw.org/mantis/view.php?id=4913 -PATCHFILES += 0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch +#PATCHFILES += 0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch VENDOR_URL = http://www.ghostscript.com LICENSE = LICENSE -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= -UPSTREAM_USE_SF = 1 +GARCOMPILER = GCC4 +LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.ghostscript)" + # Many more missing BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWlibz-dev @@ -28,7 +30,7 @@ BUILD_DEP_PKGS += CSWlibfreetype-dev BUILD_DEP_PKGS += CSWcups-dev BUILD_DEP_PKGS += CSWlibjbig2dec-dev -BUILD_DEP_PKGS += CSWfconfig-dev +BUILD_DEP_PKGS += CSWfontconfig-dev BUILD_DEP_PKGS += CSWlibjpeg-dev BUILD_DEP_PKGS += CSWlibpaper-dev BUILD_DEP_PKGS += CSWlibcairo2 @@ -133,6 +135,7 @@ CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts CONFIGURE_ARGS += --enable-cups CONFIGURE_ARGS += --with-install-cups +CONFIGURE_ARGS += --with-system-libtiff # pentium_pro does not have SSE2 and the detection does not work CONFIGURE_ARGS-32-i386 += --disable-sse2 @@ -155,11 +158,11 @@ @# 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 + #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) Modified: csw/mgar/pkg/ghostscript/trunk/checksums =================================================================== --- csw/mgar/pkg/ghostscript/trunk/checksums 2014-05-18 12:48:41 UTC (rev 23646) +++ csw/mgar/pkg/ghostscript/trunk/checksums 2014-05-18 12:53:43 UTC (rev 23647) @@ -1 +1 @@ -eea27befc1e85bef6d4768202f6b03a5 ghostscript-9.07.tar.bz2 +586494befb443363338c1b6379f13973 ghostscript-9.14.tar.gz Added: csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript 2014-05-18 12:53:43 UTC (rev 23647) @@ -0,0 +1 @@ +libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5; 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 18 14:55:12 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 May 2014 12:55:12 +0000 Subject: SF.net SVN: gar:[23648] csw/mgar/pkg/lang-python/pysetuptools/trunk Message-ID: <3gWjy1363vz1C3@mail.opencsw.org> Revision: 23648 http://sourceforge.net/p/gar/code/23648 Author: wahwah Date: 2014-05-18 12:55:09 +0000 (Sun, 18 May 2014) Log Message: ----------- lang-python/pysetuptools/trunk: Version bump, patch updated Modified Paths: -------------- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch Removed Paths: ------------- csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2014-05-18 12:53:43 UTC (rev 23647) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2014-05-18 12:55:09 UTC (rev 23648) @@ -1,7 +1,7 @@ # $Id$ NAME = setuptools -VERSION = 1.1.6 +VERSION = 3.6 CATEGORIES = python GARTYPE = v2 @@ -11,14 +11,10 @@ DESCRIPTION = Distribution Utilities for Python -define BLURB - Distribution Utilities for Python -endef - # Upstream has rejected our patch. :( # https://bitbucket.org/pypa/setuptools/issue/134/spaces-in-file-names-make-it-impossible-to # https://bitbucket.org/pypa/setuptools/pull-request/33/rename-script-templatepy-to-script/diff -PATCHFILES += 0001-Solaris-package-mge-does-not-handle-spaces.patch +PATCHFILES += 0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch ARCHALL_CSWpy-setuptools = 1 DISTFILES = $(NAME)-$(VERSION).tar.gz Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums 2014-05-18 12:53:43 UTC (rev 23647) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums 2014-05-18 12:55:09 UTC (rev 23648) @@ -1 +1 @@ -ee82ea53def4480191061997409d2996 setuptools-1.1.6.tar.gz +8f3a1dcdc14313c8334eb6af4f66ea0a setuptools-3.6.tar.gz Deleted: csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch 2014-05-18 12:53:43 UTC (rev 23647) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch 2014-05-18 12:55:09 UTC (rev 23648) @@ -1,25 +0,0 @@ -From 2b9d28c7baad8086bba0afdbb343051a3b55f235 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Tue, 1 Oct 2013 17:57:01 +0200 -Subject: [PATCH] Solaris package mge does not handle spaces - ---- - setuptools/command/easy_install.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 6ce19fa..f0ab449 100644 ---- a/setuptools/command/easy_install.py -+++ b/setuptools/command/easy_install.py -@@ -759,7 +759,7 @@ Please make the appropriate changes for your system and try again. - return clean_template - - if is_script: -- template_name = 'script template.py' -+ template_name = 'script_template.py' - if dev_path: - template_name = template_name.replace('.py', ' (dev).py') - script_text = (get_script_header(script_text) + --- -1.7.10.3 - Added: csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch (rev 0) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-packages-can-t-handle-spaces-in-file-names.patch 2014-05-18 12:55:09 UTC (rev 23648) @@ -0,0 +1,28 @@ +From 9f85a0682b3cf98845ce149724db1639cebac07d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 18 May 2014 14:47:41 +0200 +Subject: [PATCH] Solaris packages can't handle spaces in file names + +--- + setuptools/command/easy_install.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py +index a5f324e..87f12b2 100644 +--- a/setuptools/command/easy_install.py ++++ b/setuptools/command/easy_install.py +@@ -756,9 +756,9 @@ Please make the appropriate changes for your system and try again. + if is_script: + # See https://bitbucket.org/pypa/setuptools/issue/134 for info + # on script file naming and downstream issues with SVR4 +- template_name = 'script template.py' ++ template_name = 'script_template.py' + if dev_path: +- template_name = template_name.replace('.py', ' (dev).py') ++ template_name = template_name.replace('.py', '_(dev).py') + script_text = (get_script_header(script_text) + + get_template(template_name) % locals()) + self.write_script(script_name, _to_ascii(script_text), 'b') +-- +1.8.4.1 + 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 18 15:00:14 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 May 2014 13:00:14 +0000 Subject: SF.net SVN: gar:[23649] csw/mgar/pkg/lang-python/pyelftools/trunk Message-ID: <3gWk4l01vXz1GR@mail.opencsw.org> Revision: 23649 http://sourceforge.net/p/gar/code/23649 Author: wahwah Date: 2014-05-18 13:00:14 +0000 (Sun, 18 May 2014) Log Message: ----------- lang-python/pyelftools/trunk: Version bump, patches have been pushed upstream Modified Paths: -------------- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile csw/mgar/pkg/lang-python/pyelftools/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-syminfo+symbol_versioning_support.patch csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2014-05-18 12:55:09 UTC (rev 23648) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2014-05-18 13:00:14 UTC (rev 23649) @@ -2,26 +2,19 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = pyelftools -VERSION = 0.21 +VERSION = 0.22 GARTYPE = v2 DESCRIPTION = Library for analyzing ELF files and DWARF debugging information -define BLURB -endef CATEGORIES = python DISTFILES = $(DISTNAME).tar.gz -PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc - # Since elftools are used for checkpkg, they need to be built for all # platforms on which we're building. PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PATCHFILES += 0001-syminfo+symbol_versioning_support.patch -PATCHFILES += 0002-Correctly-handle-the-multiple-string-tables-case-for.patch - TEST_SCRIPTS = ARCHALL_CSWpy-pyelftools = 1 Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/checksums 2014-05-18 12:55:09 UTC (rev 23648) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/checksums 2014-05-18 13:00:14 UTC (rev 23649) @@ -1 +1 @@ -fe1039193675cb9d0ddf60d1431fbea3 pyelftools-0.21.tar.gz +e01fe8bb455b472ebe26ab9ccff26fcf pyelftools-0.22.tar.gz Deleted: csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-syminfo+symbol_versioning_support.patch =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-syminfo+symbol_versioning_support.patch 2014-05-18 12:55:09 UTC (rev 23648) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-syminfo+symbol_versioning_support.patch 2014-05-18 13:00:14 UTC (rev 23649) @@ -1,2070 +0,0 @@ -diff -r 249a5ca85159 CHANGES ---- a/CHANGES Wed Apr 17 05:57:58 2013 -0700 -+++ b/CHANGES Mon Jun 03 17:52:42 2013 +0200 -@@ -1,7 +1,14 @@ - Changelog - ========= - --+ Version 0.22 (17.04.2013) -++ Version 0.22 (??) -+ -+ - Added some initial support for parsing Solaris OpenCSW ELF files -+ (contributed by Yann Rouillard). -+ - Added some initial support for DWARF4 (as generated by gcc 4.8) -+ and DWARF generated by recent versions of Clang (3.3). -+ -++ Version 0.21 (17.04.2013) - - - Added new example: dwarf_decode_address - decode function name and - file & line information from an address. -diff -r 249a5ca85159 elftools/dwarf/callframe.py ---- a/elftools/dwarf/callframe.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/dwarf/callframe.py Mon Jun 03 17:52:42 2013 +0200 -@@ -26,13 +26,13 @@ - Eventually, each entry gets its own structs based on the initial - length field it starts with. The address_size, however, is taken - from base_structs. This appears to be a limitation of the DWARFv3 -- standard, fixed in v4 (where an address_size field exists for each -- CFI. A discussion I had on dwarf-discuss confirms this. -- Currently for base_structs I simply use the elfclass of the -- containing file, but more sophisticated methods are used by -- libdwarf and others, such as guessing which CU contains which FDEs -- (based on their address ranges) and taking the address_size from -- those CUs. -+ standard, fixed in v4. -+ A discussion I had on dwarf-discuss confirms this. -+ So for DWARFv4 we'll take the address size from the CIE header, -+ but for earlier versions will use the elfclass of the containing -+ file; more sophisticated methods are used by libdwarf and others, -+ such as guessing which CU contains which FDEs (based on their -+ address ranges) and taking the address_size from those CUs. - """ - def __init__(self, stream, size, base_structs): - self.stream = stream -@@ -99,6 +99,14 @@ - header = struct_parse( - header_struct, self.stream, offset) - -+ # If this is DWARF version 4 or later, we can have a more precise -+ # address size, read from the CIE header. -+ if entry_structs.dwarf_version >= 4: -+ entry_structs = DWARFStructs( -+ little_endian=entry_structs.little_endian, -+ dwarf_format=entry_structs.dwarf_format, -+ address_size=header.address_size) -+ - # For convenience, compute the end offset for this entry - end_offset = ( - offset + header.length + -diff -r 249a5ca85159 elftools/dwarf/descriptions.py ---- a/elftools/dwarf/descriptions.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/dwarf/descriptions.py Mon Jun 03 17:52:42 2013 +0200 -@@ -197,6 +197,12 @@ - """ - return '1' if attr.value else '0' - -+def _describe_attr_present(attr, die, section_offset): -+ """ Some forms may simply mean that an attribute is present, -+ without providing any value. -+ """ -+ return '1' -+ - def _describe_attr_block(attr, die, section_offset): - s = '%s byte block: ' % len(attr.value) - s += ' '.join('%x' % item for item in attr.value) + ' ' -@@ -227,6 +233,9 @@ - DW_FORM_block2=_describe_attr_block, - DW_FORM_block4=_describe_attr_block, - DW_FORM_block=_describe_attr_block, -+ DW_FORM_flag_present=_describe_attr_present, -+ DW_FORM_exprloc=_describe_attr_block, -+ DW_FORM_ref_sig8=_describe_attr_ref, - ) - - -diff -r 249a5ca85159 elftools/dwarf/dwarfinfo.py ---- a/elftools/dwarf/dwarfinfo.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/dwarf/dwarfinfo.py Mon Jun 03 17:52:42 2013 +0200 -@@ -21,7 +21,7 @@ - - - # Describes a debug section --# -+# - # stream: a stream object containing the data of this section - # name: section name in the container file - # global_offset: the global offset of the section in its container file -@@ -30,7 +30,7 @@ - # 'name' and 'global_offset' are for descriptional purposes only and - # aren't strictly required for the DWARF parsing to work. - # --DebugSectionDescriptor = namedtuple('DebugSectionDescriptor', -+DebugSectionDescriptor = namedtuple('DebugSectionDescriptor', - 'stream name global_offset size') - - -@@ -51,7 +51,7 @@ - - - class DWARFInfo(object): -- """ Acts also as a "context" to other major objects, bridging between -+ """ Acts also as a "context" to other major objects, bridging between - various parts of the debug infromation. - """ - def __init__(self, -@@ -59,6 +59,7 @@ - debug_info_sec, - debug_abbrev_sec, - debug_frame_sec, -+ eh_frame_sec, - debug_str_sec, - debug_loc_sec, - debug_ranges_sec, -@@ -68,19 +69,20 @@ - - debug_*_sec: - DebugSectionDescriptor for a section. Pass None for sections -- that don't exist. These arguments are best given with -+ that don't exist. These arguments are best given with - keyword syntax. - """ - self.config = config - self.debug_info_sec = debug_info_sec - self.debug_abbrev_sec = debug_abbrev_sec - self.debug_frame_sec = debug_frame_sec -+ self.eh_frame_sec = eh_frame_sec - self.debug_str_sec = debug_str_sec - self.debug_loc_sec = debug_loc_sec - self.debug_ranges_sec = debug_ranges_sec - self.debug_line_sec = debug_line_sec - -- # This is the DWARFStructs the context uses, so it doesn't depend on -+ # This is the DWARFStructs the context uses, so it doesn't depend on - # DWARF format and address_size (these are determined per CU) - set them - # to default values. - self.structs = DWARFStructs( -@@ -119,7 +121,7 @@ - return self._abbrevtable_cache[offset] - - def get_string_from_table(self, offset): -- """ Obtain a string from the string table section, given an offset -+ """ Obtain a string from the string table section, given an offset - relative to the section. - """ - return parse_cstring_from_stream(self.debug_str_sec.stream, offset) -@@ -139,12 +141,12 @@ - return None - - def has_CFI(self): -- """ Does this dwarf info has a CFI section? -+ """ Does this dwarf info have a dwarf_frame CFI section? - """ - return self.debug_frame_sec is not None - - def CFI_entries(self): -- """ Get a list of CFI entries from the .debug_frame section. -+ """ Get a list of dwarf_frame CFI entries from the .debug_frame section. - """ - cfi = CallFrameInfo( - stream=self.debug_frame_sec.stream, -@@ -152,6 +154,20 @@ - base_structs=self.structs) - return cfi.get_entries() - -+ def has_EH_CFI(self): -+ """ Does this dwarf info have a eh_frame CFI section? -+ """ -+ return self.eh_frame_sec is not None -+ -+ def EH_CFI_entries(self): -+ """ Get a list of eh_frame CFI entries from the .eh_frame section. -+ """ -+ cfi = CallFrameInfo( -+ stream=self.eh_frame_sec.stream, -+ size=self.eh_frame_sec.size, -+ base_structs=self.structs) -+ return cfi.get_entries() -+ - def location_lists(self): - """ Get a LocationLists object representing the .debug_loc section of - the DWARF data, or None if this section doesn't exist. -@@ -175,18 +191,18 @@ - # Compute the offset of the next CU in the section. The unit_length - # field of the CU header contains its size not including the length - # field itself. -- offset = ( offset + -- cu['unit_length'] + -+ offset = ( offset + -+ cu['unit_length'] + - cu.structs.initial_length_field_size()) - yield cu -- -+ - def _parse_CU_at_offset(self, offset): - """ Parse and return a CU at the given offset in the debug_info stream. - """ - # Section 7.4 (32-bit and 64-bit DWARF Formats) of the DWARF spec v3 -- # states that the first 32-bit word of the CU header determines -+ # states that the first 32-bit word of the CU header determines - # whether the CU is represented with 32-bit or 64-bit DWARF format. -- # -+ # - # So we peek at the first word in the CU header to determine its - # dwarf format. Based on it, we then create a new DWARFStructs - # instance suitable for this CU and use it to parse the rest. -@@ -205,15 +221,15 @@ - little_endian=self.config.little_endian, - dwarf_format=dwarf_format, - address_size=4) -- -+ - cu_header = struct_parse( - cu_structs.Dwarf_CU_header, self.debug_info_sec.stream, offset) - if cu_header['address_size'] == 8: - cu_structs = DWARFStructs( - little_endian=self.config.little_endian, - dwarf_format=dwarf_format, -- address_size=8) -- -+ address_size=8) -+ - cu_die_offset = self.debug_info_sec.stream.tell() - dwarf_assert( - self._is_supported_version(cu_header['version']), -@@ -224,11 +240,11 @@ - structs=cu_structs, - cu_offset=offset, - cu_die_offset=cu_die_offset) -- -+ - def _is_supported_version(self, version): - """ DWARF version supported by this parser - """ -- return 2 <= version <= 3 -+ return 2 <= version <= 4 - - def _parse_line_program_at_offset(self, debug_line_offset, structs): - """ Given an offset to the .debug_line section, parse the line program -diff -r 249a5ca85159 elftools/dwarf/enums.py ---- a/elftools/dwarf/enums.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/dwarf/enums.py Mon Jun 03 17:52:42 2013 +0200 -@@ -185,7 +185,9 @@ - DW_AT_main_subprogram = 0x6a, - DW_AT_data_bit_offset = 0x6b, - DW_AT_const_expr = 0x6c, -- -+ DW_AT_enum_class = 0x6d, -+ DW_AT_linkage_name = 0x6e, -+ - DW_AT_MIPS_fde = 0x2001, - DW_AT_MIPS_loop_begin = 0x2002, - DW_AT_MIPS_tail_loop_begin = 0x2003, -@@ -197,8 +199,46 @@ - DW_AT_MIPS_abstract_name = 0x2009, - DW_AT_MIPS_clone_origin = 0x200a, - DW_AT_MIPS_has_inlines = 0x200b, -+ DW_AT_MIPS_stride_byte = 0x200c, -+ DW_AT_MIPS_stride_elem = 0x200d, -+ DW_AT_MIPS_ptr_dopetype = 0x200e, -+ DW_AT_MIPS_allocatable_dopetype = 0x200f, -+ DW_AT_MIPS_assumed_shape_dopetype = 0x2010, -+ DW_AT_MIPS_assumed_size = 0x2011, - -- _default_ = Pass, -+ DW_AT_sf_names = 0x2101, -+ DW_AT_src_info = 0x2102, -+ DW_AT_mac_info = 0x2103, -+ DW_AT_src_coords = 0x2104, -+ DW_AT_body_begin = 0x2105, -+ DW_AT_body_end = 0x2106, -+ DW_AT_GNU_vector = 0x2107, -+ DW_AT_GNU_template_name = 0x2110, -+ -+ DW_AT_GNU_call_site_value = 0x2111, -+ DW_AT_GNU_call_site_data_value = 0x2112, -+ DW_AT_GNU_call_site_target = 0x2113, -+ DW_AT_GNU_call_site_target_clobbered = 0x2114, -+ DW_AT_GNU_tail_call = 0x2115, -+ DW_AT_GNU_all_tail_call_sites = 0x2116, -+ DW_AT_GNU_all_call_sites = 0x2117, -+ DW_AT_GNU_all_source_call_sites = 0x2118, -+ -+ DW_AT_APPLE_optimized = 0x3fe1, -+ DW_AT_APPLE_flags = 0x3fe2, -+ DW_AT_APPLE_isa = 0x3fe3, -+ DW_AT_APPLE_block = 0x3fe4, -+ DW_AT_APPLE_major_runtime_vers = 0x3fe5, -+ DW_AT_APPLE_runtime_class = 0x3fe6, -+ DW_AT_APPLE_omit_frame_ptr = 0x3fe7, -+ DW_AT_APPLE_property_name = 0x3fe8, -+ DW_AT_APPLE_property_getter = 0x3fe9, -+ DW_AT_APPLE_property_setter = 0x3fea, -+ DW_AT_APPLE_property_attribute = 0x3feb, -+ DW_AT_APPLE_objc_complete_type = 0x3fec, -+ DW_AT_APPLE_property = 0x3fed, -+ -+ _default_ = Pass, - ) - - -@@ -225,6 +265,10 @@ - DW_FORM_ref8 = 0x14, - DW_FORM_ref_udata = 0x15, - DW_FORM_indirect = 0x16, -+ DW_FORM_sec_offset = 0x17, -+ DW_FORM_exprloc = 0x18, -+ DW_FORM_flag_present = 0x19, -+ DW_FORM_ref_sig8 = 0x20, - - _default_ = Pass, - ) -diff -r 249a5ca85159 elftools/dwarf/lineprogram.py ---- a/elftools/dwarf/lineprogram.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/dwarf/lineprogram.py Mon Jun 03 17:52:42 2013 +0200 -@@ -215,10 +215,10 @@ - add_entry_old_state(opcode, [operand]) - elif opcode == DW_LNS_negate_stmt: - state.is_stmt = not state.is_stmt -- add_entry_old_state(opcode, [operand]) -+ add_entry_old_state(opcode, []) - elif opcode == DW_LNS_set_basic_block: - state.basic_block = True -- add_entry_old_state(opcode, [operand]) -+ add_entry_old_state(opcode, []) - elif opcode == DW_LNS_const_add_pc: - adjusted_opcode = 255 - self['opcode_base'] - address_addend = ((adjusted_opcode // self['line_range']) * -diff -r 249a5ca85159 elftools/dwarf/structs.py ---- a/elftools/dwarf/structs.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/dwarf/structs.py Mon Jun 03 17:52:42 2013 +0200 -@@ -11,7 +11,7 @@ - UBInt8, UBInt16, UBInt32, UBInt64, ULInt8, ULInt16, ULInt32, ULInt64, - SBInt8, SBInt16, SBInt32, SBInt64, SLInt8, SLInt16, SLInt32, SLInt64, - Adapter, Struct, ConstructError, If, RepeatUntil, Field, Rename, Enum, -- Array, PrefixedArray, CString, Embed, -+ Array, PrefixedArray, CString, Embed, StaticField - ) - from ..common.construct_utils import RepeatUntilExcluding - -@@ -19,39 +19,39 @@ - - - class DWARFStructs(object): -- """ Exposes Construct structs suitable for parsing information from DWARF -+ """ Exposes Construct structs suitable for parsing information from DWARF - sections. Each compile unit in DWARF info can have its own structs -- object. Keep in mind that these structs have to be given a name (by -+ object. Keep in mind that these structs have to be given a name (by - calling them with a name) before being used for parsing (like other - Construct structs). Those that should be used without a name are marked - by (+). -- -+ - Accessible attributes (mostly as described in chapter 7 of the DWARF - spec v3): -- -+ - Dwarf_[u]int{8,16,32,64): - Data chunks of the common sizes -- -+ - Dwarf_offset: - 32-bit or 64-bit word, depending on dwarf_format -- -+ - Dwarf_target_addr: - 32-bit or 64-bit word, depending on address size -- -+ - Dwarf_initial_length: - "Initial length field" encoding - section 7.4 -- -+ - Dwarf_{u,s}leb128: - ULEB128 and SLEB128 variable-length encoding -- -+ - Dwarf_CU_header (+): - Compilation unit header -- -+ - Dwarf_abbrev_declaration (+): - Abbreviation table declaration - doesn't include the initial - code, only the contents. -- -+ - Dwarf_dw_form (+): - A dictionary mapping 'DW_FORM_*' keys into construct Structs - that parse such forms. These Structs have already been given -@@ -62,7 +62,7 @@ - - Dwarf_lineprog_file_entry (+): - A single file entry in a line program header or instruction -- -+ - Dwarf_CIE_header (+): - A call-frame CIE - -@@ -71,22 +71,27 @@ - - See also the documentation of public methods. - """ -- def __init__(self, little_endian, dwarf_format, address_size): -- """ little_endian: -+ def __init__(self, -+ little_endian, dwarf_format, address_size, dwarf_version=2): -+ """ dwarf_version: -+ Numeric DWARF version -+ -+ little_endian: - True if the file is little endian, False if big -- -+ - dwarf_format: - DWARF Format: 32 or 64-bit (see spec section 7.4) -- -+ - address_size: -- Target machine address size, in bytes (4 or 8). (See spec -+ Target machine address size, in bytes (4 or 8). (See spec - section 7.5.1) - """ - assert dwarf_format == 32 or dwarf_format == 64 - assert address_size == 8 or address_size == 4 - self.little_endian = little_endian -- self.dwarf_format = dwarf_format -+ self.dwarf_format = dwarf_format - self.address_size = address_size -+ self.dwarf_version = dwarf_version - self._create_structs() - - def initial_length_field_size(self): -@@ -131,7 +136,7 @@ - def _create_initial_length(self): - def _InitialLength(name): - # Adapts a Struct that parses forward a full initial length field. -- # Only if the first word is the continuation value, the second -+ # Only if the first word is the continuation value, the second - # word is parsed from the stream. - # - return _InitialLengthAdapter( -@@ -152,13 +157,13 @@ - self.Dwarf_uint16('version'), - self.Dwarf_offset('debug_abbrev_offset'), - self.Dwarf_uint8('address_size')) -- -+ - def _create_abbrev_declaration(self): - self.Dwarf_abbrev_declaration = Struct('Dwarf_abbrev_entry', - Enum(self.Dwarf_uleb128('tag'), **ENUM_DW_TAG), - Enum(self.Dwarf_uint8('children_flag'), **ENUM_DW_CHILDREN), - RepeatUntilExcluding( -- lambda obj, ctx: -+ lambda obj, ctx: - obj.name == 'DW_AT_null' and obj.form == 'DW_FORM_null', - Struct('attr_spec', - Enum(self.Dwarf_uleb128('name'), **ENUM_DW_AT), -@@ -167,12 +172,12 @@ - def _create_dw_form(self): - self.Dwarf_dw_form = dict( - DW_FORM_addr=self.Dwarf_target_addr(''), -- -+ - DW_FORM_block1=self._make_block_struct(self.Dwarf_uint8), - DW_FORM_block2=self._make_block_struct(self.Dwarf_uint16), - DW_FORM_block4=self._make_block_struct(self.Dwarf_uint32), - DW_FORM_block=self._make_block_struct(self.Dwarf_uleb128), -- -+ - # All DW_FORM_data forms are assumed to be unsigned - DW_FORM_data1=self.Dwarf_uint8(''), - DW_FORM_data2=self.Dwarf_uint16(''), -@@ -180,19 +185,25 @@ - DW_FORM_data8=self.Dwarf_uint64(''), - DW_FORM_sdata=self.Dwarf_sleb128(''), - DW_FORM_udata=self.Dwarf_uleb128(''), -- -+ - DW_FORM_string=CString(''), - DW_FORM_strp=self.Dwarf_offset(''), - DW_FORM_flag=self.Dwarf_uint8(''), -- -+ - DW_FORM_ref1=self.Dwarf_uint8(''), - DW_FORM_ref2=self.Dwarf_uint16(''), - DW_FORM_ref4=self.Dwarf_uint32(''), - DW_FORM_ref8=self.Dwarf_uint64(''), - DW_FORM_ref_udata=self.Dwarf_uleb128(''), - DW_FORM_ref_addr=self.Dwarf_offset(''), -- -+ - DW_FORM_indirect=self.Dwarf_uleb128(''), -+ -+ # New forms in DWARFv4 -+ DW_FORM_flag_present = StaticField('', 0), -+ DW_FORM_sec_offset = self.Dwarf_offset(''), -+ DW_FORM_exprloc = self._make_block_struct(self.Dwarf_uleb128), -+ DW_FORM_ref_sig8 = self.Dwarf_offset(''), - ) - - def _create_lineprog_header(self): -@@ -215,7 +226,7 @@ - self.Dwarf_int8('line_base'), - self.Dwarf_uint8('line_range'), - self.Dwarf_uint8('opcode_base'), -- Array(lambda ctx: ctx['opcode_base'] - 1, -+ Array(lambda ctx: ctx['opcode_base'] - 1, - self.Dwarf_uint8('standard_opcode_lengths')), - RepeatUntilExcluding( - lambda obj, ctx: obj == b'', -@@ -226,14 +237,27 @@ - ) - - def _create_callframe_entry_headers(self): -- self.Dwarf_CIE_header = Struct('Dwarf_CIE_header', -- self.Dwarf_initial_length('length'), -- self.Dwarf_offset('CIE_id'), -- self.Dwarf_uint8('version'), -- CString('augmentation'), -- self.Dwarf_uleb128('code_alignment_factor'), -- self.Dwarf_sleb128('data_alignment_factor'), -- self.Dwarf_uleb128('return_address_register')) -+ # The CIE header was modified in DWARFv4. -+ if self.dwarf_version == 4: -+ self.Dwarf_CIE_header = Struct('Dwarf_CIE_header', -+ self.Dwarf_initial_length('length'), -+ self.Dwarf_offset('CIE_id'), -+ self.Dwarf_uint8('version'), -+ CString('augmentation'), -+ self.Dwarf_uint8('address_size'), -+ self.Dwarf_uint8('segment_size'), -+ self.Dwarf_uleb128('code_alignment_factor'), -+ self.Dwarf_sleb128('data_alignment_factor'), -+ self.Dwarf_uleb128('return_address_register')) -+ else: -+ self.Dwarf_CIE_header = Struct('Dwarf_CIE_header', -+ self.Dwarf_initial_length('length'), -+ self.Dwarf_offset('CIE_id'), -+ self.Dwarf_uint8('version'), -+ CString('augmentation'), -+ self.Dwarf_uleb128('code_alignment_factor'), -+ self.Dwarf_sleb128('data_alignment_factor'), -+ self.Dwarf_uleb128('return_address_register')) - - self.Dwarf_FDE_header = Struct('Dwarf_FDE_header', - self.Dwarf_initial_length('length'), -@@ -242,7 +266,7 @@ - self.Dwarf_target_addr('address_range')) - - def _make_block_struct(self, length_field): -- """ Create a struct for DW_FORM_block -+ """ Create a struct for DW_FORM_block - """ - return PrefixedArray( - subcon=self.Dwarf_uint8('elem'), -diff -r 249a5ca85159 elftools/elf/constants.py ---- a/elftools/elf/constants.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/elf/constants.py Mon Jun 03 17:52:42 2013 +0200 -@@ -45,3 +45,25 @@ - PF_MASKOS=0x00FF0000 - PF_MASKPROC=0xFF000000 - -+ -+# symbol info flags for entries -+# in the .SUNW_syminfo section -+class SUNW_SYMINFO_FLAGS(object): -+ """ Flags for the si_flags field of entries -+ in the .SUNW_syminfo section -+ """ -+ SYMINFO_FLG_DIRECT=0x1 -+ SYMINFO_FLG_FILTER=0x2 -+ SYMINFO_FLG_COPY=0x4 -+ SYMINFO_FLG_LAZYLOAD=0x8 -+ SYMINFO_FLG_DIRECTBIND=0x10 -+ SYMINFO_FLG_NOEXTDIRECT=0x20 -+ SYMINFO_FLG_AUXILIARY=0x40 -+ SYMINFO_FLG_INTERPOSE=0x80 -+ SYMINFO_FLG_CAP=0x100 -+ SYMINFO_FLG_DEFERRED=0x200 -+ -+class VER_FLAGS(object): -+ VER_FLG_BASE=0x1 -+ VER_FLG_WEAK=0x2 -+ VER_FLG_INFO=0x4 -diff -r 249a5ca85159 elftools/elf/descriptions.py ---- a/elftools/elf/descriptions.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/elf/descriptions.py Mon Jun 03 17:52:42 2013 +0200 -@@ -9,7 +9,7 @@ - from .enums import ( - ENUM_D_TAG, ENUM_E_VERSION, ENUM_RELOC_TYPE_i386, ENUM_RELOC_TYPE_x64 - ) --from .constants import P_FLAGS, SH_FLAGS -+from .constants import P_FLAGS, SH_FLAGS, SUNW_SYMINFO_FLAGS, VER_FLAGS - from ..common.py3compat import iteritems - - -@@ -84,6 +84,28 @@ - return _DESCR_D_TAG.get(x, _unknown) - - -+def describe_syminfo_flags(x): -+ return ''.join(_DESCR_SYMINFO_FLAGS[flag] for flag in ( -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_CAP, -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECT, -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_FILTER, -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_AUXILIARY, -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND, -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_COPY, -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_LAZYLOAD, -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_NOEXTDIRECT, -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_INTERPOSE, -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DEFERRED) if x & flag) -+ -+def describe_symbol_boundto(x): -+ return _DESCR_SYMINFO_BOUNDTO.get(x, '%3s' % x) -+ -+def describe_ver_flags(x): -+ return ' | '.join(_DESCR_VER_FLAGS[flag] for flag in ( -+ VER_FLAGS.VER_FLG_WEAK, -+ VER_FLAGS.VER_FLG_BASE, -+ VER_FLAGS.VER_FLG_INFO) if x & flag) -+ - #------------------------------------------------------------------------------- - _unknown = '' - -@@ -236,6 +258,33 @@ - SHN_COMMON='COM', - ) - -+_DESCR_SYMINFO_FLAGS = { -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECT: 'D', -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND: 'B', -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_COPY: 'C', -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_LAZYLOAD: 'L', -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_NOEXTDIRECT: 'N', -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_AUXILIARY: 'A', -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_FILTER: 'F', -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_INTERPOSE: 'I', -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_CAP: 'S', -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DEFERRED: 'P', -+} -+ -+_DESCR_SYMINFO_BOUNDTO = dict( -+ SYMINFO_BT_SELF='', -+ SYMINFO_BT_PARENT='', -+ SYMINFO_BT_NONE='', -+ SYMINFO_BT_EXTERN='', -+) -+ -+_DESCR_VER_FLAGS = { -+ 0: '', -+ VER_FLAGS.VER_FLG_BASE: 'BASE', -+ VER_FLAGS.VER_FLG_WEAK: 'WEAK', -+ VER_FLAGS.VER_FLG_INFO: 'INFO', -+} -+ - _DESCR_RELOC_TYPE_i386 = dict( - (v, k) for k, v in iteritems(ENUM_RELOC_TYPE_i386)) - -diff -r 249a5ca85159 elftools/elf/dynamic.py ---- a/elftools/elf/dynamic.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/elf/dynamic.py Mon Jun 03 17:52:42 2013 +0200 -@@ -25,7 +25,8 @@ - value of DT_SONAME (fetched from the dynamic symbol table). - """ - _HANDLED_TAGS = frozenset( -- ['DT_NEEDED', 'DT_RPATH', 'DT_RUNPATH', 'DT_SONAME']) -+ ['DT_NEEDED', 'DT_RPATH', 'DT_RUNPATH', 'DT_SONAME', -+ 'DT_SUNW_FILTER']) - - def __init__(self, entry, elffile): - self.entry = entry -diff -r 249a5ca85159 elftools/elf/elffile.py ---- a/elftools/elf/elffile.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/elf/elffile.py Mon Jun 03 17:52:42 2013 +0200 -@@ -12,9 +12,13 @@ - from ..construct import ConstructError - from .structs import ELFStructs - from .sections import ( -- Section, StringTableSection, SymbolTableSection, NullSection) -+ Section, StringTableSection, SymbolTableSection, -+ SUNWSyminfoTableSection, NullSection) - from .dynamic import DynamicSection, DynamicSegment - from .relocation import RelocationSection, RelocationHandler -+from .gnuversions import ( -+ GNUVerNeedSection, GNUVerDefSection, -+ GNUVerSymSection) - from .segments import Segment, InterpSegment - from .enums import ENUM_RELOC_TYPE_i386, ENUM_RELOC_TYPE_x64 - from ..dwarf.dwarfinfo import DWARFInfo, DebugSectionDescriptor, DwarfConfig -@@ -125,15 +129,15 @@ - # - debug_sections = {} - for secname in (b'.debug_info', b'.debug_abbrev', b'.debug_str', -- b'.debug_line', b'.debug_frame', b'.debug_loc', -- b'.debug_ranges'): -+ b'.debug_line', b'.debug_frame', -+ b'.debug_loc', b'.debug_ranges'): - section = self.get_section_by_name(secname) - if section is None: - debug_sections[secname] = None - else: - debug_sections[secname] = self._read_dwarf_section( -- section, -- relocate_dwarf_sections) -+ section, -+ relocate_dwarf_sections) - - return DWARFInfo( - config=DwarfConfig( -@@ -143,6 +147,8 @@ - debug_info_sec=debug_sections[b'.debug_info'], - debug_abbrev_sec=debug_sections[b'.debug_abbrev'], - debug_frame_sec=debug_sections[b'.debug_frame'], -+ # TODO(eliben): reading of eh_frame is not hooked up yet -+ eh_frame_sec=None, - debug_str_sec=debug_sections[b'.debug_str'], - debug_loc_sec=debug_sections[b'.debug_loc'], - debug_ranges_sec=debug_sections[b'.debug_ranges'], -@@ -243,6 +249,14 @@ - return NullSection(section_header, name, self.stream) - elif sectype in ('SHT_SYMTAB', 'SHT_DYNSYM'): - return self._make_symbol_table_section(section_header, name) -+ elif sectype == 'SHT_SUNW_syminfo': -+ return self._make_sunwsyminfo_table_section(section_header, name) -+ elif sectype == 'SHT_GNU_verneed': -+ return self._make_gnu_verneed_section(section_header, name) -+ elif sectype == 'SHT_GNU_verdef': -+ return self._make_gnu_verdef_section(section_header, name) -+ elif sectype == 'SHT_GNU_versym': -+ return self._make_gnu_versym_section(section_header, name) - elif sectype in ('SHT_REL', 'SHT_RELA'): - return RelocationSection( - section_header, name, self.stream, self) -@@ -261,6 +275,46 @@ - elffile=self, - stringtable=strtab_section) - -+ def _make_sunwsyminfo_table_section(self, section_header, name): -+ """ Create a SUNWSyminfoTableSection -+ """ -+ linked_strtab_index = section_header['sh_link'] -+ strtab_section = self.get_section(linked_strtab_index) -+ return SUNWSyminfoTableSection( -+ section_header, name, self.stream, -+ elffile=self, -+ symboltable=strtab_section) -+ -+ def _make_gnu_verneed_section(self, section_header, name): -+ """ Create a GNUVerNeedSection -+ """ -+ linked_strtab_index = section_header['sh_link'] -+ strtab_section = self.get_section(linked_strtab_index) -+ return GNUVerNeedSection( -+ section_header, name, self.stream, -+ elffile=self, -+ stringtable=strtab_section) -+ -+ def _make_gnu_verdef_section(self, section_header, name): -+ """ Create a GNUVerDefSection -+ """ -+ linked_strtab_index = section_header['sh_link'] -+ strtab_section = self.get_section(linked_strtab_index) -+ return GNUVerDefSection( -+ section_header, name, self.stream, -+ elffile=self, -+ stringtable=strtab_section) -+ -+ def _make_gnu_versym_section(self, section_header, name): -+ """ Create a GNUVerSymSection -+ """ -+ linked_strtab_index = section_header['sh_link'] -+ strtab_section = self.get_section(linked_strtab_index) -+ return GNUVerSymSection( -+ section_header, name, self.stream, -+ elffile=self, -+ symboltable=strtab_section) -+ - def _get_segment_header(self, n): - """ Find the header of segment #n, parse it and return the struct - """ -diff -r 249a5ca85159 elftools/elf/enums.py ---- a/elftools/elf/enums.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/elf/enums.py Mon Jun 03 17:52:42 2013 +0200 -@@ -184,14 +184,15 @@ - SHT_NUM=19, - SHT_LOOS=0x60000000, - SHT_GNU_HASH=0x6ffffff6, -- SHT_GNU_verdef=0x6ffffffd, -- SHT_GNU_verneed=0x6ffffffe, -- SHT_GNU_versym=0x6fffffff, -+ SHT_GNU_verdef=0x6ffffffd, # also SHT_SUNW_verdef -+ SHT_GNU_verneed=0x6ffffffe, # also SHT_SUNW_verneed -+ SHT_GNU_versym=0x6fffffff, # also SHT_SUNW_versym - SHT_LOPROC=0x70000000, - SHT_HIPROC=0x7fffffff, - SHT_LOUSER=0x80000000, - SHT_HIUSER=0xffffffff, - SHT_AMD64_UNWIND=0x70000001, -+ SHT_SUNW_syminfo=0x6ffffffc, - _default_=Pass, - ) - -@@ -301,6 +302,24 @@ - DT_PREINIT_ARRAYSZ=33, - DT_NUM=34, - DT_LOOS=0x6000000d, -+ DT_SUNW_AUXILIARY=0x6000000d, -+ DT_SUNW_RTLDINF=0x6000000e, -+ DT_SUNW_FILTER=0x6000000f, -+ DT_SUNW_CAP=0x60000010, -+ DT_SUNW_SYMTAB=0x60000011, -+ DT_SUNW_SYMSZ=0x60000012, -+ DT_SUNW_ENCODING=0x60000013, -+ DT_SUNW_SORTENT=0x60000013, -+ DT_SUNW_SYMSORT=0x60000014, -+ DT_SUNW_SYMSORTSZ=0x60000015, -+ DT_SUNW_TLSSORT=0x60000016, -+ DT_SUNW_TLSSORTSZ=0x60000017, -+ DT_SUNW_CAPINFO=0x60000018, -+ DT_SUNW_STRPAD=0x60000019, -+ DT_SUNW_CAPCHAIN=0x6000001a, -+ DT_SUNW_LDMACH=0x6000001b, -+ DT_SUNW_CAPCHAINENT=0x6000001d, -+ DT_SUNW_CAPCHAINSZ=0x6000001f, - DT_HIOS=0x6ffff000, - DT_LOPROC=0x70000000, - DT_HIPROC=0x7fffffff, -@@ -428,3 +447,29 @@ - _default_=Pass, - ) - -+# Sunw Syminfo Bound To special values -+ENUM_SUNW_SYMINFO_BOUNDTO = dict( -+ SYMINFO_BT_SELF=0xffff, -+ SYMINFO_BT_PARENT=0xfffe, -+ SYMINFO_BT_NONE=0xfffd, -+ SYMINFO_BT_EXTERN=0xfffc, -+ _default_=Pass, -+) -+ -+# Versym section, version dependency index -+ENUM_VERSYM = dict( -+ VER_NDX_LOCAL=0, -+ VER_NDX_GLOBAL=1, -+ VER_NDX_LORESERVE=0xff00, -+ VER_NDX_ELIMINATE=0xff01, -+ _default_=Pass, -+) -+# Sunw Syminfo Bound To special values -+ENUM_SUNW_SYMINFO_BOUNDTO = dict( -+ SYMINFO_BT_SELF=0xffff, -+ SYMINFO_BT_PARENT=0xfffe, -+ SYMINFO_BT_NONE=0xfffd, -+ SYMINFO_BT_EXTERN=0xfffc, -+ _default_=Pass, -+) -+ -diff -r 249a5ca85159 elftools/elf/gnuversions.py ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/elftools/elf/gnuversions.py Mon Jun 03 17:52:42 2013 +0200 -@@ -0,0 +1,228 @@ -+#------------------------------------------------------------------------------ -+# elftools: elf/gnuversions.py -+# -+# ELF sections -+# -+# Yann Rouillard (yann at pleiades.fr.eu.org) -+# This code is in the public domain -+#------------------------------------------------------------------------------ -+from ..construct import CString -+from ..common.utils import struct_parse, elf_assert -+from .sections import Section, Symbol -+ -+ -+class Version(object): -+ """ Version object - representing a version definition or dependency -+ entry from a "Version Needed" or a "Version Dependency" table section. -+ -+ This kind of entry contains a pointer to an array of auxiliary entries -+ that store the information about version names or dependencies. -+ These entries are not stored in this object and should be accessed -+ through the appropriate method of a section object which will return -+ an iterator of VersionAuxiliary objects. -+ -+ Similarly to Section objects, allows dictionary-like access to -+ verdef/verneed entry -+ """ -+ def __init__(self, entry, name=None): -+ self.entry = entry -+ self.name = name -+ -+ def __getitem__(self, name): -+ """ Implement dict-like access to entry -+ """ -+ return self.entry[name] -+ -+ -+class VersionAuxiliary(object): -+ """ Version Auxiliary object - representing an auxiliary entry of a version -+ definition or dependency entry -+ -+ Similarly to Section objects, allows dictionary-like access to the -+ verdaux/vernaux entry -+ """ -+ def __init__(self, entry, name): -+ self.entry = entry -+ self.name = name -+ -+ def __getitem__(self, name): -+ """ Implement dict-like access to entries -+ """ -+ return self.entry[name] -+ -+ -+class GNUVersionSection(Section): -+ """ Common ancestor class for ELF SUNW|GNU Version Needed/Dependency -+ sections class which contains shareable code -+ """ -+ -+ def __init__(self, header, name, stream, elffile, stringtable, -+ field_prefix, version_struct, version_auxiliaries_struct): -+ super(GNUVersionSection, self).__init__(header, name, stream) -+ self.elffile = elffile -+ self.stringtable = stringtable -+ self.field_prefix = field_prefix -+ self.version_struct = version_struct -+ self.version_auxiliaries_struct = version_auxiliaries_struct -+ -+ def num_versions(self): -+ """ Number of version entries in the section -+ """ -+ return self['sh_info'] -+ -+ def _field_name(self, name, auxiliary=False): -+ """ Return the real field's name of version or a version auxiliary -+ entry -+ """ -+ middle = 'a_' if auxiliary else '_' -+ return self.field_prefix + middle + name -+ -+ def _iter_version_auxiliaries(self, entry_offset, count): -+ """ Yield all auxiliary entries of a version entry -+ """ -+ name_field = self._field_name('name', auxiliary=True) -+ next_field = self._field_name('next', auxiliary=True) -+ -+ for _ in range(count): -+ entry = struct_parse( -+ self.version_auxiliaries_struct, -+ self.stream, -+ stream_pos=entry_offset) -+ -+ name = self.stringtable.get_string(entry[name_field]) -+ version_aux = VersionAuxiliary(entry, name) -+ yield version_aux -+ -+ entry_offset += entry[next_field] -+ -+ def iter_versions(self): -+ """ Yield all the version entries in the section -+ Each time it returns the main version structure -+ and an iterator to walk through its auxiliaries entries -+ """ -+ aux_field = self._field_name('aux') -+ count_field = self._field_name('cnt') -+ next_field = self._field_name('next') -+ -+ entry_offset = self['sh_offset'] -+ for _ in range(self.num_versions()): -+ entry = struct_parse( -+ self.version_struct, -+ self.stream, -+ stream_pos=entry_offset) -+ -+ elf_assert(entry[count_field] > 0, -+ 'Expected number of version auxiliary entries (%s) to be > 0' -+ 'for the following version entry: %s' % ( -+ count_field, str(entry))) -+ -+ version = Version(entry) -+ aux_entries_offset = entry_offset + entry[aux_field] -+ version_auxiliaries_iter = self._iter_version_auxiliaries( -+ aux_entries_offset, entry[count_field]) -+ -+ yield version, version_auxiliaries_iter -+ -+ entry_offset += entry[next_field] -+ -+ -+class GNUVerNeedSection(GNUVersionSection): -+ """ ELF SUNW or GNU Version Needed table section. -+ Has an associated StringTableSection that's passed in the constructor. -+ """ -+ def __init__(self, header, name, stream, elffile, stringtable): -+ super(GNUVerNeedSection, self).__init__( -+ header, name, stream, elffile, stringtable, 'vn', -+ elffile.structs.Elf_Verneed, elffile.structs.Elf_Vernaux) -+ self._has_indexes = None -+ -+ def has_indexes(self): -+ """ Return True if at least one version definition entry has an index -+ that is stored in the vna_other field. -+ This information is used for symbol versioning -+ """ -+ if self._has_indexes is None: -+ self._has_indexes = False -+ for _, vernaux_iter in self.iter_versions(): -+ for vernaux in vernaux_iter: -+ if vernaux['vna_other']: -+ self._has_indexes = True -+ break -+ -+ return self._has_indexes -+ -+ def iter_versions(self): -+ for verneed, vernaux in super(GNUVerNeedSection, self).iter_versions(): -+ verneed.name = self.stringtable.get_string(verneed['vn_file']) -+ yield verneed, vernaux -+ -+ def get_version(self, index): -+ """ Get the version information located at index #n in the table -+ Return boths the verneed structure and the vernaux structure -+ that contains the name of the version -+ """ -+ for verneed, vernaux_iter in self.iter_versions(): -+ for vernaux in vernaux_iter: -+ if vernaux['vna_other'] == index: -+ return verneed, vernaux -+ -+ return None -+ -+ -+class GNUVerDefSection(GNUVersionSection): -+ """ ELF SUNW or GNU Version Definition table section. -+ Has an associated StringTableSection that's passed in the constructor. -+ """ -+ def __init__(self, header, name, stream, elffile, stringtable): -+ super(GNUVerDefSection, self).__init__( -+ header, name, stream, elffile, stringtable, 'vd', -+ elffile.structs.Elf_Verdef, elffile.structs.Elf_Verdaux) -+ -+ def get_version(self, index): -+ """ Get the version information located at index #n in the table -+ Return boths the verdef structure and an iterator to retrieve -+ both the version names and dependencies in the form of -+ verdaux entries -+ """ -+ for verdef, verdaux_iter in self.iter_versions(): -+ if verdef['vd_ndx'] == index: -+ return verdef, verdaux_iter -+ -+ return None -+ -+ -+class GNUVerSymSection(Section): -+ """ ELF SUNW or GNU Versym table section. -+ Has an associated SymbolTableSection that's passed in the constructor. -+ """ -+ def __init__(self, header, name, stream, elffile, symboltable): -+ super(GNUVerSymSection, self).__init__(header, name, stream) -+ self.elffile = elffile -+ self.elfstructs = self.elffile.structs -+ self.symboltable = symboltable -+ -+ def num_symbols(self): -+ """ Number of symbols in the table -+ """ -+ return self['sh_size'] // self['sh_entsize'] -+ -+ def get_symbol(self, n): -+ """ Get the symbol at index #n from the table (Symbol object) -+ It begins at 1 and not 0 since the first entry is used to -+ store the current version of the syminfo table -+ """ -+ # Grab the symbol's entry from the stream -+ entry_offset = self['sh_offset'] + n * self['sh_entsize'] -+ entry = struct_parse( -+ self.elfstructs.Elf_Versym, -+ self.stream, -+ stream_pos=entry_offset) -+ # Find the symbol name in the associated symbol table -+ name = self.symboltable.get_symbol(n).name -+ return Symbol(entry, name) -+ -+ def iter_symbols(self): -+ """ Yield all the symbols in the table -+ """ -+ for i in range(self.num_symbols()): -+ yield self.get_symbol(i) -diff -r 249a5ca85159 elftools/elf/relocation.py ---- a/elftools/elf/relocation.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/elf/relocation.py Mon Jun 03 17:52:42 2013 +0200 -@@ -202,6 +202,9 @@ - def _reloc_calc_sym_plus_addend(value, sym_value, offset, addend=0): - return sym_value + addend - -+ def _reloc_calc_sym_plus_addend_pcrel(value, sym_value, offset, addend=0): -+ return sym_value + addend - offset -+ - _RELOCATION_RECIPES_X86 = { - ENUM_RELOC_TYPE_i386['R_386_NONE']: _RELOCATION_RECIPE_TYPE( - bytesize=4, has_addend=False, calc_func=_reloc_calc_identity), -@@ -218,6 +221,9 @@ - bytesize=8, has_addend=True, calc_func=_reloc_calc_identity), - ENUM_RELOC_TYPE_x64['R_X86_64_64']: _RELOCATION_RECIPE_TYPE( - bytesize=8, has_addend=True, calc_func=_reloc_calc_sym_plus_addend), -+ ENUM_RELOC_TYPE_x64['R_X86_64_PC32']: _RELOCATION_RECIPE_TYPE( -+ bytesize=8, has_addend=True, -+ calc_func=_reloc_calc_sym_plus_addend_pcrel), - ENUM_RELOC_TYPE_x64['R_X86_64_32']: _RELOCATION_RECIPE_TYPE( - bytesize=4, has_addend=True, calc_func=_reloc_calc_sym_plus_addend), - ENUM_RELOC_TYPE_x64['R_X86_64_32S']: _RELOCATION_RECIPE_TYPE( -diff -r 249a5ca85159 elftools/elf/sections.py ---- a/elftools/elf/sections.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/elf/sections.py Mon Jun 03 17:52:42 2013 +0200 -@@ -13,7 +13,7 @@ - class Section(object): - """ Base class for ELF sections. Also used for all sections types that have - no special functionality. -- -+ - Allows dictionary-like access to the section header. For example: - > sec = Section(...) - > sec['sh_type'] # section type -@@ -22,7 +22,7 @@ - self.header = header - self.name = name - self.stream = stream -- -+ - def data(self): - """ The section data from the file. - """ -@@ -33,7 +33,7 @@ - """ Is this a null section? - """ - return False -- -+ - def __getitem__(self, name): - """ Implement dict-like access to header entries - """ -@@ -51,14 +51,14 @@ - - def is_null(self): - return True -- -+ - - class StringTableSection(Section): - """ ELF string table section. - """ - def __init__(self, header, name, stream): - super(StringTableSection, self).__init__(header, name, stream) -- -+ - def get_string(self, offset): - """ Get the string stored at the given offset in this string table. - """ -@@ -85,7 +85,7 @@ - """ Number of symbols in the table - """ - return self['sh_size'] // self['sh_entsize'] -- -+ - def get_symbol(self, n): - """ Get the symbol at index #n from the table (Symbol object) - """ -@@ -123,3 +123,38 @@ - return self.entry[name] - - -+class SUNWSyminfoTableSection(Section): -+ """ ELF .SUNW Syminfo table section. -+ Has an associated SymbolTableSection that's passed in the constructor. -+ """ -+ def __init__(self, header, name, stream, elffile, symboltable): -+ super(SUNWSyminfoTableSection, self).__init__(header, name, stream) -+ self.elffile = elffile -+ self.elfstructs = self.elffile.structs -+ self.symboltable = symboltable -+ -+ def num_symbols(self): -+ """ Number of symbols in the table -+ """ -+ return self['sh_size'] // self['sh_entsize'] - 1 -+ -+ def get_symbol(self, n): -+ """ Get the symbol at index #n from the table (Symbol object). -+ It begins at 1 and not 0 since the first entry is used to -+ store the current version of the syminfo table. -+ """ -+ # Grab the symbol's entry from the stream -+ entry_offset = self['sh_offset'] + n * self['sh_entsize'] -+ entry = struct_parse( -+ self.elfstructs.Elf_Sunw_Syminfo, -+ self.stream, -+ stream_pos=entry_offset) -+ # Find the symbol name in the associated symbol table -+ name = self.symboltable.get_symbol(n).name -+ return Symbol(entry, name) -+ -+ def iter_symbols(self): -+ """ Yield all the symbols in the table -+ """ -+ for i in range(1, self.num_symbols() + 1): -+ yield self.get_symbol(i) -diff -r 249a5ca85159 elftools/elf/structs.py ---- a/elftools/elf/structs.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/elftools/elf/structs.py Mon Jun 03 17:52:42 2013 +0200 -@@ -19,20 +19,20 @@ - - class ELFStructs(object): - """ Accessible attributes: -- -+ - Elf_{byte|half|word|word64|addr|offset|sword|xword|xsword}: -- Data chunks, as specified by the ELF standard, adjusted for -+ Data chunks, as specified by the ELF standard, adjusted for - correct endianness and word-size. - - Elf_Ehdr: - ELF file header -- -+ - Elf_Phdr: - Program header -- -+ - Elf_Shdr: - Section header -- -+ - Elf_Sym: - Symbol table entry - -@@ -42,9 +42,9 @@ - def __init__(self, little_endian=True, elfclass=32): - assert elfclass == 32 or elfclass == 64 - self.little_endian = little_endian -- self.elfclass = elfclass -+ self.elfclass = elfclass - self._create_structs() -- -+ - def _create_structs(self): - if self.little_endian: - self.Elf_byte = ULInt8 -@@ -66,14 +66,18 @@ - self.Elf_sword = SBInt32 - self.Elf_xword = UBInt32 if self.elfclass == 32 else UBInt64 - self.Elf_sxword = SBInt32 if self.elfclass == 32 else SBInt64 -- -+ - self._create_ehdr() - self._create_phdr() - self._create_shdr() - self._create_sym() - self._create_rel() - self._create_dyn() -- -+ self._create_sunw_syminfo() -+ self._create_gnu_verneed() -+ self._create_gnu_verdef() -+ self._create_gnu_versym() -+ - def _create_ehdr(self): - self.Elf_Ehdr = Struct('Elf_Ehdr', - Struct('e_ident', -@@ -99,7 +103,7 @@ - self.Elf_half('e_shnum'), - self.Elf_half('e_shstrndx'), - ) -- -+ - def _create_phdr(self): - if self.elfclass == 32: - self.Elf_Phdr = Struct('Elf_Phdr', -@@ -122,8 +126,8 @@ - self.Elf_xword('p_filesz'), - self.Elf_xword('p_memsz'), - self.Elf_xword('p_align'), -- ) -- -+ ) -+ - def _create_shdr(self): - self.Elf_Shdr = Struct('Elf_Shdr', - self.Elf_word('sh_name'), -@@ -137,7 +141,7 @@ - self.Elf_xword('sh_addralign'), - self.Elf_xword('sh_entsize'), - ) -- -+ - def _create_rel(self): - # r_info is also taken apart into r_info_sym and r_info_type. - # This is done in Value to avoid endianity issues while parsing. -@@ -203,5 +207,50 @@ - self.Elf_xword('st_size'), - ) - -+ def _create_sunw_syminfo(self): -+ self.Elf_Sunw_Syminfo = Struct('Elf_Sunw_Syminfo', -+ Enum(self.Elf_half('si_boundto'), **ENUM_SUNW_SYMINFO_BOUNDTO), -+ self.Elf_half('si_flags'), -+ ) - -+ def _create_gnu_verneed(self): -+ # Structure of "version needed" entries is documented in -+ # Oracle "Linker and Libraries Guide", Chapter 7 Object File Format -+ self.Elf_Verneed = Struct('Elf_Verneed', -+ self.Elf_half('vn_version'), -+ self.Elf_half('vn_cnt'), -+ self.Elf_word('vn_file'), -+ self.Elf_word('vn_aux'), -+ self.Elf_word('vn_next'), -+ ) -+ self.Elf_Vernaux = Struct('Elf_Vernaux', -+ self.Elf_word('vna_hash'), -+ self.Elf_half('vna_flags'), -+ self.Elf_half('vna_other'), -+ self.Elf_word('vna_name'), -+ self.Elf_word('vna_next'), -+ ) - -+ def _create_gnu_verdef(self): -+ # Structure off "version definition" entries are documented in -+ # Oracle "Linker and Libraries Guide", Chapter 7 Object File Format -+ self.Elf_Verdef = Struct('Elf_Verdef', -+ self.Elf_half('vd_version'), -+ self.Elf_half('vd_flags'), -+ self.Elf_half('vd_ndx'), -+ self.Elf_half('vd_cnt'), -+ self.Elf_word('vd_hash'), -+ self.Elf_word('vd_aux'), -+ self.Elf_word('vd_next'), -+ ) -+ self.Elf_Verdaux = Struct('Elf_Verdaux', -+ self.Elf_word('vda_name'), -+ self.Elf_word('vda_next'), -+ ) -+ -+ def _create_gnu_versym(self): -+ # Structure off "version symbol" entries are documented in -+ # Oracle "Linker and Libraries Guide", Chapter 7 Object File Format -+ self.Elf_Versym = Struct('Elf_Versym', -+ Enum(self.Elf_half('ndx'), **ENUM_VERSYM), -+ ) -diff -r 249a5ca85159 scripts/readelf.py ---- a/scripts/readelf.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/scripts/readelf.py Mon Jun 03 17:52:42 2013 +0200 -@@ -25,6 +25,10 @@ - from elftools.elf.enums import ENUM_D_TAG - from elftools.elf.segments import InterpSegment - from elftools.elf.sections import SymbolTableSection -+from elftools.elf.gnuversions import ( -+ GNUVerSymSection, GNUVerDefSection, -+ GNUVerNeedSection, -+ ) - from elftools.elf.relocation import RelocationSection - from elftools.elf.descriptions import ( - describe_ei_class, describe_ei_data, describe_ei_version, -@@ -33,6 +37,7 @@ - describe_sh_type, describe_sh_flags, - describe_symbol_type, describe_symbol_bind, describe_symbol_visibility, - describe_symbol_shndx, describe_reloc_type, describe_dyn_tag, -+ describe_ver_flags, - ) - from elftools.dwarf.dwarfinfo import DWARFInfo - from elftools.dwarf.descriptions import ( -@@ -61,6 +66,8 @@ - # Lazily initialized if a debug dump is requested - self._dwarfinfo = None - -+ self._versioninfo = None -+ - def display_file_header(self): - """ Display the ELF file header - """ -@@ -254,6 +261,8 @@ - def display_symbol_tables(self): - """ Display the symbol tables contained in the file - """ -+ self._init_versioninfo() -+ - for section in self.elffile.iter_sections(): - if not isinstance(section, SymbolTableSection): - continue -@@ -272,16 +281,37 @@ - self._emitline(' Num: Value Size Type Bind Vis Ndx Name') - - for nsym, symbol in enumerate(section.iter_symbols()): -+ -+ version_info = '' -+ # readelf doesn't display version info for Solaris versioning -+ if (section['sh_type'] == 'SHT_DYNSYM' and -+ self._versioninfo['type'] == 'GNU'): -+ version = self._symbol_version(nsym) -+ if (version['name'] != bytes2str(symbol.name) and -+ version['index'] not in ('VER_NDX_LOCAL', -+ 'VER_NDX_GLOBAL')): -+ if version['filename']: -+ # external symbol -+ version_info = '@%(name)s (%(index)i)' % version -+ else: -+ # internal symbol -+ if version['hidden']: -+ version_info = '@%(name)s' % version -+ else: -+ version_info = '@@%(name)s' % version -+ - # symbol names are truncated to 25 chars, similarly to readelf -- self._emitline('%6d: %s %5d %-7s %-6s %-7s %4s %.25s' % ( -+ self._emitline('%6d: %s %5d %-7s %-6s %-7s %4s %.25s%s' % ( - nsym, -- self._format_hex(symbol['st_value'], fullhex=True, lead0x=False), -+ self._format_hex( -+ symbol['st_value'], fullhex=True, lead0x=False), - symbol['st_size'], - describe_symbol_type(symbol['st_info']['type']), - describe_symbol_bind(symbol['st_info']['bind']), - describe_symbol_visibility(symbol['st_other']['visibility']), - describe_symbol_shndx(symbol['st_shndx']), -- bytes2str(symbol.name))) -+ bytes2str(symbol.name), -+ version_info)) - - def display_dynamic_tags(self): - """ Display the dynamic tags contained in the file -@@ -384,6 +414,111 @@ - if not has_relocation_sections: - self._emitline('\nThere are no relocations in this file.') - -+ def display_version_info(self): -+ """ Display the version info contained in the file -+ """ -+ self._init_versioninfo() -+ -+ if not self._versioninfo['type']: -+ self._emitline("\nNo version information found in this file.") -+ return -+ -+ for section in self.elffile.iter_sections(): -+ if isinstance(section, GNUVerSymSection): -+ self._print_version_section_header( -+ section, 'Version symbols', lead0x=False) -+ -+ num_symbols = section.num_symbols() -+ -+ # Symbol version info are printed four by four entries -+ for idx_by_4 in range(0, num_symbols, 4): -+ -+ self._emit(' %03x:' % idx_by_4) -+ -+ for idx in range(idx_by_4, min(idx_by_4 + 4, num_symbols)): -+ -+ symbol_version = self._symbol_version(idx) -+ if symbol_version['index'] == 'VER_NDX_LOCAL': -+ version_index = 0 -+ version_name = '(*local*)' -+ elif symbol_version['index'] == 'VER_NDX_GLOBAL': -+ version_index = 1 -+ version_name = '(*global*)' -+ else: -+ version_index = symbol_version['index'] -+ version_name = '(%(name)s)' % symbol_version -+ -+ visibility = 'h' if symbol_version['hidden'] else ' ' -+ -+ self._emit('%4x%s%-13s' % ( -+ version_index, visibility, version_name)) -+ -+ self._emitline() -+ -+ elif isinstance(section, GNUVerDefSection): -+ self._print_version_section_header( -+ section, 'Version definition', indent=2) -+ -+ offset = 0 -+ for verdef, verdaux_iter in section.iter_versions(): -+ verdaux = next(verdaux_iter) -+ -+ name = verdaux.name -+ if verdef['vd_flags']: -+ flags = describe_ver_flags(verdef['vd_flags']) -+ # Mimic exactly the readelf output -+ flags += ' ' -+ else: -+ flags = 'none' -+ -+ self._emitline(' %s: Rev: %i Flags: %s Index: %i' -+ ' Cnt: %i Name: %s' % ( -+ self._format_hex(offset, fieldsize=6, -+ alternate=True), -+ verdef['vd_version'], flags, verdef['vd_ndx'], -+ verdef['vd_cnt'], bytes2str(name))) -+ -+ verdaux_offset = ( -+ offset + verdef['vd_aux'] + verdaux['vda_next']) -+ for idx, verdaux in enumerate(verdaux_iter, start=1): -+ self._emitline(' %s: Parent %i: %s' % -+ (self._format_hex(verdaux_offset, fieldsize=4), -+ idx, bytes2str(verdaux.name))) -+ verdaux_offset += verdaux['vda_next'] -+ -+ offset += verdef['vd_next'] -+ -+ elif isinstance(section, GNUVerNeedSection): -+ self._print_version_section_header(section, 'Version needs') -+ -+ offset = 0 -+ for verneed, verneed_iter in section.iter_versions(): -+ -+ self._emitline(' %s: Version: %i File: %s Cnt: %i' % ( -+ self._format_hex(offset, fieldsize=6, -+ alternate=True), -+ verneed['vn_version'], bytes2str(verneed.name), -+ verneed['vn_cnt'])) -+ -+ vernaux_offset = offset + verneed['vn_aux'] -+ for idx, vernaux in enumerate(verneed_iter, start=1): -+ if vernaux['vna_flags']: -+ flags = describe_ver_flags(vernaux['vna_flags']) -+ # Mimic exactly the readelf output -+ flags += ' ' -+ else: -+ flags = 'none' -+ -+ self._emitline( -+ ' %s: Name: %s Flags: %s Version: %i' % ( -+ self._format_hex(vernaux_offset, fieldsize=4), -+ bytes2str(vernaux.name), flags, -+ vernaux['vna_other'])) -+ -+ vernaux_offset += vernaux['vna_next'] -+ -+ offset += verneed['vn_next'] -+ - def display_hex_dump(self, section_spec): - """ Display a hex dump of a section. section_spec is either a section - number or a name. -@@ -486,7 +621,8 @@ - else: - self._emitline('debug dump not yet supported for "%s"' % dump_what) - -- def _format_hex(self, addr, fieldsize=None, fullhex=False, lead0x=True): -+ def _format_hex(self, addr, fieldsize=None, fullhex=False, lead0x=True, -+ alternate=False): - """ Format an address into a hexadecimal string. - - fieldsize: -@@ -501,7 +637,20 @@ - - lead0x: - If True, leading 0x is added -+ -+ alternate: -+ If True, override lead0x to emulate the alternate -+ hexadecimal form specified in format string with the # -+ character: only non-zero values are prefixed with 0x. -+ This form is used by readelf. - """ -+ if alternate: -+ if addr == 0: -+ lead0x = False -+ else: -+ lead0x = True -+ fieldsize -= 2 -+ - s = '0x' if lead0x else '' - if fullhex: - fieldsize = 8 if self.elffile.elfclass == 32 else 16 -@@ -511,6 +660,97 @@ - field = '%' + '0%sx' % fieldsize - return s + field % addr - -+ def _print_version_section_header(self, version_section, name, lead0x=True, -+ indent=1): -+ """ Print a section header of one version related section (versym, -+ verneed or verdef) with some options to accomodate readelf -+ little differences between each header (e.g. indentation -+ and 0x prefixing). -+ """ -+ if hasattr(version_section, 'num_versions'): -+ num_entries = version_section.num_versions() -+ else: -+ num_entries = version_section.num_symbols() -+ -+ self._emitline("\n%s section '%s' contains %s entries:" % -+ (name, bytes2str(version_section.name), num_entries)) -+ self._emitline('%sAddr: %s Offset: %s Link: %i (%s)' % ( -+ ' ' * indent, -+ self._format_hex( -+ version_section['sh_addr'], fieldsize=16, lead0x=lead0x), -+ self._format_hex( -+ version_section['sh_offset'], fieldsize=6, lead0x=True), -+ version_section['sh_link'], -+ bytes2str( -+ self.elffile.get_section(version_section['sh_link']).name) -+ ) -+ ) -+ -+ def _init_versioninfo(self): -+ """ Search and initialize informations about version related sections -+ and the kind of versioning used (GNU or Solaris). -+ """ -+ if self._versioninfo is not None: -+ return -+ -+ self._versioninfo = {'versym': None, 'verdef': None, -+ 'verneed': None, 'type': None} -+ -+ for section in self.elffile.iter_sections(): -+ if isinstance(section, GNUVerSymSection): -+ self._versioninfo['versym'] = section -+ elif isinstance(section, GNUVerDefSection): -+ self._versioninfo['verdef'] = section -+ elif isinstance(section, GNUVerNeedSection): -+ self._versioninfo['verneed'] = section -+ elif isinstance(section, DynamicSection): -+ for tag in section.iter_tags(): -+ if tag['d_tag'] == 'DT_VERSYM': -+ self._versioninfo['type'] = 'GNU' -+ break -+ -+ if not self._versioninfo['type'] and ( -+ self._versioninfo['verneed'] or self._versioninfo['verdef']): -+ self._versioninfo['type'] = 'Solaris' -+ -+ def _symbol_version(self, nsym): -+ """ Return a dict containing information on the -+ or None if no version information is available -+ """ -+ self._init_versioninfo() -+ -+ symbol_version = dict.fromkeys(('index', 'name', 'filename', 'hidden')) -+ -+ if (not self._versioninfo['versym'] or -+ nsym >= self._versioninfo['versym'].num_symbols()): -+ return None -+ -+ symbol = self._versioninfo['versym'].get_symbol(nsym) -+ index = symbol.entry['ndx'] -+ if not index in ('VER_NDX_LOCAL', 'VER_NDX_GLOBAL'): -+ index = int(index) -+ -+ if self._versioninfo['type'] == 'GNU': -+ # In GNU versioning mode, the highest bit is used to -+ # store wether the symbol is hidden or not -+ if index & 0x8000: -+ index &= ~0x8000 -+ symbol_version['hidden'] = True -+ -+ if (self._versioninfo['verdef'] and -+ index <= self._versioninfo['verdef'].num_versions()): -+ _, verdaux_iter = \ -+ self._versioninfo['verdef'].get_version(index) -+ symbol_version['name'] = bytes2str(next(verdaux_iter).name) -+ else: -+ verneed, vernaux = \ -+ self._versioninfo['verneed'].get_version(index) -+ symbol_version['name'] = bytes2str(vernaux.name) -+ symbol_version['filename'] = bytes2str(verneed.name) -+ -+ symbol_version['index'] = index -+ return symbol_version -+ - def _section_from_spec(self, spec): - """ Retrieve a section given a "spec" (either number or name). - Return None if no such section exists in the file. -@@ -802,6 +1042,9 @@ - optparser.add_option('-p', '--string-dump', - action='store', dest='show_string_dump', metavar='', - help='Dump the contents of section as strings') -+ optparser.add_option('-V', '--version-info', -+ action='store_true', dest='show_version_info', -+ help='Display the version sections (if present)') - optparser.add_option('--debug-dump', - action='store', dest='debug_dump_what', metavar='', - help=( -@@ -838,6 +1081,8 @@ - readelf.display_symbol_tables() - if options.show_relocs: - readelf.display_relocations() -+ if options.show_version_info: -+ readelf.display_version_info() - if options.show_hex_dump: - readelf.display_hex_dump(options.show_hex_dump) - if options.show_string_dump: -diff -r 249a5ca85159 setup.py ---- a/setup.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/setup.py Mon Jun 03 17:52:42 2013 +0200 -@@ -44,7 +44,7 @@ - 'elftools.construct', 'elftools.construct.lib', - ], - -- scripts=['scripts/readelf.py'], -+ scripts=['scripts/readelf.py'] - ) - - -diff -r 249a5ca85159 test/run_readelf_tests.py ---- a/test/run_readelf_tests.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/test/run_readelf_tests.py Mon Jun 03 17:52:42 2013 +0200 -@@ -50,7 +50,7 @@ - success = True - testlog.info("Test file '%s'" % filename) - for option in [ -- '-e', '-d', '-s', '-r', '-x.text', '-p.shstrtab', -+ '-e', '-d', '-s', '-r', '-x.text', '-p.shstrtab', '-V', - '--debug-dump=info', '--debug-dump=decodedline', - '--debug-dump=frames', '--debug-dump=frames-interp']: - if verbose: testlog.info("..option='%s'" % option) -@@ -90,9 +90,9 @@ - Note: this function contains some rather horrible hacks to ignore - differences which are not important for the verification of pyelftools. - This is due to some intricacies of binutils's readelf which pyelftools -- doesn't currently implement, or silly inconsistencies in the output of -- readelf, which I was reluctant to replicate. -- Read the documentation for more details. -+ doesn't currently implement, features that binutils doesn't support, -+ or silly inconsistencies in the output of readelf, which I was reluctant -+ to replicate. Read the documentation for more details. - """ - def prepare_lines(s): - return [line for line in s.lower().splitlines() if line.strip() != ''] -@@ -146,6 +146,9 @@ - elif 'os/abi' in lines1[i]: - if 'unix - gnu' in lines1[i] and 'unix - linux' in lines2[i]: - ok = True -+ elif ( 'unknown at value' in lines1[i] and -+ 'dw_at_apple' in lines2[i]): -+ ok = True - else: - for s in ('t (tls)', 'l (large)'): - if s in lines1[i] or s in lines2[i]: -@@ -183,7 +186,7 @@ - if len(args) > 0: - filenames = args - else: -- filenames = list(discover_testfiles('test/testfiles')) -+ filenames = list(discover_testfiles('test/testfiles_for_readelf')) - - success = True - for filename in filenames: -diff -r 249a5ca85159 test/test_arm_support.py ---- a/test/test_arm_support.py Wed Apr 17 05:57:58 2013 -0700 -+++ b/test/test_arm_support.py Mon Jun 03 17:52:42 2013 +0200 -@@ -15,7 +15,7 @@ - - class TestARMSupport(unittest.TestCase): - def test_hello(self): -- with open(os.path.join('test', 'testfiles', -+ with open(os.path.join('test', 'testfiles_for_unittests', - 'simple_gcc.elf.arm'), 'rb') as f: - elf = ELFFile(f) - self.assertEqual(elf.get_machine_arch(), 'ARM') -diff -r 249a5ca85159 test/test_gnuversions.py ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/test/test_gnuversions.py Mon Jun 03 17:52:42 2013 +0200 -@@ -0,0 +1,160 @@ -+#------------------------------------------------------------------------------ -+# elftools tests -+# -+# Yann Rouillard (yann at pleiades.fr.eu.org) -+# This code is in the public domain -+#------------------------------------------------------------------------------ -+try: -+ import unittest2 as unittest -+except ImportError: -+ import unittest -+import os -+ -+from utils import setup_syspath -+setup_syspath() -+from elftools.elf.elffile import ELFFile -+from elftools.elf.constants import VER_FLAGS -+from elftools.elf.gnuversions import ( -+ GNUVerNeedSection, GNUVerDefSection, -+ GNUVerSymSection) -+ -+ -+class TestSymbolVersioning(unittest.TestCase): -+ -+ versym_reference_data = [ -+ {'name': b'', 'ndx': 'VER_NDX_LOCAL'}, -+ {'name': b'', 'ndx': 'VER_NDX_LOCAL'}, -+ {'name': b'_ITM_deregisterTMCloneTable', 'ndx': 'VER_NDX_LOCAL'}, -+ {'name': b'puts', 'ndx': 5}, -+ {'name': b'strlcat', 'ndx': 'VER_NDX_LOCAL'}, -+ {'name': b'__stack_chk_fail', 'ndx': 6}, -+ {'name': b'__gmon_start__', 'ndx': 'VER_NDX_LOCAL'}, -+ {'name': b'gzoffset', 'ndx': 7}, -+ {'name': b'_Jv_RegisterClasses', 'ndx': 'VER_NDX_LOCAL'}, -+ {'name': b'_ITM_registerTMCloneTable', 'ndx': 'VER_NDX_LOCAL'}, -+ {'name': b'__cxa_finalize', 'ndx': 5}, -+ {'name': b'_edata', 'ndx': 'VER_NDX_GLOBAL'}, -+ {'name': b'VER_1.0', 'ndx': 2}, -+ {'name': b'function1_ver1_1', 'ndx': 'VER_NDX_GLOBAL'}, -+ {'name': b'_end', 'ndx': 'VER_NDX_GLOBAL'}, -+ {'name': b'function1', 'ndx': 4 | 0x8000}, -+ {'name': b'__bss_start', 'ndx': 'VER_NDX_GLOBAL'}, -+ {'name': b'function1', 'ndx': 2}, -+ {'name': b'VER_1.1', 'ndx': 3}, -+ {'name': b'_init', 'ndx': 'VER_NDX_GLOBAL'}, -+ {'name': b'function1_ver1_0', 'ndx': 'VER_NDX_GLOBAL'}, -+ {'name': b'_fini', 'ndx': 'VER_NDX_GLOBAL'}, -+ {'name': b'VER_1.2', 'ndx': 4}, -+ {'name': b'function2', 'ndx': 3}, -+ ] -+ -+ def test_versym_section(self): -+ -+ reference_data = TestSymbolVersioning.versym_reference_data -+ -+ with open(os.path.join('test', 'testfiles_for_unittests', -+ 'lib_versioned64.so.1.elf'), 'rb') as f: -+ elf = ELFFile(f) -+ versym_section = None -+ for section in elf.iter_sections(): -+ if isinstance(section, GNUVerSymSection): -+ versym_section = section -+ break -+ -+ self.assertIsNotNone(versym_section) -+ -+ for versym, ref_versym in zip(section.iter_symbols(), -+ reference_data): -+ self.assertEqual(versym.name, ref_versym['name']) -+ self.assertEqual(versym['ndx'], ref_versym['ndx']) -+ -+ verneed_reference_data = [ -+ {'name': b'libz.so.1', 'vn_version': 1, 'vn_cnt': 1, -+ 'vernaux': [ -+ {'name': b'ZLIB_1.2.3.5', 'vna_flags': 0, 'vna_other': 7}]}, -+ {'name': b'libc.so.6', 'vn_version': 1, 'vn_cnt': 2, -+ 'vernaux': [ -+ {'name': b'GLIBC_2.4', 'vna_flags': 0, 'vna_other': 6}, -+ {'name': b'GLIBC_2.2.5', 'vna_flags': 0, 'vna_other': 5}]}, -+ ] -+ -+ def test_verneed_section(self): -+ -+ reference_data = TestSymbolVersioning.verneed_reference_data -+ -+ with open(os.path.join('test', 'testfiles_for_unittests', -+ 'lib_versioned64.so.1.elf'), 'rb') as f: -+ elf = ELFFile(f) -+ verneed_section = None -+ for section in elf.iter_sections(): -+ if isinstance(section, GNUVerNeedSection): -+ verneed_section = section -+ break -+ -+ self.assertIsNotNone(verneed_section) -+ -+ for (verneed, vernaux_iter), ref_verneed in zip( -+ section.iter_versions(), reference_data): -+ -+ self.assertEqual(verneed.name, ref_verneed['name']) -+ self.assertEqual(verneed['vn_cnt'], ref_verneed['vn_cnt']) -+ self.assertEqual(verneed['vn_version'], -+ ref_verneed['vn_version']) -+ -+ for vernaux, ref_vernaux in zip( -+ vernaux_iter, ref_verneed['vernaux']): -+ -+ self.assertEqual(vernaux.name, ref_vernaux['name']) -+ self.assertEqual(vernaux['vna_flags'], -+ ref_vernaux['vna_flags']) -+ self.assertEqual(vernaux['vna_other'], -+ ref_vernaux['vna_other']) -+ -+ verdef_reference_data = [ -+ {'vd_ndx': 1, 'vd_version': 1, 'vd_flags': VER_FLAGS.VER_FLG_BASE, -+ 'vd_cnt': 1, -+ 'verdaux': [ -+ {'name': b'lib_versioned.so.1'}]}, -+ {'vd_ndx': 2, 'vd_version': 1, 'vd_flags': 0, 'vd_cnt': 1, -+ 'verdaux': [ -+ {'name': b'VER_1.0'}]}, -+ {'vd_ndx': 3, 'vd_version': 1, 'vd_flags': 0, 'vd_cnt': 2, -+ 'verdaux': [ -+ {'name': b'VER_1.1'}, -+ {'name': b'VER_1.0'}]}, -+ {'vd_ndx': 4, 'vd_version': 1, 'vd_flags': 0, 'vd_cnt': 2, -+ 'verdaux': [ -+ {'name': b'VER_1.2'}, -+ {'name': b'VER_1.1'}]}, -+ ] -+ -+ def test_verdef_section(self): -+ -+ reference_data = TestSymbolVersioning.verdef_reference_data -+ -+ with open(os.path.join('test', 'testfiles_for_unittests', -+ 'lib_versioned64.so.1.elf'), 'rb') as f: -+ elf = ELFFile(f) -+ verneed_section = None -+ for section in elf.iter_sections(): -+ if isinstance(section, GNUVerDefSection): -+ verdef_section = section -+ break -+ -+ self.assertIsNotNone(verdef_section) -+ -+ for (verdef, verdaux_iter), ref_verdef in zip( -+ section.iter_versions(), reference_data): -+ -+ self.assertEqual(verdef['vd_ndx'], ref_verdef['vd_ndx']) -+ self.assertEqual(verdef['vd_version'], -+ ref_verdef['vd_version']) -+ self.assertEqual(verdef['vd_flags'], ref_verdef['vd_flags']) -+ self.assertEqual(verdef['vd_cnt'], ref_verdef['vd_cnt']) -+ -+ for verdaux, ref_verdaux in zip( -+ verdaux_iter, ref_verdef['verdaux']): -+ self.assertEqual(verdaux.name, ref_verdaux['name']) -+ -+if __name__ == '__main__': -+ unittest.main() -diff -r 249a5ca85159 test/test_solaris_support.py ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/test/test_solaris_support.py Mon Jun 03 17:52:42 2013 +0200 -@@ -0,0 +1,56 @@ -+#------------------------------------------------------------------------------- -+# elftools tests -+# -+# Yann Rouillard (yann at pleiades.fr.eu.org) -+# This code is in the public domain -+#------------------------------------------------------------------------------- -+try: -+ import unittest2 as unittest -+except ImportError: -+ import unittest -+import os -+ -+from utils import setup_syspath; setup_syspath() -+from elftools.elf.elffile import ELFFile -+from elftools.elf.constants import SUNW_SYMINFO_FLAGS -+ -+ -+class TestSolarisSupport(unittest.TestCase): -+ -+ def _test_SUNW_syminfo_section_generic(self, testfile): -+ with open(os.path.join('test', 'testfiles_for_unittests', -+ testfile), 'rb') as f: -+ elf = ELFFile(f) -+ syminfo_section = elf.get_section_by_name(b'.SUNW_syminfo') -+ self.assertIsNotNone(syminfo_section) -+ -+ # The test files were compiled against libc.so.1 with -+ # direct binding, hence the libc symbols used -+ # (exit, atexit and _exit) have the direct binding flags -+ # in the syminfo table. -+ # We check that this is properly detected. -+ exit_symbols = [s for s in syminfo_section.iter_symbols() -+ if b'exit' in s.name] -+ self.assertNotEqual(len(exit_symbols), 0) -+ -+ for symbol in exit_symbols: -+ # libc.so.1 has the index 0 in the dynamic table -+ self.assertEqual(symbol['si_boundto'], 0) -+ self.assertEqual(symbol['si_flags'], -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECT | -+ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND) -+ -+ def test_SUNW_syminfo_section_x86(self): -+ self._test_SUNW_syminfo_section_generic('exe_solaris32_cc.elf') -+ -+ def test_SUNW_syminfo_section_x64(self): -+ self._test_SUNW_syminfo_section_generic('exe_solaris64_cc.elf') -+ -+ def test_SUNW_syminfo_section_sparc32(self): -+ self._test_SUNW_syminfo_section_generic('exe_solaris32_cc.elf.sparc') -+ -+ def test_SUNW_syminfo_section_sparc64(self): -+ self._test_SUNW_syminfo_section_generic('exe_solaris64_cc.elf.sparc') -+ -+if __name__ == '__main__': -+ unittest.main() -diff -r 249a5ca85159 test/testfiles/exe_simple32.elf -Binary file test/testfiles/exe_simple32.elf has changed -diff -r 249a5ca85159 test/testfiles/exe_simple64.elf -Binary file test/testfiles/exe_simple64.elf has changed -diff -r 249a5ca85159 test/testfiles/exe_stripped64.elf -Binary file test/testfiles/exe_stripped64.elf has changed -diff -r 249a5ca85159 test/testfiles/libelf0_8_13_32bit.so.elf -Binary file test/testfiles/libelf0_8_13_32bit.so.elf has changed -diff -r 249a5ca85159 test/testfiles/obj_simple32.o.elf -Binary file test/testfiles/obj_simple32.o.elf has changed -diff -r 249a5ca85159 test/testfiles/penalty_32_gcc.o.elf -Binary file test/testfiles/penalty_32_gcc.o.elf has changed -diff -r 249a5ca85159 test/testfiles/penalty_64_clang.o.elf -Binary file test/testfiles/penalty_64_clang.o.elf has changed -diff -r 249a5ca85159 test/testfiles/penalty_64_gcc.o.elf -Binary file test/testfiles/penalty_64_gcc.o.elf has changed -diff -r 249a5ca85159 test/testfiles/simple_gcc.elf.arm -Binary file test/testfiles/simple_gcc.elf.arm has changed -diff -r 249a5ca85159 test/testfiles/update32.o.elf -Binary file test/testfiles/update32.o.elf has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/clang33-simple.o -Binary file test/testfiles_for_readelf/clang33-simple.o has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/exe_simple32.elf -Binary file test/testfiles_for_readelf/exe_simple32.elf has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/exe_simple64.elf -Binary file test/testfiles_for_readelf/exe_simple64.elf has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/exe_stripped64.elf -Binary file test/testfiles_for_readelf/exe_stripped64.elf has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/gcc48-simple.o -Binary file test/testfiles_for_readelf/gcc48-simple.o has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/gcc48-simple.src.c ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/test/testfiles_for_readelf/gcc48-simple.src.c Mon Jun 03 17:52:42 2013 +0200 -@@ -0,0 +1,19 @@ -+/* Generated by compiling with gcc 4.8 as follows: -+** -+** gcc-4.8 -O0 -g -fno-dwarf2-cfi-asm -c dwarf4_simple.c -o gcc48-simple. -+** -+** Note: -fno-dwarf2-cfi-asm to tell gcc to generate .dwarf_frames as well -+** as the .eh_frames it generates by default. -+** -+*/ -+ -+extern int bar(int); -+extern int baz(int); -+ -+int foo(int v) { -+ int x = bar(v); -+ int i; -+ for (i = 0; i < v; ++i) -+ x += bar(i) + bar(v) * baz(i); -+ return x; -+} -diff -r 249a5ca85159 test/testfiles_for_readelf/libelf0_8_13_32bit.so.elf -Binary file test/testfiles_for_readelf/libelf0_8_13_32bit.so.elf has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/obj_simple32.o.elf -Binary file test/testfiles_for_readelf/obj_simple32.o.elf has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/penalty_32_gcc.o.elf -Binary file test/testfiles_for_readelf/penalty_32_gcc.o.elf has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/penalty_64_clang.o.elf -Binary file test/testfiles_for_readelf/penalty_64_clang.o.elf has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/penalty_64_gcc.o.elf -Binary file test/testfiles_for_readelf/penalty_64_gcc.o.elf has changed -diff -r 249a5ca85159 test/testfiles_for_readelf/update32.o.elf -Binary file test/testfiles_for_readelf/update32.o.elf has changed -diff -r 249a5ca85159 test/testfiles_for_unittests/exe_solaris32_cc.elf -Binary file test/testfiles_for_unittests/exe_solaris32_cc.elf has changed -diff -r 249a5ca85159 test/testfiles_for_unittests/exe_solaris32_cc.elf.sparc -Binary file test/testfiles_for_unittests/exe_solaris32_cc.elf.sparc has changed -diff -r 249a5ca85159 test/testfiles_for_unittests/exe_solaris64_cc.elf -Binary file test/testfiles_for_unittests/exe_solaris64_cc.elf has changed -diff -r 249a5ca85159 test/testfiles_for_unittests/exe_solaris64_cc.elf.sparc -Binary file test/testfiles_for_unittests/exe_solaris64_cc.elf.sparc has changed -diff -r 249a5ca85159 test/testfiles_for_unittests/lib_versioned64.so.1.elf -Binary file test/testfiles_for_unittests/lib_versioned64.so.1.elf has changed -diff -r 249a5ca85159 test/testfiles_for_unittests/simple_gcc.elf.arm -Binary file test/testfiles_for_unittests/simple_gcc.elf.arm has changed Deleted: csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch 2014-05-18 12:55:09 UTC (rev 23648) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/files/0002-Correctly-handle-the-multiple-string-tables-case-for.patch 2014-05-18 13:00:14 UTC (rev 23649) @@ -1,89 +0,0 @@ -From 9bded48f12ea546cc8ef958032000af2097daf6b Mon Sep 17 00:00:00 2001 -From: Yann Rouillard -Date: Tue, 9 Jul 2013 20:22:27 +0200 -Subject: [PATCH] Correctly handle the "multiple string tables" case for string - resolution in the dynamic section - -The index of the string table section used to resolve various strings in the -dynamic section is given by the sh_link field in the dynamic section header. -As several string tables with the same name can co-exist in an elf file -we must explicitely look for this specific string table instead of -looking for the first string table in the file. ---- - elftools/elf/dynamic.py | 26 +++++++++++++++++++------- - 1 file changed, 19 insertions(+), 7 deletions(-) - -diff --git a/elftools/elf/dynamic.py b/elftools/elf/dynamic.py -index 60fb450..e36598e 100644 ---- a/elftools/elf/dynamic.py -+++ b/elftools/elf/dynamic.py -@@ -28,12 +28,11 @@ class DynamicTag(object): - ['DT_NEEDED', 'DT_RPATH', 'DT_RUNPATH', 'DT_SONAME', - 'DT_SUNW_FILTER']) - -- def __init__(self, entry, elffile): -+ def __init__(self, entry, stringtable): - self.entry = entry - if entry.d_tag in self._HANDLED_TAGS: -- dynstr = elffile.get_section_by_name(b'.dynstr') - setattr(self, entry.d_tag[3:].lower(), -- dynstr.get_string(self.entry.d_val)) -+ stringtable.get_string(self.entry.d_val)) - - def __getitem__(self, name): - """ Implement dict-like access to entries -@@ -54,13 +53,14 @@ class DynamicTag(object): - class Dynamic(object): - """ Shared functionality between dynamic sections and segments. - """ -- def __init__(self, stream, elffile, position): -+ def __init__(self, stream, elffile, stringtable, position): - self._stream = stream - self._elffile = elffile - self._elfstructs = elffile.structs - self._num_tags = -1 - self._offset = position - self._tagsize = self._elfstructs.Elf_Dyn.sizeof() -+ self._stringtable = stringtable - - def iter_tags(self, type=None): - """ Yield all tags (limit to |type| if specified) -@@ -80,7 +80,7 @@ class Dynamic(object): - self._elfstructs.Elf_Dyn, - self._stream, - stream_pos=offset) -- return DynamicTag(entry, self._elffile) -+ return DynamicTag(entry, self._stringtable) - - def num_tags(self): - """ Number of dynamic tags in the file -@@ -100,12 +100,24 @@ class DynamicSection(Section, Dynamic): - """ - def __init__(self, header, name, stream, elffile): - Section.__init__(self, header, name, stream) -- Dynamic.__init__(self, stream, elffile, self['sh_offset']) -+ stringtable = elffile.get_section(header['sh_link']) -+ Dynamic.__init__(self, stream, elffile, stringtable, self['sh_offset']) - - - class DynamicSegment(Segment, Dynamic): - """ ELF dynamic table segment. Knows how to process the list of tags. - """ - def __init__(self, header, stream, elffile): -+ # The string table section to be used to resolve string names in -+ # the dynamic tag array is the one pointed at by the sh_link field -+ # of the dynamic section header. -+ # So we must look for the dynamic section contained in the dynamic -+ # segment, we do so by searching for the dynamic section whose content -+ # is located at the same offset as the dynamic segment -+ for section in elffile.iter_sections(): -+ if (isinstance(section, DynamicSection) and -+ section['sh_offset'] == header['p_offset']): -+ stringtable = elffile.get_section(section['sh_link']) -+ break - Segment.__init__(self, header, stream) -- Dynamic.__init__(self, stream, elffile, self['p_offset']) -+ Dynamic.__init__(self, stream, elffile, stringtable, self['p_offset']) --- -1.8.1.2 - 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 18 15:21:44 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sun, 18 May 2014 13:21:44 +0000 Subject: SF.net SVN: gar:[23650] csw/mgar/pkg/netatalk/trunk/files/ cswnetatalk-tracker-miner-fs.xml Message-ID: <3gWkXb1X7xz1Kx@mail.opencsw.org> Revision: 23650 http://sourceforge.net/p/gar/code/23650 Author: slowfranklin Date: 2014-05-18 13:21:42 +0000 (Sun, 18 May 2014) Log Message: ----------- SMF: tracker-miner-fs must depend on tracker-extract Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml Modified: csw/mgar/pkg/netatalk/trunk/files/cswnetatalk-tracker-miner-fs.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun May 18 16:05:06 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 May 2014 14:05:06 +0000 Subject: SF.net SVN: gar:[23651] csw/mgar/pkg/nmap/trunk Message-ID: <3gWlVg1xzSz1Pk@mail.opencsw.org> Revision: 23651 http://sourceforge.net/p/gar/code/23651 Author: guengel Date: 2014-05-18 14:05:04 +0000 (Sun, 18 May 2014) Log Message: ----------- nmap/trunk: new upstream release 6.46. Added changelog.CSW. Modified Paths: -------------- csw/mgar/pkg/nmap/trunk/Makefile csw/mgar/pkg/nmap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nmap/trunk/files/changelog.CSW Modified: csw/mgar/pkg/nmap/trunk/Makefile =================================================================== --- csw/mgar/pkg/nmap/trunk/Makefile 2014-05-18 13:21:42 UTC (rev 23650) +++ csw/mgar/pkg/nmap/trunk/Makefile 2014-05-18 14:05:04 UTC (rev 23651) @@ -1,5 +1,5 @@ NAME = nmap -VERSION = 6.45 +VERSION = 6.46 GARTYPE = v2 GARCOMPILER = GCC4 @@ -19,6 +19,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 # Those files are taken from FreeBSD 10.0 and stripped off some #ifdef WHATEVER where necessary. DISTFILES += file.h asprintf.c vasprintf.c +DISTFILES += changelog.CSW PATCHFILES += 0000-Add-vasprintf-compatibility.patch PATCHFILES += 0000-Add-python2.6-site-packages-gtk-2.0-to-python-path-i.patch @@ -48,6 +49,7 @@ PKGFILES_CSWzenmap += $(libdir)/python.* PKGFILES_CSWzenmap += $(mandir)/.*/zenmap\.1 PKGFILES_CSWzenmap += $(sharedstatedir)/zenmap/.* +PKGFILES_CSWzenmap += $(docdir)/zenmap/.* # For Zenmap RUNTIME_DEP_PKGS_CSWzenmap += CSWnmap RUNTIME_DEP_PKGS_CSWzenmap += CSWpy-gtk Modified: csw/mgar/pkg/nmap/trunk/checksums =================================================================== --- csw/mgar/pkg/nmap/trunk/checksums 2014-05-18 13:21:42 UTC (rev 23650) +++ csw/mgar/pkg/nmap/trunk/checksums 2014-05-18 14:05:04 UTC (rev 23651) @@ -1 +1 @@ -e8c337456a692bada3ee53e7f5b87bac nmap-6.45.tar.bz2 +5a36ad3a63d5b7ea5514f745a397436a nmap-6.46.tar.bz2 Added: csw/mgar/pkg/nmap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/nmap/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/nmap/trunk/files/changelog.CSW 2014-05-18 14:05:04 UTC (rev 23651) @@ -0,0 +1,7 @@ +nmap (6.46,REV=2014.05.18) + + * New upstream release 6.46. + + -- Rafael Ostertag Sun, 18 May 2014 15:27:07 +0200 + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun May 18 19:39:11 2014 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 May 2014 17:39:11 +0000 Subject: SF.net SVN: gar:[23652] csw/mgar/gar/v2/bin/chkdbcat Message-ID: <3gWrFj3tWFz1Xy@mail.opencsw.org> Revision: 23652 http://sourceforge.net/p/gar/code/23652 Author: guengel Date: 2014-05-18 17:39:10 +0000 (Sun, 18 May 2014) Log Message: ----------- v2/bin/chkdbcat: '--arch', '--catalog-release', and '--os-release' now accept several arguments, thus it is possible to check several catalogs at one swoop. Modified Paths: -------------- csw/mgar/gar/v2/bin/chkdbcat Modified: csw/mgar/gar/v2/bin/chkdbcat =================================================================== --- csw/mgar/gar/v2/bin/chkdbcat 2014-05-18 14:05:04 UTC (rev 23651) +++ csw/mgar/gar/v2/bin/chkdbcat 2014-05-18 17:39:10 UTC (rev 23652) @@ -3,6 +3,7 @@ import argparse import logging +import itertools from lib.python import chkdbcat class MyCheckDBCatalog(chkdbcat.CheckDBCatalog): @@ -27,15 +28,22 @@ parser.add_argument('--debug', help='enable debug output', required=False, default=False, action='store_const', const=True) parser.add_argument('--verbose', help='be verbose', required=False, default=False, action='store_const', const=True) parser.add_argument('--arch', required=True, - help="i386, sparc") + help="i386, sparc", + nargs="+") parser.add_argument('--catalog-release', required=True, - help="unstable, kiel, etc.") + help="unstable, kiel, etc.", + nargs="+") parser.add_argument('--os-release', required=True, - help="SunOS5.10, SunOS5.11") - parser.add_argument('--timestamp-file', default='/var/cache/chkdbcat/timestamp.json') - parser.add_argument('--chkcat-path', default='/opt/csw/bin/chkcat') + help="SunOS5.10, SunOS5.11", + nargs="+") + parser.add_argument('--timestamp-file', + help="timestamp filepath (default: %(default)s)", + default='/var/cache/chkdbcat/timestamp.json') + parser.add_argument('--chkcat-path', + help="path to chkcat binary (default: %(default)s)", + default='/opt/csw/bin/chkcat') parser.add_argument('--gen-catalog-path', - help="path to gen-catalog-index", + help="path to gen-catalog-index (default: %(default)s)", default="/home/web/bin/gen-catalog-index") return parser.parse_args() @@ -45,21 +53,29 @@ if args.debug: logging.basicConfig(level=logging.DEBUG) - if args.verbose: print("Checking Database Catalog {0} {2} {1}".format(args.catalog_release, args.arch, args.os_release)) - with MyCheckDBCatalog(args.catalog_release, args.arch, - args.os_release, args.timestamp_file, - args.gen_catalog_path, - args.chkcat_path, args.verbose) as checker: - success = checker.check() - if args.verbose: - if success: - print("Database Catalog {0} {2} {1}: OK".format(args.catalog_release, args.arch, args.os_release)) - else: - print("Database Catalog {0} {2} {1}: FAILED".format(args.catalog_release, args.arch, args.os_release)) - print("chkcat output") - print checker.stderr + had_errors = False + for crel_arch_orel in itertools.product(args.catalog_release, args.arch, args.os_release): + catalog_release = crel_arch_orel[0] + arch = crel_arch_orel[1] + os_release = crel_arch_orel[2] - exit(0) if success else exit(1) + if args.verbose: print("Checking Database Catalog {0} {2} {1}".format(catalog_release, arch, os_release)) + with MyCheckDBCatalog(catalog_release, arch, + os_release, args.timestamp_file, + args.gen_catalog_path, + args.chkcat_path, args.verbose) as checker: + success = checker.check() + if args.verbose: + if success: + print("Database Catalog {0} {2} {1}: OK".format(catalog_release, arch, os_release)) + else: + print("Database Catalog {0} {2} {1}: FAILED".format(catalog_release, arch, os_release)) + print("chkcat output") + print checker.stderr + had_errors = had_errors or not success + + exit(0) if had_errors else exit(1) + if __name__ == '__main__': main() 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 18 21:59:10 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 18 May 2014 19:59:10 +0000 Subject: SF.net SVN: gar:[23653] csw/mgar/pkg/liblcms2/trunk Message-ID: <3gWvM93LSxz7y@mail.opencsw.org> Revision: 23653 http://sourceforge.net/p/gar/code/23653 Author: lblume Date: 2014-05-18 19:59:09 +0000 (Sun, 18 May 2014) Log Message: ----------- liblcms2/trunk: Bump to 2.6; switch compiler to GCC4 Modified Paths: -------------- csw/mgar/pkg/liblcms2/trunk/Makefile csw/mgar/pkg/liblcms2/trunk/checksums Modified: csw/mgar/pkg/liblcms2/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms2/trunk/Makefile 2014-05-18 17:39:10 UTC (rev 23652) +++ csw/mgar/pkg/liblcms2/trunk/Makefile 2014-05-18 19:59:09 UTC (rev 23653) @@ -1,5 +1,5 @@ NAME = lcms2 -VERSION = 2.4 +VERSION = 2.6 GARTYPE = v2 # Retry compiling ghostscript 9.07 on version bump as some new API was introduced not in 2.4 yet: @@ -24,6 +24,8 @@ VENDOR_URL = http://www.littlecms.com/ +GARCOMPILER = GCC4 + PACKAGES += CSWliblcms2-2 SPKG_DESC_CSWliblcms2-2 = Color management library, liblcms2.so.2 PKGFILES_CSWliblcms2-2 += $(call pkgfiles_lib,liblcms2.so.2) Modified: csw/mgar/pkg/liblcms2/trunk/checksums =================================================================== --- csw/mgar/pkg/liblcms2/trunk/checksums 2014-05-18 17:39:10 UTC (rev 23652) +++ csw/mgar/pkg/liblcms2/trunk/checksums 2014-05-18 19:59:09 UTC (rev 23653) @@ -1 +1 @@ -861ef15fa0bc018f9ddc932c4ad8b6dd lcms2-2.4.tar.gz +f4c08d38ceade4a664ebff7228910a33 lcms2-2.6.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 18 22:29:03 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 18 May 2014 20:29:03 +0000 Subject: SF.net SVN: gar:[23654] csw/mgar/pkg/liblcms2/trunk/Makefile Message-ID: <3gWw1d3RtbzCj@mail.opencsw.org> Revision: 23654 http://sourceforge.net/p/gar/code/23654 Author: lblume Date: 2014-05-18 20:29:02 +0000 (Sun, 18 May 2014) Log Message: ----------- liblcms2/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/liblcms2/trunk/Makefile Modified: csw/mgar/pkg/liblcms2/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms2/trunk/Makefile 2014-05-18 19:59:09 UTC (rev 23653) +++ csw/mgar/pkg/liblcms2/trunk/Makefile 2014-05-18 20:29:02 UTC (rev 23654) @@ -29,6 +29,7 @@ PACKAGES += CSWliblcms2-2 SPKG_DESC_CSWliblcms2-2 = Color management library, liblcms2.so.2 PKGFILES_CSWliblcms2-2 += $(call pkgfiles_lib,liblcms2.so.2) +RUNTIME_DEP_PKGS_CSWliblcms2-2 += CSWlibgcc-s1 PACKAGES += CSWliblcms2-dev SPKG_DESC_CSWliblcms2-dev = Development files for liblcms2.so.2 @@ -40,7 +41,7 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWliblcms2-2 RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWlibtiff5 # Probably make separate package for Solaris 10 as it has float support EXTRA_CPPFLAGS-5.9 = -Dpowf=pow -Dfabsf=labs 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 18 23:22:26 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 18 May 2014 21:22:26 +0000 Subject: SF.net SVN: gar:[23655] csw/mgar/pkg/lang-python/pysetuptools/trunk/ Makefile Message-ID: <3gWxCH4KGtzJg@mail.opencsw.org> Revision: 23655 http://sourceforge.net/p/gar/code/23655 Author: wahwah Date: 2014-05-18 21:22:24 +0000 (Sun, 18 May 2014) Log Message: ----------- lang-python/pysetuptools/trunk: Correct the catalogname of the old CSWpysetuptools Modified Paths: -------------- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2014-05-18 20:29:02 UTC (rev 23654) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2014-05-18 21:22:24 UTC (rev 23655) @@ -24,6 +24,8 @@ TEST_SCRIPTS = LICENSE = LICENSE +CATALOGNAME_CSWpysetuptools = py_setuptools_stub + CHECKPKG_OVERRIDES_CSWpy-setuptools += file-with-bad-content 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 19 09:59:41 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 19 May 2014 07:59:41 +0000 Subject: SF.net SVN: gar:[23656] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: <3gXCLZ727KzqV@mail.opencsw.org> Revision: 23656 http://sourceforge.net/p/gar/code/23656 Author: lblume Date: 2014-05-19 07:59:39 +0000 (Mon, 19 May 2014) Log Message: ----------- ghostscript/trunk: Update dependencies and build options Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-18 21:22:24 UTC (rev 23655) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-19 07:59:39 UTC (rev 23656) @@ -42,7 +42,7 @@ 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 += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibcups2 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibjbig2dec0 @@ -87,8 +87,6 @@ RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibcupsimage2 RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibcups2 RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibdbus1-3 -CHECKPKG_OVERRIDES_CSWghostscript-filters += file-with-bad-content|/usr/share|root/opt/csw/lib/cups/filter/gstoraster -CHECKPKG_OVERRIDES_CSWghostscript-filters += file-with-bad-content|/usr/share|root/opt/csw/lib/cups/filter/gstopxl # Yes, the filter is 32 bit only CHECKPKG_OVERRIDES_CSWghostscript-filters += 64-bit-binaries-missing @@ -104,7 +102,7 @@ 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 += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibcupsimage2 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibjbig2dec0 @@ -113,7 +111,9 @@ RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibidn11 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibpaper1 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibgcc-s1 + PACKAGES += CSWghostscript-dev SPKG_DESC_CSWghostscript-dev = Development files for ghostscript and libgs.so.9 PKGFILES_CSWghostscript-dev += $(PKGFILES_DEVEL) @@ -133,8 +133,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts -CONFIGURE_ARGS += --enable-cups -CONFIGURE_ARGS += --with-install-cups CONFIGURE_ARGS += --with-system-libtiff # pentium_pro does not have SSE2 and the detection does not work @@ -157,12 +155,16 @@ @# 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 + # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html + gsed -i 's/ZLIBDIR=src/ZLIBDIR=$$includedir/' $(WORKSRC)/configure.ac $(WORKSRC)/configure + rm -rf $(WORKSRC)/lcms2 + rm -rf $(WORKSRC)/zlib + rm -rf $(WORKSRC)/jpeg + rm -rf $(WORKSRC)/openjpeg + rm -rf $(WORKSRC)/tiff + rm -rf $(WORKSRC)/jbig2dec + rm -rf $(WORKSRC)/libpng + rm -rf $(WORKSRC)/freetype + rm -rf $(WORKSRC)/expat @$(MAKECOOKIE) 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 19 13:27:14 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 19 May 2014 11:27:14 +0000 Subject: SF.net SVN: gar:[23657] csw/mgar/pkg/librsvg/trunk Message-ID: <3gXHyB6x6Gz1PD@mail.opencsw.org> Revision: 23657 http://sourceforge.net/p/gar/code/23657 Author: lblume Date: 2014-05-19 11:27:14 +0000 (Mon, 19 May 2014) Log Message: ----------- librsvg/trunk: Switch to 2.6.34; switch to GCC4; update dependencies; add workarund for ld bug; disable introspection Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/librsvg/trunk/checksums Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2014-05-19 07:59:39 UTC (rev 23656) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2014-05-19 11:27:14 UTC (rev 23657) @@ -1,5 +1,5 @@ NAME = librsvg -VERSION = 2.35.0 +VERSION = 2.36.4 GARTYPE = v2 DESCRIPTION = Scalable Vector Graphics library @@ -18,7 +18,7 @@ LICENSE = COPYING.LIB -GARCOMPILER = SOS12U3 +GARCOMPILER = GCC4 # We need the new glib only available on Solaris 10 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -29,7 +29,6 @@ PACKAGES += CSWlibrsvg2-2 SPKG_DESC_CSWlibrsvg2-2 = Scalable Vector Graphics library, librsvg-2.so.2 PKGFILES_CSWlibrsvg2-2 += $(call pkgfiles_lib,librsvg-2.so.2) -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWpango RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcroco RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcairo2 @@ -37,6 +36,10 @@ RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibpangocairo1-0-0 + OBSOLETED_BY_CSWlibrsvg2-2 = CSWlibrsvg PACKAGES += CSWlibrsvg-dev @@ -45,7 +48,7 @@ PKGFILES_CSWlibrsvg-dev += $(sharedstatedir)/gtk-doc/.* RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibglib2-dev -RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWgtk2devel +RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibgtk2-dev RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibcairo-dev PACKAGES += CSWrsvg @@ -56,8 +59,7 @@ RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgcc-s1 PACKAGES += CSWlibrsvg-gnome SPKG_DESC_CSWlibrsvg-gnome += Scalable Vector Graphics library - Gnome module @@ -68,9 +70,40 @@ RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgmodule2-0-0 +### +# Needed for the Solaris ld bug +ifeq ($(shell /usr/bin/uname -p),sparc) +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcroco +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcroco +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibpng15-15 +endif +### + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes --enable-static=no +# That fails on sparc +CONFIGURE_ARGS += --enable-introspection=no # This causes an configure abort CONFIGURE_ARGS += --disable-Bsymbolic @@ -79,6 +112,9 @@ STRIP_LIBTOOL = 1 +# https://bugzilla.gnome.org/show_bug.cgi?id=694649 +SKIPTEST = 1 + EXTRA_MERGE_DIRS_isa-extra = $(bindir) include gar/category.mk Modified: csw/mgar/pkg/librsvg/trunk/checksums =================================================================== --- csw/mgar/pkg/librsvg/trunk/checksums 2014-05-19 07:59:39 UTC (rev 23656) +++ csw/mgar/pkg/librsvg/trunk/checksums 2014-05-19 11:27:14 UTC (rev 23657) @@ -1 +1 @@ -190e81d8d4ed34583c71a5842e51f405 librsvg-2.35.0.tar.xz +3c94524c8ccf668e30b236f409239f54 librsvg-2.36.4.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon May 19 14:54:52 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 19 May 2014 12:54:52 +0000 Subject: SF.net SVN: gar:[23658] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: <3gXKv93V2Hz1Y9@mail.opencsw.org> Revision: 23658 http://sourceforge.net/p/gar/code/23658 Author: lblume Date: 2014-05-19 12:54:50 +0000 (Mon, 19 May 2014) Log Message: ----------- ghostscript/trunk: Update dependencies; remove obsolete comments; remove ghostscript-filters which apparently has been replaced by a separate cups-filter Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-19 11:27:14 UTC (rev 23657) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-19 12:54:50 UTC (rev 23658) @@ -58,6 +58,7 @@ RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWghostscript += CSWliblcms2-2 # These are probably ok CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/lprsetup.sh @@ -78,23 +79,6 @@ RUNTIME_DEP_PKGS_CSWgs += CSWlibgs8 CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWlibgs8 -# CUPS filter -PACKAGES += CSWghostscript-filters -SPKG_DESC_CSWghostscript-filters = CUPS filter for Ghostscript -PKGFILES_CSWghostscript-filters += $(libdir)/cups/.* -PKGFILES_CSWghostscript-filters += $(sharedstatedir)/cups/.* -PKGFILES_CSWghostscript-filters += $(sysconfdir)/cups/.* -RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibcupsimage2 -RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibdbus1-3 - -# Yes, the filter is 32 bit only -CHECKPKG_OVERRIDES_CSWghostscript-filters += 64-bit-binaries-missing - -# The filter gstopxl calls /opt/csw/bin/gs -RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWghostscript -CHECKPKG_OVERRIDES_CSWghostscript-filters += surplus-dependency|CSWghostscript - PRESERVECONF += $(sysconfdir)/cups/gstoraster.convs PACKAGES += CSWlibgs9 @@ -112,6 +96,7 @@ RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibpaper1 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWliblcms2-2 PACKAGES += CSWghostscript-dev @@ -152,9 +137,6 @@ include gar/category.mk 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 # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html gsed -i 's/ZLIBDIR=src/ZLIBDIR=$$includedir/' $(WORKSRC)/configure.ac $(WORKSRC)/configure rm -rf $(WORKSRC)/lcms2 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 19 16:27:21 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 19 May 2014 14:27:21 +0000 Subject: SF.net SVN: gar:[23659] csw/mgar/pkg/liblcms2/trunk/Makefile Message-ID: <3gXMxq5ndfzBB@mail.opencsw.org> Revision: 23659 http://sourceforge.net/p/gar/code/23659 Author: lblume Date: 2014-05-19 14:27:19 +0000 (Mon, 19 May 2014) Log Message: ----------- liblcms2/trunk: Remove obsolete comment Modified Paths: -------------- csw/mgar/pkg/liblcms2/trunk/Makefile Modified: csw/mgar/pkg/liblcms2/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms2/trunk/Makefile 2014-05-19 12:54:50 UTC (rev 23658) +++ csw/mgar/pkg/liblcms2/trunk/Makefile 2014-05-19 14:27:19 UTC (rev 23659) @@ -2,10 +2,6 @@ VERSION = 2.6 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 lblume at users.sourceforge.net Mon May 19 16:34:58 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 19 May 2014 14:34:58 +0000 Subject: SF.net SVN: gar:[23660] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: <3gXN6h6xzRzFq@mail.opencsw.org> Revision: 23660 http://sourceforge.net/p/gar/code/23660 Author: lblume Date: 2014-05-19 14:34:58 +0000 (Mon, 19 May 2014) Log Message: ----------- ghostscript/trunk: Add workaround for ld bug Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-19 14:27:19 UTC (rev 23659) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-19 14:34:58 UTC (rev 23660) @@ -104,6 +104,18 @@ PKGFILES_CSWghostscript-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibgs9 +### +# Needed for the Solaris ld bug +ifeq ($(shell /usr/bin/uname -p),sparc) +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibk5crypto3 +endif +### + REINPLACEMENTS += fontpath REINPLACE_MATCH_fontpath = /usr/share/cups/fonts REINPLACE_WITH_fontpath = $(sharedstatedir)/cups/fonts 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 20 00:21:11 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 May 2014 22:21:11 +0000 Subject: SF.net SVN: gar:[23661] csw/mgar/gar/v2/lib/python/activity.py Message-ID: <3gXZSb0NqzzrW@mail.opencsw.org> Revision: 23661 http://sourceforge.net/p/gar/code/23661 Author: wahwah Date: 2014-05-19 22:21:11 +0000 (Mon, 19 May 2014) Log Message: ----------- Add gmarler to the whitelist He responds to email and wishes to remain active. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/activity.py Modified: csw/mgar/gar/v2/lib/python/activity.py =================================================================== --- csw/mgar/gar/v2/lib/python/activity.py 2014-05-19 14:34:58 UTC (rev 23660) +++ csw/mgar/gar/v2/lib/python/activity.py 2014-05-19 22:21:11 UTC (rev 23661) @@ -27,7 +27,8 @@ # People who haven't released packages in a long time, but are otherwise # active. 'claudio', # actively works on perl as of 2014-04 - 'daniel', # answers, email, is on standby, plans to build reSIProcate + 'daniel', # answers email, is on standby, plans to build reSIProcate + 'gmarler', # answers email, works on IPS packages on his own 'jcraig', # wants to keep active status 'rmottola', # answers email, works on GNUstep 'trygvis', # answers email 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 20 00:21:34 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 May 2014 22:21:34 +0000 Subject: SF.net SVN: gar:[23662] csw/mgar/gar/v2/lib Message-ID: <3gXZT1099Dzvk@mail.opencsw.org> Revision: 23662 http://sourceforge.net/p/gar/code/23662 Author: wahwah Date: 2014-05-19 22:21:33 +0000 (Mon, 19 May 2014) Log Message: ----------- pkgdb: Add the CatalogSpec class It can be used to represent a catalog specification: catalog release, architecture, and OS release. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-05-19 22:21:11 UTC (rev 23661) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-05-19 22:21:33 UTC (rev 23662) @@ -144,6 +144,13 @@ return m.group("username") if m else None +class CatalogSpec(collections.namedtuple( + 'CatalogSpec', ['catrel', 'arch', 'osrel'])): + + def __unicode__(self): + return u'{%s, %s, %s}' % self + + class SqlobjectHelperMixin(object): def __init__(self): Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-19 22:21:11 UTC (rev 23661) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-19 22:21:33 UTC (rev 23662) @@ -242,7 +242,7 @@ stuck and I don't know why. """ # used for logging - catspec = (catrel_name, arch_name, osrel_name) + catspec = checkpkg_lib.CatalogSpec(catrel_name, arch_name, osrel_name) logging.info('PUT %s %s', catspec, md5_sum) if catrel_name not in CAN_UPLOAD_TO_CATALOGS: # Updates via web are allowed only for the unstable catalog. 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 20 00:21:44 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 May 2014 22:21:44 +0000 Subject: SF.net SVN: gar:[23663] csw/mgar/gar/v2/lib Message-ID: <3gXZTK5FzWz100@mail.opencsw.org> Revision: 23663 http://sourceforge.net/p/gar/code/23663 Author: wahwah Date: 2014-05-19 22:21:43 +0000 (Mon, 19 May 2014) Log Message: ----------- pkgdb: Improved logging Using hierarchical loggers with "opencsw" as the root. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/relational_util.py csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-05-19 22:21:33 UTC (rev 23662) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-05-19 22:21:43 UTC (rev 23663) @@ -884,7 +884,7 @@ pkgname, self.osrel, self.arch, self.catrel, catalog, examined_files_by_pkg, rest_client=self.rest_client) for function in self.individual_checks: - logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) + logger = logging.getLogger("opencsw.%s-%s" % (pkgname, function.__name__)) logger.debug("Calling %s", function.__name__) function(pkg_data, check_interface, logger=logger, messenger=messenger) pbar.update(count.next()) @@ -908,7 +908,7 @@ # Set checks logging.info("Tasting them all at once...") for function in self.set_checks: - logger = logging.getLogger(function.__name__) + logger = logging.getLogger("opencsw." + function.__name__) check_interface = SetCheckInterface( self.osrel, self.arch, self.catrel, catalog, examined_files_by_pkg, rest_client=self.rest_client) @@ -951,12 +951,13 @@ def __init__(self): super(Catalog, self).__init__() self.pkgs_by_path_cache = {} + self.logger = logging.getLogger('opencsw.checkpkg_lib.Catalog') def GetInstalledPackages(self, osrel, arch, catrel): sqo_osrel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad( osrel, arch, catrel) - logging.debug("GetInstalledPackages(%s, %s, %s)" - % (osrel, arch, catrel)) + self.logger.debug("GetInstalledPackages(%s, %s, %s)" + % (osrel, arch, catrel)) # Object defining a filter for our OS release, architecture and catalog # release. @@ -1157,7 +1158,8 @@ def AddSrv4ToCatalog(self, sqo_srv4, osrel, arch, catrel, who=None): """Registers a srv4 file in a catalog.""" - logging.debug("AddSrv4ToCatalog(%s, %s, %s, %s, %s)", + self.logger.debug( + "AddSrv4ToCatalog(%s, %r, %r, %r, %r)", sqo_srv4, osrel, arch, catrel, who) if not who: who = 'unknown' @@ -1204,8 +1206,9 @@ m.Srv4FileInCatalog.q.catrel==sqo_catrel, m.Srv4FileInCatalog.q.srv4file==sqo_srv4)) if res.count(): - logging.debug("%s is already part of %s %s %s", - sqo_srv4, osrel, arch, catrel) + self.logger.debug( + "%s is already part of %s %s %s, count=%d", + sqo_srv4, osrel, arch, catrel, res.count()) # Our srv4 is already part of that catalog. return # SQL INSERT happens here. @@ -1216,8 +1219,12 @@ srv4file=sqo_srv4, created_by=who) # The package is now in the catalog. + self.logger.debug('The package %s was inserted into catalog %s %s %s: %s', + sqo_srv4.basename, osrel, arch, catrel, pkg_in_cat) def RemoveSrv4(self, sqo_srv4, osrel, arch, catrel): + catspec = CatalogSpec(catrel, arch, osrel) + self.logger.debug('RemoveSrv4(), %s %s' % (sqo_srv4, catspec)) sqo_osrel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad( osrel, arch, catrel) try: @@ -1229,8 +1236,10 @@ m.Srv4FileInCatalog.q.osrel==sqo_osrel, m.Srv4FileInCatalog.q.catrel==sqo_catrel, m.Srv4FileInCatalog.q.srv4file==sqo_srv4)).getOne() + self.logger.debug('Package %s should be now gone from %s.' % (sqo_srv4, catspec)) # Files belonging to this package should not be removed from the catalog # as the package might be still present in another catalog. sqo_srv4_in_cat.destroySelf() except sqlobject.main.SQLObjectNotFound as e: - logging.warning(e) + self.logger.debug('The object went away when we were trying to delete it.') + self.logger.warning(e) Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2014-05-19 22:21:33 UTC (rev 23662) +++ csw/mgar/gar/v2/lib/python/models.py 2014-05-19 22:21:43 UTC (rev 23663) @@ -10,6 +10,7 @@ import sqlobject from sqlobject import sqlbuilder +logger = logging.getLogger('opencsw.models') def SanitizeDatetime(d): if isinstance(d, datetime.datetime): @@ -243,6 +244,12 @@ def __init__(self, *args, **kwargs): super(Srv4FileStats, self).__init__(*args, **kwargs) + def __unicode__(self): + return u'%s/%s, %s' % (self.pkginst.pkgname, self.catalogname, self.md5_sum) + + def __str__(self): + return str(unicode(self)) + def DeleteAllDependentObjects(self): self.RemoveCatalogAssignments() self.RemoveAllCswFiles() @@ -292,7 +299,7 @@ CheckpkgErrorTag.q.catrel==catrel)) def RemoveCheckpkgResults(self, os_rel, arch, catrel): - logging.debug("%s: RemoveCheckpkgResults(%s, %s, %s)", + logger.debug("%s: RemoveCheckpkgResults(%s, %s, %s)", self, os_rel, arch, catrel) sqlobject.sqlhub.processConnection.query( sqlobject.sqlhub.processConnection.sqlrepr(sqlbuilder.Delete( @@ -304,22 +311,19 @@ CheckpkgErrorTag.q.catrel==catrel)))) def RemoveAllCheckpkgResults(self): - logging.debug("%s: RemoveAllCheckpkgResults()", self) + logger.debug("%s: RemoveAllCheckpkgResults()", self) sqlobject.sqlhub.processConnection.query( sqlobject.sqlhub.processConnection.sqlrepr(sqlbuilder.Delete( CheckpkgErrorTag.sqlmeta.table, CheckpkgErrorTag.q.srv4_file==self))) def RemoveOverrides(self): - logging.debug("%s: RemoveOverrides()", self) + logger.debug("%s: RemoveOverrides()", self) sqlobject.sqlhub.processConnection.query( sqlobject.sqlhub.processConnection.sqlrepr(sqlbuilder.Delete( CheckpkgOverride.sqlmeta.table, CheckpkgOverride.q.srv4_file==self))) - def __unicode__(self): - return (u"%s" % (self.basename)) - def GetUnicodeOrNone(self, s): """Tries to decode UTF-8. Modified: csw/mgar/gar/v2/lib/python/relational_util.py =================================================================== --- csw/mgar/gar/v2/lib/python/relational_util.py 2014-05-19 22:21:33 UTC (rev 23662) +++ csw/mgar/gar/v2/lib/python/relational_util.py 2014-05-19 22:21:43 UTC (rev 23663) @@ -28,13 +28,14 @@ PACKAGE_STATS_VERSION = 13L +logger = logging.getLogger('opencsw.relationalutil') def GetOrSetPkginst(pkgname): try: pkginst = models.Pkginst.selectBy(pkgname=pkgname).getOne() except sqlobject.main.SQLObjectNotFound as exc: - logging.debug('pkginst %s not found (%r), making a new one' + logger.debug('pkginst %s not found (%r), making a new one' % (pkgname, exc)) pkginst = models.Pkginst(pkgname=pkgname) return pkginst @@ -72,7 +73,7 @@ msg = ('%r is not a valid OS release name. Look into %s metadata. ' 'Probably a problem with the file name: %r' % (os_rel_name, md5_sum, pkg_stats["basic_stats"]["pkg_basename"])) - logging.warning(msg) + logger.warning(msg) # This is probably a package with a file name like # 'mod_dav-1.0.3-sparc-CSW.pkg.gz'. We have to deal with it somehow, # so we'll assume it's a Solaris 8 package. @@ -82,7 +83,7 @@ try: maintainer = models.Maintainer.selectBy(email=maint_email).getOne() except sqlobject.main.SQLObjectNotFound as exc: - logging.debug(exc) + logger.debug(exc) # Try to get the maintainer name. maint_name = None vendor_str = pkg_stats["pkginfo"]["VENDOR"] @@ -102,8 +103,8 @@ db_pkg_stats = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() db_pkg_stats.DeleteAllDependentObjects() except sqlobject.main.SQLObjectNotFound: - logging.debug('Package %s present in the rel db, proceeding with insert.', - parsed_basename) + logger.debug('Package %s not present in the relational db, ' + 'proceeding with insert.', parsed_basename) register = True bundle = pkg_stats['pkginfo'].get("OPENCSW_BUNDLE", None) Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-19 22:21:33 UTC (rev 23662) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-19 22:21:43 UTC (rev 23663) @@ -62,6 +62,17 @@ ]) +applogger = logging.getLogger('opencsw') +applogger.setLevel(logging.DEBUG) +log_handler = logging.FileHandler(filename=LOG_FILE_TMPL) +log_handler.setLevel(logging.DEBUG) +log_formatter = logging.Formatter( + '%(process)d %(levelname)s %(asctime)s ' + '%(filename)s:%(lineno)d %(funcName)s: %(message)s') +log_handler.setFormatter(log_formatter) +applogger.addHandler(log_handler) + + class Index(object): def GET(self): @@ -526,16 +537,6 @@ # web.webapi.internalerror = web.debugerror -applogger = logging.getLogger('releases-web') -applogger.setLevel(logging.DEBUG) -log_handler = logging.FileHandler(filename=LOG_FILE_TMPL) -log_handler.setLevel(logging.DEBUG) -log_formatter = logging.Formatter( - '%(process)d %(levelname)s %(asctime)s ' - '%(filename)s:%(lineno)d %(funcName)s: %(message)s') -log_handler.setFormatter(log_formatter) -applogger.addHandler(log_handler) - app = web.application(urls, globals()) def app_wrapper(app): 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 20 00:21:53 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 May 2014 22:21:53 +0000 Subject: SF.net SVN: gar:[23664] csw/mgar/gar/v2/lib Message-ID: <3gXZTV3zvYz11S@mail.opencsw.org> Revision: 23664 http://sourceforge.net/p/gar/code/23664 Author: wahwah Date: 2014-05-19 22:21:52 +0000 (Mon, 19 May 2014) Log Message: ----------- pkgdb: Use transactions It's safer to bind removal+insertion operations in a single transaction - less risk of getting the database in an inconsistent state. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-05-19 22:21:43 UTC (rev 23663) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-05-19 22:21:52 UTC (rev 23664) @@ -1126,37 +1126,37 @@ def GetConflictingSrv4ByCatalognameResult(self, sqo_srv4, catalogname, - sqo_osrel, sqo_arch, sqo_catrel): + sqo_osrel, sqo_arch, sqo_catrel, trans): res = m.Srv4FileStats.select( - m.Srv4FileStats.q.catalogname==catalogname - ).throughTo.in_catalogs.filter( - sqlobject.AND( - m.Srv4FileInCatalog.q.osrel==sqo_osrel, - m.Srv4FileInCatalog.q.arch==sqo_arch, - m.Srv4FileInCatalog.q.catrel==sqo_catrel, - m.Srv4FileInCatalog.q.srv4file!=sqo_srv4)) + m.Srv4FileStats.q.catalogname==catalogname, + forUpdate=True, + connection=trans + ).throughTo.in_catalogs.filter( + sqlobject.AND( + m.Srv4FileInCatalog.q.osrel==sqo_osrel, + m.Srv4FileInCatalog.q.arch==sqo_arch, + m.Srv4FileInCatalog.q.catrel==sqo_catrel, + m.Srv4FileInCatalog.q.srv4file!=sqo_srv4)) return res def GetConflictingSrv4ByPkgnameResult(self, sqo_srv4, pkgname, - sqo_osrel, sqo_arch, sqo_catrel): - join = [ - sqlbuilder.INNERJOINOn(None, - m.Pkginst, - m.Srv4FileStats.q.pkginst==m.Pkginst.q.id), - ] + sqo_osrel, sqo_arch, sqo_catrel, trans): + pkginst = sqo_srv4.pkginst res = m.Srv4FileStats.select( - m.Pkginst.q.pkgname==pkgname, - join=join - ).throughTo.in_catalogs.filter( - sqlobject.AND( - m.Srv4FileInCatalog.q.osrel==sqo_osrel, - m.Srv4FileInCatalog.q.arch==sqo_arch, - m.Srv4FileInCatalog.q.catrel==sqo_catrel, - m.Srv4FileInCatalog.q.srv4file!=sqo_srv4)) + m.Srv4FileStats.q.pkginst==pkginst, + forUpdate=True, + connection=trans + ).throughTo.in_catalogs.filter( + sqlobject.AND( + m.Srv4FileInCatalog.q.osrel==sqo_osrel, + m.Srv4FileInCatalog.q.arch==sqo_arch, + m.Srv4FileInCatalog.q.catrel==sqo_catrel, + m.Srv4FileInCatalog.q.srv4file!=sqo_srv4)) return res - def AddSrv4ToCatalog(self, sqo_srv4, osrel, arch, catrel, who=None): + def AddSrv4ToCatalog(self, sqo_srv4, osrel, arch, catrel, + who, trans): """Registers a srv4 file in a catalog.""" self.logger.debug( "AddSrv4ToCatalog(%s, %r, %r, %r, %r)", @@ -1177,34 +1177,28 @@ raise CatalogDatabaseError( "Package %s (%s) is not registered for releases." % (sqo_srv4.basename, sqo_srv4.md5_sum)) - # TODO(maciej): Make sure the package's files are present in the database. # Checking for presence of a different srv4 with the same pkginst in the # same catalog - pkginst = sqo_srv4.pkginst - res = m.Srv4FileStats.select( - m.Srv4FileStats.q.pkginst==pkginst).throughTo.in_catalogs.filter( - sqlobject.AND( - m.Srv4FileInCatalog.q.osrel==sqo_osrel, - m.Srv4FileInCatalog.q.arch==sqo_arch, - m.Srv4FileInCatalog.q.catrel==sqo_catrel, - m.Srv4FileInCatalog.q.srv4file!=sqo_srv4)) + res = self.GetConflictingSrv4ByPkgnameResult( + sqo_srv4, sqo_srv4.pkginst.pkgname, sqo_osrel, sqo_arch, sqo_catrel, trans) if res.count(): raise CatalogDatabaseError( "There already is a package with that pkgname: %s" % pkginst.pkgname) res = self.GetConflictingSrv4ByCatalognameResult( sqo_srv4, sqo_srv4.catalogname, - sqo_osrel, sqo_arch, sqo_catrel) + sqo_osrel, sqo_arch, sqo_catrel, trans) if res.count(): raise CatalogDatabaseError( "There already is a package with that catalogname: %s" - % sqo_srv4.catalogname) + % sqo_srv4) # Checking for presence of the same srv4 already in the catalog. res = m.Srv4FileInCatalog.select( sqlobject.AND( m.Srv4FileInCatalog.q.osrel==sqo_osrel, m.Srv4FileInCatalog.q.arch==sqo_arch, m.Srv4FileInCatalog.q.catrel==sqo_catrel, - m.Srv4FileInCatalog.q.srv4file==sqo_srv4)) + m.Srv4FileInCatalog.q.srv4file==sqo_srv4), + connection=trans) if res.count(): self.logger.debug( "%s is already part of %s %s %s, count=%d", @@ -1212,34 +1206,34 @@ # Our srv4 is already part of that catalog. return # SQL INSERT happens here. - m.Srv4FileInCatalog( + pkg_in_cat = m.Srv4FileInCatalog( arch=sqo_arch, osrel=sqo_osrel, catrel=sqo_catrel, srv4file=sqo_srv4, - created_by=who) - # The package is now in the catalog. + created_by=who, + connection=trans) self.logger.debug('The package %s was inserted into catalog %s %s %s: %s', sqo_srv4.basename, osrel, arch, catrel, pkg_in_cat) - def RemoveSrv4(self, sqo_srv4, osrel, arch, catrel): + def RemoveSrv4(self, sqo_srv4, osrel, arch, catrel, trans): catspec = CatalogSpec(catrel, arch, osrel) self.logger.debug('RemoveSrv4(), %s %s' % (sqo_srv4, catspec)) sqo_osrel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad( osrel, arch, catrel) try: - # There's a race condition in here. Maybe SQLObject allows to delete - # atomically? sqo_srv4_in_cat = m.Srv4FileInCatalog.select( sqlobject.AND( m.Srv4FileInCatalog.q.arch==sqo_arch, m.Srv4FileInCatalog.q.osrel==sqo_osrel, m.Srv4FileInCatalog.q.catrel==sqo_catrel, - m.Srv4FileInCatalog.q.srv4file==sqo_srv4)).getOne() + m.Srv4FileInCatalog.q.srv4file==sqo_srv4), + forUpdate=True, + connection=trans).getOne() + sqo_srv4_in_cat.destroySelf() self.logger.debug('Package %s should be now gone from %s.' % (sqo_srv4, catspec)) # Files belonging to this package should not be removed from the catalog # as the package might be still present in another catalog. - sqo_srv4_in_cat.destroySelf() except sqlobject.main.SQLObjectNotFound as e: self.logger.debug('The object went away when we were trying to delete it.') self.logger.warning(e) Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-19 22:21:43 UTC (rev 23663) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-19 22:21:52 UTC (rev 23664) @@ -11,6 +11,8 @@ import sys import tempfile +from contextlib import contextmanager + import cjson import lockfile import sqlobject @@ -73,6 +75,20 @@ applogger.addHandler(log_handler) + at contextmanager +def Transaction(cls): + """Provide a transactional scope around a series of operations.""" + transaction = cls._connection.transaction() + try: + yield transaction + transaction.commit() + except: + transaction.rollback() + raise + finally: + transaction.commit(close=True) + + class Index(object): def GET(self): @@ -291,46 +307,53 @@ c = checkpkg_lib.Catalog() sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( osrel_name, arch_name, catrel_name) - applogger.info('See if there already is a package with that ' - 'catalogname (%s)', srv4.basename) - res = c.GetConflictingSrv4ByCatalognameResult( - srv4, srv4.catalogname, - sqo_osrel, sqo_arch, sqo_catrel) - if res.count() >= 1: - for pkg_in_catalog in res: - srv4_to_remove = pkg_in_catalog.srv4file - applogger.info('Removing %s from the %s catalog', - srv4_to_remove.catalogname, catspec) - c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name) - else: - applogger.info('Package with the same catalogname (%s) not found in %s (good)', - srv4.catalogname, catspec) - # See if there already is a package with that pkgname. - res = c.GetConflictingSrv4ByPkgnameResult( - srv4, srv4.pkginst.pkgname, - sqo_osrel, sqo_arch, sqo_catrel) - if res.count() >= 1: - # Removing old version of the package from the catalog - for pkg_in_catalog in res: - srv4_to_remove = pkg_in_catalog.srv4file - applogger.info('Removing %s from %s', srv4_to_remove.basename, catspec) - c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name) + with Transaction(models.Srv4FileStats) as trans: + applogger.info('Looking if catalog %s already contains a package ' + 'with catalogname %s', catspec, srv4.catalogname) + res = c.GetConflictingSrv4ByCatalognameResult( + srv4, srv4.catalogname, + sqo_osrel, sqo_arch, sqo_catrel, + trans) + if res.count() >= 1: + for pkg_in_catalog in res: + srv4_to_remove = pkg_in_catalog.srv4file + applogger.info('Removing previous %s catalogname from the %s catalog, ' + 'matched by catalogname', + srv4_to_remove.catalogname, catspec) + c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name, trans) + else: + applogger.info('Package with the same catalogname (%s) not found in %s', + srv4.catalogname, catspec) + # See if there already is a package with that pkgname. + res = c.GetConflictingSrv4ByPkgnameResult( + srv4, srv4.pkginst.pkgname, + sqo_osrel, sqo_arch, sqo_catrel, + trans) + if res.count() >= 1: + # Removing old version of the package from the catalog + for pkg_in_catalog in res: + srv4_to_remove = pkg_in_catalog.srv4file + applogger.info('Removing %s from %s', srv4_to_remove.basename, catspec) + c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name, trans) + else: + applogger.info('Package with the same pkgname (%s) not found in %s', + srv4.pkginst.pkgname, catspec) - # This is set by basic HTTP auth. - username = web.ctx.env.get('REMOTE_USER') + # This is set by basic HTTP auth. + username = web.ctx.env.get('REMOTE_USER') - applogger.info('Adding %s to the %s catalog', srv4.basename, catspec) - c.AddSrv4ToCatalog(srv4, osrel_name, arch_name, catrel_name, who=username) - web.header( - 'Content-type', - 'application/x-vnd.opencsw.pkg;type=catalog-update') - response = cjson.encode([ - u"Added to catalog %s %s %s" % (catrel_name, arch_name, osrel_name), - u"%s" % srv4.basename, - u"%s" % srv4.md5_sum, - ]) - web.header('Content-Length', len(response)) - return response + applogger.info('Adding %s to the %s catalog', srv4.basename, catspec) + c.AddSrv4ToCatalog(srv4, osrel_name, arch_name, catrel_name, username, trans) + web.header( + 'Content-type', + 'application/x-vnd.opencsw.pkg;type=catalog-update') + response = cjson.encode([ + u"Added to catalog %s %s %s" % (catrel_name, arch_name, osrel_name), + u"%s" % srv4.basename, + u"%s" % srv4.md5_sum, + ]) + web.header('Content-Length', len(response)) + return response except ( checkpkg_lib.CatalogDatabaseError, sqlobject.dberrors.OperationalError) as exc: 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 20 00:22:02 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 May 2014 22:22:02 +0000 Subject: SF.net SVN: gar:[23665] csw/mgar/gar/v2/lib Message-ID: <3gXZTc0wGZz12j@mail.opencsw.org> Revision: 23665 http://sourceforge.net/p/gar/code/23665 Author: wahwah Date: 2014-05-19 22:22:01 +0000 (Mon, 19 May 2014) Log Message: ----------- pkgdb: Random cleanup Random cleanup done as part of other edits. This patch does not change any functionality. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/relational_util.py csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-05-19 22:21:52 UTC (rev 23664) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-05-19 22:22:01 UTC (rev 23665) @@ -32,6 +32,7 @@ DESCRIPTION_RE = r"^([\S]+) - (.*)$" +# This should be the same as the system configuration. SYS_DEFAULT_RUNPATH = [ "/usr/lib/$ISALIST", "/usr/lib", @@ -1163,7 +1164,7 @@ sqo_srv4, osrel, arch, catrel, who) if not who: who = 'unknown' - # There are only i386 and sparc catalogs. + # There are only i386 and sparc architectures. if arch not in ('i386', 'sparc'): raise CatalogDatabaseError("Wrong architecture: %s" % arch) sqo_osrel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad( Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2014-05-19 22:21:52 UTC (rev 23664) +++ csw/mgar/gar/v2/lib/python/models.py 2014-05-19 22:22:01 UTC (rev 23665) @@ -289,8 +289,9 @@ return CheckpkgOverride.select(CheckpkgOverride.q.srv4_file==self) def GetErrorTagsResult(self, os_rel, arch, catrel): - assert arch.name != 'all', ("Asked for the 'all' architecture, this is not valid " - "for GetErrorTagsResult().") + assert arch.name != 'all', ( + "Asked for the 'all' architecture, this is not valid " + "for GetErrorTagsResult().") return CheckpkgErrorTag.select( sqlobject.AND( CheckpkgErrorTag.q.srv4_file==self, Modified: csw/mgar/gar/v2/lib/python/relational_util.py =================================================================== --- csw/mgar/gar/v2/lib/python/relational_util.py 2014-05-19 22:21:52 UTC (rev 23664) +++ csw/mgar/gar/v2/lib/python/relational_util.py 2014-05-19 22:22:01 UTC (rev 23665) @@ -92,7 +92,7 @@ maint_name = re.sub(r'^.*%s' % maint_name_magic_str, '', vendor_str) maintainer = models.Maintainer(email=maint_email, full_name=maint_name) - rev=None + rev = None if "revision_info" in parsed_basename: if "REV" in parsed_basename["revision_info"]: rev = parsed_basename["revision_info"]["REV"] Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-19 22:21:52 UTC (rev 23664) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-19 22:22:01 UTC (rev 23665) @@ -362,9 +362,7 @@ web.header( 'Content-Type', 'application/x-vnd.opencsw.pkg;type=error-message') - response = cjson.encode({ - "error_message": unicode(exc), - }) + response = cjson.encode({"error_message": unicode(exc)}) web.header('Content-Length', str(len(response))) # If we are in this state, there's a possibility that a package has been # removed from the database, and its replacesment has not been inserted. 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 20 00:22:16 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 May 2014 22:22:16 +0000 Subject: SF.net SVN: gar:[23666] csw/mgar/gar/v2/lib/python Message-ID: <3gXZTs0fF9z167@mail.opencsw.org> Revision: 23666 http://sourceforge.net/p/gar/code/23666 Author: wahwah Date: 2014-05-19 22:22:15 +0000 (Mon, 19 May 2014) Log Message: ----------- checkpkg: Bugfix for disappearing packages http://lists.opencsw.org/pipermail/maintainers/2014-May/019245.html Idempotence is hard. There is a REST URL which allows you to create relational database entries for a given package. You send a HTTP PUT request, and the package gets registered. Before that request, the package's metadata only exist as a JSON blob in the blob table. In order to make any other operations on the package, an entry in the svr4_file_stats table needs to be created, and this is what this request does. What if you send another PUT request at the same URL? REST semantics require that multiple calls are allowed and that the result is always the same. My simple-minded solution was to simply nuke all the rows that were created by this request, and create them anew. The problem is that the function used deleted too much: it also deleted rows that represent the present of that package in catalogs. So deleting all the dependent database rows effectively removed that package from all the catalogs. The fix is to modify this piece of code to not delete rows that have been inserted for other causes than just the content of the package. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/relational_util.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2014-05-19 22:22:01 UTC (rev 23665) +++ csw/mgar/gar/v2/lib/python/models.py 2014-05-19 22:22:15 UTC (rev 23666) @@ -251,9 +251,25 @@ return str(unicode(self)) def DeleteAllDependentObjects(self): + """Prepares the object to be deleted. + + Use this function with caution. + """ + self.DeleteDependentObjectsPopulatedFromPackageItself() + logger.debug('Removing all dependent objects from %s; it will cause the ' + 'package to be removed from all catalogs.', self) self.RemoveCatalogAssignments() + self.RemoveAllCheckpkgResults() + + def DeleteDependentObjectsPopulatedFromPackageItself(self): + """Removing all the objects that only depend on the package contents. + + It doesn't touch rows that are created for other reasons, e.g. assignments + of packages to catalogs. + """ + logger.debug('%s - Deleting objects that only depend on the package ' + 'contents', self) self.RemoveAllCswFiles() - self.RemoveAllCheckpkgResults() self.RemoveOverrides() self.RemoveDepends() self.RemoveIncompatibles() Modified: csw/mgar/gar/v2/lib/python/relational_util.py =================================================================== --- csw/mgar/gar/v2/lib/python/relational_util.py 2014-05-19 22:22:01 UTC (rev 23665) +++ csw/mgar/gar/v2/lib/python/relational_util.py 2014-05-19 22:22:15 UTC (rev 23666) @@ -97,11 +97,14 @@ if "REV" in parsed_basename["revision_info"]: rev = parsed_basename["revision_info"]["REV"] - # If the object already exists in the database, we'll replace all dependent data. + # If the object already exists in the database, we'll replace the + # object-dependent data, but the gotcha is that we must not delete + # assignments of that object to catalogs. If we do so, the package will get + # removed from all the catalogs. db_pkg_stats = None try: db_pkg_stats = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() - db_pkg_stats.DeleteAllDependentObjects() + db_pkg_stats.DeleteDependentObjectsPopulatedFromPackageItself() except sqlobject.main.SQLObjectNotFound: logger.debug('Package %s not present in the relational db, ' 'proceeding with insert.', parsed_basename) 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 20 00:22:26 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 May 2014 22:22:26 +0000 Subject: SF.net SVN: gar:[23667] csw/mgar/gar/v2/lib/python/models.py Message-ID: <3gXZV20sCDz192@mail.opencsw.org> Revision: 23667 http://sourceforge.net/p/gar/code/23667 Author: wahwah Date: 2014-05-19 22:22:26 +0000 (Mon, 19 May 2014) Log Message: ----------- pkgdb: Don't cache pkg-catalog assignments They can change quickly and it's safer to not cache them and avoid a situation where we get old results. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2014-05-19 22:22:15 UTC (rev 23666) +++ csw/mgar/gar/v2/lib/python/models.py 2014-05-19 22:22:26 UTC (rev 23667) @@ -519,6 +519,10 @@ 'arch', 'osrel', 'catrel', 'srv4file', unique=True) + # http://turbogears.org/1.0/docs/SQLObject/Caching.html#what-does-cache-false-do + class sqlmeta: + cacheValues = False + def __unicode__(self): return (u"%s is in catalog %s %s %s" % (self.srv4file, 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 20 00:22:36 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 May 2014 22:22:36 +0000 Subject: SF.net SVN: gar:[23668] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: <3gXZVB57t9z1CC@mail.opencsw.org> Revision: 23668 http://sourceforge.net/p/gar/code/23668 Author: wahwah Date: 2014-05-19 22:22:35 +0000 (Mon, 19 May 2014) Log Message: ----------- releases-web: Remove beanie It might be added again soon, but it's currently absent - it does not exist. 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 2014-05-19 22:22:26 UTC (rev 23667) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-19 22:22:35 UTC (rev 23668) @@ -55,7 +55,6 @@ config = configuration.GetConfig() ALLPKGS_DIR = os.path.join(config.get("buildfarm", "opencsw_root"), "allpkgs") CAN_UPLOAD_TO_CATALOGS = frozenset([ - "beanie", "bratislava", "dublin", "kiel", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Tue May 20 00:54:53 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Mon, 19 May 2014 22:54:53 +0000 Subject: SF.net SVN: gar:[23669] csw/mgar/pkg/gnustep-base/trunk/Makefile Message-ID: <3gXbCS4dfxz1NY@mail.opencsw.org> Revision: 23669 http://sourceforge.net/p/gar/code/23669 Author: rmottola Date: 2014-05-19 22:54:52 +0000 (Mon, 19 May 2014) Log Message: ----------- gnustep-base/trunk: trick to repeat DESTDIR Modified Paths: -------------- csw/mgar/pkg/gnustep-base/trunk/Makefile Modified: csw/mgar/pkg/gnustep-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-05-19 22:22:35 UTC (rev 23668) +++ csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-05-19 22:54:52 UTC (rev 23669) @@ -45,7 +45,7 @@ @$(MAKECOOKIE) install-sourcegs: - . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install DESTDIR=$(DESTDIR) @$(MAKECOOKIE) test-none : This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Tue May 20 07:50:14 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Tue, 20 May 2014 05:50:14 +0000 Subject: SF.net SVN: gar:[23670] csw/mgar/pkg Message-ID: <3gXmQk4xXBzLH@mail.opencsw.org> Revision: 23670 http://sourceforge.net/p/gar/code/23670 Author: rmottola Date: 2014-05-20 05:50:10 +0000 (Tue, 20 May 2014) Log Message: ----------- gnustep-gui/trunk: gnustep gui first version Added Paths: ----------- csw/mgar/pkg/gnustep-gui/ csw/mgar/pkg/gnustep-gui/Makefile csw/mgar/pkg/gnustep-gui/branches/ csw/mgar/pkg/gnustep-gui/tags/ csw/mgar/pkg/gnustep-gui/trunk/ csw/mgar/pkg/gnustep-gui/trunk/Makefile csw/mgar/pkg/gnustep-gui/trunk/checksums csw/mgar/pkg/gnustep-gui/trunk/files/ Added: csw/mgar/pkg/gnustep-gui/Makefile =================================================================== --- csw/mgar/pkg/gnustep-gui/Makefile (rev 0) +++ csw/mgar/pkg/gnustep-gui/Makefile 2014-05-20 05:50:10 UTC (rev 23670) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gnustep-gui/trunk =================================================================== --- csw/mgar/pkg/gnustep-gui/trunk 2014-05-19 22:54:52 UTC (rev 23669) +++ csw/mgar/pkg/gnustep-gui/trunk 2014-05-20 05:50:10 UTC (rev 23670) Property changes on: csw/mgar/pkg/gnustep-gui/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gnustep-gui/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-gui/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnustep-gui/trunk/Makefile 2014-05-20 05:50:10 UTC (rev 23670) @@ -0,0 +1,50 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gnustep-gui +VERSION = 0.24.0 +GARTYPE = v2 + +DESCRIPTION = GNUstep-core gui +define BLURB + GNUstep-core gui framework, which provides all AppKit classes except the backend dependent. Necessary for all graphical and application-oriented development. +endef + +BUILD_DEP_PKGS = CSWgmake CSWgcc4objc +DEP_PKGS = CSWgnustep-make CSWgnustep-base + +MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/core/ +DISTFILES = $(DISTNAME).tar.gz + +#we absolutely need GCC for Objective-C support. The only alternative in the future would be clang +GARCOMPILER = GNU + +# now special targets for configure, build and install so that we can source +# GNUstep.sh before +CONFIGURE_SCRIPTS = sourcegs +BUILD_SCRIPTS = sourcegs +INSTALL_SCRIPTS = sourcegs + +# Disable test scripts for now +TEST_SCRIPTS = none +SKIPTEST = 1 + + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +configure-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) ; $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +build-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) + @$(MAKECOOKIE) + +install-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install DESTDIR=$(DESTDIR) + @$(MAKECOOKIE) + +test-none : + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gnustep-gui/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gnustep-gui/trunk/checksums =================================================================== --- csw/mgar/pkg/gnustep-gui/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnustep-gui/trunk/checksums 2014-05-20 05:50:10 UTC (rev 23670) @@ -0,0 +1 @@ +bd289f0c7b2626d093ad92364069b9a7 gnustep-gui-0.24.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 Tue May 20 08:33:02 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 May 2014 06:33:02 +0000 Subject: SF.net SVN: gar:[23671] csw/mgar/gar/v2/lib/python/relational_util.py Message-ID: <3gXnN54xXwzXP@mail.opencsw.org> Revision: 23671 http://sourceforge.net/p/gar/code/23671 Author: wahwah Date: 2014-05-20 06:33:01 +0000 (Tue, 20 May 2014) Log Message: ----------- pkgdb: Delete only overrides, when cleaning lev 1 Level 1 registration only puts in the overrides, so don't delete anything else on a PUT. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/relational_util.py Modified: csw/mgar/gar/v2/lib/python/relational_util.py =================================================================== --- csw/mgar/gar/v2/lib/python/relational_util.py 2014-05-20 05:50:10 UTC (rev 23670) +++ csw/mgar/gar/v2/lib/python/relational_util.py 2014-05-20 06:33:01 UTC (rev 23671) @@ -104,7 +104,6 @@ db_pkg_stats = None try: db_pkg_stats = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() - db_pkg_stats.DeleteDependentObjectsPopulatedFromPackageItself() except sqlobject.main.SQLObjectNotFound: logger.debug('Package %s not present in the relational db, ' 'proceeding with insert.', parsed_basename) @@ -159,6 +158,7 @@ version_string=parsed_basename["full_version_string"], bundle=bundle) # Inserting overrides as rows into the database + db_pkg_stats.RemoveOverrides() for override_dict in pkg_stats["overrides"]: models.CheckpkgOverride(srv4_file=db_pkg_stats, **override_dict) 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 20 08:33:10 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 May 2014 06:33:10 +0000 Subject: SF.net SVN: gar:[23672] csw/mgar/gar/v2/lib Message-ID: <3gXnNH1kTrzZh@mail.opencsw.org> Revision: 23672 http://sourceforge.net/p/gar/code/23672 Author: wahwah Date: 2014-05-20 06:33:10 +0000 (Tue, 20 May 2014) Log Message: ----------- pkgdb: Lazy registration lev 1 Don't make the PUT request if not necessary. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg2.py csw/mgar/gar/v2/lib/python/rest.py csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg2.py 2014-05-20 06:33:01 UTC (rev 23671) +++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2014-05-20 06:33:10 UTC (rev 23672) @@ -173,7 +173,8 @@ entries = [MakeEntry(x) for x in file_list] md5_sums_from_files = collector.CollectStatsFromCatalogEntries(entries, False) for md5_sum in md5_sums_from_files: - rest_client.RegisterLevelOne(md5_sum) + if not rest_client.IsRegisteredLevelOne(md5_sum): + rest_client.RegisterLevelOne(md5_sum) # We need the md5 sums of these files md5_sums.extend(md5_sums_from_files) assert md5_sums, "The list of md5 sums must not be empty." Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2014-05-20 06:33:01 UTC (rev 23671) +++ csw/mgar/gar/v2/lib/python/rest.py 2014-05-20 06:33:10 UTC (rev 23672) @@ -359,6 +359,19 @@ url = self.releases_url + "/svr4/%s/db-level-1/" % md5_sum return self._CurlPut(url, []) + def IsRegisteredLevelOne(self, md5_sum): + self.ValidateMd5(md5_sum) + url = self.releases_url + "/svr4/%s/db-level-1/" % md5_sum + http_code = self._HttpHeadRequest(url) + if http_code == 404: + return False + elif http_code == 200: + return True + else: + raise RestCommunicationError("URL %r HTTP code: %d" + % (url, http_code)) + + @retry_decorator.Retry(tries=DEFAULT_TRIES, delay=DEFAULT_RETRY_DELAY, exceptions=(RestCommunicationError, pycurl.error)) def IsRegisteredLevelTwo(self, md5_sum): Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-20 06:33:01 UTC (rev 23671) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-20 06:33:10 UTC (rev 23672) @@ -518,6 +518,15 @@ class Srv4RelationalLevelOne(object): """Registers the package: creates a set of relational database entries.""" + def HEAD(self, md5_sum): + try: + srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() + except sqlobject.main.SQLObjectNotFound: + raise web.notfound('Stats not in the database') + if not srv4.registered_level_one: + raise web.notfound('Stats in the db, but not registered (level 1)') + return '' + def PUT(self, md5_sum): try: relational_util.StatsStructToDatabaseLevelOne(md5_sum) @@ -552,7 +561,7 @@ except sqlobject.main.SQLObjectNotFound: raise web.notfound('Stats not in the database') if not srv4.registered_level_two: - raise web.notfound('Stats in the db, but not registered') + raise web.notfound('Stats in the db, but not registered (level 2)') return '' # 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 20 08:37:33 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 May 2014 06:37:33 +0000 Subject: SF.net SVN: gar:[23673] csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Message-ID: <3gXnTG1RJTzg6@mail.opencsw.org> Revision: 23673 http://sourceforge.net/p/gar/code/23673 Author: wahwah Date: 2014-05-20 06:37:31 +0000 (Tue, 20 May 2014) Log Message: ----------- pkgdb-web: Fix a typo Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Modified: csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2014-05-20 06:33:10 UTC (rev 23672) +++ csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2014-05-20 06:37:31 UTC (rev 23673) @@ -49,7 +49,7 @@ $if binary_md5_sums: -

ELF inforomation for binaries

+

ELF information for binaries

    $for bin_path, md5_sum in binary_md5_sums:
  • $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 Tue May 20 12:38:07 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 20 May 2014 10:38:07 +0000 Subject: SF.net SVN: gar:[23674] csw/mgar/pkg Message-ID: <3gXtpw6C66z1ND@mail.opencsw.org> Revision: 23674 http://sourceforge.net/p/gar/code/23674 Author: wahwah Date: 2014-05-20 10:38:06 +0000 (Tue, 20 May 2014) Log Message: ----------- py/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/py/ csw/mgar/pkg/py/Makefile csw/mgar/pkg/py/branches/ csw/mgar/pkg/py/tags/ csw/mgar/pkg/py/trunk/ csw/mgar/pkg/py/trunk/Makefile csw/mgar/pkg/py/trunk/checksums csw/mgar/pkg/py/trunk/files/ Added: csw/mgar/pkg/py/Makefile =================================================================== --- csw/mgar/pkg/py/Makefile (rev 0) +++ csw/mgar/pkg/py/Makefile 2014-05-20 10:38:06 UTC (rev 23674) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/py/trunk =================================================================== --- csw/mgar/pkg/py/trunk 2014-05-20 06:37:31 UTC (rev 23673) +++ csw/mgar/pkg/py/trunk 2014-05-20 10:38:06 UTC (rev 23674) Property changes on: csw/mgar/pkg/py/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/py/trunk/Makefile =================================================================== --- csw/mgar/pkg/py/trunk/Makefile (rev 0) +++ csw/mgar/pkg/py/trunk/Makefile 2014-05-20 10:38:06 UTC (rev 23674) @@ -0,0 +1,17 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = py +VERSION = 1.4.20 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Cross-python path, ini-parsing, io, code, log facilities + +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +ARCHALL_CSWpy-py = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/py/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/py/trunk/checksums =================================================================== --- csw/mgar/pkg/py/trunk/checksums (rev 0) +++ csw/mgar/pkg/py/trunk/checksums 2014-05-20 10:38:06 UTC (rev 23674) @@ -0,0 +1 @@ +5f1708be5482f3ff6711dfd6cafd45e0 py-1.4.20.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 20 14:43:47 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 May 2014 12:43:47 +0000 Subject: SF.net SVN: gar:[23675] csw/mgar/pkg/r/trunk Message-ID: <3gXxc30lfcz3K@mail.opencsw.org> Revision: 23675 http://sourceforge.net/p/gar/code/23675 Author: dmichelsen Date: 2014-05-20 12:43:46 +0000 (Tue, 20 May 2014) Log Message: ----------- r/trunk: Update to 3.1.0 Modified Paths: -------------- csw/mgar/pkg/r/trunk/Makefile csw/mgar/pkg/r/trunk/checksums Modified: csw/mgar/pkg/r/trunk/Makefile =================================================================== --- csw/mgar/pkg/r/trunk/Makefile 2014-05-20 10:38:06 UTC (rev 23674) +++ csw/mgar/pkg/r/trunk/Makefile 2014-05-20 12:43:46 UTC (rev 23675) @@ -2,34 +2,45 @@ # Only builds on Solaris 10 NAME = R -VERSION = 2.13.1 +VERSION = 3.1.0 GARTYPE = v2 DESCRIPTION = A language and environment for statistical computing and graphics define BLURB endef -MASTER_SITES = http://stat.ethz.ch/CRAN/src/base/R-2/ +MASTER_SITES = http://stat.ethz.ch/CRAN/src/base/R-$(shell echo $(VERSION) | awk -F. '{print $$1}')/ DISTFILES = $(NAME)-$(VERSION).tar.gz PACKAGES = CSWr-base VENDOR_URL = http://www.r-project.org/ RUNTIME_DEP_PKGS_CSWr-base += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibicui18n48 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibicuuc48 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibicuuc52 RUNTIME_DEP_PKGS_CSWr-base += CSWlibintl8 RUNTIME_DEP_PKGS_CSWr-base += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWr-base += CSWliblzma5 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWr-base += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWr-base += CSWlibz1 -RUNTIME_DEP_PKGS_CSWr-base += CSWss12f95rt RUNTIME_DEP_PKGS_CSWr-base += CSWsunmath -RUNTIME_DEP_PKGS_CSWr-base += CSWtcl -RUNTIME_DEP_PKGS_CSWr-base += CSWtk +RUNTIME_DEP_PKGS_CSWr-base += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibtk8-5 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibgomp1 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibgfortran3 +# These are because of linker anomaly +CHECKPKG_OVERRIDES_CSWr-base += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWr-base += surplus-dependency|CSWlibglib2-0-0 + # Temporary overrides CHECKPKG_OVERRIDES_CSWr-base += file-with-bad-content CHECKPKG_OVERRIDES_CSWr-base += bad-rpath-entry @@ -50,6 +61,8 @@ CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/library/stats/libs/stats.so CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/sparcv9/R/library/Matrix/libs/Matrix.so CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/sparcv9/R/library/mgcv/libs/mgcv.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/sparcv9/R/library/stats/libs/stats.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/R/library/stats/libs/stats.so CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/modules/lapack.so CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/sparcv9/R/modules/lapack.so CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/lib/libRlapack.so @@ -65,13 +78,14 @@ CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/lib/libRlapack.so CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/library/mgcv/libs/mgcv.so CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/library/KernSmooth/libs/KernSmooth.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/amd64/R/library/stats/libs/stats.so +GARCOMPILER = GNU + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check-recommended -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - include gar/category.mk Modified: csw/mgar/pkg/r/trunk/checksums =================================================================== --- csw/mgar/pkg/r/trunk/checksums 2014-05-20 10:38:06 UTC (rev 23674) +++ csw/mgar/pkg/r/trunk/checksums 2014-05-20 12:43:46 UTC (rev 23675) @@ -1 +1 @@ -28dd0d68ac3a0eab93fe7035565a1c30 R-2.13.1.tar.gz +a1ee52446bee81820409661e6d114ab1 R-3.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue May 20 22:37:50 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 20 May 2014 20:37:50 +0000 Subject: SF.net SVN: gar:[23676] csw/mgar/pkg/tor/trunk Message-ID: <3gY86v2Q3Lz135@mail.opencsw.org> Revision: 23676 http://sourceforge.net/p/gar/code/23676 Author: jake_goerzen Date: 2014-05-20 20:37:47 +0000 (Tue, 20 May 2014) Log Message: ----------- tor: bump to version 0.2.4.22 Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile csw/mgar/pkg/tor/trunk/checksums Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2014-05-20 12:43:46 UTC (rev 23675) +++ csw/mgar/pkg/tor/trunk/Makefile 2014-05-20 20:37:47 UTC (rev 23676) @@ -1,6 +1,6 @@ # $Id$ NAME = tor -VERSION = 0.2.4.21 +VERSION = 0.2.4.22 GARTYPE = v2 DESCRIPTION = Secure network traffic router Modified: csw/mgar/pkg/tor/trunk/checksums =================================================================== --- csw/mgar/pkg/tor/trunk/checksums 2014-05-20 12:43:46 UTC (rev 23675) +++ csw/mgar/pkg/tor/trunk/checksums 2014-05-20 20:37:47 UTC (rev 23676) @@ -1 +1 @@ -bde981d10e8faf1e171ef1ebbb7b398a tor-0.2.4.21.tar.gz +5a7eee0d9df87233255d78b25c6f8270 tor-0.2.4.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed May 21 13:52:12 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 21 May 2014 11:52:12 +0000 Subject: SF.net SVN: gar:[23677] csw/mgar/pkg/pgpool/trunk Message-ID: <3gYXPw0MbWzWd@mail.opencsw.org> Revision: 23677 http://sourceforge.net/p/gar/code/23677 Author: cgrzemba Date: 2014-05-21 11:52:09 +0000 (Wed, 21 May 2014) Log Message: ----------- pgpool/trunk: update version 3.3.3 Modified Paths: -------------- csw/mgar/pkg/pgpool/trunk/Makefile csw/mgar/pkg/pgpool/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pgpool/trunk/files/0001-fix-missing-macro-WIFEXITED.patch Modified: csw/mgar/pkg/pgpool/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgpool/trunk/Makefile 2014-05-20 20:37:47 UTC (rev 23676) +++ csw/mgar/pkg/pgpool/trunk/Makefile 2014-05-21 11:52:09 UTC (rev 23677) @@ -1,6 +1,6 @@ # $Id$ NAME = pgpool -VERSION = 3.0.1 +VERSION = 3.3.3 GARTYPE = v2 DESCRIPTION = A middleware that works between PostgreSQL servers and a PostgreSQL database client @@ -13,24 +13,26 @@ endef DISTNAME = pgpool-II-$(VERSION) -MASTER_SITES = http://pgfoundry.org/frs/download.php/2841/ +MASTER_SITES = http://www.pgpool.net/mediawiki/images/ +# MASTER_SITES = http://pgfoundry.org/frs/download.php/2841/ DISTFILES = $(DISTNAME).tar.gz # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES += 0001-fix-missing-macro-WIFEXITED.patch + PACKAGES = CSWpgpool CATALOGNAME_CSWpgpool = pgpool SPKG_DESC_CSWpgpool = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWpgpool += CSWlibpq -RUNTIME_DEP_PKGS_CSWpgpool += CSWlibgnugetopt RUNTIME_DEP_PKGS_CSWpgpool += CSWlibpcp0 +RUNTIME_DEP_PKGS_CSWpgpool += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWpgpool += CSWlibpq5 PACKAGES += CSWlibpcp0 CATALOGNAME_CSWlibpcp0 = libpcp0 SPKG_DESC_CSWlibpcp0 = Library for PostgreSQL pgpool providing libpcp.so.0 PKGFILES_CSWlibpcp0 = $(call baseisadirs,$(libdir),libpcp\.so\.0(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibpcp0 += CSWlibgnugetopt PACKAGES += CSWpgpool-dev CATALOGNAME_CSWpgpool-dev = pgpool_dev @@ -53,6 +55,8 @@ #CONFIGURE_ARGS += --with-openssl # We must use gegrep insread if egrep as certain arguments are needed CONFIGURE_ARGS += ac_cv_prog_egrep=$(bindir)/gegrep +# CONFIGURE_ARGS += --enable-sequence-lock +CONFIGURE_ARGS += --enable-table-lock EXTRA_PAX_ARGS = -s ",\.sample$$,.CSW,p" Modified: csw/mgar/pkg/pgpool/trunk/checksums =================================================================== --- csw/mgar/pkg/pgpool/trunk/checksums 2014-05-20 20:37:47 UTC (rev 23676) +++ csw/mgar/pkg/pgpool/trunk/checksums 2014-05-21 11:52:09 UTC (rev 23677) @@ -1 +1 @@ -86d8beff0396d11b6753dd2be31bcad7 pgpool-II-3.0.1.tar.gz +ceeb477b978db481c0638f5242c9240d pgpool-II-3.3.3.tar.gz Added: csw/mgar/pkg/pgpool/trunk/files/0001-fix-missing-macro-WIFEXITED.patch =================================================================== --- csw/mgar/pkg/pgpool/trunk/files/0001-fix-missing-macro-WIFEXITED.patch (rev 0) +++ csw/mgar/pkg/pgpool/trunk/files/0001-fix-missing-macro-WIFEXITED.patch 2014-05-21 11:52:09 UTC (rev 23677) @@ -0,0 +1,10 @@ +--- a/watchdog/watchdog.h ++++ b/watchdog/watchdog.h +@@ -27,6 +27,7 @@ + #define WATCHDOG_H + + #include ++#include + #include "libpq-fe.h" + + #include "md5.h" 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 22 00:49:46 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 May 2014 22:49:46 +0000 Subject: SF.net SVN: gar:[23678] csw/mgar/pkg/lang-python/waitress/trunk Message-ID: <3gYq0d0kTNz1M5@mail.opencsw.org> Revision: 23678 http://sourceforge.net/p/gar/code/23678 Author: wahwah Date: 2014-05-21 22:49:44 +0000 (Wed, 21 May 2014) Log Message: ----------- lang-python/waitress/trunk: Version bump Modified Paths: -------------- csw/mgar/pkg/lang-python/waitress/trunk/Makefile csw/mgar/pkg/lang-python/waitress/trunk/checksums Modified: csw/mgar/pkg/lang-python/waitress/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/waitress/trunk/Makefile 2014-05-21 11:52:09 UTC (rev 23677) +++ csw/mgar/pkg/lang-python/waitress/trunk/Makefile 2014-05-21 22:49:44 UTC (rev 23678) @@ -2,12 +2,12 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = waitress -VERSION = 0.8.7 +VERSION = 0.8.9 GARTYPE = v2 +CATEGORIES = python DESCRIPTION = Waitress WSGI server -CATEGORIES = python TEST_SCRIPTS = DISTFILES = $(DISTNAME).tar.gz ARCHALL_CSWpy-$(NAME) = 1 Modified: csw/mgar/pkg/lang-python/waitress/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/waitress/trunk/checksums 2014-05-21 11:52:09 UTC (rev 23677) +++ csw/mgar/pkg/lang-python/waitress/trunk/checksums 2014-05-21 22:49:44 UTC (rev 23678) @@ -1 +1 @@ -714f3d458d82a47f12fb168460de8366 waitress-0.8.7.tar.gz +da3f2e62b3676be5dd630703a68e2a04 waitress-0.8.9.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 22 11:39:26 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 22 May 2014 09:39:26 +0000 Subject: SF.net SVN: gar:[23679] csw/mgar/pkg/vim/trunk Message-ID: <3gZ5QK2C9kzKQ@mail.opencsw.org> Revision: 23679 http://sourceforge.net/p/gar/code/23679 Author: lblume Date: 2014-05-22 09:39:24 +0000 (Thu, 22 May 2014) Log Message: ----------- vim/trunk: Bump to patchlevel 295 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Added Paths: ----------- csw/mgar/pkg/vim/trunk/files/0007-export-fix-for-solaris-sh.patch Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2014-05-21 22:49:44 UTC (rev 23678) +++ csw/mgar/pkg/vim/trunk/Makefile 2014-05-22 09:39:24 UTC (rev 23679) @@ -1,6 +1,6 @@ NAME = vim DISTVERSION = 7.4 -PATCHREV = 193 +PATCHREV = 295 VERSION = $(DISTVERSION).$(PATCHREV) GARTYPE = v2 SPKG_SOURCEURL = http://www.vim.org/download.php @@ -62,8 +62,7 @@ PATCHFILES = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) -PATCHFILES += 0005-test-does-not-have--e.patch -PATCHFILES += 0006-then-should-be-than.patch +PATCHFILES += 0007-export-fix-for-solaris-sh.patch PATCHDIRLEVEL = 0 Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2014-05-21 22:49:44 UTC (rev 23678) +++ csw/mgar/pkg/vim/trunk/checksums 2014-05-22 09:39:24 UTC (rev 23679) @@ -191,4 +191,106 @@ b010979da48f27769344506285c87ffd 7.4.191 b66f43553771fabff9946c2539233f8b 7.4.192 8a54888eff7728c3e1ee8eb3fc271395 7.4.193 +a48abd9780d474fc9af9eb1d6cf6a157 7.4.194 +371e8d03870cfc8cc80b7af8e2e1e227 7.4.195 +f086fef1d8f6b1223cd4c3b3b25ab03a 7.4.196 +46281579443d7738bd1a9aacf38bf463 7.4.197 +166dfc06619cc874ab986e39e6edc3dc 7.4.198 +20cce084827d4998a87909660c2f62fd 7.4.199 +910ab3bff3c7af44877736ab8ba8ae92 7.4.200 +1de8360283c464dfe37bbd3c22e74fd1 7.4.201 +ecdc9aa4facee37c563ee4e16f2447c7 7.4.202 +8f29761b3be27a7925e7cfc1b4d2d141 7.4.203 +c1fe85c772d4c5e064f2b5cc80223930 7.4.204 +fed144f679842969a87ee0aaf70694f0 7.4.205 +fa6c00de0e780f1e250d5af476aa95e4 7.4.206 +4337d84e53dc942a350d806049bc2588 7.4.207 +4f6f05ea3834293e9931f66c3b384368 7.4.208 +442df33e3f7825e7224ff0e1a5e18020 7.4.209 +afcf5759addbe717d00974cfcdd35226 7.4.210 +6418353debd191dba5f9630535d5949c 7.4.211 +0cb1b3de966db2a84c749aa34db33882 7.4.212 +bc6cfa0219398a40d729900e581ba42d 7.4.213 +fec9b228a6eb6627d2fa82b655d13c70 7.4.214 +6d73db3ca196e89d3dcfbd72821f9ca2 7.4.215 +d6f74e43a745f4a3758a33488360cecc 7.4.216 +b7371d17254fe74777d54f1816822c30 7.4.217 +2f4acb7e20fa567dc3b0930f018d0d4e 7.4.218 +b869b0398b0fa08f18e76c2007b80235 7.4.219 +884c3649a32bc3690906b470990980c6 7.4.220 +e2a95050b3edcfa42ddc31454543e3dd 7.4.221 +d458a27303fc30be8de30b74389e3466 7.4.222 +e19d284753ef5f1eeb9f44fc08785631 7.4.223 +dd2ecc1c03f724cad2757f4b45df3115 7.4.224 +8bd348cf3c661affa9f441d7cb92366e 7.4.225 +d175135cfb0a71b1cb7efd8cfec7c083 7.4.226 +dd22668741af2e2b6a5fd1b0378fdfd1 7.4.227 +f24b3eecf01d97d0b16413a43230aade 7.4.228 +92b14efda1881ecde71e368fe3f880cf 7.4.229 +c437f131d4d8e935e0c4122fe14d40bd 7.4.230 +86513da43dcfe5d341b30e9131ff5c5d 7.4.231 +c05c12752233b8d98694f740d8e842c1 7.4.232 +58619a079ecf449c0603b0ef988c853c 7.4.233 +e179ee727e1e8978f834aa66c75991d7 7.4.234 +e5d37d3e87b9e653de7a9333b670d9ac 7.4.235 +fb48e0461f7ee5cc560c7a4edfb242d1 7.4.236 +48efa9c2116d3a73c1904b258174aa02 7.4.237 +1db2c3532ad065b1cb9640d451157b88 7.4.238 +649b42a131948ca4ff2fa1a9ca03acb2 7.4.239 +1d76171ae8a64020c1226893074b0c32 7.4.240 +ead92bdd0c54248db01c9c79e2524912 7.4.241 +47a08abd198a0257894c2f0624d10962 7.4.242 +abe5ed9fb7b23119815892f98cd94613 7.4.243 +6d384e70a3e4b195bc69fe1c2fdd9735 7.4.244 +5c3141c1ae60f92f0c17e9814d38f045 7.4.245 +8cb28042047ea316a7949c75c94f0997 7.4.246 +f37b64c6641c3e462e28d800e5e0dca8 7.4.247 +2e1eab93b98dd7460cb3544d31676f6b 7.4.248 +33033c3f73418900b9fe2b7bef1d980f 7.4.249 +a9766343778385af47905a456cdfda2a 7.4.250 +cc43ae910c29aa8f20dc21a8fed6b76c 7.4.251 +268f1223f0bc09821ab23983dfa07a41 7.4.252 +1fcc11b023cf479d640e6e6f1acfe72a 7.4.253 +1daa1c8dbec782709f9c3b6386e3438f 7.4.254 +861d7eda0d351234f4559285dab0c7ad 7.4.255 +deac3b40e58f164a4486a9bd14040c64 7.4.256 +674e8a735fd62f2cf058bf98545cab19 7.4.257 +b13c892fbf2d29e16cb653558098d028 7.4.258 +37133a935b3ace0cf743beba53c4e4e2 7.4.259 +ab9e41259d3170081c45efe3e79ba5b6 7.4.260 +02279f24abec52c44f289878f1ebf0ee 7.4.261 +55d1d3dd550b868207413719881528fa 7.4.262 +a0b8b62feba16a96eb23f16649209b08 7.4.263 +2920c60d68e5eb151f9aba0451ecc6b9 7.4.264 +c507f61d19ce12bdf725cbcb7a568534 7.4.265 +2e4d058b054112b0e5919d2e4c3ca741 7.4.266 +122a3ecd0b49061ef7289d2bdea1ffd4 7.4.267 +7409a919783ecf7f5beec6e52faeeffa 7.4.268 +e8ed9e6b591337b6dab9fc995b1f121f 7.4.269 +def196358275e7930e4544e02a33f0d9 7.4.270 +d6e6a2f6efb792a35787792b3a001a73 7.4.271 +b7f6e7f3e636960e9cc407767bfa4be3 7.4.272 +b4446a9e79ea58821df53e67d3bfb94f 7.4.273 +ce4df156b46b1d6b8bfb5d8da344918f 7.4.274 +4494b43efc76858bd0de72f3da76bfb7 7.4.275 +236b445bc6b8a4306c3d12d636cffeb8 7.4.276 +8d327e0baf41e9a9af7ef646637c7dd7 7.4.277 +ac8475decfedb0dd9c86f0cb5f7a66cc 7.4.278 +46f5920fba9925643b80d8661372981f 7.4.279 +725e26a4d37cf681a0c182344e9bb493 7.4.280 +8128d231b10fb1df5c06aa839be8a40b 7.4.281 +7bb4f49b7a91af65dcd837cf7309cf4e 7.4.282 +18567f771fe446814e4733462106872c 7.4.283 +409097e1b669fa857339904c13f3cf90 7.4.284 +7157cf5e3884198c1b2f9aeed38c6343 7.4.285 +13b9e1b2ce6c283a19396f9078e7212c 7.4.286 +d3357b4d0e1623c0720536094f785ee8 7.4.287 +32960f38f1c0c8ef37f1b346c6a612bf 7.4.288 +6d1b5122aaadf8cfc048f0cd24d3588f 7.4.289 +d8e274ff051d84e9ead5e3ca36944527 7.4.290 +1f5556534d0922dcbb0392b31b0fc82f 7.4.291 +a4f9876a769c63132ac5644face5ef2f 7.4.292 +5689299be18cf9e01dc32e00aefc18b4 7.4.293 +a2c6744c3f930560f3ed935eceacb1b0 7.4.294 +8bcaa5f32681cadc66deba0426d1d502 7.4.295 607e135c559be642f210094ad023dc65 vim-7.4.tar.bz2 Added: csw/mgar/pkg/vim/trunk/files/0007-export-fix-for-solaris-sh.patch =================================================================== --- csw/mgar/pkg/vim/trunk/files/0007-export-fix-for-solaris-sh.patch (rev 0) +++ csw/mgar/pkg/vim/trunk/files/0007-export-fix-for-solaris-sh.patch 2014-05-22 09:39:24 UTC (rev 23679) @@ -0,0 +1,12 @@ +index 65c82e0..8ae35b9 100644 +--- src/testdir/Makefile ++++ src/testdir/Makefile +@@ -57,7 +57,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) + + RM_ON_RUN = test.out X* viminfo + RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok +-RUN_VIM = export VIMRUNTIME=$(SCRIPTSOURCE); $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in ++RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in + + clean: + -rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.* 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 22 11:55:23 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 May 2014 09:55:23 +0000 Subject: SF.net SVN: gar:[23680] csw/mgar/gar/v2/lib/web Message-ID: <3gZ5mg1g8RzPW@mail.opencsw.org> Revision: 23680 http://sourceforge.net/p/gar/code/23680 Author: wahwah Date: 2014-05-22 09:55:23 +0000 (Thu, 22 May 2014) Log Message: ----------- web apps: Use logging paths from the config file Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2014-05-22 09:39:24 UTC (rev 23679) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2014-05-22 09:55:23 UTC (rev 23680) @@ -22,12 +22,14 @@ # sys.stderr.write("Python path is {}.\n".format(sys.path)) from lib.python import checkpkg_lib +from lib.python import configuration from lib.python import models from lib.python import representations from lib.web import web_lib -LOG_FILE_TMPL = '/opt/csw/apache2/var/log/buildfarm/pkgdb-web.log' +config = configuration.GetConfig() +LOG_FILE_TMPL = config.get("pkgdb_app", "log_file") urls_html = ( r'/', 'index', Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-22 09:39:24 UTC (rev 23679) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-22 09:55:23 UTC (rev 23680) @@ -43,11 +43,11 @@ r'/svr4/([0-9a-f]{32})/db-level-1/', 'Srv4RelationalLevelOne', r'/svr4/([0-9a-f]{32})/db-level-2/', 'Srv4RelationalLevelTwo', r'/blob/([^/]+)/([0-9a-f]{32})/', 'JsonStorage', + r'/catalog-releases/([a-z]+)/', 'CatalogRelease', r'/catalogs/([^/]+)/([^/]+)/([^/]+)/([0-9a-f]{32})/', 'Srv4CatalogAssignment', r'/rpc/bulk-existing-svr4/', 'QueryExistingSvr4', ) -LOG_FILE_TMPL = '/opt/csw/apache2/var/log/buildfarm/releases-web.log' templatedir = os.path.join(os.path.dirname(__file__), "templates/") render = web.template.render(templatedir) @@ -65,7 +65,7 @@ applogger = logging.getLogger('opencsw') applogger.setLevel(logging.DEBUG) -log_handler = logging.FileHandler(filename=LOG_FILE_TMPL) +log_handler = logging.FileHandler(filename=config.get("releases_app", "log_file")) log_handler.setLevel(logging.DEBUG) log_formatter = logging.Formatter( '%(process)d %(levelname)s %(asctime)s ' 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 22 11:55:32 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 May 2014 09:55:32 +0000 Subject: SF.net SVN: gar:[23681] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: <3gZ5mr2mxyzRb@mail.opencsw.org> Revision: 23681 http://sourceforge.net/p/gar/code/23681 Author: wahwah Date: 2014-05-22 09:55:31 +0000 (Thu, 22 May 2014) Log Message: ----------- releases-web: Allow uploading to any 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 2014-05-22 09:55:23 UTC (rev 23680) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-22 09:55:31 UTC (rev 23681) @@ -54,15 +54,7 @@ config = configuration.GetConfig() ALLPKGS_DIR = os.path.join(config.get("buildfarm", "opencsw_root"), "allpkgs") -CAN_UPLOAD_TO_CATALOGS = frozenset([ - "bratislava", - "dublin", - "kiel", - "unstable", - "legacy", -]) - applogger = logging.getLogger('opencsw') applogger.setLevel(logging.DEBUG) log_handler = logging.FileHandler(filename=config.get("releases_app", "log_file")) @@ -270,14 +262,6 @@ # used for logging catspec = checkpkg_lib.CatalogSpec(catrel_name, arch_name, osrel_name) logging.info('PUT %s %s', catspec, md5_sum) - 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. - # Sadly, we cannot return a response body due to webpy's API - # limitation. - raise web.forbidden( - 'You can only upload to the following catalogs:' - + ' '.join(CAN_UPLOAD_TO_CATALOGS)) try: if arch_name == 'all': raise web.badrequest("There is no 'all' catalog, cannot proceed.") 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 22 11:55:40 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 May 2014 09:55:40 +0000 Subject: SF.net SVN: gar:[23682] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: <3gZ5nF5WhTzX0@mail.opencsw.org> Revision: 23682 http://sourceforge.net/p/gar/code/23682 Author: wahwah Date: 2014-05-22 09:55:39 +0000 (Thu, 22 May 2014) Log Message: ----------- releases-web: RESTful URL for catalog releases To make it easier to add and remove catalog releases. 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 2014-05-22 09:55:31 UTC (rev 23681) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-22 09:55:39 UTC (rev 23682) @@ -8,6 +8,7 @@ import hashlib import logging import os +import re import sys import tempfile @@ -548,6 +549,39 @@ raise web.notfound('Stats in the db, but not registered (level 2)') return '' + +class CatalogRelease(object): + """Manages catalog releases.""" + def PUT(self, name): + if not re.match(r'', name): + raise web.conflict() + with Transaction(models.Srv4FileStats) as trans: + res = models.CatalogRelease.selectBy(name=name) + if res.count(): + return cjson.encode('%s already exists' % name) + models.CatalogRelease(name=name, connection=trans) + return cjson.encode('%s has been created' % name) + + def DELETE(self, name): + try: + o = models.CatalogRelease.selectBy(name=name).getOne() + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() + res = models.Srv4FileInCatalog.select(models.Srv4FileInCatalog.q.catrel==o) + if res.count(): + # There are pacakges in this catalog. Cannot remove. + raise web.conflict() + o.destroySelf() + return cjson.encode('%s has been deleted' % name) + + def GET(self, name): + try: + o = models.CatalogRelease.selectBy(name=name).getOne() + return cjson.encode({'name': name, 'obj': unicode(o)}) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() + + # 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 wahwah at users.sourceforge.net Thu May 22 11:56:03 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 May 2014 09:56:03 +0000 Subject: SF.net SVN: gar:[23683] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: <3gZ5nV0ySHzb9@mail.opencsw.org> Revision: 23683 http://sourceforge.net/p/gar/code/23683 Author: wahwah Date: 2014-05-22 09:56:02 +0000 (Thu, 22 May 2014) Log Message: ----------- releases-web: Use the app logger for all logging This way, the logging entries will end up in the app log. 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 2014-05-22 09:55:39 UTC (rev 23682) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-22 09:56:02 UTC (rev 23683) @@ -239,7 +239,7 @@ srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() except sqlobject.main.SQLObjectNotFound as e: raise web.notfound("Object %s not found" % (md5_sum)) - logging.debug("Srv4CatalogAssignment::GET srv4: %s", srv4.basename) + applogger.debug("Srv4CatalogAssignment::GET srv4: %s", srv4.basename) srv4_in_c = models.Srv4FileInCatalog.selectBy( osrel=sqo_osrel, arch=sqo_arch, @@ -260,9 +260,8 @@ is to add the 'Content-Length' header. However, it sometimes still gets stuck and I don't know why. """ - # used for logging catspec = checkpkg_lib.CatalogSpec(catrel_name, arch_name, osrel_name) - logging.info('PUT %s %s', catspec, md5_sum) + applogger.info('PUT %s %s', catspec, md5_sum) try: if arch_name == 'all': raise web.badrequest("There is no 'all' catalog, cannot proceed.") @@ -272,7 +271,7 @@ try: srv4, _ = relational_util.StatsStructToDatabaseLevelOne(md5_sum) except errors.DataError as exc: - logging.warning(exc) + applogger.warning(exc) # TODO(maciej): Add the exception to the web.conflict() call. # webpy 0.37 apparently doesn't allow that. raise web.conflict() 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 22 11:58:14 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 22 May 2014 09:58:14 +0000 Subject: SF.net SVN: gar:[23684] csw/mgar/pkg/gvim/trunk Message-ID: <3gZ5r13H8Vzfh@mail.opencsw.org> Revision: 23684 http://sourceforge.net/p/gar/code/23684 Author: lblume Date: 2014-05-22 09:58:12 +0000 (Thu, 22 May 2014) Log Message: ----------- gvim/trunk: Bump to patchlevel 295; add missing build dep Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gvim/trunk/files/0007-export-fix-for-solaris-sh.patch Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2014-05-22 09:56:02 UTC (rev 23683) +++ csw/mgar/pkg/gvim/trunk/Makefile 2014-05-22 09:58:12 UTC (rev 23684) @@ -1,6 +1,6 @@ NAME = vim DISTVERSION = 7.4 -PATCHREV = 193 +PATCHREV = 295 VERSION = $(DISTVERSION).$(PATCHREV) GARTYPE = v2 SPKG_SOURCEURL = http://www.vim.org/download.php @@ -28,8 +28,7 @@ PATCHFILES = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) -PATCHFILES += 0005-test-does-not-have--e.patch -PATCHFILES += 0006-then-should-be-than.patch +PATCHFILES += 0007-export-fix-for-solaris-sh.patch PATCHDIRLEVEL = 0 @@ -67,6 +66,7 @@ BUILD_DEP_PKGS += CSWlibgnomeui-devel BUILD_DEP_PKGS += CSWlibgnome-dev BUILD_DEP_PKGS += CSWlibgconf-dev +BUILD_DEP_PKGS += CSWlibbonoboui-dev RUNTIME_DEP_PKGS_CSWgvim = CSWvimrt Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2014-05-22 09:56:02 UTC (rev 23683) +++ csw/mgar/pkg/gvim/trunk/checksums 2014-05-22 09:58:12 UTC (rev 23684) @@ -191,4 +191,106 @@ b010979da48f27769344506285c87ffd 7.4.191 b66f43553771fabff9946c2539233f8b 7.4.192 8a54888eff7728c3e1ee8eb3fc271395 7.4.193 +a48abd9780d474fc9af9eb1d6cf6a157 7.4.194 +371e8d03870cfc8cc80b7af8e2e1e227 7.4.195 +f086fef1d8f6b1223cd4c3b3b25ab03a 7.4.196 +46281579443d7738bd1a9aacf38bf463 7.4.197 +166dfc06619cc874ab986e39e6edc3dc 7.4.198 +20cce084827d4998a87909660c2f62fd 7.4.199 +910ab3bff3c7af44877736ab8ba8ae92 7.4.200 +1de8360283c464dfe37bbd3c22e74fd1 7.4.201 +ecdc9aa4facee37c563ee4e16f2447c7 7.4.202 +8f29761b3be27a7925e7cfc1b4d2d141 7.4.203 +c1fe85c772d4c5e064f2b5cc80223930 7.4.204 +fed144f679842969a87ee0aaf70694f0 7.4.205 +fa6c00de0e780f1e250d5af476aa95e4 7.4.206 +4337d84e53dc942a350d806049bc2588 7.4.207 +4f6f05ea3834293e9931f66c3b384368 7.4.208 +442df33e3f7825e7224ff0e1a5e18020 7.4.209 +afcf5759addbe717d00974cfcdd35226 7.4.210 +6418353debd191dba5f9630535d5949c 7.4.211 +0cb1b3de966db2a84c749aa34db33882 7.4.212 +bc6cfa0219398a40d729900e581ba42d 7.4.213 +fec9b228a6eb6627d2fa82b655d13c70 7.4.214 +6d73db3ca196e89d3dcfbd72821f9ca2 7.4.215 +d6f74e43a745f4a3758a33488360cecc 7.4.216 +b7371d17254fe74777d54f1816822c30 7.4.217 +2f4acb7e20fa567dc3b0930f018d0d4e 7.4.218 +b869b0398b0fa08f18e76c2007b80235 7.4.219 +884c3649a32bc3690906b470990980c6 7.4.220 +e2a95050b3edcfa42ddc31454543e3dd 7.4.221 +d458a27303fc30be8de30b74389e3466 7.4.222 +e19d284753ef5f1eeb9f44fc08785631 7.4.223 +dd2ecc1c03f724cad2757f4b45df3115 7.4.224 +8bd348cf3c661affa9f441d7cb92366e 7.4.225 +d175135cfb0a71b1cb7efd8cfec7c083 7.4.226 +dd22668741af2e2b6a5fd1b0378fdfd1 7.4.227 +f24b3eecf01d97d0b16413a43230aade 7.4.228 +92b14efda1881ecde71e368fe3f880cf 7.4.229 +c437f131d4d8e935e0c4122fe14d40bd 7.4.230 +86513da43dcfe5d341b30e9131ff5c5d 7.4.231 +c05c12752233b8d98694f740d8e842c1 7.4.232 +58619a079ecf449c0603b0ef988c853c 7.4.233 +e179ee727e1e8978f834aa66c75991d7 7.4.234 +e5d37d3e87b9e653de7a9333b670d9ac 7.4.235 +fb48e0461f7ee5cc560c7a4edfb242d1 7.4.236 +48efa9c2116d3a73c1904b258174aa02 7.4.237 +1db2c3532ad065b1cb9640d451157b88 7.4.238 +649b42a131948ca4ff2fa1a9ca03acb2 7.4.239 +1d76171ae8a64020c1226893074b0c32 7.4.240 +ead92bdd0c54248db01c9c79e2524912 7.4.241 +47a08abd198a0257894c2f0624d10962 7.4.242 +abe5ed9fb7b23119815892f98cd94613 7.4.243 +6d384e70a3e4b195bc69fe1c2fdd9735 7.4.244 +5c3141c1ae60f92f0c17e9814d38f045 7.4.245 +8cb28042047ea316a7949c75c94f0997 7.4.246 +f37b64c6641c3e462e28d800e5e0dca8 7.4.247 +2e1eab93b98dd7460cb3544d31676f6b 7.4.248 +33033c3f73418900b9fe2b7bef1d980f 7.4.249 +a9766343778385af47905a456cdfda2a 7.4.250 +cc43ae910c29aa8f20dc21a8fed6b76c 7.4.251 +268f1223f0bc09821ab23983dfa07a41 7.4.252 +1fcc11b023cf479d640e6e6f1acfe72a 7.4.253 +1daa1c8dbec782709f9c3b6386e3438f 7.4.254 +861d7eda0d351234f4559285dab0c7ad 7.4.255 +deac3b40e58f164a4486a9bd14040c64 7.4.256 +674e8a735fd62f2cf058bf98545cab19 7.4.257 +b13c892fbf2d29e16cb653558098d028 7.4.258 +37133a935b3ace0cf743beba53c4e4e2 7.4.259 +ab9e41259d3170081c45efe3e79ba5b6 7.4.260 +02279f24abec52c44f289878f1ebf0ee 7.4.261 +55d1d3dd550b868207413719881528fa 7.4.262 +a0b8b62feba16a96eb23f16649209b08 7.4.263 +2920c60d68e5eb151f9aba0451ecc6b9 7.4.264 +c507f61d19ce12bdf725cbcb7a568534 7.4.265 +2e4d058b054112b0e5919d2e4c3ca741 7.4.266 +122a3ecd0b49061ef7289d2bdea1ffd4 7.4.267 +7409a919783ecf7f5beec6e52faeeffa 7.4.268 +e8ed9e6b591337b6dab9fc995b1f121f 7.4.269 +def196358275e7930e4544e02a33f0d9 7.4.270 +d6e6a2f6efb792a35787792b3a001a73 7.4.271 +b7f6e7f3e636960e9cc407767bfa4be3 7.4.272 +b4446a9e79ea58821df53e67d3bfb94f 7.4.273 +ce4df156b46b1d6b8bfb5d8da344918f 7.4.274 +4494b43efc76858bd0de72f3da76bfb7 7.4.275 +236b445bc6b8a4306c3d12d636cffeb8 7.4.276 +8d327e0baf41e9a9af7ef646637c7dd7 7.4.277 +ac8475decfedb0dd9c86f0cb5f7a66cc 7.4.278 +46f5920fba9925643b80d8661372981f 7.4.279 +725e26a4d37cf681a0c182344e9bb493 7.4.280 +8128d231b10fb1df5c06aa839be8a40b 7.4.281 +7bb4f49b7a91af65dcd837cf7309cf4e 7.4.282 +18567f771fe446814e4733462106872c 7.4.283 +409097e1b669fa857339904c13f3cf90 7.4.284 +7157cf5e3884198c1b2f9aeed38c6343 7.4.285 +13b9e1b2ce6c283a19396f9078e7212c 7.4.286 +d3357b4d0e1623c0720536094f785ee8 7.4.287 +32960f38f1c0c8ef37f1b346c6a612bf 7.4.288 +6d1b5122aaadf8cfc048f0cd24d3588f 7.4.289 +d8e274ff051d84e9ead5e3ca36944527 7.4.290 +1f5556534d0922dcbb0392b31b0fc82f 7.4.291 +a4f9876a769c63132ac5644face5ef2f 7.4.292 +5689299be18cf9e01dc32e00aefc18b4 7.4.293 +a2c6744c3f930560f3ed935eceacb1b0 7.4.294 +8bcaa5f32681cadc66deba0426d1d502 7.4.295 607e135c559be642f210094ad023dc65 vim-7.4.tar.bz2 Added: csw/mgar/pkg/gvim/trunk/files/0007-export-fix-for-solaris-sh.patch =================================================================== --- csw/mgar/pkg/gvim/trunk/files/0007-export-fix-for-solaris-sh.patch (rev 0) +++ csw/mgar/pkg/gvim/trunk/files/0007-export-fix-for-solaris-sh.patch 2014-05-22 09:58:12 UTC (rev 23684) @@ -0,0 +1,12 @@ +index 65c82e0..8ae35b9 100644 +--- src/testdir/Makefile ++++ src/testdir/Makefile +@@ -57,7 +57,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) + + RM_ON_RUN = test.out X* viminfo + RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok +-RUN_VIM = export VIMRUNTIME=$(SCRIPTSOURCE); $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in ++RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in + + clean: + -rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.* 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 22 12:44:30 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 May 2014 10:44:30 +0000 Subject: SF.net SVN: gar:[23685] csw/mgar/gar/v2/lib Message-ID: <3gZ6sK34k9zrC@mail.opencsw.org> Revision: 23685 http://sourceforge.net/p/gar/code/23685 Author: wahwah Date: 2014-05-22 10:44:30 +0000 (Thu, 22 May 2014) Log Message: ----------- pkgdb: Class+table Host is not used Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/sh/db_privileges.sh Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2014-05-22 09:58:12 UTC (rev 23684) +++ csw/mgar/gar/v2/lib/python/models.py 2014-05-22 10:44:30 UTC (rev 23685) @@ -92,12 +92,6 @@ 'maintainer_id': self.id, } -class Host(sqlobject.SQLObject): - "Hostname, as returned by socket.getfqdn()" - fqdn = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) - arch = sqlobject.ForeignKey('Architecture', notNone=True) - - class CswConfig(sqlobject.SQLObject): option_key = sqlobject.UnicodeCol(length=255, unique=True) float_value = sqlobject.FloatCol(default=None) Modified: csw/mgar/gar/v2/lib/sh/db_privileges.sh =================================================================== --- csw/mgar/gar/v2/lib/sh/db_privileges.sh 2014-05-22 09:58:12 UTC (rev 23684) +++ csw/mgar/gar/v2/lib/sh/db_privileges.sh 2014-05-22 10:44:30 UTC (rev 23685) @@ -29,7 +29,6 @@ architecture catalog_release csw_config - host os_release ) 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 22 12:44:39 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 May 2014 10:44:39 +0000 Subject: SF.net SVN: gar:[23686] csw/mgar/gar/v2/lib/sh/db_privileges.sh Message-ID: <3gZ6sV23fhztF@mail.opencsw.org> Revision: 23686 http://sourceforge.net/p/gar/code/23686 Author: wahwah Date: 2014-05-22 10:44:39 +0000 (Thu, 22 May 2014) Log Message: ----------- pkgdb: Catalog releases can be modified by relmgr Modified Paths: -------------- csw/mgar/gar/v2/lib/sh/db_privileges.sh Modified: csw/mgar/gar/v2/lib/sh/db_privileges.sh =================================================================== --- csw/mgar/gar/v2/lib/sh/db_privileges.sh 2014-05-22 10:44:30 UTC (rev 23685) +++ csw/mgar/gar/v2/lib/sh/db_privileges.sh 2014-05-22 10:44:39 UTC (rev 23686) @@ -27,7 +27,6 @@ TABLES_ADMIN=( architecture - catalog_release csw_config os_release ) @@ -37,6 +36,7 @@ csw_file maintainer elfdump_info_blob + catalog_release ) TABLES_REGULAR=( pkginst 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 22 12:48:41 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 May 2014 10:48:41 +0000 Subject: SF.net SVN: gar:[23687] csw/mgar/pkg/lang-python/pytz/trunk Message-ID: <3gZ6y84WPmzyt@mail.opencsw.org> Revision: 23687 http://sourceforge.net/p/gar/code/23687 Author: wahwah Date: 2014-05-22 10:48:41 +0000 (Thu, 22 May 2014) Log Message: ----------- lang-python/pytz/trunk: Version bump Modified Paths: -------------- csw/mgar/pkg/lang-python/pytz/trunk/Makefile csw/mgar/pkg/lang-python/pytz/trunk/checksums Modified: csw/mgar/pkg/lang-python/pytz/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2014-05-22 10:44:39 UTC (rev 23686) +++ csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2014-05-22 10:48:41 UTC (rev 23687) @@ -1,6 +1,6 @@ # $Id$ NAME = pytz -VERSION = 2013b +VERSION = 2014.3 CATEGORIES = python GARTYPE = v2 @@ -13,14 +13,11 @@ Library Reference (datetime.tzinfo). endef -MASTER_SITES = http://pypi.python.org/packages/source/p/pytz/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -SPKG_SOURCEURL = http://$(NAME).sourceforge.net/ +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 +VENDOR_URL = http://$(NAME).sourceforge.net/ PACKAGES = CSWpy-tz -CATALOGNAME = py_tz -EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc - LICENSE = LICENSE.txt ARCHALL = 1 Modified: csw/mgar/pkg/lang-python/pytz/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/checksums 2014-05-22 10:44:39 UTC (rev 23686) +++ csw/mgar/pkg/lang-python/pytz/trunk/checksums 2014-05-22 10:48:41 UTC (rev 23687) @@ -1 +1 @@ -34f47470eedd5cd1faf6c3da2741967b pytz-2013b.tar.bz2 +73ec19d78ae6a0e168c7ff781bde289d pytz-2014.3.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 Thu May 22 13:02:08 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 May 2014 11:02:08 +0000 Subject: SF.net SVN: gar:[23688] csw/mgar/gar/v2/lib/python/database.py Message-ID: <3gZ7Fh3zhhz13v@mail.opencsw.org> Revision: 23688 http://sourceforge.net/p/gar/code/23688 Author: wahwah Date: 2014-05-22 11:02:04 +0000 (Thu, 22 May 2014) Log Message: ----------- pkgdb: Remove a missed reference to Host Modified Paths: -------------- csw/mgar/gar/v2/lib/python/database.py Modified: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2014-05-22 10:48:41 UTC (rev 23687) +++ csw/mgar/gar/v2/lib/python/database.py 2014-05-22 11:02:04 UTC (rev 23688) @@ -18,7 +18,6 @@ TABLES = (m.Architecture, m.CatalogRelease, m.CswConfig, - m.Host, m.Maintainer, m.OsRelease, m.Pkginst, 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 22 14:09:56 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 22 May 2014 12:09:56 +0000 Subject: SF.net SVN: gar:[23689] csw/mgar/pkg/gvim/trunk/Makefile Message-ID: <3gZ8lt4X9Zz1F6@mail.opencsw.org> Revision: 23689 http://sourceforge.net/p/gar/code/23689 Author: lblume Date: 2014-05-22 12:09:55 +0000 (Thu, 22 May 2014) Log Message: ----------- gvim/trunk: Adjust dependency Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2014-05-22 11:02:04 UTC (rev 23688) +++ csw/mgar/pkg/gvim/trunk/Makefile 2014-05-22 12:09:55 UTC (rev 23689) @@ -80,7 +80,7 @@ RUNTIME_DEP_PKGS_CSWgvim += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWgvim += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgvim += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWgvim += CSWlibbonoboui +RUNTIME_DEP_PKGS_CSWgvim += CSWlibbonoboui2-0 RUNTIME_DEP_PKGS_CSWgvim += CSWlibpango1-0-0 # Needed for the Solaris ld bug 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 22 14:53:10 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 22 May 2014 12:53:10 +0000 Subject: SF.net SVN: gar:[23690] csw/mgar/pkg/gnome-base/libgnomeui/trunk Message-ID: <3gZ9jn0W1Zz1M1@mail.opencsw.org> Revision: 23690 http://sourceforge.net/p/gar/code/23690 Author: lblume Date: 2014-05-22 12:53:07 +0000 (Thu, 22 May 2014) Log Message: ----------- gnome-base/libgnomeui/trunk: Bump to 2.24.5; disable gtk-doc stuff since it has disappeared Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile csw/mgar/pkg/gnome-base/libgnomeui/trunk/checksums Modified: csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile 2014-05-22 12:09:55 UTC (rev 23689) +++ csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile 2014-05-22 12:53:07 UTC (rev 23690) @@ -1,5 +1,5 @@ NAME = libgnomeui -VERSION = 2.24.3 +VERSION = 2.24.5 CATEGORIES = gnome GARTYPE = v2 @@ -30,7 +30,6 @@ SPKG_DESC_CSWlibgnomeui-devel += $(DESCRIPTION) - developer package SPKG_DESC_CSWlibgnomeui-doc += $(DESCRIPTION) - documentation -BUILD_DEP_PKGS += CSWgnomeicontheme BUILD_DEP_PKGS += CSWlibgnome BUILD_DEP_PKGS += CSWlibgnomecanvas BUILD_DEP_PKGS += CSWgtk2devel @@ -72,8 +71,10 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no -CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --enable-gtk-doc=no +CONFIGURE_ARGS += --enable-gtk-doc-html=no + ARCHALL_CSWlibgnomeui = 1 ARCHALL_CSWlibgnomeui-doc = 1 Modified: csw/mgar/pkg/gnome-base/libgnomeui/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-base/libgnomeui/trunk/checksums 2014-05-22 12:09:55 UTC (rev 23689) +++ csw/mgar/pkg/gnome-base/libgnomeui/trunk/checksums 2014-05-22 12:53:07 UTC (rev 23690) @@ -1 +1 @@ -ceab6f4370581d1a03c09f15cc103099 libgnomeui-2.24.3.tar.bz2 +d4bb506b1916015323928faab5aa708b libgnomeui-2.24.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu May 22 15:10:14 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 22 May 2014 13:10:14 +0000 Subject: SF.net SVN: gar:[23691] csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile Message-ID: <3gZB5Y5pTnz1Rc@mail.opencsw.org> Revision: 23691 http://sourceforge.net/p/gar/code/23691 Author: lblume Date: 2014-05-22 13:10:13 +0000 (Thu, 22 May 2014) Log Message: ----------- gnome-base/libgnomeui/trunk: Clean up package naming and dependencies Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile 2014-05-22 12:53:07 UTC (rev 23690) +++ csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile 2014-05-22 13:10:13 UTC (rev 23691) @@ -17,52 +17,44 @@ PACKAGES += CSWlibgnomeui PACKAGES += CSWlibgnomeui2-0 -PACKAGES += CSWlibgnomeui-devel +PACKAGES += CSWlibgnomeui-dev PACKAGES += CSWlibgnomeui-doc -CATALOGNAME_CSWlibgnomeui = libgnomeui CATALOGNAME_CSWlibgnomeui2-0 = libgnomeui2_0 -CATALOGNAME_CSWlibgnomeui-devel = libgnomeui_devel +CATALOGNAME_CSWlibgnomeui-dev = libgnomeui_dev CATALOGNAME_CSWlibgnomeui-doc = libgnomeui_doc -SPKG_DESC_CSWlibgnomeui = Transitional package as contents moved to CSWlibgnomeui2-0 +OBSOLETED_BY_CSWlibgnomeui2-0 = CSWlibgnomeui +OBSOLETED_BY_CSWlibgnomeui-dev = CSWlibgnomeui-devel + SPKG_DESC_CSWlibgnomeui2-0 = $(DESCRIPTION) providing libgnomeui-2.so.0 -SPKG_DESC_CSWlibgnomeui-devel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWlibgnomeui-dev += $(DESCRIPTION) - developer package SPKG_DESC_CSWlibgnomeui-doc += $(DESCRIPTION) - documentation -BUILD_DEP_PKGS += CSWlibgnome -BUILD_DEP_PKGS += CSWlibgnomecanvas -BUILD_DEP_PKGS += CSWgtk2devel +BUILD_DEP_PKGS += CSWlibgnome-dev +BUILD_DEP_PKGS += CSWlibgnomecanvas-dev +BUILD_DEP_PKGS += CSWlibgtk2-dev -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibpopt -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgnome -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgnomecanvas -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibatk -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWgnomevfs2 -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWorbit2 -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWgconf2 -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWbonobo2 -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibbonoboui -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWgnomekeyring -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWpango -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWglib2 RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibart RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibglade2 -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWgnomevfs2 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgnome2-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgnome-keyring0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibbonoboui2-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgnomecanvas2-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgnomeui-devel = CSWlibgnomeui2-0 +RUNTIME_DEP_PKGS_CSWlibgnomeui-dev = CSWlibgnomeui2-0 -# Legacy package dependencies, remove after deprecation -RUNTIME_DEP_PKGS_CSWlibgnomeui = CSWlibgnomeui2-0 CSWlibgnomeui-devel CSWlibgnomeui-doc -CHECKPKG_OVERRIDES_CSWlibgnomeui += surplus-dependency|CSWlibgnomeui-devel -CHECKPKG_OVERRIDES_CSWlibgnomeui += surplus-dependency|CSWlibgnomeui-doc -CHECKPKG_OVERRIDES_CSWlibgnomeui += surplus-dependency|CSWlibgnomeui2-0 - UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 EXTRA_LDFLAGS = -lm @@ -75,11 +67,9 @@ CONFIGURE_ARGS += --enable-gtk-doc-html=no -ARCHALL_CSWlibgnomeui = 1 ARCHALL_CSWlibgnomeui-doc = 1 -PKGFILES_CSWlibgnomeui = NOFILES -PKGFILES_CSWlibgnomeui-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibgnomeui-dev = $(PKGFILES_DEVEL) PKGFILES_CSWlibgnomeui-doc = $(sharedstatedir)/gtk-doc/.* 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 Thu May 22 15:25:27 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 22 May 2014 13:25:27 +0000 Subject: SF.net SVN: gar:[23692] csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile Message-ID: <3gZBR32Vprz1Xw@mail.opencsw.org> Revision: 23692 http://sourceforge.net/p/gar/code/23692 Author: lblume Date: 2014-05-22 13:25:24 +0000 (Thu, 22 May 2014) Log Message: ----------- gnome-base/libgnomeui/trunk: Add workaround for ld bug Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile 2014-05-22 13:10:13 UTC (rev 23691) +++ csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile 2014-05-22 13:25:24 UTC (rev 23692) @@ -55,6 +55,14 @@ RUNTIME_DEP_PKGS_CSWlibgnomeui-dev = CSWlibgnomeui2-0 +### +# Needed for the Solaris ld bug +ifeq ($(shell /usr/bin/uname -p),sparc) +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWorbit2 +RUNTIME_DEP_PKGS_CSWlibgnomeui2-0 += CSWlibfreetype6 +endif +### + UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 EXTRA_LDFLAGS = -lm 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 22 16:15:14 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 22 May 2014 14:15:14 +0000 Subject: SF.net SVN: gar:[23693] csw/mgar/pkg/gvim/trunk/Makefile Message-ID: <3gZCXl21W2z7y@mail.opencsw.org> Revision: 23693 http://sourceforge.net/p/gar/code/23693 Author: lblume Date: 2014-05-22 14:15:12 +0000 (Thu, 22 May 2014) Log Message: ----------- gvim/trunk: Adjust dependency Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2014-05-22 13:25:24 UTC (rev 23692) +++ csw/mgar/pkg/gvim/trunk/Makefile 2014-05-22 14:15:12 UTC (rev 23693) @@ -63,7 +63,7 @@ BUILD_DEP_PKGS += CSWfontconfig-dev BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWsunx11devel -BUILD_DEP_PKGS += CSWlibgnomeui-devel +BUILD_DEP_PKGS += CSWlibgnomeui-dev BUILD_DEP_PKGS += CSWlibgnome-dev BUILD_DEP_PKGS += CSWlibgconf-dev BUILD_DEP_PKGS += CSWlibbonoboui-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 23 14:40:32 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 23 May 2014 12:40:32 +0000 Subject: SF.net SVN: gar:[23694] csw/mgar/pkg/apcupsd/trunk Message-ID: <3gZnNt3WLZz1Nh@mail.opencsw.org> Revision: 23694 http://sourceforge.net/p/gar/code/23694 Author: lblume Date: 2014-05-23 12:40:31 +0000 (Fri, 23 May 2014) Log Message: ----------- apcupsd/trunk: Bump version to 3.14.12; add minor fixes to apccontrol script Modified Paths: -------------- csw/mgar/pkg/apcupsd/trunk/Makefile csw/mgar/pkg/apcupsd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/apcupsd/trunk/files/0001-apccontrol-fix.patch Modified: csw/mgar/pkg/apcupsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/apcupsd/trunk/Makefile 2014-05-22 14:15:12 UTC (rev 23693) +++ csw/mgar/pkg/apcupsd/trunk/Makefile 2014-05-23 12:40:31 UTC (rev 23694) @@ -1,5 +1,5 @@ NAME = apcupsd -VERSION = 3.14.10 +VERSION = 3.14.12 GARTYPE = v2 DESCRIPTION = A daemon for controlling APC UPS @@ -16,11 +16,10 @@ LICENSE = COPYING -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - BUILD_DEP_PKGS += CSWlibwrap-dev +PATCHFILES += 0001-apccontrol-fix.patch + PACKAGES += CSWapcupsd SPKG_DESC_CSWapcupsd = A daemon for controlling APC UPS # PKGFILES is catchall Modified: csw/mgar/pkg/apcupsd/trunk/checksums =================================================================== --- csw/mgar/pkg/apcupsd/trunk/checksums 2014-05-22 14:15:12 UTC (rev 23693) +++ csw/mgar/pkg/apcupsd/trunk/checksums 2014-05-23 12:40:31 UTC (rev 23694) @@ -1 +1 @@ -5928822d855c5cf7ac29655e3e0b8c23 apcupsd-3.14.10.tar.gz +08bf201acea6b4dd69cf2fb0eecfd55e apcupsd-3.14.12.tar.gz Added: csw/mgar/pkg/apcupsd/trunk/files/0001-apccontrol-fix.patch =================================================================== --- csw/mgar/pkg/apcupsd/trunk/files/0001-apccontrol-fix.patch (rev 0) +++ csw/mgar/pkg/apcupsd/trunk/files/0001-apccontrol-fix.patch 2014-05-23 12:40:31 UTC (rev 23694) @@ -0,0 +1,21 @@ +index d2297d5..89a3982 100644 +--- a/platforms/sun/apccontrol.in ++++ b/platforms/sun/apccontrol.in +@@ -55,7 +55,7 @@ case "$1" in + printf "Communications with UPS lost." | wall -a + ;; + commok) +- printf "Communciations with UPS restored." | wall -a ++ printf "Communications with UPS restored." | wall -a + ;; + powerout) + ;; +@@ -85,7 +85,7 @@ case "$1" in + ;; + doshutdown) + printf "Beginning Shutdown Sequence" | wall -a +- ${SHUTDOWN} -y -g0 -i0 "apcupsd initiated shutdown" ++ ${SHUTDOWN} -y -g0 -i5 "apcupsd initiated shutdown" + ;; + annoyme) + printf "Power problems please logoff." | wall -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 23 15:00:56 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 23 May 2014 13:00:56 +0000 Subject: SF.net SVN: gar:[23695] csw/mgar/pkg/apcupsd/trunk/Makefile Message-ID: <3gZnrK0DLtz1TG@mail.opencsw.org> Revision: 23695 http://sourceforge.net/p/gar/code/23695 Author: lblume Date: 2014-05-23 13:00:55 +0000 (Fri, 23 May 2014) Log Message: ----------- apcupsd/trunk: Update Deps; add workaround for ld bug Modified Paths: -------------- csw/mgar/pkg/apcupsd/trunk/Makefile Modified: csw/mgar/pkg/apcupsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/apcupsd/trunk/Makefile 2014-05-23 12:40:31 UTC (rev 23694) +++ csw/mgar/pkg/apcupsd/trunk/Makefile 2014-05-23 13:00:55 UTC (rev 23695) @@ -42,9 +42,18 @@ RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWapcups-gui += CSWpango RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibpango1-0-0 +### +# Needed for the Solaris ld bug +ifeq ($(shell /usr/bin/uname -p),sparc) +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibwrap1 +RUNTIME_DEP_PKGS_CSWapcups-gui += CSWlibfreetype6 +endif +### + # We need this for libusb and I definitely want this from Sun CHECKPKG_OVERRIDES_CSWapcups-gui += bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/gapcmon This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri May 23 15:17:30 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 23 May 2014 13:17:30 +0000 Subject: SF.net SVN: gar:[23696] csw/mgar/gar/v2/bin/filemerger Message-ID: <3gZpDX5N16z1x@mail.opencsw.org> Revision: 23696 http://sourceforge.net/p/gar/code/23696 Author: claudio_sf Date: 2014-05-23 13:17:28 +0000 (Fri, 23 May 2014) Log Message: ----------- First filemerger implementation Added Paths: ----------- csw/mgar/gar/v2/bin/filemerger Added: csw/mgar/gar/v2/bin/filemerger =================================================================== --- csw/mgar/gar/v2/bin/filemerger (rev 0) +++ csw/mgar/gar/v2/bin/filemerger 2014-05-23 13:17:28 UTC (rev 23696) @@ -0,0 +1,9724 @@ +#!/opt/csw/bin/perl +###!/usr/bin/env perl # We need a perl > 5.10 + +# This chunk of stuff was generated by App::FatPacker. To find the original +# file's code, look for the end of this BEGIN block or the string 'FATPACK' +BEGIN { +my %fatpacked; + +$fatpacked{"Devel/GlobalDestruction.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'DEVEL_GLOBALDESTRUCTION'; + package Devel::GlobalDestruction; + + use strict; + use warnings; + + our $VERSION = '0.12'; + + use Sub::Exporter::Progressive -setup => { + exports => [ qw(in_global_destruction) ], + groups => { default => [ -all ] }, + }; + + # we run 5.14+ - everything is in core + # + if (defined ${^GLOBAL_PHASE}) { + eval 'sub in_global_destruction () { ${^GLOBAL_PHASE} eq q[DESTRUCT] }; 1' + or die $@; + } + # try to load the xs version if it was compiled + # + elsif (eval { + require Devel::GlobalDestruction::XS; + no warnings 'once'; + *in_global_destruction = \&Devel::GlobalDestruction::XS::in_global_destruction; + 1; + }) { + # the eval already installed everything, nothing to do + } + else { + # internally, PL_main_cv is set to Nullcv immediately before entering + # global destruction and we can use B to detect that. B::main_cv will + # only ever be a B::CV or a B::SPECIAL that is a reference to 0 + require B; + eval 'sub in_global_destruction () { ${B::main_cv()} == 0 }; 1' + or die $@; + } + + 1; # keep require happy + + + __END__ + + =head1 NAME + + Devel::GlobalDestruction - Provides function returning the equivalent of + C<${^GLOBAL_PHASE} eq 'DESTRUCT'> for older perls. + + =head1 SYNOPSIS + + package Foo; + use Devel::GlobalDestruction; + + use namespace::clean; # to avoid having an "in_global_destruction" method + + sub DESTROY { + return if in_global_destruction; + + do_something_a_little_tricky(); + } + + =head1 DESCRIPTION + + Perl's global destruction is a little tricky to deal with WRT finalizers + because it's not ordered and objects can sometimes disappear. + + Writing defensive destructors is hard and annoying, and usually if global + destruction is happening you only need the destructors that free up non + process local resources to actually execute. + + For these constructors you can avoid the mess by simply bailing out if global + destruction is in effect. + + =head1 EXPORTS + + This module uses L so the exports may be renamed, + aliased, etc. if L is present. + + =over 4 + + =item in_global_destruction + + Returns true if the interpreter is in global destruction. In perl 5.14+, this + returns C<${^GLOBAL_PHASE} eq 'DESTRUCT'>, and on earlier perls, detects it using + the value of C or C. + + =back + + =head1 AUTHORS + + Yuval Kogman Enothingmuch at woobling.orgE + + Florian Ragwitz Erafl at debian.orgE + + Jesse Luehrs Edoy at tozt.netE + + Peter Rabbitson Eribasushi at cpan.orgE + + Arthur Axel 'fREW' Schmidt Efrioux at gmail.comE + + Elizabeth Mattijsen Eliz at dijkmat.nlE + + Greham Knop Ehaarg at haarg.orgE + + =head1 COPYRIGHT + + Copyright (c) 2008 Yuval Kogman. All rights reserved + This program is free software; you can redistribute + it and/or modify it under the same terms as Perl itself. + + =cut +DEVEL_GLOBALDESTRUCTION + +$fatpacked{"FileMerger.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'FILEMERGER'; + package FileMerger; + + use Moo; + use FileMerger::FS::FileOperator; + use FileMerger::FS::HardLinks; + + # Instance variables + + has 'src_dirs' => ( # arrayref + is => 'ro', + required => 1, + ); + + has 'target_dir' => ( # string + is => 'ro', + required => 1, + ); + + has 'excl_lit' => ( # arrayref + is => 'rw', + lazy => 1, + ); + + has 'excl_rx' => ( # arrayref + is => 'rw', + lazy => 1, + ); + + has 'ren_rx' => ( # hashref + is => 'rw', + lazy => 1, + ); + + has 'conflicts' => ( # arrayref + is => 'rwp', + default => sub { [] } + , # so we don't need to test for undef, only to elements + init => undef, + ); + + has 'skipped' => ( # arrayref + is => 'rwp', + default => sub { [] } + , # so we don't need to test for undef, only to elements + init => undef, + ); + + has '_hardlinks_obj' => ( + is => 'ro', + builder => '_build__hardlinks_obj', + lazy => 1, # we need the rest of $self first + ); + + + # Instance related + sub _build__hardlinks_obj { + my $self = shift; + my $hl = FileMerger::FS::HardLinks->new( src_dirs => $self->src_dirs ); + return $hl; + } + + # Methods + + sub merge_dirs { + my $self = shift; + my $fs = FileMerger::FS::FileOperator->new( + src_dirs => $self->src_dirs, + target_dir => $self->target_dir, + hardlinks_obj => $self->_hardlinks_obj, + ); + $fs->excl_lit( $self->excl_lit ) if (defined $self->excl_lit); + $fs->excl_rx( $self->excl_rx ) if (defined $self->excl_rx); + $fs->ren_rx( $self->ren_rx ) if (defined $self->ren_rx); + eval { $fs->walk_tree() }; + return $@ if $@; # Return inmedialtely when fs problems encountered + + # give unique errors + my %unique_conflicts = map { $_, 1 } @{ $fs->conflicts }; + my %unique_skipped = map { $_, 1 } @{ $fs->skipped }; + my @unique_conflicts = keys %unique_conflicts; + my @unique_skipped = keys %unique_skipped; + + $self->_set_conflicts( \@unique_conflicts ); + $self->_set_skipped( \@unique_skipped ); + return undef; + } + + sub merge_headers { + + # TODO: to be implemented + return; + } + + + 1; +FILEMERGER + +$fatpacked{"FileMerger/FS/FileOperator.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'FILEMERGER_FS_FILEOPERATOR'; + package FileMerger::FS::FileOperator; + + #use Data::Printer; ## DEBUG + + use Moo; + with 'FileMerger::FS::Transversable'; + + use File::Basename; + use File::Copy qw/cp/; + use File::Path qw(make_path); + use File::Compare; + use File::Spec; + use File::stat; + use POSIX qw(mkfifo); + + # Instance variables + has 'hardlinks_obj' => ( # is an FileMerger::FS::HardLinks obj + is => 'rw', + required => 1, + ); + + has 'target_dir' => ( # dir must exist, calling class must make sure + is => 'ro', + required => 1, + trigger => 1, # Create dir if not present + ); + + has 'conflicts' => ( + is => 'rwp', + default => sub { [] }, + lazy => 1, + ); + + has '_src_rx' => ( # is a quoted regex } + is => 'ro', + builder => '_build__src_rx', + lazy => 1, + ); + + has 'ren_rx' => ( # hashref: rx -> replacement + is => 'rw', + + # default => sub { {} }, + ); + + ### Methods + + # Instance related + + sub _build__src_rx { + my $self = shift; + my $src_str = ""; + my $id_count = scalar @{ $self->src_dirs } - 1; + for my $id ( 0 .. $id_count ) { + $src_str .= $self->src_dirs->[$id]; + $src_str .= '|' if ( $id < $id_count ); + } + return qr{$src_str}; + } + + sub _trigger_target_dir { + my ( $self, $target_dir ) = @_; + if ( !-d $target_dir ) { + print 'INFO: creating the supplied target directory ' + . $target_dir . ".\n"; + make_path($target_dir) or die($!); + } + } + + # Overrides + + sub _wanted() { + my $self = shift; + return if ( $_ eq '.' ); # skip top directory + return if $self->_to_skip($File::Find::name); + my $newpath = $self->_get_newpath($File::Find::name); + + # Let handle the different expected filetypes + if ( -d $File::Find::name ) { # directory + $self->_create_dir( $File::Find::name, $newpath ); + } + elsif ( -p $File::Find::name ) { # FIFO + $self->_create_fifo( $File::Find::name, $newpath ); + } + elsif ( -l $File::Find::name ) { # syslink + $self->_create_softlink( $File::Find::name, $newpath ); + } + else { + # We treat everything else as a file + # We need to check if it's a hardlink, we create the related hardlinks + if ( $self->_is_hardlink($File::Find::name) ) { + $self->_create_hardlink( $File::Find::name, $newpath ); + } + else { $self->_copy_file( $File::Find::name, $newpath ); } + } + } + + # Internal + + # plink.pl forces 0755 / 0644 modes + # Method left here in case this changes + # sub _check_perms { + # my ( $self, $lpath, $rpath ) = @_; + # my $st_l = stat($lpath) or die($!); + # my $st_r = stat($rpath) or die($!); + # my $perms_ok = 1; + # for my $method ( 'mode', 'uid', 'gid' ) { + # if ( $st_l->$method != $st_r->$method ) { # different permissions + # $perms_ok = 0; + # } + # } + # return $perms_ok; + # } + + sub _copy_file { + my ( $self, $lfile, $rfile ) = @_; + print "Copying " . $lfile . " to " . $rfile . ".\n"; + $self->_create_dir( dirname($rfile) ); + if ( !-e $rfile ) { + cp( $lfile, $rfile ) or die($!); + } + else { + if ( compare( $lfile, $rfile ) != 0 ) { + push @{ $self->conflicts }, "$lfile (conflicting content)"; + print STDERR "WARNING: $lfile conflicts with file at target.\n"; + } + else { + print "INFO: $lfile is already at target directory. Skipping.\n"; + } + } + } + + sub _create_dir { + my ( $self, $dir ) = @_; + + if ( -d $dir ) { + + # my $perms_ok = $self->_check_perms( $lpath, $rpath ); + # if ( !$perms_ok ) { + # push @{ $self->conflicts }, $lpath . ' (directory permissions)'; + # print STDERR + # "WARNING: directory $lpath has conflicting permissions.\n"; + # } + chmod( 0755, $dir ) or die($!); + return; + } + + my $error; + print "Creating directory $dir.\n"; + make_path( + $dir, + { + verbose => 0, + mode => 0755, + + #uid => $st_l->uid, + #group => $st_l->gid, + error => \$error + } + ); + if (@$error) { + die("Directory $dir can not be created: @$error"); + } + } + + sub _create_fifo { + my ( $self, $lfifo, $rfifo ) = @_; + $self->_create_dir( dirname($rfifo) ); + mkfifo( $rfifo, ( stat($lfifo) )[2] ) or die($!); + } + + sub _create_softlink { + my ( $self, $llink, $rlink ) = @_; + $self->_create_dir( dirname($rlink) ); + + # Find out where we should point to in new target directory + my $llink_source = readlink($llink); # get the link target + + # Sadly, syslinks are also relative: + #claudio at adelaide:~/Code/FileMerger/lib$ ls -la /var/tmp/src/f3softlink /var/tmp/src/d1lalasoft + #lrwxrwxrwx 1 claudio claudio 22 mei 20 13:35 /var/tmp/src/d1lalasoft -> /var/tmp/src/d1/dilala + #lrwxrwxrwx 1 claudio claudio 2 mei 20 13:28 /var/tmp/src/f3softlink -> f3 + + if ( !File::Spec->file_name_is_absolute($llink_source) ) { + $llink_source = File::Spec->rel2abs($llink_source); + } + my $rlink_source = + $self->_get_newpath($llink_source); # redirect to new path + + # Create the link + if ( !-e -f $rlink ) { + print "Creating symlink $rlink -> $rlink_source.\n"; + symlink( $rlink_source, $rlink ) + or die("Could create link $rlink -> $rlink_source ($!)"); + } + elsif ( -e $rlink && readlink($rlink) eq $rlink_source ) { + print "INFO: symlink $rlink -> $rlink_source already present.\n"; + } + else { + die("Could not link $rlink to $rlink_source: a file is already there"); + } + } + + sub _create_hardlink { + + # Inspiration from pcopy.pl, kudos to dam at opencsw.org + my ( $self, $llink, $rlink ) = @_; + $self->_create_dir( dirname($rlink) ); + + my @all_hardlinks = @{ $self->hardlinks_obj->related_hardlinks($llink) }; + if ( !-f $rlink ) { + + # Copy the first file + $self->_copy_file( $llink, $rlink ); + $self->hardlinks_obj->add_newlink($rlink); + + # Create related hardlinks + for my $hardlink (@all_hardlinks) { + next if ( $hardlink eq $llink ); # We created it above + + # Create the link + my $rlink_related = $self->_get_newpath($hardlink); + if ( !-e $rlink_related ) { + print "Creating hardlink $rlink <-> $rlink_related.\n"; + $self->_create_dir( dirname($rlink_related) ); + link( $rlink, $rlink_related ) + or + die("Could not create link $rlink <-> $rlink_related ($!)"); + $self->hardlinks_obj->add_newlink($rlink_related); + } + else { + my $st_l = stat($rlink); + my $st_r = stat($rlink_related); + if ( $st_l->ino == $st_r->ino ) { + print + "INFO: hardlink $rlink <-> $rlink_related already in place. Skipping.\n"; + } + else { + die( + "Could not link $rlink to $rlink_related: a file is already there" + ); + } + } + } + } + else { # newlink is already in place + if ( $self->hardlinks_obj->is_created($rlink) ) { + print "INFO: hardlink $rlink already in place. Skipping.\n"; + } + else { + die("Could not create hardlink $rlink: a file is already there"); + } + } + } + + sub _is_hardlink { + my ( $self, $file ) = @_; + my $related_hardlinks = $self->hardlinks_obj->related_hardlinks($file); + return scalar @{$related_hardlinks}; + } + + sub _get_newpath { + my ( $self, $path ) = @_; + my $newpath; + + # We check for renaming rx + if ( defined $self->ren_rx ) { + $newpath = $self->_get_newpath_rename($path); + } + + # If no rx or it doesn't match, we construct the new path src -> target + if ( !defined $newpath ) { + $newpath = $self->_get_newpath_copy($path); + } + return $newpath; + } + + sub _get_newpath_copy { + my ( $self, $path ) = @_; + my $target = $self->target_dir; + my $src_rx = $self->_src_rx; + my $newpath = $path; + if ( $newpath =~ s@^$src_rx(/.+)@$target$1@ ) { + return $newpath; + } + else { + die( + "Can not construct the name for the new target path (info:$path,$newpath)" + ); + } + } + + sub _get_newpath_rename { + my ( $self, $path ) = @_; + my $path_renamed; + for my $rx ( sort keys %{ $self->ren_rx } ) { + my $newpath = $path; + if ( $newpath =~ m@$rx@ ) { + my $repl = $self->ren_rx->{$rx}; ## TODO split $\d + $newpath =~ s@$rx@$repl@; + my %memories = ( #we only support 9 memory parentheses + '$1' => $1, + '$2' => $2, + '$3' => $3, + '$4' => $4, + '$5' => $5, + '$6' => $6, + '$7' => $7, + '$8' => $8, + '$9' => $9, + ); + for my $key (sort keys %memories) { + $newpath =~ s@\Q$key\E@$memories{$key}@ + if (defined $memories{$key}); + } + $newpath = File::Spec->canonpath($newpath); + my $target = $self->target_dir; + if ( $newpath !~ m@^$target/@ ) { + die( + "Renaming regex \'$rx,$repl\' will result in files outside $target: $newpath." + ); + } + + print "INFO: renaming $path to $newpath.\n"; + $path_renamed = $newpath; + last; + + } + } + return $path_renamed; # return undef if no rx matches + } + 1; +FILEMERGER_FS_FILEOPERATOR + +$fatpacked{"FileMerger/FS/HardLinks.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'FILEMERGER_FS_HARDLINKS'; + package FileMerger::FS::HardLinks; + + use Moo; + with('FileMerger::FS::Transversable'); + + use File::stat; + + # Instance variables + has '_hardlinks_by_file' => ( + is => 'ro', + default => sub { {} }, + ); + + has '_hardlinks_by_inode' => ( + is => 'ro', + default => sub { {} }, + ); + + has '_newlinks' => ( + is => 'ro', + default => sub { [] }, + ); + + has 'is_run' => ( + is => 'ro', + builder => '_init', + lazy => 1, + ); + + # Methods + + # Instance related + sub _init { + my $self = shift; + $self->walk_tree; + return 1; + } + + # Overrides + + sub _wanted() { + my $self = shift; + return if ( $_ eq '.' ); # skip top directory + return if $self->_to_skip($File::Find::name); + + # Let handle the different expected filetypes + if ( -f $File::Find::name && !-l ) { + my $st = stat($File::Find::name) or die($!); + + #print "$File::Find::name " . $st->ino . " \n"; + if ( $st->nlink > 1 ) { # only hardlinked files + push @{ $self->_hardlinks_by_inode->{ $st->ino } }, + $File::Find::name; + push @{ $self->_hardlinks_by_file->{$File::Find::name} }, $st->ino; + } + } + else { + return; # we only care about files + } + } + + # Methods + + sub add_newlink { + my ( $self, $newlink ) = @_; + push @{ $self->_newlinks }, $newlink; + } + + sub is_created { + my ( $self, $link ) = @_; + $self->is_run; # make sure we run walk_tree once + local $_; # File::Find conflict + return grep { $_ eq $link } @{ $self->_newlinks }; + } + + sub related_hardlinks { + my ( $self, $file ) = @_; + $self->is_run; # make sure we run walk_tree once + my @hardlinks; + my $st_l = stat($file) or die($!); + my $ino = $st_l->ino; + my $hardlinks_ref = $self->_hardlinks_by_inode->{$ino}; + my $inodes_ref = $self->_hardlinks_by_file->{$file}; + for my $inode ( @{ $self->_hardlinks_by_file->{$file} } ) { + push @hardlinks, @{ $self->_hardlinks_by_inode->{$inode} }; + } + return \@hardlinks; + } + + 1; +FILEMERGER_FS_HARDLINKS + +$fatpacked{"FileMerger/FS/HeadersUnifier.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'FILEMERGER_FS_HEADERSUNIFIER'; + package FileMerger::FS::HeadersUnifier; + + use Moo; + + + 1; + +FILEMERGER_FS_HEADERSUNIFIER + +$fatpacked{"FileMerger/FS/Transversable.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'FILEMERGER_FS_TRANSVERSABLE'; + package FileMerger::FS::Transversable; + # An OO wrapper for File::Find + + use Moo::Role; + + use File::Find; + no warnings 'File::Find'; + + #use Data::Printer; ## DEBUG + + # Instance variables + has 'src_dirs' => ( # dirs must exist, calling class must make sure + is => 'ro', # is arrayref + required => 1, + ); + + has 'excl_lit' => ( + is => 'rw', + # default => sub { [] }, + lazy => 1, + ); + + has 'excl_rx' => ( + is => 'rw', + # default => sub { [] }, + lazy => 1, + ); + + has 'skipped' => ( + is => 'rwp', + default => sub { [] }, + lazy => 1, + ); + + ### Methods + + sub walk_tree() { + my $self = shift; + + # Walk the src tree + # find( \&_wanted, $self->src_dir ); + find( sub { $self->_wanted(); }, @{ $self->src_dirs } ); # Let's play nice with OO + } + + sub _to_skip { + my ( $self, $path ) = @_; + my $skip = 0; + + # we need to localize File::Find's $_ to allow grep's use of it + local ($_); + if ( defined $self->excl_lit ) { # Calling class must clean trailing slashes + if ( grep { $path =~ m@^$_($|/)@ } @{ $self->excl_lit } ) { + $skip = 1; + } + } + + if ( defined $self->excl_rx ) { # Calling class must supply valid regex) + $skip = 1 if ( grep { $path =~ /$_/ } @{ $self->excl_rx } ); + } + push @{ $self->skipped }, $path if ($skip); + print "INFO: skipping $path as requested...\n" if ($skip); + return $skip; + } + + + sub _wanted() { + # A basic _wanted to be overwritten + my $self = shift; + return if ( $_ eq '.' ); # skip top directory + return if $self->_to_skip($File::Find::name); + print "You forgot to override _wanted()?\n"; + print $_ . "\n"; + } + + 1; +FILEMERGER_FS_TRANSVERSABLE + +$fatpacked{"FileMerger/Params.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'FILEMERGER_PARAMS'; + package FileMerger::Params; + our $VERSION = "0.1"; + use Moo; + + use Getopt::Long; + use File::Basename; + use File::Spec; + use Text::CSV; + + has 'args' => ( + + # source: arrayref + # target: string + # exclude-literal: arrayref + # exclude-regex: arrayref + # rename-regex: hashref + is => 'ro', + default => sub { {} }, + init_arg => undef, + ); + + has 'messages' => ( + is => 'ro', + default => sub { [] }, + lazy => 1, + init_arg => undef, + ); + + sub read_params { + my $self = shift; + GetOptions( $self->args, 'help|h|?', 'version|v', 'exclude-literal|l=s@', + 'exclude-rx|e=s@', 'rename-rx|r=s@', 'source|s=s@', 'target|t=s' ) + or die "\nInvalid switch. Please read the help page: " + . basename $0 + . " -?\n\n"; + + # Help and version status + if ( defined $self->args->{help} + or ( !@ARGV and !( grep { defined $_ } values %{ $self->args } ) ) ) + { + $self->_show_help(0); + exit 0; + } + if ( defined $self->args->{version} ) { + $self->args->_show_help(1); + exit 0; + } + + # Check parameters + + if ( !$self->_check_params() ) { + for my $msg ( @{ $self->messages } ) { + print STDERR $msg . "\n"; + } + print "Bailing out...\n"; + exit 1; + } + + return %{ $self->args }; + } + + sub _check_params { + my $self = shift; + my $status = 1; + + # Verify required parameters + $status = 0 unless ( $self->_check_req(qw/source target/) ); + + # Verify that the source exists and no doubles are present + $status = 0 unless ( $self->_check_src() ); + + # Verify that the target is a directory or does not exist + $status = 0 unless ( $self->_check_target() ); + + # Split the renaming regexes + my @regexes; # used to exclude after renaming + if ( defined $self->args->{'rename-rx'} ) { + # Use newstyle regexps + s,\\(\d),\$$1,g foreach(@{ $self->args->{'rename-rx'} }); + # Split the regex + my $ren_rx_ref = $self->_split_rx( $self->args->{'rename-rx'} ); + if ( defined $ren_rx_ref ) { + $self->args->{'rename-rx'} = $ren_rx_ref; # We want a % in args + @regexes = keys %{$ren_rx_ref}; + + } + else { $status = 0 } + } + + # Check for valid regexes + if ( defined $self->args->{'exclude-rx'} ) { + push @regexes, @{ $self->args->{'exclude-rx'} }; + } + + if (@regexes) { + my $rx_status = _validate_rx( \@regexes ); + if ( !$rx_status ) { + $status = 0; + } + } + + # Canonize the literal paths of exclude-literal + ## TODO and make sure they are absolute + if ( $self->args->{'exclude-literal'} ) { + for my $path ( @{ $self->args->{'exclude-literal'} } ) { + $path = $self->_canonize($path); + } + } + + return $status; + } + + sub _canonize { + my ( $self, $path ) = @_; + my $cpath = + File::Spec->canonpath($path); # Remove trailing slashes, portable + return $cpath; + } + + sub _check_req { + my ( $self, @required ) = @_; + my $ok = 1; + for my $param (@required) { + if ( !defined $self->args->{$param} ) { + push @{ $self->messages }, "Parameter $param is required."; + $ok = 0; + } + } + return $ok; + } + + sub _check_src { + my $self = shift; + my $ok = 1; + for my $src ( @{ $self->args->{source} } ) { + + if ( !-d $src ) { + push @{ $self->messages }, + "Source " . $src . " is not a valid directory."; + $ok = 0; + } + else { + $src = $self->_canonize($src); + + } + } + if ($ok) { + + # remove double entries + my %uniq_hash = map { $_, 1 } @{ $self->args->{'source'} }; + $self->args->{'source'} = [ sort keys %uniq_hash ] + ; # Sort to have reproducible search path order later + } + return $ok; + } + + sub _check_target { + my $self = shift; + my $ok = 1; + if ( -e $self->args->{target} && !-d $self->args->{target} ) { + push @{ $self->messages }, + "Target " . $self->args->{target} . " exists but is not a directory."; + $ok = 0; + } + elsif ( -d $self->args->{target} ) { + $self->args->{target} = $self->_canonize( $self->args->{target} ); + } + return $ok; + } + + sub _split_rx { + my ( $self, $rx_param_ref ) = @_; + my %rx = (); + my $split_ok = 1; + + for my $rx_param ( @{$rx_param_ref} ) { + my $csv = Text::CSV->new(); + if ( $csv->parse($rx_param) ) { + my @fields = $csv->fields(); + if ( scalar @fields == 2 ) { + if ( !exists $rx{ $fields[0] } ) { + $rx{ $fields[0] } = $fields[1]; + } + else { + push @{ $self->messages }, + "'$fields[0]' must be unique for a rename-regex."; + $split_ok = 0; + } + } + else { + push @{ $self->messages }, + "'$rx_param' can not be decomposed into a valid Perl regex and replacement."; + $split_ok = 0; + } + } + else { + push @{ $self->messages }, + "'$rx_param' can not be decomposed into a valid Perl regex and replacement."; + $split_ok = 0; + } + } + return ($split_ok) ? \%rx : undef; + } + + sub _validate_rx { + my ( $self, $rx_ref ) = @_; + my $status = 1; + for my $rx ( @{$rx_ref} ) { + my $eval_rx = eval { qr{$rx} }; + if ($@) { + $status = 0; + push @{ $self->messages }, "'$rx' is an invalid Perl regex."; + } + } + return $status; + } + + sub _show_help { + my ( $self, $version_bool ) = @_; + require File::Basename; + my $program = File::Basename::basename($0); + print "\nOpenCSW FileMerger, version $VERSION. Bugs to claudio\@opencsw.org.\n"; + return if $version_bool; + print <<"EOL"; + + usage:\t$program [-s ] [-t ] + \t\t [-l ] [-e ] [-r ] + + Available parameters: + + -h,--help\t\t\t\tdisplay a help message + -v,--version\t\t\t\tdisplay the version of the + \t\t\t\t\tprogram + -s,--source \tsource directory* + -t,--target \ttarget directory + + -l,--exclude-literal \texclude files by literal + \t\t\t\t\tfilename* + -e,--exclude-rx \t\tPerl regular expression to + \t\t\t\t\texclude files by name* + -r,--rename-rx \t\tRegex and replacement for + \t\t\t\t\trenaming files* + + *: multiple usage allowed. + All the excludeliterals and regexes work on the full path. + Slashes (/) don't need to be escaped. + + EOL + + } + + + 1; +FILEMERGER_PARAMS + +$fatpacked{"FileMerger/Reporter.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'FILEMERGER_REPORTER'; + package FileMerger::Reporter; + + use Moo; + + sub run { + my ( $self, $conflicts_ref, $skipped_ref ) = @_; + my $ok = 1; + print "\n\n". '_' x 34 . 'STATUS REPORT' . '_' x 33 . "\n"; + if ( @{$conflicts_ref} ) { + print "\nThe following conflicts were encountered:\n"; + print "$_\n" for ( sort @{$conflicts_ref} ); + $ok = 0; + } + if ( @{$skipped_ref} ) { + print "\nThe following files and directories were skipped:\n"; + print "$_\n" for ( sort @{$skipped_ref} ); + } + print "\nDirectories merged without warnings.\n\n" if $ok; + print "\nDone.\n\n"; + } + + 1; +FILEMERGER_REPORTER + +$fatpacked{"Import/Into.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'IMPORT_INTO'; + package Import::Into; + + use strict; + use warnings FATAL => 'all'; + + our $VERSION = '1.002002'; # 1.2.2 + + sub _prelude { + my $target = shift; + my ($package, $file, $line, $level) + = ref $target ? @{$target}{qw(package filename line)} + : $target =~ /[^0-9]/ ? ($target) + : (undef, undef, undef, $target); + if (defined $level) { + my ($p, $fn, $ln) = caller($level + 2); + $package ||= $p; + $file ||= $fn; + $line ||= $ln; + } + qq{package $package;\n} + . ($file ? "#line $line \"$file\"\n" : '') + } + + sub _make_action { + my ($action, $target) = @_; + my $version = ref $target && $target->{version}; + my $ver_check = $version ? '$_[0]->VERSION($version);' : ''; + eval _prelude($target).qq{sub { $ver_check shift->$action(\@_) }} + or die "Failed to build action sub to ${action} for ${target}: $@"; + } + + sub import::into { + my ($class, $target, @args) = @_; + _make_action(import => $target)->($class, @args); + } + + sub unimport::out_of { + my ($class, $target, @args) = @_; + _make_action(unimport => $target)->($class, @args); + } + + 1; + + __END__ + + =head1 NAME + + Import::Into - import packages into other packages + + =head1 SYNOPSIS + + package My::MultiExporter; + + use Import::Into; + + use Thing1 (); + use Thing2 (); + + # simple + sub import { + Thing1->import::into(scalar caller); + } + + # multiple + sub import { + my $target = caller; + Thing1->import::into($target); + Thing2->import::into($target, qw(import arguments)); + } + + # by level + sub import { + Thing1->import::into(1); + } + + # with exporter + use base qw(Exporter); + sub import { + shift->export_to_level(1); + Thing1->import::into(1); + } + + # no My::MultiExporter == no Thing1 + sub unimport { + Thing1->unimport::out_of(scalar caller); + } + + People wanting to re-export your module should also be using L. + Any exporter or pragma will work seamlessly. + + Note: You do B need to make any changes to Thing1 to be able to call + C on it. This is a global method, and is callable on any + package (and in fact on any object as well, although it's rarer that you'd + want to do that). + + =head1 DESCRIPTION + + Writing exporters is a pain. Some use L, some use L, + some use L, some use L ... and some things + are pragmas. + + Exporting on someone else's behalf is harder. The exporters don't provide a + consistent API for this, and pragmas need to have their import method called + directly, since they effect the current unit of compilation. + + C provides global methods to make this painless. + + =head1 METHODS + + =head2 $package->import::into( $target, @arguments ); + + A global method, callable on any package. Imports the given package into + C<$target>. C<@arguments> are passed along to the package's import method. + + C<$target> can be an package name to export to, an integer for the + caller level to export to, or a hashref with the following options: + + =over 4 + + =item package + + The target package to export to. + + =item filename + + The apparent filename to export to. Some exporting modules, such as + L or L, care about the filename they are being imported + to. + + =item line + + The apparent line number to export to. To be combined with the C + option. + + =item level + + The caller level to export to. This will automatically populate the + C, C, and C options, making it the easiest most + constent option. + + =item version + + A version number to check for the module. The equivalent of specifying the + version number on a C line. + + =back + + =head2 $package->unimport::out_of( $target, @arguments ); + + Equivalent to C, but dispatches to C<$package>'s C + method instead of C. + + =head1 WHY USE THIS MODULE + + The APIs for exporting modules aren't consistent. L subclasses + provide export_to_level, but if they overrode their import method all bets + are off. L provides an into parameter but figuring out + something used it isn't trivial. Pragmas need to have their C method + called directly since they affect the current unit of compilation. + + It's ... annoying. + + However, there is an approach that actually works for all of these types. + + eval "package $target; use $thing;" + + will work for anything checking caller, which is everything except pragmas. + But it doesn't work for pragmas - pragmas need: + + $thing->import; + + because they're designed to affect the code currently being compiled - so + within an eval, that's the scope of the eval itself, not the module that + just Cd you - so + + sub import { + eval "use strict;" + } + + doesn't do what you wanted, but + + sub import { + strict->import; + } + + will apply L to the calling file correctly. + + Of course, now you have two new problems - first, that you still need to + know if something's a pragma, and second that you can't use either of + these approaches alone on something like L or L that's both + an exporter and a pragma. + + So, a solution for that is: + + my $sub = eval "package $target; sub { shift->import(\@_) }"; + $sub->($thing, @import_args); + + which means that import is called from the right place for pragmas to take + effect, and from the right package for caller checking to work - and so + behaves correctly for all types of exporter, for pragmas, and for hybrids. + + Additionally, some import routines check the filename they are being imported + to. This can be dealt with by generating a L<#line directive|perlsyn/Plain + Old Comments (Not!)> in the eval, which will change what C reports for + the filename when called in the importer. The filename and line number to use + in the directive then need to be fetched using C: + + my ($target, $file, $line) = caller(1); + my $sub = eval qq{ + package $target; + #line $line "$file" + sub { shift->import(\@_) } + }; + $sub->($thing, @import_args); + + And you need to switch between these implementations depending on if you are + targeting a specific package, or something in your call stack. + + Remembering all this, however, is excessively irritating. So I wrote a module + so I didn't have to anymore. Loading L creates a global method + C which you can call on any package to import it into another + package. So now you can simply write: + + use Import::Into; + + $thing->import::into($target, @import_args); + + This works because of how perl resolves method calls - a call to a simple + method name is resolved against the package of the class or object, so + + $thing->method_name(@args); + + is roughly equivalent to: + + my $code_ref = $thing->can('method_name'); + $code_ref->($thing, @args); + + while if a C<::> is found, the lookup is made relative to the package name + (i.e. everything before the last C<::>) so + + $thing->Package::Name::method_name(@args); + + is roughly equivalent to: + + my $code_ref = Package::Name->can('method_name'); + $code_ref->($thing, @args); + + So since L defines a method C in package C + the syntax reliably calls that. + + For more craziness of this order, have a look at the article I wrote at + L which covers + coderef abuse and the C<${\...}> syntax. + + Final note: You do still need to ensure that you already loaded C<$thing> - if + you're receiving this from a parameter, I recommend using L: + + use Import::Into; + use Module::Runtime qw(use_module); + + use_module($thing)->import::into($target, @import_args); + + And that's it. + + =head1 SEE ALSO + + I gave a lightning talk on this module (and L and L) at + L. + + =head1 ACKNOWLEDGEMENTS + + Thanks to Getty for asking "how can I get C<< use strict; use warnings; >> + turned on for all consumers of my code?" and then "why is this not a + module?!". + + =head1 AUTHOR + + mst - Matt S. Trout (cpan:MSTROUT) + + =head1 CONTRIBUTORS + + haarg - Graham Knop (cpan:HAARG) + + =head1 COPYRIGHT + + Copyright (c) 2012 the Import::Into L and L + as listed above. + + =head1 LICENSE + + This library is free software and may be distributed under the same terms + as perl itself. + + =cut +IMPORT_INTO + +$fatpacked{"Method/Generate/Accessor.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'METHOD_GENERATE_ACCESSOR'; + package Method::Generate::Accessor; + + use strictures 1; + use Moo::_Utils; + use base qw(Moo::Object); + use Sub::Quote; + use B 'perlstring'; + use Scalar::Util 'blessed'; + use overload (); + use Module::Runtime qw(use_module); + BEGIN { + our $CAN_HAZ_XS = + !$ENV{MOO_XS_DISABLE} + && + _maybe_load_module('Class::XSAccessor') + && + (eval { Class::XSAccessor->VERSION('1.07') }) + ; + our $CAN_HAZ_XS_PRED = + $CAN_HAZ_XS && + (eval { Class::XSAccessor->VERSION('1.17') }) + ; + } + + sub _SIGDIE + { + our ($CurrentAttribute, $OrigSigDie); + my $sigdie = $OrigSigDie && $OrigSigDie != \&_SIGDIE + ? $OrigSigDie + : sub { die $_[0] }; + + return $sigdie->(@_) if ref($_[0]); + + my $attr_desc = _attr_desc(@$CurrentAttribute{qw(name init_arg)}); + $sigdie->("$CurrentAttribute->{step} for $attr_desc failed: $_[0]"); + } + + sub _die_overwrite + { + my ($pkg, $method, $type) = @_; + die "You cannot overwrite a locally defined method ($method) with @{[ $type || 'an accessor' ]}"; + } + + sub generate_method { + my ($self, $into, $name, $spec, $quote_opts) = @_; + $spec->{allow_overwrite}++ if $name =~ s/^\+//; + die "Must have an is" unless my $is = $spec->{is}; + if ($is eq 'ro') { + $spec->{reader} = $name unless exists $spec->{reader}; + } elsif ($is eq 'rw') { + $spec->{accessor} = $name unless exists $spec->{accessor} + or ( $spec->{reader} and $spec->{writer} ); + } elsif ($is eq 'lazy') { + $spec->{reader} = $name unless exists $spec->{reader}; + $spec->{lazy} = 1; + $spec->{builder} ||= '_build_'.$name unless $spec->{default}; + } elsif ($is eq 'rwp') { + $spec->{reader} = $name unless exists $spec->{reader}; + $spec->{writer} = "_set_${name}" unless exists $spec->{writer}; + } elsif ($is ne 'bare') { + die "Unknown is ${is}"; + } + if (exists $spec->{builder}) { + if(ref $spec->{builder}) { + $self->_validate_codulatable('builder', $spec->{builder}, + "$into->$name", 'or a method name'); + $spec->{builder_sub} = $spec->{builder}; + $spec->{builder} = 1; + } + $spec->{builder} = '_build_'.$name if ($spec->{builder}||0) eq 1; + die "Invalid builder for $into->$name - not a valid method name" + if $spec->{builder} !~ /\A[A-Za-z_][A-Za-z0-9_]*(?:::[A-Za-z_][A-Za-z0-9_]*)*\z/; + } + if (($spec->{predicate}||0) eq 1) { + $spec->{predicate} = $name =~ /^_/ ? "_has${name}" : "has_${name}"; + } + if (($spec->{clearer}||0) eq 1) { + $spec->{clearer} = $name =~ /^_/ ? "_clear${name}" : "clear_${name}"; + } + if (($spec->{trigger}||0) eq 1) { + $spec->{trigger} = quote_sub('shift->_trigger_'.$name.'(@_)'); + } + + for my $setting (qw( isa coerce )) { + next if !exists $spec->{$setting}; + $self->_validate_codulatable($setting, $spec->{$setting}, "$into->$name"); + } + + if (exists $spec->{default}) { + if (!defined $spec->{default} || ref $spec->{default}) { + $self->_validate_codulatable('default', $spec->{default}, "$into->$name", 'or a non-ref'); + } + } + + if (exists $spec->{moosify}) { + if (ref $spec->{moosify} ne 'ARRAY') { + $spec->{moosify} = [$spec->{moosify}]; + } + + for my $spec (@{$spec->{moosify}}) { + $self->_validate_codulatable('moosify', $spec, "$into->$name"); + } + } + + my %methods; + if (my $reader = $spec->{reader}) { + _die_overwrite($into, $reader, 'a reader') + if !$spec->{allow_overwrite} && *{_getglob("${into}::${reader}")}{CODE}; + if (our $CAN_HAZ_XS && $self->is_simple_get($name, $spec)) { + $methods{$reader} = $self->_generate_xs( + getters => $into, $reader, $name, $spec + ); + } else { + $self->{captures} = {}; + $methods{$reader} = + quote_sub "${into}::${reader}" + => ' die "'.$reader.' is a read-only accessor" if @_ > 1;'."\n" + .$self->_generate_get($name, $spec) + => delete $self->{captures} + ; + } + } + if (my $accessor = $spec->{accessor}) { + _die_overwrite($into, $accessor, 'an accessor') + if !$spec->{allow_overwrite} && *{_getglob("${into}::${accessor}")}{CODE}; + if ( + our $CAN_HAZ_XS + && $self->is_simple_get($name, $spec) + && $self->is_simple_set($name, $spec) + ) { + $methods{$accessor} = $self->_generate_xs( + accessors => $into, $accessor, $name, $spec + ); + } else { + $self->{captures} = {}; + $methods{$accessor} = + quote_sub "${into}::${accessor}" + => $self->_generate_getset($name, $spec) + => delete $self->{captures} + ; + } + } + if (my $writer = $spec->{writer}) { + _die_overwrite($into, $writer, 'a writer') + if !$spec->{allow_overwrite} && *{_getglob("${into}::${writer}")}{CODE}; + if ( + our $CAN_HAZ_XS + && $self->is_simple_set($name, $spec) + ) { + $methods{$writer} = $self->_generate_xs( + setters => $into, $writer, $name, $spec + ); + } else { + $self->{captures} = {}; + $methods{$writer} = + quote_sub "${into}::${writer}" + => $self->_generate_set($name, $spec) + => delete $self->{captures} + ; + } + } + if (my $pred = $spec->{predicate}) { + _die_overwrite($into, $pred, 'a predicate') + if !$spec->{allow_overwrite} && *{_getglob("${into}::${pred}")}{CODE}; + if (our $CAN_HAZ_XS && our $CAN_HAZ_XS_PRED) { + $methods{$pred} = $self->_generate_xs( + exists_predicates => $into, $pred, $name, $spec + ); + } else { + $methods{$pred} = + quote_sub "${into}::${pred}" => + ' '.$self->_generate_simple_has('$_[0]', $name, $spec)."\n" + ; + } + } + if (my $pred = $spec->{builder_sub}) { + _install_coderef( "${into}::$spec->{builder}" => $spec->{builder_sub} ); + } + if (my $cl = $spec->{clearer}) { + _die_overwrite($into, $cl, 'a clearer') + if !$spec->{allow_overwrite} && *{_getglob("${into}::${cl}")}{CODE}; + $methods{$cl} = + quote_sub "${into}::${cl}" => + $self->_generate_simple_clear('$_[0]', $name, $spec)."\n" + ; + } + if (my $hspec = $spec->{handles}) { + my $asserter = $spec->{asserter} ||= '_assert_'.$name; + my @specs = do { + if (ref($hspec) eq 'ARRAY') { + map [ $_ => $_ ], @$hspec; + } elsif (ref($hspec) eq 'HASH') { + map [ $_ => ref($hspec->{$_}) ? @{$hspec->{$_}} : $hspec->{$_} ], + keys %$hspec; + } elsif (!ref($hspec)) { + map [ $_ => $_ ], use_module('Moo::Role')->methods_provided_by(use_module($hspec)) + } else { + die "You gave me a handles of ${hspec} and I have no idea why"; + } + }; + foreach my $delegation_spec (@specs) { + my ($proxy, $target, @args) = @$delegation_spec; + _die_overwrite($into, $proxy, 'a delegation') + if !$spec->{allow_overwrite} && *{_getglob("${into}::${proxy}")}{CODE}; + $self->{captures} = {}; + $methods{$proxy} = + quote_sub "${into}::${proxy}" => + $self->_generate_delegation($asserter, $target, \@args), + delete $self->{captures} + ; + } + } + if (my $asserter = $spec->{asserter}) { + $self->{captures} = {}; + + + $methods{$asserter} = + quote_sub "${into}::${asserter}" => $self->_generate_asserter($name, $spec), + delete $self->{captures} + ; + } + \%methods; + } + + sub is_simple_attribute { + my ($self, $name, $spec) = @_; + # clearer doesn't have to be listed because it doesn't + # affect whether defined/exists makes a difference + !grep $spec->{$_}, + qw(lazy default builder coerce isa trigger predicate weak_ref); + } + + sub is_simple_get { + my ($self, $name, $spec) = @_; + !($spec->{lazy} and ($spec->{default} or $spec->{builder})); + } + + sub is_simple_set { + my ($self, $name, $spec) = @_; + !grep $spec->{$_}, qw(coerce isa trigger weak_ref); + } + + sub has_eager_default { + my ($self, $name, $spec) = @_; + (!$spec->{lazy} and (exists $spec->{default} or $spec->{builder})); + } + + sub _generate_get { + my ($self, $name, $spec) = @_; + my $simple = $self->_generate_simple_get('$_[0]', $name, $spec); + if ($self->is_simple_get($name, $spec)) { + $simple; + } else { + $self->_generate_use_default( + '$_[0]', $name, $spec, + $self->_generate_simple_has('$_[0]', $name, $spec), + ); + } + } + + sub generate_simple_has { + my $self = shift; + $self->{captures} = {}; + my $code = $self->_generate_simple_has(@_); + ($code, delete $self->{captures}); + } + + sub _generate_simple_has { + my ($self, $me, $name) = @_; + "exists ${me}->{${\perlstring $name}}"; + } + + sub _generate_simple_clear { + my ($self, $me, $name) = @_; + " delete ${me}->{${\perlstring $name}}\n" + } + + sub generate_get_default { + my $self = shift; + $self->{captures} = {}; + my $code = $self->_generate_get_default(@_); + ($code, delete $self->{captures}); + } + + sub generate_use_default { + my $self = shift; + $self->{captures} = {}; + my $code = $self->_generate_use_default(@_); + ($code, delete $self->{captures}); + } + + sub _generate_use_default { + my ($self, $me, $name, $spec, $test) = @_; + my $get_value = $self->_generate_get_default($me, $name, $spec); + if ($spec->{coerce}) { + $get_value = $self->_generate_coerce( + $name, $get_value, + $spec->{coerce} + ) + } + $test." ? \n" + .$self->_generate_simple_get($me, $name, $spec)."\n:" + .($spec->{isa} + ? " do {\n my \$value = ".$get_value.";\n" + ." ".$self->_generate_isa_check($name, '$value', $spec->{isa}).";\n" + ." ".$self->_generate_simple_set($me, $name, $spec, '$value')."\n" + ." }\n" + : ' ('.$self->_generate_simple_set($me, $name, $spec, $get_value).")\n"); + } + + sub _generate_get_default { + my ($self, $me, $name, $spec) = @_; + if (exists $spec->{default}) { + ref $spec->{default} + ? $self->_generate_call_code($name, 'default', $me, $spec->{default}) + : perlstring $spec->{default}; + } + else { + "${me}->${\$spec->{builder}}" + } + } + + sub generate_simple_get { + my ($self, @args) = @_; + $self->_generate_simple_get(@args); + } + + sub _generate_simple_get { + my ($self, $me, $name) = @_; + my $name_str = perlstring $name; + "${me}->{${name_str}}"; + } + + sub _generate_set { + my ($self, $name, $spec) = @_; + if ($self->is_simple_set($name, $spec)) { + $self->_generate_simple_set('$_[0]', $name, $spec, '$_[1]'); + } else { + my ($coerce, $trigger, $isa_check) = @{$spec}{qw(coerce trigger isa)}; + my $value_store = '$_[0]'; + my $code; + if ($coerce) { + $value_store = '$value'; + $code = "do { my (\$self, \$value) = \@_;\n" + ." \$value = " + .$self->_generate_coerce($name, $value_store, $coerce).";\n"; + } + else { + $code = "do { my \$self = shift;\n"; + } + if ($isa_check) { + $code .= + " ".$self->_generate_isa_check($name, $value_store, $isa_check).";\n"; + } + my $simple = $self->_generate_simple_set('$self', $name, $spec, $value_store); + if ($trigger) { + my $fire = $self->_generate_trigger($name, '$self', $value_store, $trigger); + $code .= + " ".$simple.";\n ".$fire.";\n" + ." $value_store;\n"; + } else { + $code .= " ".$simple.";\n"; + } + $code .= " }"; + $code; + } + } + + sub generate_coerce { + my $self = shift; + $self->{captures} = {}; + my $code = $self->_generate_coerce(@_); + ($code, delete $self->{captures}); + } + + sub _attr_desc { + my ($name, $init_arg) = @_; + return perlstring($name) if !defined($init_arg) or $init_arg eq $name; + return perlstring($name).' (constructor argument: '.perlstring($init_arg).')'; + } + + sub _generate_coerce { + my ($self, $name, $value, $coerce, $init_arg) = @_; + $self->_generate_die_prefix( + $name, + "coercion", + $init_arg, + $self->_generate_call_code($name, 'coerce', "${value}", $coerce) + ); + } + + sub generate_trigger { + my $self = shift; + $self->{captures} = {}; + my $code = $self->_generate_trigger(@_); + ($code, delete $self->{captures}); + } + + sub _generate_trigger { + my ($self, $name, $obj, $value, $trigger) = @_; + $self->_generate_call_code($name, 'trigger', "${obj}, ${value}", $trigger); + } + + sub generate_isa_check { + my ($self, @args) = @_; + $self->{captures} = {}; + my $code = $self->_generate_isa_check(@args); + ($code, delete $self->{captures}); + } + + sub _generate_die_prefix { + my ($self, $name, $prefix, $arg, $inside) = @_; + "do {\n" + .' local $Method::Generate::Accessor::CurrentAttribute = {' + .' init_arg => '.(defined $arg ? B::perlstring($arg) : 'undef') . ",\n" + .' name => '.B::perlstring($name).",\n" + .' step => '.B::perlstring($prefix).",\n" + ." };\n" + .' local $Method::Generate::Accessor::OrigSigDie = $SIG{__DIE__};'."\n" + .' local $SIG{__DIE__} = \&Method::Generate::Accessor::_SIGDIE;'."\n" + .$inside + ."}\n" + } + + sub _generate_isa_check { + my ($self, $name, $value, $check, $init_arg) = @_; + $self->_generate_die_prefix( + $name, + "isa check", + $init_arg, + $self->_generate_call_code($name, 'isa_check', $value, $check) + ); + } + + sub _generate_call_code { + my ($self, $name, $type, $values, $sub) = @_; + $sub = \&{$sub} if blessed($sub); # coderef if blessed + if (my $quoted = quoted_from_sub($sub)) { + my $local = 1; + if ($values eq '@_' || $values eq '$_[0]') { + $local = 0; + $values = '@_'; + } + my $code = $quoted->[1]; + if (my $captures = $quoted->[2]) { + my $cap_name = qq{\$${type}_captures_for_}.$self->_sanitize_name($name); + $self->{captures}->{$cap_name} = \$captures; + Sub::Quote::inlinify( + $code, $values, Sub::Quote::capture_unroll($cap_name, $captures, 6), $local + ); + } else { + Sub::Quote::inlinify($code, $values, undef, $local); + } + } else { + my $cap_name = qq{\$${type}_for_}.$self->_sanitize_name($name); + $self->{captures}->{$cap_name} = \$sub; + "${cap_name}->(${values})"; + } + } + + sub _sanitize_name { + my ($self, $name) = @_; + $name =~ s/([_\W])/sprintf('_%x', ord($1))/ge; + $name; + } + + sub generate_populate_set { + my $self = shift; + $self->{captures} = {}; + my $code = $self->_generate_populate_set(@_); + ($code, delete $self->{captures}); + } + + sub _generate_populate_set { + my ($self, $me, $name, $spec, $source, $test, $init_arg) = @_; + if ($self->has_eager_default($name, $spec)) { + my $get_indent = ' ' x ($spec->{isa} ? 6 : 4); + my $get_default = $self->_generate_get_default( + '$new', $name, $spec + ); + my $get_value = + defined($spec->{init_arg}) + ? "(\n${get_indent} ${test}\n${get_indent} ? ${source}\n${get_indent} : " + .$get_default + ."\n${get_indent})" + : $get_default; + if ($spec->{coerce}) { + $get_value = $self->_generate_coerce( + $name, $get_value, + $spec->{coerce}, $init_arg + ) + } + ($spec->{isa} + ? " {\n my \$value = ".$get_value.";\n " + .$self->_generate_isa_check( + $name, '$value', $spec->{isa}, $init_arg + ).";\n" + .' '.$self->_generate_simple_set($me, $name, $spec, '$value').";\n" + ." }\n" + : ' '.$self->_generate_simple_set($me, $name, $spec, $get_value).";\n" + ) + .($spec->{trigger} + ? ' ' + .$self->_generate_trigger( + $name, $me, $self->_generate_simple_get($me, $name, $spec), + $spec->{trigger} + )." if ${test};\n" + : '' + ); + } else { + " if (${test}) {\n" + .($spec->{coerce} + ? " $source = " + .$self->_generate_coerce( + $name, $source, + $spec->{coerce}, $init_arg + ).";\n" + : "" + ) + .($spec->{isa} + ? " " + .$self->_generate_isa_check( + $name, $source, $spec->{isa}, $init_arg + ).";\n" + : "" + ) + ." ".$self->_generate_simple_set($me, $name, $spec, $source).";\n" + .($spec->{trigger} + ? " " + .$self->_generate_trigger( + $name, $me, $self->_generate_simple_get($me, $name, $spec), + $spec->{trigger} + ).";\n" + : "" + ) + ." }\n"; + } + } + + sub _generate_core_set { + my ($self, $me, $name, $spec, $value) = @_; + my $name_str = perlstring $name; + "${me}->{${name_str}} = ${value}"; + } + + sub _generate_simple_set { + my ($self, $me, $name, $spec, $value) = @_; + my $name_str = perlstring $name; + my $simple = $self->_generate_core_set($me, $name, $spec, $value); + + if ($spec->{weak_ref}) { + require Scalar::Util; + my $get = $self->_generate_simple_get($me, $name, $spec); + + # Perl < 5.8.3 can't weaken refs to readonly vars + # (e.g. string constants). This *can* be solved by: + # + #Internals::SetReadWrite($foo); + #Scalar::Util::weaken ($foo); + #Internals::SetReadOnly($foo); + # + # but requires XS and is just too damn crazy + # so simply throw a better exception + my $weak_simple = "do { Scalar::Util::weaken(${simple}); no warnings 'void'; $get }"; + Moo::_Utils::lt_5_8_3() ? <<"EOC" : $weak_simple; + eval { Scalar::Util::weaken($simple); 1 } + ? do { no warnings 'void'; $get } + : do { + if( \$@ =~ /Modification of a read-only value attempted/) { + require Carp; + Carp::croak( sprintf ( + 'Reference to readonly value in "%s" can not be weakened on Perl < 5.8.3', + $name_str, + ) ); + } else { + die \$@; + } + } + EOC + } else { + $simple; + } + } + + sub _generate_getset { + my ($self, $name, $spec) = @_; + q{(@_ > 1}."\n ? ".$self->_generate_set($name, $spec) + ."\n : ".$self->_generate_get($name, $spec)."\n )"; + } + + sub _generate_asserter { + my ($self, $name, $spec) = @_; + + "do {\n" + ." my \$val = ".$self->_generate_get($name, $spec).";\n" + ." unless (".$self->_generate_simple_has('$_[0]', $name, $spec).") {\n" + .qq! die "Attempted to access '${name}' but it is not set";\n! + ." }\n" + ." \$val;\n" + ."}\n"; + } + sub _generate_delegation { + my ($self, $asserter, $target, $args) = @_; + my $arg_string = do { + if (@$args) { + # I could, I reckon, linearise out non-refs here using perlstring + # plus something to check for numbers but I'm unsure if it's worth it + $self->{captures}{'@curries'} = $args; + '@curries, @_'; + } else { + '@_'; + } + }; + "shift->${asserter}->${target}(${arg_string});"; + } + + sub _generate_xs { + my ($self, $type, $into, $name, $slot) = @_; + Class::XSAccessor->import( + class => $into, + $type => { $name => $slot }, + replace => 1, + ); + $into->can($name); + } + + sub default_construction_string { '{}' } + + sub _validate_codulatable { + my ($self, $setting, $value, $into, $appended) = @_; + my $invalid = "Invalid $setting '" . overload::StrVal($value) + . "' for $into not a coderef"; + $invalid .= " $appended" if $appended; + + unless (ref $value and (ref $value eq 'CODE' or blessed($value))) { + die "$invalid or code-convertible object"; + } + + unless (eval { \&$value }) { + die "$invalid and could not be converted to a coderef: $@"; + } + + 1; + } + + 1; +METHOD_GENERATE_ACCESSOR + +$fatpacked{"Method/Generate/BuildAll.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'METHOD_GENERATE_BUILDALL'; + package Method::Generate::BuildAll; + + use strictures 1; + use base qw(Moo::Object); + use Sub::Quote; + use Moo::_Utils; + use B 'perlstring'; + + sub generate_method { + my ($self, $into) = @_; + quote_sub "${into}::BUILDALL", join '', + $self->_handle_subbuild($into), + qq{ my \$self = shift;\n}, + $self->buildall_body_for($into, '$self', '@_'), + qq{ return \$self\n}; + } + + sub _handle_subbuild { + my ($self, $into) = @_; + ' if (ref($_[0]) ne '.perlstring($into).') {'."\n". + ' return shift->Moo::Object::BUILDALL(@_)'.";\n". + ' }'."\n"; + } + + sub buildall_body_for { + my ($self, $into, $me, $args) = @_; + my @builds = + grep *{_getglob($_)}{CODE}, + map "${_}::BUILD", + reverse @{Moo::_Utils::_get_linear_isa($into)}; + join '', map qq{ ${me}->${_}(${args});\n}, @builds; + } + + 1; +METHOD_GENERATE_BUILDALL + +$fatpacked{"Method/Generate/Constructor.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'METHOD_GENERATE_CONSTRUCTOR'; + package Method::Generate::Constructor; + + use strictures 1; + use Sub::Quote; + use base qw(Moo::Object); + use Sub::Defer; + use B 'perlstring'; + use Moo::_Utils qw(_getstash); + + sub register_attribute_specs { + my ($self, @new_specs) = @_; + my $specs = $self->{attribute_specs}||={}; + while (my ($name, $new_spec) = splice @new_specs, 0, 2) { + if ($name =~ s/^\+//) { + die "has '+${name}' given but no ${name} attribute already exists" + unless my $old_spec = $specs->{$name}; + foreach my $key (keys %$old_spec) { + if (!exists $new_spec->{$key}) { + $new_spec->{$key} = $old_spec->{$key} + unless $key eq 'handles'; + } + elsif ($key eq 'moosify') { + $new_spec->{$key} = [ + map { ref $_ eq 'ARRAY' ? @$_ : $_ } + ($old_spec->{$key}, $new_spec->{$key}) + ]; + } + } + } + if (exists $new_spec->{init_arg} && !defined $new_spec->{init_arg} + && $new_spec->{required}) { + die "${name} attribute can't be required with init_arg => undef"; + } + $new_spec->{index} = scalar keys %$specs + unless defined $new_spec->{index}; + $specs->{$name} = $new_spec; + } + $self; + } + + sub all_attribute_specs { + $_[0]->{attribute_specs} + } + + sub accessor_generator { + $_[0]->{accessor_generator} + } + + sub construction_string { + my ($self) = @_; + $self->{construction_string} + ||= $self->_build_construction_string; + } + + sub buildall_generator { + require Method::Generate::BuildAll; + Method::Generate::BuildAll->new; + } + + sub _build_construction_string { + my ($self) = @_; + my $builder = $self->{construction_builder}; + $builder ? $self->$builder + : 'bless(' + .$self->accessor_generator->default_construction_string + .', $class);' + } + + sub install_delayed { + my ($self) = @_; + my $package = $self->{package}; + defer_sub "${package}::new" => sub { + unquote_sub $self->generate_method( + $package, 'new', $self->{attribute_specs}, { no_install => 1 } + ) + }; + $self; + } + + sub generate_method { + my ($self, $into, $name, $spec, $quote_opts) = @_; + foreach my $no_init (grep !exists($spec->{$_}{init_arg}), keys %$spec) { + $spec->{$no_init}{init_arg} = $no_init; + } + local $self->{captures} = {}; + my $body = ' my $class = shift;'."\n" + .' $class = ref($class) if ref($class);'."\n"; + $body .= $self->_handle_subconstructor($into, $name); + my $into_buildargs = $into->can('BUILDARGS'); + if ( $into_buildargs && $into_buildargs != \&Moo::Object::BUILDARGS ) { + $body .= $self->_generate_args_via_buildargs; + } else { + $body .= $self->_generate_args; + } + $body .= $self->_check_required($spec); + $body .= ' my $new = '.$self->construction_string.";\n"; + $body .= $self->_assign_new($spec); + if ($into->can('BUILD')) { + $body .= $self->buildall_generator->buildall_body_for( + $into, '$new', '$args' + ); + } + $body .= ' return $new;'."\n"; + if ($into->can('DEMOLISH')) { + require Method::Generate::DemolishAll; + Method::Generate::DemolishAll->new->generate_method($into); + } + quote_sub + "${into}::${name}" => $body, + $self->{captures}, $quote_opts||{} + ; + } + + sub _handle_subconstructor { + my ($self, $into, $name) = @_; + if (my $gen = $self->{subconstructor_handler}) { + ' if ($class ne '.perlstring($into).') {'."\n". + $gen. + ' }'."\n"; + } else { + '' + } + } + + sub _cap_call { + my ($self, $code, $captures) = @_; + @{$self->{captures}}{keys %$captures} = values %$captures if $captures; + $code; + } + + sub _generate_args_via_buildargs { + my ($self) = @_; + q{ my $args = $class->BUILDARGS(@_);}."\n" + .q{ die "BUILDARGS did not return a hashref" unless ref($args) eq 'HASH';} + ."\n"; + } + + # inlined from Moo::Object - update that first. + sub _generate_args { + my ($self) = @_; + return <<'_EOA'; + my $args; + if ( scalar @_ == 1 ) { + unless ( defined $_[0] && ref $_[0] eq 'HASH' ) { + die "Single parameters to new() must be a HASH ref" + ." data => ". $_[0] ."\n"; + } + $args = { %{ $_[0] } }; + } + elsif ( @_ % 2 ) { + die "The new() method for $class expects a hash reference or a key/value list." + . " You passed an odd number of arguments\n"; + } + else { + $args = {@_}; + } + _EOA + + } + + sub _assign_new { + my ($self, $spec) = @_; + my $ag = $self->accessor_generator; + my %test; + NAME: foreach my $name (sort keys %$spec) { + my $attr_spec = $spec->{$name}; + next NAME unless defined($attr_spec->{init_arg}) + or $ag->has_eager_default($name, $attr_spec); + $test{$name} = $attr_spec->{init_arg}; + } + join '', map { + my $arg_key = perlstring($test{$_}); + my $test = "exists \$args->{$arg_key}"; + my $source = "\$args->{$arg_key}"; + my $attr_spec = $spec->{$_}; + $self->_cap_call($ag->generate_populate_set( + '$new', $_, $attr_spec, $source, $test, $test{$_}, + )); + } sort keys %test; + } + + sub _check_required { + my ($self, $spec) = @_; + my @required_init = + map $spec->{$_}{init_arg}, + grep { + my %s = %{$spec->{$_}}; # ignore required if default or builder set + $s{required} and not($s{builder} or $s{default}) + } sort keys %$spec; + return '' unless @required_init; + ' if (my @missing = grep !exists $args->{$_}, qw(' + .join(' ', at required_init).')) {'."\n" + .q{ die "Missing required arguments: ".join(', ', sort @missing);}."\n" + ." }\n"; + } + + use Moo; + Moo->_constructor_maker_for(__PACKAGE__)->register_attribute_specs( + attribute_specs => { + is => 'ro', + reader => 'all_attribute_specs', + }, + accessor_generator => { is => 'ro' }, + construction_string => { is => 'lazy' }, + construction_builder => { is => 'lazy' }, + subconstructor_handler => { is => 'ro' }, + package => { is => 'ro' }, + ); + + 1; +METHOD_GENERATE_CONSTRUCTOR + +$fatpacked{"Method/Generate/DemolishAll.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'METHOD_GENERATE_DEMOLISHALL'; + package Method::Generate::DemolishAll; + + use strictures 1; + use base qw(Moo::Object); + use Sub::Quote; + use Moo::_Utils; + use B qw(perlstring); + + sub generate_method { + my ($self, $into) = @_; + quote_sub "${into}::DEMOLISHALL", join '', + $self->_handle_subdemolish($into), + qq{ my \$self = shift;\n}, + $self->demolishall_body_for($into, '$self', '@_'), + qq{ return \$self\n}; + quote_sub "${into}::DESTROY", join '', + q! my $self = shift; + my $e = do { + local $?; + local $@; + require Moo::_Utils; + eval { + $self->DEMOLISHALL(Moo::_Utils::_in_global_destruction); + }; + $@; + }; + + no warnings 'misc'; + die $e if $e; # rethrow + !; + } + + sub demolishall_body_for { + my ($self, $into, $me, $args) = @_; + my @demolishers = + grep *{_getglob($_)}{CODE}, + map "${_}::DEMOLISH", + @{Moo::_Utils::_get_linear_isa($into)}; + join '', map qq{ ${me}->${_}(${args});\n}, @demolishers; + } + + sub _handle_subdemolish { + my ($self, $into) = @_; + ' if (ref($_[0]) ne '.perlstring($into).') {'."\n". + ' return shift->Moo::Object::DEMOLISHALL(@_)'.";\n". + ' }'."\n"; + } + + 1; +METHOD_GENERATE_DEMOLISHALL + +$fatpacked{"Method/Inliner.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'METHOD_INLINER'; + package Method::Inliner; + + use strictures 1; + use Text::Balanced qw(extract_bracketed); + use Sub::Quote (); + + sub slurp { do { local (@ARGV, $/) = $_[0]; <> } } + sub splat { + open my $out, '>', $_[1] or die "can't open $_[1]: $!"; + print $out $_[0] or die "couldn't write to $_[1]: $!"; + } + + sub inlinify { + my $file = $_[0]; + my @chunks = split /(^sub.*?^}$)/sm, slurp $file; + warn join "\n--\n", @chunks; + my %code; + foreach my $chunk (@chunks) { + if (my ($name, $body) = + $chunk =~ /^sub (\S+) {\n(.*)\n}$/s + ) { + $code{$name} = $body; + } + } + foreach my $chunk (@chunks) { + my ($me) = $chunk =~ /^sub.*{\n my \((\$\w+).*\) = \@_;\n/ or next; + my $meq = quotemeta $me; + #warn $meq, $chunk; + my $copy = $chunk; + my ($fixed, $rest); + while ($copy =~ s/^(.*?)${meq}->(\S+)(?=\()//s) { + my ($front, $name) = ($1, $2); + ((my $body), $rest) = extract_bracketed($copy, '()'); + warn "spotted ${name} - ${body}"; + if ($code{$name}) { + warn "replacing"; + s/^\(//, s/\)$// for $body; + $body = "${me}, ".$body; + $fixed .= $front.Sub::Quote::inlinify($code{$name}, $body); + } else { + $fixed .= $front.$me.'->'.$name.$body; + } + #warn $fixed; warn $rest; + $copy = $rest; + } + $fixed .= $rest if $fixed; + warn $fixed if $fixed; + $chunk = $fixed if $fixed; + } + print join '', @chunks; + } + + 1; +METHOD_INLINER + +$fatpacked{"Module/Runtime.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'MODULE_RUNTIME'; + =head1 NAME + + Module::Runtime - runtime module handling + + =head1 SYNOPSIS + + use Module::Runtime qw( + $module_name_rx is_module_name check_module_name + module_notional_filename require_module + ); + + if($module_name =~ /\A$module_name_rx\z/o) { ... + if(is_module_name($module_name)) { ... + check_module_name($module_name); + + $notional_filename = module_notional_filename($module_name); + require_module($module_name); + + use Module::Runtime qw(use_module use_package_optimistically); + + $bi = use_module("Math::BigInt", 1.31)->new("1_234"); + $widget = use_package_optimistically("Local::Widget")->new; + + use Module::Runtime qw( + $top_module_spec_rx $sub_module_spec_rx + is_module_spec check_module_spec + compose_module_name + ); + + if($spec =~ /\A$top_module_spec_rx\z/o) { ... + if($spec =~ /\A$sub_module_spec_rx\z/o) { ... + if(is_module_spec("Standard::Prefix", $spec)) { ... + check_module_spec("Standard::Prefix", $spec); + + $module_name = + compose_module_name("Standard::Prefix", $spec); + + =head1 DESCRIPTION + + The functions exported by this module deal with runtime handling of + Perl modules, which are normally handled at compile time. This module + avoids using any other modules, so that it can be used in low-level + infrastructure. + + The parts of this module that work with module names apply the same syntax + that is used for barewords in Perl source. In principle this syntax + can vary between versions of Perl, and this module applies the syntax of + the Perl on which it is running. In practice the usable syntax hasn't + changed yet. There's some intent for Unicode module names to be supported + in the future, but this hasn't yet amounted to any consistent facility. + + The functions of this module whose purpose is to load modules include + workarounds for three old Perl core bugs regarding C. These + workarounds are applied on any Perl version where the bugs exist, except + for a case where one of the bugs cannot be adequately worked around in + pure Perl. + + =head2 Module name syntax + + The usable module name syntax has not changed from Perl 5.000 up to + Perl 5.19.8. The syntax is composed entirely of ASCII characters. + From Perl 5.6 onwards there has been some attempt to allow the use of + non-ASCII Unicode characters in Perl source, but it was fundamentally + broken (like the entirety of Perl 5.6's Unicode handling) and remained + pretty much entirely unusable until it got some attention in the Perl + 5.15 series. Although Unicode is now consistently accepted by the + parser in some places, it remains broken for module names. Furthermore, + there has not yet been any work on how to map Unicode module names into + filenames, so in that respect also Unicode module names are unusable. + + The module name syntax is, precisely: the string must consist of one or + more segments separated by C<::>; each segment must consist of one or more + identifier characters (ASCII alphanumerics plus "_"); the first character + of the string must not be a digit. Thus "C", "C", + and "C" are all valid module names, whereas "C" + and "C<1foo::bar>" are not. C<'> separators are not permitted by this + module, though they remain usable in Perl source, being translated to + C<::> in the parser. + + =head2 Core bugs worked around + + The first bug worked around is core bug [perl #68590], which causes + lexical state in one file to leak into another that is Cd/Cd + from it. This bug is present from Perl 5.6 up to Perl 5.10, and is + fixed in Perl 5.11.0. From Perl 5.9.4 up to Perl 5.10.0 no satisfactory + workaround is possible in pure Perl. The workaround means that modules + loaded via this module don't suffer this pollution of their lexical + state. Modules loaded in other ways, or via this module on the Perl + versions where the pure Perl workaround is impossible, remain vulnerable. + The module L provides a complete workaround + for this bug. + + The second bug worked around causes some kinds of failure in module + loading, principally compilation errors in the loaded module, to be + recorded in C<%INC> as if they were successful, so later attempts to load + the same module immediately indicate success. This bug is present up + to Perl 5.8.9, and is fixed in Perl 5.9.0. The workaround means that a + compilation error in a module loaded via this module won't be cached as + a success. Modules loaded in other ways remain liable to produce bogus + C<%INC> entries, and if a bogus entry exists then it will mislead this + module if it is used to re-attempt loading. + + The third bug worked around causes the wrong context to be seen at + file scope of a loaded module, if C is invoked in a location + that inherits context from a higher scope. This bug is present up to + Perl 5.11.2, and is fixed in Perl 5.11.3. The workaround means that + a module loaded via this module will always see the correct context. + Modules loaded in other ways remain vulnerable. + + =cut + + package Module::Runtime; + + # Don't "use 5.006" here, because Perl 5.15.6 will load feature.pm if + # the version check is done that way. + BEGIN { require 5.006; } + # Don't "use warnings" here, to avoid dependencies. Do standardise the + # warning status by lexical override; unfortunately the only safe bitset + # to build in is the empty set, equivalent to "no warnings". + BEGIN { ${^WARNING_BITS} = ""; } + # Don't "use strict" here, to avoid dependencies. + + our $VERSION = "0.014"; + + # Don't use Exporter here, to avoid dependencies. + our @EXPORT_OK = qw( + $module_name_rx is_module_name is_valid_module_name check_module_name + module_notional_filename require_module + use_module use_package_optimistically + $top_module_spec_rx $sub_module_spec_rx + is_module_spec is_valid_module_spec check_module_spec + compose_module_name + ); + my %export_ok = map { ($_ => undef) } @EXPORT_OK; + sub import { + my $me = shift; + my $callpkg = caller(0); + my $errs = ""; + foreach(@_) { + if(exists $export_ok{$_}) { + # We would need to do "no strict 'refs'" here + # if we had enabled strict at file scope. + if(/\A\$(.*)\z/s) { + *{$callpkg."::".$1} = \$$1; + } else { + *{$callpkg."::".$_} = \&$_; + } + } else { + $errs .= "\"$_\" is not exported by the $me module\n"; + } + } + if($errs ne "") { + die "${errs}Can't continue after import errors ". + "at @{[(caller(0))[1]]} line @{[(caller(0))[2]]}.\n"; + } + } + + # Logic duplicated from Params::Classify. Duplicating it here avoids + # an extensive and potentially circular dependency graph. + sub _is_string($) { + my($arg) = @_; + return defined($arg) && ref(\$arg) eq "SCALAR"; + } + + =head1 REGULAR EXPRESSIONS + + These regular expressions do not include any anchors, so to check + whether an entire string matches a syntax item you must supply the + anchors yourself. + + =over + + =item $module_name_rx + + Matches a valid Perl module name in bareword syntax. + + =cut + + our $module_name_rx = qr/[A-Z_a-z][0-9A-Z_a-z]*(?:::[0-9A-Z_a-z]+)*/; + + =item $top_module_spec_rx + + Matches a module specification for use with L, + where no prefix is being used. + + =cut + + my $qual_module_spec_rx = + qr#(?:/|::)[A-Z_a-z][0-9A-Z_a-z]*(?:(?:/|::)[0-9A-Z_a-z]+)*#; + + my $unqual_top_module_spec_rx = + qr#[A-Z_a-z][0-9A-Z_a-z]*(?:(?:/|::)[0-9A-Z_a-z]+)*#; + + our $top_module_spec_rx = qr/$qual_module_spec_rx|$unqual_top_module_spec_rx/o; + + =item $sub_module_spec_rx + + Matches a module specification for use with L, + where a prefix is being used. + + =cut + + my $unqual_sub_module_spec_rx = qr#[0-9A-Z_a-z]+(?:(?:/|::)[0-9A-Z_a-z]+)*#; + + our $sub_module_spec_rx = qr/$qual_module_spec_rx|$unqual_sub_module_spec_rx/o; + + =back + + =head1 FUNCTIONS + + =head2 Basic module handling + + =over + + =item is_module_name(ARG) + + Returns a truth value indicating whether I is a plain string + satisfying Perl module name syntax as described for L. + + =cut + + sub is_module_name($) { _is_string($_[0]) && $_[0] =~ /\A$module_name_rx\z/o } + + =item is_valid_module_name(ARG) + + Deprecated alias for L. + + =cut + + *is_valid_module_name = \&is_module_name; + + =item check_module_name(ARG) + + Check whether I is a plain string + satisfying Perl module name syntax as described for L. + Return normally if it is, or C if it is not. + + =cut + + sub check_module_name($) { + unless(&is_module_name) { + die +(_is_string($_[0]) ? "`$_[0]'" : "argument"). + " is not a module name\n"; + } + } + + =item module_notional_filename(NAME) + + Generates a notional relative filename for a module, which is used in + some Perl core interfaces. + The I is a string, which should be a valid module name (one or + more C<::>-separated segments). If it is not a valid name, the function + Cs. + + The notional filename for the named module is generated and returned. + This filename is always in Unix style, with C directory separators + and a C<.pm> suffix. This kind of filename can be used as an argument to + C, and is the key that appears in C<%INC> to identify a module, + regardless of actual local filename syntax. + + =cut + + sub module_notional_filename($) { + &check_module_name; + my($name) = @_; + $name =~ s!::!/!g; + return $name.".pm"; + } + + =item require_module(NAME) + + This is essentially the bareword form of C, in runtime form. + The I is a string, which should be a valid module name (one or + more C<::>-separated segments). If it is not a valid name, the function + Cs. + + The module specified by I is loaded, if it hasn't been already, + in the manner of the bareword form of C. That means that a + search through C<@INC> is performed, and a byte-compiled form of the + module will be used if available. + + The return value is as for C. That is, it is the value returned + by the module itself if the module is loaded anew, or C<1> if the module + was already loaded. + + =cut + + # Don't "use constant" here, to avoid dependencies. + BEGIN { + *_WORK_AROUND_HINT_LEAKAGE = + "$]" < 5.011 && !("$]" >= 5.009004 && "$]" < 5.010001) + ? sub(){1} : sub(){0}; + *_WORK_AROUND_BROKEN_MODULE_STATE = "$]" < 5.009 ? sub(){1} : sub(){0}; + } + + BEGIN { if(_WORK_AROUND_BROKEN_MODULE_STATE) { eval q{ + sub Module::Runtime::__GUARD__::DESTROY { + delete $INC{$_[0]->[0]} if @{$_[0]}; + } + 1; + }; die $@ if $@ ne ""; } } + + sub require_module($) { + # Localise %^H to work around [perl #68590], where the bug exists + # and this is a satisfactory workaround. The bug consists of + # %^H state leaking into each required module, polluting the + # module's lexical state. + local %^H if _WORK_AROUND_HINT_LEAKAGE; + if(_WORK_AROUND_BROKEN_MODULE_STATE) { + my $notional_filename = &module_notional_filename; + my $guard = bless([ $notional_filename ], + "Module::Runtime::__GUARD__"); + my $result = CORE::require($notional_filename); + pop @$guard; + return $result; + } else { + return scalar(CORE::require(&module_notional_filename)); + } + } + + =back + + =head2 Structured module use + + =over + + =item use_module(NAME[, VERSION]) + + This is essentially C in runtime form, but without the importing + feature (which is fundamentally a compile-time thing). The I is + handled just like in C above: it must be a module name, + and the named module is loaded as if by the bareword form of C. + + If a I is specified, the C method of the loaded module is + called with the specified I as an argument. This normally serves to + ensure that the version loaded is at least the version required. This is + the same functionality provided by the I parameter of C. + + On success, the name of the module is returned. This is unlike + L, and is done so that the entire call to L + can be used as a class name to call a constructor, as in the example in + the synopsis. + + =cut + + sub use_module($;$) { + my($name, $version) = @_; + require_module($name); + $name->VERSION($version) if @_ >= 2; + return $name; + } + + =item use_package_optimistically(NAME[, VERSION]) + + This is an analogue of L for the situation where there is + uncertainty as to whether a package/class is defined in its own module + or by some other means. It attempts to arrange for the named package to + be available, either by loading a module or by doing nothing and hoping. + + An attempt is made to load the named module (as if by the bareword form + of C). If the module cannot be found then it is assumed that + the package was actually already loaded by other means, and no error + is signalled. That's the optimistic bit. + + This is mostly the same operation that is performed by the L pragma + to ensure that the specified base classes are available. The behaviour + of L was simplified in version 2.18, and later improved in version + 2.20, and on both occasions this function changed to match. + + If a I is specified, the C method of the loaded package is + called with the specified I as an argument. This normally serves + to ensure that the version loaded is at least the version required. + On success, the name of the package is returned. These aspects of the + function work just like L. + + =cut + + sub use_package_optimistically($;$) { + my($name, $version) = @_; + my $fn = module_notional_filename($name); + eval { local $SIG{__DIE__}; require_module($name); }; + die $@ if $@ ne "" && + ($@ !~ /\ACan't locate \Q$fn\E .+ at \Q@{[__FILE__]}\E line/s || + $@ =~ /^Compilation\ failed\ in\ require + \ at\ \Q@{[__FILE__]}\E\ line/xm); + $name->VERSION($version) if @_ >= 2; + return $name; + } + + =back + + =head2 Module name composition + + =over + + =item is_module_spec(PREFIX, SPEC) + + Returns a truth value indicating + whether I is valid input for L. + See below for what that entails. Whether a I is supplied affects + the validity of I, but the exact value of the prefix is unimportant, + so this function treats I as a truth value. + + =cut + + sub is_module_spec($$) { + my($prefix, $spec) = @_; + return _is_string($spec) && + $spec =~ ($prefix ? qr/\A$sub_module_spec_rx\z/o : + qr/\A$top_module_spec_rx\z/o); + } + + =item is_valid_module_spec(PREFIX, SPEC) + + Deprecated alias for L. + + =cut + + *is_valid_module_spec = \&is_module_spec; + + =item check_module_spec(PREFIX, SPEC) + + Check whether I is valid input for L. + Return normally if it is, or C if it is not. + + =cut + + sub check_module_spec($$) { + unless(&is_module_spec) { + die +(_is_string($_[1]) ? "`$_[1]'" : "argument"). + " is not a module specification\n"; + } + } + + =item compose_module_name(PREFIX, SPEC) + + This function is intended to make it more convenient for a user to specify + a Perl module name at runtime. Users have greater need for abbreviations + and context-sensitivity than programmers, and Perl module names get a + little unwieldy. I is what the user specifies, and this function + translates it into a module name in standard form, which it returns. + + I has syntax approximately that of a standard module name: it + should consist of one or more name segments, each of which consists + of one or more identifier characters. However, C is permitted as a + separator, in addition to the standard C<::>. The two separators are + entirely interchangeable. + + Additionally, if I is not C then it must be a module + name in standard form, and it is prefixed to the user-specified name. + The user can inhibit the prefix addition by starting I with a + separator (either C or C<::>). + + =cut + + sub compose_module_name($$) { + my($prefix, $spec) = @_; + check_module_name($prefix) if defined $prefix; + &check_module_spec; + if($spec =~ s#\A(?:/|::)##) { + # OK + } else { + $spec = $prefix."::".$spec if defined $prefix; + } + $spec =~ s#/#::#g; + return $spec; + } + + =back + + =head1 BUGS + + On Perl versions 5.7.2 to 5.8.8, if C is overridden by the + C mechanism, it is likely to break the heuristics used by + L, making it signal an error for a missing + module rather than assume that it was already loaded. From Perl 5.8.9 + onwards, and on 5.7.1 and earlier, this module can avoid being confused + by such an override. On the affected versions, a C override + might be installed by L, if something requires + its bugfix but for some reason its XS implementation isn't available. + + =head1 SEE ALSO + + L, + L, + L, + L + + =head1 AUTHOR + + Andrew Main (Zefram) + + =head1 COPYRIGHT + + Copyright (C) 2004, 2006, 2007, 2009, 2010, 2011, 2012, 2014 + Andrew Main (Zefram) + + =head1 LICENSE + + This module is free software; you can redistribute it and/or modify it + under the same terms as Perl itself. + + =cut + + 1; +MODULE_RUNTIME + +$fatpacked{"Moo.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'MOO'; + package Moo; + + use strictures 1; + use Moo::_Utils; + use B 'perlstring'; + use Sub::Defer (); + use Import::Into; + + our $VERSION = '1.004002'; + $VERSION = eval $VERSION; + + require Moo::sification; + + our %MAKERS; + + sub _install_tracked { + my ($target, $name, $code) = @_; + $MAKERS{$target}{exports}{$name} = $code; + _install_coderef "${target}::${name}" => "Moo::${name}" => $code; + } + + sub import { + my $target = caller; + my $class = shift; + _set_loaded(caller); + strictures->import::into(1); + if ($Role::Tiny::INFO{$target} and $Role::Tiny::INFO{$target}{is_role}) { + die "Cannot import Moo into a role"; + } + $MAKERS{$target} ||= {}; + _install_tracked $target => extends => sub { + $class->_set_superclasses($target, @_); + $class->_maybe_reset_handlemoose($target); + return; + }; + _install_tracked $target => with => sub { + require Moo::Role; + Moo::Role->apply_roles_to_package($target, @_); + $class->_maybe_reset_handlemoose($target); + }; + _install_tracked $target => has => sub { + my $name_proto = shift; + my @name_proto = ref $name_proto eq 'ARRAY' ? @$name_proto : $name_proto; + if (@_ % 2 != 0) { + require Carp; + Carp::croak("Invalid options for " . join(', ', map "'$_'", @name_proto) + . " attribute(s): even number of arguments expected, got " . scalar @_) + } + my %spec = @_; + foreach my $name (@name_proto) { + # Note that when multiple attributes specified, each attribute + # needs a separate \%specs hashref + my $spec_ref = @name_proto > 1 ? +{%spec} : \%spec; + $class->_constructor_maker_for($target) + ->register_attribute_specs($name, $spec_ref); + $class->_accessor_maker_for($target) + ->generate_method($target, $name, $spec_ref); + $class->_maybe_reset_handlemoose($target); + } + return; + }; + foreach my $type (qw(before after around)) { + _install_tracked $target => $type => sub { + require Class::Method::Modifiers; + _install_modifier($target, $type, @_); + return; + }; + } + return if $MAKERS{$target}{is_class}; # already exported into this package + my $stash = _getstash($target); + my @not_methods = map { *$_{CODE}||() } grep !ref($_), values %$stash; + @{$MAKERS{$target}{not_methods}={}}{@not_methods} = @not_methods; + $MAKERS{$target}{is_class} = 1; + { + no strict 'refs'; + @{"${target}::ISA"} = do { + require Moo::Object; ('Moo::Object'); + } unless @{"${target}::ISA"}; + } + if ($INC{'Moo/HandleMoose.pm'}) { + Moo::HandleMoose::inject_fake_metaclass_for($target); + } + } + + sub unimport { + my $target = caller; + _unimport_coderefs($target, $MAKERS{$target}); + } + + sub _set_superclasses { + my $class = shift; + my $target = shift; + foreach my $superclass (@_) { + _load_module($superclass); + if ($INC{"Role/Tiny.pm"} && $Role::Tiny::INFO{$superclass}) { + require Carp; + Carp::croak("Can't extend role '$superclass'"); + } + } + # Can't do *{...} = \@_ or 5.10.0's mro.pm stops seeing @ISA + @{*{_getglob("${target}::ISA")}{ARRAY}} = @_; + if (my $old = delete $Moo::MAKERS{$target}{constructor}) { + delete _getstash($target)->{new}; + Moo->_constructor_maker_for($target) + ->register_attribute_specs(%{$old->all_attribute_specs}); + } + elsif (!$target->isa('Moo::Object')) { + Moo->_constructor_maker_for($target); + } + no warnings 'once'; # piss off. -- mst + $Moo::HandleMoose::MOUSE{$target} = [ + grep defined, map Mouse::Util::find_meta($_), @_ + ] if Mouse::Util->can('find_meta'); + } + + sub _maybe_reset_handlemoose { + my ($class, $target) = @_; + if ($INC{"Moo/HandleMoose.pm"}) { + Moo::HandleMoose::maybe_reinject_fake_metaclass_for($target); + } + } + + sub _accessor_maker_for { + my ($class, $target) = @_; + return unless $MAKERS{$target}; + $MAKERS{$target}{accessor} ||= do { + my $maker_class = do { + if (my $m = do { + if (my $defer_target = + (Sub::Defer::defer_info($target->can('new'))||[])->[0] + ) { + my ($pkg) = ($defer_target =~ /^(.*)::[^:]+$/); + $MAKERS{$pkg} && $MAKERS{$pkg}{accessor}; + } else { + undef; + } + }) { + ref($m); + } else { + require Method::Generate::Accessor; + 'Method::Generate::Accessor' + } + }; + $maker_class->new; + } + } + + sub _constructor_maker_for { + my ($class, $target, $select_super) = @_; + return unless $MAKERS{$target}; + $MAKERS{$target}{constructor} ||= do { + require Method::Generate::Constructor; + require Sub::Defer; + my ($moo_constructor, $con); + + if ($select_super && $MAKERS{$select_super}) { + $moo_constructor = 1; + $con = $MAKERS{$select_super}{constructor}; + } else { + my $t_new = $target->can('new'); + if ($t_new) { + if ($t_new == Moo::Object->can('new')) { + $moo_constructor = 1; + } elsif (my $defer_target = (Sub::Defer::defer_info($t_new)||[])->[0]) { + my ($pkg) = ($defer_target =~ /^(.*)::[^:]+$/); + if ($MAKERS{$pkg}) { + $moo_constructor = 1; + $con = $MAKERS{$pkg}{constructor}; + } + } + } else { + $moo_constructor = 1; # no other constructor, make a Moo one + } + } + ($con ? ref($con) : 'Method::Generate::Constructor') + ->new( + package => $target, + accessor_generator => $class->_accessor_maker_for($target), + $moo_constructor ? ( + $con ? (construction_string => $con->construction_string) : () + ) : ( + construction_builder => sub { + '$class->'.$target.'::SUPER::new(' + .($target->can('FOREIGNBUILDARGS') ? + '$class->FOREIGNBUILDARGS(@_)' : '@_') + .')' + }, + ), + subconstructor_handler => ( + ' if ($Moo::MAKERS{$class}) {'."\n" + .' '.$class.'->_constructor_maker_for($class,'.perlstring($target).');'."\n" + .' return $class->new(@_)'.";\n" + .' } elsif ($INC{"Moose.pm"} and my $meta = Class::MOP::get_metaclass_by_name($class)) {'."\n" + .' return $meta->new_object($class->BUILDARGS(@_));'."\n" + .' }'."\n" + ), + ) + ->install_delayed + ->register_attribute_specs(%{$con?$con->all_attribute_specs:{}}) + } + } + + sub _concrete_methods_of { + my ($me, $role) = @_; + my $makers = $MAKERS{$role}; + # grab role symbol table + my $stash = _getstash($role); + # reverse so our keys become the values (captured coderefs) in case + # they got copied or re-used since + my $not_methods = { reverse %{$makers->{not_methods}||{}} }; + +{ + # grab all code entries that aren't in the not_methods list + map { + my $code = *{$stash->{$_}}{CODE}; + ( ! $code or exists $not_methods->{$code} ) ? () : ($_ => $code) + } grep !ref($stash->{$_}), keys %$stash + }; + } + + 1; + __END__ + + =pod + + =encoding utf-8 + + =head1 NAME + + Moo - Minimalist Object Orientation (with Moose compatibility) + + =head1 SYNOPSIS + + package Cat::Food; + + use Moo; + use namespace::clean; + + sub feed_lion { + my $self = shift; + my $amount = shift || 1; + + $self->pounds( $self->pounds - $amount ); + } + + has taste => ( + is => 'ro', + ); + + has brand => ( + is => 'ro', + isa => sub { + die "Only SWEET-TREATZ supported!" unless $_[0] eq 'SWEET-TREATZ' + }, + ); + + has pounds => ( + is => 'rw', + isa => sub { die "$_[0] is too much cat food!" unless $_[0] < 15 }, + ); + + 1; + + And elsewhere: + + my $full = Cat::Food->new( + taste => 'DELICIOUS.', + brand => 'SWEET-TREATZ', + pounds => 10, + ); + + $full->feed_lion; + + say $full->pounds; + + =head1 DESCRIPTION + + This module is an extremely light-weight subset of L optimised for + rapid startup and "pay only for what you use". + + It also avoids depending on any XS modules to allow simple deployments. The + name C is based on the idea that it provides almost -- but not quite -- two + thirds of L. + + Unlike L this module does not aim at full compatibility with + L's surface syntax, preferring instead of provide full interoperability + via the metaclass inflation capabilities described in L. + + For a full list of the minor differences between L and L's surface + syntax, see L. + + =head1 WHY MOO EXISTS + + If you want a full object system with a rich Metaprotocol, L is + already wonderful. + + However, sometimes you're writing a command line script or a CGI script + where fast startup is essential, or code designed to be deployed as a single + file via L, or you're writing a CPAN module and you want it + to be usable by people with those constraints. + + I've tried several times to use L but it's 3x the size of Moo and + takes longer to load than most of my Moo based CGI scripts take to run. + + If you don't want L, you don't want "less metaprotocol" like L, + you want "as little as possible" -- which means "no metaprotocol", which is + what Moo provides. + + Better still, if you install and load L, we set up metaclasses for your + L classes and L roles, so you can use them in L code + without ever noticing that some of your codebase is using L. + + Hence, Moo exists as its name -- Minimal Object Orientation -- with a pledge + to make it smooth to upgrade to L when you need more than minimal + features. + + =head1 MOO AND MOOSE + + If L detects L being loaded, it will automatically register + metaclasses for your L and L packages, so you should be able + to use them in L code without anybody ever noticing you aren't using + L everywhere. + + L will also create L for + classes and roles, so that C<< isa => 'MyClass' >> and C<< isa => 'MyRole' >> + work the same as for L classes and roles. + + Extending a L class or consuming a L will also work. + + So will extending a L class or consuming a L - but note + that we don't provide L metaclasses or metaroles so the other way + around doesn't work. This feature exists for L users porting to + L; enabling L users to use L classes is not a priority for us. + + This means that there is no need for anything like L for Moo + code - Moo and Moose code should simply interoperate without problem. To + handle L code, you'll likely need an empty Moo role or class consuming + or extending the L stuff since it doesn't register true L + metaclasses like L does. + + If you want types to be upgraded to the L types, use + L and install the L library to + match the L library you're using - L will + load the L library and use that type for the newly created + metaclass. + + If you need to disable the metaclass creation, add: + + no Moo::sification; + + to your code before Moose is loaded, but bear in mind that this switch is + currently global and turns the mechanism off entirely so don't put this + in library code. + + =head1 MOO AND CLASS::XSACCESSOR + + If a new enough version of L is available, it + will be used to generate simple accessors, readers, and writers for + a speed boost. Simple accessors are those without lazy defaults, + type checks/coercions, or triggers. Readers and writers generated + by L will behave slightly differently: they will + reject attempts to call them with the incorrect number of parameters. + + =head1 MOO VERSUS ANY::MOOSE + + L will load L normally, and L in a program using + L - which theoretically allows you to get the startup time of L + without disadvantaging L users. + + Sadly, this doesn't entirely work, since the selection is load order dependent + - L's metaclass inflation system explained above in L is + significantly more reliable. + + So if you want to write a CPAN module that loads fast or has only pure perl + dependencies but is also fully usable by L users, you should be using + L. + + For a full explanation, see the article + L which explains + the differing strategies in more detail and provides a direct example of + where L succeeds and L fails. + + =head1 IMPORTED METHODS + + =head2 new + + Foo::Bar->new( attr1 => 3 ); + + or + + Foo::Bar->new({ attr1 => 3 }); + + =head2 BUILDARGS + + sub BUILDARGS { + my ( $class, @args ) = @_; + + unshift @args, "attr1" if @args % 2 == 1; + + return { @args }; + }; + + Foo::Bar->new( 3 ); + + The default implementation of this method accepts a hash or hash reference of @@ 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 claudio_sf at users.sourceforge.net Fri May 23 16:08:24 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 23 May 2014 14:08:24 +0000 Subject: SF.net SVN: gar:[23697] csw/mgar/gar/v2/src/filemerger Message-ID: <3gZqL65sk9z9b@mail.opencsw.org> Revision: 23697 http://sourceforge.net/p/gar/code/23697 Author: claudio_sf Date: 2014-05-23 14:08:24 +0000 (Fri, 23 May 2014) Log Message: ----------- Source location Added Paths: ----------- csw/mgar/gar/v2/src/filemerger Added: csw/mgar/gar/v2/src/filemerger =================================================================== --- csw/mgar/gar/v2/src/filemerger (rev 0) +++ csw/mgar/gar/v2/src/filemerger 2014-05-23 14:08:24 UTC (rev 23697) @@ -0,0 +1 @@ +Source at https://github.com/nxadm/FileMerger This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Fri May 23 16:32:37 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Fri, 23 May 2014 14:32:37 +0000 Subject: SF.net SVN: gar:[23698] csw/mgar/gar/v2/src/filemerger Message-ID: <3gZqt40pTnzG3@mail.opencsw.org> Revision: 23698 http://sourceforge.net/p/gar/code/23698 Author: claudio_sf Date: 2014-05-23 14:32:34 +0000 (Fri, 23 May 2014) Log Message: ----------- More information about the source of filemerger Modified Paths: -------------- csw/mgar/gar/v2/src/filemerger Modified: csw/mgar/gar/v2/src/filemerger =================================================================== --- csw/mgar/gar/v2/src/filemerger 2014-05-23 14:08:24 UTC (rev 23697) +++ csw/mgar/gar/v2/src/filemerger 2014-05-23 14:32:34 UTC (rev 23698) @@ -1 +1,5 @@ -Source at https://github.com/nxadm/FileMerger +The source of the filemerger standalone executable in the bin directory can be found at https://github.com/nxadm/FileMerger. + +A script to generate the standalone executable from the FileMerger Perl distribution (CPAN styled and installable) is included as https://github.com/nxadm/FileMerger/blob/master/bin/create_fatpacked_bin.sh. + +All the Perl dependencies are included in the standalone executable. 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 23 17:21:23 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 23 May 2014 15:21:23 +0000 Subject: SF.net SVN: gar:[23699] csw/mgar/pkg Message-ID: <3gZryQ14bnzNB@mail.opencsw.org> Revision: 23699 http://sourceforge.net/p/gar/code/23699 Author: dmichelsen Date: 2014-05-23 15:21:22 +0000 (Fri, 23 May 2014) Log Message: ----------- libgssapi/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/libgssapi/ csw/mgar/pkg/libgssapi/Makefile csw/mgar/pkg/libgssapi/branches/ csw/mgar/pkg/libgssapi/tags/ csw/mgar/pkg/libgssapi/trunk/ csw/mgar/pkg/libgssapi/trunk/Makefile csw/mgar/pkg/libgssapi/trunk/checksums csw/mgar/pkg/libgssapi/trunk/files/ csw/mgar/pkg/libgssapi/trunk/files/0001-Drop-unknown-linker-flags.patch Added: csw/mgar/pkg/libgssapi/Makefile =================================================================== --- csw/mgar/pkg/libgssapi/Makefile (rev 0) +++ csw/mgar/pkg/libgssapi/Makefile 2014-05-23 15:21:22 UTC (rev 23699) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/libgssapi/trunk =================================================================== --- csw/mgar/pkg/libgssapi/trunk 2014-05-23 14:32:34 UTC (rev 23698) +++ csw/mgar/pkg/libgssapi/trunk 2014-05-23 15:21:22 UTC (rev 23699) Property changes on: csw/mgar/pkg/libgssapi/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/libgssapi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgssapi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgssapi/trunk/Makefile 2014-05-23 15:21:22 UTC (rev 23699) @@ -0,0 +1,34 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libgssapi +VERSION = 0.11 +GARTYPE = v2 + +DESCRIPTION = Exports a gssapi interface, but doesn't implement any gssapi mechanisms itself + +MASTER_SITES = http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-Drop-unknown-linker-flags.patch + +VENDOR_URL = http://cblfs.cross-lfs.org/index.php/Libgssapi + +PACKAGES += CSWlibgssapi2 +SPKG_DESC_CSWlibgssapi2 = Exports a gssapi interface, but doesn't implement any gssapi mechanisms itself, libgssapi.so.2 +PKGFILES_CSWlibgssapi2 += $(call pkgfiles_lib,libgssapi.so.2) +RUNTIME_DEP_PKGS_CSWlibgssapi2 += CSWlibgcc-s1 + +PACKAGES += CSWlibgssapi-dev +SPKG_DESC_CSWlibgssapi-dev = Development files for libgssapi.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibgssapi-dev += CSWlibgssapi2 + +GARCOMPILER = GNU + +BUILD64 = 1 + +EXTRA_MERGE_EXCLUDE_FILES += .*/gssapi\.h + +include gar/category.mk + Property changes on: csw/mgar/pkg/libgssapi/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/libgssapi/trunk/checksums =================================================================== --- csw/mgar/pkg/libgssapi/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgssapi/trunk/checksums 2014-05-23 15:21:22 UTC (rev 23699) @@ -0,0 +1 @@ +0e5b4c7267724f8ddf64bc35514c272e libgssapi-0.11.tar.gz Added: csw/mgar/pkg/libgssapi/trunk/files/0001-Drop-unknown-linker-flags.patch =================================================================== --- csw/mgar/pkg/libgssapi/trunk/files/0001-Drop-unknown-linker-flags.patch (rev 0) +++ csw/mgar/pkg/libgssapi/trunk/files/0001-Drop-unknown-linker-flags.patch 2014-05-23 15:21:22 UTC (rev 23699) @@ -0,0 +1,25 @@ +From f7d9e739bf4085c69cdc94f90b7d67299492e581 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 23 May 2014 16:35:39 +0200 +Subject: [PATCH] Drop unknown linker flags + +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index d6d9be7..bb3d5bb 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -191,7 +191,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + lib_LTLIBRARIES = libgssapi.la +-libgssapi_la_LDFLAGS = -version-info 2:0:0 -Wl,--version-script,$(srcdir)/symbol_versions ++libgssapi_la_LDFLAGS = -version-info 2:0:0 + libgssapi_la_SOURCES = \ + g_accept_sec_context.c g_acquire_cred.c g_compare_name.c \ + g_context_time.c g_delete_sec_context.c g_dsp_name.c g_dsp_status.c \ +-- +1.8.4.1 + 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 24 12:54:51 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 May 2014 10:54:51 +0000 Subject: SF.net SVN: gar:[23700] csw/mgar/gar/v2/gar.conf.mk Message-ID: <3gbM0M2SbNz1Gp@mail.opencsw.org> Revision: 23700 http://sourceforge.net/p/gar/code/23700 Author: wahwah Date: 2014-05-24 10:54:47 +0000 (Sat, 24 May 2014) Log Message: ----------- mGAR v2: Add the CSWpy-lockfile dependency Used by the web apps. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2014-05-23 15:21:22 UTC (rev 23699) +++ csw/mgar/gar/v2/gar.conf.mk 2014-05-24 10:54:47 UTC (rev 23700) @@ -202,6 +202,7 @@ DEF_BASE_PKGS += CSWpy-cjson DEF_BASE_PKGS += CSWpy-dateutil DEF_BASE_PKGS += CSWpy-libmagic +DEF_BASE_PKGS += CSWpy-lockfile DEF_BASE_PKGS += CSWpy-mysql DEF_BASE_PKGS += CSWpy-progressbar DEF_BASE_PKGS += CSWpy-pyelftools 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 26 13:50:30 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 26 May 2014 11:50:30 +0000 Subject: SF.net SVN: gar:[23701] csw/mgar/pkg/libcurl4/trunk Message-ID: <3gcc7n5HVlzS8@mail.opencsw.org> Revision: 23701 http://sourceforge.net/p/gar/code/23701 Author: dmichelsen Date: 2014-05-26 11:50:30 +0000 (Mon, 26 May 2014) Log Message: ----------- libcurl4/trunk: Update to 7.37.0 Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile csw/mgar/pkg/libcurl4/trunk/checksums Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2014-05-24 10:54:47 UTC (rev 23700) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2014-05-26 11:50:30 UTC (rev 23701) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.36.0 +VERSION = 7.37.0 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers @@ -29,6 +29,8 @@ BUILD_DEP_PKGS += CSWlibrtmp-dev BUILD_DEP_PKGS += CSWlibidn-dev BUILD_DEP_PKGS += CSWlibmetalink-dev +BUILD_DEP_PKGS += CSWlibfbopenssl-dev +#BUILD_DEP_PKGS += CSWlibgssapi-dev PACKAGES += CSWlibcurl4 CATALOGNAME_CSWlibcurl4 = libcurl4 @@ -98,6 +100,8 @@ EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap EXTRA_CONFIGURE_ARGS_features-full += --enable-ldaps EXTRA_CONFIGURE_ARGS_features-full += --with-libmetalink +#EXTRA_CONFIGURE_ARGS_features-full += --with-gssapi-includes=$(includedir) +#EXTRA_CONFIGURE_ARGS_features-full += --with-gssapi-libs=$(libdir) # Make sure to link to the new libnet. See for details http://wiki.opencsw.org/project-libnet EXTRA_LDFLAGS = -L$(libdir)/libnet-new Modified: csw/mgar/pkg/libcurl4/trunk/checksums =================================================================== --- csw/mgar/pkg/libcurl4/trunk/checksums 2014-05-24 10:54:47 UTC (rev 23700) +++ csw/mgar/pkg/libcurl4/trunk/checksums 2014-05-26 11:50:30 UTC (rev 23701) @@ -1 +1 @@ -291081121e604b04e0035bfdd736d196 curl-7.36.0.tar.lzma +54bfd1eb5214f604186d6f5ac61c7781 curl-7.37.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 Mon May 26 14:00:41 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 26 May 2014 12:00:41 +0000 Subject: SF.net SVN: gar:[23702] csw/mgar/pkg/websvn/trunk/Makefile Message-ID: <3gccMM3l82zX4@mail.opencsw.org> Revision: 23702 http://sourceforge.net/p/gar/code/23702 Author: dmichelsen Date: 2014-05-26 12:00:38 +0000 (Mon, 26 May 2014) Log Message: ----------- websvn/trunk: Really preserve config Modified Paths: -------------- csw/mgar/pkg/websvn/trunk/Makefile Modified: csw/mgar/pkg/websvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/websvn/trunk/Makefile 2014-05-26 11:50:30 UTC (rev 23701) +++ csw/mgar/pkg/websvn/trunk/Makefile 2014-05-26 12:00:38 UTC (rev 23702) @@ -43,9 +43,9 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -EXTRA_PAX_ARGS += -s ',^\.\(.*\)/distconfig.php$$,.\1/config.php,' +EXTRA_PAX_ARGS += -s ',^\.\(.*\)/distconfig.php$$,.\1/config.php.CSW,' -PRESERVECONF = $(sharedstatedir)/www/websvn/include/config.php +PRESERVECONF += $(sharedstatedir)/www/websvn/htdocs/include/config.php ARCHALL = 1 @@ -53,11 +53,12 @@ install-custom: @echo " ==> Installing $(NAME)" - @rm -rf $(DESTDIR)$(sharedstatedir)/www/websvn - @ginstall -d $(DESTDIR)$(sharedstatedir)/www/websvn - @cp -rp $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/websvn/htdocs - @find $(DESTDIR)$(prefix) -name .svn -exec rm -rf \{\} \; - @find $(DESTDIR)$(prefix) -name .git -exec rm -rf \{\} \; - @rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn - @ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs - @ln -s $(sharedstatedir)/www/websvn/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn + rm -rf $(DESTDIR)$(sharedstatedir)/www/websvn + ginstall -d $(DESTDIR)$(sharedstatedir)/www/websvn + cp -rp $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/websvn/htdocs + find $(DESTDIR)$(prefix) -name .svn -exec rm -rf \{\} \; + find $(DESTDIR)$(prefix) -name .git -exec rm -rf \{\} \; + rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn + ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs + ln -s $(sharedstatedir)/www/websvn/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Tue May 27 01:05:15 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Mon, 26 May 2014 23:05:15 +0000 Subject: SF.net SVN: gar:[23703] csw/mgar/pkg Message-ID: <3gcv6F3Qx5z1Ff@mail.opencsw.org> Revision: 23703 http://sourceforge.net/p/gar/code/23703 Author: rmottola Date: 2014-05-26 23:05:13 +0000 (Mon, 26 May 2014) Log Message: ----------- gnustep-back/trunk: first gnustep-bck version non-working Added Paths: ----------- csw/mgar/pkg/gnustep-back/ csw/mgar/pkg/gnustep-back/Makefile csw/mgar/pkg/gnustep-back/branches/ csw/mgar/pkg/gnustep-back/tags/ csw/mgar/pkg/gnustep-back/trunk/ csw/mgar/pkg/gnustep-back/trunk/Makefile csw/mgar/pkg/gnustep-back/trunk/checksums csw/mgar/pkg/gnustep-back/trunk/files/ Added: csw/mgar/pkg/gnustep-back/Makefile =================================================================== --- csw/mgar/pkg/gnustep-back/Makefile (rev 0) +++ csw/mgar/pkg/gnustep-back/Makefile 2014-05-26 23:05:13 UTC (rev 23703) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gnustep-back/trunk =================================================================== --- csw/mgar/pkg/gnustep-back/trunk 2014-05-26 12:00:38 UTC (rev 23702) +++ csw/mgar/pkg/gnustep-back/trunk 2014-05-26 23:05:13 UTC (rev 23703) Property changes on: csw/mgar/pkg/gnustep-back/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gnustep-back/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-back/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnustep-back/trunk/Makefile 2014-05-26 23:05:13 UTC (rev 23703) @@ -0,0 +1,59 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gnustep-back +VERSION = 0.24.0 +GARTYPE = v2 + +DESCRIPTION = GNUstep-core back +define BLURB + GNUstep-core, backend dependent part of GNUstep AppKit. +endef + +#EXTRA_MODULATORS = GRAPHICS +#MODULATIONS_graphics = xlib cairo + +BUILD_DEP_PKGS = SUNWxorg-headers CSWgmake CSWgcc4objc +DEP_PKGS = CSWgnustep-make CSWgnustep-base CSWgnustep-gui + +DEP_PKGS += CSWlibcairo2 +#DEP_PKGS_GRAPHICS_cairo += CSWlibcairo2 + +MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/core/ +DISTFILES = $(DISTNAME).tar.gz + +#we absolutely need GCC for Objective-C support. The only alternative in the future would be clang +GARCOMPILER = GNU + +# now special targets for configure, build and install so that we can source +# GNUstep.sh before +CONFIGURE_SCRIPTS = sourcegs +BUILD_SCRIPTS = sourcegs +INSTALL_SCRIPTS = sourcegs + +# Disable test scripts for now +TEST_SCRIPTS = none +SKIPTEST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +#CONFIGURE_ARGS_GRAPHICS_xlib = $(DIRPATHS) --enable-graphics=xlib +#CONFIGURE_ARGS_GRAPHICS_cairo = $(DIRPATHS) --enable-graphics=cairo +CONFIGURE_ARGS = $(DIRPATHS) --enable-graphics=cairo + +include gar/category.mk + +configure-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) ; $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +build-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) + @$(MAKECOOKIE) + +install-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install DESTDIR=$(DESTDIR) + @$(MAKECOOKIE) + +test-none : + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gnustep-back/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gnustep-back/trunk/checksums =================================================================== --- csw/mgar/pkg/gnustep-back/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnustep-back/trunk/checksums 2014-05-26 23:05:13 UTC (rev 23703) @@ -0,0 +1 @@ +0b8393832bd928b9d3ec4eb68d7f6564 gnustep-back-0.24.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 27 09:23:20 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 May 2014 07:23:20 +0000 Subject: SF.net SVN: gar:[23704] csw/mgar/pkg/mbuffer/trunk Message-ID: <3gd68v3d4Sz96@mail.opencsw.org> Revision: 23704 http://sourceforge.net/p/gar/code/23704 Author: dmichelsen Date: 2014-05-27 07:23:18 +0000 (Tue, 27 May 2014) Log Message: ----------- mbuffer/trunk: Update to 20140310 Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2014-05-26 23:05:13 UTC (rev 23703) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2014-05-27 07:23:18 UTC (rev 23704) @@ -1,5 +1,5 @@ NAME = mbuffer -VERSION = 20140126 +VERSION = 20140310 GARTYPE = v2 DESCRIPTION = A tool for buffering data streams Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2014-05-26 23:05:13 UTC (rev 23703) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2014-05-27 07:23:18 UTC (rev 23704) @@ -1 +1 @@ -5d6eb4da888fa205fd20ddb04dc0b5d9 mbuffer-20140126.tgz +9937d7f666c19a2e6b2499b04dbecc44 mbuffer-20140310.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 27 09:25:38 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 May 2014 07:25:38 +0000 Subject: SF.net SVN: gar:[23705] csw/mgar/pkg/mtwrite/trunk/Makefile Message-ID: <3gd6CW6SR1zDY@mail.opencsw.org> Revision: 23705 http://sourceforge.net/p/gar/code/23705 Author: dmichelsen Date: 2014-05-27 07:25:37 +0000 (Tue, 27 May 2014) Log Message: ----------- mtwrite/trunk: Add override for direct binding Modified Paths: -------------- csw/mgar/pkg/mtwrite/trunk/Makefile Modified: csw/mgar/pkg/mtwrite/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtwrite/trunk/Makefile 2014-05-27 07:23:18 UTC (rev 23704) +++ csw/mgar/pkg/mtwrite/trunk/Makefile 2014-05-27 07:25:37 UTC (rev 23705) @@ -35,6 +35,9 @@ # LD_LIBRARY_PATH only this is ok. CHECKPKG_OVERRIDES_CSWmtwrite += soname-equals-filename|file=/opt/csw/lib/mtwrite.so +# libumem does not support direct binding +CHECKPKG_OVERRIDES_CSWmtwrite += no-direct-binding|/opt/csw/lib/mtwrite.so|is|not|directly|bound|to|soname|libumem.so.1 + include gar/category.mk post-install-modulated: 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 27 15:45:52 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 May 2014 13:45:52 +0000 Subject: SF.net SVN: gar:[23706] csw/mgar/pkg/squid/trunk/Makefile Message-ID: <3gdGfP0wQSzf4@mail.opencsw.org> Revision: 23706 http://sourceforge.net/p/gar/code/23706 Author: dmichelsen Date: 2014-05-27 13:45:50 +0000 (Tue, 27 May 2014) Log Message: ----------- squid/trunk: Enable asyncio Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2014-05-27 07:25:37 UTC (rev 23705) +++ csw/mgar/pkg/squid/trunk/Makefile 2014-05-27 13:45:50 UTC (rev 23706) @@ -79,6 +79,8 @@ CONFIGURE_ARGS += --with-large-files CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-default-user=$(NAME) +CONFIGURE_ARGS += --enable-aio +CONFIGURE_ARGS += --enable-storeio=ufs,diskd # Allowed values (see configure --help): # POSIX_V6_ILP32_OFF32 32 bits 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 27 17:09:51 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 27 May 2014 15:09:51 +0000 Subject: SF.net SVN: gar:[23707] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: <3gdJWJ6GFvznf@mail.opencsw.org> Revision: 23707 http://sourceforge.net/p/gar/code/23707 Author: lblume Date: 2014-05-27 15:09:50 +0000 (Tue, 27 May 2014) Log Message: ----------- ghostscript/trunk: Add the build of libijs.so Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-27 13:45:50 UTC (rev 23706) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-27 15:09:50 UTC (rev 23707) @@ -136,6 +136,11 @@ CONFIGURE_ARGS-32-i386 += --disable-sse2 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)-$(GARCH)) +# The arguments used for libijs +CONFIGURE_ARGS_ijs = $(DIRPATHS) +CONFIGURE_ARGS_ijs += --enable-shared +CONFIGURE_ARGS_ijs += --disable-static + # We want the shared library BUILD_ARGS += so @@ -161,4 +166,23 @@ rm -rf $(WORKSRC)/freetype rm -rf $(WORKSRC)/expat @$(MAKECOOKIE) - + +post-configure: + # Specific for libijs + cd $(WORKSRC)/ijs && ./autogen.sh + cd $(WORKSRC)/ijs && \ + /usr/bin/env -i $(CONFIGURE_ENV) PWD=$(abspath $(WORKSRC)/ijs) \ + ./configure $(CONFIGURE_ARGS_ijs) + @$(MAKECOOKIE) + +post-build: + # Specific for libijs + cd $(WORKSRC)/ijs && \ + /usr/bin/env -i $(BUILD_ENV) $(MAKE) MAKEFLAGS= $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS_ijs) + @$(MAKECOOKIE) + +post-install: + # Specific for libijs + cd $(WORKSRC)/ijs && \ + /usr/bin/env -i $(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS_ijs) install + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Tue May 27 17:24:14 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 27 May 2014 15:24:14 +0000 Subject: SF.net SVN: gar:[23708] csw/mgar/gar/v2/src Message-ID: <3gdJqr0lm4zss@mail.opencsw.org> Revision: 23708 http://sourceforge.net/p/gar/code/23708 Author: claudio_sf Date: 2014-05-27 15:24:13 +0000 (Tue, 27 May 2014) Log Message: ----------- Renaming of filemerger to buildmerger Added Paths: ----------- csw/mgar/gar/v2/src/buildmerger Removed Paths: ------------- csw/mgar/gar/v2/src/filemerger Copied: csw/mgar/gar/v2/src/buildmerger (from rev 23698, csw/mgar/gar/v2/src/filemerger) =================================================================== --- csw/mgar/gar/v2/src/buildmerger (rev 0) +++ csw/mgar/gar/v2/src/buildmerger 2014-05-27 15:24:13 UTC (rev 23708) @@ -0,0 +1,5 @@ +The source of the buildmerger standalone executable in the bin directory can be found at https://github.com/nxadm/OpenCSW-BuildMerger. + +A script to generate the standalone executable from the OpenCSW::BuildMerger Perl distribution (CPAN styled and installable) is included as https://github.com/nxadm/OpenCSW-BuildMerger/blob/master/bin/create_fatpacked_bin.sh. + +All the Perl dependencies are included in the standalone executable. Deleted: csw/mgar/gar/v2/src/filemerger =================================================================== --- csw/mgar/gar/v2/src/filemerger 2014-05-27 15:09:50 UTC (rev 23707) +++ csw/mgar/gar/v2/src/filemerger 2014-05-27 15:24:13 UTC (rev 23708) @@ -1,5 +0,0 @@ -The source of the filemerger standalone executable in the bin directory can be found at https://github.com/nxadm/FileMerger. - -A script to generate the standalone executable from the FileMerger Perl distribution (CPAN styled and installable) is included as https://github.com/nxadm/FileMerger/blob/master/bin/create_fatpacked_bin.sh. - -All the Perl dependencies are included in the standalone executable. 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 27 17:25:49 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 27 May 2014 15:25:49 +0000 Subject: SF.net SVN: gar:[23709] csw/mgar/gar/v2/lib/python/models.py Message-ID: <3gdJsf5jy1zx7@mail.opencsw.org> Revision: 23709 http://sourceforge.net/p/gar/code/23709 Author: cgrzemba Date: 2014-05-27 15:25:47 +0000 (Tue, 27 May 2014) Log Message: ----------- limit index key length to prevent warning, see http://bugs.mysql.com/bug.php?id=68453 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2014-05-27 15:24:13 UTC (rev 23708) +++ csw/mgar/gar/v2/lib/python/models.py 2014-05-27 15:25:47 UTC (rev 23709) @@ -145,7 +145,7 @@ pkginst = sqlobject.ForeignKey('Pkginst', notNone=True) srv4_file = sqlobject.ForeignKey('Srv4FileStats') basename_idx = sqlobject.DatabaseIndex('basename') - path_idx = sqlobject.DatabaseIndex('path') + path_idx = sqlobject.DatabaseIndex({'column': 'path', 'length': 255}) def FullPath(self): return os.path.join(self.path, self.basename) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Tue May 27 20:13:42 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Tue, 27 May 2014 18:13:42 +0000 Subject: SF.net SVN: gar:[23710] csw/mgar/pkg/perl/trunk Message-ID: <3gdNbM1qTMz1BP@mail.opencsw.org> Revision: 23710 http://sourceforge.net/p/gar/code/23710 Author: claudio_sf Date: 2014-05-27 18:13:40 +0000 (Tue, 27 May 2014) Log Message: ----------- perl/trunk: Suppport for new release 5.20.0 Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/perl/trunk/checksums Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-05-27 15:25:47 UTC (rev 23709) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-05-27 18:13:40 UTC (rev 23710) @@ -1,5 +1,5 @@ NAME = perl -VERSION = 5.18.2 +VERSION = 5.20.0 VERSION_MAJOR = $(shell echo $(VERSION) | cut -f1-2 -d.) #CATEGORIES = lang GARTYPE = v2 @@ -18,7 +18,8 @@ VENDOR_URL = http://www.perl.org #DISTFILES = $(NAME)-$(VERSION).tar.gz # The source has been patched to fix a failing patch (Solaris only). The patch was discussed with upstream (p5p) and committed to BLEAD. The patch is in the files directory. -DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz +#DISTFILES = $(NAME)-$(VERSION)-patched.tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.bz2 PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc PACKAGES = CSWperl PKG_DESC_CSWperl = $(DESCRIPTION) @@ -122,7 +123,8 @@ build-perl: BUILD_EXPORTS = LD_OPTIONS build-perl: @echo " ==> Running make in $*" - cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) perldtrace.h && $(BUILD_ENV) $(MAKE) $(MAKE_OPT) +# cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) perldtrace.h && $(BUILD_ENV) $(MAKE) $(MAKE_OPT) + cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(MAKE_OPT) @$(MAKECOOKIE) # Test @@ -130,5 +132,5 @@ # You can always run the test single threaded if needed. test-perl: @echo " ==> Running make $(TEST_TARGET) in $*" - cd $(WORKSRC) && $(MAKE) -j1 test + cd $(WORKSRC) && $(MAKE) $(MAKE_OPT) test @$(MAKECOOKIE) Deleted: csw/mgar/pkg/perl/trunk/checksums =================================================================== --- csw/mgar/pkg/perl/trunk/checksums 2014-05-27 15:25:47 UTC (rev 23709) +++ csw/mgar/pkg/perl/trunk/checksums 2014-05-27 18:13:40 UTC (rev 23710) @@ -1 +0,0 @@ -ebe29eb6d3a4b264c2dbe3f186b309d2 perl-5.18.2-patched.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Wed May 28 00:07:16 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Tue, 27 May 2014 22:07:16 +0000 Subject: SF.net SVN: gar:[23711] csw/mgar/pkg/gnustep-back/trunk/Makefile Message-ID: <3gdTmq5kVXz1SC@mail.opencsw.org> Revision: 23711 http://sourceforge.net/p/gar/code/23711 Author: rmottola Date: 2014-05-27 22:07:16 +0000 (Tue, 27 May 2014) Log Message: ----------- gnustep-back/trunk: add correct cairo dependencies Modified Paths: -------------- csw/mgar/pkg/gnustep-back/trunk/Makefile Modified: csw/mgar/pkg/gnustep-back/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-back/trunk/Makefile 2014-05-27 18:13:40 UTC (rev 23710) +++ csw/mgar/pkg/gnustep-back/trunk/Makefile 2014-05-27 22:07:16 UTC (rev 23711) @@ -13,9 +13,10 @@ #EXTRA_MODULATORS = GRAPHICS #MODULATIONS_graphics = xlib cairo -BUILD_DEP_PKGS = SUNWxorg-headers CSWgmake CSWgcc4objc -DEP_PKGS = CSWgnustep-make CSWgnustep-base CSWgnustep-gui +BUILD_DEP_PKGS = SUNWxorg-headers CSWgmake CSWgcc4objc CSWlibfreetype-dev +DEP_PKGS = CSWgnustep-make CSWgnustep-base CSWgnustep-gui CSWlibfreetype6 +BUILD_DEP_PKGS += CSWlibcairo-dev DEP_PKGS += CSWlibcairo2 #DEP_PKGS_GRAPHICS_cairo += CSWlibcairo2 @@ -37,9 +38,9 @@ CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS_GRAPHICS_xlib = $(DIRPATHS) --enable-graphics=xlib -#CONFIGURE_ARGS_GRAPHICS_cairo = $(DIRPATHS) --enable-graphics=cairo -CONFIGURE_ARGS = $(DIRPATHS) --enable-graphics=cairo +#CONFIGURE_ARGS_GRAPHICS_xlib += --enable-graphics=xlib +#CONFIGURE_ARGS_GRAPHICS_cairo += --enable-graphics=cairo +CONFIGURE_ARGS +== $(DIRPATHS) --enable-graphics=cairo include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Wed May 28 00:21:20 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Tue, 27 May 2014 22:21:20 +0000 Subject: SF.net SVN: gar:[23712] csw/mgar/pkg/gnustep-back/trunk/Makefile Message-ID: <3gdV512mg5z1XN@mail.opencsw.org> Revision: 23712 http://sourceforge.net/p/gar/code/23712 Author: rmottola Date: 2014-05-27 22:21:18 +0000 (Tue, 27 May 2014) Log Message: ----------- correct cairo configure args Modified Paths: -------------- csw/mgar/pkg/gnustep-back/trunk/Makefile Modified: csw/mgar/pkg/gnustep-back/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-back/trunk/Makefile 2014-05-27 22:07:16 UTC (rev 23711) +++ csw/mgar/pkg/gnustep-back/trunk/Makefile 2014-05-27 22:21:18 UTC (rev 23712) @@ -40,7 +40,7 @@ #CONFIGURE_ARGS_GRAPHICS_xlib += --enable-graphics=xlib #CONFIGURE_ARGS_GRAPHICS_cairo += --enable-graphics=cairo -CONFIGURE_ARGS +== $(DIRPATHS) --enable-graphics=cairo +CONFIGURE_ARGS += --enable-graphics=cairo include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Wed May 28 00:22:49 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Tue, 27 May 2014 22:22:49 +0000 Subject: SF.net SVN: gar:[23713] csw/mgar/pkg Message-ID: <3gdV6l6bMkz3X@mail.opencsw.org> Revision: 23713 http://sourceforge.net/p/gar/code/23713 Author: rmottola Date: 2014-05-27 22:22:47 +0000 (Tue, 27 May 2014) Log Message: ----------- gs_ftp/trunk: initial version of gnustep FTP app Added Paths: ----------- csw/mgar/pkg/gs_ftp/ csw/mgar/pkg/gs_ftp/Makefile csw/mgar/pkg/gs_ftp/branches/ csw/mgar/pkg/gs_ftp/tags/ csw/mgar/pkg/gs_ftp/trunk/ csw/mgar/pkg/gs_ftp/trunk/Makefile csw/mgar/pkg/gs_ftp/trunk/checksums csw/mgar/pkg/gs_ftp/trunk/files/ Added: csw/mgar/pkg/gs_ftp/Makefile =================================================================== --- csw/mgar/pkg/gs_ftp/Makefile (rev 0) +++ csw/mgar/pkg/gs_ftp/Makefile 2014-05-27 22:22:47 UTC (rev 23713) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gs_ftp/trunk =================================================================== --- csw/mgar/pkg/gs_ftp/trunk 2014-05-27 22:21:18 UTC (rev 23712) +++ csw/mgar/pkg/gs_ftp/trunk 2014-05-27 22:22:47 UTC (rev 23713) Property changes on: csw/mgar/pkg/gs_ftp/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gs_ftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gs_ftp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gs_ftp/trunk/Makefile 2014-05-27 22:22:47 UTC (rev 23713) @@ -0,0 +1,46 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = FTP +VERSION = 0.4 +GARTYPE = v2 + +DESCRIPTION = GNUstep FTP client +define BLURB + Graphical, compact FTP client for GNUstep. +endef + +BUILD_DEP_PKGS = CSWgmake CSWgcc4objc +DEP_PKGS = CSWgnustep-make CSWgnustep-base CSWgnustep-gui CSWgnustep-back + +MASTER_SITES = http://savannah.nongnu.org/download/gap/ +DISTFILES = $(DISTNAME).tar.gz + +#we absolutely need GCC for Objective-C support. The only alternative in the future would be clang +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +# now special targets for build and install so that we can source +# GNUstep.sh before +# configure is skipped +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = sourcegs +INSTALL_SCRIPTS = sourcegs + +# Disable test scripts for now +TEST_SCRIPTS = none +SKIPTEST = 1 + +include gar/category.mk + +build-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) + @$(MAKECOOKIE) + +install-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install DESTDIR=$(DESTDIR) + @$(MAKECOOKIE) + +test-none : + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gs_ftp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gs_ftp/trunk/checksums =================================================================== --- csw/mgar/pkg/gs_ftp/trunk/checksums (rev 0) +++ csw/mgar/pkg/gs_ftp/trunk/checksums 2014-05-27 22:22:47 UTC (rev 23713) @@ -0,0 +1 @@ +3a81fdab1b55bda8b34a461c223d676d FTP-0.4.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 Wed May 28 10:40:05 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 28 May 2014 08:40:05 +0000 Subject: SF.net SVN: gar:[23714] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: <3gdlq06TW3zds@mail.opencsw.org> Revision: 23714 http://sourceforge.net/p/gar/code/23714 Author: lblume Date: 2014-05-28 08:40:05 +0000 (Wed, 28 May 2014) Log Message: ----------- ghostscript/trunk: Add libijs packaging Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-27 22:22:47 UTC (rev 23713) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-28 08:40:05 UTC (rev 23714) @@ -59,6 +59,7 @@ RUNTIME_DEP_PKGS_CSWghostscript += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWghostscript += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWghostscript += CSWlibijs0-35 # These are probably ok CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/lprsetup.sh @@ -98,11 +99,26 @@ RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWliblcms2-2 +PACKAGES += CSWlibijs0-35 +CATALOGNAME_CSWlibijs0-35 = libijs0_35 +PKGFILES_CSWlibijs0-35 += $(call baseisadirs,$(libdir),libijs-0\.35\.so) +PKGFILES_CSWlibijs0-35 += $(call baseisadirs,$(libdir),libijs-0\.35\.so(\.\d+)*) +SPKG_DESC_CSWlibijs0-35 += $(DESCRIPTION), libijs-0.35.so +RUNTIME_DEP_PKGS_CSWlibijs0-35 += CSWlibgcc-s1 +OBSOLETED_BY_CSWlibijs0-35 = CSWijs +CHECKPKG_OVERRIDES_CSWlibijs0-35 += soname-equals-filename PACKAGES += CSWghostscript-dev SPKG_DESC_CSWghostscript-dev = Development files for ghostscript and libgs.so.9 +# This remove all the .so symlinks for PKGFILES_DEVEL +# so only the right ones can be re-added +PKGFILES_DEVEL_SHAREDLIBLINK = PKGFILES_CSWghostscript-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWghostscript-dev += $(call baseisadirs,$(libdir),libgs\.so) +PKGFILES_CSWghostscript-dev += $(call baseisadirs,$(libdir),libijs\.so) RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibgs9 +RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibijs0-35 +RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWghostscript ### # Needed for the Solaris ld bug 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 28 11:17:43 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 May 2014 09:17:43 +0000 Subject: SF.net SVN: gar:[23715] csw/mgar/gar/v2/gar.lib.mk Message-ID: <3gdmfP5hqszlt@mail.opencsw.org> Revision: 23715 http://sourceforge.net/p/gar/code/23715 Author: dmichelsen Date: 2014-05-28 09:17:42 +0000 (Wed, 28 May 2014) Log Message: ----------- mGAR v2: Undo changes from r17696 to gar.lib.mk Revision Links: -------------- http://sourceforge.net/p/gar/code/17696 Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2014-05-28 08:40:05 UTC (rev 23714) +++ csw/mgar/gar/v2/gar.lib.mk 2014-05-28 09:17:42 UTC (rev 23715) @@ -1002,12 +1002,12 @@ # just run make install and hope for the best. install-%/Makefile: @echo " ==> Running make install in $*" - cd $* && /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install + @cd $* && /usr/bin/env -i $(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/makefile: @echo " ==> Running make install in $*" - @cd $* && $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install + @cd $* && $(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install @$(MAKECOOKIE) install-%/GNUmakefile: 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 28 11:40:40 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 May 2014 09:40:40 +0000 Subject: SF.net SVN: gar:[23716] csw/mgar/pkg/libgssapi/ Message-ID: <3gdn8t2Wkpzr4@mail.opencsw.org> Revision: 23716 http://sourceforge.net/p/gar/code/23716 Author: dmichelsen Date: 2014-05-28 09:40:40 +0000 (Wed, 28 May 2014) Log Message: ----------- libgssapi: Remove directory, libgssapi was renamed to libgssglue in 2007 Removed Paths: ------------- csw/mgar/pkg/libgssapi/ 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 28 11:50:01 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 May 2014 09:50:01 +0000 Subject: SF.net SVN: gar:[23717] csw/mgar/pkg Message-ID: <3gdnMf2zC2z120@mail.opencsw.org> Revision: 23717 http://sourceforge.net/p/gar/code/23717 Author: dmichelsen Date: 2014-05-28 09:49:59 +0000 (Wed, 28 May 2014) Log Message: ----------- libcurl_, curl: Archive old sonames under tags inside curl/ Added Paths: ----------- csw/mgar/pkg/curl/tags/libcurl2/ csw/mgar/pkg/curl/tags/libcurl3/ csw/mgar/pkg/curl/trunk/ Removed Paths: ------------- csw/mgar/pkg/libcurl2/ csw/mgar/pkg/libcurl3/ csw/mgar/pkg/libcurl4/ 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 28 12:05:49 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 May 2014 10:05:49 +0000 Subject: SF.net SVN: gar:[23718] csw/mgar/pkg/socat/trunk Message-ID: <3gdnk01VXpz16N@mail.opencsw.org> Revision: 23718 http://sourceforge.net/p/gar/code/23718 Author: dmichelsen Date: 2014-05-28 10:05:48 +0000 (Wed, 28 May 2014) Log Message: ----------- socat/trunk: Work towards release, several tests failing Modified Paths: -------------- csw/mgar/pkg/socat/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/socat/trunk/files/0001-Do-not-use-Wall.patch Removed Paths: ------------- csw/mgar/pkg/socat/trunk/files/CSWsocat.depend csw/mgar/pkg/socat/trunk/files/CSWsocat.gspec csw/mgar/pkg/socat/trunk/files/CSWsocat.prototype Modified: csw/mgar/pkg/socat/trunk/Makefile =================================================================== --- csw/mgar/pkg/socat/trunk/Makefile 2014-05-28 09:49:59 UTC (rev 23717) +++ csw/mgar/pkg/socat/trunk/Makefile 2014-05-28 10:05:48 UTC (rev 23718) @@ -38,8 +38,11 @@ MASTER_SITES = http://www.dest-unreach.org/socat/download/ DISTFILES = $(NAME)-$(VERSION).tar.gz +VENDOR_URL = http://www.dest-unreach.org/socat/ -RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibreadline6 CSWlibwrap1 +RUNTIME_DEP_PKGS_CSWsocat += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWsocat += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWsocat += CSWlibwrap1 # test.sh uses unescaped nested double quotes (doesn't work with /bin/bash) # PATCHFILES += 0001-Escape-nested-double-quotes.patch @@ -50,7 +53,10 @@ # Note that test.sh tends to see advanced bash feature creep, don't bother # getting them all working with /bin/bash, it's only the test suite. #TEST_SCRIPTS = /opt/csw/bin/bash $(WORKSRC)/test.sh +#TEST_SCRIPTS = $(WORKSRC)/test.sh +TEST_SCRIPTS = custom + # When you run the tests on a non IPV6 system you can set HAVENOT_IP6 # to shortcut some tests #TEST_ENV="HAVENOT_IP6=1" @@ -120,10 +126,14 @@ # where TESTNAME is one of the uppercase testnames from above # (for example PTMXWAITSLAVE). -TEST_SCRIPTS = +# TEST_SCRIPTS = include gar/category.mk +test-custom: + cd $(WORKSRC) && ./test.sh + @$(MAKECOOKIE) + post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) post-install-modulated: ginstall -d $(DOCDEST) Added: csw/mgar/pkg/socat/trunk/files/0001-Do-not-use-Wall.patch =================================================================== --- csw/mgar/pkg/socat/trunk/files/0001-Do-not-use-Wall.patch (rev 0) +++ csw/mgar/pkg/socat/trunk/files/0001-Do-not-use-Wall.patch 2014-05-28 10:05:48 UTC (rev 23718) @@ -0,0 +1,25 @@ +From 6b4136d6416b1af9f15d8c2662341fb8e5905792 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 28 Oct 2013 13:27:15 +0100 +Subject: [PATCH] Do not use -Wall + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index f319a62..e926aac 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -22,7 +22,7 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + + CC = @CC@ +-CCOPTS = $(CCOPT) -Wall -Wno-parentheses ++CCOPTS = $(CCOPT) + + SYSDEFS = @SYSDEFS@ + CPPFLAGS = -I. @CPPFLAGS@ +-- +1.8.3.4 + Deleted: csw/mgar/pkg/socat/trunk/files/CSWsocat.depend =================================================================== --- csw/mgar/pkg/socat/trunk/files/CSWsocat.depend 2014-05-28 09:49:59 UTC (rev 23717) +++ csw/mgar/pkg/socat/trunk/files/CSWsocat.depend 2014-05-28 10:05:48 UTC (rev 23718) @@ -1,3 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWreadline readline - library to enable interactive line editing -P CSWtcpwrap tcpwrappers - (ipv6.4 patched) lib and tools for pre-screening tcp connections Deleted: csw/mgar/pkg/socat/trunk/files/CSWsocat.gspec =================================================================== --- csw/mgar/pkg/socat/trunk/files/CSWsocat.gspec 2014-05-28 09:49:59 UTC (rev 23717) +++ csw/mgar/pkg/socat/trunk/files/CSWsocat.gspec 2014-05-28 10:05:48 UTC (rev 23718) @@ -1,4 +0,0 @@ -%var bitname socat -%var pkgname CSWsocat -%include url file://%{GARDIR}/pkglib/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/socat/trunk/files/CSWsocat.prototype =================================================================== --- csw/mgar/pkg/socat/trunk/files/CSWsocat.prototype 2014-05-28 09:49:59 UTC (rev 23717) +++ csw/mgar/pkg/socat/trunk/files/CSWsocat.prototype 2014-05-28 10:05:48 UTC (rev 23718) @@ -1,10 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/filan 0755 root bin -f none /opt/csw/bin/procan 0755 root bin -f none /opt/csw/bin/socat 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/socat.1 0644 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/socat 0755 root bin -f none /opt/csw/share/doc/socat/changelog.CSW=changelog.CSW 0644 root bin 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 28 13:49:38 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 28 May 2014 11:49:38 +0000 Subject: SF.net SVN: gar:[23719] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: <3gdr1j0Rz5z1Hl@mail.opencsw.org> Revision: 23719 http://sourceforge.net/p/gar/code/23719 Author: lblume Date: 2014-05-28 11:49:36 +0000 (Wed, 28 May 2014) Log Message: ----------- ghostscript/trunk: More comments Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-28 10:05:48 UTC (rev 23718) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2014-05-28 11:49:36 UTC (rev 23719) @@ -99,6 +99,7 @@ RUNTIME_DEP_PKGS_CSWlibgs9 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgs9 += CSWliblcms2-2 +# This used to be a separate library and is now maintained as part of Ghostscript PACKAGES += CSWlibijs0-35 CATALOGNAME_CSWlibijs0-35 = libijs0_35 PKGFILES_CSWlibijs0-35 += $(call baseisadirs,$(libdir),libijs-0\.35\.so) @@ -111,7 +112,8 @@ PACKAGES += CSWghostscript-dev SPKG_DESC_CSWghostscript-dev = Development files for ghostscript and libgs.so.9 # This remove all the .so symlinks for PKGFILES_DEVEL -# so only the right ones can be re-added +# so only the right ones can be re-added, and the versioned .so used +# in the package above PKGFILES_DEVEL_SHAREDLIBLINK = PKGFILES_CSWghostscript-dev += $(PKGFILES_DEVEL) PKGFILES_CSWghostscript-dev += $(call baseisadirs,$(libdir),libgs\.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 Wed May 28 16:21:17 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 28 May 2014 14:21:17 +0000 Subject: SF.net SVN: gar:[23720] csw/mgar/pkg Message-ID: <3gdvNr6QSFz2v@mail.opencsw.org> Revision: 23720 http://sourceforge.net/p/gar/code/23720 Author: lblume Date: 2014-05-28 14:21:15 +0000 (Wed, 28 May 2014) Log Message: ----------- qpdf/trunk: Intoducing qpdf Added Paths: ----------- csw/mgar/pkg/qpdf/ csw/mgar/pkg/qpdf/Makefile csw/mgar/pkg/qpdf/branches/ csw/mgar/pkg/qpdf/tags/ csw/mgar/pkg/qpdf/trunk/ csw/mgar/pkg/qpdf/trunk/Makefile csw/mgar/pkg/qpdf/trunk/checksums csw/mgar/pkg/qpdf/trunk/files/ Added: csw/mgar/pkg/qpdf/Makefile =================================================================== --- csw/mgar/pkg/qpdf/Makefile (rev 0) +++ csw/mgar/pkg/qpdf/Makefile 2014-05-28 14:21:15 UTC (rev 23720) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/qpdf/trunk =================================================================== --- csw/mgar/pkg/qpdf/trunk 2014-05-28 11:49:36 UTC (rev 23719) +++ csw/mgar/pkg/qpdf/trunk 2014-05-28 14:21:15 UTC (rev 23720) Property changes on: csw/mgar/pkg/qpdf/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/qpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/qpdf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/qpdf/trunk/Makefile 2014-05-28 14:21:15 UTC (rev 23720) @@ -0,0 +1,51 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = qpdf +VERSION = 5.1.1 +GARTYPE = v2 + +DESCRIPTION = A CLI program that does structural, content-preserving transformations on PDF +define BLURB + QPDF is a command-line program that does structural, content-preserving transformations on PDF files. It could have been called something like pdf-to-pdf. It also provides many useful capabilities to developers of PDF-producing software or for people who just want to look at the innards of a PDF file to learn more about how they work. + +QPDF is capable of creating linearized (also known as web-optimized) files and encrypted files. It is also capable of converting PDF files with object streams (also known as compressed objects) to files with no compressed objects or to generate object streams from files that don't have them (or even those that already do). QPDF also supports a special mode designed to allow you to edit the content of PDF files in a text editor. For more details, please see the documentation links below. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = GCC4 + +RUNTIME_DEP_PKGS_CSWqpdf += CSWlibqpdf13 + +PACKAGES += CSWlibqpdf13 +CATALOGNAME_CSWlibqpdf13 = libqpdf13 +PKGFILES_CSWlibqpdf13 += $(call baseisadirs,$(libdir),libqpdf\.so\.13\.1\.1) +PKGFILES_CSWlibqpdf13 += $(call baseisadirs,$(libdir),libqpdf\.so\.13(\.\d+)*) +SPKG_DESC_CSWlibqpdf13 += $(DESCRIPTION), libqpdf.so.13 +RUNTIME_DEP_PKGS_CSWlibqpdf13 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibqpdf13 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibqpdf13 += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWlibqpdf13 += CSWlibz1 + +PACKAGES += CSWqpdf-dev +CATALOGNAME_CSWqpdf-dev = qpdf_dev +SPKG_DESC_CSWqpdf-dev += $(DESCRIPTION), development files +PKGFILES_CSWqpdf-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWqpdf-dev += CSWlibqpdf13 + +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no + +# Most tests are okay, some fail (I think) because of /bin/sh incompatible scripting +SKIPTEST = 1 + +include gar/category.mk + +# Some tests assume GNU diff +PATH := $(prefix)/gnu:$(PATH) + Property changes on: csw/mgar/pkg/qpdf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/qpdf/trunk/checksums =================================================================== --- csw/mgar/pkg/qpdf/trunk/checksums (rev 0) +++ csw/mgar/pkg/qpdf/trunk/checksums 2014-05-28 14:21:15 UTC (rev 23720) @@ -0,0 +1 @@ +378bfd1c2ee15d7815f2f4b1a50fa6e0 qpdf-5.1.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 Wed May 28 16:39:49 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 28 May 2014 14:39:49 +0000 Subject: SF.net SVN: gar:[23721] csw/mgar/pkg Message-ID: <3gdvp50hSDz74@mail.opencsw.org> Revision: 23721 http://sourceforge.net/p/gar/code/23721 Author: lblume Date: 2014-05-28 14:39:48 +0000 (Wed, 28 May 2014) Log Message: ----------- cups-filters/trunk: Introducing cups-filters Added Paths: ----------- csw/mgar/pkg/cups-filters/ csw/mgar/pkg/cups-filters/Makefile csw/mgar/pkg/cups-filters/branches/ csw/mgar/pkg/cups-filters/tags/ csw/mgar/pkg/cups-filters/trunk/ csw/mgar/pkg/cups-filters/trunk/Makefile csw/mgar/pkg/cups-filters/trunk/checksums csw/mgar/pkg/cups-filters/trunk/files/ Added: csw/mgar/pkg/cups-filters/Makefile =================================================================== --- csw/mgar/pkg/cups-filters/Makefile (rev 0) +++ csw/mgar/pkg/cups-filters/Makefile 2014-05-28 14:39:48 UTC (rev 23721) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/cups-filters/trunk =================================================================== --- csw/mgar/pkg/cups-filters/trunk 2014-05-28 14:21:15 UTC (rev 23720) +++ csw/mgar/pkg/cups-filters/trunk 2014-05-28 14:39:48 UTC (rev 23721) Property changes on: csw/mgar/pkg/cups-filters/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/cups-filters/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups-filters/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cups-filters/trunk/Makefile 2014-05-28 14:39:48 UTC (rev 23721) @@ -0,0 +1,19 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = cups-filters +VERSION = 1.0.53 +GARTYPE = v2 + +DESCRIPTION = Backends, filters and other software that was once part of the core CUPS distribution +define BLURB + This project provides backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc. In addition it contains additional filters and software developed independently of Apple, especially filters for the PDF-centric printing workflow introduced by OpenPrinting and a daemon to browse Bonjour broadcasts of remote CUPS printers to make these printers available locally and to provide backward compatibility to the old CUPS broadcasting and browsing of CUPS 1.5.x and older. +endef + +MASTER_SITES = http://www.openprinting.org/download/cups-filters/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/cups-filters/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/cups-filters/trunk/checksums =================================================================== --- csw/mgar/pkg/cups-filters/trunk/checksums (rev 0) +++ csw/mgar/pkg/cups-filters/trunk/checksums 2014-05-28 14:39:48 UTC (rev 23721) @@ -0,0 +1 @@ +f9df275dd161eb0364f40c6f00d755a4 cups-filters-1.0.53.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 28 16:47:36 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 May 2014 14:47:36 +0000 Subject: SF.net SVN: gar:[23722] csw/mgar/pkg/squid/trunk/Makefile Message-ID: <3gdvz40zzPzBm@mail.opencsw.org> Revision: 23722 http://sourceforge.net/p/gar/code/23722 Author: dmichelsen Date: 2014-05-28 14:47:35 +0000 (Wed, 28 May 2014) Log Message: ----------- squid/trunk: Do not ship .default config files any more, we have .CSW, also preserve errorpage.css Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2014-05-28 14:39:48 UTC (rev 23721) +++ csw/mgar/pkg/squid/trunk/Makefile 2014-05-28 14:47:35 UTC (rev 23722) @@ -123,6 +123,7 @@ SAMPLECONF = squid.conf SAMPLECONF += cachemgr.conf SAMPLECONF += mime.conf +SAMPLECONF += errorpage.css USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup PROTOTYPE_MODIFIERS = varuser @@ -140,7 +141,7 @@ REINPLACE_WITH_conf = $(sysconfdir)/$(NAME)/ REINPLACE_FILES_conf += helpers/basic_auth/MSNT/msntauth.conf.default -EXTRA_MERGE_EXCLUDE_FILES += .*/msntauth\.conf\.default +EXTRA_MERGE_EXCLUDE_FILES += .*\.default 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 29 00:39:05 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 28 May 2014 22:39:05 +0000 Subject: SF.net SVN: gar:[23723] csw/mgar/gar/v2/src/filemerger Message-ID: <3gf6R40QnnzpW@mail.opencsw.org> Revision: 23723 http://sourceforge.net/p/gar/code/23723 Author: wahwah Date: 2014-05-28 22:39:04 +0000 (Wed, 28 May 2014) Log Message: ----------- src/filemerger: Line breaks (80 cols) Added Paths: ----------- csw/mgar/gar/v2/src/filemerger Added: csw/mgar/gar/v2/src/filemerger =================================================================== --- csw/mgar/gar/v2/src/filemerger (rev 0) +++ csw/mgar/gar/v2/src/filemerger 2014-05-28 22:39:04 UTC (rev 23723) @@ -0,0 +1,8 @@ +The source of the filemerger standalone executable in the bin directory can be +found at https://github.com/nxadm/FileMerger. + +A script to generate the standalone executable from the FileMerger Perl +distribution (CPAN styled and installable) is included as +https://github.com/nxadm/FileMerger/blob/master/bin/create_fatpacked_bin.sh. + +All the Perl dependencies are included in the standalone 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 Thu May 29 00:39:13 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 28 May 2014 22:39:13 +0000 Subject: SF.net SVN: gar:[23724] csw/mgar/gar/v2/go Message-ID: <3gf6RK51rWzsh@mail.opencsw.org> Revision: 23724 http://sourceforge.net/p/gar/code/23724 Author: wahwah Date: 2014-05-28 22:39:12 +0000 (Wed, 28 May 2014) Log Message: ----------- Automatic catalog integrations: Work in progress Modified Paths: -------------- csw/mgar/gar/v2/go/Makefile csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go Added Paths: ----------- csw/mgar/gar/v2/go/src/promote-packages/ csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go Modified: csw/mgar/gar/v2/go/Makefile =================================================================== --- csw/mgar/gar/v2/go/Makefile 2014-05-28 22:39:04 UTC (rev 23723) +++ csw/mgar/gar/v2/go/Makefile 2014-05-28 22:39:12 UTC (rev 23724) @@ -3,30 +3,53 @@ # 1. gmake # 2. scp to the web host to replace the old binary -all: bin bin/catalog-release-to-disk bin/gen-catalog-index +BINARIES += bin/catalog-release-to-disk +BINARIES += bin/crashtest +BINARIES += bin/gen-catalog-index +BINARIES += bin/promote-packages +LIBS = diskformat + +all: bin $(BINARIES) + bin: mkdir -p bin +opencsw: + mkdir -p opencsw + bin/catalog-release-to-disk: src/catalog-release-to-disk/catalog-release-to-disk.o src/opencsw/diskformat/diskformat.o gccgo -g -o $@ $? bin/gen-catalog-index: src/gen-catalog-index/gen-catalog-index.o src/opencsw/diskformat/diskformat.o gccgo -g -o $@ $? +bin/crashtest: src/crashtest/crashtest.go opencsw/diskformat.o + gccgo -g -o $@ $? + +bin/promote-packages: src/promote-packages/promote-packages.go opencsw/diskformat.o + gccgo -g -o $@ $? + +opencsw/diskformat.o: opencsw src/opencsw/diskformat/diskformat.o + # Not portable to Linux. But we can't just use 'install' on Solaris. + ginstall -m 755 src/opencsw/diskformat/diskformat.o opencsw/diskformat.o + # This is a poor hack, but it gets it to compile. -src/catalog-release-to-disk/catalog-release-to-disk.o: src/opencsw/diskformat/diskformat.o - mkdir -p opencsw - ln -sf ../src/opencsw/diskformat/diskformat.o opencsw/diskformat.o +src/catalog-release-to-disk/catalog-release-to-disk.o: src/opencsw/diskformat/diskformat.o opencsw/diskformat.o gccgo -o $@ -g -c src/catalog-release-to-disk/catalog-release-to-disk.go -src/gen-catalog-index/gen-catalog-index.o: src/opencsw/diskformat/diskformat.o - mkdir -p opencsw - ln -sf ../src/opencsw/diskformat/diskformat.o opencsw/diskformat.o +src/gen-catalog-index/gen-catalog-index.o: src/opencsw/diskformat/diskformat.o opencsw/diskformat.o gccgo -o $@ -g -c src/gen-catalog-index/gen-catalog-index.go +src/promote-packages/promote-packages.o: src/opencsw/diskformat/diskformat.o opencsw/diskformat.o + gccgo -o $@ -g -c src/promote-packages/promote-packages.go + +src/crashtest/crashtest.o: src/opencsw/diskformat/diskformat.o opencsw/diskformat.o + gccgo -o $@ -g -c src/crashtest/crashtest.go + %.o: %.go gccgo -o $@ -g -c $< clean: - rm -f src/opencsw/diskformat/diskformat.o bin/catalog-release-to-disk bin/gen-catalog-index + find . -name '*.o' -exec rm -f {} \; + rm -f $(BINARIES) Modified: csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go =================================================================== --- csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go 2014-05-28 22:39:04 UTC (rev 23723) +++ csw/mgar/gar/v2/go/src/opencsw/diskformat/diskformat.go 2014-05-28 22:39:12 UTC (rev 23724) @@ -27,6 +27,7 @@ // Keeping PkgdbUrl as a package global variable is probably not the best idea, // but let's not refactor without a good plan. var PkgdbUrl string +var ReleasesUrl string // 3 strings that define a specific catalog, e.g. "unstable sparc 5.10" type CatalogSpec struct { @@ -188,6 +189,17 @@ return nil } +// Returns True when the two catalog specs match in arch and osrel. +func (s CatalogSpec) Matches(o CatalogSpec) bool { + if s.Arch == o.Arch && s.Osrel == o.Osrel { + if s.Catrel == o.Catrel { + log.Println("We're matching the same catspec against itself: ", s) + } + return true + } + return false +} + func GetCatalogSpecsFromDatabase() ([]CatalogSpec, error) { url := fmt.Sprintf("%s/catalogs/", PkgdbUrl) resp, err := http.Get(url) @@ -241,7 +253,7 @@ return cws, nil } -func filterCatspecs(all_catspecs []CatalogSpec, catrel string) []CatalogSpec { +func FilterCatspecs(all_catspecs []CatalogSpec, catrel string) []CatalogSpec { catspecs := make([]CatalogSpec, 0) for _, catspec := range all_catspecs { if catspec.Catrel == catrel { @@ -776,10 +788,10 @@ all_catspecs, err := GetCatalogSpecsFromDatabase() if err != nil { - log.Panicln("Could not get the catalog spec list") + log.Fatalln("Could not get the catalog spec list") } // Because of memory constraints, we're only processing 1 catalog in one run - catspecs := filterCatspecs(all_catspecs, catrel) + catspecs := FilterCatspecs(all_catspecs, catrel) // The plan: // 1. build a data structure representing all the hardlinks and symlinks Added: csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go =================================================================== --- csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go (rev 0) +++ csw/mgar/gar/v2/go/src/promote-packages/promote-packages.go 2014-05-28 22:39:12 UTC (rev 23724) @@ -0,0 +1,111 @@ +// Command promote-packages analyzes the state of the catalogs, and promotes +// packages from one catalog (unstable) to another one, based on a set of +// rules. + +package main + +import ( + // "bufio" + "flag" + "log" + // "os" + "opencsw/diskformat" +) + +// Command line flags +var from_catrel_flag string +var to_catrel_flag string + +func init() { + flag.StringVar(&from_catrel_flag, "from-catrel", "unstable", + "Actually, only unstable makes sense here.") + flag.StringVar(&to_catrel_flag, "to-catrel", "bratislava", + "The testing release.") + flag.BoolVar(&diskformat.DryRun, "dry-run", true, + "Don't make any changes.") + flag.StringVar(&diskformat.PkgdbUrl, "pkgdb-url", + "http://buildfarm.opencsw.org/pkgdb/rest", + "Web address of the pkgdb app.") + flag.StringVar(&diskformat.ReleasesUrl, "releases-url", + "http://buildfarm.opencsw.org/releases", + "Web address of the releases app.") +} + +type CatalogSpecTransition struct { + fromCatspec diskformat.CatalogSpec + toCatspec diskformat.CatalogSpec +} + +func groupByOsrelAndArch(cs []diskformat.CatalogSpec) map[diskformat.CatalogSpec]diskformat.CatalogSpec { + fromIndexed := make(map[diskformat.CatalogSpec]diskformat.CatalogSpec) + for _, f := range cs { + i := diskformat.CatalogSpec{"fake", f.Arch, f.Osrel} + fromIndexed[i] = f + } + return fromIndexed +} + +func matchCatspecs(fromCats, toCats []diskformat.CatalogSpec) ([]CatalogSpecTransition) { + transitions := make([]CatalogSpecTransition, 0) + // We need to match the catspecs according to osrel and arch. + fromIndexed := groupByOsrelAndArch(fromCats) + toIndexed := groupByOsrelAndArch(toCats) + for k, f := range fromIndexed { + if t, ok := toIndexed[k]; ok { + transitions = append(transitions, CatalogSpecTransition{f, t}) + } else { + log.Println("Did not find a match for", f, "something might be wrong", + "with the data / the database.") + } + } + return transitions +} + +func fetchTwo(transition CatalogSpecTransition) (f, t diskformat.CatalogWithSpec) { + chf := make(chan diskformat.CatalogWithSpec) + go func(ch chan diskformat.CatalogWithSpec) { + fromCat, err := diskformat.GetCatalogWithSpec(transition.fromCatspec) + if err != nil { + log.Fatalln("Could not fetch", fromCat, "error:", err) + } + ch <- fromCat + }(chf) + cht := make(chan diskformat.CatalogWithSpec) + go func(ch chan diskformat.CatalogWithSpec) { + toCat, err := diskformat.GetCatalogWithSpec(transition.toCatspec) + if err != nil { + log.Fatalln("Could not fetch", toCat, "error:", err) + } + ch <- toCat + }(cht) + return <-chf, <-cht +} + +func Integrate(transition CatalogSpecTransition) { + // We have the catalogs, now we need to generate commands to integrate the + // catalogs. One of the questions is how do we map replacements from one + // catalog into the other; and how do we group these catalogs. + fromCat, toCat := fetchTwo(transition) + log.Println("Integration from", fromCat.Spec, "to", toCat.Spec) + // Integrations are done by bundle; a group of packages. (or maybe not?) + // Considering deletions as well as additions of packages. + // Package addition and removal times are not taken from the catalog, but + // from the times when we saw packages appear and/or disappear. + // How to test these rules? What should be the output of this function? +} + +func main() { + flag.Parse() + log.Println("Program start") + + all_catspecs, err := diskformat.GetCatalogSpecsFromDatabase() + if err != nil { + log.Fatalln("Could not get the catalog spec list") + } + from_catspecs := diskformat.FilterCatspecs(all_catspecs, from_catrel_flag) + to_catspecs := diskformat.FilterCatspecs(all_catspecs, to_catrel_flag) + transitions := matchCatspecs(from_catspecs, to_catspecs) + for _, transition := range transitions { + Integrate(transition) + } +} 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 29 00:39:20 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 28 May 2014 22:39:20 +0000 Subject: SF.net SVN: gar:[23725] csw/mgar/gar/v2/lib Message-ID: <3gf6RM1s3Dzsm@mail.opencsw.org> Revision: 23725 http://sourceforge.net/p/gar/code/23725 Author: wahwah Date: 2014-05-28 22:39:20 +0000 (Wed, 28 May 2014) Log Message: ----------- pkgdb: Export bundle in the Timing REST url Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/representations.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2014-05-28 22:39:12 UTC (rev 23724) +++ csw/mgar/gar/v2/lib/python/models.py 2014-05-28 22:39:20 UTC (rev 23725) @@ -595,6 +595,7 @@ 'mtime', # 10 'created_on', # 11 'created_by', # 12 + 'bundle', # 13 ], where=where, orderBy='catalogname', Modified: csw/mgar/gar/v2/lib/python/representations.py =================================================================== --- csw/mgar/gar/v2/lib/python/representations.py 2014-05-28 22:39:12 UTC (rev 23724) +++ csw/mgar/gar/v2/lib/python/representations.py 2014-05-28 22:39:20 UTC (rev 23725) @@ -24,7 +24,8 @@ CatalogTimingEntry = collections.namedtuple( 'CatalogTimingEntry', ['catalogname', 'version', 'pkgname', 'basename', 'md5_sum', 'size', - 'deps', 'category', 'i_deps', 'desc', 'maintainer', 'mtime', 'inserted_on', 'inserted_by']) + 'deps', 'category', 'i_deps', 'desc', 'maintainer', 'mtime', + 'inserted_on', 'inserted_by', 'bundle']) PkgmapEntry = collections.namedtuple( 'PkgmapEntry', Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2014-05-28 22:39:12 UTC (rev 23724) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2014-05-28 22:39:20 UTC (rev 23725) @@ -764,6 +764,7 @@ mtime=row[10].isoformat(), inserted_on=row[11].isoformat(), inserted_by=row[12], + bundle=row[13], ) return entry rows = [MakeCatalogTimingEntry(x)._asdict() for x in rows] 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 29 00:48:54 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 28 May 2014 22:48:54 +0000 Subject: SF.net SVN: gar:[23726] csw/mgar/pkg/cups-filters/trunk/Makefile Message-ID: <3gf6fP2hbXz11P@mail.opencsw.org> Revision: 23726 http://sourceforge.net/p/gar/code/23726 Author: lblume Date: 2014-05-28 22:48:53 +0000 (Wed, 28 May 2014) Log Message: ----------- cups-filters/trunk: Add build deps and use GCC4 Modified Paths: -------------- csw/mgar/pkg/cups-filters/trunk/Makefile Modified: csw/mgar/pkg/cups-filters/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups-filters/trunk/Makefile 2014-05-28 22:39:20 UTC (rev 23725) +++ csw/mgar/pkg/cups-filters/trunk/Makefile 2014-05-28 22:48:53 UTC (rev 23726) @@ -13,6 +13,14 @@ MASTER_SITES = http://www.openprinting.org/download/cups-filters/ DISTFILES = $(DISTNAME).tar.gz +GARCOMPILER = GCC4 + +BUILD_DEP_PKGS += CSWphp5 +BUILD_DEP_PKGS += CSWghostscript +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibtiff-dev + 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 claudio_sf at users.sourceforge.net Thu May 29 01:15:14 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 28 May 2014 23:15:14 +0000 Subject: SF.net SVN: gar:[23727] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gf7Dl3pJxz15M@mail.opencsw.org> Revision: 23727 http://sourceforge.net/p/gar/code/23727 Author: claudio_sf Date: 2014-05-28 23:15:12 +0000 (Wed, 28 May 2014) Log Message: ----------- Debug print to show GAR bug related to /home/claudio/opencsw/perl/trunk shell variable Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-05-28 22:48:53 UTC (rev 23726) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-05-28 23:15:12 UTC (rev 23727) @@ -132,5 +132,7 @@ # You can always run the test single threaded if needed. test-perl: @echo " ==> Running make $(TEST_TARGET) in $*" - cd $(WORKSRC) && $(MAKE) $(MAKE_OPT) test + echo "PWD is $(PWD)" + cd $(WORKSRC) && echo "PWD is now $(PWD)" && $(MAKE) $(MAKE_OPT) test + #cd $(WORKSRC) && $(MAKE) $(MAKE_OPT) test @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Thu May 29 01:16:35 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 28 May 2014 23:16:35 +0000 Subject: SF.net SVN: gar:[23728] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3gf7GK5NFWz18Z@mail.opencsw.org> Revision: 23728 http://sourceforge.net/p/gar/code/23728 Author: claudio_sf Date: 2014-05-28 23:16:35 +0000 (Wed, 28 May 2014) Log Message: ----------- Debug print to show GAR bug related to $PWD shell variable Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-05-28 23:15:12 UTC (rev 23727) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-05-28 23:16:35 UTC (rev 23728) @@ -134,5 +134,6 @@ @echo " ==> Running make $(TEST_TARGET) in $*" echo "PWD is $(PWD)" cd $(WORKSRC) && echo "PWD is now $(PWD)" && $(MAKE) $(MAKE_OPT) test + #cd $(WORKSRC) && $(MAKE) $(MAKE_OPT) test @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Thu May 29 18:30:27 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Thu, 29 May 2014 16:30:27 +0000 Subject: SF.net SVN: gar:[23729] csw/mgar/pkg Message-ID: <3gfZCS0DWpzPm@mail.opencsw.org> Revision: 23729 http://sourceforge.net/p/gar/code/23729 Author: rmottola Date: 2014-05-29 16:30:24 +0000 (Thu, 29 May 2014) Log Message: ----------- gs_zipper/trunk: introducing GNUstep's zipper Added Paths: ----------- csw/mgar/pkg/gs_zipper/ csw/mgar/pkg/gs_zipper/Makefile csw/mgar/pkg/gs_zipper/branches/ csw/mgar/pkg/gs_zipper/tags/ csw/mgar/pkg/gs_zipper/trunk/ csw/mgar/pkg/gs_zipper/trunk/Makefile csw/mgar/pkg/gs_zipper/trunk/checksums csw/mgar/pkg/gs_zipper/trunk/files/ Added: csw/mgar/pkg/gs_zipper/Makefile =================================================================== --- csw/mgar/pkg/gs_zipper/Makefile (rev 0) +++ csw/mgar/pkg/gs_zipper/Makefile 2014-05-29 16:30:24 UTC (rev 23729) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gs_zipper/trunk =================================================================== --- csw/mgar/pkg/gs_zipper/trunk 2014-05-28 23:16:35 UTC (rev 23728) +++ csw/mgar/pkg/gs_zipper/trunk 2014-05-29 16:30:24 UTC (rev 23729) Property changes on: csw/mgar/pkg/gs_zipper/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gs_zipper/trunk/Makefile =================================================================== --- csw/mgar/pkg/gs_zipper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gs_zipper/trunk/Makefile 2014-05-29 16:30:24 UTC (rev 23729) @@ -0,0 +1,46 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = Zipper +VERSION = 1.5 +GARTYPE = v2 + +DESCRIPTION = GNUstep graphical archive tool (zip, tar, ...) +define BLURB + GNUstep tool to inspect and extract various archives by wrapping existing shell tools (tar, zip, lha...) and create archives through Services from the Workspace. +endef + +BUILD_DEP_PKGS = CSWgmake CSWgcc4objc +DEP_PKGS = CSWgnustep-make CSWgnustep-base CSWgnustep-gui CSWgnustep-back CSWgtar SUNWzip + +MASTER_SITES = http://savannah.nongnu.org/download/gap/ +DISTFILES = $(DISTNAME).tar.gz + +#we absolutely need GCC for Objective-C support. The only alternative in the future would be clang +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +# now special targets for build and install so that we can source +# GNUstep.sh before +# configure is skipped +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = sourcegs +INSTALL_SCRIPTS = sourcegs + +# Disable test scripts for now +TEST_SCRIPTS = none +SKIPTEST = 1 + +include gar/category.mk + +build-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) + @$(MAKECOOKIE) + +install-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install DESTDIR=$(DESTDIR) + @$(MAKECOOKIE) + +test-none : + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gs_zipper/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gs_zipper/trunk/checksums =================================================================== --- csw/mgar/pkg/gs_zipper/trunk/checksums (rev 0) +++ csw/mgar/pkg/gs_zipper/trunk/checksums 2014-05-29 16:30:24 UTC (rev 23729) @@ -0,0 +1 @@ +2281adff0815920db61f24c1cf5fb56d Zipper-1.5.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 Thu May 29 22:21:11 2014 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 29 May 2014 20:21:11 +0000 Subject: SF.net SVN: gar:[23730] csw/mgar/pkg/git/trunk Message-ID: <3gfgKW1XfnzgG@mail.opencsw.org> Revision: 23730 http://sourceforge.net/p/gar/code/23730 Author: bdwalton Date: 2014-05-29 20:21:08 +0000 (Thu, 29 May 2014) Log Message: ----------- git/trunk: version bump; drop some legacy obsoletions; update download link Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2014-05-29 16:30:24 UTC (rev 23729) +++ csw/mgar/pkg/git/trunk/Makefile 2014-05-29 20:21:08 UTC (rev 23730) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.9.0 +VERSION = 2.0.0 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) GARTYPE = v2 @@ -22,21 +22,6 @@ PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev -OBSOLETED_BY_CSWgit-gui = CSWgitgui -CATALOGNAME_CSWgitgui = git_gui_stub -OBSOLETED_BY_CSWgit-svn = CSWgitsvn -CATALOGNAME_CSWgitsvn = git_svn_stub -OBSOLETED_BY_CSWgit-emacs = CSWgitemacs -CATALOGNAME_CSWgitemacs = git_emacs_stub -OBSOLETED_BY_CSWgit-doc = CSWgitdoc -CATALOGNAME_CSWgitdoc = git_doc_stub -OBSOLETED_BY_CSWgit-completion = CSWgitcompletion -CATALOGNAME_CSWgitcompletion = git_completion_stub -OBSOLETED_BY_CSWgit-dev = CSWgitdevel -CATALOGNAME_CSWgitdevel = git_devel_stub -OBSOLETED_BY_CSWgit-cvs = CSWgitcvs -CATALOGNAME_CSWgitcvs = git_cvs_stub - CATALOGNAME_CSWgit = git CATALOGNAME_CSWgit-cvs = git_cvs CATALOGNAME_CSWgit-svn = git_svn @@ -105,7 +90,7 @@ SPKG_DESC_CSWgit-completion = Bash completion support for Git SPKG_DESC_CSWgit-dev = Headers and static libraries for Git -MASTER_SITES = http://git-core.googlecode.com/files/ +MASTER_SITES = https://www.kernel.org/pub/software/scm/git/ DISTFILES += $(DISTNAME).tar.gz DISTFILES += CSWgit.postinstall @@ -116,7 +101,6 @@ # this patch is required on current9s (not necessarily all sparc boxes) due # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch -PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2014-05-29 16:30:24 UTC (rev 23729) +++ csw/mgar/pkg/git/trunk/checksums 2014-05-29 20:21:08 UTC (rev 23730) @@ -1 +1 @@ -e16c14b27c644b8e0dd72bdb5ff77450 git-1.9.0.tar.gz +a461ea86f5d655e449a3356ac7eb71ec git-2.0.0.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 Thu May 29 23:16:00 2014 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 29 May 2014 21:16:00 +0000 Subject: SF.net SVN: gar:[23731] csw/mgar/pkg/git/trunk Message-ID: <3gfhXp1ZVHzmf@mail.opencsw.org> Revision: 23731 http://sourceforge.net/p/gar/code/23731 Author: bdwalton Date: 2014-05-29 21:15:59 +0000 (Thu, 29 May 2014) Log Message: ----------- git/trunk: cherry pick a branch from upstream's next to obtain some endianess fixes Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0007-endianess-fix.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2014-05-29 20:21:08 UTC (rev 23730) +++ csw/mgar/pkg/git/trunk/Makefile 2014-05-29 21:15:59 UTC (rev 23731) @@ -101,6 +101,7 @@ # this patch is required on current9s (not necessarily all sparc boxes) due # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch +PATCHFILES += 0007-endianess-fix.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0007-endianess-fix.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0007-endianess-fix.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0007-endianess-fix.patch 2014-05-29 21:15:59 UTC (rev 23731) @@ -0,0 +1,63 @@ +From 6986b4ab224dce1e4f9d6f0c7c84ad908fef72e8 Mon Sep 17 00:00:00 2001 +From: Junio C Hamano +Date: Wed, 7 May 2014 15:52:14 -0700 +Subject: [PATCH] Merge branch 'cb/byte-order' into next + +* cb/byte-order: + compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN + compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER +--- + compat/bswap.h | 33 ++++++++++++++++++++++++--------- + 1 file changed, 24 insertions(+), 9 deletions(-) + +diff --git a/compat/bswap.h b/compat/bswap.h +index 120c6c1..c4293db 100644 +--- a/compat/bswap.h ++++ b/compat/bswap.h +@@ -101,19 +101,34 @@ static inline uint64_t git_bswap64(uint64_t x) + #undef ntohll + #undef htonll + +-#if !defined(__BYTE_ORDER) +-# if defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN) +-# define __BYTE_ORDER BYTE_ORDER +-# define __LITTLE_ENDIAN LITTLE_ENDIAN +-# define __BIG_ENDIAN BIG_ENDIAN ++#if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN) ++ ++# define GIT_BYTE_ORDER __BYTE_ORDER ++# define GIT_LITTLE_ENDIAN __LITTLE_ENDIAN ++# define GIT_BIG_ENDIAN __BIG_ENDIAN ++ ++#elif defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN) ++ ++# define GIT_BYTE_ORDER BYTE_ORDER ++# define GIT_LITTLE_ENDIAN LITTLE_ENDIAN ++# define GIT_BIG_ENDIAN BIG_ENDIAN ++ ++#else ++ ++# define GIT_BIG_ENDIAN 4321 ++# define GIT_LITTLE_ENDIAN 1234 ++ ++# if defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) ++# define GIT_BYTE_ORDER GIT_BIG_ENDIAN ++# elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) ++# define GIT_BYTE_ORDER GIT_LITTLE_ENDIAN ++# else ++# error "Cannot determine endianness" + # endif +-#endif + +-#if !defined(__BYTE_ORDER) +-# error "Cannot determine endianness" + #endif + +-#if __BYTE_ORDER == __BIG_ENDIAN ++#if GIT_BYTE_ORDER == GIT_BIG_ENDIAN + # define ntohll(n) (n) + # define htonll(n) (n) + #else +-- +1.8.3.2 + 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 30 18:37:17 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 30 May 2014 16:37:17 +0000 Subject: SF.net SVN: gar:[23732] csw/mgar/pkg/glib2/trunk Message-ID: <3ggBJq23B7zJd@mail.opencsw.org> Revision: 23732 http://sourceforge.net/p/gar/code/23732 Author: slowfranklin Date: 2014-05-30 16:37:14 +0000 (Fri, 30 May 2014) Log Message: ----------- glib2/trunk: Work on updating to 2.41.0 Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glib2/trunk/checksums Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2014-05-29 21:15:59 UTC (rev 23731) +++ csw/mgar/pkg/glib2/trunk/Makefile 2014-05-30 16:37:14 UTC (rev 23732) @@ -8,7 +8,7 @@ # Set max open files to 1024 NAME = glib -VERSION = 2.40.0 +VERSION = 2.41.0 GARTYPE = v2 # for memory synchronisation primitives like __sync_synchronize we need gcc GARCOMPILER = GNU @@ -34,6 +34,8 @@ # This is used to adjust paths in documentation BUILD_DEP_PKGS += CSWgsed BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibffi-dev +BUILD_DEP_PKGS += CSWggettext # # Build patches Modified: csw/mgar/pkg/glib2/trunk/checksums =================================================================== --- csw/mgar/pkg/glib2/trunk/checksums 2014-05-29 21:15:59 UTC (rev 23731) +++ csw/mgar/pkg/glib2/trunk/checksums 2014-05-30 16:37:14 UTC (rev 23732) @@ -1 +1 @@ -05fb7cb17eacbc718e90366a1eae60d9 glib-2.40.0.tar.xz +65a0d3fa1e79b7d21bbc09579a0f3cf3 glib-2.41.0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri May 30 19:20:19 2014 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 30 May 2014 17:20:19 +0000 Subject: SF.net SVN: gar:[23733] csw/mgar/pkg/git/trunk Message-ID: <3ggCGM6NwpzQT@mail.opencsw.org> Revision: 23733 http://sourceforge.net/p/gar/code/23733 Author: bdwalton Date: 2014-05-30 17:20:15 +0000 (Fri, 30 May 2014) Log Message: ----------- git/trunk: add another endianness compatibility fix Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0008-A-further-small-tweak-for-endianess-detection.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2014-05-30 16:37:14 UTC (rev 23732) +++ csw/mgar/pkg/git/trunk/Makefile 2014-05-30 17:20:15 UTC (rev 23733) @@ -102,6 +102,7 @@ # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0007-endianess-fix.patch +PATCHFILES += 0008-A-further-small-tweak-for-endianess-detection.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0008-A-further-small-tweak-for-endianess-detection.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0008-A-further-small-tweak-for-endianess-detection.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0008-A-further-small-tweak-for-endianess-detection.patch 2014-05-30 17:20:15 UTC (rev 23733) @@ -0,0 +1,26 @@ +From cd9dd899f792e478bd90852ef8498ad04d69b0a7 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 30 May 2014 14:51:03 +0200 +Subject: [PATCH] A further small tweak for endianess detection + +Signed-off-by: Ben Walton +--- + compat/bswap.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compat/bswap.h b/compat/bswap.h +index c4293db..f6fd9a6 100644 +--- a/compat/bswap.h ++++ b/compat/bswap.h +@@ -120,7 +120,7 @@ static inline uint64_t git_bswap64(uint64_t x) + + # if defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) + # define GIT_BYTE_ORDER GIT_BIG_ENDIAN +-# elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) ++# elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) + # define GIT_BYTE_ORDER GIT_LITTLE_ENDIAN + # else + # error "Cannot determine endianness" +-- +1.8.4.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri May 30 20:12:40 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 30 May 2014 18:12:40 +0000 Subject: SF.net SVN: gar:[23734] csw/mgar/pkg Message-ID: <3ggDQk2P8ZzX9@mail.opencsw.org> Revision: 23734 http://sourceforge.net/p/gar/code/23734 Author: jake_goerzen Date: 2014-05-30 18:12:36 +0000 (Fri, 30 May 2014) Log Message: ----------- darkstat/trunk: initial commit of darkstat version 3.0.718 Added Paths: ----------- csw/mgar/pkg/darkstat/ csw/mgar/pkg/darkstat/Makefile csw/mgar/pkg/darkstat/branches/ csw/mgar/pkg/darkstat/tags/ csw/mgar/pkg/darkstat/trunk/ csw/mgar/pkg/darkstat/trunk/Makefile csw/mgar/pkg/darkstat/trunk/checksums csw/mgar/pkg/darkstat/trunk/files/ Added: csw/mgar/pkg/darkstat/Makefile =================================================================== --- csw/mgar/pkg/darkstat/Makefile (rev 0) +++ csw/mgar/pkg/darkstat/Makefile 2014-05-30 18:12:36 UTC (rev 23734) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/darkstat/trunk =================================================================== --- csw/mgar/pkg/darkstat/trunk 2014-05-30 17:20:15 UTC (rev 23733) +++ csw/mgar/pkg/darkstat/trunk 2014-05-30 18:12:36 UTC (rev 23734) Property changes on: csw/mgar/pkg/darkstat/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/darkstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/darkstat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/darkstat/trunk/Makefile 2014-05-30 18:12:36 UTC (rev 23734) @@ -0,0 +1,24 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = darkstat +VERSION = 3.0.718 +GARTYPE = v2 + +DESCRIPTION = Network traffic analyzer +define BLURB + Captures network traffic, calculates statistics about usage, and serves reports over HTTP. +endef + +MASTER_SITES = http://unix4lyfe.org/darkstat/ +DISTFILES = $(DISTNAME).tar.bz2 + +RUNTIME_DEP_PKGS_CSWdarkstat += CSWlibpcap1 +RUNTIME_DEP_PKGS_CSWdarkstat += CSWlibz1 + +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/darkstat/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/darkstat/trunk/checksums =================================================================== --- csw/mgar/pkg/darkstat/trunk/checksums (rev 0) +++ csw/mgar/pkg/darkstat/trunk/checksums 2014-05-30 18:12:36 UTC (rev 23734) @@ -0,0 +1 @@ +1fb31ac01d4689493c917fa622a002e7 darkstat-3.0.718.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 30 21:17:10 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 30 May 2014 19:17:10 +0000 Subject: SF.net SVN: gar:[23735] csw/mgar/pkg/qpdf/trunk/Makefile Message-ID: <3ggFs95FbGzfY@mail.opencsw.org> Revision: 23735 http://sourceforge.net/p/gar/code/23735 Author: lblume Date: 2014-05-30 19:17:08 +0000 (Fri, 30 May 2014) Log Message: ----------- qpdf/trunk: Add missing package for the binaries Modified Paths: -------------- csw/mgar/pkg/qpdf/trunk/Makefile Modified: csw/mgar/pkg/qpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/qpdf/trunk/Makefile 2014-05-30 18:12:36 UTC (rev 23734) +++ csw/mgar/pkg/qpdf/trunk/Makefile 2014-05-30 19:17:08 UTC (rev 23735) @@ -17,7 +17,14 @@ GARCOMPILER = GCC4 + +PACKAGES += CSWqpdf +CATALOGNAME_CSWqpdf = qpdf +SPKG_DESC_CSWqpdf += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWqpdf += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWqpdf += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWqpdf += CSWlibqpdf13 +# Catchall PACKAGES += CSWlibqpdf13 CATALOGNAME_CSWlibqpdf13 = libqpdf13 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri May 30 21:37:59 2014 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 30 May 2014 19:37:59 +0000 Subject: SF.net SVN: gar:[23736] csw/mgar/pkg/git/trunk/Makefile Message-ID: <3ggGK91pKLzlJ@mail.opencsw.org> Revision: 23736 http://sourceforge.net/p/gar/code/23736 Author: bdwalton Date: 2014-05-30 19:37:56 +0000 (Fri, 30 May 2014) Log Message: ----------- git/trunk: nuke a few deprecated overrides Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2014-05-30 19:17:08 UTC (rev 23735) +++ csw/mgar/pkg/git/trunk/Makefile 2014-05-30 19:37:56 UTC (rev 23736) @@ -155,10 +155,8 @@ CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbashcmplt CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWgit CHECKPKG_OVERRIDES_CSWgit-doc += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgit-doc += file-with-bad-content CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a -CHECKPKG_OVERRIDES_CSWgit-dev += surplus-dependency|CSWgit CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmerror CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWosshclient @@ -166,9 +164,7 @@ CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWless CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmnetsmtpssl CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmtermreadkey -CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/git-config.1 CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/libexec/git-core/git-send-email -CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/share/gitweb/gitweb.cgi CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/local|root/opt/csw/libexec/git-core/git-instaweb CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWtk CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWgit 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 30 22:27:11 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 30 May 2014 20:27:11 +0000 Subject: SF.net SVN: gar:[23737] csw/mgar/pkg/glib2/trunk Message-ID: <3ggHPy40vJztb@mail.opencsw.org> Revision: 23737 http://sourceforge.net/p/gar/code/23737 Author: slowfranklin Date: 2014-05-30 20:27:08 +0000 (Fri, 30 May 2014) Log Message: ----------- glib2/trunk: Fix configure test for pthread Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0001-Fix-configure-pthread-detection.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2014-05-30 19:37:56 UTC (rev 23736) +++ csw/mgar/pkg/glib2/trunk/Makefile 2014-05-30 20:27:08 UTC (rev 23737) @@ -47,6 +47,7 @@ PATCHFILES_5.11 += 0020-Adjust-path-to-zoneinfo-database.patch PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch PATCHFILES += 0029-Don-t-undefine-_XOPEN_SOURCE.patch +PATCHFILES += 0001-Fix-configure-pthread-detection.patch # # Until someone invests some real resources into checking all test patches, Added: csw/mgar/pkg/glib2/trunk/files/0001-Fix-configure-pthread-detection.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0001-Fix-configure-pthread-detection.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0001-Fix-configure-pthread-detection.patch 2014-05-30 20:27:08 UTC (rev 23737) @@ -0,0 +1,25 @@ +From 486ad042884089ed48fbc6468d16bf0a727f8473 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 30 May 2014 22:09:06 +0200 +Subject: [PATCH] Fix configure pthread detection + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index fa4bbcd..74758e6 100755 +--- a/configure ++++ b/configure +@@ -26056,7 +26056,7 @@ if test "x$with_threads" = xyes || test "x$with_threads" = xposix; then : + + if test "x$have_threads" = xno; then : + +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-- +1.8.4.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 Sat May 31 10:26:49 2014 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 31 May 2014 08:26:49 +0000 Subject: SF.net SVN: gar:[23738] csw/mgar/pkg/coreutils/trunk Message-ID: <3ggbNJ63jGz48@mail.opencsw.org> Revision: 23738 http://sourceforge.net/p/gar/code/23738 Author: bdwalton Date: 2014-05-31 08:26:41 +0000 (Sat, 31 May 2014) Log Message: ----------- coreutils/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2014-05-30 20:27:08 UTC (rev 23737) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2014-05-31 08:26:41 UTC (rev 23738) @@ -1,5 +1,5 @@ NAME = coreutils -VERSION = 8.17 +VERSION = 8.22 GARTYPE = v2 # seq has issues related to the handling of long double's with -O2. Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2014-05-30 20:27:08 UTC (rev 23737) +++ csw/mgar/pkg/coreutils/trunk/checksums 2014-05-31 08:26:41 UTC (rev 23738) @@ -1 +1 @@ -bbda656ce8ca2c6903948f9faa204ba3 coreutils-8.17.tar.xz +8fb0ae2267aa6e728958adc38f8163a2 coreutils-8.22.tar.xz 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 31 15:20:07 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sat, 31 May 2014 13:20:07 +0000 Subject: SF.net SVN: gar:[23739] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: <3ggjtk6b2YzN2@mail.opencsw.org> Revision: 23739 http://sourceforge.net/p/gar/code/23739 Author: slowfranklin Date: 2014-05-31 13:20:05 +0000 (Sat, 31 May 2014) Log Message: ----------- glib2/trunk: Bumb library version number in override Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2014-05-31 08:26:41 UTC (rev 23738) +++ csw/mgar/pkg/glib2/trunk/Makefile 2014-05-31 13:20:05 UTC (rev 23739) @@ -166,14 +166,14 @@ RUNTIME_DEP_PKGS_CSWlibgio2-0-0_5.10_sparc += CSWlibffi5 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgio2-0-0_$(GAROSREL)_$(GARCH)) # 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.4000.0 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.4100.0 # libgio uses the mime info for determining the type of files CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += surplus-dependency|CSWsharedmimeinfo -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.4000.0 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.4000.0 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.4000.0 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.4100.0 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibgio2-0-0_$(GARCH)) @@ -184,8 +184,8 @@ RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4000.0 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.4100.0 PACKAGES += CSWlibgmodule2-0-0 @@ -198,12 +198,12 @@ RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_5.10_sparc += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_$(GAROSREL)_$(GARCH)) # 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.4000.0 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4000.0 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.4000.0 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.4000.0 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.4000.0 -CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.4000.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.4100.0 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.4100.0 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibglib2-0-0_$(GARCH)) PACKAGES += CSWlibgobject2-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Sat May 31 18:50:14 2014 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sat, 31 May 2014 16:50:14 +0000 Subject: SF.net SVN: gar:[23740] csw/mgar/pkg/tracker/trunk Message-ID: <3ggpYK4MBKzWn@mail.opencsw.org> Revision: 23740 http://sourceforge.net/p/gar/code/23740 Author: slowfranklin Date: 2014-05-31 16:50:05 +0000 (Sat, 31 May 2014) Log Message: ----------- tracker/trunk: Patch for broken amount of memory detection Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tracker/trunk/files/0001-libtracker-common-memory-limits-on-systems-with-larg.patch Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2014-05-31 13:20:05 UTC (rev 23739) +++ csw/mgar/pkg/tracker/trunk/Makefile 2014-05-31 16:50:05 UTC (rev 23740) @@ -48,6 +48,7 @@ PATCHFILES += 0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch PATCHFILES += 0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch PATCHFILES += 0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch +PATCHFILES += 0001-libtracker-common-memory-limits-on-systems-with-larg.patch # Packages PACKAGES += CSWtracker Added: csw/mgar/pkg/tracker/trunk/files/0001-libtracker-common-memory-limits-on-systems-with-larg.patch =================================================================== --- csw/mgar/pkg/tracker/trunk/files/0001-libtracker-common-memory-limits-on-systems-with-larg.patch (rev 0) +++ csw/mgar/pkg/tracker/trunk/files/0001-libtracker-common-memory-limits-on-systems-with-larg.patch 2014-05-31 16:50:05 UTC (rev 23740) @@ -0,0 +1,71 @@ +From faf826c57ee33c9e29388c586f14b26451416934 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sat, 31 May 2014 09:22:35 +0200 +Subject: [PATCH] libtracker-common: memory limits on systems with large + amounts of RAM + +On systems with large amounts of RAM get_memory_total() could overflow +and return a negative value, as a result memory would be limited to +MEM_LIMIT_MIN (which is 256 MB atm). +--- + src/libtracker-common/tracker-os-dependant-unix.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libtracker-common/tracker-os-dependant-unix.c b/src/libtracker-common/tracker-os-dependant-unix.c +index 4aa99f6..bc07996 100644 +--- a/src/libtracker-common/tracker-os-dependant-unix.c ++++ b/src/libtracker-common/tracker-os-dependant-unix.c +@@ -227,11 +227,11 @@ tracker_create_permission_string (struct stat finfo) + + #ifndef DISABLE_MEM_LIMITS + +-static glong ++static guint64 + get_memory_total (void) + { + #if defined (__OpenBSD__) +- glong total = 0; ++ guint64 total = 0; + int64_t physmem; + size_t len; + static gint mib[] = { CTL_HW, HW_PHYSMEM64 }; +@@ -244,12 +244,12 @@ get_memory_total (void) + total = physmem; + } + #elif defined (__sun) +- glong total = (glong)sysconf(_SC_PAGESIZE) * (glong)sysconf(_SC_PHYS_PAGES); ++ guint64 total = (guint64)sysconf(_SC_PAGESIZE) * (guint64)sysconf(_SC_PHYS_PAGES); + #else + GError *error = NULL; + const gchar *filename; + gchar *contents = NULL; +- glong total = 0; ++ guint64 total = 0; + + filename = "/proc/meminfo"; + +@@ -274,7 +274,7 @@ get_memory_total (void) + + if (end) { + *end = '\0'; +- total = 1024L * atol (p); ++ total = 1024L * (guint64)g_ascii_strtoll (p, NULL, 10); + } + } + g_free (contents); +@@ -291,9 +291,9 @@ tracker_memory_setrlimits (void) + { + #ifndef DISABLE_MEM_LIMITS + struct rlimit rl = { 0 }; +- glong total; +- glong total_halfed; +- glong limit; ++ guint64 total; ++ guint64 total_halfed; ++ guint64 limit; + + total = get_memory_total (); + +-- +1.9.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Sat May 31 22:10:30 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sat, 31 May 2014 20:10:30 +0000 Subject: SF.net SVN: gar:[23741] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3ggv0D5DYZzmp@mail.opencsw.org> Revision: 23741 http://sourceforge.net/p/gar/code/23741 Author: claudio_sf Date: 2014-05-31 20:10:27 +0000 (Sat, 31 May 2014) Log Message: ----------- perl/trunk: Workaround PWD bug gar Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-05-31 16:50:05 UTC (rev 23740) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-05-31 20:10:27 UTC (rev 23741) @@ -132,8 +132,7 @@ # You can always run the test single threaded if needed. test-perl: @echo " ==> Running make $(TEST_TARGET) in $*" - echo "PWD is $(PWD)" - cd $(WORKSRC) && echo "PWD is now $(PWD)" && $(MAKE) $(MAKE_OPT) test - #cd $(WORKSRC) && $(MAKE) $(MAKE_OPT) test + # workaround gar pwd bug: http://sourceforge.net/apps/trac/gar/ticket/78 + cd $(WORKSRC) && PWD=`pwd` $(MAKE) $(MAKE_OPT) test @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.