From dmichelsen at users.sourceforge.net Mon Aug 3 14:02:00 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 03 Aug 2020 12:02:00 +0000 Subject: SF.net SVN: gar:[26685] csw/mgar/pkg/bison/trunk Message-ID: <1596456120.922376.5987@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26685 http://sourceforge.net/p/gar/code/26685 Author: dmichelsen Date: 2020-08-03 12:02:00 +0000 (Mon, 03 Aug 2020) Log Message: ----------- bison/trunk: Update to 3.7.1 Modified Paths: -------------- csw/mgar/pkg/bison/trunk/Makefile csw/mgar/pkg/bison/trunk/checksums Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2020-07-26 13:45:27 UTC (rev 26684) +++ csw/mgar/pkg/bison/trunk/Makefile 2020-08-03 12:02:00 UTC (rev 26685) @@ -1,7 +1,7 @@ # $Id$ NAME = bison -VERSION = 3.6.3 +VERSION = 3.7.1 GARTYPE = v2 DESCRIPTION = GNU Project parser generator (yacc replacement) @@ -13,10 +13,11 @@ MASTER_SITES += $(GNU_MIRROR) MASTER_SITES += https://alpha.gnu.org/gnu/bison/ -DISTFILES = $(DISTNAME).tar.xz +DISTFILES = $(DISTNAME).tar.gz RUNTIME_DEP_PKGS_CSWbison += CSWlibintl9 RUNTIME_DEP_PKGS_CSWbison += CSWgm4 +RUNTIME_DEP_PKGS_CSWbison += CSWlibiconv2 VENDOR_URL = http://www.gnu.org/software/bison/ Modified: csw/mgar/pkg/bison/trunk/checksums =================================================================== --- csw/mgar/pkg/bison/trunk/checksums 2020-07-26 13:45:27 UTC (rev 26684) +++ csw/mgar/pkg/bison/trunk/checksums 2020-08-03 12:02:00 UTC (rev 26685) @@ -1 +1 @@ -ca0513e77de1de46b9f2419d175cb3b4 bison-3.6.3.tar.xz +0e0196484fcd9608a931d9fee8252bc0 bison-3.7.1.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 Aug 10 12:49:02 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Aug 2020 10:49:02 +0000 Subject: SF.net SVN: gar:[26686] csw/mgar/pkg/sqlite3/trunk Message-ID: <1597056542.862200.9809@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26686 http://sourceforge.net/p/gar/code/26686 Author: dmichelsen Date: 2020-08-10 10:49:02 +0000 (Mon, 10 Aug 2020) Log Message: ----------- sqlite3/trunk: Update to 3.32.3 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2020-08-03 12:02:00 UTC (rev 26685) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2020-08-10 10:49:02 UTC (rev 26686) @@ -1,5 +1,5 @@ NAME = sqlite3 -VERSION = 3220000 +VERSION = 3320300 GARTYPE = v2 DESCRIPTION = An embeddable SQL engine in a C library @@ -9,7 +9,7 @@ endef # Download informations -MASTER_SITES = http://sqlite.org/2018/ +MASTER_SITES = http://sqlite.org/2020/ DISTNAME = sqlite-autoconf-$(VERSION) DISTFILES += $(DISTNAME).tar.gz DISTFILES += copyright-release.html @@ -45,7 +45,7 @@ # Enable sqlite3_unlock_notify() API as requested in #4837 EXTRA_CPPFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -# FOr fchmod in stat.h +# For fchmod in stat.h EXTRA_CPPFLAGS-5.9 += -D__EXTENSIONS__=1 EXTRA_CPPFLAGS += $(EXTRA_CPPFLAGS-$(GAROSREL)) Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2020-08-03 12:02:00 UTC (rev 26685) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2020-08-10 10:49:02 UTC (rev 26686) @@ -1,2 +1,2 @@ fc9432136482bcde03102bc3e06dd413 copyright-release.html -96b5648d542e8afa6ab7ffb8db8ddc3d sqlite-autoconf-3220000.tar.gz +2e3911a3c15e85c2f2d040154bbe5ce3 sqlite-autoconf-3320300.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 Wed Aug 12 23:27:41 2020 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 12 Aug 2020 21:27:41 +0000 Subject: SF.net SVN: gar:[26687] csw/mgar/pkg/dovecot/trunk Message-ID: <1597267661.641237.13274@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26687 http://sourceforge.net/p/gar/code/26687 Author: jake_goerzen Date: 2020-08-12 21:27:41 +0000 (Wed, 12 Aug 2020) Log Message: ----------- dovecot: update to 2.3.11.3 fixes CVE-2020-1200, CVE-2020-12673, CVE-202012674 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 2020-08-10 10:49:02 UTC (rev 26686) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2020-08-12 21:27:41 UTC (rev 26687) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.3.10.1 +VERSION = 2.3.11.3 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2020-08-10 10:49:02 UTC (rev 26686) +++ csw/mgar/pkg/dovecot/trunk/checksums 2020-08-12 21:27:41 UTC (rev 26687) @@ -1 +1 @@ -dfa416e58dd7132264847c59957b519c dovecot-2.3.10.1.tar.gz +f06f2272fad04e7b0207f8d00a291f66 dovecot-2.3.11.3.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 Thu Aug 13 01:29:02 2020 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 12 Aug 2020 23:29:02 +0000 Subject: SF.net SVN: gar:[26688] csw/mgar/pkg/dovecot-sieve/trunk Message-ID: <1597274942.467435.30488@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26688 http://sourceforge.net/p/gar/code/26688 Author: jake_goerzen Date: 2020-08-12 23:29:02 +0000 (Wed, 12 Aug 2020) Log Message: ----------- dovecot-sieve/trunk: update to 0.5.11 Modified Paths: -------------- csw/mgar/pkg/dovecot-sieve/trunk/Makefile csw/mgar/pkg/dovecot-sieve/trunk/checksums Modified: csw/mgar/pkg/dovecot-sieve/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2020-08-12 21:27:41 UTC (rev 26687) +++ csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2020-08-12 23:29:02 UTC (rev 26688) @@ -1,5 +1,5 @@ -NAME = dovecot-2.3-pigeonhole -VERSION = 0.5.10 +NAME = dovecot-2.3.11-pigeonhole +VERSION = 0.5.11 GARTYPE = v2 DESCRIPTION = Secure POP3/IMAP server - Sieve filters support @@ -26,13 +26,13 @@ UNAME := $(shell /usr/bin/uname -p) ifeq ($(UNAME), i386) -CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.3.10 -CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.3.10 +CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.3.11.3 +CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.3.11.3 endif ifeq ($(UNAME), sparc) -CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.3.10 -CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.3.10 +CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.3.11.3 +CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.3.11.3 endif CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) Modified: csw/mgar/pkg/dovecot-sieve/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/checksums 2020-08-12 21:27:41 UTC (rev 26687) +++ csw/mgar/pkg/dovecot-sieve/trunk/checksums 2020-08-12 23:29:02 UTC (rev 26688) @@ -1 +1 @@ -e2ad144f95358233a92cf2c5b35066c9 dovecot-2.3-pigeonhole-0.5.10.tar.gz +5778ab1367a158db2418cdaf4ddf835e dovecot-2.3.11-pigeonhole-0.5.11.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 Aug 19 10:52:05 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 19 Aug 2020 08:52:05 +0000 Subject: SF.net SVN: gar:[26689] csw/mgar/pkg/curl/trunk Message-ID: <1597827125.124705.6585@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26689 http://sourceforge.net/p/gar/code/26689 Author: dmichelsen Date: 2020-08-19 08:52:04 +0000 (Wed, 19 Aug 2020) Log Message: ----------- curl/trunk: Update to 7.72.0 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2020-08-12 23:29:02 UTC (rev 26688) +++ csw/mgar/pkg/curl/trunk/Makefile 2020-08-19 08:52:04 UTC (rev 26689) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.71.0 +VERSION = 7.72.0 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2020-08-12 23:29:02 UTC (rev 26688) +++ csw/mgar/pkg/curl/trunk/checksums 2020-08-19 08:52:04 UTC (rev 26689) @@ -1 +1 @@ -9a1f04044df1ddb0d764b2ccb4353215 curl-7.71.0.tar.xz +b5579dcc9ae76478f4e070fb4f820223 curl-7.72.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 Fri Aug 21 19:30:24 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 Aug 2020 17:30:24 +0000 Subject: SF.net SVN: gar:[26690] csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Message-ID: <1598031024.680228.30072@sfp-scm-5.v30.lw.sourceforge.com> Revision: 26690 http://sourceforge.net/p/gar/code/26690 Author: dmichelsen Date: 2020-08-21 17:30:24 +0000 (Fri, 21 Aug 2020) Log Message: ----------- php5/branches/php-5.6.x: Reworked path structure to conform OpenCSW standards Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2020-08-19 08:52:04 UTC (rev 26689) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2020-08-21 17:30:24 UTC (rev 26690) @@ -32,6 +32,10 @@ MERGE_SCRIPTS_isa-default64-sapi-ap24 = copy-relocate MERGE_SCRIPTS_isa-default64-sapi-fpm = copy-relocate +MERGE_DIRS_isa-default64-sapi-ap2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_DIRS_isa-default64-sapi-ap24 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_DIRS_isa-default64-sapi-fpm = $(bindir) $(sbindir) $(libexecdir) $(libdir) + # There is no FPM on SPARC before SPARCV9 SKIP_MODULATIONS += isa-sparcv8plus-sapi-fpm @@ -105,6 +109,7 @@ BUILD_DEP_PKGS += CSWlibxpm-dev BUILD_DEP_PKGS += CSWlibaspell-dev +PRESERVECONF += $(sysconfdir)/php.ini PRESERVECONF += $(sysconfdir)/$(MM_LIBDIR)/php.ini PRESERVECONF += $(sysconfdir)/pear.conf PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf @@ -112,17 +117,15 @@ define php5_subpackage 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) # OBSOLETED_BY_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5$(subst _,-,$(1)) PKGFILES_CSWphp5-$(subst _,-,$(1)) += .*/$(1).so PKGFILES_CSWphp5-$(subst _,-,$(1)) += $(includedir)/php/ext/$(1) -# CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5 endef PACKAGES += CSWphp5 -CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Language RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibexpat1 CSWlibz1 RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n57 @@ -131,45 +134,63 @@ INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 # 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 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/php/PEAR/Config.php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/php/PEAR/Config.php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/php/PEAR/Config.php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/php/doc/PEAR/README.rst +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/php/doc/PEAR/README.rst +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/php/doc/PEAR/README.rst +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/php-cgi +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/php-cgi +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/php-cgi +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/sbin/php-fpm +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/sbin/amd64/php-fpm +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/sbin/sparcv9/php-fpm # verify these... CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php.ini.CSW -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/php/man/man1/php-config.1 -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so -CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/doc/PEAR/README.rst +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/64/php.ini.CSW +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php-fpm.conf.default - PACKAGES += CSWphp5-dev -CATALOGNAME_CSWphp5-dev = php5_dev SPKG_DESC_CSWphp5-dev = Development files for php5 RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 -PKGFILES_CSWphp5-dev = $(prefix)/php5/bin/php-config -PKGFILES_CSWphp5-dev = $(prefix)/bin/php-config -PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/phpize -PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/peardev -PKGFILES_CSWphp5-dev += $(prefix)/bin/peardev -PKGFILES_CSWphp5-dev += $(prefix)/php5/lib/php/build/.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/TSRM.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/Zend.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/include.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/main.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/regex.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/date.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/filter.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/libxml.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/pcre.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/spl.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/standard.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/xml.* -PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/php-config.1 -PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/phpize.1 -CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 -CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 -CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool -CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 -CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 +# Some include files like the ones for hash and session belong to the +# specific PHP module package and not the general PHP development package +PKGFILES_DEVEL_INCLUDEDIR = +PKGFILES_CSWphp5-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWphp5-dev += $(call baseisadirs,$(bindir),phpize) +PKGFILES_CSWphp5-dev += $(call baseisadirs,$(bindir),peardev) +PKGFILES_CSWphp5-dev += $(call baseisadirs,$(libdir),build/.*) +PKGFILES_CSWphp5-dev += $(prefix)/include/php/TSRM.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/Zend.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/include.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/main.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/regex.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/date.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/filter.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/libxml.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/pcre.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/spl.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/standard.* +PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/xml.* +PKGFILES_CSWphp5-dev += $(mandir)/man1/php-config.1 +PKGFILES_CSWphp5-dev += $(mandir)/man1/phpize.1 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/build/acinclude.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/build/libtool.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/build/shtool +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/build/phpize.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/build/acinclude.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/build/libtool.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/build/shtool +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/build/phpize.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/build/acinclude.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/build/libtool.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/build/shtool +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/build/phpize.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 EXTRA_MERGE_EXCLUDE_FILES-ap24 += $(prefix)/apache2.* EXTRA_MERGE_EXCLUDE_FILES-ap2 += $(sysconfdir_ap24).* @@ -185,16 +206,13 @@ RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicui18n57 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc57 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio57 -#PKGFILES_CSWap24-modphp5 += $(call baseisadirs,$(prefix)/lib,apache2/modules/libphp5.so) -PKGFILES_CSWap24-modphp5 += $(prefix)/lib/apache2/modules/libphp5.so -PKGFILES_CSWap24-modphp5 += $(prefix)/lib/64/apache2/modules/libphp5.so +PKGFILES_CSWap24-modphp5 += $(call pkgfiles_lib,apache2/modules/libphp5.so) PKGFILES_CSWap24-modphp5 += $(sysconfdir_ap24).* -#work/solaris10-i386/pkgroot/opt/csw/lib/apache2/modules/libphp5.so -#work/solaris10-i386/pkgroot/opt/csw/lib/64/apache2/modules/libphp5.so - CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWapache24 CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so +CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/apache2/modules/libphp5.so +CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/apache2/modules/libphp5.so PACKAGES += CSWap2-modphp5 SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module @@ -211,6 +229,8 @@ CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so +# There are no 64 bit packages for Apache 2.2 +CHECKPKG_OVERRIDES_CSWap2-modphp5 += 64-bit-binaries-missing $(eval $(call php5_subpackage,bcmath,)) $(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0)) @@ -251,7 +271,7 @@ CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibssl1-0-0 $(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18)) $(eval $(call php5_subpackage,odbc,CSWlibodbc2)) -RUNTIME_DEP_PKGS_CSWphp5-openssl_sparc += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWphp5-openssl_sparc += CSWlibintl9 RUNTIME_DEP_PKGS_CSWphp5-openssl += $(RUNTIME_DEP_PKGS_CSWphp5-openssl_$(GARCH)) $(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0)) $(eval $(call php5_subpackage,pcntl,)) @@ -258,23 +278,19 @@ $(eval $(call php5_subpackage,pdo,)) PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* $(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo)) -PKGFILES_CSWphp5-pdomysql += .*/lib/extensions/.*/pdo_mysql.so -PKGFILES_CSWphp5-pdomysql += .*/lib/64/extensions/.*/pdo_mysql.so +PKGFILES_CSWphp5-pdomysql += $(call baseisadirs,$(libdir),extensions/.*/pdo_mysql.so) PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pdoodbc,CSWlibodbc2 CSWphp5-pdo)) -PKGFILES_CSWphp5-pdoodbc += .*/lib/extensions/.*/pdo_odbc.so -PKGFILES_CSWphp5-pdoodbc += .*/lib/64/extensions/.*/pdo_odbc.so +PKGFILES_CSWphp5-pdoodbc += $(call baseisadirs,$(libdir),extensions/.*/pdo_odbc.so) PKGFILES_CSWphp5-pdoodbc += .*extensions/pdo_odbc CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pdopgsql,CSWlibpq5 CSWphp5-pdo)) -PKGFILES_CSWphp5-pdopgsql += .*/lib/extensions/.*/pdo_pgsql.so -PKGFILES_CSWphp5-pdopgsql += .*/lib/64/extensions/.*/pdo_pgsql.so +PKGFILES_CSWphp5-pdopgsql += $(call baseisadirs,$(libdir),extensions/.*/pdo_pgsql.so) PKGFILES_CSWphp5-pdopgsql += .*extensions/pdo_pgsql CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pdosqlite,CSWphp5-pdo CSWlibsqlite3-0)) -PKGFILES_CSWphp5-pdosqlite += .*/lib/extensions/.*/pdo_sqlite.so -PKGFILES_CSWphp5-pdosqlite += .*/lib/64/extensions/.*/pdo_sqlite.so +PKGFILES_CSWphp5-pdosqlite += $(call baseisadirs,$(libdir),extensions/.*/pdo_sqlite.so) PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo $(eval $(call php5_subpackage,pgsql,CSWlibpq5)) @@ -363,12 +379,12 @@ # configure: WARNING: unrecognized options: --enable-magic-quotes, --enable-sqlite-utf8, --enable-sqlite3, --with-curlwrappers, --with-exec-dir, --with-sqlite # Taken out for testing -exec_prefix = /opt/csw/php5 +#exec_prefix = /opt/csw/php5 -EXTRA_MERGE_DIRS += $(abspath $(prefix)/bin/$(MM_LIBDIR)) -EXTRA_MERGE_DIRS += $(abspath $(prefix)/sbin/$(MM_LIBDIR)) -EXTRA_MERGE_DIRS += $(abspath $(prefix)/libexec/$(MM_LIBDIR)) -EXTRA_MERGE_DIRS += $(abspath $(prefix)/lib/$(MM_LIBDIR)) +#EXTRA_MERGE_DIRS += $(abspath $(prefix)/bin/$(MM_LIBDIR)) +#EXTRA_MERGE_DIRS += $(abspath $(prefix)/sbin/$(MM_LIBDIR)) +#EXTRA_MERGE_DIRS += $(abspath $(prefix)/libexec/$(MM_LIBDIR)) +#EXTRA_MERGE_DIRS += $(abspath $(prefix)/lib/$(MM_LIBDIR)) #MERGEBASE_$(bindir) ?= $(bindir_install) #MERGEBASE_$(sbindir) ?= $(sbindir_install) @@ -532,16 +548,16 @@ rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f* perl -pi -e 's!s:17:"http://proxy:3128!s:0:"!' $(DESTDIR)$(sysconfdir)/pear.conf* mkdir -p $(DESTDIR)$(prefix)/bin/$(MM_BINDIR) - ( cd $(DESTDIR)$(prefix)/bin/$(MM_BINDIR); \ - for f in pear peardev pecl phar php php-config; do \ - ln -s $(if $(filter 64,$(MEMORYMODEL)),../../php5/bin/$(MM_BINDIR)/$$f,../php5/bin/$$f) $$f; \ - done ) + #( cd $(DESTDIR)$(prefix)/bin/$(MM_BINDIR); \ + # for f in pear peardev pecl phar php php-config; do \ + # ln -s $(if $(filter 64,$(MEMORYMODEL)),../../php5/bin/$(MM_BINDIR)/$$f,../php5/bin/$$f) $$f; \ + # done ) @$(MAKECOOKIE) -post-merge-all: - gln -s . $(PKGROOT)$(libdir)/32 - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - @$(MAKECOOKIE) +#post-merge-all: +# gln -s . $(PKGROOT)$(libdir)/32 +# gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 +# @$(MAKECOOKIE) #post-merge-all: 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 Aug 21 20:06:04 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 Aug 2020 18:06:04 +0000 Subject: SF.net SVN: gar:[26691] csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Message-ID: <1598033164.226270.6135@sfp-scm-5.v30.lw.sourceforge.com> Revision: 26691 http://sourceforge.net/p/gar/code/26691 Author: dmichelsen Date: 2020-08-21 18:06:03 +0000 (Fri, 21 Aug 2020) Log Message: ----------- php5/branches/php-5.6.x: Fix dependency Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2020-08-21 17:30:24 UTC (rev 26690) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2020-08-21 18:06:03 UTC (rev 26691) @@ -237,6 +237,7 @@ $(eval $(call php5_subpackage,calendar,)) $(eval $(call php5_subpackage,ctype,)) RUNTIME_DEP_PKGS_CSWphp5-curl_sparc += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWphp5-curl_sparc += CSWlibcares2 RUNTIME_DEP_PKGS_CSWphp5-curl += $(RUNTIME_DEP_PKGS_CSWphp5-curl_$(GARCH)) $(eval $(call php5_subpackage,curl,CSWlibcurl4)) $(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42)) @@ -258,6 +259,8 @@ $(eval $(call php5_subpackage,iconv,CSWlibiconv2)) PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* $(eval $(call php5_subpackage,imap,CSWlibc-client-dev)) +RUNTIME_DEP_PKGS_CSWphp5-iconv_sparc += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWphp5-iconv += $(RUNTIME_DEP_PKGS_CSWphp5-iconv_$(GARCH)) $(eval $(call php5_subpackage,json,)) $(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2)) $(eval $(call php5_subpackage,mbstring,)) 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 Aug 21 22:12:45 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 Aug 2020 20:12:45 +0000 Subject: SF.net SVN: gar:[26692] csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Message-ID: <1598040765.343082.20514@sfp-scm-5.v30.lw.sourceforge.com> Revision: 26692 http://sourceforge.net/p/gar/code/26692 Author: dmichelsen Date: 2020-08-21 20:12:45 +0000 (Fri, 21 Aug 2020) Log Message: ----------- php5/branches/php-5.6.x: Fix dependency Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2020-08-21 18:06:03 UTC (rev 26691) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2020-08-21 20:12:45 UTC (rev 26692) @@ -259,8 +259,8 @@ $(eval $(call php5_subpackage,iconv,CSWlibiconv2)) PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* $(eval $(call php5_subpackage,imap,CSWlibc-client-dev)) -RUNTIME_DEP_PKGS_CSWphp5-iconv_sparc += CSWlibintl9 -RUNTIME_DEP_PKGS_CSWphp5-iconv += $(RUNTIME_DEP_PKGS_CSWphp5-iconv_$(GARCH)) +RUNTIME_DEP_PKGS_CSWphp5-imap_sparc += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWphp5-imap += $(RUNTIME_DEP_PKGS_CSWphp5-imap_$(GARCH)) $(eval $(call php5_subpackage,json,)) $(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2)) $(eval $(call php5_subpackage,mbstring,)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Aug 23 12:32:19 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 23 Aug 2020 10:32:19 +0000 Subject: SF.net SVN: gar:[26693] csw/mgar/pkg/squid/trunk Message-ID: <1598178739.671747.11895@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26693 http://sourceforge.net/p/gar/code/26693 Author: dmichelsen Date: 2020-08-23 10:32:19 +0000 (Sun, 23 Aug 2020) Log Message: ----------- squid/trunk: Update to 4.13 Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2020-08-21 20:12:45 UTC (rev 26692) +++ csw/mgar/pkg/squid/trunk/Makefile 2020-08-23 10:32:19 UTC (rev 26693) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 4.12 +VERSION = 4.13 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2020-08-21 20:12:45 UTC (rev 26692) +++ csw/mgar/pkg/squid/trunk/checksums 2020-08-23 10:32:19 UTC (rev 26693) @@ -1 +1 @@ -ad7a4a8a0031cae3435717a759173829 squid-4.12.tar.xz +492e54afc15821141ff1d1d9903854d6 squid-4.13.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 Mon Aug 24 09:17:08 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Aug 2020 07:17:08 +0000 Subject: SF.net SVN: gar:[26694] csw/mgar/pkg/squid/trunk Message-ID: <1598253428.763850.27870@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26694 http://sourceforge.net/p/gar/code/26694 Author: dmichelsen Date: 2020-08-24 07:17:08 +0000 (Mon, 24 Aug 2020) Log Message: ----------- squid/trunk: Add workaround for #5073 Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/squid/trunk/files/0001-Replace-index-with-strchr.patch Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2020-08-23 10:32:19 UTC (rev 26693) +++ csw/mgar/pkg/squid/trunk/Makefile 2020-08-24 07:17:08 UTC (rev 26694) @@ -16,7 +16,10 @@ MASTER_SITES = http://www.squid-cache.org/Versions/v$(V1)/ DISTFILES += $(DISTNAME).tar.xz +# Add workaround until this is fixed: +# https://bugs.squid-cache.org/show_bug.cgi?id=5073 PATCHFILES += 0001-Add-include-for-index.patch +PATCHFILES += 0001-Replace-index-with-strchr.patch PACKAGES = CSWsquid RUNTIME_DEP_PKGS_CSWsquid += CSWliblber2-4-2 Added: csw/mgar/pkg/squid/trunk/files/0001-Replace-index-with-strchr.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/0001-Replace-index-with-strchr.patch (rev 0) +++ csw/mgar/pkg/squid/trunk/files/0001-Replace-index-with-strchr.patch 2020-08-24 07:17:08 UTC (rev 26694) @@ -0,0 +1,40 @@ +From 69cb6c1e72e45a8142667b37f6601710005e37a4 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 24 Aug 2020 08:04:31 +0200 +Subject: [PATCH] Replace 'index' with 'strchr' + +--- + src/esi/VarState.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/esi/VarState.cc b/src/esi/VarState.cc +index c98b285..41fe535 100644 +--- a/src/esi/VarState.cc ++++ b/src/esi/VarState.cc +@@ -150,7 +150,7 @@ ESIVariableUserAgent::getProductVersion (char const *s) + { + char const *t; + int len; +- t = index(s,'/'); ++ t = strchr(s,'/'); + + if (!t || !*(++t)) + return xstrdup(""); +@@ -328,12 +328,12 @@ ESIVariableUserAgent::ESIVariableUserAgent(ESIVarState &state) + + if ((t = strstr (s, "MSIE"))) { + browser = ESI_BROWSER_MSIE; +- t = index (t, ' '); ++ t = strchr (t, ' '); + + if (!t) + browserversion = xstrdup(""); + else { +- t1 = index(t, ';'); ++ t1 = strchr(t, ';'); + + if (!t1) + browserversion = xstrdup(t + 1); +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Aug 26 17:30:31 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 Aug 2020 15:30:31 +0000 Subject: SF.net SVN: gar:[26695] csw/mgar/pkg/rrdtool/trunk Message-ID: <1598455831.309198.5002@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26695 http://sourceforge.net/p/gar/code/26695 Author: dmichelsen Date: 2020-08-26 15:30:31 +0000 (Wed, 26 Aug 2020) Log Message: ----------- rrdtool/trunk: Update to 1.7.2 Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rrdtool/trunk/files/0001-Include-limits.h-for-PATH_MAX.patch Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2020-08-24 07:17:08 UTC (rev 26694) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2020-08-26 15:30:31 UTC (rev 26695) @@ -1,5 +1,5 @@ NAME = rrdtool -VERSION = 1.4.8 +VERSION = 1.7.2 GARTYPE = v2 DESCRIPTION = Time-series data logging and graphing @@ -12,23 +12,24 @@ MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/ DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += 0002-Always-link-local-libs-first-during-Perl-module.patch +PATCHFILES += 0001-Include-limits.h-for-PATH_MAX.patch -# Make sure to link against libperl.so to make shared libraries self-contained. -PATCHFILES += 0003-Always-link-against-libperl.so.patch +EXTRA_MODULATORS += PYTHON_VERSION +#MODULATIONS_PYTHON_VERSION = 2.6 2.7 +MODULATIONS_PYTHON_VERSION = 2.7 +# We need 64 bit just once as it is without python anyway +SKIP_MODULATIONS += isa-sparcv9-python_version-2.6 +SKIP_MODULATIONS += isa-amd64-python_version-2.6 +MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all +MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all +MERGE_SCRIPTS_isa-default64-python_version-2.7 += copy-relocated-only +MERGE_DIRS_isa-default64-python_version-2.7 += $(libdir) -# Do not pass LDFLAGS during pysetup or -L/opt/csw/lib will appear too early during -# linking which results in the system installed librrd.so is linked against instead -# of the newly build one -PATCHFILES += 0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch +GARCOMPILER = GNU -# New glib2 is only available for Solaris 10 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - VENDOR_URL = http://oss.oetiker.ch/rrdtool/ -BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibrrd4) -BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibpango-dev BUILD_DEP_PKGS += CSWlibcairo-dev BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWperl @@ -39,38 +40,31 @@ PACKAGES += CSWrrdtool SPKG_DESC_CSWrrdtool = Time-series data logging and graphing RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl9 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibwrap1 -RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4 -RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4 +RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd8 OBSOLETED_BY_CSWrrdtool = CSWrrd CATALOGNAME_CSWrrd = rrd_stub PACKAGES += CSWrrdtool-dev -SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.4 +SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.8 # Explicitly do not include *.3perl PKGFILES_DEVEL_MAN3_MANPAGE = $(mandir)/man3/.*\.3 PKGFILES_CSWrrdtool-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd4 -RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th4 +RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd8 -PACKAGES += CSWlibrrd4 -SPKG_DESC_CSWlibrrd4 = Runtime library for RRDtool, librrd.so.4 -PKGFILES_CSWlibrrd4 += $(call pkgfiles_lib,librrd.so.4) -RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango -RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1 +PACKAGES += CSWlibrrd8 +SPKG_DESC_CSWlibrrd8 = Runtime library for RRDtool, librrd.so.8 +PKGFILES_CSWlibrrd8 += $(call pkgfiles_lib,librrd.so.8) +RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibpangocairo1-0-0 +RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibdbi1 +RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibpng16-16 -PACKAGES += CSWlibrrd-th4 -SPKG_DESC_CSWlibrrd-th4 = Runtime library for RRDtool, librrd_th.so.4 -PKGFILES_CSWlibrrd-th4 += $(call pkgfiles_lib,librrd_th.so.4) -RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango -RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibdbi1 +# RRDTool is now threadsafe by default, so there is no more librrd-th4 PACKAGES += CSWpm-rrdtool SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of RRDtool) @@ -80,22 +74,24 @@ PKGFILES_CSWpm-rrdtool += .*\.3perl RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl -RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4 -OBSOLETED_BY_CSWpm-rrdtool = CSWrrd +RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd8 PACKAGES += CSWpy-rrdtool -SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool) -PKGFILES_CSWpy-rrdtool = $(libdir)/python/.* -RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4 -OBSOLETED_BY_CSWpy-rrdtool = CSWrrd +SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool) +PKGFILES_CSWpy-rrdtool = $(libdir)/python.* +RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd8 +# Python 2.6 libs are acrually quite hard to build due to mixed Sun Studio / GCC compiler +# requirements, skip 2.6 for now. +CHECKPKG_OVERRIDES_CSWpy-rrdtool += python-package-missing-py26-files +# This is ok as the magic is in the share lib only. +CHECKPKG_OVERRIDES_CSWpy-rrdtool += python-package-missing-py-files PACKAGES += CSWrb-rrdtool -SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool) +SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool) PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.* -RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby18-1 -RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4 -OBSOLETED_BY_CSWrb-rrdtool = CSWrrd +RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWruby20 # This is crappy and needs fixing, unfortunately inside extconf.rb which is hard. CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry @@ -124,10 +120,20 @@ EXTRA_INC += $(includedir)/glib-2.0 EXTRA_INC += $(libdir)/glib-2.0/include +# We need PATH_MAX from limits.h +EXTRA_CPPFLAGS += -D__EXTENSIONS__ + +# Avoid the error "Compiler or options invalid for pre-UNIX 03 X/Open applications and pre-2001 POSIX applications" +EXTRA_CPPFLAGS += -D_XPG6 + EXTRA_LINKER_FLAGS = -lintl -z ignore BUILD64_LIBS_ONLY = 1 +# We do not want to link against the (possibly old) version of librrd.so +#LD_OPTIONS = +#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + # Verbose build output # BUILD_ARGS += V=1 @@ -150,8 +156,15 @@ CONFIGURE_ARGS += --with-libintl-prefix=$(libdir) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL)) -# TEST_TARGET = check +EXTRA_CONFIGURE_EXPORTS += PYTHON +CONFIGURE_ENV_PYTHON = $(bindir)/python$(PYTHON_VERSION) +# Testsuite is failing due to mismatch in number representation like 'nan' instead of 'NaN' +SKIPTEST ?= 1 + +# We need 'readlink' and 'seq' +TEST_ENV_PATH = /opt/csw/gnu:$(PATH) + # MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*/\.packlist EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(NAME)-$(VERSION),.$(BUILD_PREFIX)/share/doc/rrdtool,' Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2020-08-24 07:17:08 UTC (rev 26694) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2020-08-26 15:30:31 UTC (rev 26695) @@ -1 +1 @@ -dbe59386db97fd2f2216729facd74ca8 rrdtool-1.4.8.tar.gz +638e3a0a1609d97e9f82e8832759dcd2 rrdtool-1.7.2.tar.gz Added: csw/mgar/pkg/rrdtool/trunk/files/0001-Include-limits.h-for-PATH_MAX.patch =================================================================== --- csw/mgar/pkg/rrdtool/trunk/files/0001-Include-limits.h-for-PATH_MAX.patch (rev 0) +++ csw/mgar/pkg/rrdtool/trunk/files/0001-Include-limits.h-for-PATH_MAX.patch 2020-08-26 15:30:31 UTC (rev 26695) @@ -0,0 +1,24 @@ +From 5fa8685a53ac551df3186354cf9d4d3348a798a7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 25 Aug 2020 14:59:57 +0200 +Subject: [PATCH] Include limits.h for PATH_MAX + +--- + src/rrd_list.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/rrd_list.c b/src/rrd_list.c +index e743b9b..c5c9479 100644 +--- a/src/rrd_list.c ++++ b/src/rrd_list.c +@@ -15,6 +15,7 @@ + #include + #endif + #include ++#include + + #include "rrd_tool.h" + #include "rrd_client.h" +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Aug 27 10:59:15 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Aug 2020 08:59:15 +0000 Subject: SF.net SVN: gar:[26696] csw/mgar/pkg/rrdtool/trunk/Makefile Message-ID: <1598518755.854359.29933@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26696 http://sourceforge.net/p/gar/code/26696 Author: dmichelsen Date: 2020-08-27 08:59:15 +0000 (Thu, 27 Aug 2020) Log Message: ----------- rrdtool/trunk: Update dependencies on Sparc due to linker anomaly Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2020-08-26 15:30:31 UTC (rev 26695) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2020-08-27 08:59:15 UTC (rev 26696) @@ -43,6 +43,11 @@ RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl9 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd8 +RUNTIME_DEP_PKGS_CSWrrdtool-sparc += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWrrdtool-sparc += CSWlibpng16-16 +RUNTIME_DEP_PKGS_CSWrrdtool-sparc += CSWlibdbi1 +RUNTIME_DEP_PKGS_CSWrrdtool += $(RUNTIME_DEP_PKGS_CSWrrdtool-$(GARCH)) + OBSOLETED_BY_CSWrrdtool = CSWrrd CATALOGNAME_CSWrrd = rrd_stub @@ -63,6 +68,9 @@ RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibdbi1 RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibrrd8 += CSWlibpng16-16 +RUNTIME_DEP_PKGS_CSWlibrrd8-sparc += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWlibrrd8-sparc += CSWlibwrap1 +RUNTIME_DEP_PKGS_CSWlibrrd8 += $(RUNTIME_DEP_PKGS_CSWlibrrd8-$(GARCH)) # RRDTool is now threadsafe by default, so there is no more librrd-th4 @@ -82,6 +90,8 @@ RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd8 +RUNTIME_DEP_PKGS_CSWpy-rrdtool-sparc += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWpy-rrdtool += $(RUNTIME_DEP_PKGS_CSWpy-rrdtool-$(GARCH)) # Python 2.6 libs are acrually quite hard to build due to mixed Sun Studio / GCC compiler # requirements, skip 2.6 for now. CHECKPKG_OVERRIDES_CSWpy-rrdtool += python-package-missing-py26-files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.