From slowfranklin at users.sourceforge.net Thu Sep 1 07:22:43 2016 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 1 Sep 2016 05:22:43 +0000 Subject: SF.net SVN: gar:[25923] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: <3sPrHp317BzKJ@mail.opencsw.org> Revision: 25923 http://sourceforge.net/p/gar/code/25923 Author: slowfranklin Date: 2016-09-01 05:22:43 +0000 (Thu, 01 Sep 2016) Log Message: ----------- samba/branches/samba4: Update deps after removing -z ignore Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2016-08-31 19:39:45 UTC (rev 25922) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2016-09-01 05:22:43 UTC (rev 25923) @@ -152,6 +152,13 @@ RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibncurses6 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibfam0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL)) # Silence conflicts with CSWsamba CHECKPKG_OVERRIDES_CSWsamba4 += file-collision @@ -186,6 +193,13 @@ RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel6 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibmenu6 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4-client_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client_sparc_5.10 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GAROSREL)) @@ -273,6 +287,7 @@ RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWsamba4-libs += $(RUNTIME_DEP_PKGS_CSWsamba4-libs_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/share/man/man7/libsmbclient.7|CSWlibsmbclient0|CSWsamba4-libs @@ -324,6 +339,15 @@ RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibfam0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4-python_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-python_sparc_5.10 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GAROSREL)) @@ -365,6 +389,12 @@ RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWwinbind-krb5locator RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWsamba4-winbind += $(RUNTIME_DEP_PKGS_CSWsamba4-winbind_$(GAROSREL)) CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWnss-winbind1 CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWwinbind-krb5locator @@ -399,6 +429,7 @@ SPKG_DESC_CSWwinbind-krb5locator += $(DESCRIPTION), winbind_krb5_locator.so RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_5.10 += CSWlibssp0 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_sparc_5.10 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += $(RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_$(GAROSREL)) 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 Sep 2 14:13:56 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 2 Sep 2016 12:13:56 +0000 Subject: SF.net SVN: gar:[25924] csw/mgar/pkg/389-adminutil/trunk/Makefile Message-ID: <3sQdMt5h8gzfs@mail.opencsw.org> Revision: 25924 http://sourceforge.net/p/gar/code/25924 Author: cgrzemba Date: 2016-09-02 12:13:56 +0000 (Fri, 02 Sep 2016) Log Message: ----------- 389-adminutil/trunk: reintroduce Sparc runtimedependencies Modified Paths: -------------- csw/mgar/pkg/389-adminutil/trunk/Makefile Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/Makefile 2016-09-01 05:22:43 UTC (rev 25923) +++ csw/mgar/pkg/389-adminutil/trunk/Makefile 2016-09-02 12:13:56 UTC (rev 25924) @@ -39,8 +39,10 @@ RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssl3 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibicui18n57 RUNTIME_DEP_PKGS_CSWlibadminutil0_openldap += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(LDAPAPI)) +RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(GARCH)) PACKAGES += CSWlibadmsslutil0 CATALOGNAME_CSWlibadmsslutil0 = libadmsslutil0 @@ -52,7 +54,10 @@ RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibadminutil0 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssl3 RUNTIME_DEP_PKGS_CSWlibadmsslutil0_openldap += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicui18n57 +RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicuuc57 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(LDAPAPI)) +RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(GARCH)) PACKAGES += CSW389-adminutil-dev CATALOGNAME_CSW389-adminutil-dev = 389_adminutil_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 2 19:53:16 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 2 Sep 2016 17:53:16 +0000 Subject: SF.net SVN: gar:[25925] csw/mgar/pkg/sudo/trunk Message-ID: <3sQmvJ1jC9zm1@mail.opencsw.org> Revision: 25925 http://sourceforge.net/p/gar/code/25925 Author: dmichelsen Date: 2016-09-02 17:53:15 +0000 (Fri, 02 Sep 2016) Log Message: ----------- sudo/trunk: Update to 1.8.17p1 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2016-09-02 12:13:56 UTC (rev 25924) +++ csw/mgar/pkg/sudo/trunk/Makefile 2016-09-02 17:53:15 UTC (rev 25925) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.17 +VERSION = 1.8.17p1 GARTYPE = v2 EXTRA_MODULATORS = LDAP Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2016-09-02 12:13:56 UTC (rev 25924) +++ csw/mgar/pkg/sudo/trunk/checksums 2016-09-02 17:53:15 UTC (rev 25925) @@ -1 +1 @@ -01518df10b12c5396c498cdc15d2475f sudo-1.8.17.tar.gz +50a840a688ceb6fa3ab24fc0adf4fa23 sudo-1.8.17p1.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 Sep 5 16:44:32 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 5 Sep 2016 14:44:32 +0000 Subject: SF.net SVN: gar:[25926] csw/mgar/pkg Message-ID: <3sSXZL4yG6z1B5@mail.opencsw.org> Revision: 25926 http://sourceforge.net/p/gar/code/25926 Author: dmichelsen Date: 2016-09-05 14:44:32 +0000 (Mon, 05 Sep 2016) Log Message: ----------- libidn2: Initial commit, symbols strchrnul, strverscmp missing Modified Paths: -------------- csw/mgar/pkg/libidn2/trunk/Makefile csw/mgar/pkg/libidn2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libidn2/ Modified: csw/mgar/pkg/libidn2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2016-07-06 11:21:51 UTC (rev 25802) +++ csw/mgar/pkg/libidn2/trunk/Makefile 2016-09-05 14:44:32 UTC (rev 25926) @@ -1,21 +1,13 @@ -NAME = libidn -VERSION = 1.26 +NAME = libidn2 +VERSION = 0.3 GARTYPE = v2 -DESCRIPTION = GNU IDN Library -define BLURB - GNU Libidn is a fully documented implementation of the Stringprep, - Punycode and IDNA specifications. Libidn's purpose is to encode and - decode internationalized domain names. The native C, C# and Java - libraries are available under the GNU Lesser General Public License - version 2.1 or later. -endef +DESCRIPTION = GNU IDN2 Library -MASTER_SITES = $(GNU_MIRROR) -# MASTER_SITES += http://daily.josefsson.org/libidn/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://josefsson.org/libidn2/releases/ +DISTFILES += $(DISTNAME).tar.gz -VENDOR_URL = http://www.gnu.org/software/libidn/ +VENDOR_URL = http://josefsson.org/libidn2/ PACKAGES += CSWlibidn11 SPKG_DESC_CSWlibidn11 = GNU IDN library, libidn.so.11 @@ -41,22 +33,25 @@ RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWlibiconv2 OBSOLETED_BY_CSWlibidn-utils = CSWlibidn -BUILD_OVERRIDE_VARS = SHELL -BUILD_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash +#BUILD_OVERRIDE_VARS = SHELL +#BUILD_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash -TEST_OVERRIDE_VARS = SHELL -TEST_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash +#TEST_OVERRIDE_VARS = SHELL +#TEST_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash -INSTALL_OVERRIDE_VARS = SHELL -INSTALL_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash +#INSTALL_OVERRIDE_VARS = SHELL +#INSTALL_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash +GARCOMPILER = GNU + BUILD64_LIBS_ONLY = 1 # We don't need it and if defined the test breaks -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +#LD_OPTIONS = +#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -# What's this? Windows DLLs? How do they end up in the Solaris build? -EXTRA_MERGE_EXCLUDE_FILES = .*\.dll +# strchrnul ../.libs/libidn2.so +# strverscmp ../.libs/libidn2.so +SKIPTEST ?= 1 include gar/category.mk Modified: csw/mgar/pkg/libidn2/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2016-07-06 11:21:51 UTC (rev 25802) +++ csw/mgar/pkg/libidn2/trunk/checksums 2016-09-05 14:44:32 UTC (rev 25926) @@ -1 +1 @@ -7533d14fbbb6c026a1a9eaa2179ccb69 libidn-1.26.tar.gz +98f3f31312376e398f6e51aff2ac93c1 libidn2-0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 5 17:49:38 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 5 Sep 2016 15:49:38 +0000 Subject: SF.net SVN: gar:[25927] csw/mgar/pkg/doxygen/trunk Message-ID: <3sSZ1M2pRdz1Dd@mail.opencsw.org> Revision: 25927 http://sourceforge.net/p/gar/code/25927 Author: dmichelsen Date: 2016-09-05 15:49:37 +0000 (Mon, 05 Sep 2016) Log Message: ----------- doxygen/trunk: Update to 1.8.12 Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2016-09-05 14:44:32 UTC (rev 25926) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2016-09-05 15:49:37 UTC (rev 25927) @@ -1,5 +1,5 @@ NAME = doxygen -VERSION = 1.8.11 +VERSION = 1.8.12 GARTYPE = v2 DESCRIPTION = A documentation system for programming languages Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2016-09-05 14:44:32 UTC (rev 25926) +++ csw/mgar/pkg/doxygen/trunk/checksums 2016-09-05 15:49:37 UTC (rev 25927) @@ -1 +1 @@ -f4697a444feaed739cfa2f0644abc19b doxygen-1.8.11.src.tar.gz +08e0f7850c4d22cb5188da226b209a96 doxygen-1.8.12.src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 5 17:53:21 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 5 Sep 2016 15:53:21 +0000 Subject: SF.net SVN: gar:[25928] csw/mgar/pkg/libidn/trunk Message-ID: <3sSZ5Z5HWZz1Gx@mail.opencsw.org> Revision: 25928 http://sourceforge.net/p/gar/code/25928 Author: dmichelsen Date: 2016-09-05 15:53:21 +0000 (Mon, 05 Sep 2016) Log Message: ----------- libidn/trunk: Update to 1.33 Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libidn/trunk/checksums Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2016-09-05 15:49:37 UTC (rev 25927) +++ csw/mgar/pkg/libidn/trunk/Makefile 2016-09-05 15:53:21 UTC (rev 25928) @@ -1,5 +1,5 @@ NAME = libidn -VERSION = 1.26 +VERSION = 1.33 GARTYPE = v2 DESCRIPTION = GNU IDN Library @@ -12,7 +12,6 @@ endef MASTER_SITES = $(GNU_MIRROR) -# MASTER_SITES += http://daily.josefsson.org/libidn/ DISTFILES = $(NAME)-$(VERSION).tar.gz VENDOR_URL = http://www.gnu.org/software/libidn/ @@ -31,32 +30,19 @@ PKGFILES_CSWlibidn-dev += $(infodir)/.* RUNTIME_DEP_PKGS_CSWlibidn-dev += CSWlibidn11 # This is just a file for the emacs mode -CHECKPKG_OVERRIDES_CSWlibidn-dev += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWlibidn-dev += missing-dependency|CSWemacs-common PACKAGES += CSWlibidn-utils SPKG_DESC_CSWlibidn-utils = GNU IDN utilities # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWlibidn11 RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibidn-utils += CSWlibiconv2 OBSOLETED_BY_CSWlibidn-utils = CSWlibidn -BUILD_OVERRIDE_VARS = SHELL -BUILD_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash - -TEST_OVERRIDE_VARS = SHELL -TEST_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash - -INSTALL_OVERRIDE_VARS = SHELL -INSTALL_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash - BUILD64_LIBS_ONLY = 1 -# We don't need it and if defined the test breaks -LD_OPTIONS = +# Put Runpath Linker Flags in LDFLAGS or the testsuite will break +LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS)) EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -# What's this? Windows DLLs? How do they end up in the Solaris build? -EXTRA_MERGE_EXCLUDE_FILES = .*\.dll - include gar/category.mk Modified: csw/mgar/pkg/libidn/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2016-09-05 15:49:37 UTC (rev 25927) +++ csw/mgar/pkg/libidn/trunk/checksums 2016-09-05 15:53:21 UTC (rev 25928) @@ -1 +1 @@ -7533d14fbbb6c026a1a9eaa2179ccb69 libidn-1.26.tar.gz +a9aa7e003665de9c82bd3f9fc6ccf308 libidn-1.33.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 Sep 7 09:54:13 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 7 Sep 2016 07:54:13 +0000 Subject: SF.net SVN: gar:[25929] csw/mgar/pkg/curl/trunk Message-ID: <3sTbMw2SGBz32@mail.opencsw.org> Revision: 25929 http://sourceforge.net/p/gar/code/25929 Author: dmichelsen Date: 2016-09-07 07:54:13 +0000 (Wed, 07 Sep 2016) Log Message: ----------- curl/trunk: Update to 7.50.2 and libpsl5 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-09-05 15:53:21 UTC (rev 25928) +++ csw/mgar/pkg/curl/trunk/Makefile 2016-09-07 07:54:13 UTC (rev 25929) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.50.1 +VERSION = 7.50.2 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers @@ -38,7 +38,7 @@ RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibpsl0 +RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibpsl5 # We want the certs needed for ssl RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWcacertificates CHECKPKG_OVERRIDES_CSWlibcurl4 += surplus-dependency|CSWcacertificates @@ -57,7 +57,7 @@ RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibrtmp0 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibpsl0 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibpsl5 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibnghttp2-14 #RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibk5crypto3 #RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcom-err3 Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2016-09-05 15:53:21 UTC (rev 25928) +++ csw/mgar/pkg/curl/trunk/checksums 2016-09-07 07:54:13 UTC (rev 25929) @@ -1 +1 @@ -01ac668b9f78266d72bdb86aa9db0849 curl-7.50.1.tar.lzma +440fb3aa31a9e97f95394fd2022552c3 curl-7.50.2.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 Wed Sep 7 17:13:45 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 7 Sep 2016 15:13:45 +0000 Subject: SF.net SVN: gar:[25930] csw/mgar/pkg/gettext/trunk Message-ID: <3sTn766LnMz8y@mail.opencsw.org> Revision: 25930 http://sourceforge.net/p/gar/code/25930 Author: dmichelsen Date: 2016-09-07 15:13:45 +0000 (Wed, 07 Sep 2016) Log Message: ----------- gettext/trunk: Update to 0.19.8 Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile csw/mgar/pkg/gettext/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gettext/trunk/ Index: csw/mgar/pkg/gettext/trunk =================================================================== --- csw/mgar/pkg/gettext/trunk 2016-09-07 07:54:13 UTC (rev 25929) +++ csw/mgar/pkg/gettext/trunk 2016-09-07 15:13:45 UTC (rev 25930) Property changes on: csw/mgar/pkg/gettext/trunk ___________________________________________________________________ Modified: svn:ignore ## -1,4 +1 ## -cookies -download work - Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2016-09-07 07:54:13 UTC (rev 25929) +++ csw/mgar/pkg/gettext/trunk/Makefile 2016-09-07 15:13:45 UTC (rev 25930) @@ -1,5 +1,5 @@ NAME = gettext -VERSION = 0.19.1 +VERSION = 0.19.8 GARTYPE = v2 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc @@ -10,7 +10,7 @@ endef MASTER_SITES += $(GNU_MIRROR) -DISTFILES += $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.lz # A few legacy packages that we still need to depend on for dependency reasons # that we no longer want to rebuild and carry. @@ -30,15 +30,16 @@ PACKAGES += CSWggettext SPKG_DESC_CSWggettext = GNU locale utilities -RUNTIME_DEP_PKGS_CSWggettext += CSWlibexpat1 +# PKGFILES is catchall RUNTIME_DEP_PKGS_CSWggettext += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-3 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-18-3 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-19-8 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-19-8 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl9 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgomp1 RUNTIME_DEP_PKGS_CSWggettext += CSWlibasprintf0 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextpo0 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibunistring0 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextpo1 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibunistring2 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWggettext += CSWggettext-data CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWggettext-data CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacs-common @@ -51,6 +52,9 @@ CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl2 RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl3 CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl3 +# This is for the comment: +# Ignore absolute directory pathnames, like /usr/local/share/aclocal. +CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/bin/ggettextize PACKAGES += CSWlibasprintf0 SPKG_DESC_CSWlibasprintf0 += GNU locale utilities, libasprintf.so.0 @@ -61,59 +65,60 @@ CHECKPKG_OVERRIDES_CSWlibasprintf0 += surplus-dependency|CSWggettext-data OBSOLETED_BY_CSWlibasprintf0 += CSWggettextrt -PACKAGES += CSWlibgettextlib0-18-3 -SPKG_DESC_CSWlibgettextlib0-18-3 += GNU locale utilities, libgettextlib-0.18.3.so -PKGFILES_CSWlibgettextlib0-18-3 += $(call pkgfiles_lib,libgettextlib-0.18.3.so) -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibunistring0 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-3 += surplus-dependency|CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-3 += soname-equals-filename +PACKAGES += CSWlibgettextlib0-19-8 +SPKG_DESC_CSWlibgettextlib0-19-8 += GNU locale utilities, libgettextlib-0.19.8.so +PKGFILES_CSWlibgettextlib0-19-8 += $(call pkgfiles_lib,libgettextlib-0.19.8.so) +RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibncurses6 +RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibunistring2 +RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWggettext-data +CHECKPKG_OVERRIDES_CSWlibgettextlib0-19-8 += surplus-dependency|CSWggettext-data +CHECKPKG_OVERRIDES_CSWlibgettextlib0-19-8 += soname-equals-filename -PACKAGES += CSWlibgettextpo0 -SPKG_DESC_CSWlibgettextpo0 += GNU locale utilities, libgettextpo.so.0 -PKGFILES_CSWlibgettextpo0 += $(call pkgfiles_lib,libgettextpo.so.0) -RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibunistring0 -RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data -OBSOLETED_BY_CSWlibgettextpo0 += CSWggettextrt +PACKAGES += CSWlibgettextpo1 +SPKG_DESC_CSWlibgettextpo1 += GNU locale utilities, libgettextpo.so.1 +PKGFILES_CSWlibgettextpo1 += $(call pkgfiles_lib,libgettextpo.so.1) +RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibunistring2 +RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWggettext-data +CHECKPKG_OVERRIDES_CSWlibgettextpo1 += surplus-dependency|CSWggettext-data +OBSOLETED_BY_CSWlibgettextpo1 += CSWggettextrt -PACKAGES += CSWlibgettextsrc0-18-3 -SPKG_DESC_CSWlibgettextsrc0-18-3 += GNU locale utilities, libgettextsrc-0.18.3.so -PKGFILES_CSWlibgettextsrc0-18-3 += $(call pkgfiles_lib,libgettextsrc-0.18.3.so) -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibgettextlib0-18-3 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibunistring0 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += surplus-dependency|CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += soname-equals-filename +PACKAGES += CSWlibgettextsrc0-19-8 +SPKG_DESC_CSWlibgettextsrc0-19-8 += GNU locale utilities, libgettextsrc-0.19.8.so +PKGFILES_CSWlibgettextsrc0-19-8 += $(call pkgfiles_lib,libgettextsrc-0.19.8.so) +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibgettextlib0-19-8 +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibncurses6 +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibunistring2 +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWggettext-data +CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += surplus-dependency|CSWggettext-data +CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += soname-equals-filename # On i386 only -CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += surplus-dependency|CSWlibxml2-2 -CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += surplus-dependency|CSWlibncurses5 +CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += surplus-dependency|CSWlibxml2-2 +CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += surplus-dependency|CSWlibncurses6 -PACKAGES += CSWlibintl8 -SPKG_DESC_CSWlibintl8 += GNU locale utilities, libintl.so.8 -PKGFILES_CSWlibintl8 += $(call pkgfiles_lib,libintl.so.8) -RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibintl8 += CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibintl8 += surplus-dependency|CSWggettext-data -OBSOLETED_BY_CSWlibintl8 += CSWggettextrt +PACKAGES += CSWlibintl9 +SPKG_DESC_CSWlibintl9 += GNU locale utilities, libintl.so.9 +PKGFILES_CSWlibintl9 += $(call pkgfiles_lib,libintl.so.9) +RUNTIME_DEP_PKGS_CSWlibintl9 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibintl9 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibintl9 += CSWggettext-data +CHECKPKG_OVERRIDES_CSWlibintl9 += surplus-dependency|CSWggettext-data PACKAGES += CSWggettext-dev SPKG_DESC_CSWggettext-dev = GNU locale utilities, development files -# Why is this needed? +# This is needed because these libs are the ones linked against, not symlinks as usual: +# libgettextlib-0.19.8.so +# libgettextsrc-0.19.8.so PKGFILES_DEVEL_SHAREDLIBLINK = PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL) PKGFILES_CSWggettext-dev += $(PKGFILES_DOC) @@ -124,10 +129,10 @@ PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libintl.so) PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*\.mo RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0 -RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-3 +RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-19-8 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17 -RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-18-3 +RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-19-8 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8 OBSOLETED_BY_CSWggettext-dev += CSWggettextdoc CHECKPKG_OVERRIDES_CSWggettext-dev += missing-dependency|CSWperl @@ -139,6 +144,10 @@ GARCOMPILER = GNU +# Make sure libgettlib gets linked to the newly built libintl instead of the installed one +# This is everything but RUNPATH_LINKER_FLAGS which is passed via LDFLAGS instead of LD_OPTIONS +LD_OPTIONS = $(strip $($(GARCOMPILER)_LD_OPTIONS) $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS)) + CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g # Dont' depend on packages that depend on me @@ -147,8 +156,16 @@ # No glibc CONFIGURE_ARGS += --with-included-gettext +CONFIGURE_ARGS += --disable-java +CONFIGURE_ARGS += --disable-native-java + +# We need "grep -E" +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) + +# While we are investigating +BUILD_ARGS += V=1 + BUILD64_LIBS_ONLY = 1 -#EXTRA_LINKER_FLAGS = -xnorunpath MERGE_EXCLUDE_FILES = .*/charset.alias MERGE_EXCLUDE_FILES += .*/locale.alias @@ -156,45 +173,16 @@ COMPILE_ELISP = 1 -# Just 4 ACL tests are failing -SKIPTEST ?= 1 - include gar/category.mk -#Include old libraries for compatibility with existing packages -# TODO: Convert to modulated builds +# This is an ugly workaround to circumvent libgettextlib.so getting linked against the +# old libintl.so from /opt/csw/lib instead the newly built one +pre-install: + perl -i.old -npe 's,-L$(libdir) -liconv,-liconv,g;' $(WORKSRC)/gettext-tools/gnulib-lib/libgettextlib.la + @$(MAKECOOKIE) -post-install-isa-sparcv8plus: - @mkdir $(INSTALLISADIR)/opt/csw/share/java - @mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java - $(MAKECOOKIE) - -post-install-isa-sparcv9: - @rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar - $(MAKECOOKIE) - -post-install-isa-pentium_pro: - @mkdir $(INSTALLISADIR)/opt/csw/share/java - @mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java - $(MAKECOOKIE) - -post-install-isa-amd64: - @rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar - $(MAKECOOKIE) - post-merge-all: @echo "Setting up gnu links..." ginstall -d $(DESTDIR)$(prefix)/gnu $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) - @echo "Fixing usr/local and usr/share references..." - @(cd $(PKGROOT); \ - gfind .$(docdir) .$(datadir)/aclocal -type f -print0 | \ - gxargs -0 perl -pi \ - -e "s#/usr/share#/opt/csw/share#g;" \ - -e "s#/usr/local#/opt/csw#g;"; \ - perl -pi \ - -e "s#/usr/share#/opt/csw/share#g;" \ - -e "s#/usr/local#/opt/csw#g;" \ - .$(bindir)/ggettextize \ - .$(infodir)/gettext.info; ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/gettext/trunk/checksums =================================================================== --- csw/mgar/pkg/gettext/trunk/checksums 2016-09-07 07:54:13 UTC (rev 25929) +++ csw/mgar/pkg/gettext/trunk/checksums 2016-09-07 15:13:45 UTC (rev 25930) @@ -1 +1 @@ -8949a57e82abe88274a93174ade515e4 gettext-0.19.1.tar.gz +e83becf5dc4c29519a5ec5335d769764 gettext-0.19.8.tar.lz 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 Sep 7 22:00:58 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 7 Sep 2016 20:00:58 +0000 Subject: SF.net SVN: gar:[25931] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <3sTvVN0G8KzNd@mail.opencsw.org> Revision: 25931 http://sourceforge.net/p/gar/code/25931 Author: dmichelsen Date: 2016-09-07 20:00:58 +0000 (Wed, 07 Sep 2016) Log Message: ----------- gettext/trunk: Fix /opt/csw/gnu links Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2016-09-07 15:13:45 UTC (rev 25930) +++ csw/mgar/pkg/gettext/trunk/Makefile 2016-09-07 20:00:58 UTC (rev 25931) @@ -183,6 +183,6 @@ post-merge-all: @echo "Setting up gnu links..." - ginstall -d $(DESTDIR)$(prefix)/gnu - $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) + ginstall -d $(PKGROOT)$(prefix)/gnu + $(foreach G,$(notdir $(wildcard $(PKGROOT)$(bindir)/*)),ln -s ../bin/$G $(PKGROOT)$(prefix)/gnu/$(patsubst g%,%,$G);) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Sep 8 09:45:34 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 8 Sep 2016 07:45:34 +0000 Subject: SF.net SVN: gar:[25932] csw/mgar/pkg/mozldap/trunk/Makefile Message-ID: <3sVC7L2y29z103@mail.opencsw.org> Revision: 25932 http://sourceforge.net/p/gar/code/25932 Author: cgrzemba Date: 2016-09-08 07:45:33 +0000 (Thu, 08 Sep 2016) Log Message: ----------- mozldap/trunk: reintroduce Sparc related runtime dependencies Modified Paths: -------------- csw/mgar/pkg/mozldap/trunk/Makefile Modified: csw/mgar/pkg/mozldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/mozldap/trunk/Makefile 2016-09-07 20:00:58 UTC (rev 25931) +++ csw/mgar/pkg/mozldap/trunk/Makefile 2016-09-08 07:45:33 UTC (rev 25932) @@ -112,7 +112,11 @@ RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnss3 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibssldap60 +RUNTIME_DEP_PKGS_CSWmozldap-tools_sparc += CSWlibplds4 +RUNTIME_DEP_PKGS_CSWmozldap-tools_sparc += CSWlibplc4 +RUNTIME_DEP_PKGS_CSWmozldap-tools += $(RUNTIME_DEP_PKGS_CSWmozldap-tools_$(GARCH)) + PACKAGES += CSWmozldap-dev CATALOGNAME_CSWmozldap-dev = mozldap_dev SPKG_DESC_CSWmozldap-dev += $(DESCRIPTION), development files 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 Sep 8 14:03:26 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 8 Sep 2016 12:03:26 +0000 Subject: SF.net SVN: gar:[25933] csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Message-ID: <3sVJs10k65z1Fq@mail.opencsw.org> Revision: 25933 http://sourceforge.net/p/gar/code/25933 Author: dmichelsen Date: 2016-09-08 12:03:25 +0000 (Thu, 08 Sep 2016) Log Message: ----------- php5/branches/php-5.6.x: Adjust dependency Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2016-09-08 07:45:33 UTC (rev 25932) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2016-09-08 12:03:25 UTC (rev 25933) @@ -194,7 +194,7 @@ $(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0)) $(eval $(call php5_subpackage,calendar,)) $(eval $(call php5_subpackage,ctype,)) -RUNTIME_DEP_PKGS_CSWphp5-curl += CSWlibpsl5 +RUNTIME_DEP_PKGS_CSWphp5-curl_sparc += CSWlibpsl5 RUNTIME_DEP_PKGS_CSWphp5-curl_sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWphp5-curl += $(RUNTIME_DEP_PKGS_CSWphp5-curl_$(GARCH)) $(eval $(call php5_subpackage,curl,CSWlibcurl4)) 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 Sep 9 14:43:50 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 9 Sep 2016 12:43:50 +0000 Subject: SF.net SVN: gar:[25934] csw/mgar/pkg/poppler/trunk Message-ID: <3sVxjL0Vl7z1Rs@mail.opencsw.org> Revision: 25934 http://sourceforge.net/p/gar/code/25934 Author: dmichelsen Date: 2016-09-09 12:43:50 +0000 (Fri, 09 Sep 2016) Log Message: ----------- poppler/trunk: Update to 0.47.0 Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile csw/mgar/pkg/poppler/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/poppler/trunk/files/ltmain.patch csw/mgar/pkg/poppler/trunk/files/old_libs_i386.tar.bz2 csw/mgar/pkg/poppler/trunk/files/old_libs_sparc.tar.bz2 Property Changed: ---------------- csw/mgar/pkg/poppler/trunk/ Index: csw/mgar/pkg/poppler/trunk =================================================================== --- csw/mgar/pkg/poppler/trunk 2016-09-08 12:03:25 UTC (rev 25933) +++ csw/mgar/pkg/poppler/trunk 2016-09-09 12:43:50 UTC (rev 25934) Property changes on: csw/mgar/pkg/poppler/trunk ___________________________________________________________________ Modified: svn:ignore ## -1,4 +1 ## -cookies -download work - Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2016-09-08 12:03:25 UTC (rev 25933) +++ csw/mgar/pkg/poppler/trunk/Makefile 2016-09-09 12:43:50 UTC (rev 25934) @@ -1,104 +1,66 @@ # $Id$ NAME = poppler -VERSION = 0.26.0 +VERSION = 0.47.0 GARTYPE = v2 DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base - define BLURB -endef -SPKG_SOURCEURL = http://poppler.freedesktop.org/ MASTER_SITES = http://poppler.freedesktop.org/ -DISTFILES = $(NAME)-$(VERSION).tar.xz -DISTFILES += old_libs_i386.tar.bz2 -DISTFILES += old_libs_sparc.tar.bz2 +DISTFILES += $(DISTNAME).tar.xz -GARCOMPILER = GNU -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +VENDOR_URL = http://poppler.freedesktop.org/ -PATCHFILES += ltmain.patch - -# UPSTREAM_MASTER_SITES = -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# BUILD64_LIBS_ONLY = 1 -BUILD64 = 1 - PACKAGES += CSWlibpoppler-cpp0 -PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0\.2\.0) -PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0(\.\d+)*) SPKG_DESC_CSWlibpoppler-cpp0 += $(DESCRIPTION), libpoppler-cpp.so.0 -RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler46 +PKGFILES_CSWlibpoppler-cpp0 += $(call pkgfiles_lib,libpoppler-cpp.so.0) +RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler63 RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibstdc++6 -# Those dependencies are due to `ld -z ignore' has changed (patch 147147-26). -RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibtiff5 -RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibjpeg7 -# Those overrides are due to `ld -z ignore' has changed (patch 147147-26). -CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibfontconfig1 -CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibtiff5 -CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibpng15-15 -CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibjpeg7 -CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWliblcms2-2 -CHECKPKG_OVERRIDES_CSWlibpoppler-cpp0 += surplus-dependency|CSWlibfreetype6 PACKAGES += CSWlibpoppler-glib8 -PKGFILES_CSWlibpoppler-glib8 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.8\.6\.0) -PKGFILES_CSWlibpoppler-glib8 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.8(\.\d+)*) SPKG_DESC_CSWlibpoppler-glib8 += $(DESCRIPTION), libpoppler-glib.so.8 +PKGFILES_CSWlibpoppler-glib8 += $(call pkgfiles_lib,libpoppler-glib.so.8) RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpoppler46 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpoppler63 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibstdc++6 -# Those dependencies are due to `ld -z ignore' has changed (patch 147147-26). -RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibtiff5 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWliblcms2-2 -# Those overrides are due to `ld -z ignore' has changed (patch 147147-26). -CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibfontconfig1 -CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibtiff5 -CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibpng15-15 -CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWlibjpeg7 -CHECKPKG_OVERRIDES_CSWlibpoppler-glib8 += surplus-dependency|CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8-sparc += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += $(RUNTIME_DEP_PKGS_CSWlibpoppler-glib8-$(GARCH)) -PACKAGES += CSWlibpoppler46 -PKGFILES_CSWlibpoppler46 += $(call baseisadirs,$(libdir),libpoppler\.so\.46\.0\.0) -PKGFILES_CSWlibpoppler46 += $(call baseisadirs,$(libdir),libpoppler\.so\.46(\.\d+)*) -SPKG_DESC_CSWlibpoppler46 += $(DESCRIPTION), libpoppler.so.46 -RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibtiff5 -RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibpoppler46 += CSWlibstdc++6 +PACKAGES += CSWlibpoppler63 +SPKG_DESC_CSWlibpoppler63 += $(DESCRIPTION), libpoppler.so.63 +PKGFILES_CSWlibpoppler63 += $(call pkgfiles_lib,libpoppler.so.63) +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibtiff5 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibsmime3 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibpng16-16 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibopenjp2-7 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibnss3 +RUNTIME_DEP_PKGS_CSWlibpoppler63 += CSWlibnspr4 PACKAGES += CSWpoppler-dev SPKG_DESC_CSWpoppler-dev += $(DESCRIPTION), development files PKGFILES_CSWpoppler-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler46 +RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler63 RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-cpp0 RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-glib8 PACKAGES += CSWpoppler SPKG_DESC_CSWpoppler += $(DESCRIPTION), utils -PKGFILES_CSWpoppler += $(call baseisadirs,$(bindir),.*) -PKGFILES_CSWpoppler += $(call baseisadirs,$(datadir)/man,.*) +# PKGFILES is catchall # CSWxpdf provides the same tools, but should use this package instead # interims solution until rework xpdf INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf @@ -117,32 +79,37 @@ CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftotext.1|CSWpoppler|CSWxpdf CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdffonts.1|CSWpoppler|CSWxpdf CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftohtml.1|CSWpdftohtml|CSWpoppler -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler46 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler63 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWpoppler += CSWliblcms2-2 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWpoppler-sparc += CSWlibpng16-16 +RUNTIME_DEP_PKGS_CSWpoppler-sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpoppler += $(RUNTIME_DEP_PKGS_CSWpoppler-$(GARCH)) +OBSOLETED_BY_CSWpoppler += CSWlibpopplerdoc +GARCOMPILER = GNU + +BUILD64 = 1 + # Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib # when relinking libpoppler-glib during install phaze EXTRA_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs) -# EXTRA_CXXFLAGS += -D__EXTENSIONS__ + EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64 CONFIGURE_ARGS = $(DIRPATHS) -### Install unsupported xpdf headers. + +# Install unsupported xpdf headers. CONFIGURE_ARGS += --enable-xpdf-headers CONFIGURE_ARGS += --disable-poppler-qt4 + # FIXME: introspection doesn't build on amd64, couldn't figure out why CONFIGURE_ARGS += --enable-introspection=no +CONFIGURE_ARGS += --enable-libcurl + include gar/category.mk -post-install-isa-sparcv8: - (cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_sparc.tar.bz2|tar xf -) - $(MAKECOOKIE) - -post-install-isa-i386: - (cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_i386.tar.bz2|tar xf -) - $(MAKECOOKIE) Modified: csw/mgar/pkg/poppler/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler/trunk/checksums 2016-09-08 12:03:25 UTC (rev 25933) +++ csw/mgar/pkg/poppler/trunk/checksums 2016-09-09 12:43:50 UTC (rev 25934) @@ -1 +1 @@ -76c3b2f18002a0f1e2bbbc7cccd1b957 poppler-0.26.0.tar.xz +669b195ff24173d35cacf1d20b6fe4fa poppler-0.47.0.tar.xz Deleted: csw/mgar/pkg/poppler/trunk/files/ltmain.patch =================================================================== --- csw/mgar/pkg/poppler/trunk/files/ltmain.patch 2016-09-08 12:03:25 UTC (rev 25933) +++ csw/mgar/pkg/poppler/trunk/files/ltmain.patch 2016-09-09 12:43:50 UTC (rev 25934) @@ -1,11 +0,0 @@ ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -5853,7 +5853,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-xnorunpath|-norunpath) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" Deleted: csw/mgar/pkg/poppler/trunk/files/old_libs_i386.tar.bz2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/poppler/trunk/files/old_libs_sparc.tar.bz2 =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Sep 11 15:37:14 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 11 Sep 2016 13:37:14 +0000 Subject: SF.net SVN: gar:[25935] csw/mgar/pkg/collectd/trunk Message-ID: <3sXBp04PjtzBg@mail.opencsw.org> Revision: 25935 http://sourceforge.net/p/gar/code/25935 Author: dmichelsen Date: 2016-09-11 13:37:14 +0000 (Sun, 11 Sep 2016) Log Message: ----------- collectd/trunk: Update to 5.6.0 Modified Paths: -------------- csw/mgar/pkg/collectd/trunk/Makefile csw/mgar/pkg/collectd/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch Modified: csw/mgar/pkg/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile 2016-09-09 12:43:50 UTC (rev 25934) +++ csw/mgar/pkg/collectd/trunk/Makefile 2016-09-11 13:37:14 UTC (rev 25935) @@ -1,17 +1,18 @@ # $Id$ # NAME = collectd -VERSION = 5.5.2 +VERSION = 5.6.0 GARTYPE = v2 DESCRIPTION = Collects system performance statistics periodically MASTER_SITES = http://collectd.org/files/ +# MASTER_SITES += https://ci.collectd.org/job/packages-prepare-tarball-collectd-5.6/lastSuccessfulBuild/artifact/ DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += cswcollectd -# Review on 5.5.3 -PATCHFILES += 0001-Forward-port-1782.patch +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 VENDOR_URL = http://collectd.org/ @@ -32,21 +33,11 @@ BUILD_DEP_PKGS += CSWjdk7 BUILD_DEP_PKGS += CSWlibprotobuf-c-dev -# We need asprintf in write_sensu.c until the vendor substitute is in place from -# https://github.com/collectd/collectd/pull/912 -LINKER_MAPS = - GARCOMPILER = GNU BUILD64 = 1 ISAEXEC = 1 -###EXTRA_CPPFLAGS += -D__EXTENSIONS__ - -# GCC 5 has C standards which are too new for the headers -#EXTRA_CFLAGS += -std=c99 -###EXTRA_CPPFLAGS += -D_XPG6 - EXTRA_CFLAGS += -std=gnu99 CONFIGURE_ARGS += $(DIRPATHS) @@ -58,10 +49,6 @@ # Make sure net-snmp-config is found at the correct path for both 32 and 64 bit CONFIGURE_ARGS += --with-snmp-config=$(bindir)/net-snmp-config -# Use only Java 8 and 64 bit until this is fixed: -# https://github.com/collectd/collectd/issues/1007 -# Also the detection uses "find" which does not follow symlinks - JAVA_ARCHDIR-sparc-32 = sparc JAVA_ARCHDIR-sparc-64 = sparcv9 JAVA_ARCHDIR-i386-32 = i386 @@ -92,6 +79,10 @@ # We need 'grep -q' CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) +# Make sure we pick up the correct python +EXTRA_CONFIGURE_EXPORTS += PYTHON_CONFIG +CONFIGURE_ENV_PYTHON_CONFIG = /opt/csw/bin/python2.7-config + CONFIGURE_ARGS += --enable-java CONFIGURE_ARGS += JAVAC="$(JAVAC)" CONFIGURE_ARGS += JAR="$(JAR)" @@ -104,6 +95,9 @@ # This is Linux only # CONFIGURE_ARGS += --enable-protocols +# No 64 bit Perl yet +CONFIGURE_ARGS-64 += --disable-perl + CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) PACKAGES += CSWlibcollectdclient1 @@ -134,15 +128,12 @@ RUNTIME_DEP_PKGS_CSWcollectd += CSWlibprotobuf-c1 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibstatgrab10 # These are pulled in because of a linker anomaly -RUNTIME_DEP_PKGS_CSWcollectd-sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWcollectd-sparc += CSWlibintl9 RUNTIME_DEP_PKGS_CSWcollectd-i386 += CSWlibmemcached8 RUNTIME_DEP_PKGS_CSWcollectd-i386 += CSWlibfl2 RUNTIME_DEP_PKGS_CSWcollectd += $(RUNTIME_DEP_PKGS_CSWcollectd-$(GARCH)) -# This is for asprintf in write_sensu, please see MAPFILE clearance above -CHECKPKG_OVERRIDES_CSWcollectd += forbidden-version-interface-dependencies|/opt/csw/lib/collectd/write_sensu.so|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 -CHECKPKG_OVERRIDES_CSWcollectd += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/collectd/write_sensu.so|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 -CHECKPKG_OVERRIDES_CSWcollectd += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/collectd/write_sensu.so|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 +IPS_DEVPKG = CSWcollectd PACKAGES += CSWcollectd-plugin-dbi SPKG_DESC_CSWcollectd-plugin-dbi = CollectD Plugin for DBI @@ -233,12 +224,31 @@ RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibgdk1-2-0 RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibglib1-2-0 RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibgtk1-2-0 -RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibintl9 RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms += $(RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-$(GARCH)) # No 64 bit XMMS yet CHECKPKG_OVERRIDES_CSWcollectd-plugin-xmms += 64-bit-binaries-missing +PACKAGES += CSWcollectd-plugin-lua +SPKG_DESC_CSWcollectd-plugin-lua = CollectD Plugin for Lua +PKGFILES_CSWcollectd-plugin-lua += $(call pkgfiles_lib,collectd/lua.so) +PKGFILES_CSWcollectd-plugin-lua += $(mandir)/man5/collectd-lua.5 +RUNTIME_DEP_PKGS_CSWcollectd-plugin-lua += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWcollectd-plugin-lua += CSWcollectd +CHECKPKG_OVERRIDES_CSWcollectd-plugin-lua += surplus-dependency|CSWcollectd +RUNTIME_DEP_PKGS_CSWcollectd-plugin-lua += CSWliblua5-2 + +PACKAGES += CSWcollectd-plugin-riemann +SPKG_DESC_CSWcollectd-plugin-riemann = CollectD Plugin for Riemann +PKGFILES_CSWcollectd-plugin-riemann += $(call pkgfiles_lib,collectd/write_riemann.so) +RUNTIME_DEP_PKGS_CSWcollectd-plugin-riemann += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWcollectd-plugin-riemann += CSWcollectd +CHECKPKG_OVERRIDES_CSWcollectd-plugin-riemann += surplus-dependency|CSWcollectd +RUNTIME_DEP_PKGS_CSWcollectd-plugin-riemann += CSWlibriemann-client0 + PACKAGES += CSWcollectd-plugins-all + +PACKAGES += CSWcollectd-plugins-all SPKG_DESC_CSWcollectd-plugins-all = CollectD Metapackage that pulls in all plugins PKGFILES_CSWcollectd-plugins-all = EMPTY ARCHALL_CSWcollectd-plugins-all = 1 @@ -250,6 +260,8 @@ RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-rrdtool RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-snmp RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-xmms +RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-lua +RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-riemann # These are all sort of surplus as this is a meta package CHECKPKG_OVERRIDES_CSWcollectd-plugins-all += surplus-dependency @@ -259,6 +271,10 @@ include gar/category.mk +xxxpost-patch: + cd $(WORKSRC) && autoreconf -fi + @$(MAKECOOKIE) + post-install-modulated: mv $(DESTDIR)/opt/csw/man $(DESTDIR)$(mandir) grm -f $(DESTDIR)/opt/csw/lib/perl/5.10.1/perllocal.pod Modified: csw/mgar/pkg/collectd/trunk/checksums =================================================================== --- csw/mgar/pkg/collectd/trunk/checksums 2016-09-09 12:43:50 UTC (rev 25934) +++ csw/mgar/pkg/collectd/trunk/checksums 2016-09-11 13:37:14 UTC (rev 25935) @@ -1 +1 @@ -40b83343f72089e0330f53965f1140bd collectd-5.5.2.tar.bz2 +572b346ca47d6466fe48e6e504b41cf0 collectd-5.6.0.tar.bz2 Deleted: csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch =================================================================== --- csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch 2016-09-09 12:43:50 UTC (rev 25934) +++ csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch 2016-09-11 13:37:14 UTC (rev 25935) @@ -1,71 +0,0 @@ -From 0bacf0dbb15b91e4569cc89e68f7aa6ea964bbca Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 3 Aug 2016 15:29:00 +0200 -Subject: [PATCH] Forward-port #1782 - ---- - src/write_riemann.c | 14 +++++++------- - src/write_riemann_threshold.c | 8 ++++---- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/src/write_riemann.c b/src/write_riemann.c -index 58611a9..dbac784 100644 ---- a/src/write_riemann.c -+++ b/src/write_riemann.c -@@ -26,6 +26,13 @@ - * Florian octo Forster - */ - -+#include "plugin.h" -+#include "common.h" -+#include "configfile.h" -+#include "utils_cache.h" -+#include "riemann.pb-c.h" -+#include "write_riemann_threshold.h" -+ - #include - #include - #include -@@ -33,13 +40,6 @@ - #include - #include - --#include "collectd.h" --#include "plugin.h" --#include "common.h" --#include "configfile.h" --#include "utils_cache.h" --#include "riemann.pb-c.h" --#include "write_riemann_threshold.h" - - #define RIEMANN_HOST "localhost" - #define RIEMANN_PORT "5555" -diff --git a/src/write_riemann_threshold.c b/src/write_riemann_threshold.c -index b1f7297..18dec69 100644 ---- a/src/write_riemann_threshold.c -+++ b/src/write_riemann_threshold.c -@@ -25,10 +25,6 @@ - * Andr?s J. D?az - **/ - --#include --#include --#include -- - #include "collectd.h" - #include "common.h" - #include "plugin.h" -@@ -37,6 +33,10 @@ - #include "utils_threshold.h" - #include "write_riemann_threshold.h" - -+#include -+#include -+#include -+ - /* - * Threshold management - * ==================== --- -2.4.0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Sep 11 17:54:33 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 11 Sep 2016 15:54:33 +0000 Subject: SF.net SVN: gar:[25936] csw/mgar/pkg/collectd/trunk/Makefile Message-ID: <3sXFrB71tBzFK@mail.opencsw.org> Revision: 25936 http://sourceforge.net/p/gar/code/25936 Author: dmichelsen Date: 2016-09-11 15:54:32 +0000 (Sun, 11 Sep 2016) Log Message: ----------- collectd/trunk: No extra Solaris 11 build Modified Paths: -------------- csw/mgar/pkg/collectd/trunk/Makefile Modified: csw/mgar/pkg/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile 2016-09-11 13:37:14 UTC (rev 25935) +++ csw/mgar/pkg/collectd/trunk/Makefile 2016-09-11 15:54:32 UTC (rev 25936) @@ -11,9 +11,6 @@ DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += cswcollectd -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 - VENDOR_URL = http://collectd.org/ # Lots of others missing @@ -161,10 +158,6 @@ RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWcollectd CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += surplus-dependency|CSWcollectd RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWjre7 -# There are some symlinks that confuse checkpkg -CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/sparcv9/collectd/java.so -CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/amd64/collectd/java.so -CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/collectd/java.so CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += surplus-dependency|CSWjre7 PACKAGES += CSWcollectd-plugin-mysql 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 Sep 14 09:28:20 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Sep 2016 07:28:20 +0000 Subject: SF.net SVN: gar:[25937] csw/mgar/pkg/curl/trunk Message-ID: <3sYtSj5p4KzkW@mail.opencsw.org> Revision: 25937 http://sourceforge.net/p/gar/code/25937 Author: dmichelsen Date: 2016-09-14 07:28:20 +0000 (Wed, 14 Sep 2016) Log Message: ----------- curl/trunk: Update to 7.50.3 and libintl9 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-09-11 15:54:32 UTC (rev 25936) +++ csw/mgar/pkg/curl/trunk/Makefile 2016-09-14 07:28:20 UTC (rev 25937) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.50.2 +VERSION = 7.50.3 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers @@ -55,7 +55,7 @@ RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcares2 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibrtmp0 -RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibpsl5 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibnghttp2-14 @@ -73,7 +73,7 @@ CHECKPKG_OVERRIDES_CSWlibcurl4-feature += soname-not-part-of-filename # Linker anomaly -CHECKPKG_OVERRIDES_CSWlibcurl4-feature-i386 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibcurl4-feature-i386 += surplus-dependency|CSWlibintl9 CHECKPKG_OVERRIDES_CSWlibcurl4-feature += $(CHECKPKG_OVERRIDES_CSWlibcurl4-feature-$(GARCH)) PACKAGES += CSWlibcurl-dev @@ -96,10 +96,10 @@ RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWcurl += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWcurl += CSWlibmetalink3 -RUNTIME_DEP_PKGS_CSWcurl += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWcurl += CSWlibintl9 # Linker anomaly -CHECKPKG_OVERRIDES_CSWcurl-i386 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWcurl-i386 += surplus-dependency|CSWlibintl9 CHECKPKG_OVERRIDES_CSWcurl += $(CHECKPKG_OVERRIDES_CSWcurl-$(GARCH)) EXTRA_MODULATORS = FEATURES Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2016-09-11 15:54:32 UTC (rev 25936) +++ csw/mgar/pkg/curl/trunk/checksums 2016-09-14 07:28:20 UTC (rev 25937) @@ -1 +1 @@ -440fb3aa31a9e97f95394fd2022552c3 curl-7.50.2.tar.lzma +6080c1eb3e72d5da6c892ba72a074ad2 curl-7.50.3.tar.lzma 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 Sep 14 10:53:52 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 14 Sep 2016 08:53:52 +0000 Subject: SF.net SVN: gar:[25938] csw/mgar/gar/v2-hg Message-ID: <3sYwMY3HSvznq@mail.opencsw.org> Revision: 25938 http://sourceforge.net/p/gar/code/25938 Author: cgrzemba Date: 2016-09-14 08:53:52 +0000 (Wed, 14 Sep 2016) Log Message: ----------- made some improvements for using GARCH with mercurial repository Modified Paths: -------------- csw/mgar/gar/v2-hg/gar.lib.mk csw/mgar/gar/v2-hg/gar.mk Modified: csw/mgar/gar/v2-hg/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-hg/gar.lib.mk 2016-09-14 07:28:20 UTC (rev 25937) +++ csw/mgar/gar/v2-hg/gar.lib.mk 2016-09-14 08:53:52 UTC (rev 25938) @@ -52,8 +52,12 @@ ifdef HG_REPOS URLS += $(foreach R,$(HG_REPOS),$(foreach hgproto,hg http file ssh,$(call hgsubst,$(hgproto),$(R)))) +NOEXTRACT += $(call GITPROJ,$(HG_REPOS)).hg endif +# filename used for mercurial archive +GARCHDISTNAME ?= $(DISTNAME).tar.gz + # Download the file if and only if it doesn't have a preexisting # checksum file. Loop through available URLs and stop when you # get one that doesn't return an error code. @@ -77,7 +81,7 @@ esac; \ break; \ done; ) 2>&1 | grep -v '^$(MAKE)'; \ - if test -r $(@:%.hg=%) ; then : ; else \ + if [ -r $(@:%.hg=%) ] || [ $* = $(GARCHDISTNAME) -a ! -z $(HG_REPOS) ]; then : ; else \ echo '(!!!) Failed to download $@!' 1>&2; \ false; \ fi; \ @@ -569,9 +573,12 @@ # checksummed files $(GARCHIVEDIR)/%: $(GARCHIVEDIR) + $(if $(filter %.hg,$*),(cd $(DOWNLOADDIR)/$(*:%.hg=%) && \ + hg archive --prefix=$(DISTNAME)/ --rev=$(call HG_TREEISH,$(*:%.hg=%)) --type tar - | gzip > $(GARCHIVEDIR)/$(GARCHDISTNAME) && \ + rm -f $(GARCHDISTNAME) && ln -s $(GARCHIVEDIR)/$(GARCHDISTNAME) . ), \ @if [ -h $(DOWNLOADDIR)/$* ]; then :; else \ gcp -Lr $(DOWNLOADDIR)/$* $@; \ - fi + fi ) #################### EXTRACT RULES #################### @@ -652,8 +659,8 @@ ( cd $(abspath $(DOWNLOADDIR))/$*/; git --bare archive --prefix=$(NAME)-$(VERSION)/ $(call GIT_TREEISH,$*)) | gtar -xf - -C $(EXTRACTDIR) @$(MAKECOOKIE) hg-extract-%: - @echo " ===> Extracting Mercurial Repo $(DOWNLOADDIR)/$* (Tag: $(call HG_TREEISH,$*))" - ( cd $(abspath $(DOWNLOADDIR))/$*/; hg archive --prefix=$(DISTNAME)/ --rev=$(call HG_TREEISH,$*) --type tar -)| gtar -xf - -C $(EXTRACTDIR) + @echo " ===> Extracting Mercurial Repo $(DOWNLOADDIR)/$* (Tag: $(call HG_TREEISH,$(*:%.hg=%)))" + ( cd $(abspath $(DOWNLOADDIR))/$*/; hg archive --prefix=$(DISTNAME)/ --rev=$(call HG_TREEISH,$(*:%.hg=%)) --type tar -)| gtar -xf - -C $(EXTRACTDIR) @$(MAKECOOKIE) # rule to extract files with unzip Modified: csw/mgar/gar/v2-hg/gar.mk =================================================================== --- csw/mgar/gar/v2-hg/gar.mk 2016-09-14 07:28:20 UTC (rev 25937) +++ csw/mgar/gar/v2-hg/gar.mk 2016-09-14 08:53:52 UTC (rev 25938) @@ -385,7 +385,7 @@ MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) -makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) $(GARCHIVE_TARGETS) +makesum: fetch $(GARCHIVE_TARGETS) $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) @if test "x$(MAKESUM_TARGETS)" != "x"; then \ (cd $(DOWNLOADDIR) && $(md5sum) $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ echo "Checksums made for $(MAKESUM_TARGETS)" ; \ 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 Sep 14 11:03:58 2016 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 14 Sep 2016 09:03:58 +0000 Subject: SF.net SVN: gar:[25939] csw/mgar/pkg/memconf/trunk Message-ID: <3sYwb22fXDzrL@mail.opencsw.org> Revision: 25939 http://sourceforge.net/p/gar/code/25939 Author: bonivart Date: 2016-09-14 09:03:58 +0000 (Wed, 14 Sep 2016) Log Message: ----------- memconf/trunk: update to 3.11 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2016-09-14 08:53:52 UTC (rev 25938) +++ csw/mgar/pkg/memconf/trunk/Makefile 2016-09-14 09:03:58 UTC (rev 25939) @@ -2,7 +2,7 @@ # rm /home/src/memconf* NAME = memconf -VERSION = 3.08 +VERSION = 3.11 GARTYPE = v2 DESCRIPTION = Perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2016-09-14 08:53:52 UTC (rev 25938) +++ csw/mgar/pkg/memconf/trunk/checksums 2016-09-14 09:03:58 UTC (rev 25939) @@ -1,2 +1,2 @@ -084ea2315ae47acc75a3db2c88f89c8e memconf.gz -60f1708aa5d1f07c139453e57d6869d1 memconf.man +38bd5bfad2ffd4502babfb07163fb9d5 memconf.gz +a8197f9c03b7fcf4ac914c3b078dc2ce memconf.man 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 Sep 14 14:16:14 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 14 Sep 2016 12:16:14 +0000 Subject: SF.net SVN: gar:[25940] csw/mgar/pkg/mozldap/trunk Message-ID: <3sZ0rx4Zn4zwP@mail.opencsw.org> Revision: 25940 http://sourceforge.net/p/gar/code/25940 Author: cgrzemba Date: 2016-09-14 12:16:13 +0000 (Wed, 14 Sep 2016) Log Message: ----------- mozldap/trunk: update versions, use mercurial repository Modified Paths: -------------- csw/mgar/pkg/mozldap/trunk/Makefile csw/mgar/pkg/mozldap/trunk/checksums Modified: csw/mgar/pkg/mozldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/mozldap/trunk/Makefile 2016-09-14 09:03:58 UTC (rev 25939) +++ csw/mgar/pkg/mozldap/trunk/Makefile 2016-09-14 12:16:13 UTC (rev 25940) @@ -10,11 +10,11 @@ GARTYPE = v2 NSPR_NAME = nspr -NSPR_VERSION = 4.11 +NSPR_VERSION = 4.12 NSS_NAME = nss NSS_VERSION = 3.26 SVRCORE_NAME = svrcore -SVR_CORE_VERSION = 4.0.3 +SVR_CORE_VERSION = 4.0.4 DESCRIPTION = Mozilla LDAP C-SDK define BLURB @@ -29,11 +29,10 @@ # http://hg.mozilla.org/projects/ldap-sdks/archive/ # MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.7/src/ # GIT_REPOS += git://pkgs.fedoraproject.org/mozldap.git +# GIT_TREEISH_ldap-sdks = $(subst .,_,LDAPCSDK_$(VERSION)_RTM) HG_REPOS += http://hg.mozilla.org/projects/ldap-sdks -# HG_TREEISH_ldap-sdks = $(subst .,_,LDAPCSDK_$(VERSION)_RTM) -# GIT_TREEISH_ldap-sdks = $(subst .,_,LDAPCSDK_$(VERSION)_RTM) -# DISTNAME = $(NAME) -# DISTFILES = $(NAME)-$(VERSION).tar.gz +HG_TREEISH_ldap-sdks = $(subst .,_,LDAPCSDK_$(VERSION)_RTM) +DISTFILES += $(DISTNAME).tar.gz DISTFILES += COPYING BUILD_DEP_PKGS = CSWlibsvrcore0-dev Modified: csw/mgar/pkg/mozldap/trunk/checksums =================================================================== --- csw/mgar/pkg/mozldap/trunk/checksums 2016-09-14 09:03:58 UTC (rev 25939) +++ csw/mgar/pkg/mozldap/trunk/checksums 2016-09-14 12:16:13 UTC (rev 25940) @@ -0,0 +1 @@ +10e2d0d292a1797b656e68e72533a80e mozldap-6.0.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Sep 14 15:39:33 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 14 Sep 2016 13:39:33 +0000 Subject: SF.net SVN: gar:[25941] csw/mgar/gar/v2 Message-ID: <3sZ2jD6gplzyt@mail.opencsw.org> Revision: 25941 http://sourceforge.net/p/gar/code/25941 Author: cgrzemba Date: 2016-09-14 13:39:33 +0000 (Wed, 14 Sep 2016) Log Message: ----------- update IPS package transforms and pkglint Added Paths: ----------- csw/mgar/gar/v2/pkglint/ csw/mgar/gar/v2/pkglint/__init__.py csw/mgar/gar/v2/pkglint/opencsw.py csw/mgar/gar/v2/transforms/ csw/mgar/gar/v2/transforms/README csw/mgar/gar/v2/transforms/defaults csw/mgar/gar/v2/transforms/remove-os-version csw/mgar/gar/v2/transforms/remove-os-version.notactive csw/mgar/gar/v2/transforms/unneeded-deps Removed Paths: ------------- csw/mgar/gar/v2/pkglint/ csw/mgar/gar/v2/transforms/ Property Changed: ---------------- csw/mgar/gar/v2/ Index: csw/mgar/gar/v2 =================================================================== --- csw/mgar/gar/v2 2016-09-14 12:16:13 UTC (rev 25940) +++ csw/mgar/gar/v2 2016-09-14 13:39:33 UTC (rev 25941) Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo ## -8,6 +8,7 ## /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 +/csw/mgar/gar/v2-hg:25913-25940 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 \ No newline at end of property Added: csw/mgar/gar/v2/pkglint/__init__.py =================================================================== --- csw/mgar/gar/v2/pkglint/__init__.py (rev 0) +++ csw/mgar/gar/v2/pkglint/__init__.py 2016-09-14 13:39:33 UTC (rev 25941) @@ -0,0 +1,22 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Added: csw/mgar/gar/v2/pkglint/opencsw.py =================================================================== --- csw/mgar/gar/v2/pkglint/opencsw.py (rev 0) +++ csw/mgar/gar/v2/pkglint/opencsw.py 2016-09-14 13:39:33 UTC (rev 25941) @@ -0,0 +1,85 @@ +#!/usr/bin/python +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) Carsten Grzemba +# + +import pkg.lint.base as base +import subprocess as sp +import os +import re + +class OpenCSWActionChecker(base.ActionChecker): + """An OpenCSW-specific class to check actions.""" + + name = "opencsw.action" + + def __init__(self, config): + self.description = _( + "checks OpenCSW packages for common action errors") + super(OpenCSWActionChecker, self).__init__(config) + + def split_packages(self, manifest, engine, pkglint_id="001"): + """Warn if there shared libries in standard path + """ + split_packages.pkglint_desc = _("Package should split out subpackages for shared libraries") + +class OpenCSWManifestChecker(base.ManifestChecker): + """An opencsw.org-specific class to check manifests.""" + + name = "opencsw.manifest" + + def __init__(self, config): + self.description = _( + "checks OpenCSW packages for common errors") + super(OpenCSWManifestChecker, self).__init__(config) + + def recipe_uncommited(self, manifest, engine, pkglint_id="001"): + """Warn when a build recipe is not commited + """ + p = sp.Popen("cd ../../.. && svn st --ignore-externals", shell=True, stdout=sp.PIPE,stderr=sp.PIPE) + p.wait() + err = p.stderr.read() + if len(err) > 0: + engine.error( + _("SVN error for {pkg} recipe on path {path}\n{msg}").format(pkg=manifest.fmri, path=os.path.abspath(''), msg=err), + msgid="{0}{1}.1".format(self.name, pkglint_id)) + else: + if p.stdout.read(): + engine.warning( + _("Build recipe should commited for publish {pkg}").format(pkg=manifest.fmri), + msgid="{0}{1}.1".format(self.name, pkglint_id)) + recipe_uncommited.pkglint_desc = _("Build recipe should commited to sourceforge") + + + def packageprefixname_notset(self, manifest, engine, pkglint_id="002"): + """ set name=pkg.fmri value=diagnotic/nrpe at 2.15 + + """ + + fmri_name = manifest.fmri.get_name() + if fmri_name.find('/',1) < 0 or re.match("opencsw/.*", fmri_name): + engine.error(_("IPS_PACKAGE_PREFIX must set in build recipe and must end with a '/', missing prefix in {fmri}").format(fmri=manifest.fmri), + msgid="%s%s.2" % (self.name, pkglint_id)) + + packageprefixname_notset.pkglint_desc = _( "build recipe must set package name prefix for package FMRI" ) Added: csw/mgar/gar/v2/transforms/README =================================================================== --- csw/mgar/gar/v2/transforms/README (rev 0) +++ csw/mgar/gar/v2/transforms/README 2016-09-14 13:39:33 UTC (rev 25941) @@ -0,0 +1 @@ +see also at /usr/share/pkg/transform Added: csw/mgar/gar/v2/transforms/defaults =================================================================== --- csw/mgar/gar/v2/transforms/defaults (rev 0) +++ csw/mgar/gar/v2/transforms/defaults 2016-09-14 13:39:33 UTC (rev 25941) @@ -0,0 +1,26 @@ + default facet.doc.man true> + default facet.doc true> + add restart_fmri svc:/application/man-index:default> + drop> + drop> + drop> + drop> + drop> + drop> + drop> + drop> + drop> + add restart_fmri \ + svc:/application/pycompile> + emit depend fmri=pkg:/opencsw/cswpycomile type=require> + default restart_fmri svc:/system/manifest-import:default> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + default facet.devel all> + Added: csw/mgar/gar/v2/transforms/remove-os-version =================================================================== Copied: csw/mgar/gar/v2/transforms/remove-os-version.notactive (from rev 25940, csw/mgar/gar/v2/transforms/remove-os-version.notactive) =================================================================== --- csw/mgar/gar/v2/transforms/remove-os-version.notactive (rev 0) +++ csw/mgar/gar/v2/transforms/remove-os-version.notactive 2016-09-14 13:39:33 UTC (rev 25941) @@ -0,0 +1 @@ + edit fmri "(.*@[0-9\.]*)-.*" "\1"> Property changes on: csw/mgar/gar/v2/transforms/remove-os-version.notactive ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +1,18 ## +/csw/mgar/gar/v2/transforms/remove-os-version.notactive:4936-6678 +/csw/mgar/gar/v2-bwalton/transforms/remove-os-version.notactive:9784-10011 +/csw/mgar/gar/v2-checkpkg/transforms/remove-os-version.notactive:7722-7855 +/csw/mgar/gar/v2-checkpkg-override-relocation/transforms/remove-os-version.notactive:10585-10737 +/csw/mgar/gar/v2-checkpkg-stats/transforms/remove-os-version.notactive:8454-8649 +/csw/mgar/gar/v2-collapsed-modulations/transforms/remove-os-version.notactive:6895 +/csw/mgar/gar/v2-defaultchange/transforms/remove-os-version.notactive:13903-14022 +/csw/mgar/gar/v2-dirpackage/transforms/remove-os-version.notactive:8125-8180 +/csw/mgar/gar/v2-fortran/transforms/remove-os-version.notactive:10883-12516 +/csw/mgar/gar/v2-git/v2-relocate/transforms/remove-os-version.notactive:7617 +/csw/mgar/gar/v2-migrateconf/transforms/remove-os-version.notactive:7082-7211 +/csw/mgar/gar/v2-noexternals/transforms/remove-os-version.notactive:11592-11745 +/csw/mgar/gar/v2-raised-buildlevel/transforms/remove-os-version.notactive:15906-15949 +/csw/mgar/gar/v2-relocate/transforms/remove-os-version.notactive:5028-11738 +/csw/mgar/gar/v2-skayser/transforms/remove-os-version.notactive:6087-6132 +/csw/mgar/gar/v2-solaris11/transforms/remove-os-version.notactive:18134-18236 +/csw/mgar/gar/v2-sqlite/transforms/remove-os-version.notactive:10434-10449 +/csw/mgar/gar/v2-uwatch2/transforms/remove-os-version.notactive:12141-13270 \ No newline at end of property Added: csw/mgar/gar/v2/transforms/unneeded-deps =================================================================== --- csw/mgar/gar/v2/transforms/unneeded-deps (rev 0) +++ csw/mgar/gar/v2/transforms/unneeded-deps 2016-09-14 13:39:33 UTC (rev 25941) @@ -0,0 +1,4 @@ + drop > + drop > + edit fmri "@[^ \t\n\r\f\v]*" "" > + 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 Sep 16 15:38:48 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Sep 2016 13:38:48 +0000 Subject: SF.net SVN: gar:[25942] csw/mgar/pkg/jdk8/trunk Message-ID: <3sbGbN0ynDz1LG@mail.opencsw.org> Revision: 25942 http://sourceforge.net/p/gar/code/25942 Author: dmichelsen Date: 2016-09-16 13:38:48 +0000 (Fri, 16 Sep 2016) Log Message: ----------- jdk8/trunk: Update to 8u102 Modified Paths: -------------- csw/mgar/pkg/jdk8/trunk/Makefile csw/mgar/pkg/jdk8/trunk/checksums Modified: csw/mgar/pkg/jdk8/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk8/trunk/Makefile 2016-09-14 13:39:33 UTC (rev 25941) +++ csw/mgar/pkg/jdk8/trunk/Makefile 2016-09-16 13:38:48 UTC (rev 25942) @@ -1,6 +1,7 @@ NAME = jre8 -SPKG_VERSION = 1.8.0_92 -VERSION = 8u92 +RELEASE = 102 +SPKG_VERSION = 1.8.0_$(RELEASE) +VERSION = 8u$(RELEASE) GARTYPE = v2 DESCRIPTION = Java Development Kit 8 Modified: csw/mgar/pkg/jdk8/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk8/trunk/checksums 2016-09-14 13:39:33 UTC (rev 25941) +++ csw/mgar/pkg/jdk8/trunk/checksums 2016-09-16 13:38:48 UTC (rev 25942) @@ -1,2 +1,2 @@ -91c8f4f33aa754d692d017dc573fa5b0 jdk-8u92-solaris-sparcv9.tar.gz -d5d7111cf49556665485bb4c29e0d92a jdk-8u92-solaris-x64.tar.gz +f96282ad50d4d47ab35ffe2521f87ff9 jdk-8u102-solaris-sparcv9.tar.gz +d997b1515ffe8465639b444d02584303 jdk-8u102-solaris-x64.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 Mon Sep 19 06:40:08 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Sep 2016 04:40:08 +0000 Subject: SF.net SVN: gar:[25943] csw/mgar/pkg/mercurial/trunk Message-ID: <3sctVR0pD0zBg@mail.opencsw.org> Revision: 25943 http://sourceforge.net/p/gar/code/25943 Author: rthurner Date: 2016-09-19 04:40:07 +0000 (Mon, 19 Sep 2016) Log Message: ----------- mercurial/trunk: upgrade to hg-3.9.1. Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2016-09-16 13:38:48 UTC (rev 25942) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2016-09-19 04:40:07 UTC (rev 25943) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 3.8.2 +VERSION = 3.9.1 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2016-09-16 13:38:48 UTC (rev 25942) +++ csw/mgar/pkg/mercurial/trunk/checksums 2016-09-19 04:40:07 UTC (rev 25943) @@ -1 +1 @@ -c38daa0cbe264fc621dc3bb05933b0b3 mercurial-3.8.2.tar.gz +3759dd10edb8c1a6dfb8ff0ce82658ce mercurial-3.9.1.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 Mon Sep 19 06:46:52 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Sep 2016 04:46:52 +0000 Subject: SF.net SVN: gar:[25944] csw/mgar/pkg/cmake/trunk Message-ID: <3sctf35t8XzF1@mail.opencsw.org> Revision: 25944 http://sourceforge.net/p/gar/code/25944 Author: rthurner Date: 2016-09-19 04:46:52 +0000 (Mon, 19 Sep 2016) Log Message: ----------- cmake/trunk: update to cmake-3.6.2 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-09-19 04:40:07 UTC (rev 25943) +++ csw/mgar/pkg/cmake/trunk/Makefile 2016-09-19 04:46:52 UTC (rev 25944) @@ -1,7 +1,7 @@ # $Id$ NAME = cmake -VERSION = 3.5.0 +VERSION = 3.6.2 GARTYPE = v2 DESCRIPTION = Cross-platform make Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2016-09-19 04:40:07 UTC (rev 25943) +++ csw/mgar/pkg/cmake/trunk/checksums 2016-09-19 04:46:52 UTC (rev 25944) @@ -1 +1 @@ -33c5d09d4c33d4ffcc63578a6ba8777e cmake-3.5.0.tar.gz +139d7affdd4e8ab1edfc9f4322d69e43 cmake-3.6.2.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 Mon Sep 19 07:00:28 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Sep 2016 05:00:28 +0000 Subject: SF.net SVN: gar:[25945] csw/mgar/pkg/libserf/trunk Message-ID: <3sctxm5WWfzHL@mail.opencsw.org> Revision: 25945 http://sourceforge.net/p/gar/code/25945 Author: rthurner Date: 2016-09-19 05:00:27 +0000 (Mon, 19 Sep 2016) Log Message: ----------- libserf/trunk: upgrade to serf-1.3.9. Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2016-09-19 04:46:52 UTC (rev 25944) +++ csw/mgar/pkg/libserf/trunk/Makefile 2016-09-19 05:00:27 UTC (rev 25945) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 1.3.8 +VERSION = 1.3.9 DISTNAME = serf-$(VERSION) GARTYPE = v2 @@ -12,9 +12,7 @@ operation. endef -GOOGLE_PROJECT = serf -#MASTER_SITES = $(GOOGLE_MIRROR) -MASTER_SITES = http://serf.googlecode.com/svn/src_releases/ +MASTER_SITES = http://mirror.serversupportforum.de/apache/serf/ DISTFILES += $(DISTNAME).tar.bz2 PATCHFILES += 0001-mark-solaris-as-posix-for-scons.patch Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2016-09-19 04:46:52 UTC (rev 25944) +++ csw/mgar/pkg/libserf/trunk/checksums 2016-09-19 05:00:27 UTC (rev 25945) @@ -1 +1 @@ -2e4efe57ff28cb3202a112e90f0c2889 serf-1.3.8.tar.bz2 +370a6340ff20366ab088012cd13f2b57 serf-1.3.9.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Sep 19 07:31:53 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Sep 2016 05:31:53 +0000 Subject: SF.net SVN: gar:[25946] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: <3scvf14XBwzKn@mail.opencsw.org> Revision: 25946 http://sourceforge.net/p/gar/code/25946 Author: rthurner Date: 2016-09-19 05:31:52 +0000 (Mon, 19 Sep 2016) Log Message: ----------- libserf/trunk: upgrade to serf-1.3.9, now on apache instead google code. Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2016-09-19 05:00:27 UTC (rev 25945) +++ csw/mgar/pkg/libserf/trunk/Makefile 2016-09-19 05:31:52 UTC (rev 25946) @@ -14,10 +14,10 @@ MASTER_SITES = http://mirror.serversupportforum.de/apache/serf/ DISTFILES += $(DISTNAME).tar.bz2 -PATCHFILES += 0001-mark-solaris-as-posix-for-scons.patch +#PATCHFILES += 0001-mark-solaris-as-posix-for-scons.patch LICENSE = LICENSE -VENDOR_URL = http://code.google.com/p/serf/ +VENDOR_URL = https://serf.apache.org/ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = serf @@ -41,8 +41,6 @@ RUNTIME_DEP_PKGS_CSWlibserf1-1-5.9 += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibserf1-1-5.10 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibserf1-1 += $(RUNTIME_DEP_PKGS_CSWlibserf1-1-$(GAROSREL)) -# The name libserf1_3 was wrong due to false soname interpretation -OBSOLETED_BY_CSWlibserf1-1 += CSWlibserf1-3 # Linker anomaly CHECKPKG_OVERRIDES_CSWlibserf1-1 += surplus-dependency|CSWlibintl8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Sep 19 07:33:02 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Sep 2016 05:33:02 +0000 Subject: SF.net SVN: gar:[25947] csw/mgar/pkg/libserf/trunk/files/ Message-ID: <3scvgJ5KCCzN6@mail.opencsw.org> Revision: 25947 http://sourceforge.net/p/gar/code/25947 Author: rthurner Date: 2016-09-19 05:33:02 +0000 (Mon, 19 Sep 2016) Log Message: ----------- libserf/trunk: upgrade to serf-1.3.9, patch not needed any more. Removed Paths: ------------- csw/mgar/pkg/libserf/trunk/files/ 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 Sep 19 17:15:20 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Sep 2016 15:15:20 +0000 Subject: SF.net SVN: gar:[25948] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <3sd8bZ67DFzVS@mail.opencsw.org> Revision: 25948 http://sourceforge.net/p/gar/code/25948 Author: dmichelsen Date: 2016-09-19 15:15:20 +0000 (Mon, 19 Sep 2016) Log Message: ----------- subversion/trunk: Adjust Python location, update to libintl9 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2016-09-19 05:33:02 UTC (rev 25947) +++ csw/mgar/pkg/subversion/trunk/Makefile 2016-09-19 15:15:20 UTC (rev 25948) @@ -66,7 +66,8 @@ PACKAGES += CSWsubversion SPKG_DESC_CSWsubversion = Version control rethought RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWsubversion += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsubversion-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsubversion-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-subr1-0 @@ -80,6 +81,7 @@ RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-fs1-0 RUNTIME_DEP_PKGS_CSWsubversion-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWsubversion += $(RUNTIME_DEP_PKGS_CSWsubversion-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWsubversion += $(RUNTIME_DEP_PKGS_CSWsubversion-$(GAROSREL)-$(GARCH)) OBSOLETED_BY_CSWsubversion += CSWsvn @@ -115,7 +117,8 @@ PACKAGES += CSWlibsvn-auth-gnome-keyring1-0 SPKG_DESC_CSWlibsvn-auth-gnome-keyring1-0 = Subversion library libsvn_auth_gnome_keyring-1.so.0 PKGFILES_CSWlibsvn-auth-gnome-keyring1-0 += $(call pkgfiles_lib,libsvn_auth_gnome_keyring-1.so.0) -RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibgnome-keyring0 RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibsvn-subr1-0 @@ -129,32 +132,38 @@ SPKG_DESC_CSWlibsvn-client1-0 = Subversion library libsvn_client-1.so.0 PKGFILES_CSWlibsvn-client1-0 += $(call pkgfiles_lib,libsvn_client-1.so.0) RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-subr1-0 -RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-ra1-0 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-wc1-0 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-diff1-0 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-delta1-0 SPKG_DESC_CSWlibsvn-delta1-0 = Subversion library libsvn_delta-1.so.0 PKGFILES_CSWlibsvn-delta1-0 += $(call pkgfiles_lib,libsvn_delta-1.so.0) -RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibsvn-subr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-diff1-0 SPKG_DESC_CSWlibsvn-diff1-0 = Subversion library libsvn_diff-1.so.0 PKGFILES_CSWlibsvn-diff1-0 += $(call pkgfiles_lib,libsvn_diff-1.so.0) -RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibsvn-subr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-fs-base1-0 @@ -162,43 +171,51 @@ PKGFILES_CSWlibsvn-fs-base1-0 += $(call pkgfiles_lib,libsvn_fs_base-1.so.0) RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-subr1-0 -RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWbdb48 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-fs-util1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-fs-fs1-0 SPKG_DESC_CSWlibsvn-fs-fs1-0 = Subversion library libsvn_fs_fs-1.so.0 PKGFILES_CSWlibsvn-fs-fs1-0 += $(call pkgfiles_lib,libsvn_fs_fs-1.so.0) -RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-fs-util1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-subr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-fs-util1-0 SPKG_DESC_CSWlibsvn-fs-util1-0 = Subversion library libsvn_fs_util-1.so.0 PKGFILES_CSWlibsvn-fs-util1-0 += $(call pkgfiles_lib,libsvn_fs_util-1.so.0) -RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibsvn-subr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-fs-x1-0 SPKG_DESC_CSWlibsvn-fs-x1-0 = Subversion library libsvn_fs_x-1.so.0 PKGFILES_CSWlibsvn-fs-x1-0 += $(call pkgfiles_lib,libsvn_fs_x-1.so.0) -RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-fs-util1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-subr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-fs1-0 @@ -206,7 +223,8 @@ PKGFILES_CSWlibsvn-fs1-0 += $(call pkgfiles_lib,libsvn_fs-1.so.0) RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-subr1-0 -RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-x1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-base1-0 @@ -214,18 +232,21 @@ RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-util1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-fs1-0 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-ra-local1-0 SPKG_DESC_CSWlibsvn-ra-local1-0 = Subversion library libsvn_ra_local-1.so.0 PKGFILES_CSWlibsvn-ra-local1-0 += $(call pkgfiles_lib,libsvn_ra_local-1.so.0) RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-subr1-0 -RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-repos1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-fs1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-ra-serf1-0 @@ -234,11 +255,13 @@ RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibserf1-1 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibsvn-subr1-0 -RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-ra-svn1-0 @@ -246,11 +269,13 @@ PKGFILES_CSWlibsvn-ra-svn1-0 += $(call pkgfiles_lib,libsvn_ra_svn-1.so.0) RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsvn-subr1-0 -RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-ra1-0 @@ -259,23 +284,27 @@ RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-local1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-subr1-0 -RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-svn1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-serf1-0 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-repos1-0 SPKG_DESC_CSWlibsvn-repos1-0 = Subversion library libsvn_repos-1.so.0 PKGFILES_CSWlibsvn-repos1-0 += $(call pkgfiles_lib,libsvn_repos-1.so.0) -RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-fs1-0 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-subr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWlibsvn-subr1-0 @@ -285,20 +314,24 @@ RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0-$(GAROSREL)) PACKAGES += CSWlibsvn-wc1-0 SPKG_DESC_CSWlibsvn-wc1-0 = Subversion library libsvn_wc-1.so.0 PKGFILES_CSWlibsvn-wc1-0 += $(call pkgfiles_lib,libsvn_wc-1.so.0) RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-subr1-0 -RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-diff1-0 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-$(GAROSREL)-$(GARCH)) PACKAGES += CSWap2-subversion @@ -313,7 +346,7 @@ RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-subr1-0 RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibintl9 RUNTIME_DEP_PKGS_CSWap2-subversion += $(RUNTIME_DEP_PKGS_CSWap2-subversion-$(GAROSREL)-$(GARCH)) OBSOLETED_BY_CSWap2-subversion += CSWap2svn @@ -329,7 +362,8 @@ PKGFILES_CSWjavasvn += $(libdir)/svn-javahl/include.* PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWjavasvn-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWjavasvn-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-subr1-0 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-ra1-0 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-repos1-0 @@ -339,6 +373,7 @@ RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-fs1-0 RUNTIME_DEP_PKGS_CSWjavasvn-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GARCH)) # This would go away when -norunpath would make it to the linker, but at this point this is difficult. @@ -368,7 +403,7 @@ RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-fs1-0 RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibmagic1 RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibintl9 RUNTIME_DEP_PKGS_CSWpm-subversion += $(RUNTIME_DEP_PKGS_CSWpm-subversion-$(GAROSREL)-$(GARCH)) OBSOLETED_BY_CSWpm-subversion += CSWpmsvn @@ -382,7 +417,8 @@ PKGFILES_CSWrb-subversion += $(libdir)/ruby.* PKGFILES_CSWrb-subversion += $(docdir)/$(CATALOGNAME_CSWrb-subversion)/changelog.CSW RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWrb-subversion-5.9 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWrb-subversion-5.10 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-subr1-0 RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-ra1-0 RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-repos1-0 @@ -419,7 +455,7 @@ RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-fs1-0 RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibintl9 RUNTIME_DEP_PKGS_CSWpy-subversion += CSWpython RUNTIME_DEP_PKGS_CSWpy-subversion += $(RUNTIME_DEP_PKGS_CSWpy-subversion-$(GAROSREL)-$(GARCH)) CHECKPKG_OVERRIDES_CSWpy-subversion += surplus-dependency|CSWpython @@ -429,14 +465,14 @@ OBSOLETED_BY_CSWpy-subversion = CSWpythonsvn # This is for /usr/share/lib/zoneinfo -CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_delta.so -CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_ra.so -CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_fs.so -CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_diff.so -CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_client.so -CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_core.so -CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_wc.so -CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_repos.so +CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_delta.so +CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_ra.so +CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_fs.so +CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_diff.so +CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_client.so +CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_core.so +CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_wc.so +CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_repos.so CHECKPKG_OVERRIDES_CSWpy-subversion += $(CHECKPKG_OVERRIDES_CSWpy-subversion-$(GAROSREL)) # should be in lib ... put something below to at least make it compile. @@ -619,8 +655,8 @@ -e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=v8 +-mt(.*)!$$1 -mcpu=v8 $$2!;' \ -e 's,/opt/solarisstudio12.3/bin/cc,/opt/csw/bin/gcc-5.2,g;' \ -e 's,(SWIG_PY_LINK = .*) -march=pentiumpro (.*),$$1 $$2,;' \ - -e 's,(^swig_pydir =) .*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/subversion/libsvn,;' \ - -e 's,(^swig_pydir_extra =).*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/subversion/svn,;' \ + -e 's,(^swig_pydir =) .*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/libsvn,;' \ + -e 's,(^swig_pydir_extra =).*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/svn,;' \ Makefile /usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-py /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR) 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 Sep 20 09:46:53 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Sep 2016 07:46:53 +0000 Subject: SF.net SVN: gar:[25949] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <3sdZbR3gYnzgb@mail.opencsw.org> Revision: 25949 http://sourceforge.net/p/gar/code/25949 Author: dmichelsen Date: 2016-09-20 07:46:53 +0000 (Tue, 20 Sep 2016) Log Message: ----------- subversion/trunk: Add one more dependency Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2016-09-19 15:15:20 UTC (rev 25948) +++ csw/mgar/pkg/subversion/trunk/Makefile 2016-09-20 07:46:53 UTC (rev 25949) @@ -81,6 +81,7 @@ RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-delta1-0 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-fs1-0 RUNTIME_DEP_PKGS_CSWsubversion-5.10-sparc += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWsubversion-5.10-sparc += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsubversion += $(RUNTIME_DEP_PKGS_CSWsubversion-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWsubversion += $(RUNTIME_DEP_PKGS_CSWsubversion-$(GAROSREL)-$(GARCH)) 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 Sep 21 14:04:15 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Sep 2016 12:04:15 +0000 Subject: SF.net SVN: gar:[25950] csw/mgar/pkg/sudo/trunk Message-ID: <3sfJFy2sVGzyV@mail.opencsw.org> Revision: 25950 http://sourceforge.net/p/gar/code/25950 Author: dmichelsen Date: 2016-09-21 12:04:14 +0000 (Wed, 21 Sep 2016) Log Message: ----------- sudo/trunk: Update to 1.8.18 and new gettext Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2016-09-20 07:46:53 UTC (rev 25949) +++ csw/mgar/pkg/sudo/trunk/Makefile 2016-09-21 12:04:14 UTC (rev 25950) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.17p1 +VERSION = 1.8.18 GARTYPE = v2 EXTRA_MODULATORS = LDAP @@ -37,8 +37,9 @@ PACKAGES += CSWsudo SPKG_DESC_CSWsudo = Provides limited super user privileges # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsudo-5.9 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsudo += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsudo += $(RUNTIME_DEP_PKGS_CSWsudo-$(GAROSREL)) #OBSOLETED_BY_CSWsudo = CSWsudo-common # These are just docs @@ -56,10 +57,11 @@ PKGFILES_CSWsudo-ldap += $(libexecdir)/sudo/sudoers-ldap.so PKGFILES_CSWsudo-ldap += $(LDAP_DOCFILES) PKGFILES_CSWsudo-ldap += $(LDAP_MANFILES) -RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsudo-ldap-5.9 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsudo-ldap += $(RUNTIME_DEP_PKGS_CSWsudo-ldap-$(GAROSREL)) # This logical dependency can not be tracked via checkpkg RUNTIME_DEP_PKGS_CSWsudo-ldap += CSWsudo #OBSOLETED_BY_CSWsudo-ldap += CSWsudoldap Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2016-09-20 07:46:53 UTC (rev 25949) +++ csw/mgar/pkg/sudo/trunk/checksums 2016-09-21 12:04:14 UTC (rev 25950) @@ -1 +1 @@ -50a840a688ceb6fa3ab24fc0adf4fa23 sudo-1.8.17p1.tar.gz +c1201904fd9144ea5e7cd9496fcbbc64 sudo-1.8.18.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 Sep 21 14:40:46 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Sep 2016 12:40:46 +0000 Subject: SF.net SVN: gar:[25951] csw/mgar/pkg/jdk8/trunk/Makefile Message-ID: <3sfK3y255fz11r@mail.opencsw.org> Revision: 25951 http://sourceforge.net/p/gar/code/25951 Author: dmichelsen Date: 2016-09-21 12:40:46 +0000 (Wed, 21 Sep 2016) Log Message: ----------- jdk8/trunk: Fix invocation of 64 bit java Modified Paths: -------------- csw/mgar/pkg/jdk8/trunk/Makefile Modified: csw/mgar/pkg/jdk8/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk8/trunk/Makefile 2016-09-21 12:04:14 UTC (rev 25950) +++ csw/mgar/pkg/jdk8/trunk/Makefile 2016-09-21 12:40:46 UTC (rev 25951) @@ -120,4 +120,16 @@ gln -sf ../$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre8 gln -sf jre8 $(DESTDIR)$(prefix)/java/jre/latest gln -sf jdk/latest/man $(DESTDIR)$(prefix)/java/man + @# This is a funky fix for the explicit invocation of Java as 64 bit binary: + @# Starting with Java 8 there is only a 64 bit version in bin/ and the files in bin/sparcv9/ are actually + @# symlinks to binaries in bin/. When + @# /opt/csw/java/jdk1.8.0_102/jre/bin/sparcv9/java + @# is invoked it looks for libjli.so in a relative location to the binary path which is + @# /opt/csw/java/jdk1.8.0_102/jre/bin/sparcv9/../lib/sparcv9/jli/libjli.so + @# This can be solved by replacing the sparcv9 directory with a symlink sparcv9 -> . + @# as all binaries and libs are now 64 bit anyway. + rm -rf $(DESTDIR)$(prefix)/java/$(DISTNAME)/bin/$(ISA_DEFAULT64) + ln -s . $(DESTDIR)$(prefix)/java/$(DISTNAME)/bin/$(ISA_DEFAULT64) + rm -rf $(DESTDIR)$(prefix)/java/$(DISTNAME)/jre/bin/$(ISA_DEFAULT64) + ln -s . $(DESTDIR)$(prefix)/java/$(DISTNAME)/jre/bin/$(ISA_DEFAULT64) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Sep 22 11:57:28 2016 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 22 Sep 2016 09:57:28 +0000 Subject: SF.net SVN: gar:[25952] csw/mgar/pkg/zsh/trunk/files/_mgar Message-ID: <3sfsP51Tvxz18f@mail.opencsw.org> Revision: 25952 http://sourceforge.net/p/gar/code/25952 Author: opk Date: 2016-09-22 09:57:27 +0000 (Thu, 22 Sep 2016) Log Message: ----------- zsh: update mgar completion Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/files/_mgar Modified: csw/mgar/pkg/zsh/trunk/files/_mgar =================================================================== --- csw/mgar/pkg/zsh/trunk/files/_mgar 2016-09-21 12:40:46 UTC (rev 25951) +++ csw/mgar/pkg/zsh/trunk/files/_mgar 2016-09-22 09:57:27 UTC (rev 25952) @@ -2,7 +2,7 @@ local curcontext="$curcontext" ret=1 local subcmd -local -a cmds +local -a cmds expl if (( CURRENT == 2 )); then cmds=( @@ -10,10 +10,11 @@ install:install\ files\ to\ staging\ directory makepatch:create\ a\ patch\ for\ outstanding\ changes check-prereqs checksum test patch - ${${(M)${(f)"$(_call_program commands ${words[1]} help)"}:# *}// (#b)([a-z-]##)[^A-Z]##(?)/$match[1]:${match[2]:l}} + ${${(M)${(f)"$(_call_program commands ${words[1]} help)"}:# *}/ (#b)([a-z-]##)[^A-U]##(?)/$match[1]:${match[2]:l}} ) _describe 'mgar command' cmds && ret=0 + [[ -prefix - ]] && _wanted options expl option compadd - -V && ret=0 else shift words (( CURRENT-- )) @@ -33,6 +34,9 @@ up) _arguments '--all' && ret=0 ;; + newpkg) + _arguments '1:new package name' '2:version number' && ret=0 + ;; *) _default && ret=0 ;; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Sep 22 14:00:54 2016 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 22 Sep 2016 12:00:54 +0000 Subject: SF.net SVN: gar:[25953] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: <3sfw7Z5CrYz1Cg@mail.opencsw.org> Revision: 25953 http://sourceforge.net/p/gar/code/25953 Author: wilbury Date: 2016-09-22 12:00:54 +0000 (Thu, 22 Sep 2016) Log Message: ----------- irssi/trunk: Upgrade to 0.8.22 Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2016-09-22 09:57:27 UTC (rev 25952) +++ csw/mgar/pkg/irssi/trunk/Makefile 2016-09-22 12:00:54 UTC (rev 25953) @@ -1,5 +1,7 @@ +# $Id$ + NAME = irssi -VERSION = 0.8.17 +VERSION = 0.8.22 GARTYPE = v2 DESCRIPTION = IRC client with IPv6, proxy, bot, socks and Perl support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Sep 22 14:02:41 2016 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 22 Sep 2016 12:02:41 +0000 Subject: SF.net SVN: gar:[25954] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: <3sfw9h1fV0z1G0@mail.opencsw.org> Revision: 25954 http://sourceforge.net/p/gar/code/25954 Author: wilbury Date: 2016-09-22 12:02:40 +0000 (Thu, 22 Sep 2016) Log Message: ----------- irssi/trunk: It is actually 0.8.20 and fix download link. Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2016-09-22 12:00:54 UTC (rev 25953) +++ csw/mgar/pkg/irssi/trunk/Makefile 2016-09-22 12:02:40 UTC (rev 25954) @@ -1,7 +1,7 @@ # $Id$ NAME = irssi -VERSION = 0.8.22 +VERSION = 0.8.20 GARTYPE = v2 DESCRIPTION = IRC client with IPv6, proxy, bot, socks and Perl support @@ -14,7 +14,7 @@ endef VENDOR_URL = http://www.irssi.org/ -MASTER_SITES = http://www.irssi.org/files/ +MASTER_SITES = https://github.com/irssi/irssi/releases/download/$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Sep 22 14:06:45 2016 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 22 Sep 2016 12:06:45 +0000 Subject: SF.net SVN: gar:[25955] csw/mgar/pkg/irssi/trunk/checksums Message-ID: <3sfwGL1XsSz1JK@mail.opencsw.org> Revision: 25955 http://sourceforge.net/p/gar/code/25955 Author: wilbury Date: 2016-09-22 12:06:44 +0000 (Thu, 22 Sep 2016) Log Message: ----------- irssi/trunk: Fix checksums Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/checksums Modified: csw/mgar/pkg/irssi/trunk/checksums =================================================================== --- csw/mgar/pkg/irssi/trunk/checksums 2016-09-22 12:02:40 UTC (rev 25954) +++ csw/mgar/pkg/irssi/trunk/checksums 2016-09-22 12:06:44 UTC (rev 25955) @@ -1 +1 @@ -00cde2ba7ba37af9e3df451f430ecdea irssi-0.8.17.tar.gz +2b00a0492f52571772d030d1af3a043a irssi-0.8.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Sep 22 14:58:40 2016 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 22 Sep 2016 12:58:40 +0000 Subject: SF.net SVN: gar:[25956] csw/mgar/pkg Message-ID: <3sfxQL0nVWz1Ln@mail.opencsw.org> Revision: 25956 http://sourceforge.net/p/gar/code/25956 Author: opk Date: 2016-09-22 12:58:40 +0000 (Thu, 22 Sep 2016) Log Message: ----------- the_silver_searcher/trunk: new package Added Paths: ----------- csw/mgar/pkg/the_silver_searcher/ csw/mgar/pkg/the_silver_searcher/Makefile csw/mgar/pkg/the_silver_searcher/branches/ csw/mgar/pkg/the_silver_searcher/tags/ csw/mgar/pkg/the_silver_searcher/trunk/ csw/mgar/pkg/the_silver_searcher/trunk/Makefile csw/mgar/pkg/the_silver_searcher/trunk/checksums csw/mgar/pkg/the_silver_searcher/trunk/files/ csw/mgar/pkg/the_silver_searcher/trunk/files/_the_silver_searcher Added: csw/mgar/pkg/the_silver_searcher/Makefile =================================================================== --- csw/mgar/pkg/the_silver_searcher/Makefile (rev 0) +++ csw/mgar/pkg/the_silver_searcher/Makefile 2016-09-22 12:58:40 UTC (rev 25956) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/the_silver_searcher/trunk =================================================================== --- csw/mgar/pkg/the_silver_searcher/trunk 2016-09-22 12:06:44 UTC (rev 25955) +++ csw/mgar/pkg/the_silver_searcher/trunk 2016-09-22 12:58:40 UTC (rev 25956) Property changes on: csw/mgar/pkg/the_silver_searcher/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/the_silver_searcher/trunk/Makefile =================================================================== --- csw/mgar/pkg/the_silver_searcher/trunk/Makefile (rev 0) +++ csw/mgar/pkg/the_silver_searcher/trunk/Makefile 2016-09-22 12:58:40 UTC (rev 25956) @@ -0,0 +1,36 @@ +# $Id$ + +NAME = the_silver_searcher +VERSION = 0.32.0 +GARTYPE = v2 + +DESCRIPTION = The Silver Searcher is a code searching tool similar to ack +define BLURB + The Silver Searcher is a tool for searching code. It started off as a + clone of Ack, but their feature sets have since diverged slightly. In + typical usage, Ag is 5-10x faster than Ack. +endef + +MASTER_SITES = http://geoff.greer.fm/ag/releases/ +SPKG_SOURCEURL = http://geoff.greer.fm/ag/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += _the_silver_searcher +LICENSE = LICENSE + +RUNTIME_DEP_PKGS = CSWlibpcre1 CSWliblzma5 CSWlibz1 +BUILD_DEP_PKGS = CSWlibpcre-dev CSWliblzma-dev CSWlibz-dev + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +post-extract: + gsed -i -e 's/ -Wall[^"]*//' $(WORKSRC)/configure + @$(MAKECOOKIE) + +post-install: + rm $(DESTDIR)$(sharedstatedir)/the_silver_searcher/completions/ag.bashcomp.sh + mkdir -p $(DESTDIR)$(sharedstatedir)/zsh/functions $(DESTDIR)$(sharedstatedir)/bash-completion/completions + cp -p $(WORKDIR)/_the_silver_searcher $(DESTDIR)$(sharedstatedir)/zsh/functions + cp -p $(WORKSRC)/ag.bashcomp.sh $(DESTDIR)$(sharedstatedir)/bash-completion/completions/ag + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/the_silver_searcher/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/the_silver_searcher/trunk/checksums =================================================================== --- csw/mgar/pkg/the_silver_searcher/trunk/checksums (rev 0) +++ csw/mgar/pkg/the_silver_searcher/trunk/checksums 2016-09-22 12:58:40 UTC (rev 25956) @@ -0,0 +1 @@ +3fdfd5836924246073d5344257a06823 the_silver_searcher-0.32.0.tar.gz Added: csw/mgar/pkg/the_silver_searcher/trunk/files/_the_silver_searcher =================================================================== --- csw/mgar/pkg/the_silver_searcher/trunk/files/_the_silver_searcher (rev 0) +++ csw/mgar/pkg/the_silver_searcher/trunk/files/_the_silver_searcher 2016-09-22 12:58:40 UTC (rev 25956) @@ -0,0 +1,86 @@ +#compdef ag + +# Completion function for zsh + +local ret=1 +local -a args expl + +# Intentionally avoided many possible mutual exlusions because it is +# likely that earlier options come from an alias. In line with this +# the following conditionally adds options that assert defaults. +[[ -n $words[(r)(-[is]|--ignore-case|--case-sensitive)] ]] && args+=( + '(-S --smart-case -s -s --ignore-case --case-sensitive)'{-S,--smart-case}'[insensitive match unless pattern includes uppercase]' +) +[[ -n $words[(r)--nobreak] ]] && args+=( + "(--nobreak)--break[print newlines between matches in different files]" +) +[[ -n $words[(r)--nogroup] ]] && args+=( + "(--nogroup)--group[don't repeat filename for each match line]" +) + +_tags normal-options file-types +while _tags; do + _requested normal-options && _arguments -S -s $args \ + '--ackmate[print results in AckMate-parseable format]' \ + '(--after -A)'{--after=-,-A+}'[specify lines of trailing context]::lines [2]' \ + '(--before -B)'{--before=-,-B+}'[specify lines of leading context]::lines [2]' \ + "--nobreak[don't print newlines between matches in different files]" \ + '(--count -c)'{--count,-c}'[only print a count of matching lines]' \ + '--color[enable color highlighting of output]' \ + '(--color-line-number --color-match --color-path)--nocolor[disable color highlighting of output]' \ + '--color-line-number=[specify color for line numbers]:color [1;33]' \ + '--color-match=[specify color for result match numbers]:color [30;43]' \ + '--color-path=[specify color for path names]:color [1;32]' \ + '--column[print column numbers in results]' \ + '(--context -C)'{--context=-,-C+}'[specify lines of context]::lines' \ + '(--debug -D)'{--debug,-D}'[output debug information]' \ + '--depth=[specify directory levels to descend when searching]:levels [25]' \ + '(--noheading)--nofilename[suppress printing of filenames]' \ + '(-f --follow)'{-f,--follow}'[follow symlinks]' \ + '(-F --fixed-strings --literal -Q)'{--fixed-strings,-F,--literal,-Q}'[use literal strings]' \ + '--nogroup[repeat filename for each match line]' \ + '(1 -G --file-search-regex)-g+[print filenames matching a pattern]:regex' \ + '(-G --file-search-regex)'{-G+,--file-search-regex=}'[limit search to filenames matching pattern]:regex' \ + '(-H --heading --noheading)'{-H,--heading}'[print filename with each match]' \ + '(-H --heading --noheading --nofilename)--noheading[suppress printing of filenames]' \ + '--hidden[search hidden files (obeying .*ignore files)]' \ + {--ignore=,--ignore-dir=}'[ignore files/directories matching pattern]:regex' \ + '(-i --ignore-case)'{-i,--ignore-case}'[match case-insensitively]' \ + '(-l --files-with-matches)'{-l,--files-with-matches}"[output matching files' names only]" \ + '(-L --files-without-matches)'{-L,--files-without-matches}"[output non-matching files' names only]" \ + '(--max-count -m)'{--max-count=,-m+}'[stop after specified no of matches in each file]:max number of matches' \ + '--numbers[prefix output with line numbers, even for streams]' \ + '--nonumbers[suppress printing of line numbers]' \ + '(--only-matching -o)'{--only-matching,-o}'[show only matching part of line]' \ + '(-p --path-to-agignore)'{-p+,--path-to-agignore=}'[use specified .agignore file]:file:_files' \ + '--print-long-lines[print matches on very long lines]' \ + "--passthrough[when searching a stream, print all lines even if they don't match]" \ + '(-s --case-sensitive)'{-s,--case-sensitive}'[match case]' \ + '--silent[suppress all log messages, including errors]' \ + '(--stats-only)--stats[print stats (files scanned, time taken, etc.)]' \ + '(--stats)--stats-only[print stats and nothing else]' \ + '(-U --skip-vcs-ignores)'{-U,--skip-vcs-ignores}'[ignore VCS files (stil obey .agignore)]' \ + '(-v --invert-match)'{-v,--invert-match}'[select non-matching lines]' \ + '--vimgrep[output results like vim :vimgrep /pattern/g would]' \ + '(-w --word-regexp)'{-w,--word-regexp}'[force pattern to match only whole words]' \ + '(-z --search-zip)'{-z,--search-zip}'[search contents of compressed files]' \ + '(-0 --null)'{-0,--null}'[separate filenames with null]' \ + ': :_guard "^-*" pattern' \ + '*:file:_files' \ + '(- :)--list-file-types[list supported file types]' \ + '(- :)'{-h,--help}'[display help information]' \ + '(- :)'{-V,--version}'[display version information]' \ + - '(ignores)' \ + '(-a --all-types)'{-a,--all-types}'[search all files]' \ + '--search-binary[search binary files for matches]' \ + {-t,--all-text}'[search all text files (not including hidden files)]' \ + {-u,--unrestricted}'[search all files]' && ret=0 + + _requested file-types && { ! zstyle -T ":completion:${curcontext}:options" prefix-needed || + [[ -prefix - ]] } && _all_labels file-types expl 'file type' \ + compadd - ${(M)$(_call_program file-types $words[1] --list-file-types):#--*} && ret=0 + + (( ret )) || break +done + +return ret 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 Sep 23 08:21:34 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 23 Sep 2016 06:21:34 +0000 Subject: SF.net SVN: gar:[25957] csw/mgar/pkg/lang-python Message-ID: <3sgNYb2rKhz1Vv@mail.opencsw.org> Revision: 25957 http://sourceforge.net/p/gar/code/25957 Author: cgrzemba Date: 2016-09-23 06:21:33 +0000 (Fri, 23 Sep 2016) Log Message: ----------- lang-python/uwsgi/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/uwsgi/ csw/mgar/pkg/lang-python/uwsgi/Makefile csw/mgar/pkg/lang-python/uwsgi/branches/ csw/mgar/pkg/lang-python/uwsgi/tags/ csw/mgar/pkg/lang-python/uwsgi/trunk/ csw/mgar/pkg/lang-python/uwsgi/trunk/Makefile csw/mgar/pkg/lang-python/uwsgi/trunk/checksums csw/mgar/pkg/lang-python/uwsgi/trunk/files/ csw/mgar/pkg/lang-python/uwsgi/trunk/files/0001-csw.profile Added: csw/mgar/pkg/lang-python/uwsgi/Makefile =================================================================== --- csw/mgar/pkg/lang-python/uwsgi/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/uwsgi/Makefile 2016-09-23 06:21:33 UTC (rev 25957) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/lang-python/uwsgi/trunk =================================================================== --- csw/mgar/pkg/lang-python/uwsgi/trunk 2016-09-22 12:58:40 UTC (rev 25956) +++ csw/mgar/pkg/lang-python/uwsgi/trunk 2016-09-23 06:21:33 UTC (rev 25957) Property changes on: csw/mgar/pkg/lang-python/uwsgi/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/lang-python/uwsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/uwsgi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/uwsgi/trunk/Makefile 2016-09-23 06:21:33 UTC (rev 25957) @@ -0,0 +1,55 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = uwsgi +VERSION = 2.0.13.1 +GARTYPE = v2 + +DESCRIPTION = The uWSGI project aims at developing a full stack for building hosting services +define BLURB + Application servers (for various programming languages and protocols), proxies, process managers and monitors are all implemented using a common api and a common configuration style. + Thanks to its pluggable architecture it can be extended to support more platforms and languages. + Currently, you can write plugins in C, C++ and Objective-C. +endef + +MASTER_SITES = http://projects.unbit.it/downloads/ + +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = GNU + +PATCHFILES += 0001-csw.profile + +RUNTIME_DEP_PKGS_CSWuwsgi += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWuwsgi += CSWlibz1 +RUNTIME_DEP_PKGS_CSWuwsgi += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWuwsgi += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWuwsgi += CSWlibjansson4 +RUNTIME_DEP_PKGS_CSWuwsgi += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWuwsgi += CSWlibpcre1 + +CONFIGURE_SCRIPTS = +# BUILD_SCRIPTS = uwsgi +INSTALL_SCRIPTS = + +EXTRA_BUILD_ENV += UWSGI_BIN_NAME="$(DESTDIR)$(bindir)/uwsgi" +EXTRA_BUILD_ENV += UWSGI_PLUGIN_DIR="$(DESTDIR)$(libdir)/uwsgi" +# BUILD_ARGS = plugin.python default +BUILD_ARGS = default + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +configure-uwsgi: + @$(MAKECOOKIE) + +pre-build-modulated: + ginstall -d $(DESTDIR)/opt/csw/bin + ginstall -d $(DESTDIR)/opt/csw/lib/uwsgi + +build-uwsgi: + ginstall -d $(DESTDIR)/opt/csw/bin + env + (cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) MAKEFLAGS= UWSGI_PROFILE="default" UWSGI_BIN_NAME="$(DESTDIR)$(bindir)/uwsgi" $(MAKE)) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/lang-python/uwsgi/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/lang-python/uwsgi/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/uwsgi/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/uwsgi/trunk/checksums 2016-09-23 06:21:33 UTC (rev 25957) @@ -0,0 +1 @@ +e9ec5b2b296ce21b3787e0579d02bade uwsgi-2.0.13.1.tar.gz Added: csw/mgar/pkg/lang-python/uwsgi/trunk/files/0001-csw.profile =================================================================== --- csw/mgar/pkg/lang-python/uwsgi/trunk/files/0001-csw.profile (rev 0) +++ csw/mgar/pkg/lang-python/uwsgi/trunk/files/0001-csw.profile 2016-09-23 06:21:33 UTC (rev 25957) @@ -0,0 +1,14 @@ +--- a/buildconf/base.ini ++++ b/buildconf/base.ini +@@ -10,9 +10,9 @@ unbit = false + malloc_implementation = libc + extras = + plugins = +-bin_name = uwsgi ++bin_name = ${UWSGI_BIN_NAME} + append_version = +-plugin_dir = . ++plugin_dir = ${UWSGI_PLUGIN_DIR} + embedded_plugins = %(main_plugin)s, ping, cache, nagios, rrdtool, carbon, rpc, corerouter, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter, router_static, sslrouter, spooler, cheaper_busyness, symcall, transformation_tofile, transformation_gzip, transformation_chunked, transformation_offload, router_memcached, router_redis, router_hash, router_expires, router_metrics, transformation_template, stats_pusher_socket + as_shared_library = false + 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 Sep 28 13:53:34 2016 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 28 Sep 2016 11:53:34 +0000 Subject: SF.net SVN: gar:[25958] csw/mgar/pkg/cpan/JSON/trunk Message-ID: <3skbhQ3J40znL@mail.opencsw.org> Revision: 25958 http://sourceforge.net/p/gar/code/25958 Author: bonivart Date: 2016-09-28 11:53:33 +0000 (Wed, 28 Sep 2016) Log Message: ----------- cpan/JSON/trunk: update to 2.90 Modified Paths: -------------- csw/mgar/pkg/cpan/JSON/trunk/Makefile csw/mgar/pkg/cpan/JSON/trunk/checksums Modified: csw/mgar/pkg/cpan/JSON/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/JSON/trunk/Makefile 2016-09-23 06:21:33 UTC (rev 25957) +++ csw/mgar/pkg/cpan/JSON/trunk/Makefile 2016-09-28 11:53:33 UTC (rev 25958) @@ -1,5 +1,5 @@ NAME = JSON -VERSION = 2.50 +VERSION = 2.90 CATEGORIES = cpan GARTYPE = v2 AUTHOR = MAKAMAKA @@ -15,7 +15,5 @@ CATALOGNAME = pm_json SPKG_DESC_CSWpm-json = $(DESCRIPTION) ARCHALL = 1 -OBSOLETED_BY_CSWpm-json = CSWpmjson -CATALOGNAME_CSWpmjson = pm_json_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/JSON/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/JSON/trunk/checksums 2016-09-23 06:21:33 UTC (rev 25957) +++ csw/mgar/pkg/cpan/JSON/trunk/checksums 2016-09-28 11:53:33 UTC (rev 25958) @@ -1 +1 @@ -7aa1f17255ec8b074a1e8b18df23d6fb JSON-2.50.tar.gz +e1512169a623e790a3f69b599cc1d3b9 JSON-2.90.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Sep 29 17:08:24 2016 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 29 Sep 2016 15:08:24 +0000 Subject: SF.net SVN: gar:[25959] csw/mgar/pkg/bind/trunk Message-ID: <3slHyr18vjz11s@mail.opencsw.org> Revision: 25959 http://sourceforge.net/p/gar/code/25959 Author: bonivart Date: 2016-09-29 15:08:24 +0000 (Thu, 29 Sep 2016) Log Message: ----------- bind/trunk: update to 9.10.4-P3 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-09-28 11:53:33 UTC (rev 25958) +++ csw/mgar/pkg/bind/trunk/Makefile 2016-09-29 15:08:24 UTC (rev 25959) @@ -6,24 +6,35 @@ VERSION = 9.10.4 GARTYPE = v2 -# Enable these for Px-releases -#RELEASE = P4 -#DISTVERSION = $(VERSION)-$(RELEASE) +# Enable these for beta releases +#RELEASE = b1 +#DISTVERSION = $(VERSION)$(RELEASE) #SPKG_VERSION = $(VERSION)$(RELEASE) -#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)$(RELEASE) #WORKSRC = $(WORKDIR)/$(DISTNAME) +# Enable these for Px-releases +RELEASE = P3 +DISTVERSION = $(VERSION)-$(RELEASE) +SPKG_VERSION = $(VERSION)$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) + DESCRIPTION = ISC BIND DNS reference implementation define BLURB endef -# Enable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +# Enable these for beta releases +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)$(RELEASE)/ #DISTFILES = $(DISTNAME).tar.gz +# Enable these for Px-releases +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +DISTFILES = $(DISTNAME).tar.gz + # Disable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +#DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall @@ -34,11 +45,16 @@ PACKAGES += CSWbind CATALOGNAME_CSWbind = bind SPKG_DESC_CSWbind = ISC BIND DNS main package -RUNTIME_DEP_PKGS_CSWbind += CSWbindutils +#RUNTIME_DEP_PKGS_CSWbind += CSWbindutils RUNTIME_DEP_PKGS_CSWbind += CSWlibbind -RUNTIME_DEP_PKGS_CSWbind += CSWlibiconv2 +#RUNTIME_DEP_PKGS_CSWbind += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWbind += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbind += CSWlibxml2-2 +#RUNTIME_DEP_PKGS_CSWbind += CSWlibkrb5-3 +#CHECKPKG_OVERRIDES_CSWbind += missing-dependency|CSWlibbind +#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibkrb5-3 +#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils PACKAGES += CSWbind-dev CATALOGNAME_CSWbind-dev = bind_dev @@ -57,14 +73,28 @@ RUNTIME_DEP_PKGS_CSWlibbind += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibz1 +#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibssl1-0-0 +#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibz1 +#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibcom-err3 +#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibkrb5-3 +#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibxml2-2 +#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibgcc-s1 +#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibk5crypto3 PACKAGES += CSWbindutils CATALOGNAME_CSWbindutils = bind_utils SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package RUNTIME_DEP_PKGS_CSWbindutils += CSWlibbind -RUNTIME_DEP_PKGS_CSWbindutils += CSWlibiconv2 +#RUNTIME_DEP_PKGS_CSWbindutils += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWbindutils += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWbindutils += CSWlibreadline6 +#RUNTIME_DEP_PKGS_CSWbindutils += CSWlibssl1-0-0 +#RUNTIME_DEP_PKGS_CSWbindutils += CSWlibxml2-2 +#CHECKPKG_OVERRIDES_CSWbindutils += missing-dependency|CSWlibbind +#CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibxml2-2 +#CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibssl1-0-0 +#CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibiconv2 PACKAGES += CSWbindchroot CATALOGNAME_CSWbindchroot = bind_chroot @@ -83,7 +113,8 @@ CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named #CONFIGURE_ARGS += --enable-rrl #CONFIGURE_ARGS += --with-dlz-ldap=/opt/csw -CONFIGURE_ARGS += --enable-fetchlimit +#CONFIGURE_ARGS += --enable-fetchlimit # default by now +#CONFIGURE_ARGS += --disable-static EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la $(mandir)/man1/isc-config.sh.1 $(bindir)/isc-config.sh @@ -113,10 +144,18 @@ SPKG_SOURCEURL = http://www.isc.org/software/bind -CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils -CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibssl1-0-0 +### + + +### + + + + +#CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibiconv2 +#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils +#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibssl1-0-0 CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot @@ -126,7 +165,7 @@ 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/libbind9.so.140.0.11|soname=libbind9.so.140|pkgname=CSWlibbind|expected=CSWlibbind9-140 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.164.0.3|soname=libdns.so.164|pkgname=CSWlibbind|expected=CSWlibdns164 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.165.0.2|soname=libdns.so.165|pkgname=CSWlibbind|expected=CSWlibdns165 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.160.1.1|soname=libisc.so.160|pkgname=CSWlibbind|expected=CSWlibisc160 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.140.3.1|soname=libisccfg.so.140|pkgname=CSWlibbind|expected=CSWlibisccfg140 Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2016-09-28 11:53:33 UTC (rev 25958) +++ csw/mgar/pkg/bind/trunk/checksums 2016-09-29 15:08:24 UTC (rev 25959) @@ -1 +1 @@ -f2167f42e6f1baad42c637d8771c9675 bind-9.10.4.tar.gz +2ce7b49516d3df1490bf2263f474b2d6 bind-9.10.4-P3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Sep 29 17:24:29 2016 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 29 Sep 2016 15:24:29 +0000 Subject: SF.net SVN: gar:[25960] csw/mgar/pkg/bind/trunk/Makefile Message-ID: <3slJKD1wxTz14F@mail.opencsw.org> Revision: 25960 http://sourceforge.net/p/gar/code/25960 Author: bonivart Date: 2016-09-29 15:24:29 +0000 (Thu, 29 Sep 2016) Log Message: ----------- bind/trunk: clean up Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2016-09-29 15:08:24 UTC (rev 25959) +++ csw/mgar/pkg/bind/trunk/Makefile 2016-09-29 15:24:29 UTC (rev 25960) @@ -45,16 +45,9 @@ PACKAGES += CSWbind CATALOGNAME_CSWbind = bind SPKG_DESC_CSWbind = ISC BIND DNS main package -#RUNTIME_DEP_PKGS_CSWbind += CSWbindutils RUNTIME_DEP_PKGS_CSWbind += CSWlibbind -#RUNTIME_DEP_PKGS_CSWbind += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWbind += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbind += CSWlibxml2-2 -#RUNTIME_DEP_PKGS_CSWbind += CSWlibkrb5-3 -#CHECKPKG_OVERRIDES_CSWbind += missing-dependency|CSWlibbind -#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibkrb5-3 -#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibiconv2 -#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils PACKAGES += CSWbind-dev CATALOGNAME_CSWbind-dev = bind_dev @@ -73,28 +66,13 @@ RUNTIME_DEP_PKGS_CSWlibbind += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibz1 -#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibiconv2 -#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibssl1-0-0 -#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibz1 -#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibcom-err3 -#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibkrb5-3 -#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibxml2-2 -#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibgcc-s1 -#CHECKPKG_OVERRIDES_CSWlibbind += missing-dependency|CSWlibk5crypto3 PACKAGES += CSWbindutils CATALOGNAME_CSWbindutils = bind_utils SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package RUNTIME_DEP_PKGS_CSWbindutils += CSWlibbind -#RUNTIME_DEP_PKGS_CSWbindutils += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWbindutils += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWbindutils += CSWlibreadline6 -#RUNTIME_DEP_PKGS_CSWbindutils += CSWlibssl1-0-0 -#RUNTIME_DEP_PKGS_CSWbindutils += CSWlibxml2-2 -#CHECKPKG_OVERRIDES_CSWbindutils += missing-dependency|CSWlibbind -#CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibxml2-2 -#CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibssl1-0-0 -#CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibiconv2 PACKAGES += CSWbindchroot CATALOGNAME_CSWbindchroot = bind_chroot @@ -113,7 +91,6 @@ CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named #CONFIGURE_ARGS += --enable-rrl #CONFIGURE_ARGS += --with-dlz-ldap=/opt/csw -#CONFIGURE_ARGS += --enable-fetchlimit # default by now #CONFIGURE_ARGS += --disable-static EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la $(mandir)/man1/isc-config.sh.1 $(bindir)/isc-config.sh @@ -144,18 +121,6 @@ SPKG_SOURCEURL = http://www.isc.org/software/bind -### - - -### - - - - -#CHECKPKG_OVERRIDES_CSWbindutils += surplus-dependency|CSWlibiconv2 -#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibiconv2 -#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils -#CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWlibssl1-0-0 CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Sep 29 21:33:12 2016 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 29 Sep 2016 19:33:12 +0000 Subject: SF.net SVN: gar:[25961] csw/mgar/pkg/clamav/trunk Message-ID: <3slPrC0lHdz18G@mail.opencsw.org> Revision: 25961 http://sourceforge.net/p/gar/code/25961 Author: bonivart Date: 2016-09-29 19:33:12 +0000 (Thu, 29 Sep 2016) Log Message: ----------- clamav/trunk: update to 0.99.2 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2016-09-29 15:24:29 UTC (rev 25960) +++ csw/mgar/pkg/clamav/trunk/Makefile 2016-09-29 19:33:12 UTC (rev 25961) @@ -1,12 +1,12 @@ NAME = clamav -VERSION = 0.99-rc1 +VERSION = 0.99.2 GARTYPE = v2 DESCRIPTION = Clam AntiVirus define BLURB endef -MASTER_SITES = http://www.clamav.net/downloads/release_candidate/ +MASTER_SITES = http://www.clamav.net/downloads/production/ DISTFILES = $(NAME)-$(VERSION).tar.gz PACKAGES += CSWclamav @@ -14,7 +14,7 @@ SPKG_DESC_CSWclamav = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam7 RUNTIME_DEP_PKGS_CSWclamav += CSWlibz1 -RUNTIME_DEP_PKGS_CSWclamav += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWclamav += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWclamav += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWclamav += CSWlibssl1-0-0 @@ -29,6 +29,7 @@ RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibclam7 += CSWlibpcre1 INCOMPATIBLE_PKGS_CSWlibclam7 += CSWlibclamav CSWlibclam6 PACKAGES += CSWlibclam7-dev @@ -44,6 +45,11 @@ GARCOMPILER = GNU +# Fix for missing msg_control and msg_controllen +EXTRA_CFLAGS += -D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__ +EXTRA_CFLAGS += -std=gnu99 -D_XPG6 +CONFIGURE_ENV_PATH = /usr/xpg4/bin:$(PATH) + sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) @@ -52,10 +58,12 @@ CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(NAME) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) CONFIGURE_ARGS += --enable-milter -#CONFIGURE_ARGS += --disable-llvm +CONFIGURE_ARGS += --disable-llvm #CONFIGURE_ARGS += --enable-check CONFIGURE_ARGS += --enable-clamdtop CONFIGURE_ARGS += --with-openssl=/opt/csw +CONFIGURE_ARGS += --with-pcre=/opt/csw +#CONFIGURE_ARGS += --disable-yara # Enable support for files > 2GB in size. #EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE @@ -99,7 +107,6 @@ CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdscan CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clambc CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/freshclam -CHECKPKG_OVERRIDES_CSWlibclam7 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.7.1.1 # We don't split to three separate packages CHECKPKG_OVERRIDES_CSWlibclam7 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.7.1.1|soname=libclamav.so.7|pkgname=CSWlibclam7|expected=CSWlibclamav7 @@ -124,7 +131,6 @@ DOCS = AUTHORS BUGS ChangeLog DOCS += FAQ NEWS README UPGRADE -DOCS += docs/clamav-mirror-howto.pdf DOCS += docs/clamdoc.pdf DOCS += docs/phishsigs_howto.pdf DOCS += docs/signatures.pdf Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2016-09-29 15:24:29 UTC (rev 25960) +++ csw/mgar/pkg/clamav/trunk/checksums 2016-09-29 19:33:12 UTC (rev 25961) @@ -1 +1 @@ -022ffb40c085047dd4475a62b50af914 clamav-0.99-rc1.tar.gz +61b51a04619aeafd965892a53f86d192 clamav-0.99.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Sep 30 16:10:33 2016 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 30 Sep 2016 14:10:33 +0000 Subject: SF.net SVN: gar:[25962] csw/mgar/pkg/dnstop/trunk Message-ID: <3sltdn6MzrzLP@mail.opencsw.org> Revision: 25962 http://sourceforge.net/p/gar/code/25962 Author: bonivart Date: 2016-09-30 14:10:33 +0000 (Fri, 30 Sep 2016) Log Message: ----------- dnstop/trunk: update to 20140915 Modified Paths: -------------- csw/mgar/pkg/dnstop/trunk/Makefile csw/mgar/pkg/dnstop/trunk/checksums csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p csw/mgar/pkg/dnstop/trunk/files/dnstop.8 Modified: csw/mgar/pkg/dnstop/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnstop/trunk/Makefile 2016-09-29 19:33:12 UTC (rev 25961) +++ csw/mgar/pkg/dnstop/trunk/Makefile 2016-09-30 14:10:33 UTC (rev 25962) @@ -1,5 +1,5 @@ NAME = dnstop -VERSION = 20110502 +VERSION = 20140915 GARTYPE = v2 DESCRIPTION = Displays various tables of DNS traffic Modified: csw/mgar/pkg/dnstop/trunk/checksums =================================================================== --- csw/mgar/pkg/dnstop/trunk/checksums 2016-09-29 19:33:12 UTC (rev 25961) +++ csw/mgar/pkg/dnstop/trunk/checksums 2016-09-30 14:10:33 UTC (rev 25962) @@ -1 +1 @@ -28cb54f3780b27e15df8924235e4e37b dnstop-20110502.tar.gz +f0fe1690b114e076196a51d63266eadc dnstop-20140915.tar.gz Modified: csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p 2016-09-29 19:33:12 UTC (rev 25961) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p 2016-09-30 14:10:33 UTC (rev 25962) @@ -4,10 +4,10 @@ OPTFLAGS= -DUSE_IPV6=1 CC=/opt/SUNWspro/bin/cc --CFLAGS=-xO3 -m32 -xarch=386 ${OPTFLAGS} +-CFLAGS=-xO3 -m32 -xarch=pentium_pro -xchip=pentium_pro ${OPTFLAGS} -LIBS=-lresolv -lnsl -lsocket -lpcap -lncurses -+CFLAGS=-xO3 -m32 -xarch=386 ${OPTFLAGS} -I/opt/csw/include ++CFLAGS=-xO3 -m32 -xarch=pentium_pro -xchip=pentium_pro ${OPTFLAGS} -I/opt/csw/include +LIBS=-lresolv -lnsl -lsocket -lpcap -lcurses - LDFLAGS=-m32 -xarch=386 -L/opt/csw/lib + LDFLAGS=-m32 -xarch=pentium_pro -xchip=pentium_pro -L/opt/csw/lib prefix=/opt/csw Modified: csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p 2016-09-29 19:33:12 UTC (rev 25961) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p 2016-09-30 14:10:33 UTC (rev 25962) @@ -4,10 +4,10 @@ OPTFLAGS= -DUSE_IPV6=1 CC=/opt/SUNWspro/bin/cc --CFLAGS=-xO3 -m32 -xarch=v8 ${OPTFLAGS} +-CFLAGS=-xO3 -m32 -xarch=sparc ${OPTFLAGS} -LIBS=-lresolv -lnsl -lsocket -lpcap -lncurses -+CFLAGS=-xO3 -m32 -xarch=v8 ${OPTFLAGS} -I/opt/csw/include ++CFLAGS=-xO3 -m32 -xarch=sparc ${OPTFLAGS} -I/opt/csw/include +LIBS=-lresolv -lnsl -lsocket -lpcap -lcurses - LDFLAGS=-m32 -xarch=v8 -L/opt/csw/lib + LDFLAGS=-m32 -xarch=sparc -L/opt/csw/lib prefix=/opt/csw Modified: csw/mgar/pkg/dnstop/trunk/files/dnstop.8 =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/dnstop.8 2016-09-29 19:33:12 UTC (rev 25961) +++ csw/mgar/pkg/dnstop/trunk/files/dnstop.8 2016-09-30 14:10:33 UTC (rev 25962) @@ -1,347 +1,229 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32 +.\" $Id: dnstop.8,v 1.29 2014/09/12 22:01:56 wessels Exp $ +.\" +.\" manpage written by jose at monkey.org .\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading +.Dd 21 March, 2008 +.Dt DNSTOP 8 +.Os +.Sh NAME +.Nm dnstop +.Nd displays various tables of DNS traffic on your network +.Sh SYNOPSIS +.Nm +.Op Fl 46apsQR +.Op Fl b Ar expression +.Op Fl i Ar address +.Op Fl f Ar filter +.Op Fl r Ar interval +.Op Ar device +.Op Ar savefile +.Sh DESCRIPTION +.Nm +is a small tool to listen on +.Ar device +or to parse the file +.Ar savefile +and collect and print statistics on the local network's DNS traffic. You +must have read access to +.Pa /dev/bpf\&* . +.Sh COMMAND LINE OPTIONS +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl 4 +count only messages with IPv4 addresses +.It Fl 6 +count only messages with IPv6 addresses +.It Fl Q +count only DNS query messages +.It Fl R +count only DNS reply messages +.It Fl a +anonymize addresses +.It Fl b Ar expression +BPF filter expression .br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} +(default: udp port 53) +.It Fl i Ar address +ignore select addresses +.It Fl p +Do not put the interface into promiscuous mode. +.It Fl r +Redraw interval (seconds). +.It Fl l Ar level +keep counts on names up to +.Pa level +domain name levels. +.Pp +For example, with -l 2 (the default), +.Nm +will keep two tables: one with top-level domain names, and another +with second-level domain names. Increasing the +.Pa level +provides more details, but also requires more memory and CPU. .\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.if \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} +.It Fl f +input filter name +.Pp +The "unknown-tlds" filter +includes only queries for TLDs that are +bogus. Useful for identifying hosts/servers +that leak queries for things like "localhost" +or "workgroup." +.Pp +The "new-gtlds" filter includes only queries for the +new gTLD program of 2013/2014. Useful for identifying +hosts/servers that use names which may result in future +collisions and problems when new gTLDs become active. +.Pp +The "A-for-A" filter +includes only A queries for names that are +already IP addresses. Certain Microsoft +Windows DNS servers have a known bug that +forward these queries. +.Pp +The "rfc1918-ptr" filter +includes only PTR queries for addresses in RFC1918 space. +These should never leak from inside an +organization. +.Pp +The "refused" filter, when used with the +.Fl R +option, tells +.Nm +to count only replies with rcode REFUSED. +.Pp +The "qtype-any" filter tells +.Nm +to count only message of type ANY. .\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "DNSTOP 8" -.TH DNSTOP 8 "2010-02-16" "perl v5.8.8" "User Contributed Perl Documentation" -.SH "NAME" -dnstop \- displays various tables of DNS traffic on your network. -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -dnstop [\-46apsQR] [\-b expression] [\-i address] [\-f filter] [\-r interval] [device] [savefile] -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -dnstop is a small tool to listen on device or to parse the file savefile and collect and print statistics on the local network's \s-1DNS\s0 traffic. You must have read access to /dev/bpf*. -.SH "COMMAND LINE OPTIONS" -.IX Header "COMMAND LINE OPTIONS" -The options are as follows: -.RE -.IP "\fB\-4\fR" -.IX Item "-4" -Count only messages with IPv4 addresses. -.RE -.IP "\fB\-6\fR" -.IX Item "-6" -Count only messages with IPv6 addresses. -.RE -.IP "\fB\-a\fR" -.IX Item "-a" -Anonymize addresses. -.RE -.IP "\fB\-b expression\fR" -.IX Item "-b expression" -\&\s-1BPF\s0 filter expression (default: udp port 53). -.RE -.IP "\fB\-i address\fR" -.IX Item "-i address" -Ignore select addresses. -.RE -.IP "\fB\-p\fR" -.IX Item "-p" -Do not put the interface into promiscuous mode. -.RE -.IP "\fB\-r\fR" -.IX Item "-r" -Redraw interval (seconds). -.RE -.IP "\fB\-l level\fR" -.IX Item "-l level" -Keep counts on names up to level domain name levels. -.PP -For example, with \-l 2 (the default), dnstop will keep two tables: one with top-level domain names, and another with second-level domain names. Increasing the level provides more details, but also requires more memory and \s-1CPU\s0. -.RE -.IP "\fB\-f\fR" -.IX Item "-f" -Input filter name -.PP -The \*(L"unknown\-tlds\*(R" filter includes only queries for TLDs that are bogus. Useful for identifying hosts/servers that leak queries for things like \*(L"localhost\*(R" or \*(L"workgroup.\*(R" -.PP -The \*(L"A\-for\-A\*(R" filter includes only A queries for names that are already \s-1IP\s0 addresses. Certain Microsoft Windows \s-1DNS\s0 servers have a known bug that forward these queries. -.PP -The \*(L"rfc1918\-ptr\*(R" filter includes only \s-1PTR\s0 queries for addresses in \s-1RFC1918\s0 space. These should never leak from inside an organization. -.RE -.IP "\fB\-Q\fR" -.IX Item "-Q" -Count only \s-1DNS\s0 query messages. -.RE -.IP "\fB\-R\fR" -.IX Item "-R" -Count only \s-1DNS\s0 reply messages. -.RE -.IP "\fBsavefile\fR" -.IX Item "savefile" -A captured network trace in pcap format. -.RE -.IP "\fBdevice\fR" -.IX Item "device" -Ethernet device (ie fxp0). -.SH "RUN TIME OPTIONS" -.IX Header "RUN TIME OPTIONS" +.It Fl n Ar name +Only count messages within the domain +.Ar name +.It Fl P +Print "progress" messages on stderr when in non-interactive mode. +.It Fl B Ar buckets +Use +.Pa buckets +hash table buckets. +.It Fl X +Do not tabulate the sources + query name counters. This can significantly +reduce memory usage on busy servers and large savefiles. +.It Ar savefile +a captured network trace in +.Cm pcap +format +.It Ar device +ethernet device (ie fxp0) +.El +.Sh RUN TIME OPTIONS +.Pp While running, the following options are available to alter the display: -.RE -.IP "\fBs\fR" -.IX Item "s" -Display the source address table. -.RE -.IP "\fBd\fR" -.IX Item "d" -Display the destination address table. -.RE -.IP "\fBt\fR" -.IX Item "t" -Display the breakdown of query types seen. -.RE -.IP "\fBo\fR" -.IX Item "o" -Display the breakdown of opcodes seen. -.RE -.IP "\fB1\fR" -.IX Item "1" -Show 1st level query names. -.RE -.IP "\fB2\fR" -.IX Item "2" -Show 2nd level query names. -.RE -.IP "\fB3\fR" -.IX Item "3" -Show 3rd level query names. -.RE -.IP "\fB4\fR" -.IX Item "4" -Show 4th level query names. -.RE -.IP "\fB5\fR" -.IX Item "5" -Show 5th level query names. -.RE -.IP "\fB6\fR" -.IX Item "6" -Show 6th level query names. -.RE -.IP "\fB7\fR" -.IX Item "7" -Show 7th level query names. -.RE -.IP "\fB8\fR" -.IX Item "8" -Show 8th level query names. -.RE -.IP "\fB9\fR" -.IX Item "9" -Show 9th level query names. -.RE -.IP "\fB!\fR" -.IX Item "!" -Show sources + 1st level query names. -.RE -.IP "\fB@\fR" -.IX Item "@" -Show sources + 2nd level query names. -.RE -.IP "\fB#\fR" -.IX Item "#" -Show sources + 3rd level query names. -.RE -.IP "\fB$\fR" -.IX Item "$" -Show sources + 4th level query names. -.RE -.IP "\fB%\fR" -.IX Item "%" -Show sources + 5th level query names. -.RE -.IP "\fB^\fR" -.IX Item "^" -Show sources + 6th level query names. -.RE -.IP "\fB&\fR" -.IX Item "&" -Show sources + 7th level query names. -.RE -.IP "\fB*\fR" -.IX Item "*" -Show sources + 8th level query names. -.RE -.IP "\fB(\fR" -.IX Item "(" -Show sources + 9th level query names. -.RE -.IP "\fB^R\fR" -.IX Item "^R" -Reset the counters. -.RE -.IP "\fB^X\fR" -.IX Item "^X" -Exit the program. -.RE -.IP "\fBspace\fR" -.IX Item "space" -Redraw. -.RE -.IP "\fB?\fR" -.IX Item "?" -Help. -.SH "NON-INTERACTIVE MODE" -.IX Header "NON-INTERACTIVE MODE" -If stdout is not a tty, dnstop runs in non-interactive mode. In this case, you must supply a savefile for reading, instead of capturing live packets. After reading the entire savefile, dnstop prints the top 50 entries for each table. -.SH "AUTHORS" -.IX Header "AUTHORS" -.RE -.IP "\fBDuane Wessels (wessels at measurement\-factory.com)\fR" -.IX Item "Duane Wessels (wessels at measurement-factory.com)" -.RE -.PD 0 -.IP "\fBMark Foster (mark at foster.cc)\fR" -.IX Item "Mark Foster (mark at foster.cc)" -.RE -.IP "\fBJose Nazario (jose at monkey.org)\fR" -.IX Item "Jose Nazario (jose at monkey.org)" -.RE -.IP "\fBSam Norris <@ChangeIP.com>\fR" -.IX Item "Sam Norris <@ChangeIP.com>" -.RE -.IP "\fBMax Horn <@quendi.de>\fR" -.IX Item "Max Horn <@quendi.de>" -.RE -.IP "\fBJohn Morrissey \fR" -.IX Item "John Morrissey " -.RE -.IP "\fBFlorian Forster \fR" -.IX Item "Florian Forster " -.RE -.IP "\fBDave Plonka \fR" -.IX Item "Dave Plonka " -.RE -.IP "\fBhttp://dnstop.measurement\-factory.com/\fR" -.IX Item "http://dnstop.measurement-factory.com/" -.PD -.SH "BUGS" -.IX Header "BUGS" -Does not support \s-1TCP\s0 at this time. +.Bl -tag -width Ds +.It s +display the source address table +.It d +display the destination address table +.It t +display the breakdown of query types seen +.It r +display the breakdown of response codes seen +.It o +display the breakdown of opcodes seen +.It 1 +show 1st level query names +.It 2 +show 2nd level query names +.It 3 +show 3rd level query names +.It 4 +show 4th level query names +.It 5 +show 5th level query names +.It 6 +show 6th level query names +.It 7 +show 7th level query names +.It 8 +show 8th level query names +.It 9 +show 9th level query names +.It ! +show sources + 1st level query names +.It @ +show sources + 2nd level query names +.It # +show sources + 3rd level query names +.It $ +show sources + 4th level query names +.It % +show sources + 5th level query names +.It ^ +show sources + 6th level query names +.It & +show sources + 7th level query names +.It * +show sources + 8th level query names +.It ( +show sources + 9th level query names +.It ^R +reset the counters +.It ^X +exit the program +.It space +redraw +.It ? +help +.El +.Pp +.Sh NON-INTERACTIVE MODE +If stdout is not a tty, +.Nm +runs in non-interactive mode. In this case, you must +supply a savefile for reading, instead of capturing +live packets. After reading the entire savefile, +.Nm +prints the top 50 entries for each table. +.Pp +.Sh HOW MESSAGES ARE COUNTED +By default +.Nm +examines only query messages and ignores replies. In this case the response code +table is meaningless and will likely show 100% "Noerror." +.Pp +If you supply (only) the +.Fl R +command line option, +.Nm +examines replies and ignores queries. This allows you to see meaningful +response code values, as well as all the other tables. In this case +all the query attributes (such as type and name) are taken from the +Question section of the reply. +.Pp +Note, however, that it is common for a stream of DNS messages to contain +more queries than replies. +This could happen, for example, +if the server is too busy to respond to every single query, or if +the server is designed to ignore malformed query messages. Therefore, +you might want to examine both queries and replies by giving both +.Fl R +and +.Fl Q +command line options. In this case, only the response code counts +are taken from the replies and all other attributes +are taken from the queries. +.Pp +.Sh AUTHORS +.Bl -tag -width xx -compact +.It Pa Duane Wessels (wessels at measurement-factory.com) +.It Pa Mark Foster (mark at foster.cc) +.It Pa Jose Nazario (jose at monkey.org) +.It Pa Sam Norris <@ChangeIP.com> +.It Pa Max Horn <@quendi.de> +.It Pa John Morrissey +.It Pa Florian Forster +.It Pa Dave Plonka +.It Pa http://dnstop.measurement-factory.com/ +.El +.Sh BUGS +Does not support TCP at this time. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.