From janholzh at users.sourceforge.net Tue Mar 1 15:15:50 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 1 Mar 2016 14:15:50 +0000 Subject: SF.net SVN: gar:[25586] csw/mgar/pkg/openssl1/branches/openssl_101 Message-ID: <3qF0qx55hwzVp@mail.opencsw.org> Revision: 25586 http://sourceforge.net/p/gar/code/25586 Author: janholzh Date: 2016-03-01 14:15:50 +0000 (Tue, 01 Mar 2016) Log Message: ----------- openssl1/branches/openssl_101: update to 1.0.1s Modified Paths: -------------- csw/mgar/pkg/openssl1/branches/openssl_101/Makefile csw/mgar/pkg/openssl1/branches/openssl_101/checksums Modified: csw/mgar/pkg/openssl1/branches/openssl_101/Makefile =================================================================== --- csw/mgar/pkg/openssl1/branches/openssl_101/Makefile 2016-02-29 12:38:22 UTC (rev 25585) +++ csw/mgar/pkg/openssl1/branches/openssl_101/Makefile 2016-03-01 14:15:50 UTC (rev 25586) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = openssl -VERSION = 1.0.1r +VERSION = 1.0.1s GARTYPE = v2 # Since version 1.0.0, soname is fixed and does not follow the minor releases SONAME=1.0.0 Modified: csw/mgar/pkg/openssl1/branches/openssl_101/checksums =================================================================== --- csw/mgar/pkg/openssl1/branches/openssl_101/checksums 2016-02-29 12:38:22 UTC (rev 25585) +++ csw/mgar/pkg/openssl1/branches/openssl_101/checksums 2016-03-01 14:15:50 UTC (rev 25586) @@ -1 +1 @@ -1abd905e079542ccae948af37e393d28 openssl-1.0.1r.tar.gz +562986f6937aabc7c11a6d376d8a0d26 openssl-1.0.1s.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Mar 1 15:52:40 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 1 Mar 2016 14:52:40 +0000 Subject: SF.net SVN: gar:[25587] csw/mgar/pkg/openssl1/branches/openssl_101/files Message-ID: <3qF1fJ21zLzYv@mail.opencsw.org> Revision: 25587 http://sourceforge.net/p/gar/code/25587 Author: janholzh Date: 2016-03-01 14:52:39 +0000 (Tue, 01 Mar 2016) Log Message: ----------- openssl1/branches/openssl_101: fix map files Modified Paths: -------------- csw/mgar/pkg/openssl1/branches/openssl_101/files/map.openssl.libcrypto csw/mgar/pkg/openssl1/branches/openssl_101/files/map.openssl.libssl Modified: csw/mgar/pkg/openssl1/branches/openssl_101/files/map.openssl.libcrypto =================================================================== --- csw/mgar/pkg/openssl1/branches/openssl_101/files/map.openssl.libcrypto 2016-03-01 14:15:50 UTC (rev 25586) +++ csw/mgar/pkg/openssl1/branches/openssl_101/files/map.openssl.libcrypto 2016-03-01 14:52:39 UTC (rev 25587) @@ -3739,3 +3739,10 @@ CRYPTO_memcmp = DIRECT; } OPENSSL_1.0.1; +OPENSSL_1.0.1s { + global: + SRP_user_pwd_free = DIRECT; + SRP_VBASE_get1_by_user = DIRECT; +} OPENSSL_1.0.1d; + + Modified: csw/mgar/pkg/openssl1/branches/openssl_101/files/map.openssl.libssl =================================================================== --- csw/mgar/pkg/openssl1/branches/openssl_101/files/map.openssl.libssl 2016-03-01 14:15:50 UTC (rev 25586) +++ csw/mgar/pkg/openssl1/branches/openssl_101/files/map.openssl.libssl 2016-03-01 14:52:39 UTC (rev 25587) @@ -223,9 +223,6 @@ SSLv23_client_method = DIRECT; SSLv23_method = DIRECT; SSLv23_server_method = DIRECT; - SSLv2_client_method = DIRECT; - SSLv2_method = DIRECT; - SSLv2_server_method = DIRECT; SSLv3_client_method = DIRECT; SSLv3_method = DIRECT; SSLv3_server_method = DIRECT; 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 Mar 1 18:20:35 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 1 Mar 2016 17:20:35 +0000 Subject: SF.net SVN: gar:[25588] csw/mgar/pkg/stunnel/trunk Message-ID: <3qF4x02Z73zf2@mail.opencsw.org> Revision: 25588 http://sourceforge.net/p/gar/code/25588 Author: dmichelsen Date: 2016-03-01 17:20:35 +0000 (Tue, 01 Mar 2016) Log Message: ----------- stunnel/trunk: Update to 5.31 Modified Paths: -------------- csw/mgar/pkg/stunnel/trunk/Makefile csw/mgar/pkg/stunnel/trunk/checksums Modified: csw/mgar/pkg/stunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/stunnel/trunk/Makefile 2016-03-01 14:52:39 UTC (rev 25587) +++ csw/mgar/pkg/stunnel/trunk/Makefile 2016-03-01 17:20:35 UTC (rev 25588) @@ -7,7 +7,7 @@ # Test on Solaris 8 / 9 for comparison # NAME = stunnel -VERSION = 5.30 +VERSION = 5.31 #BETA = b3 GARTYPE = v2 Modified: csw/mgar/pkg/stunnel/trunk/checksums =================================================================== --- csw/mgar/pkg/stunnel/trunk/checksums 2016-03-01 14:52:39 UTC (rev 25587) +++ csw/mgar/pkg/stunnel/trunk/checksums 2016-03-01 17:20:35 UTC (rev 25588) @@ -1 +1 @@ -7bbf27296a83c0b752f6bb6d1b750b19 stunnel-5.30.tar.gz +a39b89624984cefc6d229a54f34b33ec stunnel-5.31.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Mar 3 11:28:58 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 3 Mar 2016 10:28:58 +0000 Subject: SF.net SVN: gar:[25589] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: <3qG7jF3M7Jz9h@mail.opencsw.org> Revision: 25589 http://sourceforge.net/p/gar/code/25589 Author: janholzh Date: 2016-03-03 10:28:58 +0000 (Thu, 03 Mar 2016) Log Message: ----------- lang-python/python/trunk: fix deps Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2016-03-01 17:20:35 UTC (rev 25588) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2016-03-03 10:28:58 UTC (rev 25589) @@ -165,13 +165,13 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbdb47 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 +#RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 +#RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Mar 3 16:51:01 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 3 Mar 2016 15:51:01 +0000 Subject: SF.net SVN: gar:[25590] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: <3qGJ0h1kCFz6P@mail.opencsw.org> Revision: 25590 http://sourceforge.net/p/gar/code/25590 Author: janholzh Date: 2016-03-03 15:51:01 +0000 (Thu, 03 Mar 2016) Log Message: ----------- ruby19/trunk: fix deps Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2016-03-03 10:28:58 UTC (rev 25589) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2016-03-03 15:51:01 UTC (rev 25590) @@ -46,7 +46,7 @@ SPKG_DESC_CSWlibruby1-9-1-1 = The libruby shared object files (Ruby $(VERSION), API $(API_VERSION)) RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 = CSWlibgdbm4 CSWlibiconv2 CSWlibncurses5 RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibssl1-0-0 CSWlibyaml0-2 -RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibreadline6 CSWlibz1 CSWlibffi4 +RUNTIME_DEP_PKGS_CSWlibruby1-9-1-1 += CSWlibreadline6 CSWlibz1 CSWlibffi6 PKGFILES_CSWlibruby1-9-1-1 += $(call baseisadirs,$(libdir),libruby$(API_VERSION)\.so\.1.*) PKGFILES_CSWlibruby1-9-1-1 += $(libdir)/ruby/.* 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 Mar 6 15:45:54 2016 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sun, 6 Mar 2016 14:45:54 +0000 Subject: SF.net SVN: gar:[25591] csw/mgar/pkg/perl5/trunk/Makefile Message-ID: <3qJ5GJ62P2z14b@mail.opencsw.org> Revision: 25591 http://sourceforge.net/p/gar/code/25591 Author: claudio_sf Date: 2016-03-06 14:45:54 +0000 (Sun, 06 Mar 2016) Log Message: ----------- perl5/trunk: prepare inclusion Modified Paths: -------------- csw/mgar/pkg/perl5/trunk/Makefile Modified: csw/mgar/pkg/perl5/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl5/trunk/Makefile 2016-03-03 15:51:01 UTC (rev 25590) +++ csw/mgar/pkg/perl5/trunk/Makefile 2016-03-06 14:45:54 UTC (rev 25591) @@ -24,6 +24,7 @@ PACKAGES = CSWperl5 PKG_DESC_CSWperl = $(DESCRIPTION) SPKG_DESC_CSWperl = $(DESCRIPTION) +OBSOLETED_BY_CSWperl = CSWperl CSWperldoc CSWpm-cpan-meta CSWpm-test-use-ok CSWpm-test-tester CSWpm-json-pp CSWpm-parse-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-experimental CSWpm-cpan-meta-requirements CSWpm-perl-ostype LICENSE = Copying # GCC build (Sun Studio build has been fixed) @@ -45,13 +46,13 @@ CONFIGURE_ARGS += -Dcc=$(CC) CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1perl$(VERSION_MAJOR_FULL) +CONFIGURE_ARGS += -Dman1ext=1 CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3perl$(VERSION_MAJOR_FULL) +CONFIGURE_ARGS += -Dman3ext=3 CONFIGURE_ARGS += -Dperladmin="root at localhost" CONFIGURE_ARGS += -Dprefix=$(prefix) CONFIGURE_ARGS += -Dbin=$(bindir) -CONFIGURE_ARGS += -Dscriptdir=$(bindir)/perl5scripts +CONFIGURE_ARGS += -Dscriptdir=$(bindir) CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR_FULL) CONFIGURE_ARGS += -Dsitearch=/opt/csw/local/lib/perl/$(VERSION_MAJOR_FULL) CONFIGURE_ARGS += -Dsitelib=/opt/csw/local/share/perl/$(VERSION_MAJOR_FULL) @@ -112,7 +113,7 @@ # Test # This test fails due the NFS setup of the buildfarm. If only this test fails -# just package it wit +# just package it with SKIPTEST=1 # $ SKIPTEST=1 mgar package # cpan/ExtUtils-Command/t/cp .................................... # Failed test 'cp updated mtime' # at t/cp.t line 26. @@ -132,5 +133,5 @@ install-perl: INSTALL_EXPORTS = PATH LD_OPTIONS DESTDIR install-perl: - (cd $(WORKSRC) ; $(INSTALL_ENV) $(MAKE) $(MAKE_OPT) install PERLNAME=perl5 PERLNAME_VERBASE=perl) + (cd $(WORKSRC) ; $(INSTALL_ENV) $(MAKE) $(MAKE_OPT) 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 Sun Mar 6 16:50:50 2016 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sun, 6 Mar 2016 15:50:50 +0000 Subject: SF.net SVN: gar:[25592] csw/mgar/pkg/perl5/trunk/Makefile Message-ID: <3qJ6j60J0Fz17H@mail.opencsw.org> Revision: 25592 http://sourceforge.net/p/gar/code/25592 Author: claudio_sf Date: 2016-03-06 15:50:49 +0000 (Sun, 06 Mar 2016) Log Message: ----------- perl5/trunk: typo Modified Paths: -------------- csw/mgar/pkg/perl5/trunk/Makefile Modified: csw/mgar/pkg/perl5/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl5/trunk/Makefile 2016-03-06 14:45:54 UTC (rev 25591) +++ csw/mgar/pkg/perl5/trunk/Makefile 2016-03-06 15:50:49 UTC (rev 25592) @@ -22,9 +22,9 @@ DISTFILES = perl-$(VERSION_FULL).tar.bz2 PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc PACKAGES = CSWperl5 -PKG_DESC_CSWperl = $(DESCRIPTION) -SPKG_DESC_CSWperl = $(DESCRIPTION) -OBSOLETED_BY_CSWperl = CSWperl CSWperldoc CSWpm-cpan-meta CSWpm-test-use-ok CSWpm-test-tester CSWpm-json-pp CSWpm-parse-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-experimental CSWpm-cpan-meta-requirements CSWpm-perl-ostype +PKG_DESC_CSWperl5 = $(DESCRIPTION) +SPKG_DESC_CSWperl5 = $(DESCRIPTION) +OBSOLETED_BY_CSWperl5 = CSWperl CSWperldoc CSWpm-cpan-meta CSWpm-test-use-ok CSWpm-test-tester CSWpm-json-pp CSWpm-parse-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-experimental CSWpm-cpan-meta-requirements CSWpm-perl-ostype LICENSE = Copying # GCC build (Sun Studio build has been fixed) 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 Mar 6 16:59:42 2016 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Sun, 6 Mar 2016 15:59:42 +0000 Subject: SF.net SVN: gar:[25593] csw/mgar/pkg/perl5/trunk/Makefile Message-ID: <3qJ6vN0KS6z19n@mail.opencsw.org> Revision: 25593 http://sourceforge.net/p/gar/code/25593 Author: claudio_sf Date: 2016-03-06 15:59:41 +0000 (Sun, 06 Mar 2016) Log Message: ----------- perl5/trunk: overrides Modified Paths: -------------- csw/mgar/pkg/perl5/trunk/Makefile Modified: csw/mgar/pkg/perl5/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl5/trunk/Makefile 2016-03-06 15:50:49 UTC (rev 25592) +++ csw/mgar/pkg/perl5/trunk/Makefile 2016-03-06 15:59:41 UTC (rev 25593) @@ -17,11 +17,11 @@ endef #MASTER_SITES = manual:// -MASTER_SITES = http://www.cpan.org/src/5.0/ -VENDOR_URL = http://www.perl.org -DISTFILES = perl-$(VERSION_FULL).tar.bz2 -PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc -PACKAGES = CSWperl5 +MASTER_SITES = http://www.cpan.org/src/5.0/ +VENDOR_URL = http://www.perl.org +DISTFILES = perl-$(VERSION_FULL).tar.bz2 +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc +PACKAGES = CSWperl5 PKG_DESC_CSWperl5 = $(DESCRIPTION) SPKG_DESC_CSWperl5 = $(DESCRIPTION) OBSOLETED_BY_CSWperl5 = CSWperl CSWperldoc CSWpm-cpan-meta CSWpm-test-use-ok CSWpm-test-tester CSWpm-json-pp CSWpm-parse-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-experimental CSWpm-cpan-meta-requirements CSWpm-perl-ostype @@ -46,9 +46,9 @@ CONFIGURE_ARGS += -Dcc=$(CC) CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL) CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1 -CONFIGURE_ARGS += -Dman1ext=1 +CONFIGURE_ARGS += -Dman1ext=1perl CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3 -CONFIGURE_ARGS += -Dman3ext=3 +CONFIGURE_ARGS += -Dman3ext=3perl CONFIGURE_ARGS += -Dperladmin="root at localhost" CONFIGURE_ARGS += -Dprefix=$(prefix) CONFIGURE_ARGS += -Dbin=$(bindir) @@ -89,8 +89,9 @@ RUNTIME_DEP_PKGS_CSWperl5 += CSWlibgdbm4 CHECKPKG_OVERRIDES_CSWperl5 += file-with-bad-content # Temporary deps -#RUNTIME_DEP_PKGS_CSWperl5 += CSWperl +RUNTIME_DEP_PKGS_CSWperl5 += CSWperl CHECKPKG_OVERRIDES_CSWperl5 += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWpm-cpan-meta-requirements += catalogname-too-long # weird .nfs* file leftover #CHECKPKG_OVERRIDES_CSWperl5 += pkginfo-opencsw-repository-uncommitted This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Mar 7 15:41:01 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 7 Mar 2016 14:41:01 +0000 Subject: SF.net SVN: gar:[25594] csw/mgar/pkg/ruby20/trunk/Makefile Message-ID: <3qJj653LPMz1YD@mail.opencsw.org> Revision: 25594 http://sourceforge.net/p/gar/code/25594 Author: janholzh Date: 2016-03-07 14:41:00 +0000 (Mon, 07 Mar 2016) Log Message: ----------- ruby20/trunk: update deps Modified Paths: -------------- csw/mgar/pkg/ruby20/trunk/Makefile Modified: csw/mgar/pkg/ruby20/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby20/trunk/Makefile 2016-03-06 15:59:41 UTC (rev 25593) +++ csw/mgar/pkg/ruby20/trunk/Makefile 2016-03-07 14:41:00 UTC (rev 25594) @@ -34,7 +34,7 @@ PACKAGES = CSWruby20 SPKG_DESC_CSWruby20 = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWruby20 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWruby20 += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWruby20 += CSWlibffi6 RUNTIME_DEP_PKGS_CSWruby20 += CSWlibtk8-5 RUNTIME_DEP_PKGS_CSWruby20 += CSWlibtcl8-5 RUNTIME_DEP_PKGS_CSWruby20 += CSWlibyaml0-2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Mar 7 17:09:41 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 7 Mar 2016 16:09:41 +0000 Subject: SF.net SVN: gar:[25595] csw/mgar/pkg Message-ID: <3qJl4Y6B3qz5J@mail.opencsw.org> Revision: 25595 http://sourceforge.net/p/gar/code/25595 Author: cgrzemba Date: 2016-03-07 16:09:40 +0000 (Mon, 07 Mar 2016) Log Message: ----------- xastir/trunk: Initial commit version 2.0.6 Added Paths: ----------- csw/mgar/pkg/xastir/ csw/mgar/pkg/xastir/Makefile csw/mgar/pkg/xastir/branches/ csw/mgar/pkg/xastir/tags/ csw/mgar/pkg/xastir/trunk/ csw/mgar/pkg/xastir/trunk/Makefile csw/mgar/pkg/xastir/trunk/checksums csw/mgar/pkg/xastir/trunk/files/ Added: csw/mgar/pkg/xastir/Makefile =================================================================== --- csw/mgar/pkg/xastir/Makefile (rev 0) +++ csw/mgar/pkg/xastir/Makefile 2016-03-07 16:09:40 UTC (rev 25595) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/xastir/trunk =================================================================== --- csw/mgar/pkg/xastir/trunk 2016-03-07 14:41:00 UTC (rev 25594) +++ csw/mgar/pkg/xastir/trunk 2016-03-07 16:09:40 UTC (rev 25595) Property changes on: csw/mgar/pkg/xastir/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/xastir/trunk/Makefile =================================================================== --- csw/mgar/pkg/xastir/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xastir/trunk/Makefile 2016-03-07 16:09:40 UTC (rev 25595) @@ -0,0 +1,29 @@ +# +NAME = xastir +VERSION = 2.0.6 +GARTYPE = v2 + +DESCRIPTION = APRS Client +define BLURB + Xastir provides mapping, tracking, messaging, weather, weather alerts, and Search & Rescue features over radio or internet and runs on a variety of platforms. Xastir is an open source software project maintained by Developers and Contributors from all over the globe, provided free under the GNU General Public License. From its early beginnings, Xastir has evolved into a very robust client with a rich feature set that rivals other APRS clients. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz + +# studio ignores inline statement +GARCOMPILER = GCC5 + +RUNTIME_DEP_PKGS_CSWxastir += CSWlibgdal1 +RUNTIME_DEP_PKGS_CSWxastir += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWxastir += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWxastir += CSWlibxpm4 +RUNTIME_DEP_PKGS_CSWxastir += CSWperl +# use libdb-5 of database/berkeleydb-5, Solaris11 +CHECKPKG_OVERRIDES_CSWxastir += soname-not-found|libdb-5.3.so|is|needed|by|opt/csw/bin/xastir +CHECKPKG_OVERRIDES_CSWxastir += discouraged-path-in-pkgmap|/opt/csw/share/doc/xastir/README.CVS + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/xastir/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/xastir/trunk/checksums =================================================================== --- csw/mgar/pkg/xastir/trunk/checksums (rev 0) +++ csw/mgar/pkg/xastir/trunk/checksums 2016-03-07 16:09:40 UTC (rev 25595) @@ -0,0 +1 @@ +08a39e442a1117e8f5a72ddea64eedb2 xastir-2.0.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Mar 8 09:26:18 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 8 Mar 2016 08:26:18 +0000 Subject: SF.net SVN: gar:[25596] csw/mgar/pkg/libfastjson/trunk Message-ID: <3qK8lG2mbfzMm@mail.opencsw.org> Revision: 25596 http://sourceforge.net/p/gar/code/25596 Author: dmichelsen Date: 2016-03-08 08:26:17 +0000 (Tue, 08 Mar 2016) Log Message: ----------- libfastjson/trunk: Update to 0.99.2 Modified Paths: -------------- csw/mgar/pkg/libfastjson/trunk/Makefile csw/mgar/pkg/libfastjson/trunk/checksums Modified: csw/mgar/pkg/libfastjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfastjson/trunk/Makefile 2016-03-07 16:09:40 UTC (rev 25595) +++ csw/mgar/pkg/libfastjson/trunk/Makefile 2016-03-08 08:26:17 UTC (rev 25596) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = libfastjson -VERSION = 0.99.0 +VERSION = 0.99.2 GARTYPE = v2 DESCRIPTION = A fork of the json-c library optimized for liblognorm Modified: csw/mgar/pkg/libfastjson/trunk/checksums =================================================================== --- csw/mgar/pkg/libfastjson/trunk/checksums 2016-03-07 16:09:40 UTC (rev 25595) +++ csw/mgar/pkg/libfastjson/trunk/checksums 2016-03-08 08:26:17 UTC (rev 25596) @@ -1 +1 @@ -5d90d00265674696401297e04f08eda5 libfastjson-0.99.0.tar.gz +5e95590422d26b22eb8e9efb073b9b83 libfastjson-0.99.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Mar 8 10:01:00 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 8 Mar 2016 09:01:00 +0000 Subject: SF.net SVN: gar:[25597] csw/mgar/pkg/phpMyAdmin/trunk Message-ID: <3qK9WP2H4BzQP@mail.opencsw.org> Revision: 25597 http://sourceforge.net/p/gar/code/25597 Author: janholzh Date: 2016-03-08 09:01:00 +0000 (Tue, 08 Mar 2016) Log Message: ----------- phpMyAdmin/trunk: update to 4.5.5.1 and change deps Modified Paths: -------------- csw/mgar/pkg/phpMyAdmin/trunk/Makefile csw/mgar/pkg/phpMyAdmin/trunk/checksums Modified: csw/mgar/pkg/phpMyAdmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2016-03-08 08:26:17 UTC (rev 25596) +++ csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2016-03-08 09:01:00 UTC (rev 25597) @@ -1,20 +1,18 @@ NAME = phpMyAdmin -VERSION = 4.2.11 +VERSION = 4.5.5.1 GARTYPE = v2 DESCRIPTION = Effective MySQL Management define BLURB endef -MASTER_SITES = http://garr.dl.sourceforge.net/sourceforge/phpmyadmin/ -DISTFILES = $(NAME)-$(VERSION)-all-languages.tar.bz2 +MASTER_SITES = https://files.phpmyadmin.net/phpMyAdmin/$(VERSION)/ +DISTFILES = $(NAME)-$(VERSION)-all-languages.zip PACKAGES = CSWphpmyadmin CATALOGNAME = phpmyadmin -RUNTIME_DEP_PKGS = CSWap2-modphp5 -RUNTIME_DEP_PKGS += CSWapache2 -RUNTIME_DEP_PKGS += CSWmysql5 +#RUNTIME_DEP_PKGS = CSWap2-modphp5 RUNTIME_DEP_PKGS += CSWphp5 RUNTIME_DEP_PKGS += CSWphp5-ctype RUNTIME_DEP_PKGS += CSWphp5-gd @@ -23,6 +21,11 @@ RUNTIME_DEP_PKGS += CSWphp5-mysqli RUNTIME_DEP_PKGS += CSWphp5-session RUNTIME_DEP_PKGS += CSWphp5-zip +RUNTIME_DEP_PKGS += CSWphp5-openssl +RUNTIME_DEP_PKGS += CSWphp5-xmlreader +RUNTIME_DEP_PKGS += CSWphp5-xmlwriter +RUNTIME_DEP_PKGS += CSWphp5-json +RUNTIME_DEP_PKGS += CSWphp5-curl CONFIGURE_SCRIPTS = BUILD_SCRIPTS = @@ -32,9 +35,7 @@ ARCHALL = 1 SPKG_SOURCEURL = http://www.phpmyadmin.net -CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWap2-modphp5 -CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWmysql5 +#CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWap2-modphp5 CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-ctype CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-gd @@ -43,6 +44,11 @@ CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-mysqli CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-session CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-zip +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-openssl +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-xmlreader +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-xmlwriter +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-json +CHECKPKG_OVERRIDES_CSWphpmyadmin += surplus-dependency|CSWphp5-curl include gar/category.mk Modified: csw/mgar/pkg/phpMyAdmin/trunk/checksums =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/checksums 2016-03-08 08:26:17 UTC (rev 25596) +++ csw/mgar/pkg/phpMyAdmin/trunk/checksums 2016-03-08 09:01:00 UTC (rev 25597) @@ -1 +1 @@ -72494aeb514784c87730b2268caf4a4c phpMyAdmin-4.2.11-all-languages.tar.bz2 +440a32ecfea4d38b10017c3b75de8dcd phpMyAdmin-4.5.5.1-all-languages.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Mar 8 12:13:14 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 8 Mar 2016 11:13:14 +0000 Subject: SF.net SVN: gar:[25598] csw/mgar/pkg/php5/branches/php-5.6.x Message-ID: <3qKDRv285qzTq@mail.opencsw.org> Revision: 25598 http://sourceforge.net/p/gar/code/25598 Author: cgrzemba Date: 2016-03-08 11:13:14 +0000 (Tue, 08 Mar 2016) Log Message: ----------- php5/branches/php-5.6.x: bump version 5.6.19 Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile csw/mgar/pkg/php5/branches/php-5.6.x/checksums Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2016-03-08 09:01:00 UTC (rev 25597) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2016-03-08 11:13:14 UTC (rev 25598) @@ -1,5 +1,5 @@ NAME = php -VERSION = 5.6.16 +VERSION = 5.6.19 GARTYPE = v2 BUNDLE = php5 Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2016-03-08 09:01:00 UTC (rev 25597) +++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2016-03-08 11:13:14 UTC (rev 25598) @@ -1 +1 @@ -3f1d999ed1f9cb5713c9a0161c557f2f php-5.6.16.tar.xz +aab960cc1b2bfbeb00d030a9d42b38bd php-5.6.19.tar.xz 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 Mar 9 12:44:27 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 9 Mar 2016 11:44:27 +0000 Subject: SF.net SVN: gar:[25599] csw/mgar/pkg/xastir/trunk/Makefile Message-ID: <3qKs5b3mhczxx@mail.opencsw.org> Revision: 25599 http://sourceforge.net/p/gar/code/25599 Author: cgrzemba Date: 2016-03-09 11:44:27 +0000 (Wed, 09 Mar 2016) Log Message: ----------- xastir/trunk: reconfigure with libcurl graphicsmagick Modified Paths: -------------- csw/mgar/pkg/xastir/trunk/Makefile Modified: csw/mgar/pkg/xastir/trunk/Makefile =================================================================== --- csw/mgar/pkg/xastir/trunk/Makefile 2016-03-08 11:13:14 UTC (rev 25598) +++ csw/mgar/pkg/xastir/trunk/Makefile 2016-03-09 11:44:27 UTC (rev 25599) @@ -19,6 +19,9 @@ RUNTIME_DEP_PKGS_CSWxastir += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWxastir += CSWlibxpm4 RUNTIME_DEP_PKGS_CSWxastir += CSWperl +RUNTIME_DEP_PKGS_CSWxastir += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWxastir += CSWlibmagickcore6q16hdri2 + # use libdb-5 of database/berkeleydb-5, Solaris11 CHECKPKG_OVERRIDES_CSWxastir += soname-not-found|libdb-5.3.so|is|needed|by|opt/csw/bin/xastir CHECKPKG_OVERRIDES_CSWxastir += discouraged-path-in-pkgmap|/opt/csw/share/doc/xastir/README.CVS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 9 23:27:05 2016 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 9 Mar 2016 22:27:05 +0000 Subject: SF.net SVN: gar:[25600] csw/mgar/pkg/bind/trunk Message-ID: <3qL7Lz0rcPz1F8@mail.opencsw.org> Revision: 25600 http://sourceforge.net/p/gar/code/25600 Author: bonivart Date: 2016-03-09 22:27:04 +0000 (Wed, 09 Mar 2016) Log Message: ----------- bind/trunk: update to 9.10.3-P4 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 2016-03-09 11:44:27 UTC (rev 25599) +++ csw/mgar/pkg/bind/trunk/Makefile 2016-03-09 22:27:04 UTC (rev 25600) @@ -7,7 +7,7 @@ GARTYPE = v2 # Enable these for Px-releases -RELEASE = P3 +RELEASE = P4 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) @@ -124,10 +124,11 @@ CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.140.0.10|soname=libbind9.so.140|pkgname=CSWlibbind|expected=CSWlibbind9-140 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libirs.so.141.0.4|soname=libirs.so.141|pkgname=CSWlibbind|expected=CSWlibirs141 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.160.0.0|soname=libisc.so.160|pkgname=CSWlibbind|expected=CSWlibisc160 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.140.0.3|soname=libisccc.so.140|pkgname=CSWlibbind|expected=CSWlibisccc140 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.140.3.0|soname=libisccfg.so.140|pkgname=CSWlibbind|expected=CSWlibisccfg140 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.141.0.3|soname=liblwres.so.141|pkgname=CSWlibbind|expected=CSWliblwres141 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.162.1.2|soname=libdns.so.162|pkgname=CSWlibbind|expected=CSWlibdns162 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.140.0.4|soname=libisccc.so.140|pkgname=CSWlibbind|expected=CSWlibisccc140 +CHECKPKG_OVERRIDES_CSWlibbind += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.162.1.3|soname=libdns.so.162|pkgname=CSWlibbind|expected=CSWlibdns162 # 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 2016-03-09 11:44:27 UTC (rev 25599) +++ csw/mgar/pkg/bind/trunk/checksums 2016-03-09 22:27:04 UTC (rev 25600) @@ -1 +1 @@ -bcf7e772b616f7259420a3edc5df350a bind-9.10.3-P3.tar.gz +173ce5e83e9ba31f8368367ee1ff7807 bind-9.10.3-P4.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 Mar 10 14:01:41 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 10 Mar 2016 13:01:41 +0000 Subject: SF.net SVN: gar:[25601] csw/mgar/pkg/otr/trunk/Makefile Message-ID: <3qLVmD0fLkz1RM@mail.opencsw.org> Revision: 25601 http://sourceforge.net/p/gar/code/25601 Author: lblume Date: 2016-03-10 13:01:41 +0000 (Thu, 10 Mar 2016) Log Message: ----------- otr/trunk: Bump to 4.1.1 Modified Paths: -------------- csw/mgar/pkg/otr/trunk/Makefile Modified: csw/mgar/pkg/otr/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/trunk/Makefile 2016-03-09 22:27:04 UTC (rev 25600) +++ csw/mgar/pkg/otr/trunk/Makefile 2016-03-10 13:01:41 UTC (rev 25601) @@ -1,5 +1,5 @@ NAME = libotr -VERSION = 4.0.0 +VERSION = 4.1.1 GARTYPE = v2 DESCRIPTION = Off-The-Record Messaging plugin for pidgin 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 Mar 10 14:03:04 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 10 Mar 2016 13:03:04 +0000 Subject: SF.net SVN: gar:[25602] csw/mgar/pkg/otr/trunk/checksums Message-ID: <3qLVnr5TQPz1Tk@mail.opencsw.org> Revision: 25602 http://sourceforge.net/p/gar/code/25602 Author: lblume Date: 2016-03-10 13:03:04 +0000 (Thu, 10 Mar 2016) Log Message: ----------- otr/trunk: Checksum Modified Paths: -------------- csw/mgar/pkg/otr/trunk/checksums Modified: csw/mgar/pkg/otr/trunk/checksums =================================================================== --- csw/mgar/pkg/otr/trunk/checksums 2016-03-10 13:01:41 UTC (rev 25601) +++ csw/mgar/pkg/otr/trunk/checksums 2016-03-10 13:03:04 UTC (rev 25602) @@ -1 +1 @@ -00979dca82d70383fcd1b01f3974363c libotr-4.0.0.tar.gz +dac5a8778a35f674c046ddf5d97e4d81 libotr-4.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 Thu Mar 10 14:28:40 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 10 Mar 2016 13:28:40 +0000 Subject: SF.net SVN: gar:[25603] csw/mgar/pkg/otr/trunk/Makefile Message-ID: <3qLWMJ3vv4z1X8@mail.opencsw.org> Revision: 25603 http://sourceforge.net/p/gar/code/25603 Author: lblume Date: 2016-03-10 13:28:40 +0000 (Thu, 10 Mar 2016) Log Message: ----------- otr/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/otr/trunk/Makefile Modified: csw/mgar/pkg/otr/trunk/Makefile =================================================================== --- csw/mgar/pkg/otr/trunk/Makefile 2016-03-10 13:03:04 UTC (rev 25602) +++ csw/mgar/pkg/otr/trunk/Makefile 2016-03-10 13:28:40 UTC (rev 25603) @@ -33,12 +33,12 @@ BUILD64_LIBS_ONLY = 1 -RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgcrypt20 RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr5 RUNTIME_DEP_PKGS_CSWotr += CSWlibotr5 -RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt20 # Don't know yet why but this dependency is only picked under sparc RUNTIME_DEP_PKGS_CSWlibotr5_sparc = CSWlibgpg-error0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Mar 11 12:15:14 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 11 Mar 2016 11:15:14 +0000 Subject: SF.net SVN: gar:[25604] csw/mgar/pkg/xastir/trunk Message-ID: <3qM4Lr26drzHV@mail.opencsw.org> Revision: 25604 http://sourceforge.net/p/gar/code/25604 Author: cgrzemba Date: 2016-03-11 11:15:14 +0000 (Fri, 11 Mar 2016) Log Message: ----------- xastir/trunk: remove /usr/sfw path from build env Modified Paths: -------------- csw/mgar/pkg/xastir/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/xastir/trunk/files/0001-acinclude.m4.patch Modified: csw/mgar/pkg/xastir/trunk/Makefile =================================================================== --- csw/mgar/pkg/xastir/trunk/Makefile 2016-03-10 13:28:40 UTC (rev 25603) +++ csw/mgar/pkg/xastir/trunk/Makefile 2016-03-11 11:15:14 UTC (rev 25604) @@ -14,6 +14,8 @@ # studio ignores inline statement GARCOMPILER = GCC5 +PATCHFILES = 0001-acinclude.m4.patch + RUNTIME_DEP_PKGS_CSWxastir += CSWlibgdal1 RUNTIME_DEP_PKGS_CSWxastir += CSWlibintl8 RUNTIME_DEP_PKGS_CSWxastir += CSWlibpcre1 @@ -30,3 +32,9 @@ include gar/category.mk +pre-configure: + cd $(WORKSRC) && aclocal-1.13 \ + && autoconf --force \ + && automake-1.13 -a -c -f \ + && autoheader + @$(MAKECOOKIE) Added: csw/mgar/pkg/xastir/trunk/files/0001-acinclude.m4.patch =================================================================== --- csw/mgar/pkg/xastir/trunk/files/0001-acinclude.m4.patch (rev 0) +++ csw/mgar/pkg/xastir/trunk/files/0001-acinclude.m4.patch 2016-03-11 11:15:14 UTC (rev 25604) @@ -0,0 +1,36 @@ +# remove sfw directories from INCLUDE and LDFLAGS +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -37,13 +37,13 @@ AC_DEFUN([XASTIR_ADD_SEARCH_PATHS], + [ + AC_MSG_CHECKING([for search paths]) + +-test -d /usr/local/include && CPPFLAGS="-I/usr/local/include $CPPFLAGS" +-test -d /usr/local/lib && LDFLAGS="-L/usr/local/lib $LDFLAGS" ++# test -d /usr/local/include && CPPFLAGS="-I/usr/local/include $CPPFLAGS" ++# test -d /usr/local/lib && LDFLAGS="-L/usr/local/lib $LDFLAGS" + +-for d in /sw /opt /opt/local /usr/dt/share /usr/sfw /opt/sfw; do +-test -d $d/include && CPPFLAGS="$CPPFLAGS -I$d/include" +-test -d $d/lib && LDFLAGS="$LDFLAGS -L$d/lib" +-done ++# for d in /sw /opt /opt/local /usr/dt/share /usr/sfw /opt/sfw; do ++# test -d $d/include && CPPFLAGS="$CPPFLAGS -I$d/include" ++# test -d $d/lib && LDFLAGS="$LDFLAGS -L$d/lib" ++# done + + AC_MSG_RESULT([done]) + ]) +@@ -161,9 +161,9 @@ AC_DEFUN([XASTIR_DETECT_BINARIES], + [ + BINPATH=$PATH + +-for d in / /usr /usr/local /usr/X11 /usr/X11R6 /usr/sfw /opt/sfw /opt/local /sw; do +-test -d $d/bin && echo $BINPATH | grep -- $d/bin > /dev/null || BINPATH="$BINPATH:$d/bin" +-done ++# for d in / /usr /usr/local /usr/X11 /usr/X11R6 /usr/sfw /opt/sfw /opt/local /sw; do ++# test -d $d/bin && echo $BINPATH | grep -- $d/bin > /dev/null || BINPATH="$BINPATH:$d/bin" ++# done + + # it would be much nicer to do this in a for loop + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Mar 11 15:38:45 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 11 Mar 2016 14:38:45 +0000 Subject: SF.net SVN: gar:[25605] csw/mgar/pkg/xastir/trunk Message-ID: <3qM8sp3w17zRx@mail.opencsw.org> Revision: 25605 http://sourceforge.net/p/gar/code/25605 Author: cgrzemba Date: 2016-03-11 14:38:45 +0000 (Fri, 11 Mar 2016) Log Message: ----------- xastir/trunk: use graphicsmagick Modified Paths: -------------- csw/mgar/pkg/xastir/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/xastir/trunk/files/0002-acinclude.patch csw/mgar/pkg/xastir/trunk/files/0003-map-graphicsmagick-linkerror.patch Modified: csw/mgar/pkg/xastir/trunk/Makefile =================================================================== --- csw/mgar/pkg/xastir/trunk/Makefile 2016-03-11 11:15:14 UTC (rev 25604) +++ csw/mgar/pkg/xastir/trunk/Makefile 2016-03-11 14:38:45 UTC (rev 25605) @@ -12,29 +12,36 @@ DISTFILES = $(DISTNAME).tar.gz # studio ignores inline statement -GARCOMPILER = GCC5 +GARCOMPILER = GCC4 -PATCHFILES = 0001-acinclude.m4.patch +PATCHFILES += 0001-acinclude.m4.patch +PATCHFILES += 0002-acinclude.patch +PATCHFILES += 0003-map-graphicsmagick-linkerror.patch -RUNTIME_DEP_PKGS_CSWxastir += CSWlibgdal1 +BUILD_DEP_PKGS += CSWgraphicsmagick-dev +BUILD_DEP_PKGS += CSWliblcms2-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWliblzma-dev + +RUNTIME_DEP_PKGS_CSWxastir += CSWlibgraphicsmagick-q16-3 RUNTIME_DEP_PKGS_CSWxastir += CSWlibintl8 RUNTIME_DEP_PKGS_CSWxastir += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWxastir += CSWlibxpm4 RUNTIME_DEP_PKGS_CSWxastir += CSWperl RUNTIME_DEP_PKGS_CSWxastir += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWxastir += CSWlibmagickcore6q16hdri2 # use libdb-5 of database/berkeleydb-5, Solaris11 CHECKPKG_OVERRIDES_CSWxastir += soname-not-found|libdb-5.3.so|is|needed|by|opt/csw/bin/xastir CHECKPKG_OVERRIDES_CSWxastir += discouraged-path-in-pkgmap|/opt/csw/share/doc/xastir/README.CVS CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --without-imagemagick include gar/category.mk pre-configure: - cd $(WORKSRC) && aclocal-1.13 \ + cd $(WORKSRC) && aclocal-1.12 \ && autoconf --force \ - && automake-1.13 -a -c -f \ + && automake-1.12 -a -c -f \ && autoheader @$(MAKECOOKIE) Added: csw/mgar/pkg/xastir/trunk/files/0002-acinclude.patch =================================================================== --- csw/mgar/pkg/xastir/trunk/files/0002-acinclude.patch (rev 0) +++ csw/mgar/pkg/xastir/trunk/files/0002-acinclude.patch 2016-03-11 14:38:45 UTC (rev 25605) @@ -0,0 +1,11 @@ +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -561,7 +561,7 @@ if test "${use_graphicsmagick}" = "yes"; then + if test "${use_graphicsmagick}" = "no"; then + AC_MSG_WARN(*** Cannot find GraphicsMagick include files: Building w/o GraphicsMagick support. ***) + else +- AC_CHECK_LIB([GraphicsMagick], [WriteImage], AC_DEFINE(HAVE_GRAPHICSMAGICK, 1, [GraphicsMagick image library]), use_graphicsmagick="no") ++ AC_CHECK_LIB([GraphicsMagick], [GmWriteImage], AC_DEFINE(HAVE_GRAPHICSMAGICK, 1, [GraphicsMagick image library]), use_graphicsmagick="no") + if test "${use_graphicsmagick}" = "no"; then + AC_MSG_WARN(*** Cannot find GraphicsMagick library files: Building w/o GraphicsMagick support. ***) + fi Added: csw/mgar/pkg/xastir/trunk/files/0003-map-graphicsmagick-linkerror.patch =================================================================== --- csw/mgar/pkg/xastir/trunk/files/0003-map-graphicsmagick-linkerror.patch (rev 0) +++ csw/mgar/pkg/xastir/trunk/files/0003-map-graphicsmagick-linkerror.patch 2016-03-11 14:38:45 UTC (rev 25605) @@ -0,0 +1,33 @@ +--- a/src/map_OSM.c ++++ b/src/map_OSM.c +@@ -1570,7 +1570,7 @@ void draw_OSM_map (Widget w, + image = ReadImage(image_info, &exception); + + if (image == (Image *) NULL) { +- MagickWarning(exception.severity, exception.reason, exception.description); ++ _MagickWarning(exception.severity, exception.reason, exception.description); + //fprintf(stderr,"MagickWarning\n"); + + #ifdef USE_MAP_CACHE +--- a/src/map_WMS.c ++++ b/src/map_WMS.c +@@ -646,7 +646,7 @@ void draw_WMS_map (Widget w, + image = ReadImage(image_info, &exception); + + if (image == (Image *) NULL) { +- MagickWarning(exception.severity, exception.reason, exception.description); ++ _MagickWarning(exception.severity, exception.reason, exception.description); + //fprintf(stderr,"MagickWarning\n"); + + #ifdef USE_MAP_CACHE +--- a/src/map_tiger.c ++++ b/src/map_tiger.c +@@ -591,7 +591,7 @@ void draw_tiger_map (Widget w, + image = ReadImage(image_info, &exception); + + if (image == (Image *) NULL) { +- MagickWarning(exception.severity, exception.reason, exception.description); ++ _MagickWarning(exception.severity, exception.reason, exception.description); + //fprintf(stderr,"MagickWarning\n"); + + #ifdef USE_MAP_CACHE 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 Mar 11 22:59:40 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 11 Mar 2016 21:59:40 +0000 Subject: SF.net SVN: gar:[25606] csw/mgar/pkg Message-ID: <3qMLfQ1vY9zZP@mail.opencsw.org> Revision: 25606 http://sourceforge.net/p/gar/code/25606 Author: jake_goerzen Date: 2016-03-11 21:59:39 +0000 (Fri, 11 Mar 2016) Log Message: ----------- dovecot-sieve: initial commit of pigeonhole sieve plugin for dovecot Added Paths: ----------- csw/mgar/pkg/dovecot-sieve/ csw/mgar/pkg/dovecot-sieve/Makefile csw/mgar/pkg/dovecot-sieve/branches/ csw/mgar/pkg/dovecot-sieve/tags/ csw/mgar/pkg/dovecot-sieve/trunk/ csw/mgar/pkg/dovecot-sieve/trunk/Makefile csw/mgar/pkg/dovecot-sieve/trunk/checksums csw/mgar/pkg/dovecot-sieve/trunk/files/ Added: csw/mgar/pkg/dovecot-sieve/Makefile =================================================================== --- csw/mgar/pkg/dovecot-sieve/Makefile (rev 0) +++ csw/mgar/pkg/dovecot-sieve/Makefile 2016-03-11 21:59:39 UTC (rev 25606) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/dovecot-sieve/trunk =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk 2016-03-11 14:38:45 UTC (rev 25605) +++ csw/mgar/pkg/dovecot-sieve/trunk 2016-03-11 21:59:39 UTC (rev 25606) Property changes on: csw/mgar/pkg/dovecot-sieve/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/dovecot-sieve/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2016-03-11 21:59:39 UTC (rev 25606) @@ -0,0 +1,36 @@ +NAME = dovecot-2.2-pigeonhole +VERSION = 0.4.12 +GARTYPE = v2 + +DESCRIPTION = Secure POP3/IMAP server - Sieve filters support +define BLURB +This package provides Sieve filters support for Dovecot. +endef + +MASTER_SITES = http://pigeonhole.dovecot.org/releases/2.2/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + +PACKAGES = dovecot-sieve + +GARCOMPILER = GNU + +BUILD64 = 1 +ISAEXEC = 1 + +# disable test-suite +SKIPTEST = 1 + +CONFIGURE_ARGS-32 = $(DIRPATHS) +CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=/opt/csw/lib/64/dovecot +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + +STRIP_DIRS = $(DESTDIR)$(libexecdir)/dovecot + +EXTRA_LIB = /opt/csw/lib/dovecot +EXTRA_LIB-64 = /opt/csw/lib/64/dovecot + +RUNTIME_DEP_PKGS_dovecot-sieve += CSWdovecot +RUNTIME_DEP_PKGS_dovecot-sieve += CSWlibgcc-s1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/dovecot-sieve/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/dovecot-sieve/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/checksums (rev 0) +++ csw/mgar/pkg/dovecot-sieve/trunk/checksums 2016-03-11 21:59:39 UTC (rev 25606) @@ -0,0 +1 @@ +eb96e65be62c71f987a3b5ad2d782b7b dovecot-2.2-pigeonhole-0.4.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Mar 13 23:20:57 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Mar 2016 22:20:57 +0000 Subject: SF.net SVN: gar:[25607] csw/mgar/pkg/ansible/trunk/Makefile Message-ID: <3qNb264chyz114@mail.opencsw.org> Revision: 25607 http://sourceforge.net/p/gar/code/25607 Author: dmichelsen Date: 2016-03-13 22:20:56 +0000 (Sun, 13 Mar 2016) Log Message: ----------- ansible/trunk: Depend on Python 2.7 Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2016-03-11 21:59:39 UTC (rev 25606) +++ csw/mgar/pkg/ansible/trunk/Makefile 2016-03-13 22:20:56 UTC (rev 25607) @@ -18,7 +18,7 @@ CHECKPKG_OVERRIDES_CSWansible += catalogname-does-not-start-with-py_ SPKG_DESC_CSWansible = Deploy, manage, and orchestrate computer systems # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWansible += CSWpython +RUNTIME_DEP_PKGS_CSWansible += CSWpython27 # We really want Python 2.7 which checkpkg cannot detect CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpython RUNTIME_DEP_PKGS_CSWansible += CSWpy-jinja2 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 Mar 14 00:01:23 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Mar 2016 23:01:23 +0000 Subject: SF.net SVN: gar:[25608] csw/mgar/pkg/ansible/trunk/Makefile Message-ID: <3qNbwf1YbRz13h@mail.opencsw.org> Revision: 25608 http://sourceforge.net/p/gar/code/25608 Author: dmichelsen Date: 2016-03-13 23:01:23 +0000 (Sun, 13 Mar 2016) Log Message: ----------- ansible/trunk: Update override Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2016-03-13 22:20:56 UTC (rev 25607) +++ csw/mgar/pkg/ansible/trunk/Makefile 2016-03-13 23:01:23 UTC (rev 25608) @@ -20,7 +20,7 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWansible += CSWpython27 # We really want Python 2.7 which checkpkg cannot detect -CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpython27 RUNTIME_DEP_PKGS_CSWansible += CSWpy-jinja2 RUNTIME_DEP_PKGS_CSWansible += CSWpy-markupsafe RUNTIME_DEP_PKGS_CSWansible += CSWpy-yaml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Mar 14 16:12:00 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Mar 2016 15:12:00 +0000 Subject: SF.net SVN: gar:[25609] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: <3qP1Sd6GZjz1JQ@mail.opencsw.org> Revision: 25609 http://sourceforge.net/p/gar/code/25609 Author: dmichelsen Date: 2016-03-14 15:12:00 +0000 (Mon, 14 Mar 2016) Log Message: ----------- lang-python/python/branches/python-2.7: Enable multiprocessing plugin 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 2016-03-13 23:01:23 UTC (rev 25608) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2016-03-14 15:12:00 UTC (rev 25609) @@ -69,6 +69,9 @@ # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev PREPEND_LINKER_FLAGS += -L$(libdir)/ffi +# This is needed to enable _multiprocessing module +EXTRA_CFLAGS += -std=gnu89 + BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -82,6 +85,7 @@ CONFIGURE_ARGS += --with-signal-module CONFIGURE_ARGS += --with-fpectl CONFIGURE_ARGS += --with-system-ffi +CONFIGURE_ARGS += --with-threads # This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. # PYCOMPILE = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Mar 15 12:48:43 2016 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 15 Mar 2016 11:48:43 +0000 Subject: SF.net SVN: gar:[25610] csw/mgar/pkg/php5_memcached/trunk Message-ID: <3qPXvm0ycJzfn@mail.opencsw.org> Revision: 25610 http://sourceforge.net/p/gar/code/25610 Author: wilbury Date: 2016-03-15 11:48:43 +0000 (Tue, 15 Mar 2016) Log Message: ----------- php5_memcached/trunk: Version bump and update for newer PHP Modified Paths: -------------- csw/mgar/pkg/php5_memcached/trunk/Makefile csw/mgar/pkg/php5_memcached/trunk/checksums Modified: csw/mgar/pkg/php5_memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5_memcached/trunk/Makefile 2016-03-14 15:12:00 UTC (rev 25609) +++ csw/mgar/pkg/php5_memcached/trunk/Makefile 2016-03-15 11:48:43 UTC (rev 25610) @@ -1,7 +1,7 @@ # $Id$ # NAME = memcached -VERSION = 2.1.0 +VERSION = 2.2.0 GARTYPE = v2 # to match php5 @@ -25,8 +25,6 @@ MASTER_SITES = http://pecl.php.net/get/ DISTFILES = $(DISTNAME).tgz -PATCHFILES += 0001-Use-proper-libmemcached-headers-dir.patch -PATCHFILES += 0002-Include-proper-memcached.h.patch GARCOMPILER = GNU @@ -38,6 +36,7 @@ RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibmemcached8 RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibz1 +RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibsasl2-2 OBSOLETED_BY_CSWphp5-memcached = CSWphp5memcached ARCHALL_CSWphp5memcached = Modified: csw/mgar/pkg/php5_memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/php5_memcached/trunk/checksums 2016-03-14 15:12:00 UTC (rev 25609) +++ csw/mgar/pkg/php5_memcached/trunk/checksums 2016-03-15 11:48:43 UTC (rev 25610) @@ -1 +1 @@ -daf070aad13bebffdff50acf6e93043c memcached-2.1.0.tgz +28937c6144f734e000c6300242f44ce6 memcached-2.2.0.tgz 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 Mar 16 20:48:26 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 16 Mar 2016 19:48:26 +0000 Subject: SF.net SVN: gar:[25611] csw/mgar/pkg/dovecot-sieve/trunk/Makefile Message-ID: <3qQMVn5PFfzQp@mail.opencsw.org> Revision: 25611 http://sourceforge.net/p/gar/code/25611 Author: jake_goerzen Date: 2016-03-16 19:48:26 +0000 (Wed, 16 Mar 2016) Log Message: ----------- dovecot-sieve: fix catalog name and runtime dependancies Modified Paths: -------------- csw/mgar/pkg/dovecot-sieve/trunk/Makefile Modified: csw/mgar/pkg/dovecot-sieve/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2016-03-15 11:48:43 UTC (rev 25610) +++ csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2016-03-16 19:48:26 UTC (rev 25611) @@ -10,7 +10,7 @@ MASTER_SITES = http://pigeonhole.dovecot.org/releases/2.2/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = dovecot-sieve +PACKAGES = CSWdovecot-sieve GARCOMPILER = GNU @@ -29,8 +29,8 @@ EXTRA_LIB = /opt/csw/lib/dovecot EXTRA_LIB-64 = /opt/csw/lib/64/dovecot -RUNTIME_DEP_PKGS_dovecot-sieve += CSWdovecot -RUNTIME_DEP_PKGS_dovecot-sieve += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWdovecot-sieve += CSWdovecot +RUNTIME_DEP_PKGS_CSWdovecot-sieve += CSWlibgcc-s1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 18 09:51:50 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Mar 2016 08:51:50 +0000 Subject: SF.net SVN: gar:[25612] csw/mgar/pkg/sudo/trunk Message-ID: <3qRJrG52Qzz1Rn@mail.opencsw.org> Revision: 25612 http://sourceforge.net/p/gar/code/25612 Author: dmichelsen Date: 2016-03-18 08:51:49 +0000 (Fri, 18 Mar 2016) Log Message: ----------- sudo/trunk: Update to 1.8.16 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/sudo/trunk/files/bug464.patch Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2016-03-16 19:48:26 UTC (rev 25611) +++ csw/mgar/pkg/sudo/trunk/Makefile 2016-03-18 08:51:49 UTC (rev 25612) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.15 +VERSION = 1.8.16 GARTYPE = v2 EXTRA_MODULATORS = LDAP @@ -21,9 +21,6 @@ DISTFILES += sudo.conf.CSW DISTFILES += map.sudo -# Taken from http://bugzilla.sudo.ws/show_bug.cgi?id=727 -PATCHFILES += bug464.patch - LICENSE = doc/LICENSE VENDOR_URL = http://www.sudo.ws Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2016-03-16 19:48:26 UTC (rev 25611) +++ csw/mgar/pkg/sudo/trunk/checksums 2016-03-18 08:51:49 UTC (rev 25612) @@ -1 +1 @@ -7cf6b9b76d0478a572432bed481dd7b5 sudo-1.8.15.tar.gz +a977449587dc857e129bb20555b46af4 sudo-1.8.16.tar.gz Deleted: csw/mgar/pkg/sudo/trunk/files/bug464.patch =================================================================== --- csw/mgar/pkg/sudo/trunk/files/bug464.patch 2016-03-16 19:48:26 UTC (rev 25611) +++ csw/mgar/pkg/sudo/trunk/files/bug464.patch 2016-03-18 08:51:49 UTC (rev 25612) @@ -1,27 +0,0 @@ ---- a/plugins/sudoers/timestamp.c Sat Oct 31 17:35:44 2015 -0600 -+++ a/plugins/sudoers/timestamp.c Sun Nov 01 15:13:41 2015 -0700 -@@ -310,7 +310,7 @@ - (long long)old_eof); - } - } -- debug_return_size_t(-1); -+ debug_return_size_t((size_t)-1); - } - debug_return_size_t(nwritten); - } -@@ -354,13 +354,13 @@ - static void - ts_fill(struct timestamp_entry *entry, struct passwd *pw, int flags) - { -- return ts_fill4(entry, pw, flags, def_tty_tickets); -+ ts_fill4(entry, pw, flags, def_tty_tickets); - } - - static void - ts_fill_tty(struct timestamp_entry *entry, struct passwd *pw, int flags) - { -- return ts_fill4(entry, pw, flags, true); -+ ts_fill4(entry, pw, flags, true); - } - - /* 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 Mar 18 13:11:13 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Mar 2016 12:11:13 +0000 Subject: SF.net SVN: gar:[25613] csw/mgar/pkg/libgmp/trunk Message-ID: <3qRPGM57fXz1X7@mail.opencsw.org> Revision: 25613 http://sourceforge.net/p/gar/code/25613 Author: dmichelsen Date: 2016-03-18 12:11:13 +0000 (Fri, 18 Mar 2016) Log Message: ----------- libgmp/trunk: Update to 6.1.0 Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile csw/mgar/pkg/libgmp/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libgmp/trunk/files/0001-Add-missing-cmath-includes.patch csw/mgar/pkg/libgmp/trunk/files/0002-Work-around-a-compilation-issue.patch Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2016-03-18 08:51:49 UTC (rev 25612) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2016-03-18 12:11:13 UTC (rev 25613) @@ -1,8 +1,8 @@ # $Id$ NAME = gmp -VERSION = 6.0.0 -SUBVERSION = a +VERSION = 6.1.0 +SUBVERSION = GARTYPE = v2 DESCRIPTION = GNU Multiple Precision Arithmetic Library Modified: csw/mgar/pkg/libgmp/trunk/checksums =================================================================== --- csw/mgar/pkg/libgmp/trunk/checksums 2016-03-18 08:51:49 UTC (rev 25612) +++ csw/mgar/pkg/libgmp/trunk/checksums 2016-03-18 12:11:13 UTC (rev 25613) @@ -1 +1 @@ -a8b0090b79291a54390356414264142c gmp-6.0.0a.tar.lz +63190f6c09449a16e6f96189527eed5a gmp-6.1.0.tar.lz Deleted: csw/mgar/pkg/libgmp/trunk/files/0001-Add-missing-cmath-includes.patch =================================================================== --- csw/mgar/pkg/libgmp/trunk/files/0001-Add-missing-cmath-includes.patch 2016-03-18 08:51:49 UTC (rev 25612) +++ csw/mgar/pkg/libgmp/trunk/files/0001-Add-missing-cmath-includes.patch 2016-03-18 12:11:13 UTC (rev 25613) @@ -1,51 +0,0 @@ -From 33d94be2354a45bf9981c9540f6fe2d23860e8bd Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sun, 16 Mar 2014 23:02:52 +0100 -Subject: [PATCH] Add missing includes - ---- - tests/cxx/t-constr.cc | 1 + - tests/cxx/t-ops2.cc | 2 +- - tests/cxx/t-ostream.cc | 1 + - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/cxx/t-constr.cc b/tests/cxx/t-constr.cc -index 261005d..936d742 100644 ---- a/tests/cxx/t-constr.cc -+++ b/tests/cxx/t-constr.cc -@@ -19,6 +19,7 @@ the GNU MP Library test suite. If not, see http://www.gnu.org/licenses/. */ - - #include "config.h" - -+#include - #include - #include - -diff --git a/tests/cxx/t-ops2.cc b/tests/cxx/t-ops2.cc -index 3fc472b..c539881 100644 ---- a/tests/cxx/t-ops2.cc -+++ b/tests/cxx/t-ops2.cc -@@ -19,7 +19,7 @@ the GNU MP Library test suite. If not, see http://www.gnu.org/licenses/. */ - - #include "config.h" - --#include -+#include - - #include "gmp.h" - #include "gmpxx.h" -diff --git a/tests/cxx/t-ostream.cc b/tests/cxx/t-ostream.cc -index 9899f5f..decce1b 100644 ---- a/tests/cxx/t-ostream.cc -+++ b/tests/cxx/t-ostream.cc -@@ -17,6 +17,7 @@ Public License for more details. - You should have received a copy of the GNU General Public License along with - the GNU MP Library test suite. If not, see http://www.gnu.org/licenses/. */ - -+#include - #include - #include - --- -1.7.10.3 - Deleted: csw/mgar/pkg/libgmp/trunk/files/0002-Work-around-a-compilation-issue.patch =================================================================== --- csw/mgar/pkg/libgmp/trunk/files/0002-Work-around-a-compilation-issue.patch 2016-03-18 08:51:49 UTC (rev 25612) +++ csw/mgar/pkg/libgmp/trunk/files/0002-Work-around-a-compilation-issue.patch 2016-03-18 12:11:13 UTC (rev 25613) @@ -1,88 +0,0 @@ -From d3f7cf3a349ef8623303c1b5aab79774856f29c4 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Mon, 17 Mar 2014 23:19:30 +0100 -Subject: [PATCH] Work around a compilation issue - ---- - tests/cxx/t-ops2.cc | 41 ++++++++++++++++++++++++++++++++++------- - 1 file changed, 34 insertions(+), 7 deletions(-) - -diff --git a/tests/cxx/t-ops2.cc b/tests/cxx/t-ops2.cc -index 3fc472b..da76a32 100644 ---- a/tests/cxx/t-ops2.cc -+++ b/tests/cxx/t-ops2.cc -@@ -19,7 +19,7 @@ the GNU MP Library test suite. If not, see http://www.gnu.org/licenses/. */ - - #include "config.h" - --#include -+#include - - #include "gmp.h" - #include "gmpxx.h" -@@ -27,6 +27,7 @@ the GNU MP Library test suite. If not, see http://www.gnu.org/licenses/. */ - #include "tests.h" - - -+ - #define CHECK1(Type,a,fun) \ - ASSERT_ALWAYS(fun((Type)(a))==fun(a)) - #define CHECK(Type1,Type2,a,b,op) \ -@@ -183,22 +184,48 @@ void checkf (){ - ASSERT_ALWAYS(sqrt(mpf_class(0))==0); - // TODO: add some consistency checks, as described in - // http://gmplib.org/list-archives/gmp-bugs/2013-February/002940.html -- CHECK1(mpf_class,1.9,trunc); -+ -+ // I need to comment out the trunc() tests, because: -+ -+ // maciej at unstable9x [unstable9x]:~/src/opencsw/pkg/libgmp/trunk $ (cd /home/maciej/src/opencsw/pkg/libgmp/trunk/work/solaris9-i386/build-isa-pentium_pro/gmp-5.1.3/tests/cxx ; /opt/csw/bin/g++-4.6 -DHAVE_CONF -+ // IG_H -I. -I../.. -I../.. -I../../tests -fexceptions -I/opt/csw/include -O2 -pipe -m32 -march=pentiumpro -fexceptions -c -o t-ops2.o t-ops2.cc) -+ // t-ops2.cc: In function 'void checkf()': -+ // t-ops2.cc:187:3: error: no matching function for call to 'trunc(double)' -+ // t-ops2.cc:187:3: note: candidate is: -+ // ../../gmpxx.h:3091:1: note: template __gmp_expr, __gmp_trunc_function> > trunc(const __gmp_expr&) -+ // t-ops2.cc:190:3: error: no matching function for call to 'trunc(double)' -+ // t-ops2.cc:190:3: note: candidate is: -+ // ../../gmpxx.h:3091:1: note: template __gmp_expr, __gmp_trunc_function> > trunc(const __gmp_expr&) -+ // t-ops2.cc:193:3: error: no matching function for call to 'trunc(double)' -+ // t-ops2.cc:193:3: note: candidate is: -+ // ../../gmpxx.h:3091:1: note: template __gmp_expr, __gmp_trunc_function> > trunc(const __gmp_expr&) -+ // t-ops2.cc:196:3: error: no matching function for call to 'trunc(double)' -+ // t-ops2.cc:196:3: note: candidate is: -+ // ../../gmpxx.h:3091:1: note: template __gmp_expr, __gmp_trunc_function> > trunc(const __gmp_expr&) -+ // t-ops2.cc:199:3: error: no matching function for call to 'trunc(double)' -+ // t-ops2.cc:199:3: note: candidate is: -+ // ../../gmpxx.h:3091:1: note: template __gmp_expr, __gmp_trunc_function> > trunc(const __gmp_expr&) -+ // t-ops2.cc:202:3: error: no matching function for call to 'trunc(double)' -+ // t-ops2.cc:202:3: note: candidate is: -+ // ../../gmpxx.h:3091:1: note: template __gmp_expr, __gmp_trunc_function> > trunc(const __gmp_expr&) -+ -+ -+ // CHECK1(mpf_class,1.9,trunc); - CHECK1(mpf_class,1.9,floor); - CHECK1(mpf_class,1.9,ceil); -- CHECK1(mpf_class,4.3,trunc); -+ // CHECK1(mpf_class,4.3,trunc); - CHECK1(mpf_class,4.3,floor); - CHECK1(mpf_class,4.3,ceil); -- CHECK1(mpf_class,-7.1,trunc); -+ // CHECK1(mpf_class,-7.1,trunc); - CHECK1(mpf_class,-7.1,floor); - CHECK1(mpf_class,-7.1,ceil); -- CHECK1(mpf_class,-2.8,trunc); -+ // CHECK1(mpf_class,-2.8,trunc); - CHECK1(mpf_class,-2.8,floor); - CHECK1(mpf_class,-2.8,ceil); -- CHECK1(mpf_class,-1.5,trunc); -+ // CHECK1(mpf_class,-1.5,trunc); - CHECK1(mpf_class,-1.5,floor); - CHECK1(mpf_class,-1.5,ceil); -- CHECK1(mpf_class,2.5,trunc); -+ // CHECK1(mpf_class,2.5,trunc); - CHECK1(mpf_class,2.5,floor); - CHECK1(mpf_class,2.5,ceil); - ASSERT_ALWAYS(hypot(mpf_class(-3),mpf_class(4))>4.9); --- -1.7.10.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 18 13:21:31 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Mar 2016 12:21:31 +0000 Subject: SF.net SVN: gar:[25614] csw/mgar/gar/v2/gar.pkg.mk Message-ID: <3qRPV63wJNz33@mail.opencsw.org> Revision: 25614 http://sourceforge.net/p/gar/code/25614 Author: dmichelsen Date: 2016-03-18 12:21:30 +0000 (Fri, 18 Mar 2016) Log Message: ----------- mGAR v2: Make overriding the package format easier Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2016-03-18 12:11:13 UTC (rev 25613) +++ csw/mgar/gar/v2/gar.pkg.mk 2016-03-18 12:21:30 UTC (rev 25614) @@ -335,11 +335,11 @@ _CSWCLASSES += cswtexhash _CSWCLASSES += cswdictconf -PKGFORMAT-5.8 = svr4 -PKGFORMAT-5.9 = svr4 -PKGFORMAT-5.10 = svr4 -PKGFORMAT-5.11 = ips -PKGFORMAT := $(PKGFORMAT-$(GAROSREL)) +PKGFORMAT-5.8 ?= svr4 +PKGFORMAT-5.9 ?= svr4 +PKGFORMAT-5.10 ?= svr4 +PKGFORMAT-5.11 ?= ips +PKGFORMAT = $(PKGFORMAT-$(GAROSREL)) # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. 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 Mar 18 13:28:29 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Mar 2016 12:28:29 +0000 Subject: SF.net SVN: gar:[25615] csw/mgar/pkg Message-ID: <3qRPfC5yYmz5R@mail.opencsw.org> Revision: 25615 http://sourceforge.net/p/gar/code/25615 Author: dmichelsen Date: 2016-03-18 12:28:28 +0000 (Fri, 18 Mar 2016) Log Message: ----------- ruby23: Initial commit Modified Paths: -------------- csw/mgar/pkg/ruby23/trunk/Makefile csw/mgar/pkg/ruby23/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ruby23/ Modified: csw/mgar/pkg/ruby23/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby21/trunk/Makefile 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/ruby23/trunk/Makefile 2016-03-18 12:28:28 UTC (rev 25615) @@ -2,8 +2,8 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = ruby -SHORTVER = 2.1 -VERSION = $(SHORTVER).5 +SHORTVER = 2.3 +VERSION = $(SHORTVER).0 API_VERSION = $(VERSION) DESCRIPTION = An object-oriented language for quick and easy programming. @@ -22,41 +22,44 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # Solaris 11 has build problems, skip for now -# PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 +PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 +# Make SVR4 for Solaris 11 for now +PKGFORMAT-5.11 = svr4 + # Use patch until this is fixed: # https://bugs.ruby-lang.org/issues/10830 -PATCHFILES += 0001-Use-LDFLAGS-for-libruby.so.patch +#PATCHFILES += 0001-Use-LDFLAGS-for-libruby.so.patch -PACKAGES += CSWruby21 -SPKG_DESC_CSWruby21 = Ruby 2.1.x -RUNTIME_DEP_PKGS_CSWruby21 += CSWlibgdbm4 -RUNTIME_DEP_PKGS_CSWruby21 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWruby21 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWruby21 += CSWlibgmp10 -RUNTIME_DEP_PKGS_CSWruby21 += CSWlibtcl8-5 -RUNTIME_DEP_PKGS_CSWruby21 += CSWlibtk8-5 -RUNTIME_DEP_PKGS_CSWruby21 += CSWlibyaml0-2 -RUNTIME_DEP_PKGS_CSWruby21 += CSWlibreadline6 +PACKAGES += CSWruby23 +SPKG_DESC_CSWruby23 = Ruby 2.1.x +RUNTIME_DEP_PKGS_CSWruby23 += CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWruby23 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWruby23 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWruby23 += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWruby23 += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWruby23 += CSWlibtk8-5 +RUNTIME_DEP_PKGS_CSWruby23 += CSWlibyaml0-2 +RUNTIME_DEP_PKGS_CSWruby23 += CSWlibreadline6 # These are all comments, checked by inspection -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/pathname.rb -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/fileutils.rb -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/shell.rb -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/rubygems/installer.rb -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/rubygems/basic_specification.rb -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/rubygems/specification.rb -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/tkextlib/itcl/setup.rb -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/tkextlib/itk/setup.rb -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/2.1.0/open3.rb -CHECKPKG_OVERRIDES_CSWruby21 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/2.1.0/tk/dialog.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/pathname.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/fileutils.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/shell.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/rubygems/installer.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/rubygems/basic_specification.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/rubygems/specification.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/tkextlib/itcl/setup.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/tkextlib/itk/setup.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/2.1.0/open3.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/2.1.0/tk/dialog.rb # We don't split off the library - without lots of ruby files it is not usable anyway -CHECKPKG_OVERRIDES_CSWruby21 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libruby2.1.5.so -CHECKPKG_OVERRIDES_CSWruby21 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libruby2.1.5.so.2|soname=libruby2.1.5.so.2|pkgname=CSWruby21|expected=CSWlibruby2-1-5-2 +CHECKPKG_OVERRIDES_CSWruby23 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libruby2.1.5.so +CHECKPKG_OVERRIDES_CSWruby23 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libruby2.1.5.so.2|soname=libruby2.1.5.so.2|pkgname=CSWruby23|expected=CSWlibruby2-1-5-2 # The reason is that there are *.rb files which normally require a ruby library, but we don't split this any more -CHECKPKG_OVERRIDES_CSWruby21 += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 +CHECKPKG_OVERRIDES_CSWruby23 += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 # path = %w[/usr/local/bin /usr/ucb /usr/bin /bin] REINPLACE_USRLOCAL += lib/mkmf.rb @@ -67,7 +70,7 @@ #GARCOMPILER = GNU # Using binutils 2.24 objcopy leads to this funny corruption: -#/home/dam/mgar/pkg/ruby21/trunk/work/solaris11-i386/build-isa-pentium_pro/ruby-2.1.3 +#/home/dam/mgar/pkg/ruby23/trunk/work/solaris11-i386/build-isa-pentium_pro/ruby-2.1.3 #unstable11x% /opt/solstudio12.2/bin/cc -G -h libruby2.1.3.so.2 -R/opt/csw/lib -m32 dln.o localeinit.o loadpath.o array.o bignum.o class.o compar.o complex.o dir.o dln_find.o encoding.o enum.o enumerator.o error.o eval.o load.o proc.o file.o gc.o hash.o inits.o io.o marshal.o math.o node.o numeric.o object.o pack.o parse.o process.o random.o range.o rational.o re.o regcomp.o regenc.o regerror.o regexec.o regparse.o regsyntax.o ruby.o safe.o signal.o sprintf.o st.o strftime.o string.o struct.o time.o transcode.o util.o variable.o version.o compile.o debug.o iseq.o vm.o vm_dump.o vm_backtrace.o vm_trace.o thread.o cont.o ascii.o us_ascii.o unicode.o utf_8.o newline.o flock.o isinf.o setproctitle.o prelude.o dmyext.o -lpthread -lgmp -lsocket -ldl -lcrypt -lm -o libruby2.1.3.so.2 #unstable11x% /usr/gnu/bin/objcopy libruby2.1.3.so.2 #unstable11x% elfdump libruby2.1.3.so.2 >/dev/null @@ -85,13 +88,16 @@ # Enabled DTrace support has problems during linking # CONFIGURE_ARGS += --disable-dtrace -CONFIGURE_ARGS += --program-suffix=21 +CONFIGURE_ARGS += --program-suffix=23 CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-soname=ruby$(API_VERSION) #CONFIGURE_ARGS += --with-out-ext=tk +# We want "make" to be GNU make +TEST_ENV_PATH = /opt/csw/gnu:$(PATH) + # There are tests failing -SKIPTEST ?= 1 +#SKIPTEST ?= 1 include gar/category.mk Modified: csw/mgar/pkg/ruby23/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby21/trunk/checksums 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/ruby23/trunk/checksums 2016-03-18 12:28:28 UTC (rev 25615) @@ -1 +1 @@ -df4c1b23f624a50513c7a78cb51a13dc ruby-2.1.5.tar.gz +e81740ac7b14a9f837e9573601db3162 ruby-2.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 18 13:42:26 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Mar 2016 12:42:26 +0000 Subject: SF.net SVN: gar:[25616] csw/mgar/pkg/ruby23/trunk/Makefile Message-ID: <3qRPyD2WkCz80@mail.opencsw.org> Revision: 25616 http://sourceforge.net/p/gar/code/25616 Author: dmichelsen Date: 2016-03-18 12:42:25 +0000 (Fri, 18 Mar 2016) Log Message: ----------- ruby23/trunk: Adjust dependencies and overrides Modified Paths: -------------- csw/mgar/pkg/ruby23/trunk/Makefile Modified: csw/mgar/pkg/ruby23/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby23/trunk/Makefile 2016-03-18 12:28:28 UTC (rev 25615) +++ csw/mgar/pkg/ruby23/trunk/Makefile 2016-03-18 12:42:25 UTC (rev 25616) @@ -31,8 +31,10 @@ # https://bugs.ruby-lang.org/issues/10830 #PATCHFILES += 0001-Use-LDFLAGS-for-libruby.so.patch +BUILD_DEP_PKGS += CSWlibgdbm-dev + PACKAGES += CSWruby23 -SPKG_DESC_CSWruby23 = Ruby 2.1.x +SPKG_DESC_CSWruby23 = Ruby $(VERSION) RUNTIME_DEP_PKGS_CSWruby23 += CSWlibgdbm4 RUNTIME_DEP_PKGS_CSWruby23 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWruby23 += CSWlibz1 @@ -41,22 +43,24 @@ RUNTIME_DEP_PKGS_CSWruby23 += CSWlibtk8-5 RUNTIME_DEP_PKGS_CSWruby23 += CSWlibyaml0-2 RUNTIME_DEP_PKGS_CSWruby23 += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWruby23 += CSWlibffi6 # These are all comments, checked by inspection -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/pathname.rb -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/fileutils.rb -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/shell.rb -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/rubygems/installer.rb -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/rubygems/basic_specification.rb -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/rubygems/specification.rb -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/tkextlib/itcl/setup.rb -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.1.0/tkextlib/itk/setup.rb -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/2.1.0/open3.rb -CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/2.1.0/tk/dialog.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.3.0/pathname.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.3.0/fileutils.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.3.0/shell.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.3.0/rubygems/installer.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.3.0/rubygems/basic_specification.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.3.0/rubygems/specification.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.3.0/tkextlib/itcl/setup.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/2.3.0/tkextlib/itk/setup.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/2.3.0/open3.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/2.3.0/tk/dialog.rb +CHECKPKG_OVERRIDES_CSWruby23 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/gems/2.3.0/gems/rake-10.4.2/doc/rake.1 # We don't split off the library - without lots of ruby files it is not usable anyway -CHECKPKG_OVERRIDES_CSWruby23 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libruby2.1.5.so -CHECKPKG_OVERRIDES_CSWruby23 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libruby2.1.5.so.2|soname=libruby2.1.5.so.2|pkgname=CSWruby23|expected=CSWlibruby2-1-5-2 +CHECKPKG_OVERRIDES_CSWruby23 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libruby2.3.0.so +CHECKPKG_OVERRIDES_CSWruby23 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libruby2.3.0.so.2|soname=libruby2.3.0.so.2|pkgname=CSWruby23|expected=CSWlibruby2-3-0-2 # The reason is that there are *.rb files which normally require a ruby library, but we don't split this any more CHECKPKG_OVERRIDES_CSWruby23 += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 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 Mar 18 14:20:44 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Mar 2016 13:20:44 +0000 Subject: SF.net SVN: gar:[25617] csw/mgar/pkg/ruby23/trunk/Makefile Message-ID: <3qRQpN48KxzC2@mail.opencsw.org> Revision: 25617 http://sourceforge.net/p/gar/code/25617 Author: dmichelsen Date: 2016-03-18 13:20:44 +0000 (Fri, 18 Mar 2016) Log Message: ----------- ruby23/trunk: Override no-direct-binding for now Modified Paths: -------------- csw/mgar/pkg/ruby23/trunk/Makefile Modified: csw/mgar/pkg/ruby23/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby23/trunk/Makefile 2016-03-18 12:42:25 UTC (rev 25616) +++ csw/mgar/pkg/ruby23/trunk/Makefile 2016-03-18 13:20:44 UTC (rev 25617) @@ -65,6 +65,10 @@ # The reason is that there are *.rb files which normally require a ruby library, but we don't split this any more CHECKPKG_OVERRIDES_CSWruby23 += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 +# This needs to be investigated, override for now +CHECKPKG_OVERRIDES_CSWruby23 += no-direct-binding|/opt/csw/lib/ruby/2.3.0/i386-solaris2.11/thread.so|is|not|directly|bound|to|soname|libcrypt.so.1 +CHECKPKG_OVERRIDES_CSWruby23 += no-direct-binding|/opt/csw/lib/ruby/2.3.0/i386-solaris2.11/thread.so|is|not|directly|bound|to|soname|libgmp.so.10 + # path = %w[/usr/local/bin /usr/ucb /usr/bin /bin] REINPLACE_USRLOCAL += lib/mkmf.rb # path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:."; 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 Mar 18 17:14:39 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 18 Mar 2016 16:14:39 +0000 Subject: SF.net SVN: gar:[25618] csw/mgar/pkg/dovecot/trunk Message-ID: <3qRVg31jmZzLK@mail.opencsw.org> Revision: 25618 http://sourceforge.net/p/gar/code/25618 Author: jake_goerzen Date: 2016-03-18 16:14:39 +0000 (Fri, 18 Mar 2016) Log Message: ----------- dovecot: update to version 2.2.22 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 2016-03-18 13:20:44 UTC (rev 25617) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2016-03-18 16:14:39 UTC (rev 25618) @@ -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.21 +VERSION = 2.2.22 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2016-03-18 13:20:44 UTC (rev 25617) +++ csw/mgar/pkg/dovecot/trunk/checksums 2016-03-18 16:14:39 UTC (rev 25618) @@ -1 +1 @@ -28c39ab78a20f00701c26960d9190cf0 dovecot-2.2.21.tar.gz +bc8057bd5bdfa0f8e80e2fef1082a241 dovecot-2.2.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 18 23:18:17 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Mar 2016 22:18:17 +0000 Subject: SF.net SVN: gar:[25619] csw/mgar/pkg/lang-python/python/branches/python-3.3 Message-ID: <3qRfkj5GpXzTB@mail.opencsw.org> Revision: 25619 http://sourceforge.net/p/gar/code/25619 Author: dmichelsen Date: 2016-03-18 22:18:16 +0000 (Fri, 18 Mar 2016) Log Message: ----------- lang-python/python/branches/python-3.3: Update to 3.3.6 and rebuild to to removal of SSL v2 symbols from OpenSSL Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2016-03-18 16:14:39 UTC (rev 25618) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2016-03-18 22:18:16 UTC (rev 25619) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 3.3.2 +VERSION = 3.3.6 VER = 3.3 DVER = 3-3 UVER = 3_3 @@ -17,7 +17,7 @@ # - http://bugs.python.org/issue4902 # - Python-2.6.1/Modules/_ctypes/libffi/src/x86/sysv.S -SPKG_SOURCEURL = http://python.org/download/releases/$(VERSION) +VENDOR_URL = http://python.org/download/releases/$(VERSION) DESCRIPTION = A high-level scripting language. define BLURB @@ -30,16 +30,16 @@ an extension language for applications that need a programmable interface. endef -MASTER_SITES = http://python.org/ftp/python/$(VERSION)/ +MASTER_SITES = https://www.python.org/ftp/python/$(VERSION)/ +DISTFILES += $(DISTNAME).tar.xz + UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ UFILES_REGEX = $(VER)\.\d+ -DISTFILES = $(DISTNAME).tar.bz2 - # Patches PATCHFILES += makesetup.diff PATCHFILES += modules.diff -PATCHFILES += multiprocess.diff +#PATCHFILES += multiprocess.diff PATCHFILES += 0004-Use-PY_CPPFLAGS-in-Modules-makesetup.patch PATCHFILES += 0005-Use-opt-csw-lib-for-module-search.patch PATCHFILES += 0007-Settings-for-Solaris.patch @@ -52,6 +52,7 @@ # There are problems with platform-dependent data in $(prefix)/lib/python3.3 # Installation paths are defined in: # http://hg.python.org/cpython/file/26588b6a39d9/Makefile.pre.in#l114 + # http://wiki.debian.org/Python/MultiArch # GARFLAVOR = DBG # BUILD64 = 1 @@ -86,7 +87,14 @@ # cswpycompile can how handle Python 3 files. PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' +BUILD_DEP_PKGS += CSWlibffi-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev +# Because of /opt/csw/lib/libxtermcap.a +BUILD_DEP_PKGS += CSWschilybase + PACKAGES = CSWidle$(CVER) SPKG_DESC_CSWidle$(CVER) = Python IDE CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython @@ -108,7 +116,7 @@ SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi6 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWliblzma5 @@ -119,6 +127,7 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- @@ -189,12 +198,7 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ -BUILD_DEP_PKGS += CSWlibffi-dev -BUILD_DEP_PKGS += CSWggettext-dev -BUILD_DEP_PKGS += CSWlibncurses-dev -BUILD_DEP_PKGS += CSWlibgcrypt-dev -# Because of /opt/csw/lib/libxtermcap.a -BUILD_DEP_PKGS += CSWschilybase +GARCOMPILER = GNU LICENSE = LICENSE @@ -202,25 +206,7 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ -# To avoid file collisions with CSWpython: -EXTRA_PAX_ARGS += -s ',^\.$(bindir)/idle,$(bindir)/idle-$(VER),' -EXTRA_PAX_ARGS += -s ',^\.$(bindir)/smtpd.py,$(bindir)/smtpd.py-$(VER),' -EXTRA_PAX_ARGS += -s ',^\.$(bindir)/pydoc,$(bindir)/pydoc-$(VER),' -EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),' -EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),' - EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python -GARCOMPILER = GNU - include gar/category.mk -# There is a file name conflict over libffi.so symlink between libffi package -# and a gcc-java package. While it will ultimately belong to libffi_dev, the -# symlink is currently under a subdirectory. -# pkgchk -L CSWlibffi-dev -# (...) -# /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev -# EXTRA_LINKER_FLAGS += $(libdir)/ffi -# LDFLAGS += -L$(libdir)/ffi - Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums 2016-03-18 16:14:39 UTC (rev 25618) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums 2016-03-18 22:18:16 UTC (rev 25619) @@ -1 +1 @@ -7dffe775f3bea68a44f762a3490e5e28 Python-3.3.2.tar.bz2 +67b8ddd9ee600d636423ada321b8da86 Python-3.3.6.tar.xz 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 Mar 18 23:56:16 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 18 Mar 2016 22:56:16 +0000 Subject: SF.net SVN: gar:[25620] csw/mgar/pkg/bluefish/trunk Message-ID: <3qRgZQ6g0DzWZ@mail.opencsw.org> Revision: 25620 http://sourceforge.net/p/gar/code/25620 Author: jake_goerzen Date: 2016-03-18 22:56:16 +0000 (Fri, 18 Mar 2016) Log Message: ----------- bluefish: update to 2.2.8 Modified Paths: -------------- csw/mgar/pkg/bluefish/trunk/Makefile csw/mgar/pkg/bluefish/trunk/checksums Modified: csw/mgar/pkg/bluefish/trunk/Makefile =================================================================== --- csw/mgar/pkg/bluefish/trunk/Makefile 2016-03-18 22:18:16 UTC (rev 25619) +++ csw/mgar/pkg/bluefish/trunk/Makefile 2016-03-18 22:56:16 UTC (rev 25620) @@ -1,5 +1,5 @@ NAME = bluefish -VERSION = 2.2.7 +VERSION = 2.2.8 DESCRIPTION = Advanced Gtk+ HTML editor define BLURB Modified: csw/mgar/pkg/bluefish/trunk/checksums =================================================================== --- csw/mgar/pkg/bluefish/trunk/checksums 2016-03-18 22:18:16 UTC (rev 25619) +++ csw/mgar/pkg/bluefish/trunk/checksums 2016-03-18 22:56:16 UTC (rev 25620) @@ -1 +1 @@ -b1abef07197200a15f14c5ae773837a1 bluefish-2.2.7.tar.gz +a561a583940675e7144e073fd7db77d9 bluefish-2.2.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Mar 19 12:36:37 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Mar 2016 11:36:37 +0000 Subject: SF.net SVN: gar:[25621] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: <3qS0Rv0PGFzdQ@mail.opencsw.org> Revision: 25621 http://sourceforge.net/p/gar/code/25621 Author: dmichelsen Date: 2016-03-19 11:36:37 +0000 (Sat, 19 Mar 2016) Log Message: ----------- lang-python/python/branches/python-3.3: Take care of linker anomaly Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2016-03-18 22:56:16 UTC (rev 25620) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2016-03-19 11:36:37 UTC (rev 25621) @@ -127,7 +127,9 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 +# Linker anomaly +RUNTIME_DEP_PKGS_CSWpython$(CVER)-sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += $(RUNTIME_DEP_PKGS_CSWpython$(CVER)-$(GARCH)) CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Mar 20 09:27:32 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 20 Mar 2016 08:27:32 +0000 Subject: SF.net SVN: gar:[25622] csw/mgar/pkg/mercurial/trunk Message-ID: <3qSXC85jyWzqT@mail.opencsw.org> Revision: 25622 http://sourceforge.net/p/gar/code/25622 Author: rthurner Date: 2016-03-20 08:27:32 +0000 (Sun, 20 Mar 2016) Log Message: ----------- mercurial/trunk: mercurial, update to hg-3.7.2 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2016-03-19 11:36:37 UTC (rev 25621) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2016-03-20 08:27:32 UTC (rev 25622) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 3.6.3 +VERSION = 3.7.2 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2016-03-19 11:36:37 UTC (rev 25621) +++ csw/mgar/pkg/mercurial/trunk/checksums 2016-03-20 08:27:32 UTC (rev 25622) @@ -1 +1 @@ -25b6065487842a7851ba8cfcaa704b1f mercurial-3.6.3.tar.gz +cebd60f39965480879d268d6e13e3d30 mercurial-3.7.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Mar 21 10:59:01 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Mar 2016 09:59:01 +0000 Subject: SF.net SVN: gar:[25623] csw/mgar/gar/v2/categories/python/category.mk Message-ID: <3qTBBN1qx9zNs@mail.opencsw.org> Revision: 25623 http://sourceforge.net/p/gar/code/25623 Author: dmichelsen Date: 2016-03-21 09:59:01 +0000 (Mon, 21 Mar 2016) Log Message: ----------- mGAR v2: Use default GNU compiler for python category Modified Paths: -------------- csw/mgar/gar/v2/categories/python/category.mk Modified: csw/mgar/gar/v2/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2016-03-20 08:27:32 UTC (rev 25622) +++ csw/mgar/gar/v2/categories/python/category.mk 2016-03-21 09:59:01 UTC (rev 25623) @@ -55,11 +55,11 @@ GARCOMPILER_PYTHON__5.11 = SOS12 # Specific modulations GARCOMPILER_PYTHON_2_6_5.9 = SOS12 -GARCOMPILER_PYTHON_2_7_5.9 = GCC4 +GARCOMPILER_PYTHON_2_7_5.9 = GNU GARCOMPILER_PYTHON_2_6_5.10 = SOS12U3 -GARCOMPILER_PYTHON_2_7_5.10 = GCC4 +GARCOMPILER_PYTHON_2_7_5.10 = GNU GARCOMPILER_PYTHON_2_6_5.11 = SOS12U3 -GARCOMPILER_PYTHON_2_7_5.11 = GCC4 +GARCOMPILER_PYTHON_2_7_5.11 = GNU GARCOMPILER ?= $(GARCOMPILER_PYTHON_$(PYTHON_VERSION)_$(GAROSREL)) PACKAGING_PLATFORMS ?= solaris9-i386 solaris9-sparc solaris10-i386 solaris10-sparc 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 Mar 21 11:01:58 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Mar 2016 10:01:58 +0000 Subject: SF.net SVN: gar:[25624] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: <3qTBFg5KD3zRF@mail.opencsw.org> Revision: 25624 http://sourceforge.net/p/gar/code/25624 Author: dmichelsen Date: 2016-03-21 10:01:58 +0000 (Mon, 21 Mar 2016) Log Message: ----------- mercurial/trunk: Simplify recipe Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2016-03-21 09:59:01 UTC (rev 25623) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2016-03-21 10:01:58 UTC (rev 25624) @@ -1,39 +1,22 @@ NAME = mercurial VERSION = 3.7.2 CATEGORIES = python -GARTYPE = v2 DESCRIPTION = Fast, lightweight Source Control Management system -MASTER_SITES = http://selenic.com/mercurial/release/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +MASTER_SITES += http://selenic.com/mercurial/release/ +DISTFILES += $(DISTNAME).tar.gz -PACKAGES = CSWmercurial +# We can just build for Python 2.7 as this is an application +MODULATIONS_PYTHON_VERSION = 2_7 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -SPKG_DESC_CSWmercurial = Mercurial +PACKAGES += CSWmercurial +SPKG_DESC_CSWmercurial = Mercurial SCM +RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWmercurial += CSWlibgcc-s1 -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py -# Some tests fail, but manual inspection of the failures show no significant failures. -# how to include the test scripts correctly with mgar? a test target does not exist -TEST_SCRIPTS = -#TEST_SCRIPTS = $(WORKSRC)/tests/run_tests.py -#TEST_TARGET = - -#RUNTIME_DEP_PKGS_CSWmercurial += CSWlibgcc-s1 -#RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-6-1-0 -#RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-7-1-0 - CHECKPKG_OVERRIDES_CSWmercurial += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWmercurial += catalogname-does-not-start-with-py_ include gar/category.mk - -pre-build-modulated: - @echo "Changing /bin/sh to /opt/csw/bin/bash in test scripts..." - @(cd $(WORKSRC)/tests; \ - ggrep -rl '#!/bin/sh' * | \ - xargs perl -pi -e 's|#!/bin/sh|#!/opt/csw/bin/bash|' ) - @$(MAKECOOKIE) 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 Mar 21 23:08:58 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 21 Mar 2016 22:08:58 +0000 Subject: SF.net SVN: gar:[25625] csw/mgar/pkg Message-ID: <3qTVNX1pH8zqV@mail.opencsw.org> Revision: 25625 http://sourceforge.net/p/gar/code/25625 Author: jake_goerzen Date: 2016-03-21 22:08:57 +0000 (Mon, 21 Mar 2016) Log Message: ----------- sdlgfx/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/sdlgfx/ csw/mgar/pkg/sdlgfx/Makefile csw/mgar/pkg/sdlgfx/branches/ csw/mgar/pkg/sdlgfx/tags/ csw/mgar/pkg/sdlgfx/trunk/ csw/mgar/pkg/sdlgfx/trunk/Makefile csw/mgar/pkg/sdlgfx/trunk/checksums csw/mgar/pkg/sdlgfx/trunk/files/ Added: csw/mgar/pkg/sdlgfx/Makefile =================================================================== --- csw/mgar/pkg/sdlgfx/Makefile (rev 0) +++ csw/mgar/pkg/sdlgfx/Makefile 2016-03-21 22:08:57 UTC (rev 25625) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/sdlgfx/trunk =================================================================== --- csw/mgar/pkg/sdlgfx/trunk 2016-03-21 10:01:58 UTC (rev 25624) +++ csw/mgar/pkg/sdlgfx/trunk 2016-03-21 22:08:57 UTC (rev 25625) Property changes on: csw/mgar/pkg/sdlgfx/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/sdlgfx/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlgfx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sdlgfx/trunk/Makefile 2016-03-21 22:08:57 UTC (rev 25625) @@ -0,0 +1,35 @@ +NAME = SDL_gfx +VERSION = 2.0.25 +GARTYPE = v2 + +DESCRIPTION = Drawing and graphical effects extension for SDL +define BLURB + The SDL_gfx library is an extension to the SDL library which provides basic antialiased drawing routines such as lines, circles or polygons, an interpolating rotozoomer for SDL surfaces, framerate control and MMX image filters. +endef + +MASTER_SITES = http://www.ferzkopp.net/Software/SDL_gfx-2.0/ +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = GNU + +PACKAGES += CSWlibsdl-gfx15 +CATALOGNAME_CSWlibsdl-gfx15 = libsdl_gfx15 +PKGFILES_CSWlibsdl-gfx15 += $(call baseisadirs,$(libdir),libSDL_gfx\.so\.15\.9\.1) +PKGFILES_CSWlibsdl-gfx15 += $(call baseisadirs,$(libdir),libSDL_gfx\.so\.15(\.\d+)*) +SPKG_DESC_CSWlibsdl-gfx15 += $(DESCRIPTION), libSDL_gfx.so.15 + +PACKAGES += CSWlibsdl-gfx15-dev +CATALOGNAME_CSWlibsdl-gfx15-dev = libsdl_gfx15_dev +SPKG_DESC_CSWlibsdl-gfx15-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibsdl-gfx15-dev += /opt/csw/lib/libSDL_gfx.so +PKGFILES_CSWlibsdl-gfx15-dev += $(PKGFILES_DEVEL) + +RUNTIME_DEP_PKGS_CSWlibsdl-gfx15 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsdl-gfx15 += CSWlibsdl1-2-0 + +RUNTIME_DEP_PKGS_CSWlibsdl-gfx15-dev += CSWlibsdl-gfx15 + +CONFIGURE_ARGS = $(DIRPATHS) --disable-mmx + +include gar/category.mk + Property changes on: csw/mgar/pkg/sdlgfx/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/sdlgfx/trunk/checksums =================================================================== --- csw/mgar/pkg/sdlgfx/trunk/checksums (rev 0) +++ csw/mgar/pkg/sdlgfx/trunk/checksums 2016-03-21 22:08:57 UTC (rev 25625) @@ -0,0 +1 @@ +ea24ed4b82ff1304809c363494fa8e16 SDL_gfx-2.0.25.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Mar 22 17:05:20 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 22 Mar 2016 16:05:20 +0000 Subject: SF.net SVN: gar:[25626] csw/mgar/pkg/phpMyAdmin/trunk Message-ID: <3qTyGc0HDRz190@mail.opencsw.org> Revision: 25626 http://sourceforge.net/p/gar/code/25626 Author: janholzh Date: 2016-03-22 16:05:19 +0000 (Tue, 22 Mar 2016) Log Message: ----------- phpMyAdmin/trunk: update to 4.6.0 Modified Paths: -------------- csw/mgar/pkg/phpMyAdmin/trunk/Makefile csw/mgar/pkg/phpMyAdmin/trunk/checksums Modified: csw/mgar/pkg/phpMyAdmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2016-03-21 22:08:57 UTC (rev 25625) +++ csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2016-03-22 16:05:19 UTC (rev 25626) @@ -1,5 +1,5 @@ NAME = phpMyAdmin -VERSION = 4.5.5.1 +VERSION = 4.6.0 GARTYPE = v2 DESCRIPTION = Effective MySQL Management Modified: csw/mgar/pkg/phpMyAdmin/trunk/checksums =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/checksums 2016-03-21 22:08:57 UTC (rev 25625) +++ csw/mgar/pkg/phpMyAdmin/trunk/checksums 2016-03-22 16:05:19 UTC (rev 25626) @@ -1 +1 @@ -440a32ecfea4d38b10017c3b75de8dcd phpMyAdmin-4.5.5.1-all-languages.zip +bab932ea87ec92b8a5ebf6c87c729b70 phpMyAdmin-4.6.0-all-languages.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Mar 22 19:52:40 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 22 Mar 2016 18:52:40 +0000 Subject: SF.net SVN: gar:[25627] csw/mgar/pkg/cmake/trunk Message-ID: <3qV1zX5Xh2z1FZ@mail.opencsw.org> Revision: 25627 http://sourceforge.net/p/gar/code/25627 Author: rthurner Date: 2016-03-22 18:52:39 +0000 (Tue, 22 Mar 2016) Log Message: ----------- cmake/trunk: cmake, update to cmake-3.4.3 Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/cmake/trunk/checksums Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2016-03-22 16:05:19 UTC (rev 25626) +++ csw/mgar/pkg/cmake/trunk/Makefile 2016-03-22 18:52:39 UTC (rev 25627) @@ -1,7 +1,7 @@ # $Id$ NAME = cmake -VERSION = 3.4.1 +VERSION = 3.4.3 GARTYPE = v2 DESCRIPTION = Cross-platform make Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2016-03-22 16:05:19 UTC (rev 25626) +++ csw/mgar/pkg/cmake/trunk/checksums 2016-03-22 18:52:39 UTC (rev 25627) @@ -1 +1 @@ -73acda0d33be9b2729af99893d99a012 cmake-3.4.1.tar.gz +4cb3ff35b2472aae70f542116d616e63 cmake-3.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Mar 23 04:45:12 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 23 Mar 2016 03:45:12 +0000 Subject: SF.net SVN: gar:[25628] csw/mgar/pkg/cmake/trunk Message-ID: <3qVFp20J5qz1S8@mail.opencsw.org> Revision: 25628 http://sourceforge.net/p/gar/code/25628 Author: rthurner Date: 2016-03-23 03:45:11 +0000 (Wed, 23 Mar 2016) Log Message: ----------- cmake/trunk: cmake, update to cmake-3.5.0. Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/cmake/trunk/checksums Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2016-03-22 18:52:39 UTC (rev 25627) +++ csw/mgar/pkg/cmake/trunk/Makefile 2016-03-23 03:45:11 UTC (rev 25628) @@ -1,7 +1,7 @@ # $Id$ NAME = cmake -VERSION = 3.4.3 +VERSION = 3.5.0 GARTYPE = v2 DESCRIPTION = Cross-platform make Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2016-03-22 18:52:39 UTC (rev 25627) +++ csw/mgar/pkg/cmake/trunk/checksums 2016-03-23 03:45:11 UTC (rev 25628) @@ -1 +1 @@ -4cb3ff35b2472aae70f542116d616e63 cmake-3.4.3.tar.gz +33c5d09d4c33d4ffcc63578a6ba8777e cmake-3.5.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 Wed Mar 23 11:20:16 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Mar 2016 10:20:16 +0000 Subject: SF.net SVN: gar:[25629] csw/mgar/pkg/curl/trunk Message-ID: <3qVQYr3VQjz6W@mail.opencsw.org> Revision: 25629 http://sourceforge.net/p/gar/code/25629 Author: dmichelsen Date: 2016-03-23 10:20:15 +0000 (Wed, 23 Mar 2016) Log Message: ----------- curl/trunk: Update to 7.48.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 2016-03-23 03:45:11 UTC (rev 25628) +++ csw/mgar/pkg/curl/trunk/Makefile 2016-03-23 10:20:15 UTC (rev 25629) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.47.1 +VERSION = 7.48.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 2016-03-23 03:45:11 UTC (rev 25628) +++ csw/mgar/pkg/curl/trunk/checksums 2016-03-23 10:20:15 UTC (rev 25629) @@ -1 +1 @@ -8242c073d8e5fc1c2a1aa946f1e903a4 curl-7.47.1.tar.lzma +de75665721e3adb0a1d7e03b90c3d7a2 curl-7.48.0.tar.lzma This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 24 15:34:09 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 24 Mar 2016 14:34:09 +0000 Subject: SF.net SVN: gar:[25630] csw/mgar/pkg Message-ID: <3qW88g4mbDzcj@mail.opencsw.org> Revision: 25630 http://sourceforge.net/p/gar/code/25630 Author: dmichelsen Date: 2016-03-24 14:34:08 +0000 (Thu, 24 Mar 2016) Log Message: ----------- xrdp/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/xrdp/ csw/mgar/pkg/xrdp/Makefile csw/mgar/pkg/xrdp/branches/ csw/mgar/pkg/xrdp/tags/ csw/mgar/pkg/xrdp/trunk/ csw/mgar/pkg/xrdp/trunk/Makefile csw/mgar/pkg/xrdp/trunk/checksums csw/mgar/pkg/xrdp/trunk/files/ csw/mgar/pkg/xrdp/trunk/files/0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch Added: csw/mgar/pkg/xrdp/Makefile =================================================================== --- csw/mgar/pkg/xrdp/Makefile (rev 0) +++ csw/mgar/pkg/xrdp/Makefile 2016-03-24 14:34:08 UTC (rev 25630) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/xrdp/trunk =================================================================== --- csw/mgar/pkg/xrdp/trunk 2016-03-23 10:20:15 UTC (rev 25629) +++ csw/mgar/pkg/xrdp/trunk 2016-03-24 14:34:08 UTC (rev 25630) Property changes on: csw/mgar/pkg/xrdp/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/xrdp/trunk/Makefile =================================================================== --- csw/mgar/pkg/xrdp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xrdp/trunk/Makefile 2016-03-24 14:34:08 UTC (rev 25630) @@ -0,0 +1,61 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xrdp +VERSION = 0.6.1 +GARTYPE = v2 + +DESCRIPTION = An open source remote desktop protocol(rdp) server + +MASTER_SITES = $(SF_MIRROR) +DISTNAME = $(NAME)-v$(VERSION) +DISTFILES += $(DISTNAME).tar.gz + +# Taken from https://github.com/cherokee/webserver/issues/962 +PATCHFILES += 0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch + +PACKAGES += CSWxrdp +SPKG_DESC_CSWxrdp = An open source remote desktop protocol(rdp) server +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWxrdp += CSWlibssl1-0-0 +# We need /usr/openwin/sfw/lib for libXfixes.so.1 +# This is in all libraries und binaries +CHECKPKG_OVERRIDES_CSWxrdp += bad-rpath-entry +# We need this for mkdtemp +CHECKPKG_OVERRIDES_CSWxrdp += forbidden-version-interface-dependencies|/opt/csw/lib/xrdp/libcommon.so.0.0.0|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 + +REINPLACE_USRLOCAL += sesman/startwm.sh +REINPLACE_USRLOCAL += sesman/env.c +REINPLACE_USRLOCAL += instfiles/xrdp.sh + +# We need standard-conforming sigwait with two arguments +# Better check for this in configure +EXTRA_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS + +# We must not strip down to old libc as we need mkdtemp from SUNW_1.23 +#LINKER_MAP_RELEASE = + +# We need this for sem_detroy, sem_init, sem_post and sem_wait +# Better check for this in configure +EXTRA_LINKER_FLAGS += -lrt + +# For bind +# Better check for this in configure +EXTRA_LINKER_FLAGS += -lsocket -lnsl + +# For libXfixes.so +EXTRA_LIB += /usr/openwin/sfw/lib + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-nopam +CONFIGURE_ARGS += --enable-kerberos +CONFIGURE_ARGS += --enable-pamuserpass +#CONFIGURE_ARGS += --enable-xrdpdebug +#CONFIGURE_ARGS += --enable-freerdp +#CONFIGURE_ARGS += --enable-freerdp1 + +include gar/category.mk + +pre-configure: + cd $(WORKSRC) && $ $(CONFIGURE_ENV) bash ./bootstrap + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/xrdp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/xrdp/trunk/checksums =================================================================== --- csw/mgar/pkg/xrdp/trunk/checksums (rev 0) +++ csw/mgar/pkg/xrdp/trunk/checksums 2016-03-24 14:34:08 UTC (rev 25630) @@ -0,0 +1 @@ +26099c6588943262023607c1b4e774d8 xrdp-v0.6.1.tar.gz Added: csw/mgar/pkg/xrdp/trunk/files/0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch =================================================================== --- csw/mgar/pkg/xrdp/trunk/files/0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch (rev 0) +++ csw/mgar/pkg/xrdp/trunk/files/0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch 2016-03-24 14:34:08 UTC (rev 25630) @@ -0,0 +1,34 @@ +From bc750620f3b9bb567bf08dc9da0eccc9f607f9de Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 24 Mar 2016 15:13:37 +0100 +Subject: [PATCH] Do not use mkdtemp only available in Solaris 10u11 + +--- + common/os_calls.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/common/os_calls.c b/common/os_calls.c +index 692dc01..52c7d0d 100644 +--- a/common/os_calls.c ++++ b/common/os_calls.c +@@ -118,7 +118,7 @@ g_mk_temp_dir(const char* app_name) + "/tmp/.xrdp/%s-XXXXXX", app_name); + snprintf(g_temp_base_org, sizeof(g_temp_base_org), + "/tmp/.xrdp/%s-XXXXXX", app_name); +- if (mkdtemp(g_temp_base) == 0) ++ if (!mktemp( g_temp_base ) || mkdir( g_temp_base, 0700 ) ) + { + printf("g_mk_temp_dir: mkdtemp failed [%s]\n", g_temp_base); + return 1; +@@ -138,7 +138,7 @@ g_mk_temp_dir(const char* app_name) + return 1; + } + g_strncpy(g_temp_base, g_temp_base_org, 127); +- if (mkdtemp(g_temp_base) == 0) ++ if (!mktemp( g_temp_base ) || mkdir( g_temp_base, 0700 ) ) + { + printf("g_mk_temp_dir: mkdtemp failed [%s]\n", g_temp_base); + } +-- +2.4.0 + 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 Mar 24 16:35:23 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 24 Mar 2016 15:35:23 +0000 Subject: SF.net SVN: gar:[25631] csw/mgar/pkg/sdlimage/branches/solaris9 Message-ID: <3qW9Vz4xtHzgy@mail.opencsw.org> Revision: 25631 http://sourceforge.net/p/gar/code/25631 Author: jake_goerzen Date: 2016-03-24 15:35:22 +0000 (Thu, 24 Mar 2016) Log Message: ----------- sdlimage/branches/solaris9: update to 1.2.12; fix naming of dev package Modified Paths: -------------- csw/mgar/pkg/sdlimage/branches/solaris9/Makefile csw/mgar/pkg/sdlimage/branches/solaris9/checksums Modified: csw/mgar/pkg/sdlimage/branches/solaris9/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/branches/solaris9/Makefile 2016-03-24 14:34:08 UTC (rev 25630) +++ csw/mgar/pkg/sdlimage/branches/solaris9/Makefile 2016-03-24 15:35:22 UTC (rev 25631) @@ -1,5 +1,5 @@ NAME = SDL_image -VERSION = 1.2.10 +VERSION = 1.2.12 GARTYPE = v2 DESCRIPTION = SDL image file loading library @@ -22,18 +22,18 @@ OBSOLETED_BY_CSWlibsdl-image1-2-0 += CSWsdlimage # Split development files into separate package. -PACKAGES += CSWsdlimage-dev -CATALOGNAME_CSWsdlimage-dev = sdlimage_dev -SPKG_DESC_CSWsdlimage-dev += $(DESCRIPTION), development files -PKGFILES_CSWsdlimage-dev += /opt/csw/lib/libSDL_image.so -PKGFILES_CSWsdlimage-dev += $(PKGFILES_DEVEL) +PACKAGES += CSWlibsdl-image-dev +CATALOGNAME_CSWlibsdl-image-dev = libsdl_image_dev +SPKG_DESC_CSWlibsdl-image-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibsdl-image-dev += /opt/csw/lib/libSDL_image.so +PKGFILES_CSWlibsdl-image-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWsdlimage-dev += CSWlibsdl-image1-2-0 RUNTIME_DEP_PKGS_CSWlibsdl-image1-2-0 += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWlibsdl-image-dev += CSWlibsdl-image1-2-0 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) --disable-static +CONFIGURE_ARGS = $(DIRPATHS) --disable-static --disable-webp TEST_SCRIPTS = Modified: csw/mgar/pkg/sdlimage/branches/solaris9/checksums =================================================================== --- csw/mgar/pkg/sdlimage/branches/solaris9/checksums 2016-03-24 14:34:08 UTC (rev 25630) +++ csw/mgar/pkg/sdlimage/branches/solaris9/checksums 2016-03-24 15:35:22 UTC (rev 25631) @@ -1 +1 @@ -6c06584b31559e2b59f2b982d0d1f628 SDL_image-1.2.10.tar.gz +a0f9098ebe5400f0bdc9b62e60797ecb SDL_image-1.2.12.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 Mar 24 22:29:56 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 24 Mar 2016 21:29:56 +0000 Subject: SF.net SVN: gar:[25632] csw/mgar/pkg/sdlimage/branches/solaris9 Message-ID: <3qWKN45Sczz1D5@mail.opencsw.org> Revision: 25632 http://sourceforge.net/p/gar/code/25632 Author: jake_goerzen Date: 2016-03-24 21:29:55 +0000 (Thu, 24 Mar 2016) Log Message: ----------- sdlimage/branches/solaris9: back to version 1.2.10 to keep compatibility with packages that depend on old CSWsdlimage Modified Paths: -------------- csw/mgar/pkg/sdlimage/branches/solaris9/Makefile csw/mgar/pkg/sdlimage/branches/solaris9/checksums Modified: csw/mgar/pkg/sdlimage/branches/solaris9/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/branches/solaris9/Makefile 2016-03-24 15:35:22 UTC (rev 25631) +++ csw/mgar/pkg/sdlimage/branches/solaris9/Makefile 2016-03-24 21:29:55 UTC (rev 25632) @@ -1,5 +1,5 @@ NAME = SDL_image -VERSION = 1.2.12 +VERSION = 1.2.10 GARTYPE = v2 DESCRIPTION = SDL image file loading library Modified: csw/mgar/pkg/sdlimage/branches/solaris9/checksums =================================================================== --- csw/mgar/pkg/sdlimage/branches/solaris9/checksums 2016-03-24 15:35:22 UTC (rev 25631) +++ csw/mgar/pkg/sdlimage/branches/solaris9/checksums 2016-03-24 21:29:55 UTC (rev 25632) @@ -1 +1 @@ -a0f9098ebe5400f0bdc9b62e60797ecb SDL_image-1.2.12.tar.gz +6c06584b31559e2b59f2b982d0d1f628 SDL_image-1.2.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Mar 29 10:40:50 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 29 Mar 2016 08:40:50 +0000 Subject: SF.net SVN: gar:[25633] csw/mgar/pkg/nrpe/trunk Message-ID: <3qZ44X4fkmzgg@mail.opencsw.org> Revision: 25633 http://sourceforge.net/p/gar/code/25633 Author: janholzh Date: 2016-03-29 08:40:50 +0000 (Tue, 29 Mar 2016) Log Message: ----------- nrpe/trunk: repackage und change dh_param Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2016-03-24 21:29:55 UTC (rev 25632) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2016-03-29 08:40:50 UTC (rev 25633) @@ -26,6 +26,7 @@ PATCHFILES_isa-pentium_pro-size-8k = 0002-changing-packetbuffer-length-to-8k.patch # needs autoconf! PATCHFILES += 0003-remove-chown-on-install.patch +PATCHFILES += 0003-chage_dh_param_to_2048.patch # # replace /usr/local @@ -35,7 +36,7 @@ REINPLACE_USRLOCAL += .*/nrpe-2.15/README REINPLACE_USRLOCAL += sample-config/nrpe.cfg.in -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-i386 solaris11-sparc # GARCOMPILER = GCC5 @@ -56,20 +57,20 @@ IPS_PACKAGE_PREFIX = diagnostic/ PACKAGES += CSWnrpe SPKG_DESC_CSWnrpe = Nagios remote plugin executor -# PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_1k -# PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_8k -# PKGFILES_CSWnrpe += /opt/csw/bin/nrpe -# PKGFILES_CSWnrpe += /etc/opt/csw/nrpe.cfg -# PKGFILES_CSWnrpe += /etc/opt/csw/init.d/cswnrpe -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/NRPE.pdf -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/LEGAL -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/license -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README +PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_1k +PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_8k +PKGFILES_CSWnrpe += /opt/csw/bin/nrpe +PKGFILES_CSWnrpe += /etc/opt/csw/nrpe.cfg.CSW +PKGFILES_CSWnrpe += /etc/opt/csw/init.d/cswnrpe +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/NRPE.pdf +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/LEGAL +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/license +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README PKGFILES_CSWnrpe_SHARED += /opt/csw/share/doc/nrpe/README_8k -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README.SSL -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/SECURITY -# PKGFILES_CSWnrpe += /opt/csw/nagios +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README.SSL +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/SECURITY +PKGFILES_CSWnrpe += /opt/csw/nagios RUNTIME_DEP_PKGS_CSWnrpe += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWnrpe += CSWlibssl1-0-0 @@ -95,6 +96,7 @@ RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWnrpe + # # migrate configuration # Added: csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch (rev 0) +++ csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch 2016-03-29 08:40:50 UTC (rev 25633) @@ -0,0 +1,39 @@ +From a733ca5b0f5e5e8f8a17730c43164c338c79161e Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Tue, 29 Mar 2016 10:16:49 +0200 +Subject: [PATCH] chage_dh_param_to_2048 + +--- + configure.in | 2 +- + src/nrpe.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index f0dfa09..1993140 100644 +--- a/configure.in ++++ b/configure.in +@@ -340,7 +340,7 @@ if test x$check_for_ssl = xyes; then + sslbin=$ssldir/bin/openssl + fi + # awk to strip off meta data at bottom of dhparam output +- $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h ++ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h + fi + fi + +diff --git a/src/nrpe.c b/src/nrpe.c +index 381f0ac..6234492 100644 +--- a/src/nrpe.c ++++ b/src/nrpe.c +@@ -266,7 +266,7 @@ int main(int argc, char **argv){ + + /* use anonymous DH ciphers */ + SSL_CTX_set_cipher_list(ctx,"ADH"); +- dh=get_dh512(); ++ dh=get_dh2048(); + SSL_CTX_set_tmp_dh(ctx,dh); + DH_free(dh); + if(debug==TRUE) +-- +2.4.0 + 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 Mar 29 10:46:01 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 29 Mar 2016 08:46:01 +0000 Subject: SF.net SVN: gar:[25634] csw/mgar/pkg/nrpe/trunk/Makefile Message-ID: <3qZ4BJ1YC7zkD@mail.opencsw.org> Revision: 25634 http://sourceforge.net/p/gar/code/25634 Author: janholzh Date: 2016-03-29 08:46:01 +0000 (Tue, 29 Mar 2016) Log Message: ----------- nrpe/trunk: change deps Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2016-03-29 08:40:50 UTC (rev 25633) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2016-03-29 08:46:01 UTC (rev 25634) @@ -94,7 +94,7 @@ PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin/license RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWnrpe +#RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWnrpe # 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 Mar 29 13:48:30 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 29 Mar 2016 11:48:30 +0000 Subject: SF.net SVN: gar:[25635] csw/mgar/pkg/samba/branches/samba4 Message-ID: <3qZ8F26lsHz173@mail.opencsw.org> Revision: 25635 http://sourceforge.net/p/gar/code/25635 Author: janholzh Date: 2016-03-29 11:48:30 +0000 (Tue, 29 Mar 2016) Log Message: ----------- samba/branches/samba4: update to 4.4.0 Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile csw/mgar/pkg/samba/branches/samba4/checksums Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2016-03-29 08:46:01 UTC (rev 25634) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2016-03-29 11:48:30 UTC (rev 25635) @@ -1,5 +1,5 @@ NAME = samba -VERSION = 4.3.4 +VERSION = 4.4.0 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -66,11 +66,11 @@ #PATCHFILES +=fix_bugid_11512 #From https://hg.java.net/hg/solaris-userland~gate/file/73dae8fa5c34/components/samba/samba/patches/talloc_dict_sigbus.patch -PATCHFILES += talloc_dict_sigbus.patch +#PATCHFILES += talloc_dict_sigbus.patch #fix build problems with idmap patch not in 4.3 but master #https://git.samba.org/?p=samba.git;a=patch;h=5134d29cbb2edcc2326de8896c5465afb3a0f392 -PATCHFILES +=idmap_fix +#PATCHFILES +=idmap_fix NOGITPATCH += 1 @@ -121,7 +121,7 @@ PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/vfs_.*) PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/idmap_.*) PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),mit_samba\.so) -PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),security/pam_smbpass\.so) +#PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),security/pam_smbpass\.so) PKGFILES_CSWsamba4 += /etc/opt/csw/samba/.* PKGFILES_CSWsamba4 += /var/opt/csw/samba/.* @@ -136,7 +136,7 @@ RUNTIME_DEP_PKGS_CSWsamba4_5.11 += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1 +#RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL)) @@ -210,6 +210,7 @@ CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbtree|CSWsamba-client|CSWsamba4-client CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbbackup|CSWsamba|CSWsamba4-client CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbget.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-not-found|libarchive.so.12|is|needed|by|opt/csw/bin/smbclient CHECKPKG_OVERRIDES_CSWsamba4-client += $(CHECKPKG_OVERRIDES_CSWsamba4-client_$(GAROSREL)) INCOMPATIBLE_PKGS_CSWsamba4-client += CSWsamba-client @@ -246,7 +247,7 @@ SMB_LIBS += libndr-krb5pac.so.0 libndr-nbt.so.0 libndr-standard.so.0 libndr.so.0 libnetapi.so.0 libpdb.so.0 SMB_LIBS += libregistry.so.0 libsamba-credentials.so.0 libsamba-hostconfig.so.0 libsamba-policy.so.0 SMB_LIBS += libsamba-util.so.0 libsamdb.so.0 libsmbclient-raw.so.0 libsmbconf.so.0 libsmbldap.so.0 libtevent-util.so.0 -SMB_LIBS += libtorture.so.0 libsamba-passdb.so.0 libsmbclient.so.0 libwbclient.so.0 +SMB_LIBS += libtorture.so.0 libsamba-passdb.so.0 libsmbclient.so.0 libwbclient.so.0 libsamba-errors.so.1 libtevent-unix-util.so.0 PKGFILES_CSWsamba4-libs += $(foreach L,$(SMB_LIBS),$(call pkgfiles_lib,$L)) PKGFILES_CSWsamba4-libs += $(SMBPRIVATELIB)/.* @@ -293,7 +294,7 @@ CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libregistry.so.0.0.1|soname=libregistry.so.0|pkgname=CSWsamba4-libs|expected=CSWlibregistry0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-credentials.so.0.0.1|soname=libsamba-credentials.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-credentials0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-hostconfig.so.0.0.1|soname=libsamba-hostconfig.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-hostconfig0 -CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-passdb.so.0.24.1|soname=libsamba-passdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-passdb0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-passdb.so.0.25.0|soname=libsamba-passdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-passdb0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-policy.so.0.0.1|soname=libsamba-policy.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-policy0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-util.so.0.0.1|soname=libsamba-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-util0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamdb.so.0.0.1|soname=libsamdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamdb0 @@ -304,6 +305,8 @@ CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libtevent-util.so.0.0.1|soname=libtevent-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtevent-util0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libtorture.so.0.0.1|soname=libtorture.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtorture0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwbclient.so.0.12|soname=libwbclient.so.0|pkgname=CSWsamba4-libs|expected=CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-errors.so.1|soname=libsamba-errors.so.1|pkgname=CSWsamba4-libs|expected=CSWlibsamba-errors1 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libtevent-unix-util.so.0.0.1|soname=libtevent-unix-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtevent-unix-util0 CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/lib/libwbclient.so.0|CSWlibwbclient0|CSWsamba4-libs CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/lib/libnetapi.so.0|CSWlibnetapi0|CSWsamba4-libs @@ -423,11 +426,11 @@ ARCHALL_CSWsamba4-pam-system-links = 1 CATALOGNAME_CSWsamba4-pam-system-links = samba4_pam_system_links INCOMPATIBLE_PKGS_CSWsamba4-pam-system-links += CSWsamba-pam-system-links -PKGFILES_CSWsamba4-pam-system-links = /usr/lib/security/pam_smbpass_csw.so +#PKGFILES_CSWsamba4-pam-system-links = /usr/lib/security/pam_smbpass_csw.so PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/pam_winbind_csw.so -PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/amd64/pam_smbpass_csw.so +#PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/amd64/pam_smbpass_csw.so PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/amd64/pam_winbind_csw.so -PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_smbpass_csw.so +#PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_smbpass_csw.so PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_winbind_csw.so SPKG_DESC_CSWsamba4-pam-system-links += Samba 4 pam modules links for the system RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSWsamba4 @@ -468,7 +471,6 @@ NODIRPATHS += --exec_prefix=/opt/csw CONFIGURE_ARGS += --with-acl-support -CONFIGURE_ARGS += --with-aio-support CONFIGURE_ARGS += --with-pam CONFIGURE_ARGS += --with-winbind CONFIGURE_ARGS += --with-shared-modules=$(SMB_MODULES) @@ -533,9 +535,9 @@ #NSS_WINS_64 = ../../..$(libdir)/libnss_wins.so.2 PAM_WINBIND_32 = ../../..$(libdir)/security/pam_winbind.so -PAM_SMBPASS_32 = ../../..$(libdir)/security/pam_smbpass.so +#PAM_SMBPASS_32 = ../../..$(libdir)/security/pam_smbpass.so PAM_WINBIND_64 = ../../../..$(libdir)/security/pam_winbind.so -PAM_SMBPASS_64 = ../../../..$(libdir)/security/pam_smbpass.so +#PAM_SMBPASS_64 = ../../../..$(libdir)/security/pam_smbpass.so post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw/init.d @@ -554,7 +556,7 @@ # system's pam.conf ginstall -d -m 0755 $(DESTDIR)$(PAM_MODULE_DIR) gln -s $(PAM_WINBIND_$(MEMORYMODEL)) $(DESTDIR)$(PAM_MODULE_DIR)/pam_winbind_csw.so - gln -s $(PAM_SMBPASS_$(MEMORYMODEL)) $(DESTDIR)$(PAM_MODULE_DIR)/pam_smbpass_csw.so + #gln -s $(PAM_SMBPASS_$(MEMORYMODEL)) $(DESTDIR)$(PAM_MODULE_DIR)/pam_smbpass_csw.so @$(MAKECOOKIE) # python buildtools/bin/waf -v build Modified: csw/mgar/pkg/samba/branches/samba4/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba4/checksums 2016-03-29 08:46:01 UTC (rev 25634) +++ csw/mgar/pkg/samba/branches/samba4/checksums 2016-03-29 11:48:30 UTC (rev 25635) @@ -1 +1 @@ -48df803c6c6c475a714cae82a2dc219e samba-4.3.4.tar.gz +e42b884d0e07528c8571641a4df40666 samba-4.4.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 Mar 29 17:32:17 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 29 Mar 2016 15:32:17 +0000 Subject: SF.net SVN: gar:[25636] csw/mgar/pkg/sdlimage/trunk/Makefile Message-ID: <3qZFCC6bp7z2M@mail.opencsw.org> Revision: 25636 http://sourceforge.net/p/gar/code/25636 Author: jake_goerzen Date: 2016-03-29 15:32:17 +0000 (Tue, 29 Mar 2016) Log Message: ----------- sdlimage/trunk: remove downgraded build level override; fix dev package naming; recipe clean ups Modified Paths: -------------- csw/mgar/pkg/sdlimage/trunk/Makefile Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2016-03-29 11:48:30 UTC (rev 25635) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2016-03-29 15:32:17 UTC (rev 25636) @@ -10,7 +10,7 @@ MASTER_SITES = http://www.libsdl.org/projects/SDL_image/release/ DISTFILES = $(NAME)-$(VERSION).tar.gz -GARCOMPILER = SUN +GARCOMPILER = GNU PACKAGES += CSWlibsdl-image1-2-0 CATALOGNAME_CSWlibsdl-image1-2-0 = libsdl_image1_2_0 @@ -18,28 +18,23 @@ PKGFILES_CSWlibsdl-image1-2-0 += $(call baseisadirs,$(libdir),libSDL_image-1\.2\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsdl-image1-2-0 += $(DESCRIPTION), libSDL_image-1.2.so.0 -# This creates the stub package that older packages depend on. OBSOLETED_BY_CSWlibsdl-image1-2-0 += CSWsdlimage -# Split development files into separate package. -PACKAGES += CSWsdlimage-dev -CATALOGNAME_CSWsdlimage-dev = sdlimage_dev -SPKG_DESC_CSWsdlimage-dev += $(DESCRIPTION), development files -PKGFILES_CSWsdlimage-dev += /opt/csw/lib/libSDL_image.so -PKGFILES_CSWsdlimage-dev += $(PKGFILES_DEVEL) +PACKAGES += CSWlibsdl-image-dev +CATALOGNAME_CSWlibsdl-image-dev = libsdl_image_dev +SPKG_DESC_CSWlibsdl-image-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibsdl-image-dev += /opt/csw/lib/libSDL_image.so +PKGFILES_CSWlibsdl-image-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWsdlimage-dev += CSWlibsdl-image1-2-0 RUNTIME_DEP_PKGS_CSWlibsdl-image1-2-0 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibsdl-image1-2-0 += CSWlibwebp4 +RUNTIME_DEP_PKGS_CSWlibsdl-image1-2-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsdl-image-dev += CSWlibsdl-image1-2-0 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz BUILD64_LIBS_ONLY = 1 -# lower build level for the 32-bit libs for backwords compatibilty. -ISA_DEFAULT_sparc-5.10 ?= sparcv8 -ISA_DEFAULT_i386-5.10 ?= i386 - EXTRA_LINKER_FLAGS = -lwebp CONFIGURE_ARGS = $(DIRPATHS) --disable-static 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 Mar 30 23:45:39 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 30 Mar 2016 21:45:39 +0000 Subject: SF.net SVN: gar:[25637] csw/mgar/pkg/libsdl/trunk Message-ID: <3qb1S91DllzmG@mail.opencsw.org> Revision: 25637 http://sourceforge.net/p/gar/code/25637 Author: jake_goerzen Date: 2016-03-30 21:45:39 +0000 (Wed, 30 Mar 2016) Log Message: ----------- libsdl/trunk: update to 1.2.15; add patch; recipe clean up Modified Paths: -------------- csw/mgar/pkg/libsdl/trunk/Makefile csw/mgar/pkg/libsdl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libsdl/trunk/files/0002-restore-previous-version-assembly-code.patch csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.14 csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.15 csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.patched Modified: csw/mgar/pkg/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2016-03-29 15:32:17 UTC (rev 25636) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2016-03-30 21:45:39 UTC (rev 25637) @@ -1,5 +1,5 @@ NAME = SDL -VERSION = 1.2.14 +VERSION = 1.2.15 GARTYPE = v2 DESCRIPTION = Simple DirectMedia Layer library @@ -11,7 +11,11 @@ MASTER_SITES = http://www.libsdl.org/release/ DISTFILES = $(NAME)-$(VERSION).tar.gz + +GARCOMPILER = SUN + PATCHFILES = 0001-Fix-nasm-options.patch +PATCHFILES += 0002-restore-previous-version-assembly-code.patch VENDOR_URL = http://www.libsdl.org/ @@ -23,10 +27,13 @@ PACKAGES += CSWlibsdl-dev SPKG_DESC_CSWlibsdl-dev = Simple DirectMedia Layer library development files for libsdl-1.2.so.0 -# PKGFILES is catchall -RUNTIME_DEP_PKGS += CSWlibsdl1-2-0 +PKGFILES_CSWlibsdl-dev += /opt/csw/lib/libSDL.so +PKGFILES_CSWlibsdl-dev += /opt/csw/lib/amd64/libSDL.so +PKGFILES_CSWlibsdl-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibsdl-dev += CSWlibsdl1-2-0 BUILD64_LIBS_ONLY = 1 + CONFIGURE_ARGS = $(DIRPATHS) --disable-static TEST_TARGET = test Modified: csw/mgar/pkg/libsdl/trunk/checksums =================================================================== --- csw/mgar/pkg/libsdl/trunk/checksums 2016-03-29 15:32:17 UTC (rev 25636) +++ csw/mgar/pkg/libsdl/trunk/checksums 2016-03-30 21:45:39 UTC (rev 25637) @@ -1 +1 @@ -e52086d1b508fa0b76c52ee30b55bec4 SDL-1.2.14.tar.gz +9d96df8417572a2afb781a7c4c811a85 SDL-1.2.15.tar.gz Added: csw/mgar/pkg/libsdl/trunk/files/0002-restore-previous-version-assembly-code.patch =================================================================== --- csw/mgar/pkg/libsdl/trunk/files/0002-restore-previous-version-assembly-code.patch (rev 0) +++ csw/mgar/pkg/libsdl/trunk/files/0002-restore-previous-version-assembly-code.patch 2016-03-30 21:45:39 UTC (rev 25637) @@ -0,0 +1,67 @@ +From 8fd158c7393bed3177965eb330d5aacc3a85676f Mon Sep 17 00:00:00 2001 +From: Jake Goerzen +Date: Wed, 30 Mar 2016 20:29:06 +0200 +Subject: [PATCH] restore previous version assembly code + +--- + src/cpuinfo/SDL_cpuinfo.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c +index 0cd0838..a1e58f7 100644 +--- a/src/cpuinfo/SDL_cpuinfo.c ++++ b/src/cpuinfo/SDL_cpuinfo.c +@@ -202,23 +202,21 @@ done: + } + #elif defined(__sun) && (defined(__i386) || defined(__amd64)) + __asm( ++" movl %ebx,%edi\n" + " xorl %eax,%eax \n" +-" pushl %ebx \n" + " cpuid \n" +-" popl %ebx \n" + " cmpl $1,%eax \n" + " jl 1f \n" + " xorl %eax,%eax \n" + " incl %eax \n" +-" pushl %ebx \n" + " cpuid \n" +-" popl %ebx \n" + #ifdef __i386 + " movl %edx,-8(%ebp) \n" + #else + " movl %edx,-8(%rbp) \n" + #endif + "1: \n" ++" movl %edi,%ebx\n" ); + #endif + return features; + } +@@ -279,22 +277,20 @@ done: + } + #elif defined(__sun) && ( defined(__i386) || defined(__amd64) ) + __asm ( ++" movl %ebx,%edi\n" + " movl $0x80000000,%eax \n" +-" pushl %ebx \n" + " cpuid \n" +-" popl %ebx \n" + " cmpl $0x80000001,%eax \n" + " jl 1f \n" + " movl $0x80000001,%eax \n" +-" pushl %ebx \n" + " cpuid \n" +-" popl %ebx \n" + #ifdef __i386 + " movl %edx,-8(%ebp) \n" + #else + " movl %edx,-8(%rbp) \n" + #endif + "1: \n" ++" movl %edi,%ebx\n" + ); + #endif + return features; +-- +2.4.0 + Added: csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.14 =================================================================== --- csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.14 (rev 0) +++ csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.14 2016-03-30 21:45:39 UTC (rev 25637) @@ -0,0 +1,479 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2009 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken at libsdl.org +*/ +#include "SDL_config.h" + +/* CPU feature detection for SDL */ + +#include "SDL.h" +#include "SDL_cpuinfo.h" + +#if defined(__MACOSX__) && defined(__ppc__) +#include /* For AltiVec check */ +#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP +#include +#include +#endif + +#define CPU_HAS_RDTSC 0x00000001 +#define CPU_HAS_MMX 0x00000002 +#define CPU_HAS_MMXEXT 0x00000004 +#define CPU_HAS_3DNOW 0x00000010 +#define CPU_HAS_3DNOWEXT 0x00000020 +#define CPU_HAS_SSE 0x00000040 +#define CPU_HAS_SSE2 0x00000080 +#define CPU_HAS_ALTIVEC 0x00000100 + +#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ +/* This is the brute force way of detecting instruction sets... + the idea is borrowed from the libmpeg2 library - thanks! + */ +static jmp_buf jmpbuf; +static void illegal_instruction(int sig) +{ + longjmp(jmpbuf, 1); +} +#endif /* HAVE_SETJMP */ + +static __inline__ int CPU_haveCPUID(void) +{ + int has_CPUID = 0; +#if defined(__GNUC__) && defined(i386) + __asm__ ( +" pushfl # Get original EFLAGS \n" +" popl %%eax \n" +" movl %%eax,%%ecx \n" +" xorl $0x200000,%%eax # Flip ID bit in EFLAGS \n" +" pushl %%eax # Save new EFLAGS value on stack \n" +" popfl # Replace current EFLAGS value \n" +" pushfl # Get new EFLAGS \n" +" popl %%eax # Store new EFLAGS in EAX \n" +" xorl %%ecx,%%eax # Can not toggle ID bit, \n" +" jz 1f # Processor=80486 \n" +" movl $1,%0 # We have CPUID support \n" +"1: \n" + : "=m" (has_CPUID) + : + : "%eax", "%ecx" + ); +#elif defined(__GNUC__) && defined(__x86_64__) +/* Technically, if this is being compiled under __x86_64__ then it has +CPUid by definition. But it's nice to be able to prove it. :) */ + __asm__ ( +" pushfq # Get original EFLAGS \n" +" popq %%rax \n" +" movq %%rax,%%rcx \n" +" xorl $0x200000,%%eax # Flip ID bit in EFLAGS \n" +" pushq %%rax # Save new EFLAGS value on stack \n" +" popfq # Replace current EFLAGS value \n" +" pushfq # Get new EFLAGS \n" +" popq %%rax # Store new EFLAGS in EAX \n" +" xorl %%ecx,%%eax # Can not toggle ID bit, \n" +" jz 1f # Processor=80486 \n" +" movl $1,%0 # We have CPUID support \n" +"1: \n" + : "=m" (has_CPUID) + : + : "%rax", "%rcx" + ); +#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) + __asm { + pushfd ; Get original EFLAGS + pop eax + mov ecx, eax + xor eax, 200000h ; Flip ID bit in EFLAGS + push eax ; Save new EFLAGS value on stack + popfd ; Replace current EFLAGS value + pushfd ; Get new EFLAGS + pop eax ; Store new EFLAGS in EAX + xor eax, ecx ; Can not toggle ID bit, + jz done ; Processor=80486 + mov has_CPUID,1 ; We have CPUID support +done: + } +#elif defined(__sun) && defined(__i386) + __asm ( +" pushfl \n" +" popl %eax \n" +" movl %eax,%ecx \n" +" xorl $0x200000,%eax \n" +" pushl %eax \n" +" popfl \n" +" pushfl \n" +" popl %eax \n" +" xorl %ecx,%eax \n" +" jz 1f \n" +" movl $1,-8(%ebp) \n" +"1: \n" + ); +#elif defined(__sun) && defined(__amd64) + __asm ( +" pushfq \n" +" popq %rax \n" +" movq %rax,%rcx \n" +" xorl $0x200000,%eax \n" +" pushq %rax \n" +" popfq \n" +" pushfq \n" +" popq %rax \n" +" xorl %ecx,%eax \n" +" jz 1f \n" +" movl $1,-8(%rbp) \n" +"1: \n" + ); +#endif + return has_CPUID; +} + +static __inline__ int CPU_getCPUIDFeatures(void) +{ + int features = 0; +#if defined(__GNUC__) && defined(i386) + __asm__ ( +" movl %%ebx,%%edi\n" +" xorl %%eax,%%eax # Set up for CPUID instruction \n" +" cpuid # Get and save vendor ID \n" +" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n" +" jl 1f # We dont have the CPUID instruction\n" +" xorl %%eax,%%eax \n" +" incl %%eax \n" +" cpuid # Get family/model/stepping/features\n" +" movl %%edx,%0 \n" +"1: \n" +" movl %%edi,%%ebx\n" + : "=m" (features) + : + : "%eax", "%ecx", "%edx", "%edi" + ); +#elif defined(__GNUC__) && defined(__x86_64__) + __asm__ ( +" movq %%rbx,%%rdi\n" +" xorl %%eax,%%eax # Set up for CPUID instruction \n" +" cpuid # Get and save vendor ID \n" +" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n" +" jl 1f # We dont have the CPUID instruction\n" +" xorl %%eax,%%eax \n" +" incl %%eax \n" +" cpuid # Get family/model/stepping/features\n" +" movl %%edx,%0 \n" +"1: \n" +" movq %%rdi,%%rbx\n" + : "=m" (features) + : + : "%rax", "%rbx", "%rcx", "%rdx", "%rdi" + ); +#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) + __asm { + xor eax, eax ; Set up for CPUID instruction + cpuid ; Get and save vendor ID + cmp eax, 1 ; Make sure 1 is valid input for CPUID + jl done ; We dont have the CPUID instruction + xor eax, eax + inc eax + cpuid ; Get family/model/stepping/features + mov features, edx +done: + } +#elif defined(__sun) && (defined(__i386) || defined(__amd64)) + __asm( +" movl %ebx,%edi\n" +" xorl %eax,%eax \n" +" cpuid \n" +" cmpl $1,%eax \n" +" jl 1f \n" +" xorl %eax,%eax \n" +" incl %eax \n" +" cpuid \n" +#ifdef __i386 +" movl %edx,-8(%ebp) \n" +#else +" movl %edx,-8(%rbp) \n" +#endif +"1: \n" +" movl %edi,%ebx\n" ); +#endif + return features; +} + +static __inline__ int CPU_getCPUIDFeaturesExt(void) +{ + int features = 0; +#if defined(__GNUC__) && defined(i386) + __asm__ ( +" movl %%ebx,%%edi\n" +" movl $0x80000000,%%eax # Query for extended functions \n" +" cpuid # Get extended function limit \n" +" cmpl $0x80000001,%%eax \n" +" jl 1f # Nope, we dont have function 800000001h\n" +" movl $0x80000001,%%eax # Setup extended function 800000001h\n" +" cpuid # and get the information \n" +" movl %%edx,%0 \n" +"1: \n" +" movl %%edi,%%ebx\n" + : "=m" (features) + : + : "%eax", "%ecx", "%edx", "%edi" + ); +#elif defined(__GNUC__) && defined (__x86_64__) + __asm__ ( +" movq %%rbx,%%rdi\n" +" movl $0x80000000,%%eax # Query for extended functions \n" +" cpuid # Get extended function limit \n" +" cmpl $0x80000001,%%eax \n" +" jl 1f # Nope, we dont have function 800000001h\n" +" movl $0x80000001,%%eax # Setup extended function 800000001h\n" +" cpuid # and get the information \n" +" movl %%edx,%0 \n" +"1: \n" +" movq %%rdi,%%rbx\n" + : "=m" (features) + : + : "%rax", "%rbx", "%rcx", "%rdx", "%rdi" + ); +#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) + __asm { + mov eax,80000000h ; Query for extended functions + cpuid ; Get extended function limit + cmp eax,80000001h + jl done ; Nope, we dont have function 800000001h + mov eax,80000001h ; Setup extended function 800000001h + cpuid ; and get the information + mov features,edx +done: + } +#elif defined(__sun) && ( defined(__i386) || defined(__amd64) ) + __asm ( +" movl %ebx,%edi\n" +" movl $0x80000000,%eax \n" +" cpuid \n" +" cmpl $0x80000001,%eax \n" +" jl 1f \n" +" movl $0x80000001,%eax \n" +" cpuid \n" +#ifdef __i386 +" movl %edx,-8(%ebp) \n" +#else +" movl %edx,-8(%rbp) \n" +#endif +"1: \n" +" movl %edi,%ebx\n" + ); +#endif + return features; +} + +static __inline__ int CPU_haveRDTSC(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x00000010); + } + return 0; +} + +static __inline__ int CPU_haveMMX(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x00800000); + } + return 0; +} + +static __inline__ int CPU_haveMMXExt(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeaturesExt() & 0x00400000); + } + return 0; +} + +static __inline__ int CPU_have3DNow(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeaturesExt() & 0x80000000); + } + return 0; +} + +static __inline__ int CPU_have3DNowExt(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeaturesExt() & 0x40000000); + } + return 0; +} + +static __inline__ int CPU_haveSSE(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x02000000); + } + return 0; +} + +static __inline__ int CPU_haveSSE2(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x04000000); + } + return 0; +} + +static __inline__ int CPU_haveAltiVec(void) +{ + volatile int altivec = 0; +#if defined(__MACOSX__) && defined(__ppc__) + int selectors[2] = { CTL_HW, HW_VECTORUNIT }; + int hasVectorUnit = 0; + size_t length = sizeof(hasVectorUnit); + int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0); + if( 0 == error ) + altivec = (hasVectorUnit != 0); +#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP + void (*handler)(int sig); + handler = signal(SIGILL, illegal_instruction); + if ( setjmp(jmpbuf) == 0 ) { + asm volatile ("mtspr 256, %0\n\t" + "vand %%v0, %%v0, %%v0" + : + : "r" (-1)); + altivec = 1; + } + signal(SIGILL, handler); +#endif + return altivec; +} + +static Uint32 SDL_CPUFeatures = 0xFFFFFFFF; + +static Uint32 SDL_GetCPUFeatures(void) +{ + if ( SDL_CPUFeatures == 0xFFFFFFFF ) { + SDL_CPUFeatures = 0; + if ( CPU_haveRDTSC() ) { + SDL_CPUFeatures |= CPU_HAS_RDTSC; + } + if ( CPU_haveMMX() ) { + SDL_CPUFeatures |= CPU_HAS_MMX; + } + if ( CPU_haveMMXExt() ) { + SDL_CPUFeatures |= CPU_HAS_MMXEXT; + } + if ( CPU_have3DNow() ) { + SDL_CPUFeatures |= CPU_HAS_3DNOW; + } + if ( CPU_have3DNowExt() ) { + SDL_CPUFeatures |= CPU_HAS_3DNOWEXT; + } + if ( CPU_haveSSE() ) { + SDL_CPUFeatures |= CPU_HAS_SSE; + } + if ( CPU_haveSSE2() ) { + SDL_CPUFeatures |= CPU_HAS_SSE2; + } + if ( CPU_haveAltiVec() ) { + SDL_CPUFeatures |= CPU_HAS_ALTIVEC; + } + } + return SDL_CPUFeatures; +} + +SDL_bool SDL_HasRDTSC(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_RDTSC ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasMMX(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_MMX ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasMMXExt(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_MMXEXT ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_Has3DNow(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOW ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_Has3DNowExt(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOWEXT ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasSSE(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_SSE ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasSSE2(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_SSE2 ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasAltiVec(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_ALTIVEC ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +#ifdef TEST_MAIN + +#include + +int main() +{ + printf("RDTSC: %d\n", SDL_HasRDTSC()); + printf("MMX: %d\n", SDL_HasMMX()); + printf("MMXExt: %d\n", SDL_HasMMXExt()); + printf("3DNow: %d\n", SDL_Has3DNow()); + printf("3DNowExt: %d\n", SDL_Has3DNowExt()); + printf("SSE: %d\n", SDL_HasSSE()); + printf("SSE2: %d\n", SDL_HasSSE2()); + printf("AltiVec: %d\n", SDL_HasAltiVec()); + return 0; +} + +#endif /* TEST_MAIN */ Added: csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.15 =================================================================== --- csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.15 (rev 0) +++ csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.15 2016-03-30 21:45:39 UTC (rev 25637) @@ -0,0 +1,499 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken at libsdl.org +*/ +#include "SDL_config.h" + +/* CPU feature detection for SDL */ + +#include "SDL.h" +#include "SDL_cpuinfo.h" + +#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__)) +#include /* For AltiVec check */ +#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP +#include +#include +#endif + +#define CPU_HAS_RDTSC 0x00000001 +#define CPU_HAS_MMX 0x00000002 +#define CPU_HAS_MMXEXT 0x00000004 +#define CPU_HAS_3DNOW 0x00000010 +#define CPU_HAS_3DNOWEXT 0x00000020 +#define CPU_HAS_SSE 0x00000040 +#define CPU_HAS_SSE2 0x00000080 +#define CPU_HAS_ALTIVEC 0x00000100 + +#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ +/* This is the brute force way of detecting instruction sets... + the idea is borrowed from the libmpeg2 library - thanks! + */ +static jmp_buf jmpbuf; +static void illegal_instruction(int sig) +{ + longjmp(jmpbuf, 1); +} +#endif /* HAVE_SETJMP */ + +static __inline__ int CPU_haveCPUID(void) +{ + int has_CPUID = 0; +#if defined(__GNUC__) && defined(i386) + __asm__ ( +" pushfl # Get original EFLAGS \n" +" popl %%eax \n" +" movl %%eax,%%ecx \n" +" xorl $0x200000,%%eax # Flip ID bit in EFLAGS \n" +" pushl %%eax # Save new EFLAGS value on stack \n" +" popfl # Replace current EFLAGS value \n" +" pushfl # Get new EFLAGS \n" +" popl %%eax # Store new EFLAGS in EAX \n" +" xorl %%ecx,%%eax # Can not toggle ID bit, \n" +" jz 1f # Processor=80486 \n" +" movl $1,%0 # We have CPUID support \n" +"1: \n" + : "=m" (has_CPUID) + : + : "%eax", "%ecx" + ); +#elif defined(__GNUC__) && defined(__x86_64__) +/* Technically, if this is being compiled under __x86_64__ then it has +CPUid by definition. But it's nice to be able to prove it. :) */ + __asm__ ( +" pushfq # Get original EFLAGS \n" +" popq %%rax \n" +" movq %%rax,%%rcx \n" +" xorl $0x200000,%%eax # Flip ID bit in EFLAGS \n" +" pushq %%rax # Save new EFLAGS value on stack \n" +" popfq # Replace current EFLAGS value \n" +" pushfq # Get new EFLAGS \n" +" popq %%rax # Store new EFLAGS in EAX \n" +" xorl %%ecx,%%eax # Can not toggle ID bit, \n" +" jz 1f # Processor=80486 \n" +" movl $1,%0 # We have CPUID support \n" +"1: \n" + : "=m" (has_CPUID) + : + : "%rax", "%rcx" + ); +#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) + __asm { + pushfd ; Get original EFLAGS + pop eax + mov ecx, eax + xor eax, 200000h ; Flip ID bit in EFLAGS + push eax ; Save new EFLAGS value on stack + popfd ; Replace current EFLAGS value + pushfd ; Get new EFLAGS + pop eax ; Store new EFLAGS in EAX + xor eax, ecx ; Can not toggle ID bit, + jz done ; Processor=80486 + mov has_CPUID,1 ; We have CPUID support +done: + } +#elif defined(__sun) && defined(__i386) + __asm ( +" pushfl \n" +" popl %eax \n" +" movl %eax,%ecx \n" +" xorl $0x200000,%eax \n" +" pushl %eax \n" +" popfl \n" +" pushfl \n" +" popl %eax \n" +" xorl %ecx,%eax \n" +" jz 1f \n" +" movl $1,-8(%ebp) \n" +"1: \n" + ); +#elif defined(__sun) && defined(__amd64) + __asm ( +" pushfq \n" +" popq %rax \n" +" movq %rax,%rcx \n" +" xorl $0x200000,%eax \n" +" pushq %rax \n" +" popfq \n" +" pushfq \n" +" popq %rax \n" +" xorl %ecx,%eax \n" +" jz 1f \n" +" movl $1,-8(%rbp) \n" +"1: \n" + ); +#endif + return has_CPUID; +} + +static __inline__ int CPU_getCPUIDFeatures(void) +{ + int features = 0; +#if defined(__GNUC__) && defined(i386) + __asm__ ( +" xorl %%eax,%%eax # Set up for CPUID instruction \n" +" pushl %%ebx \n" +" cpuid # Get and save vendor ID \n" +" popl %%ebx \n" +" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n" +" jl 1f # We dont have the CPUID instruction\n" +" xorl %%eax,%%eax \n" +" incl %%eax \n" +" pushl %%ebx \n" +" cpuid # Get family/model/stepping/features\n" +" popl %%ebx \n" +" movl %%edx,%0 \n" +"1: \n" + : "=m" (features) + : + : "%eax", "%ecx", "%edx" + ); +#elif defined(__GNUC__) && defined(__x86_64__) + __asm__ ( +" xorl %%eax,%%eax # Set up for CPUID instruction \n" +" pushq %%rbx \n" +" cpuid # Get and save vendor ID \n" +" popq %%rbx \n" +" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n" +" jl 1f # We dont have the CPUID instruction\n" +" xorl %%eax,%%eax \n" +" incl %%eax \n" +" pushq %%rbx \n" +" cpuid # Get family/model/stepping/features\n" +" popq %%rbx \n" +" movl %%edx,%0 \n" +"1: \n" + : "=m" (features) + : + : "%rax", "%rcx", "%rdx" + ); +#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) + __asm { + xor eax, eax ; Set up for CPUID instruction + push ebx + cpuid ; Get and save vendor ID + pop ebx + cmp eax, 1 ; Make sure 1 is valid input for CPUID + jl done ; We dont have the CPUID instruction + xor eax, eax + inc eax + push ebx + cpuid ; Get family/model/stepping/features + pop ebx + mov features, edx +done: + } +#elif defined(__sun) && (defined(__i386) || defined(__amd64)) + __asm( +" xorl %eax,%eax \n" +" pushl %ebx \n" +" cpuid \n" +" popl %ebx \n" +" cmpl $1,%eax \n" +" jl 1f \n" +" xorl %eax,%eax \n" +" incl %eax \n" +" pushl %ebx \n" +" cpuid \n" +" popl %ebx \n" +#ifdef __i386 +" movl %edx,-8(%ebp) \n" +#else +" movl %edx,-8(%rbp) \n" +#endif +"1: \n" +#endif + return features; +} + +static __inline__ int CPU_getCPUIDFeaturesExt(void) +{ + int features = 0; +#if defined(__GNUC__) && defined(i386) + __asm__ ( +" movl $0x80000000,%%eax # Query for extended functions \n" +" pushl %%ebx \n" +" cpuid # Get extended function limit \n" +" popl %%ebx \n" +" cmpl $0x80000001,%%eax \n" +" jl 1f # Nope, we dont have function 800000001h\n" +" movl $0x80000001,%%eax # Setup extended function 800000001h\n" +" pushl %%ebx \n" +" cpuid # and get the information \n" +" popl %%ebx \n" +" movl %%edx,%0 \n" +"1: \n" + : "=m" (features) + : + : "%eax", "%ecx", "%edx" + ); +#elif defined(__GNUC__) && defined (__x86_64__) + __asm__ ( +" movl $0x80000000,%%eax # Query for extended functions \n" +" pushq %%rbx \n" +" cpuid # Get extended function limit \n" +" popq %%rbx \n" +" cmpl $0x80000001,%%eax \n" +" jl 1f # Nope, we dont have function 800000001h\n" +" movl $0x80000001,%%eax # Setup extended function 800000001h\n" +" pushq %%rbx \n" +" cpuid # and get the information \n" +" popq %%rbx \n" +" movl %%edx,%0 \n" +"1: \n" + : "=m" (features) + : + : "%rax", "%rcx", "%rdx" + ); +#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) + __asm { + mov eax,80000000h ; Query for extended functions + push ebx + cpuid ; Get extended function limit + pop ebx + cmp eax,80000001h + jl done ; Nope, we dont have function 800000001h + mov eax,80000001h ; Setup extended function 800000001h + push ebx + cpuid ; and get the information + pop ebx + mov features,edx +done: + } +#elif defined(__sun) && ( defined(__i386) || defined(__amd64) ) + __asm ( +" movl $0x80000000,%eax \n" +" pushl %ebx \n" +" cpuid \n" +" popl %ebx \n" +" cmpl $0x80000001,%eax \n" +" jl 1f \n" +" movl $0x80000001,%eax \n" +" pushl %ebx \n" +" cpuid \n" +" popl %ebx \n" +#ifdef __i386 +" movl %edx,-8(%ebp) \n" +#else +" movl %edx,-8(%rbp) \n" +#endif +"1: \n" + ); +#endif + return features; +} + +static __inline__ int CPU_haveRDTSC(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x00000010); + } + return 0; +} + +static __inline__ int CPU_haveMMX(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x00800000); + } + return 0; +} + +static __inline__ int CPU_haveMMXExt(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeaturesExt() & 0x00400000); + } + return 0; +} + +static __inline__ int CPU_have3DNow(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeaturesExt() & 0x80000000); + } + return 0; +} + +static __inline__ int CPU_have3DNowExt(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeaturesExt() & 0x40000000); + } + return 0; +} + +static __inline__ int CPU_haveSSE(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x02000000); + } + return 0; +} + +static __inline__ int CPU_haveSSE2(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x04000000); + } + return 0; +} + +static __inline__ int CPU_haveAltiVec(void) +{ + volatile int altivec = 0; +#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__)) + int selectors[2] = { CTL_HW, HW_VECTORUNIT }; + int hasVectorUnit = 0; + size_t length = sizeof(hasVectorUnit); + int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0); + if( 0 == error ) + altivec = (hasVectorUnit != 0); +#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP + void (*handler)(int sig); + handler = signal(SIGILL, illegal_instruction); + if ( setjmp(jmpbuf) == 0 ) { + asm volatile ("mtspr 256, %0\n\t" + "vand %%v0, %%v0, %%v0" + : + : "r" (-1)); + altivec = 1; + } + signal(SIGILL, handler); +#endif + return altivec; +} + +static Uint32 SDL_CPUFeatures = 0xFFFFFFFF; + +static Uint32 SDL_GetCPUFeatures(void) +{ + if ( SDL_CPUFeatures == 0xFFFFFFFF ) { + SDL_CPUFeatures = 0; + if ( CPU_haveRDTSC() ) { + SDL_CPUFeatures |= CPU_HAS_RDTSC; + } + if ( CPU_haveMMX() ) { + SDL_CPUFeatures |= CPU_HAS_MMX; + } + if ( CPU_haveMMXExt() ) { + SDL_CPUFeatures |= CPU_HAS_MMXEXT; + } + if ( CPU_have3DNow() ) { + SDL_CPUFeatures |= CPU_HAS_3DNOW; + } + if ( CPU_have3DNowExt() ) { + SDL_CPUFeatures |= CPU_HAS_3DNOWEXT; + } + if ( CPU_haveSSE() ) { + SDL_CPUFeatures |= CPU_HAS_SSE; + } + if ( CPU_haveSSE2() ) { + SDL_CPUFeatures |= CPU_HAS_SSE2; + } + if ( CPU_haveAltiVec() ) { + SDL_CPUFeatures |= CPU_HAS_ALTIVEC; + } + } + return SDL_CPUFeatures; +} + +SDL_bool SDL_HasRDTSC(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_RDTSC ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasMMX(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_MMX ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasMMXExt(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_MMXEXT ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_Has3DNow(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOW ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_Has3DNowExt(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOWEXT ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasSSE(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_SSE ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasSSE2(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_SSE2 ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasAltiVec(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_ALTIVEC ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +#ifdef TEST_MAIN + +#include + +int main() +{ + printf("RDTSC: %d\n", SDL_HasRDTSC()); + printf("MMX: %d\n", SDL_HasMMX()); + printf("MMXExt: %d\n", SDL_HasMMXExt()); + printf("3DNow: %d\n", SDL_Has3DNow()); + printf("3DNowExt: %d\n", SDL_Has3DNowExt()); + printf("SSE: %d\n", SDL_HasSSE()); + printf("SSE2: %d\n", SDL_HasSSE2()); + printf("AltiVec: %d\n", SDL_HasAltiVec()); + return 0; +} + +#endif /* TEST_MAIN */ Added: csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.patched =================================================================== --- csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.patched (rev 0) +++ csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.patched 2016-03-30 21:45:39 UTC (rev 25637) @@ -0,0 +1,495 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2012 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken at libsdl.org +*/ +#include "SDL_config.h" + +/* CPU feature detection for SDL */ + +#include "SDL.h" +#include "SDL_cpuinfo.h" + +#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__)) +#include /* For AltiVec check */ +#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP +#include +#include +#endif + +#define CPU_HAS_RDTSC 0x00000001 +#define CPU_HAS_MMX 0x00000002 +#define CPU_HAS_MMXEXT 0x00000004 +#define CPU_HAS_3DNOW 0x00000010 +#define CPU_HAS_3DNOWEXT 0x00000020 +#define CPU_HAS_SSE 0x00000040 +#define CPU_HAS_SSE2 0x00000080 +#define CPU_HAS_ALTIVEC 0x00000100 + +#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ +/* This is the brute force way of detecting instruction sets... + the idea is borrowed from the libmpeg2 library - thanks! + */ +static jmp_buf jmpbuf; +static void illegal_instruction(int sig) +{ + longjmp(jmpbuf, 1); +} +#endif /* HAVE_SETJMP */ + +static __inline__ int CPU_haveCPUID(void) +{ + int has_CPUID = 0; +#if defined(__GNUC__) && defined(i386) + __asm__ ( +" pushfl # Get original EFLAGS \n" +" popl %%eax \n" +" movl %%eax,%%ecx \n" +" xorl $0x200000,%%eax # Flip ID bit in EFLAGS \n" +" pushl %%eax # Save new EFLAGS value on stack \n" +" popfl # Replace current EFLAGS value \n" +" pushfl # Get new EFLAGS \n" +" popl %%eax # Store new EFLAGS in EAX \n" +" xorl %%ecx,%%eax # Can not toggle ID bit, \n" +" jz 1f # Processor=80486 \n" +" movl $1,%0 # We have CPUID support \n" +"1: \n" + : "=m" (has_CPUID) + : + : "%eax", "%ecx" + ); +#elif defined(__GNUC__) && defined(__x86_64__) +/* Technically, if this is being compiled under __x86_64__ then it has +CPUid by definition. But it's nice to be able to prove it. :) */ + __asm__ ( +" pushfq # Get original EFLAGS \n" +" popq %%rax \n" +" movq %%rax,%%rcx \n" +" xorl $0x200000,%%eax # Flip ID bit in EFLAGS \n" +" pushq %%rax # Save new EFLAGS value on stack \n" +" popfq # Replace current EFLAGS value \n" +" pushfq # Get new EFLAGS \n" +" popq %%rax # Store new EFLAGS in EAX \n" +" xorl %%ecx,%%eax # Can not toggle ID bit, \n" +" jz 1f # Processor=80486 \n" +" movl $1,%0 # We have CPUID support \n" +"1: \n" + : "=m" (has_CPUID) + : + : "%rax", "%rcx" + ); +#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) + __asm { + pushfd ; Get original EFLAGS + pop eax + mov ecx, eax + xor eax, 200000h ; Flip ID bit in EFLAGS + push eax ; Save new EFLAGS value on stack + popfd ; Replace current EFLAGS value + pushfd ; Get new EFLAGS + pop eax ; Store new EFLAGS in EAX + xor eax, ecx ; Can not toggle ID bit, + jz done ; Processor=80486 + mov has_CPUID,1 ; We have CPUID support +done: + } +#elif defined(__sun) && defined(__i386) + __asm ( +" pushfl \n" +" popl %eax \n" +" movl %eax,%ecx \n" +" xorl $0x200000,%eax \n" +" pushl %eax \n" +" popfl \n" +" pushfl \n" +" popl %eax \n" +" xorl %ecx,%eax \n" +" jz 1f \n" +" movl $1,-8(%ebp) \n" +"1: \n" + ); +#elif defined(__sun) && defined(__amd64) + __asm ( +" pushfq \n" +" popq %rax \n" +" movq %rax,%rcx \n" +" xorl $0x200000,%eax \n" +" pushq %rax \n" +" popfq \n" +" pushfq \n" +" popq %rax \n" +" xorl %ecx,%eax \n" +" jz 1f \n" +" movl $1,-8(%rbp) \n" +"1: \n" + ); +#endif + return has_CPUID; +} + +static __inline__ int CPU_getCPUIDFeatures(void) +{ + int features = 0; +#if defined(__GNUC__) && defined(i386) + __asm__ ( +" xorl %%eax,%%eax # Set up for CPUID instruction \n" +" pushl %%ebx \n" +" cpuid # Get and save vendor ID \n" +" popl %%ebx \n" +" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n" +" jl 1f # We dont have the CPUID instruction\n" +" xorl %%eax,%%eax \n" +" incl %%eax \n" +" pushl %%ebx \n" +" cpuid # Get family/model/stepping/features\n" +" popl %%ebx \n" +" movl %%edx,%0 \n" +"1: \n" + : "=m" (features) + : + : "%eax", "%ecx", "%edx" + ); +#elif defined(__GNUC__) && defined(__x86_64__) + __asm__ ( +" xorl %%eax,%%eax # Set up for CPUID instruction \n" +" pushq %%rbx \n" +" cpuid # Get and save vendor ID \n" +" popq %%rbx \n" +" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n" +" jl 1f # We dont have the CPUID instruction\n" +" xorl %%eax,%%eax \n" +" incl %%eax \n" +" pushq %%rbx \n" +" cpuid # Get family/model/stepping/features\n" +" popq %%rbx \n" +" movl %%edx,%0 \n" +"1: \n" + : "=m" (features) + : + : "%rax", "%rcx", "%rdx" + ); +#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) + __asm { + xor eax, eax ; Set up for CPUID instruction + push ebx + cpuid ; Get and save vendor ID + pop ebx + cmp eax, 1 ; Make sure 1 is valid input for CPUID + jl done ; We dont have the CPUID instruction + xor eax, eax + inc eax + push ebx + cpuid ; Get family/model/stepping/features + pop ebx + mov features, edx +done: + } +#elif defined(__sun) && (defined(__i386) || defined(__amd64)) + __asm( +" movl %ebx,%edi\n" +" xorl %eax,%eax \n" +" cpuid \n" +" cmpl $1,%eax \n" +" jl 1f \n" +" xorl %eax,%eax \n" +" incl %eax \n" +" cpuid \n" +#ifdef __i386 +" movl %edx,-8(%ebp) \n" +#else +" movl %edx,-8(%rbp) \n" +#endif +"1: \n" +" movl %edi,%ebx\n" ); +#endif + return features; +} + +static __inline__ int CPU_getCPUIDFeaturesExt(void) +{ + int features = 0; +#if defined(__GNUC__) && defined(i386) + __asm__ ( +" movl $0x80000000,%%eax # Query for extended functions \n" +" pushl %%ebx \n" +" cpuid # Get extended function limit \n" +" popl %%ebx \n" +" cmpl $0x80000001,%%eax \n" +" jl 1f # Nope, we dont have function 800000001h\n" +" movl $0x80000001,%%eax # Setup extended function 800000001h\n" +" pushl %%ebx \n" +" cpuid # and get the information \n" +" popl %%ebx \n" +" movl %%edx,%0 \n" +"1: \n" + : "=m" (features) + : + : "%eax", "%ecx", "%edx" + ); +#elif defined(__GNUC__) && defined (__x86_64__) + __asm__ ( +" movl $0x80000000,%%eax # Query for extended functions \n" +" pushq %%rbx \n" +" cpuid # Get extended function limit \n" +" popq %%rbx \n" +" cmpl $0x80000001,%%eax \n" +" jl 1f # Nope, we dont have function 800000001h\n" +" movl $0x80000001,%%eax # Setup extended function 800000001h\n" +" pushq %%rbx \n" +" cpuid # and get the information \n" +" popq %%rbx \n" +" movl %%edx,%0 \n" +"1: \n" + : "=m" (features) + : + : "%rax", "%rcx", "%rdx" + ); +#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) + __asm { + mov eax,80000000h ; Query for extended functions + push ebx + cpuid ; Get extended function limit + pop ebx + cmp eax,80000001h + jl done ; Nope, we dont have function 800000001h + mov eax,80000001h ; Setup extended function 800000001h + push ebx + cpuid ; and get the information + pop ebx + mov features,edx +done: + } +#elif defined(__sun) && ( defined(__i386) || defined(__amd64) ) + __asm ( +" movl %ebx,%edi\n" +" movl $0x80000000,%eax \n" +" cpuid \n" +" cmpl $0x80000001,%eax \n" +" jl 1f \n" +" movl $0x80000001,%eax \n" +" cpuid \n" +#ifdef __i386 +" movl %edx,-8(%ebp) \n" +#else +" movl %edx,-8(%rbp) \n" +#endif +"1: \n" +" movl %edi,%ebx\n" + ); +#endif + return features; +} + +static __inline__ int CPU_haveRDTSC(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x00000010); + } + return 0; +} + +static __inline__ int CPU_haveMMX(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x00800000); + } + return 0; +} + +static __inline__ int CPU_haveMMXExt(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeaturesExt() & 0x00400000); + } + return 0; +} + +static __inline__ int CPU_have3DNow(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeaturesExt() & 0x80000000); + } + return 0; +} + +static __inline__ int CPU_have3DNowExt(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeaturesExt() & 0x40000000); + } + return 0; +} + +static __inline__ int CPU_haveSSE(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x02000000); + } + return 0; +} + +static __inline__ int CPU_haveSSE2(void) +{ + if ( CPU_haveCPUID() ) { + return (CPU_getCPUIDFeatures() & 0x04000000); + } + return 0; +} + +static __inline__ int CPU_haveAltiVec(void) +{ + volatile int altivec = 0; +#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__)) + int selectors[2] = { CTL_HW, HW_VECTORUNIT }; + int hasVectorUnit = 0; + size_t length = sizeof(hasVectorUnit); + int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0); + if( 0 == error ) + altivec = (hasVectorUnit != 0); +#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP + void (*handler)(int sig); + handler = signal(SIGILL, illegal_instruction); + if ( setjmp(jmpbuf) == 0 ) { + asm volatile ("mtspr 256, %0\n\t" + "vand %%v0, %%v0, %%v0" + : + : "r" (-1)); + altivec = 1; + } + signal(SIGILL, handler); +#endif + return altivec; +} + +static Uint32 SDL_CPUFeatures = 0xFFFFFFFF; + +static Uint32 SDL_GetCPUFeatures(void) +{ + if ( SDL_CPUFeatures == 0xFFFFFFFF ) { + SDL_CPUFeatures = 0; + if ( CPU_haveRDTSC() ) { + SDL_CPUFeatures |= CPU_HAS_RDTSC; + } + if ( CPU_haveMMX() ) { + SDL_CPUFeatures |= CPU_HAS_MMX; + } + if ( CPU_haveMMXExt() ) { + SDL_CPUFeatures |= CPU_HAS_MMXEXT; + } + if ( CPU_have3DNow() ) { + SDL_CPUFeatures |= CPU_HAS_3DNOW; + } + if ( CPU_have3DNowExt() ) { + SDL_CPUFeatures |= CPU_HAS_3DNOWEXT; + } + if ( CPU_haveSSE() ) { + SDL_CPUFeatures |= CPU_HAS_SSE; + } + if ( CPU_haveSSE2() ) { + SDL_CPUFeatures |= CPU_HAS_SSE2; + } + if ( CPU_haveAltiVec() ) { + SDL_CPUFeatures |= CPU_HAS_ALTIVEC; + } + } + return SDL_CPUFeatures; +} + +SDL_bool SDL_HasRDTSC(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_RDTSC ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasMMX(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_MMX ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasMMXExt(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_MMXEXT ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_Has3DNow(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOW ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_Has3DNowExt(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOWEXT ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasSSE(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_SSE ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasSSE2(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_SSE2 ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +SDL_bool SDL_HasAltiVec(void) +{ + if ( SDL_GetCPUFeatures() & CPU_HAS_ALTIVEC ) { + return SDL_TRUE; + } + return SDL_FALSE; +} + +#ifdef TEST_MAIN + +#include + +int main() +{ + printf("RDTSC: %d\n", SDL_HasRDTSC()); + printf("MMX: %d\n", SDL_HasMMX()); + printf("MMXExt: %d\n", SDL_HasMMXExt()); + printf("3DNow: %d\n", SDL_Has3DNow()); + printf("3DNowExt: %d\n", SDL_Has3DNowExt()); + printf("SSE: %d\n", SDL_HasSSE()); + printf("SSE2: %d\n", SDL_HasSSE2()); + printf("AltiVec: %d\n", SDL_HasAltiVec()); + return 0; +} + +#endif /* TEST_MAIN */ 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 Mar 31 00:33:56 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 30 Mar 2016 22:33:56 +0000 Subject: SF.net SVN: gar:[25638] csw/mgar/pkg/dovecot/trunk Message-ID: <3qb2W84t9tzpx@mail.opencsw.org> Revision: 25638 http://sourceforge.net/p/gar/code/25638 Author: jake_goerzen Date: 2016-03-30 22:33:56 +0000 (Wed, 30 Mar 2016) Log Message: ----------- dovecot: update to 2.2.23 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 2016-03-30 21:45:39 UTC (rev 25637) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2016-03-30 22:33:56 UTC (rev 25638) @@ -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.22 +VERSION = 2.2.23 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2016-03-30 21:45:39 UTC (rev 25637) +++ csw/mgar/pkg/dovecot/trunk/checksums 2016-03-30 22:33:56 UTC (rev 25638) @@ -1 +1 @@ -bc8057bd5bdfa0f8e80e2fef1082a241 dovecot-2.2.22.tar.gz +0d2855c19b0603b417cd70613b4a9f36 dovecot-2.2.23.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.