From wahwah at users.sourceforge.net Sat Oct 1 00:08:08 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 30 Sep 2011 22:08:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[15819] csw/mgar/pkg/mysql5/branches/mysql-5.1.x Message-ID: Revision: 15819 http://gar.svn.sourceforge.net/gar/?rev=15819&view=rev Author: wahwah Date: 2011-09-30 22:08:08 +0000 (Fri, 30 Sep 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x: What's up with CFLAGS? Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-Use-OpenCSW-Perl-for-testing.patch csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-looking-for-ps-use-basename-0.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2011-09-30 20:55:26 UTC (rev 15818) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2011-09-30 22:08:08 UTC (rev 15819) @@ -37,16 +37,33 @@ MYSQL_LIB_VER = 16 +PACKAGES += CSWmysql-dev +SPKG_DESC_CSWmysql-dev = MySQL development files +PKGFILES_CSWmysql-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient$(MYSQL_LIB_VER) +CSWmysql-dev_programs += mysql_config +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql-dev += $(prefix)/include.* +PKGFILES_CSWmysql-dev += /opt/csw/include/mysql +CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1 + PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWosslrt OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt PACKAGES += CSW$(NAME)client @@ -91,55 +108,37 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt PACKAGES += CSW$(NAME)bench -PACKAGES += CSW$(NAME)devel PACKAGES += CSW$(NAME)test PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch -PATCHFILES += 0004-Use-OpenCSW-Perl-for-testing.patch +# PATCHFILES += 0004-Use-OpenCSW-Perl-for-testing.patch PATCHFILES += 0004-looking-for-ps-use-basename-0.patch SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking -SPKG_DESC_CSW$(NAME)devel = MySQL $(BASE_VERSION) header files SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files CATALOGNAME_CSW$(NAME)bench = $(NAME)bench -CATALOGNAME_CSW$(NAME)devel = $(NAME)devel CATALOGNAME_CSW$(NAME)test = $(NAME)test -COMMON_CFLAGS = -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt +# COMMON_EXTRA_FLAGS += -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt -EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) -Xa -fast -native -xnorunpath -EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_CFLAGS) -EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) +# EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_EXTRA_FLAGS) +# EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_EXTRA_FLAGS) +# EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) -Xa -fast -native -xnorunpath -EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) -noex -mt -norunpath -EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS) -EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) +# EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_EXTRA_FLAGS) +# EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_EXTRA_FLAGS) +# EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) -noex -mt -norunpath ARCHALL_CSW$(NAME)bench = 1 -ARCHALL_CSW$(NAME)test = 1 -CSW$(NAME)devel_programs += mysql_config - # Enable 64 bits build BUILD64 = 1 PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* -PKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSW$(NAME)devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSW$(NAME)devel += $(prefix)/include.* -PKGFILES_CSW$(NAME)devel += /opt/csw/include/mysql PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* @@ -206,6 +205,16 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles +CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client +CHECKPKG_OVERRIDES_CSW$(NAME)bench += file-with-bad-content +CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSW$(NAME) +CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content +CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) + +CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqlaccess.1 +# This could be reviewed. +CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content + EXECUTABLES += comp_err EXECUTABLES += innochecksum EXECUTABLES += msql2mysql @@ -264,7 +273,7 @@ include gar/category.mk -CFLAGS := $(filter-out -I%,$(CFLAGS)) +# CFLAGS := $(filter-out -I%,$(CFLAGS)) test-custom: alias sh=/usr/bin/bash; \ Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2011-09-30 20:55:26 UTC (rev 15818) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2011-09-30 22:08:08 UTC (rev 15819) @@ -1,12 +1 @@ -8940e0673e599689932e94fec906aec9 0001-Use-libc-not-libcrypt.patch -1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch -5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch -0cea0d771ff324ccdd31de4b6311b12f 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch -a1008df3aee0528449eb18f39bc21603 CSWmysql51.postinstall -fe58fe0af20a51143893495b56964682 CSWmysql51.preinstall -e691b0cf00a3925ac55c1844045d6e30 ChangeLog -59f9d5aa04d8e8d3806bec666d01e096 README.CSW -22a8164a101fa7e4be35fd6aa674d272 cswmysql51 -e3000190fef8aa4cfbd527bb5e40d9a6 cswusergroup -a90d87a71fa3c23dff6d78afc8e3184c mysql-5.1.49.tar.gz -028a9f9167edee23d2e946239af5a2fb quick_start-csw +1e89816164692f44f768024db4bc05f6 mysql-5.1.59.tar.gz Added: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-Use-OpenCSW-Perl-for-testing.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-Use-OpenCSW-Perl-for-testing.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-Use-OpenCSW-Perl-for-testing.patch 2011-09-30 22:08:08 UTC (rev 15819) @@ -0,0 +1,33 @@ +From 2b227bddcd0cd2f8f2fb299ecd6c6957cb52c496 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 11 Mar 2011 01:22:51 +0100 +Subject: [PATCH] Use OpenCSW Perl for testing + +--- + mysql-test/lib/v1/mysql-test-run.pl | 2 +- + mysql-test/mysql-test-run.pl | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl +index 5d06d9c..a1205cf 100755 +--- a/mysql-test/lib/v1/mysql-test-run.pl ++++ b/mysql-test/lib/v1/mysql-test-run.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + # -*- cperl -*- + + # +diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl +index 2301b24..754e426 100755 +--- a/mysql-test/mysql-test-run.pl ++++ b/mysql-test/mysql-test-run.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + # -*- cperl -*- + + # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +-- +1.7.3.2 + Added: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-looking-for-ps-use-basename-0.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-looking-for-ps-use-basename-0.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-looking-for-ps-use-basename-0.patch 2011-09-30 22:08:08 UTC (rev 15819) @@ -0,0 +1,48 @@ +From 111c7574ea02e17df8b2aff8e1b94d6118024f7b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 28 Sep 2011 23:26:47 +0200 +Subject: [PATCH] looking for ps, use `basename $0` + +Upstream bug filed: +http://bugs.mysql.com/bug.php?id=62567 + +--- + configure.in | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.in b/configure.in +index cfae77d..8e6dd43 100644 +--- a/configure.in ++++ b/configure.in +@@ -518,23 +518,23 @@ AC_PATH_PROG(PS, ps, ps) + AC_MSG_CHECKING("how to check if pid exists") + PS=$ac_cv_path_PS + # Linux style +-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null ++if $PS wwwp $$ 2> /dev/null | grep -- "`basename $0`" > /dev/null + then + FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + # Solaris +-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null ++elif $PS -fp $$ 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + # BSD style +-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null ++elif $PS -uaxww 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" + # SysV style +-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null ++elif $PS -ef 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" + # Do anybody use this? +-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null ++elif $PS $$ 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + else +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 1 00:13:42 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 30 Sep 2011 22:13:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[15820] csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Message-ID: Revision: 15820 http://gar.svn.sourceforge.net/gar/?rev=15820&view=rev Author: wahwah Date: 2011-09-30 22:13:42 +0000 (Fri, 30 Sep 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x: uncommenting -I filtering Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2011-09-30 22:08:08 UTC (rev 15819) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2011-09-30 22:13:42 UTC (rev 15820) @@ -273,7 +273,7 @@ include gar/category.mk -# CFLAGS := $(filter-out -I%,$(CFLAGS)) +CFLAGS := $(filter-out -I%,$(CFLAGS)) test-custom: alias sh=/usr/bin/bash; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 1 19:18:42 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 01 Oct 2011 17:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[15821] csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Message-ID: Revision: 15821 http://gar.svn.sourceforge.net/gar/?rev=15821&view=rev Author: wahwah Date: 2011-10-01 17:18:42 +0000 (Sat, 01 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x: adding the CFLAGS settings back Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2011-09-30 22:13:42 UTC (rev 15820) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2011-10-01 17:18:42 UTC (rev 15821) @@ -123,15 +123,15 @@ CATALOGNAME_CSW$(NAME)bench = $(NAME)bench CATALOGNAME_CSW$(NAME)test = $(NAME)test -# COMMON_EXTRA_FLAGS += -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt +COMMON_EXTRA_FLAGS += -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt -# EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_EXTRA_FLAGS) -# EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_EXTRA_FLAGS) -# EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) -Xa -fast -native -xnorunpath +EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_EXTRA_FLAGS) +EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_EXTRA_FLAGS) +EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) -Xa -fast -native -xnorunpath -# EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_EXTRA_FLAGS) -# EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_EXTRA_FLAGS) -# EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) -noex -mt -norunpath +EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_EXTRA_FLAGS) +EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_EXTRA_FLAGS) +EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) -noex -mt -norunpath ARCHALL_CSW$(NAME)bench = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 1 21:35:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 01 Oct 2011 19:35:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[15822] csw/mgar/pkg/di/trunk Message-ID: Revision: 15822 http://gar.svn.sourceforge.net/gar/?rev=15822&view=rev Author: dmichelsen Date: 2011-10-01 19:35:52 +0000 (Sat, 01 Oct 2011) Log Message: ----------- di/trunk: Update to 4.29 Modified Paths: -------------- csw/mgar/pkg/di/trunk/Makefile csw/mgar/pkg/di/trunk/checksums Modified: csw/mgar/pkg/di/trunk/Makefile =================================================================== --- csw/mgar/pkg/di/trunk/Makefile 2011-10-01 17:18:42 UTC (rev 15821) +++ csw/mgar/pkg/di/trunk/Makefile 2011-10-01 19:35:52 UTC (rev 15822) @@ -1,5 +1,5 @@ NAME = di -VERSION = 4.28 +VERSION = 4.29 CATEGORIES = utils DESCRIPTION = Disk information utility Modified: csw/mgar/pkg/di/trunk/checksums =================================================================== --- csw/mgar/pkg/di/trunk/checksums 2011-10-01 17:18:42 UTC (rev 15821) +++ csw/mgar/pkg/di/trunk/checksums 2011-10-01 19:35:52 UTC (rev 15822) @@ -1 +1 @@ -8f56121562ac3ca05b48c0827ec0d48d di-4.28.tar.gz +1445008c4720ec68727326a94c5e5de8 di-4.29.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 2 09:55:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 07:55:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[15823] csw/mgar/pkg/examples Message-ID: Revision: 15823 http://gar.svn.sourceforge.net/gar/?rev=15823&view=rev Author: wahwah Date: 2011-10-02 07:55:05 +0000 (Sun, 02 Oct 2011) Log Message: ----------- hello: a program for minimal examples Added Paths: ----------- csw/mgar/pkg/examples/hello/ csw/mgar/pkg/examples/hello/AUTHORS csw/mgar/pkg/examples/hello/COPYING csw/mgar/pkg/examples/hello/ChangeLog csw/mgar/pkg/examples/hello/INSTALL csw/mgar/pkg/examples/hello/Makefile.am csw/mgar/pkg/examples/hello/NEWS csw/mgar/pkg/examples/hello/README csw/mgar/pkg/examples/hello/acinclude.m4 csw/mgar/pkg/examples/hello/configure.ac csw/mgar/pkg/examples/hello/getopt.c csw/mgar/pkg/examples/hello/getopt.h csw/mgar/pkg/examples/hello/getopt1.c csw/mgar/pkg/examples/hello/gpl.texinfo csw/mgar/pkg/examples/hello/hello.1 csw/mgar/pkg/examples/hello/hello.c csw/mgar/pkg/examples/hello/hello.info csw/mgar/pkg/examples/hello/hello.lsm.in csw/mgar/pkg/examples/hello/hello.spec.in csw/mgar/pkg/examples/hello/hello.texinfo csw/mgar/pkg/examples/hello/system.h Added: csw/mgar/pkg/examples/hello/AUTHORS =================================================================== --- csw/mgar/pkg/examples/hello/AUTHORS (rev 0) +++ csw/mgar/pkg/examples/hello/AUTHORS 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1 @@ +Maciej Blizinski Added: csw/mgar/pkg/examples/hello/COPYING =================================================================== --- csw/mgar/pkg/examples/hello/COPYING (rev 0) +++ csw/mgar/pkg/examples/hello/COPYING 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/examples/hello/ChangeLog =================================================================== --- csw/mgar/pkg/examples/hello/ChangeLog (rev 0) +++ csw/mgar/pkg/examples/hello/ChangeLog 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,4 @@ +2010-01-11 Maciej Blizinski + + * hello: initial version. + Added: csw/mgar/pkg/examples/hello/INSTALL =================================================================== --- csw/mgar/pkg/examples/hello/INSTALL (rev 0) +++ csw/mgar/pkg/examples/hello/INSTALL 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,365 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008, 2009 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + Added: csw/mgar/pkg/examples/hello/Makefile.am =================================================================== --- csw/mgar/pkg/examples/hello/Makefile.am (rev 0) +++ csw/mgar/pkg/examples/hello/Makefile.am 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,18 @@ +bin_PROGRAMS=hello +hello_SOURCES=hello.c hello.1 system.h aclocal.m4 getopt.c getopt1.c getopt.h + +# uncomment the following if hello requires the math library +#hello_LDADD=-lm + +EXTRA_DIST=hello.lsm.in hello.spec.in hello.texinfo + +# if you write a self-test script named `chk', uncomment the +# following and add `chk' to the EXTRA_DIST list +#TESTS=chk + +# build and install the .info pages +info_TEXINFOS = hello.texinfo +hello_TEXINFOS = gpl.texinfo + +# install the man pages +man_MANS=hello.1 Added: csw/mgar/pkg/examples/hello/NEWS =================================================================== Added: csw/mgar/pkg/examples/hello/README =================================================================== --- csw/mgar/pkg/examples/hello/README (rev 0) +++ csw/mgar/pkg/examples/hello/README 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,23 @@ + hello - A hello world program. + + + + Copyright (C) 2010 Maciej Blizinski + + hello is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Comments are welcome. + + - Maciej Blizinski Added: csw/mgar/pkg/examples/hello/acinclude.m4 =================================================================== --- csw/mgar/pkg/examples/hello/acinclude.m4 (rev 0) +++ csw/mgar/pkg/examples/hello/acinclude.m4 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,40 @@ +#serial 3 + +dnl From Jim Meyering + +dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- +dnl usually in . +dnl Some systems have utime.h but don't declare the struct anywhere. + +AC_DEFUN(jm_CHECK_TYPE_STRUCT_UTIMBUF, +[ + AC_CHECK_HEADERS(utime.h) + AC_REQUIRE([AC_HEADER_TIME]) + AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, + [AC_TRY_COMPILE( + [ +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +#ifdef HAVE_UTIME_H +# include +#endif + ], + [static struct utimbuf x; x.actime = x.modtime;], + fu_cv_sys_struct_utimbuf=yes, + fu_cv_sys_struct_utimbuf=no) + ]) + + if test $fu_cv_sys_struct_utimbuf = yes; then + AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1, +[Define if struct utimbuf is declared -- usually in . + Some systems have utime.h but don't declare the struct anywhere. ]) + fi +]) Added: csw/mgar/pkg/examples/hello/configure.ac =================================================================== --- csw/mgar/pkg/examples/hello/configure.ac (rev 0) +++ csw/mgar/pkg/examples/hello/configure.ac 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,41 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_INIT(hello.c) +dnl Every other copy of the package version number gets its value from here +AM_INIT_AUTOMAKE(hello, 0.1.0) + +dnl create a config.h file (Automake will add -DHAVE_CONFIG_H) +AM_CONFIG_HEADER(config.h) + +AC_SUBST(VERSION) + +ISODATE=`date +%Y-%m-%d` +AC_SUBST(ISODATE) + +AC_CANONICAL_HOST + +dnl Checks for programs. +AC_PROG_INSTALL +AC_PROG_CC + +dnl Checks for libraries. + +dnl Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h ) + + +jm_CHECK_TYPE_STRUCT_UTIMBUF +AC_HEADER_MAJOR +AC_FUNC_ALLOCA +AC_STRUCT_TM +AC_STRUCT_ST_BLOCKS +AC_FUNC_CLOSEDIR_VOID +AC_CHECK_FUNCS(mkfifo) +AC_CHECK_FUNC(mknod) + +dnl Checks for typedefs, structures, and compiler characteristics. + +dnl Checks for library functions. + +AC_OUTPUT(Makefile hello.lsm hello.spec) Added: csw/mgar/pkg/examples/hello/getopt.c =================================================================== --- csw/mgar/pkg/examples/hello/getopt.c (rev 0) +++ csw/mgar/pkg/examples/hello/getopt.c 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,1055 @@ +/* Getopt for GNU. + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to drepper at gnu.org + before changing it! + + Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 + Free Software Foundation, Inc. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* This tells Alpha OSF/1 not to define a getopt prototype in . + Ditto for AIX 3.2 and . */ +#ifndef _NO_PROTO +# define _NO_PROTO +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +# ifndef const +# define const +# endif +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +# include +# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +# define ELIDE_CODE +# endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +/* Don't include stdlib.h for non-GNU C libraries because some of them + contain conflicting prototypes for getopt. */ +# include +# include +#endif /* GNU C library. */ + +#ifdef VMS +# include +# if HAVE_STRING_H - 0 +# include +# endif +#endif + +#ifndef _ +/* This is for other GNU distributions with internationalized messages. + When compiling libc, the _ macro is predefined. */ +# ifdef HAVE_LIBINTL_H +# include +# define _(msgid) gettext (msgid) +# else +# define _(msgid) (msgid) +# endif +#endif + +/* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. + + As `getopt' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Setting the environment variable POSIXLY_CORRECT disables permutation. + Then the behavior is completely standard. + + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +#include "getopt.h" + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* 1003.2 says this must be 1 before any call. */ +int optind = 1; + +/* Formerly, initialization of getopt depended on optind==0, which + causes problems with re-calling getopt as programs generally don't + know that. */ + +int __getopt_initialized; + +/* The next char to be scanned in the option-element + in which the last option character we returned was found. + This allows us to pick up the scan where we left off. + + If this is zero, or a null string, it means resume the scan + by advancing to the next ARGV-element. */ + +static char *nextchar; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; + +/* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters. + + PERMUTE is the default. We permute the contents of ARGV as we scan, + so that eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written to + expect this. + + RETURN_IN_ORDER is an option available to programs that were written + to expect options and other ARGV-elements in any order and that care about + the ordering of the two. We describe each non-option ARGV-element + as if it were the argument of an option with character code 1. + Using `-' as the first character of the list of option characters + selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + +static enum +{ + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER +} ordering; + +/* Value of POSIXLY_CORRECT environment variable. */ +static char *posixly_correct; + +#ifdef __GNU_LIBRARY__ +/* We want to avoid inclusion of string.h with non-GNU libraries + because there are many ways it can cause trouble. + On some systems, it contains special magic macros that don't work + in GCC. */ +# include +# define my_index strchr +#else + +# if HAVE_STRING_H +# include +# else +# include +# endif + +/* Avoid depending on library functions or files + whose names are inconsistent. */ + +#ifndef getenv +extern char *getenv (); +#endif + +static char * +my_index (str, chr) + const char *str; + int chr; +{ + while (*str) + { + if (*str == chr) + return (char *) str; + str++; + } + return 0; +} + +/* If using GCC, we can safely declare strlen this way. + If not using GCC, it is ok not to declare it. */ +#ifdef __GNUC__ +/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. + That was relevant to code that was here before. */ +# if (!defined __STDC__ || !__STDC__) && !defined strlen +/* gcc with -traditional declares the built-in strlen to return int, + and has done so at least since version 2.4.5. -- rms. */ +extern int strlen (const char *); +# endif /* not __STDC__ */ +#endif /* __GNUC__ */ + +#endif /* not __GNU_LIBRARY__ */ + +/* Handle permutation of arguments. */ + +/* Describe the part of ARGV that contains non-options that have + been skipped. `first_nonopt' is the index in ARGV of the first of them; + `last_nonopt' is the index after the last of them. */ + +static int first_nonopt; +static int last_nonopt; + +#ifdef _LIBC +/* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + +/* Defined in getopt_init.c */ +extern char *__getopt_nonoption_flags; + +static int nonoption_flags_max_len; +static int nonoption_flags_len; + +static int original_argc; +static char *const *original_argv; + +/* Make sure the environment variable bash 2.0 puts in the environment + is valid for the getopt call we must make sure that the ARGV passed + to getopt is that one passed to the process. */ +static void +__attribute__ ((unused)) +store_args_and_env (int argc, char *const *argv) +{ + /* XXX This is no good solution. We should rather copy the args so + that we can compare them later. But we must not use malloc(3). */ + original_argc = argc; + original_argv = argv; +} +# ifdef text_set_element +text_set_element (__libc_subinit, store_args_and_env); +# endif /* text_set_element */ + +# define SWAP_FLAGS(ch1, ch2) \ + if (nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } +#else /* !_LIBC */ +# define SWAP_FLAGS(ch1, ch2) +#endif /* _LIBC */ + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + `first_nonopt' and `last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +#if defined __STDC__ && __STDC__ +static void exchange (char **); +#endif + +static void +exchange (argv) + char **argv; +{ + int bottom = first_nonopt; + int middle = last_nonopt; + int top = optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + +#ifdef _LIBC + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ + if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) + { + /* We must extend the array. The user plays games with us and + presents new arguments. */ + char *new_str = malloc (top + 1); + if (new_str == NULL) + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { + memset (__mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; + __getopt_nonoption_flags = new_str; + } + } +#endif + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + register int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + register int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + SWAP_FLAGS (bottom + i, middle + i); + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + first_nonopt += (optind - last_nonopt); + last_nonopt = optind; +} + +/* Initialize the internal data when the first call is made. */ + +#if defined __STDC__ && __STDC__ +static const char *_getopt_initialize (int, char *const *, const char *); +#endif +static const char * +_getopt_initialize (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + + first_nonopt = last_nonopt = optind; + + nextchar = NULL; + + posixly_correct = getenv ("POSIXLY_CORRECT"); + + /* Determine how to handle the ordering of options and nonoptions. */ + + if (optstring[0] == '-') + { + ordering = RETURN_IN_ORDER; + ++optstring; + } + else if (optstring[0] == '+') + { + ordering = REQUIRE_ORDER; + ++optstring; + } + else if (posixly_correct != NULL) + ordering = REQUIRE_ORDER; + else + ordering = PERMUTE; + +#ifdef _LIBC + if (posixly_correct == NULL + && argc == original_argc && argv == original_argv) + { + if (nonoption_flags_max_len == 0) + { + if (__getopt_nonoption_flags == NULL + || __getopt_nonoption_flags[0] == '\0') + nonoption_flags_max_len = -1; + else + { + const char *orig_str = __getopt_nonoption_flags; + int len = nonoption_flags_max_len = strlen (orig_str); + if (nonoption_flags_max_len < argc) + nonoption_flags_max_len = argc; + __getopt_nonoption_flags = + (char *) malloc (nonoption_flags_max_len); + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } + nonoption_flags_len = nonoption_flags_max_len; + } + else + nonoption_flags_len = 0; +#endif + + return optstring; +} + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If `getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, `getopt' returns -1. + Then `optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set `opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in `optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in `optarg', otherwise `optarg' is set to zero. + + If OPTSTRING starts with `-' or `+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with `--' instead of `-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of `struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal (argc, argv, optstring, longopts, longind, long_only) + int argc; + char *const *argv; + const char *optstring; + const struct option *longopts; + int *longind; + int long_only; +{ + int print_errors = opterr; + if (optstring[0] == ':') + print_errors = 0; + + optarg = NULL; + + if (optind == 0 || !__getopt_initialized) + { + if (optind == 0) + optind = 1; /* Don't scan ARGV[0], the program name. */ + optstring = _getopt_initialize (argc, argv, optstring); + __getopt_initialized = 1; + } + + /* Test whether ARGV[optind] points to a non-option argument. + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +#ifdef _LIBC +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ + || (optind < nonoption_flags_len \ + && __getopt_nonoption_flags[optind] == '1')) +#else +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') +#endif + + if (nextchar == NULL || *nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been + moved back by the user (who may also have changed the arguments). */ + if (last_nonopt > optind) + last_nonopt = optind; + if (first_nonopt > optind) + first_nonopt = optind; + + if (ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (last_nonopt != optind) + first_nonopt = optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (optind < argc && NONOPTION_P) + optind++; + last_nonopt = optind; + } + + /* The special ARGV-element `--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (optind != argc && !strcmp (argv[optind], "--")) + { + optind++; + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (first_nonopt == last_nonopt) + first_nonopt = optind; + last_nonopt = argc; + + optind = argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (optind == argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (first_nonopt != last_nonopt) + optind = first_nonopt; + return -1; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if (NONOPTION_P) + { + if (ordering == REQUIRE_ORDER) + return -1; + optarg = argv[optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Skip the initial punctuation. */ + + nextchar = (argv[optind] + 1 + + (longopts != NULL && argv[optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (argv[optind][1] == '-' + || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = -1; + int option_index; + + for (nameend = nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) + == (unsigned int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (print_errors) + fprintf (stderr, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + optopt = 0; + return '?'; + } + + if (pfound != NULL) + { + option_index = indfound; + optind++; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + { + if (argv[optind - 1][1] == '-') + /* --option */ + fprintf (stderr, + _("%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); + else + /* +option or -option */ + fprintf (stderr, + _("%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], pfound->name); + } + + nextchar += strlen (nextchar); + + optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || argv[optind][1] == '-' + || my_index (optstring, *nextchar) == NULL) + { + if (print_errors) + { + if (argv[optind][1] == '-') + /* --option */ + fprintf (stderr, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); + else + /* +option or -option */ + fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); + } + nextchar = (char *) ""; + optind++; + optopt = 0; + return '?'; + } + } + + /* Look at and handle the next short option-character. */ + + { + char c = *nextchar++; + char *temp = my_index (optstring, c); + + /* Increment `optind' when we start to process its last character. */ + if (*nextchar == '\0') + ++optind; + + if (temp == NULL || c == ':') + { + if (print_errors) + { + if (posixly_correct) + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, _("%s: illegal option -- %c\n"), + argv[0], c); + else + fprintf (stderr, _("%s: invalid option -- %c\n"), + argv[0], c); + } + optopt = c; + return '?'; + } + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';') + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = 0; + int option_index; + + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, _("%s: option requires an argument -- %c\n"), + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (print_errors) + fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + fprintf (stderr, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name); + + nextchar += strlen (nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + nextchar = NULL; + return 'W'; /* Let the application handle it. */ + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*nextchar != '\0') + { + optarg = nextchar; + optind++; + } + else + optarg = NULL; + nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, + _("%s: option requires an argument -- %c\n"), + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + nextchar = NULL; + } + } + return c; + } +} + +int +getopt (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + return _getopt_internal (argc, argv, optstring, + (const struct option *) 0, + (int *) 0, + 0); +} + +#endif /* Not ELIDE_CODE. */ + +#ifdef TEST + +/* Compile with -DTEST to make an executable for use in testing + the above definition of `getopt'. */ + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + + c = getopt (argc, argv, "abc:d:0123456789"); + if (c == -1) + break; + + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value `%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ Added: csw/mgar/pkg/examples/hello/getopt.h =================================================================== --- csw/mgar/pkg/examples/hello/getopt.h (rev 0) +++ csw/mgar/pkg/examples/hello/getopt.h 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,169 @@ +/* Declarations for getopt. + Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _GETOPT_H + +#ifndef __need_getopt +# define _GETOPT_H 1 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +#ifndef __need_getopt +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ +# if defined __STDC__ && __STDC__ + const char *name; +# else + char *name; +# endif + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +# define no_argument 0 +# define required_argument 1 +# define optional_argument 2 +#endif /* need getopt */ + + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, `optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in `optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU `getopt'. + + The argument `--' causes premature termination of argument + scanning, explicitly telling `getopt' that there are no more + options. + + If OPTS begins with `--', then non-option arguments are treated as + arguments to the option '\0'. This behavior is specific to the GNU + `getopt'. */ + +#if defined __STDC__ && __STDC__ +# ifdef __GNU_LIBRARY__ +/* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ +extern int getopt (int __argc, char *const *__argv, const char *__shortopts); +# else /* not __GNU_LIBRARY__ */ +extern int getopt (); +# endif /* __GNU_LIBRARY__ */ + +# ifndef __need_getopt +extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts, + const struct option *__longopts, int *__longind); +extern int getopt_long_only (int __argc, char *const *__argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); + +/* Internal only. Users should not call this directly. */ +extern int _getopt_internal (int __argc, char *const *__argv, + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only); +# endif +#else /* not __STDC__ */ +extern int getopt (); +# ifndef __need_getopt +extern int getopt_long (); +extern int getopt_long_only (); + +extern int _getopt_internal (); +# endif +#endif /* __STDC__ */ + +#ifdef __cplusplus +} +#endif + +/* Make sure we later can get all the definitions and declarations. */ +#undef __need_getopt + +#endif /* getopt.h */ Added: csw/mgar/pkg/examples/hello/getopt1.c =================================================================== --- csw/mgar/pkg/examples/hello/getopt1.c (rev 0) +++ csw/mgar/pkg/examples/hello/getopt1.c 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,188 @@ +/* getopt_long and getopt_long_only entry points for GNU getopt. + Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "getopt.h" + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +#ifndef const +#define const +#endif +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +#include +#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +#define ELIDE_CODE +#endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +#include +#endif + +#ifndef NULL +#define NULL 0 +#endif + +int +getopt_long (argc, argv, options, long_options, opt_index) + int argc; + char *const *argv; + const char *options; + const struct option *long_options; + int *opt_index; +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 0); +} + +/* Like getopt_long, but '-' as well as '--' can indicate a long option. + If an option that starts with '-' (not '--') doesn't match a long option, + but does match a short option, it is parsed as a short option + instead. */ + +int +getopt_long_only (argc, argv, options, long_options, opt_index) + int argc; + char *const *argv; + const char *options; + const struct option *long_options; + int *opt_index; +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 1); +} + + +#endif /* Not ELIDE_CODE. */ + +#ifdef TEST + +#include + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + int option_index = 0; + static struct option long_options[] = + { + {"add", 1, 0, 0}, + {"append", 0, 0, 0}, + {"delete", 1, 0, 0}, + {"verbose", 0, 0, 0}, + {"create", 0, 0, 0}, + {"file", 1, 0, 0}, + {0, 0, 0, 0} + }; + + c = getopt_long (argc, argv, "abc:d:0123456789", + long_options, &option_index); + if (c == -1) + break; + + switch (c) + { + case 0: + printf ("option %s", long_options[option_index].name); + if (optarg) + printf (" with arg %s", optarg); + printf ("\n"); + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value `%s'\n", optarg); + break; + + case 'd': + printf ("option d with value `%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ Added: csw/mgar/pkg/examples/hello/gpl.texinfo =================================================================== --- csw/mgar/pkg/examples/hello/gpl.texinfo (rev 0) +++ csw/mgar/pkg/examples/hello/gpl.texinfo 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,396 @@ + at setfilename gpl.info + + at unnumbered GNU GENERAL PUBLIC LICENSE + at center Version 2, June 1991 + + at display +Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + at end display + + at unnumberedsec Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software---to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + at iftex + at unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + at end iftex + at ifinfo + at center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + at end ifinfo + + at enumerate + at item +This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The ``Program'', below, +refers to any such program or work, and a ``work based on the Program'' +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term ``modification''.) Each licensee is addressed as ``you''. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + at item +You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + at item +You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + at enumerate a + at item +You must cause the modified files to carry prominent notices +stating that you changed the files and the date of any change. + + at item +You must cause any work that you distribute or publish, that in +whole or in part contains or is derived from the Program or any +part thereof, to be licensed as a whole at no charge to all third +parties under the terms of this License. + + at item +If the modified program normally reads commands interactively +when run, you must cause it, when started running for such +interactive use in the most ordinary way, to print or display an +announcement including an appropriate copyright notice and a +notice that there is no warranty (or else, saying that you provide +a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this +License. (Exception: if the Program itself is interactive but +does not normally print such an announcement, your work based on +the Program is not required to print an announcement.) + at end enumerate + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + at item +You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + at enumerate a + at item +Accompany it with the complete corresponding machine-readable +source code, which must be distributed under the terms of Sections +1 and 2 above on a medium customarily used for software interchange; or, + + at item +Accompany it with a written offer, valid for at least three +years, to give any third party, for a charge no more than your +cost of physically performing source distribution, a complete +machine-readable copy of the corresponding source code, to be +distributed under the terms of Sections 1 and 2 above on a medium +customarily used for software interchange; or, + + at item +Accompany it with the information you received as to the offer +to distribute corresponding source code. (This alternative is +allowed only for noncommercial distribution and only if you +received the program in object code or executable form with such +an offer, in accord with Subsection b above.) + at end enumerate + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + at item +You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + at item +You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + at item +Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + at item +If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + at item +If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + at item +The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and ``any +later version'', you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + at item +If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + at iftex + at heading NO WARRANTY + at end iftex + at ifinfo + at center NO WARRANTY + at end ifinfo + + at item +BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + at item +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + at end enumerate + + at iftex + at heading END OF TERMS AND CONDITIONS + at end iftex + at ifinfo + at center END OF TERMS AND CONDITIONS + at end ifinfo + + at page + at unnumberedsec How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the ``copyright'' line and a pointer to where the full notice is found. + + at smallexample + at var{one line to give the program's name and an idea of what it does.} +Copyright (C) @var{year} @var{name of author} + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + at end smallexample + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + at smallexample +Gnomovision version 69, Copyright (C) @var{year} @var{name of author} +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details +type `show w'. This is free software, and you are welcome +to redistribute it under certain conditions; type `show c' +for details. + at end smallexample + +The hypothetical commands @samp{show w} and @samp{show c} should show +the appropriate parts of the General Public License. Of course, the +commands you use may be called something other than @samp{show w} and + at samp{show c}; they could even be mouse-clicks or menu items---whatever +suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a ``copyright disclaimer'' for the program, if +necessary. Here is a sample; alter the names: + + at smallexample + at group +Yoyodyne, Inc., hereby disclaims all copyright +interest in the program `Gnomovision' +(which makes passes at compilers) written +by James Hacker. + + at var{signature of Ty Coon}, 1 April 1989 +Ty Coon, President of Vice + at end group + at end smallexample + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/examples/hello/hello.1 =================================================================== --- csw/mgar/pkg/examples/hello/hello.1 (rev 0) +++ csw/mgar/pkg/examples/hello/hello.1 2011-10-02 07:55:05 UTC (rev 15823) @@ -0,0 +1,50 @@ +.\" hey, Emacs: -*- nroff -*- +.\" hello is free software; you can redistribute it and/or modify +.\" it under the terms of the GNU General Public License as published by +.\" the Free Software Foundation; either version 2 of the License, or +.\" (at your option) any later version. +.\" @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 2 10:24:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 08:24:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15824] csw/mgar/pkg/examples/hello Message-ID: Revision: 15824 http://gar.svn.sourceforge.net/gar/?rev=15824&view=rev Author: wahwah Date: 2011-10-02 08:24:06 +0000 (Sun, 02 Oct 2011) Log Message: ----------- hello: added a minimal shared library Modified Paths: -------------- csw/mgar/pkg/examples/hello/Makefile.am csw/mgar/pkg/examples/hello/configure.ac Added Paths: ----------- csw/mgar/pkg/examples/hello/libhello.c Modified: csw/mgar/pkg/examples/hello/Makefile.am =================================================================== --- csw/mgar/pkg/examples/hello/Makefile.am 2011-10-02 07:55:05 UTC (rev 15823) +++ csw/mgar/pkg/examples/hello/Makefile.am 2011-10-02 08:24:06 UTC (rev 15824) @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + bin_PROGRAMS=hello hello_SOURCES=hello.c hello.1 system.h aclocal.m4 getopt.c getopt1.c getopt.h @@ -6,6 +8,12 @@ EXTRA_DIST=hello.lsm.in hello.spec.in hello.texinfo +# AUTOMAKE_OPTIONS = gnu + +lib_LTLIBRARIES = libhello.la +libhello_la_SOURCES = libhello.c +libhello_la_LDFLAGS = -version-info 0:0:0 + # if you write a self-test script named `chk', uncomment the # following and add `chk' to the EXTRA_DIST list #TESTS=chk Modified: csw/mgar/pkg/examples/hello/configure.ac =================================================================== --- csw/mgar/pkg/examples/hello/configure.ac 2011-10-02 07:55:05 UTC (rev 15823) +++ csw/mgar/pkg/examples/hello/configure.ac 2011-10-02 08:24:06 UTC (rev 15824) @@ -3,6 +3,8 @@ AC_INIT(hello.c) dnl Every other copy of the package version number gets its value from here AM_INIT_AUTOMAKE(hello, 0.1.0) +AM_PROG_LIBTOOL +AC_CONFIG_MACRO_DIR([m4]) dnl create a config.h file (Automake will add -DHAVE_CONFIG_H) AM_CONFIG_HEADER(config.h) Added: csw/mgar/pkg/examples/hello/libhello.c =================================================================== --- csw/mgar/pkg/examples/hello/libhello.c (rev 0) +++ csw/mgar/pkg/examples/hello/libhello.c 2011-10-02 08:24:06 UTC (rev 15824) @@ -0,0 +1,3 @@ +int return_zero(void) { + return 0; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 2 10:24:59 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 08:24:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[15825] csw/mgar/pkg/examples/hello/configure.ac Message-ID: Revision: 15825 http://gar.svn.sourceforge.net/gar/?rev=15825&view=rev Author: wahwah Date: 2011-10-02 08:24:59 +0000 (Sun, 02 Oct 2011) Log Message: ----------- hello: version bump Modified Paths: -------------- csw/mgar/pkg/examples/hello/configure.ac Modified: csw/mgar/pkg/examples/hello/configure.ac =================================================================== --- csw/mgar/pkg/examples/hello/configure.ac 2011-10-02 08:24:06 UTC (rev 15824) +++ csw/mgar/pkg/examples/hello/configure.ac 2011-10-02 08:24:59 UTC (rev 15825) @@ -2,7 +2,7 @@ AC_INIT(hello.c) dnl Every other copy of the package version number gets its value from here -AM_INIT_AUTOMAKE(hello, 0.1.0) +AM_INIT_AUTOMAKE(hello, 0.1.1) AM_PROG_LIBTOOL AC_CONFIG_MACRO_DIR([m4]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 2 11:45:16 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 09:45:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15826] csw/mgar/pkg/examples Message-ID: Revision: 15826 http://gar.svn.sourceforge.net/gar/?rev=15826&view=rev Author: wahwah Date: 2011-10-02 09:45:15 +0000 (Sun, 02 Oct 2011) Log Message: ----------- 64-bit: An example 64-bit build Modified Paths: -------------- csw/mgar/pkg/examples/64-bit/trunk/Makefile csw/mgar/pkg/examples/64-bit/trunk/checksums Added Paths: ----------- csw/mgar/pkg/examples/64-bit/ csw/mgar/pkg/examples/64-bit/trunk/files/check_pkgroot.sh Modified: csw/mgar/pkg/examples/64-bit/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-09-24 08:01:34 UTC (rev 15728) +++ csw/mgar/pkg/examples/64-bit/trunk/Makefile 2011-10-02 09:45:15 UTC (rev 15826) @@ -2,186 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -NAME = mypkg -VERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +NAME = hello +VERSION = 0.1.1 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = A test of a 64-bit build define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR), -## $(PYPI_MIRROR) +SPKG_SOURCEURL = http://www.opencsw.org/ MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DISTFILES = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software -## release -## UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRight for details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. This can be also: SOS11, GCC3, GCC4. -## Specifying GNU will default to GCC4, specifying SUN will default to SOS12 -## GARCOMPILER = SOS12 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +PACKAGES += CSWlibhello0 +CATALOGNAME_CSWlibhello0 = libhello0 +PKGFILES_CSWlibhello0 += $(call baseisadirs,$(libdir),libhello\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibhello0 += $(DESCRIPTION), libhello.so.0 +RUNTIME_DEP_PKGS_CSWhello += CSWlibhello0 + +prefix = $(BUILD_PREFIX)/foo +libdir = $(BUILD_PREFIX)/lib +BUILD64 = 1 + +include gar/category.mk + +post-merge: + $(FILEDIR)/check_pkgroot.sh "$(PKGROOT)" Modified: csw/mgar/pkg/examples/64-bit/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2011-09-24 08:01:34 UTC (rev 15728) +++ csw/mgar/pkg/examples/64-bit/trunk/checksums 2011-10-02 09:45:15 UTC (rev 15826) @@ -0,0 +1 @@ +e2f152436f9367f6aa37aa1b696ab9da hello-0.1.1.tar.gz Copied: csw/mgar/pkg/examples/64-bit/trunk/files/check_pkgroot.sh (from rev 15728, csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh) =================================================================== --- csw/mgar/pkg/examples/64-bit/trunk/files/check_pkgroot.sh (rev 0) +++ csw/mgar/pkg/examples/64-bit/trunk/files/check_pkgroot.sh 2011-10-02 09:45:15 UTC (rev 15826) @@ -0,0 +1,41 @@ +#!/opt/csw/bin/bash +# $Id$ + +set -u +set -e +set -x + +declare -r PKGROOT="$1" + +function must_not_exist { +local f="$1" +if [[ -e "$f" ]]; then + echo "'$f' must not exist, but it does" + return 1 +else + echo "good, '$f' does not exist" + return 0 +fi +} + +function must_exist { +local f="$1" +if [[ -e "$f" ]]; then + echo "good, '$f' exists" + return 0 +else + echo "'$f' must exist, but it doesn't" + return 1 +fi +} + +if [[ -z "${PKGROOT}" ]] +then + echo "Please pass PKGROOT as an argument." + exit 1 +fi + +tree ${PKGROOT}/opt/csw + +must_not_exist ${PKGROOT}/opt/csw/foo/lib/sparcv9/libhello.so.0.0.0 +must_exist ${PKGROOT}/opt/csw/lib/sparcv9/libhello.so.0.0.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 2 12:56:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 10:56:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[15827] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15827 http://gar.svn.sourceforge.net/gar/?rev=15827&view=rev Author: wahwah Date: 2011-10-02 10:56:01 +0000 (Sun, 02 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: using --program-suffix to differentiate versions Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 09:45:15 UTC (rev 15826) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 10:56:01 UTC (rev 15827) @@ -26,23 +26,6 @@ (Structured Query Language) database server. endef -# Change prefix to /opt/csw/$(NAME) -prefix = $(BUILD_PREFIX)/$(NAME) -localstatedir = /var$(prefix) -sysconfdir = /etc$(prefix) -libdir = $(BUILD_PREFIX)/lib -includedir = $(BUILD_PREFIX)/include - -# --bindir=/opt/csw/mysql5/bin -# --datadir=/opt/csw/mysql5/share -# --exec_prefix=/opt/csw/mysql5 -# --infodir=/opt/csw/mysql5/share/info -# --libexecdir=/opt/csw/mysql5/libexec -# --mandir=/opt/csw/mysql5/share/man -# --prefix=/opt/csw/mysql5 -# --sbindir=/opt/csw/mysql5/sbin -# --sharedstatedir=/opt/csw/mysql5/share - # Where to put the init script global_sysconfdir = /etc$(BUILD_PREFIX) # Where to link the binaries @@ -80,17 +63,6 @@ RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt -PACKAGES += CSW$(NAME)client -SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries -RPKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)) -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 -CHECKPKG_OVERRIDES_CSWmysql5client += bad-rpath-entry # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSW$(NAME)client_programs += myisamlog @@ -110,6 +82,18 @@ CSW$(NAME)client_programs += perror CSW$(NAME)client_programs += replace +PACKAGES += CSW$(NAME)client +SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries +PKGFILES_CSW$(NAME)client = $(bindir) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)-$(BASE_VERSION)\.1) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 +CHECKPKG_OVERRIDES_CSWmysql5client += bad-rpath-entry + PACKAGES += CSW$(NAME) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) @@ -121,7 +105,19 @@ CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content PACKAGES += CSW$(NAME)bench +SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking +ARCHALL_CSW$(NAME)bench = 1 +PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* +RUNTIME_DEP_PKGS_CSW$(NAME)bench = CSW$(NAME) +RUNTIME_DEP_PKGS_CSW$(NAME)bench += CSWperl +CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWperl + PACKAGES += CSW$(NAME)test +SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files +ARCHALL_CSW$(NAME)test = 1 +PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* +RUNTIME_DEP_PKGS_CSW$(NAME)test = CSW$(NAME) +RUNTIME_DEP_PKGS_CSW$(NAME)test += CSWperl PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch @@ -129,30 +125,12 @@ PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch PATCHFILES += 0004-looking-for-ps-use-basename-0.patch -SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking -SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files +# Enable 64 bits build +BUILD64 = 1 -CATALOGNAME_CSW$(NAME)bench = $(NAME)bench -CATALOGNAME_CSW$(NAME)test = $(NAME)test - EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -ARCHALL_CSW$(NAME)bench = 1 -ARCHALL_CSW$(NAME)test = 1 - -# Enable 64 bits build -BUILD64 = 1 - -PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* - -PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* - -RUNTIME_DEP_PKGS_CSW$(NAME)bench = CSW$(NAME) -RUNTIME_DEP_PKGS_CSW$(NAME)bench += CSWperl -RUNTIME_DEP_PKGS_CSW$(NAME)test = CSW$(NAME) -RUNTIME_DEP_PKGS_CSW$(NAME)test += CSWperl - MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(VERSION).tar.gz DISTFILES += csw$(NAME) quick_start-csw README.CSW ChangeLog @@ -187,6 +165,7 @@ CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +CONFIGURE_ARGS += --program-suffix=-$(BASE_VERSION) # TODO: Make the tests pass. They don't at the moment. SKIPTEST ?= 1 @@ -208,7 +187,7 @@ CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) -CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqlaccess.1 +CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/mysqlaccess-5.0.1 # This could be reviewed. CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content @@ -261,12 +240,12 @@ ALTERNATIVES = ALTERNATIVES_CSW$(NAME) = -# This list could be generated automatically from $(EXECUTABLES) -# /home/maciej/src/opencsw/.buildsys/v2/gar//gar.pkg.mk:833: *** The variable 'ALTERNATIVE_comp_err' is empty, but must contain an alternative. Stop. ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION) ALTERNATIVE_mysql$(BASE_VERSION) = $(global_bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 ALTERNATIVE_mysql$(BASE_VERSION) += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ - $(global_bindir)/$C $C $(bindir)/$C) + $(bindir)/$C-$(BASE_VERSION) $C $(bindir)/$C) +ALTERNATIVE_mysql$(BASE_VERSION) += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ + $(mandir)/man1/$C-$(BASE_VERSION).1 $C $(mandir)/man1/$(C).1) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 2 13:42:03 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 11:42:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[15828] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15828 http://gar.svn.sourceforge.net/gar/?rev=15828&view=rev Author: wahwah Date: 2011-10-02 11:42:03 +0000 (Sun, 02 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: using alternatives for mysql_dev Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 10:56:01 UTC (rev 15827) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 11:42:03 UTC (rev 15828) @@ -31,7 +31,7 @@ # Where to link the binaries global_bindir = $(BUILD_PREFIX)/bin -INITSMF = $(sysconfdir)/init\.d/csw$(NAME) +INITSMF = $(global_sysconfdir)/init\.d/csw$(NAME) MYSQL_LIB_VER = 15 @@ -41,15 +41,21 @@ RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient$(MYSQL_LIB_VER) CSWmysql-dev_programs += mysql_config -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config\.1 PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1 +ALTERNATIVES_CSWmysql-dev = mysql_dev +ALTERNATIVE_mysql_dev = $(global_bindir)/$(firstword $(CSWmysql-dev_programs)) mysql $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 +ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ + $(bindir)/$C-$(BASE_VERSION) $C $(bindir)/$C) +ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ + $(mandir)/man1/$C-$(BASE_VERSION).1 $C $(mandir)/man1/$(C).1) PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 2 13:45:27 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 11:45:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[15829] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15829 http://gar.svn.sourceforge.net/gar/?rev=15829&view=rev Author: wahwah Date: 2011-10-02 11:45:27 +0000 (Sun, 02 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: backward compatible localstatedir (/var/opt/csw/mysql5) Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 11:42:03 UTC (rev 15828) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 11:45:27 UTC (rev 15829) @@ -33,6 +33,9 @@ INITSMF = $(global_sysconfdir)/init\.d/csw$(NAME) +# Existing databases are in this location +localstatedir = /var/opt/csw/mysql5 + MYSQL_LIB_VER = 15 PACKAGES += CSWmysql-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 2 14:58:38 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 02 Oct 2011 12:58:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[15830] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 15830 http://gar.svn.sourceforge.net/gar/?rev=15830&view=rev Author: rthurner Date: 2011-10-02 12:58:37 +0000 (Sun, 02 Oct 2011) Log Message: ----------- mercurial: upgrade to hg-1.9.3 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 2011-10-02 11:45:27 UTC (rev 15829) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-10-02 12:58:37 UTC (rev 15830) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 1.9.2 +VERSION = 1.9.3 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-10-02 11:45:27 UTC (rev 15829) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-10-02 12:58:37 UTC (rev 15830) @@ -1 +1 @@ -0bda8040e2626e70d3d1a0654b0b03f2 mercurial-1.9.2.tar.gz +f309b084aaf58773e9f4f4d66c49622a mercurial-1.9.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sun Oct 2 16:12:29 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 02 Oct 2011 14:12:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[15831] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 15831 http://gar.svn.sourceforge.net/gar/?rev=15831&view=rev Author: phipsy Date: 2011-10-02 14:12:29 +0000 (Sun, 02 Oct 2011) Log Message: ----------- puppet: 2.6.11 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-10-02 12:58:37 UTC (rev 15830) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-10-02 14:12:29 UTC (rev 15831) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.7.1 +VERSION = 2.6.11 CATEGORIES = apps define BLURB @@ -28,6 +28,7 @@ DISTFILES += CSWpuppet.postinstall # pkgutil.rb is from https://raw.github.com/domcleal/puppet/tickets/master/8011/lib/puppet/provider/package/pkgutil.rb # Should be headed into 2.7 code - supports -t REPO +# Still not in 2.7.3 as of 9/9/11 DISTFILES += pkgutil.rb DISTFILES += README.CSW DISTFILES += puppet.conf.example-CSW Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2011-10-02 12:58:37 UTC (rev 15830) +++ csw/mgar/pkg/puppet/trunk/checksums 2011-10-02 14:12:29 UTC (rev 15831) @@ -4,3 +4,5 @@ 588dc3343ea66983010e8c4eb58af6af puppet-2.6.8.tar.gz b41bee893aea4624b441a3c29e760c31 puppet-2.6.9.tar.gz 7a0346758af0222dc5e2b2b1a99c44ec puppet-2.7.1.tar.gz +f60d8118ee1f3d68b2383acf3dd76d38 puppet-2.7.3.tar.gz +c95639073a812a0c91119b10f46a66fb puppet-2.6.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 2 23:04:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 21:04:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[15832] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 15832 http://gar.svn.sourceforge.net/gar/?rev=15832&view=rev Author: wahwah Date: 2011-10-02 21:04:25 +0000 (Sun, 02 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: alternatives corrected, startup script updated Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 14:12:29 UTC (rev 15831) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 21:04:25 UTC (rev 15832) @@ -56,9 +56,9 @@ ALTERNATIVES_CSWmysql-dev = mysql_dev ALTERNATIVE_mysql_dev = $(global_bindir)/$(firstword $(CSWmysql-dev_programs)) mysql $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ - $(bindir)/$C-$(BASE_VERSION) $C $(bindir)/$C) + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ - $(mandir)/man1/$C-$(BASE_VERSION).1 $C $(mandir)/man1/$(C).1) + $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -101,6 +101,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWalternatives CHECKPKG_OVERRIDES_CSWmysql5client += bad-rpath-entry PACKAGES += CSW$(NAME) @@ -110,6 +111,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWalternatives CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content @@ -142,7 +144,10 @@ MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(VERSION).tar.gz -DISTFILES += csw$(NAME) quick_start-csw README.CSW ChangeLog +DISTFILES += csw$(NAME).tpl +DISTFILES += quick_start-csw +DISTFILES += README.CSW +DISTFILES += ChangeLog DISTFILES += CSW$(NAME).preinstall DISTFILES += CSW$(NAME).postinstall DISTFILES += cswusergroup @@ -252,9 +257,9 @@ ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION) ALTERNATIVE_mysql$(BASE_VERSION) = $(global_bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 ALTERNATIVE_mysql$(BASE_VERSION) += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ - $(bindir)/$C-$(BASE_VERSION) $C $(bindir)/$C) + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql$(BASE_VERSION) += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ - $(mandir)/man1/$C-$(BASE_VERSION).1 $C $(mandir)/man1/$(C).1) + $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) include gar/category.mk @@ -289,7 +294,14 @@ gln -sf ../../../$(NAME)/share/$(NAME)/doc/README.CSW \ $(PKGROOT)/opt/csw/share/$(NAME)/doc/README.CSW ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d - ginstall -m 755 $(FILEDIR)/csw$(NAME) $(PKGROOT)$(sysconfdir)/init.d + gsed \ + -e 's+ at prefix@+$(prefix)+' \ + -e 's+ at varstatedir@+$(varstatedir)+' \ + -e 's+ at sysconfdir@+$(sysconfdir)+' \ + -e 's+ at bindir@+$(bindir)+' \ + < $(WORKDIR)/csw$(NAME).tpl \ + > $(WORKDIR)/csw$(NAME) + ginstall -m 755 $(WORKDIR)/csw$(NAME) $(PKGROOT)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-10-02 14:12:29 UTC (rev 15831) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-10-02 21:04:25 UTC (rev 15832) @@ -1,203 +0,0 @@ -#!/bin/sh -# -# $Id$ -# Start script for MySQL database. -# -# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod -# 700. -# -# First time installation can use quick_start-csw in -# /opt/csw/mysql5/share/mysql to build the mysql database for the -# grant tables. Or create the initial database yourself. -# -# Use my.cnf for startup options. See MySQL documention -# for 'Using Option Files'. -# Support for mysql5rc still remains in this startup script. -# - -RETVAL=0 -prefix="/opt/csw/mysql5" -BASEDIR="${prefix}" -MYSQL_VAR="/var${prefix}" -sysconfdir="/etc${prefix}" -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=${sysconfdir}/my.cnf - -# -# Source configuration -[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc -[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc - -if [ -r "${sysconfdir}/my.cnf" ]; then - MYSQL_HOME="${MYSQL_VAR}" -elif [ -r "${BASEDIR}/my.cnf" ]; then - MYSQL_HOME="${BASEDIR}" -fi -export MYSQL_HOME - -# To get started quickly, copy a sample configuration file from -# $BASEDIR/share/mysql -# For example, -# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf -# -# Or, manually follow the database creation steps below, and have -# mysql just use defaults for everything. - -# 2006-03-11 Changed to only look for the grant tables database -# 2006-04-16 Changed again. Look for either the grant tables database -# or the options file. -# 2006-12-28 Fix problem. Look for either the grant tables database in -# the default location or the default options file. -if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then - exit 0 -fi - -# If CONFFILE is the server default file, unset CONFFILE -if [ "${CONFFILE}" = "${MYSQL_HOME}/my.cnf" \ - -o \ - "${CONFFILE}" = "${sysconfdir}/my.cnf" ]; then - CONFFILE= -fi - -# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR -# Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQL_HOME/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then - MYSQLD_DATADIR= -fi - -# Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_HOME/mysql.pid} - -# If a database already exists, start whether or not there is a conf file. -# If no conf file, the database will just use internal defaults for everything. - -start_it() { - if test -r $MYSQLD_PID_FILE ; then - if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." - return 1 - fi - fi - - printf "%-60s" "Starting mysqld: " - - # 2006-03-11 - # This script no longer creates the default database. You may create the - # default database manually or use - # /opt/csw/mysql5/share/mysql/quick_start-csw - # if [ ! -d "$BASEDIR/var/mysql" ] ; then - # echo MySQL core database has not been created. - # echo Creating it now... - # $BASEDIR/bin/mysql_install_db - # chown -R mysql:mysql $BASEDIR/var - # fi - - # 2006-04-16 --defaults-file is changed to --defaults-extra-file - $BASEDIR/bin/mysqld_safe \ - `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ - --pid-file=$MYSQLD_PID_FILE \ - `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ - `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ - `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ - `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ - `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ - `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ - `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ - `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ - `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ - `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ - `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ - `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ - `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ - `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ - `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ - `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ - `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ - `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ - `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ - `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ - `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ - `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ - `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ - `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ - `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ - `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ - `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ - `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ - `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ - `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ - `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ - `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ - `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ - `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ - `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ - `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ - `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ - `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ - `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ - `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ - `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ - `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ - `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ - & >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - return 0 -} - -stop_it() { - - printf "%-60s" "Shutting down mysqld: " - if test -f "$MYSQLD_PID_FILE" ; then - pkill `pgrep_opts` mysqld_safe >/dev/null 2>&1 - kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - echo "" - return 0 -} - -pgrep_opts() { - if [ -x /bin/zonename ] - then - echo "-z `/bin/zonename`" - fi -} - -case $1 in - start) - start_it - ;; - - stop) - stop_it - ;; - - restart) - stop_it - while pgrep `pgrep_opts` mysqld > /dev/null - do - sleep 1 - done - start_it - ;; - - *) - echo "Usage: $0 { start | stop | restart } " - ;; -esac - -exit $RETVAL Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl (from rev 15728, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-10-02 21:04:25 UTC (rev 15832) @@ -0,0 +1,205 @@ +#!/bin/sh +# vim:ft=sh: +# +# $Id$ +# Start script for MySQL database. +# +# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod +# 700. +# +# First time installation can use quick_start-csw in +# /opt/csw/mysql5/share/mysql to build the mysql database for the +# grant tables. Or create the initial database yourself. +# +# Use my.cnf for startup options. See MySQL documention +# for 'Using Option Files'. +# Support for mysql5rc still remains in this startup script. +# + +RETVAL=0 +prefix="@prefix@" +BASEDIR="${prefix}" +BINDIR="@bindir@" +MYSQL_VAR="@varstatedir@" +sysconfdir="@sysconfdir@" +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=${sysconfdir}/my.cnf + +# Source the configuration +[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc +[ -r @prefix@/etc/mysql5rc ] && . @prefix@/etc/mysql5rc +[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc + +if [ -r "${sysconfdir}/my.cnf" ]; then + MYSQL_HOME="${MYSQL_VAR}" +elif [ -r "${BASEDIR}/my.cnf" ]; then + MYSQL_HOME="${BASEDIR}" +fi +export MYSQL_HOME + +# To get started quickly, copy a sample configuration file from +# $BASEDIR/share/mysql +# For example, +# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf +# +# Or, manually follow the database creation steps below, and have +# mysql just use defaults for everything. + +# 2006-03-11 Changed to only look for the grant tables database +# 2006-04-16 Changed again. Look for either the grant tables database +# or the options file. +# 2006-12-28 Fix problem. Look for either the grant tables database in +# the default location or the default options file. +if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then + exit 0 +fi + +# If CONFFILE is the server default file, unset CONFFILE +if [ "${CONFFILE}" = "${MYSQL_HOME}/my.cnf" \ + -o \ + "${CONFFILE}" = "${sysconfdir}/my.cnf" ]; then + CONFFILE= +fi + +# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR +# Also, check that MYSQLD_DATADIR contains a mysql directory +if [ ! -d "$MYSQL_HOME/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then + MYSQLD_DATADIR= +fi + +# Make sure required vars are set +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_HOME/mysql.pid} + +# If a database already exists, start whether or not there is a conf file. +# If no conf file, the database will just use internal defaults for everything. + +start_it() { + if test -r $MYSQLD_PID_FILE ; then + if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then + echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." + return 1 + fi + fi + + printf "%-60s" "Starting mysqld: " + + # 2006-03-11 + # This script no longer creates the default database. You may create the + # default database manually or use + # /opt/csw/mysql5/share/mysql/quick_start-csw + # if [ ! -d "$BASEDIR/var/mysql" ] ; then + # echo MySQL core database has not been created. + # echo Creating it now... + # $BASEDIR/bin/mysql_install_db + # chown -R mysql:mysql $BASEDIR/var + # fi + + # 2006-04-16 --defaults-file is changed to --defaults-extra-file + ${BINDIR}/mysqld_safe \ + `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ + --pid-file=$MYSQLD_PID_FILE \ + `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ + `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ + `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ + `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ + `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ + `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ + `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ + `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ + `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ + `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ + `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ + `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ + `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ + `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ + `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ + `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ + `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ + `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ + `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ + `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ + `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ + `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ + `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ + `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ + `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ + `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ + `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ + `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ + `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ + `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ + `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ + `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ + `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ + `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ + `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ + `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ + `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ + `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ + `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ + `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ + `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ + `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ + `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ + & >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + return 1 + fi + return 0 +} + +stop_it() { + + printf "%-60s" "Shutting down mysqld: " + if test -f "$MYSQLD_PID_FILE" ; then + pkill `pgrep_opts` mysqld_safe >/dev/null 2>&1 + kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 + RETVAL=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + echo "" + return 0 +} + +pgrep_opts() { + if [ -x /bin/zonename ] + then + echo "-z `/bin/zonename`" + fi +} + +case $1 in + start) + start_it + ;; + + stop) + stop_it + ;; + + restart) + stop_it + while pgrep `pgrep_opts` mysqld > /dev/null + do + sleep 1 + done + start_it + ;; + + *) + echo "Usage: $0 { start | stop | restart } " + ;; +esac + +exit $RETVAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 3 00:04:46 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 22:04:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[15833] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15833 http://gar.svn.sourceforge.net/gar/?rev=15833&view=rev Author: wahwah Date: 2011-10-02 22:04:46 +0000 (Sun, 02 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: turns out, GAR automatically adds the CSWalternatives dependency Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 21:04:25 UTC (rev 15832) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 22:04:46 UTC (rev 15833) @@ -101,8 +101,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWalternatives -CHECKPKG_OVERRIDES_CSWmysql5client += bad-rpath-entry +CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry PACKAGES += CSW$(NAME) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) @@ -111,7 +110,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWalternatives CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 3 00:42:20 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 22:42:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[15834] csw/mgar/pkg/schily/trunk/Makefile Message-ID: Revision: 15834 http://gar.svn.sourceforge.net/gar/?rev=15834&view=rev Author: wahwah Date: 2011-10-02 22:42:20 +0000 (Sun, 02 Oct 2011) Log Message: ----------- pkg/schily/trunk: switching to smake, the build breaks Modified Paths: -------------- csw/mgar/pkg/schily/trunk/Makefile Modified: csw/mgar/pkg/schily/trunk/Makefile =================================================================== --- csw/mgar/pkg/schily/trunk/Makefile 2011-10-02 22:04:46 UTC (rev 15833) +++ csw/mgar/pkg/schily/trunk/Makefile 2011-10-02 22:42:20 UTC (rev 15834) @@ -11,12 +11,25 @@ SPKG_SOURCEURL = MASTER_SITES = ftp://ftp.berlios.de/pub/schily/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 +BUILD_DEP_PKGS = CSWsmake CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +INSTALL_SCRIPTS = custom TEST_SCRIPTS = -INS_BASE = /opt/csw -INS_RBASE = /opt/csw +INS_BASE = $(BUILD_PREFIX) +INS_RBASE = $(BUILD_PREFIX) EXTRA_COMMON_EXPORTS = INS_BASE INS_RBASE # Shared libraries don't work at the moment. # LINKMODE = dynamic # EXTRA_COMMON_EXPORTS += LINKMODE +BUILD_ARGS = INS_BASE=$(INS_BASE) INS_RBASE=$(INS_RBASE) + include gar/category.mk + +build-custom: + (cd $(WORKSRC) && smake $(BUILD_ARGS)) + @$(MAKECOOKIE) + +install-custom: + (cd $(WORKSRC) && smake $(BUILD_ARGS) install) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 3 00:55:42 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Oct 2011 22:55:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[15835] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15835 http://gar.svn.sourceforge.net/gar/?rev=15835&view=rev Author: wahwah Date: 2011-10-02 22:55:42 +0000 (Sun, 02 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: moving the macro expansion to a -modulated target Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 22:42:20 UTC (rev 15834) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 22:55:42 UTC (rev 15835) @@ -278,6 +278,16 @@ cd $(WORKSRC) && autoreconf --force --install --symlink @$(MAKECOOKIE) +post-configure-modulated: + gsed \ + -e 's+ at prefix@+$(prefix)+' \ + -e 's+ at varstatedir@+$(varstatedir)+' \ + -e 's+ at sysconfdir@+$(sysconfdir)+' \ + -e 's+ at bindir@+$(bindir)+' \ + < $(WORKDIR)/csw$(NAME).tpl \ + > $(WORKDIR)/csw$(NAME) + @$(MAKECOOKIE) + post-install-modulated: (cd $(DESTDIR)$(libdir); gmv -v mysql/* .) (cd $(DESTDIR)$(libdir); grmdir -v mysql) @@ -292,13 +302,6 @@ gln -sf ../../../$(NAME)/share/$(NAME)/doc/README.CSW \ $(PKGROOT)/opt/csw/share/$(NAME)/doc/README.CSW ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d - gsed \ - -e 's+ at prefix@+$(prefix)+' \ - -e 's+ at varstatedir@+$(varstatedir)+' \ - -e 's+ at sysconfdir@+$(sysconfdir)+' \ - -e 's+ at bindir@+$(bindir)+' \ - < $(WORKDIR)/csw$(NAME).tpl \ - > $(WORKDIR)/csw$(NAME) ginstall -m 755 $(WORKDIR)/csw$(NAME) $(PKGROOT)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 3 09:21:57 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Oct 2011 07:21:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[15836] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15836 http://gar.svn.sourceforge.net/gar/?rev=15836&view=rev Author: wahwah Date: 2011-10-03 07:21:57 +0000 (Mon, 03 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: WORKDIR is only available from the *-modulated targets Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-02 22:55:42 UTC (rev 15835) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-03 07:21:57 UTC (rev 15836) @@ -291,6 +291,7 @@ post-install-modulated: (cd $(DESTDIR)$(libdir); gmv -v mysql/* .) (cd $(DESTDIR)$(libdir); grmdir -v mysql) + ginstall -m 755 $(WORKDIR)/csw$(NAME) $(PKGROOT)$(sysconfdir)/init.d @$(MAKECOOKIE) post-merge: @@ -302,7 +303,6 @@ gln -sf ../../../$(NAME)/share/$(NAME)/doc/README.CSW \ $(PKGROOT)/opt/csw/share/$(NAME)/doc/README.CSW ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d - ginstall -m 755 $(WORKDIR)/csw$(NAME) $(PKGROOT)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 3 09:48:15 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Oct 2011 07:48:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[15837] csw/mgar/pkg/schily/trunk/Makefile Message-ID: Revision: 15837 http://gar.svn.sourceforge.net/gar/?rev=15837&view=rev Author: wahwah Date: 2011-10-03 07:48:15 +0000 (Mon, 03 Oct 2011) Log Message: ----------- pkg/schily/trunk: build progressed, but still failed Modified Paths: -------------- csw/mgar/pkg/schily/trunk/Makefile Modified: csw/mgar/pkg/schily/trunk/Makefile =================================================================== --- csw/mgar/pkg/schily/trunk/Makefile 2011-10-03 07:21:57 UTC (rev 15836) +++ csw/mgar/pkg/schily/trunk/Makefile 2011-10-03 07:48:15 UTC (rev 15837) @@ -24,12 +24,14 @@ # EXTRA_COMMON_EXPORTS += LINKMODE BUILD_ARGS = INS_BASE=$(INS_BASE) INS_RBASE=$(INS_RBASE) +PATH = /opt/csw/bin:/usr/ccs/bin:/usr/bin + include gar/category.mk build-custom: - (cd $(WORKSRC) && smake $(BUILD_ARGS)) + (cd $(WORKSRC) && /usr/bin/env -i PATH=$(PATH) /opt/csw/bin/smake $(BUILD_ARGS)) @$(MAKECOOKIE) install-custom: - (cd $(WORKSRC) && smake $(BUILD_ARGS) install) + (cd $(WORKSRC) && /usr/bin/env -i PATH=$(PATH) /opt/csw/bin/smake $(BUILD_ARGS) install) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 3 10:02:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Oct 2011 08:02:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15838] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15838 http://gar.svn.sourceforge.net/gar/?rev=15838&view=rev Author: wahwah Date: 2011-10-03 08:02:07 +0000 (Mon, 03 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: The init.d base directory is needed too Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-03 07:48:15 UTC (rev 15837) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-03 08:02:07 UTC (rev 15838) @@ -291,7 +291,8 @@ post-install-modulated: (cd $(DESTDIR)$(libdir); gmv -v mysql/* .) (cd $(DESTDIR)$(libdir); grmdir -v mysql) - ginstall -m 755 $(WORKDIR)/csw$(NAME) $(PKGROOT)$(sysconfdir)/init.d + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d @$(MAKECOOKIE) post-merge: @@ -302,13 +303,12 @@ ginstall -m 755 -d $(PKGROOT)/opt/csw/share/$(NAME)/doc gln -sf ../../../$(NAME)/share/$(NAME)/doc/README.CSW \ $(PKGROOT)/opt/csw/share/$(NAME)/doc/README.CSW - ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) # Create symlinks to binaries - ginstall -m 755 -d $(PKGROOT)$(global_bindir) + # ginstall -m 755 -d $(PKGROOT)$(global_bindir) #for f in $(PKGROOT)$(bindir)/*; do \ # if echo $$f | grep amd64$$; then continue; fi; \ # if echo $$f | grep sparcv9$$; then continue; fi; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Oct 3 14:53:52 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 03 Oct 2011 12:53:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[15839] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 15839 http://gar.svn.sourceforge.net/gar/?rev=15839&view=rev Author: guengel Date: 2011-10-03 12:53:52 +0000 (Mon, 03 Oct 2011) Log Message: ----------- glib2/trunk: Fixed/excluded tests. Tests running on all platforms now. Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0016-Format-string-for-Solaris-lt.-10u9.patch csw/mgar/pkg/glib2/trunk/files/0017-Disable-gapplication-gapplication-basic-test.patch csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch csw/mgar/pkg/glib2/trunk/files/0018-Disable-gdbus-connection-large_message-on-sparc.patch csw/mgar/pkg/glib2/trunk/files/0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch csw/mgar/pkg/glib2/trunk/files/0019-Disable-volumemonitor-tests.patch csw/mgar/pkg/glib2/trunk/files/0019-Fix-gdbus-peer-tests.patch csw/mgar/pkg/glib2/trunk/files/0020-Disable-buffered-input-stream-set-buffer-size-on-spa.patch csw/mgar/pkg/glib2/trunk/files/0022-Disable-gsettings-strinfo-on-sparcv9.patch csw/mgar/pkg/glib2/trunk/files/0023-Disable-run-assert-msg-test.sh.patch Removed Paths: ------------- csw/mgar/pkg/glib2/trunk/files/0009-Fix-gdbus-peer-tests.patch csw/mgar/pkg/glib2/trunk/files/0014-Disable-log-tests.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-10-03 08:02:07 UTC (rev 15838) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-10-03 12:53:52 UTC (rev 15839) @@ -25,7 +25,6 @@ PATCHFILES += 0005-Fix-hard-coded-paths.patch PATCHFILES += 0006-Fix-path-to-dbus-machine-id.patch PATCHFILES += 0007-Fix-configure-_XOPEN_SOURCE.patch -PATCHFILES += 0009-Fix-gdbus-peer-tests.patch PATCHFILES += 0009-make-gsocket.c-word-with-solaris.patch # Disabled until fixed: # https://bugzilla.gnome.org/show_bug.cgi?id=659306 @@ -33,10 +32,22 @@ PATCHFILES += 0011-Remove-support-for-abstract-sockets-from-g_socket_ad.patch PATCHFILES += 0012-Use-proper-locale-for-collate-tests-2.patch PATCHFILES += 0013-Fix-test-shell-script.patch -PATCHFILES += 0014-Disable-log-tests.patch +PATCHFILES += 0019-Fix-gdbus-peer-tests.patch +# Disable test on sparc v9 +# https://bugzilla.gnome.org/show_bug.cgi?id=660638 +PATCHFILES += 0020-Disable-buffered-input-stream-set-buffer-size-on-spa.patch + +# Those patches are for tests that fail on the build farm +# but not on other build hosts. PATCHFILES += 0015-Do-not-ellipses-in-switch-cases.patch -#PATCHFILES += 0016-Format-string-for-Solaris-lt.-10u9.patch -#PATCHFILES += 0017-Disable-gvariant-varargs-test.patch +PATCHFILES += 0016-Format-string-for-Solaris-lt.-10u9.patch +PATCHFILES += 0017-Disable-gapplication-gapplication-basic-test.patch +PATCHFILES += 0017-Fix-disable-testglib-tests.patch +PATCHFILES += 0018-Disable-gdbus-connection-large_message-on-sparc.patch +PATCHFILES += 0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch +PATCHFILES += 0019-Disable-volumemonitor-tests.patch +PATCHFILES += 0022-Disable-gsettings-strinfo-on-sparcv9.patch +PATCHFILES_isa-sparcv9 += 0023-Disable-run-assert-msg-test.sh.patch PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 # Make special build for Solaris 10 to use dtrace @@ -149,10 +160,14 @@ CONFIGURE_ARGS += --disable-dtrace # DEBUGGING -#CONFIGURE_ARGS += --enable-debug=yes -#EXTRA_CFLAGS += -xO0 -g +CONFIGURE_ARGS += --enable-debug=yes +EXTRA_CFLAGS += -xO0 -g -TEST_ENV = TZ=Europe/Berlin +# Those are to make the checks work +EXTRA_COMMON_EXPORTS = TZ +EXTRA_COMMON_EXPORTS += DISPLAY +EXTRA_COMMON_EXPORTS += TERM +EXTRA_COMMON_EXPORTS += HOME PYCOMPILE = 1 Deleted: csw/mgar/pkg/glib2/trunk/files/0009-Fix-gdbus-peer-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0009-Fix-gdbus-peer-tests.patch 2011-10-03 08:02:07 UTC (rev 15838) +++ csw/mgar/pkg/glib2/trunk/files/0009-Fix-gdbus-peer-tests.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -1,106 +0,0 @@ -From 30e8cd362e7392872f518f67564be350ede69654 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Wed, 14 Sep 2011 11:04:32 +0200 -Subject: [PATCH] Fix gdbus-peer tests - ---- - gio/tests/gdbus-peer.c | 34 ++++++++++++++++++++++++++++++++-- - 1 files changed, 32 insertions(+), 2 deletions(-) - -diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c -index e304618..5e5c64d 100644 ---- a/gio/tests/gdbus-peer.c -+++ b/gio/tests/gdbus-peer.c -@@ -41,6 +41,7 @@ - #ifdef G_OS_UNIX - #include - #include -+#include - #endif - - #include "gdbus-tests.h" -@@ -51,6 +52,7 @@ static gboolean is_unix = TRUE; - static gboolean is_unix = FALSE; - #endif - -+static gchar *tmp_address = NULL; - static gchar *test_guid = NULL; - static GMainLoop *service_loop = NULL; - static GDBusServer *server = NULL; -@@ -328,7 +330,7 @@ service_thread_func (gpointer user_data) - - error = NULL; - observer = g_dbus_auth_observer_new (); -- server = g_dbus_server_new_sync (is_unix ? "unix:tmpdir=/tmp/gdbus-test-" : "nonce-tcp:", -+ server = g_dbus_server_new_sync (tmp_address, - G_DBUS_SERVER_FLAGS_NONE, - test_guid, - observer, -@@ -1002,7 +1004,7 @@ dmp_thread_func (gpointer user_data) - - error = NULL; - guid = g_dbus_generate_guid (); -- data->server = g_dbus_server_new_sync ("unix:tmpdir=/tmp/gdbus-test-", -+ data->server = g_dbus_server_new_sync (tmp_address, - G_DBUS_SERVER_FLAGS_NONE, - guid, - NULL, /* GDBusAuthObserver */ -@@ -1444,6 +1446,8 @@ main (int argc, - { - gint ret; - GDBusNodeInfo *introspection_data = NULL; -+ gchar *tmpdir = NULL; -+ gchar *template = NULL; - - g_type_init (); - g_thread_init (NULL); -@@ -1455,6 +1459,21 @@ main (int argc, - - test_guid = g_dbus_generate_guid (); - -+ if (is_unix) -+ { -+ if (g_unix_socket_address_abstract_names_supported ()) -+ tmp_address = g_strdup ("unix:tmpdir=/tmp/gdbus-test-"); -+ else -+ { -+ template = g_strdup("/tmp/gdbus-test-XXXXXX"); -+ tmpdir = mktemp(template); -+ mkdir(tmpdir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); -+ tmp_address = g_strdup_printf ("unix:tmpdir=%s", tmpdir); -+ } -+ } -+ else -+ tmp_address = g_strdup ("nonce-tcp:"); -+ - /* all the tests rely on a shared main loop */ - loop = g_main_loop_new (NULL, FALSE); - -@@ -1463,7 +1482,9 @@ main (int argc, - #ifdef BUG_631379_FIXED - g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp); - #endif -+#if defined(__linux__) || defined(__FreeBSD__) - g_test_add_func ("/gdbus/credentials", test_credentials); -+#endif - g_test_add_func ("/gdbus/overflow", test_overflow); - - ret = g_test_run(); -@@ -1471,6 +1492,15 @@ main (int argc, - g_main_loop_unref (loop); - g_free (test_guid); - g_dbus_node_info_unref (introspection_data); -+ if (is_unix) -+ g_free (tmp_address); -+ if (template) -+ g_free (template); -+ if (tmpdir) -+ { -+ g_rmdir (tmpdir); -+ g_free (tmpdir); -+ } - - return ret; - } --- -1.7.6.1 Deleted: csw/mgar/pkg/glib2/trunk/files/0014-Disable-log-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0014-Disable-log-tests.patch 2011-10-03 08:02:07 UTC (rev 15838) +++ csw/mgar/pkg/glib2/trunk/files/0014-Disable-log-tests.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -1,76 +0,0 @@ -From 0820120801a1f57ba4200bf8bf9cf6d56a58a07d Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 18 Sep 2011 08:51:17 +0200 -Subject: [PATCH] Disable log tests - ---- - tests/testglib.c | 53 +++++++++++++++++++++++++++-------------------------- - 1 files changed, 27 insertions(+), 26 deletions(-) - -diff --git a/tests/testglib.c b/tests/testglib.c -index 158808a..c3e8c59 100644 ---- a/tests/testglib.c -+++ b/tests/testglib.c -@@ -533,32 +533,33 @@ test_g_parse_debug_string (void) - static void - log_warning_error_tests (void) - { -- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) -- { -- g_message ("this is a g_message test."); -- g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\""); -- g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\""); -- exit (0); -- } -- g_test_trap_assert_passed(); -- g_test_trap_assert_stderr ("*is a g_message test*"); -- g_test_trap_assert_stderr ("*non-printable UTF-8*"); -- g_test_trap_assert_stderr ("*unsafe chars*"); -- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) -- { -- g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345); -- exit (0); -- } -- g_test_trap_assert_failed(); /* we have fatal-warnings enabled */ -- g_test_trap_assert_stderr ("*harmless warning*"); -- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) -- { -- g_print (NULL); -- exit (0); -- } -- g_test_trap_assert_failed(); /* we have fatal-warnings enabled */ -- g_test_trap_assert_stderr ("*g_print*assertion*failed*"); -- g_test_trap_assert_stderr ("*NULL*"); -+ /* Disabled: Won't work */ -+ /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */ -+ /* { */ -+ /* g_message ("this is a g_message test."); */ -+ /* g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\""); */ -+ /* g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\""); */ -+ /* exit (0); */ -+ /* } */ -+ /* g_test_trap_assert_passed(); */ -+ /* g_test_trap_assert_stderr ("*is a g_message test*"); */ -+ /* g_test_trap_assert_stderr ("*non-printable UTF-8*"); */ -+ /* g_test_trap_assert_stderr ("*unsafe chars*"); */ -+ /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */ -+ /* { */ -+ /* g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345); */ -+ /* exit (0); */ -+ /* } */ -+ /* g_test_trap_assert_failed(); /\* we have fatal-warnings enabled *\/ */ -+ /* g_test_trap_assert_stderr ("*harmless warning*"); */ -+ /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */ -+ /* { */ -+ /* g_print (NULL); */ -+ /* exit (0); */ -+ /* } */ -+ /* g_test_trap_assert_failed(); /\* we have fatal-warnings enabled *\/ */ -+ /* g_test_trap_assert_stderr ("*g_print*assertion*failed*"); */ -+ /* g_test_trap_assert_stderr ("*NULL*"); */ - } - - static void --- -1.7.6.1 - Added: csw/mgar/pkg/glib2/trunk/files/0016-Format-string-for-Solaris-lt.-10u9.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0016-Format-string-for-Solaris-lt.-10u9.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0016-Format-string-for-Solaris-lt.-10u9.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,25 @@ +From 45edb4fed7b58e5ec7ed6b055f0dd73536821a7a Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 24 Sep 2011 17:06:12 +0200 +Subject: [PATCH] Format string for Solaris lt. 10u9 + +--- + glib/tests/string.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/glib/tests/string.c b/glib/tests/string.c +index ff172bd..8f85c93 100644 +--- a/glib/tests/string.c ++++ b/glib/tests/string.c +@@ -102,7 +102,7 @@ test_string_printf (void) + #ifndef G_OS_WIN32 + /* MSVC and mingw32 use the same run-time C library, which doesn't like + the %10000.10000f format... */ +- g_string_printf (string, "%s|%0100d|%s|%0*d|%*.*f|%10000.10000f", ++ g_string_printf (string, "%s|%0100d|%s|%0*d|%*.*f|%100.100f", + "this pete guy sure is a wuss, like he's the number ", + 1, + " wuss. everyone agrees.\n", +-- +1.7.6.1 + Added: csw/mgar/pkg/glib2/trunk/files/0017-Disable-gapplication-gapplication-basic-test.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0017-Disable-gapplication-gapplication-basic-test.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0017-Disable-gapplication-gapplication-basic-test.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,28 @@ +From d88d6aad48bf8c0f2478d14968527b7ff82e6292 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Thu, 29 Sep 2011 07:57:46 +0200 +Subject: [PATCH] Disable gapplication gapplication/basic test + +Won't work on build farm. +--- + gio/tests/gapplication.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c +index 453d8d8..4234be8 100644 +--- a/gio/tests/gapplication.c ++++ b/gio/tests/gapplication.c +@@ -224,6 +224,10 @@ basic (void) + int + main (int argc, char **argv) + { ++ /* Won't work on build farm */ ++ printf("Doesn't work on build farm\n"); ++ exit(0); ++ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/gapplication/basic", basic); +-- +1.7.6.1 + Added: csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,85 @@ +From 32edd15a61dee58fe9dc3547147d99a7a9d923fe Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Thu, 29 Sep 2011 14:08:06 +0200 +Subject: [PATCH] Fix/disable testglib tests + +--- + tests/testglib.c | 55 +++++++++++++++++++++++++++-------------------------- + 1 files changed, 28 insertions(+), 27 deletions(-) + +diff --git a/tests/testglib.c b/tests/testglib.c +index 158808a..c012d04 100644 +--- a/tests/testglib.c ++++ b/tests/testglib.c +@@ -533,32 +533,33 @@ test_g_parse_debug_string (void) + static void + log_warning_error_tests (void) + { +- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) +- { +- g_message ("this is a g_message test."); +- g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\""); +- g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\""); +- exit (0); +- } +- g_test_trap_assert_passed(); +- g_test_trap_assert_stderr ("*is a g_message test*"); +- g_test_trap_assert_stderr ("*non-printable UTF-8*"); +- g_test_trap_assert_stderr ("*unsafe chars*"); +- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) +- { +- g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345); +- exit (0); +- } +- g_test_trap_assert_failed(); /* we have fatal-warnings enabled */ +- g_test_trap_assert_stderr ("*harmless warning*"); +- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) +- { +- g_print (NULL); +- exit (0); +- } +- g_test_trap_assert_failed(); /* we have fatal-warnings enabled */ +- g_test_trap_assert_stderr ("*g_print*assertion*failed*"); +- g_test_trap_assert_stderr ("*NULL*"); ++ /* Disabled: Won't work */ ++ /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */ ++ /* { */ ++ /* g_message ("this is a g_message test."); */ ++ /* g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\""); */ ++ /* g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\""); */ ++ /* exit (0); */ ++ /* } */ ++ /* g_test_trap_assert_passed(); */ ++ /* g_test_trap_assert_stderr ("*is a g_message test*"); */ ++ /* g_test_trap_assert_stderr ("*non-printable UTF-8*"); */ ++ /* g_test_trap_assert_stderr ("*unsafe chars*"); */ ++ /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */ ++ /* { */ ++ /* g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345); */ ++ /* exit (0); */ ++ /* } */ ++ /* g_test_trap_assert_failed(); /\* we have fatal-warnings enabled *\/ */ ++ /* g_test_trap_assert_stderr ("*harmless warning*"); */ ++ /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */ ++ /* { */ ++ /* g_print (NULL); */ ++ /* exit (0); */ ++ /* } */ ++ /* g_test_trap_assert_failed(); /\* we have fatal-warnings enabled *\/ */ ++ /* g_test_trap_assert_stderr ("*g_print*assertion*failed*"); */ ++ /* g_test_trap_assert_stderr ("*NULL*"); */ + } + + static void +@@ -1130,7 +1131,7 @@ gstring_tests (void) + for (i = 0; i < 10000; i++) + g_string_append_c (string1, 'a'+(i%26)); + +-#ifndef G_OS_WIN32 ++#if !(defined(G_OS_WIN32) || defined(__sun)) + /* MSVC, mingw32 and LCC use the same run-time C library, which doesn't like + the %10000.10000f format... */ + g_string_printf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%10000.10000f", +-- +1.7.6.1 + Added: csw/mgar/pkg/glib2/trunk/files/0018-Disable-gdbus-connection-large_message-on-sparc.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0018-Disable-gdbus-connection-large_message-on-sparc.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0018-Disable-gdbus-connection-large_message-on-sparc.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,26 @@ +From 07dd2c8f1086babddf273de04f566b7b984ca51c Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 1 Oct 2011 11:40:25 +0200 +Subject: [PATCH] Disable gdbus/connection/large_message on sparc + +--- + gio/tests/gdbus-connection-slow.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/gio/tests/gdbus-connection-slow.c b/gio/tests/gdbus-connection-slow.c +index 5511b5f..4f774d1 100644 +--- a/gio/tests/gdbus-connection-slow.c ++++ b/gio/tests/gdbus-connection-slow.c +@@ -209,6 +209,9 @@ main (int argc, + g_setenv ("DBUS_SESSION_BUS_ADDRESS", session_bus_get_temporary_address (), TRUE); + + g_test_add_func ("/gdbus/connection/flush", test_connection_flush); ++ /* won't work on sparc */ ++#ifndef __sparc + g_test_add_func ("/gdbus/connection/large_message", test_connection_large_message); ++#endif + return g_test_run(); + } +-- +1.7.6.1 + Added: csw/mgar/pkg/glib2/trunk/files/0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,26 @@ +From 520cc2cc90a6b47807ada9d73133aabcf0c7894a Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Tue, 27 Sep 2011 20:10:13 +0200 +Subject: [PATCH] Disable gdbus-threading /gdbus/method-calls-in-thread + +--- + gio/tests/gdbus-threading.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c +index 0700ad3..7999a77 100644 +--- a/gio/tests/gdbus-threading.c ++++ b/gio/tests/gdbus-threading.c +@@ -526,7 +526,9 @@ main (int argc, + g_assert (c != NULL); + + g_test_add_func ("/gdbus/delivery-in-thread", test_delivery_in_thread); ++ /* Doesn't run + g_test_add_func ("/gdbus/method-calls-in-thread", test_method_calls_in_thread); ++ */ + + ret = g_test_run(); + +-- +1.7.6.1 + Added: csw/mgar/pkg/glib2/trunk/files/0019-Disable-volumemonitor-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0019-Disable-volumemonitor-tests.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0019-Disable-volumemonitor-tests.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,26 @@ +From 49f46164f588377dc6040a4d056927889d85573b Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 1 Oct 2011 11:50:28 +0200 +Subject: [PATCH] Disable volumemonitor tests + +These tests sporadically fail. +--- + gio/tests/volumemonitor.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/gio/tests/volumemonitor.c b/gio/tests/volumemonitor.c +index e3fdc3b..368b83c 100644 +--- a/gio/tests/volumemonitor.c ++++ b/gio/tests/volumemonitor.c +@@ -165,6 +165,8 @@ int + main (int argc, char *argv[]) + { + gboolean ret; ++ /* Test sporadically fails. */ ++ exit(0); + + g_setenv ("GIO_USE_VFS", "local", FALSE); + +-- +1.7.6.1 + Added: csw/mgar/pkg/glib2/trunk/files/0019-Fix-gdbus-peer-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0019-Fix-gdbus-peer-tests.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0019-Fix-gdbus-peer-tests.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,110 @@ +From c7e81851af3b8aae37e3e7d7b7799dd188cf47cc Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 1 Oct 2011 12:36:20 +0200 +Subject: [PATCH] Fix gdbus-peer tests + +--- + gio/tests/gdbus-peer.c | 37 +++++++++++++++++++++++++++++++++++-- + 1 files changed, 35 insertions(+), 2 deletions(-) + +diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c +index e304618..51d155f 100644 +--- a/gio/tests/gdbus-peer.c ++++ b/gio/tests/gdbus-peer.c +@@ -41,6 +41,7 @@ + #ifdef G_OS_UNIX + #include + #include ++#include + #endif + + #include "gdbus-tests.h" +@@ -51,6 +52,7 @@ static gboolean is_unix = TRUE; + static gboolean is_unix = FALSE; + #endif + ++static gchar *tmp_address = NULL; + static gchar *test_guid = NULL; + static GMainLoop *service_loop = NULL; + static GDBusServer *server = NULL; +@@ -328,7 +330,7 @@ service_thread_func (gpointer user_data) + + error = NULL; + observer = g_dbus_auth_observer_new (); +- server = g_dbus_server_new_sync (is_unix ? "unix:tmpdir=/tmp/gdbus-test-" : "nonce-tcp:", ++ server = g_dbus_server_new_sync (tmp_address, + G_DBUS_SERVER_FLAGS_NONE, + test_guid, + observer, +@@ -1002,7 +1004,7 @@ dmp_thread_func (gpointer user_data) + + error = NULL; + guid = g_dbus_generate_guid (); +- data->server = g_dbus_server_new_sync ("unix:tmpdir=/tmp/gdbus-test-", ++ data->server = g_dbus_server_new_sync (tmp_address, + G_DBUS_SERVER_FLAGS_NONE, + guid, + NULL, /* GDBusAuthObserver */ +@@ -1444,6 +1446,8 @@ main (int argc, + { + gint ret; + GDBusNodeInfo *introspection_data = NULL; ++ gchar *tmpdir = NULL; ++ gchar *template = NULL; + + g_type_init (); + g_thread_init (NULL); +@@ -1455,6 +1459,21 @@ main (int argc, + + test_guid = g_dbus_generate_guid (); + ++ if (is_unix) ++ { ++ if (g_unix_socket_address_abstract_names_supported ()) ++ tmp_address = g_strdup ("unix:tmpdir=/tmp/gdbus-test-"); ++ else ++ { ++ template = g_strdup("/tmp/gdbus-test-XXXXXX"); ++ tmpdir = mktemp(template); ++ mkdir(tmpdir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); ++ tmp_address = g_strdup_printf ("unix:tmpdir=%s", tmpdir); ++ } ++ } ++ else ++ tmp_address = g_strdup ("nonce-tcp:"); ++ + /* all the tests rely on a shared main loop */ + loop = g_main_loop_new (NULL, FALSE); + +@@ -1463,14 +1482,28 @@ main (int argc, + #ifdef BUG_631379_FIXED + g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp); + #endif ++#if defined(__linux__) || defined(__FreeBSD__) + g_test_add_func ("/gdbus/credentials", test_credentials); ++#endif ++ /* Won't work on sparc */ ++#ifndef __sparc + g_test_add_func ("/gdbus/overflow", test_overflow); ++#endif + + ret = g_test_run(); + + g_main_loop_unref (loop); + g_free (test_guid); + g_dbus_node_info_unref (introspection_data); ++ if (is_unix) ++ g_free (tmp_address); ++ if (template) ++ g_free (template); ++ if (tmpdir) ++ { ++ g_rmdir (tmpdir); ++ g_free (tmpdir); ++ } + + return ret; + } +-- +1.7.6.1 + Added: csw/mgar/pkg/glib2/trunk/files/0020-Disable-buffered-input-stream-set-buffer-size-on-spa.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0020-Disable-buffered-input-stream-set-buffer-size-on-spa.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0020-Disable-buffered-input-stream-set-buffer-size-on-spa.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,36 @@ +From 1bc51a25ac3564fc748499ba880b2a11f62d7aff Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 1 Oct 2011 19:51:03 +0200 +Subject: [PATCH] Disable buffered-input-stream/set-buffer-size on sparcv9 + +Bug report has been filed + https://bugzilla.gnome.org/show_bug.cgi?id=660638 +--- + gio/tests/buffered-input-stream.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/gio/tests/buffered-input-stream.c b/gio/tests/buffered-input-stream.c +index 8515351..f7072e3 100644 +--- a/gio/tests/buffered-input-stream.c ++++ b/gio/tests/buffered-input-stream.c +@@ -86,6 +86,9 @@ test_peek_buffer (void) + static void + test_set_buffer_size (void) + { ++#ifdef __sparcv9 ++ printf("Test disabled on sparcv9. Bug report submitted.\n"); ++#else + GInputStream *base; + GInputStream *in; + gsize size, bufsize; +@@ -116,6 +119,7 @@ test_set_buffer_size (void) + + g_object_unref (in); + g_object_unref (base); ++#endif + } + + static void +-- +1.7.6.1 + Added: csw/mgar/pkg/glib2/trunk/files/0022-Disable-gsettings-strinfo-on-sparcv9.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0022-Disable-gsettings-strinfo-on-sparcv9.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0022-Disable-gsettings-strinfo-on-sparcv9.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,28 @@ +From 4be33dc73d5fcefc53ce37b440d2502bb6c4c5d3 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 2 Oct 2011 22:05:01 +0200 +Subject: [PATCH] Disable gsettings/strinfo on sparcv9 + +This test fails on sparcv9 (SIGBUS) +--- + gio/tests/gsettings.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c +index b2f9d4f..fed5d89 100644 +--- a/gio/tests/gsettings.c ++++ b/gio/tests/gsettings.c +@@ -1961,7 +1961,10 @@ main (int argc, char *argv[]) + + g_test_add_func ("/gsettings/keyfile", test_keyfile); + g_test_add_func ("/gsettings/child-schema", test_child_schema); ++ /* Fails on sparcv9 */ ++#ifndef __sparcv9 + g_test_add_func ("/gsettings/strinfo", test_strinfo); ++#endif + g_test_add_func ("/gsettings/enums", test_enums); + g_test_add_func ("/gsettings/flags", test_flags); + g_test_add_func ("/gsettings/range", test_range); +-- +1.7.6.1 + Added: csw/mgar/pkg/glib2/trunk/files/0023-Disable-run-assert-msg-test.sh.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0023-Disable-run-assert-msg-test.sh.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0023-Disable-run-assert-msg-test.sh.patch 2011-10-03 12:53:52 UTC (rev 15839) @@ -0,0 +1,37 @@ +From c373fff2502d1b637e0ea375efa943794fad6dd6 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Mon, 3 Oct 2011 10:09:52 +0200 +Subject: [PATCH] Disable run-assert-msg-test.sh + +This test fails on sparcv9 since gdb does not behave as expected by the script. assert-msg-test does however produce the expected output. +--- + tests/run-assert-msg-test.sh | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/tests/run-assert-msg-test.sh b/tests/run-assert-msg-test.sh +index 9f2be0d..32216e7 100755 +--- a/tests/run-assert-msg-test.sh ++++ b/tests/run-assert-msg-test.sh +@@ -1,4 +1,9 @@ +-#! /usr/bin/bash ++#! /bin/sh ++ ++# Disabled since gdb on unstable10s does not ++# behave as expected by this script. ++echo "Test disabled" ++exit 0 + + fail () + { +@@ -21,7 +26,7 @@ fi + + echo_v "Running assert-msg-test" + OUT=$(./assert-msg-test 2>&1) && fail "assert-msg-test should abort" +-echo "$OUT" | grep '^ERROR:.*assert-msg-test.c:.*:main: assertion failed: (42 < 0)' >/dev/null 2>&1 || \ ++echo "$OUT" | grep -q '^ERROR:.*assert-msg-test.c:.*:main: assertion failed: (42 < 0)' || \ + fail "does not print assertion message" + + if ! type gdb >/dev/null 2>&1; then +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 3 15:03:45 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Oct 2011 13:03:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[15840] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15840 http://gar.svn.sourceforge.net/gar/?rev=15840&view=rev Author: wahwah Date: 2011-10-03 13:03:44 +0000 (Mon, 03 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: fix a bug in a variable name Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-03 12:53:52 UTC (rev 15839) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-03 13:03:44 UTC (rev 15840) @@ -281,7 +281,7 @@ post-configure-modulated: gsed \ -e 's+ at prefix@+$(prefix)+' \ - -e 's+ at varstatedir@+$(varstatedir)+' \ + -e 's+ at localstatedir@+$(localstatedir)+' \ -e 's+ at sysconfdir@+$(sysconfdir)+' \ -e 's+ at bindir@+$(bindir)+' \ < $(WORKDIR)/csw$(NAME).tpl \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 3 17:32:17 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Oct 2011 15:32:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[15841] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5.tpl Message-ID: Revision: 15841 http://gar.svn.sourceforge.net/gar/?rev=15841&view=rev Author: wahwah Date: 2011-10-03 15:32:16 +0000 (Mon, 03 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: ...and the same variable in one more place Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-10-03 13:03:44 UTC (rev 15840) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-10-03 15:32:16 UTC (rev 15841) @@ -20,7 +20,7 @@ prefix="@prefix@" BASEDIR="${prefix}" BINDIR="@bindir@" -MYSQL_VAR="@varstatedir@" +MYSQL_VAR="@localstatedir@" sysconfdir="@sysconfdir@" MYSQLD_DATADIR=$MYSQL_VAR MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid 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 Oct 3 18:34:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 03 Oct 2011 16:34:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[15842] csw/mgar/pkg/xmlstarlet/trunk Message-ID: Revision: 15842 http://gar.svn.sourceforge.net/gar/?rev=15842&view=rev Author: dmichelsen Date: 2011-10-03 16:34:17 +0000 (Mon, 03 Oct 2011) Log Message: ----------- xmlstarlet: Update to 1.3.0 and new XSLT library names Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile csw/mgar/pkg/xmlstarlet/trunk/checksums Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2011-10-03 15:32:16 UTC (rev 15841) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2011-10-03 16:34:17 UTC (rev 15842) @@ -1,5 +1,5 @@ NAME = xmlstarlet -VERSION = 1.2.1 +VERSION = 1.3.0 CATEGORIES = utils DESCRIPTION = XML transformation utility @@ -21,7 +21,8 @@ BUILD_DEP_PKGS += CSWlibxsltdevel RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxslt +RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibexslt0 BUILD64 = 1 ISAEXEC = 1 Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/checksums 2011-10-03 15:32:16 UTC (rev 15841) +++ csw/mgar/pkg/xmlstarlet/trunk/checksums 2011-10-03 16:34:17 UTC (rev 15842) @@ -1 +1 @@ -575d2b0fc97450c97f4029817a8a787a xmlstarlet-1.2.1.tar.gz +4553fb51c38372e862987d0447e730ba xmlstarlet-1.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 3 19:16:28 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Oct 2011 17:16:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[15843] csw/mgar/pkg/libmpfr/trunk Message-ID: Revision: 15843 http://gar.svn.sourceforge.net/gar/?rev=15843&view=rev Author: wahwah Date: 2011-10-03 17:16:28 +0000 (Mon, 03 Oct 2011) Log Message: ----------- pkg/libmpfr/trunk: upgrade to 3.1.0 Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile csw/mgar/pkg/libmpfr/trunk/checksums Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-10-03 16:34:17 UTC (rev 15842) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-10-03 17:16:28 UTC (rev 15843) @@ -1,7 +1,7 @@ # $Id$ NAME = mpfr -VERSION = 3.0.1 +VERSION = 3.1.0 CATEGORIES = lib GARTYPE = v2 @@ -11,14 +11,13 @@ computations with correct rounding. endef -MASTER_SITES = http://www.mpfr.org/mpfr-$(VERSION)/ +DL_VER = $(shell echo $(VERSION) | gsed -e 's/\([^-]\+\)\(-.*\)/\1/') + +MASTER_SITES = http://www.mpfr.org/mpfr-$(DL_VER)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 BUILD_DEP_PKGS = CSWlibgmp-dev -RUNTIME_DEP_PKGS_CSWlibmpfr = -#PATCHFILES = patches - BUILD64 = 1 STRIP_LIBTOOL = 1 @@ -42,4 +41,12 @@ CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/mpfr.info CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mpfr/FAQ.html +# The LD_OPTIONS setting breaks the test suite, because it makes +# /opt/csw/lib/$ISALIST be always in front, while the tests require a local +# directory be in front instead. +# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-09/msg00009.html +# http://wiki.opencsw.org/porting-faq#toc9 +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + include gar/category.mk Modified: csw/mgar/pkg/libmpfr/trunk/checksums =================================================================== --- csw/mgar/pkg/libmpfr/trunk/checksums 2011-10-03 16:34:17 UTC (rev 15842) +++ csw/mgar/pkg/libmpfr/trunk/checksums 2011-10-03 17:16:28 UTC (rev 15843) @@ -1 +1 @@ -bfbecb2eacb6d48432ead5cfc3f7390a mpfr-3.0.1.tar.bz2 +238ae4a15cc3a5049b723daef5d17938 mpfr-3.1.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 09:20:20 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 07:20:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[15844] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15844 http://gar.svn.sourceforge.net/gar/?rev=15844&view=rev Author: wahwah Date: 2011-10-04 07:20:20 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: alternatives for CSWmysql5 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-03 17:16:28 UTC (rev 15843) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 07:20:20 UTC (rev 15844) @@ -250,13 +250,16 @@ EXECUTABLES += resolveip ALTERNATIVES = -ALTERNATIVES_CSW$(NAME) = +ALTERNATIVES_CSW$(NAME) = mysq$(BASE_VERSION)_main +ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql $(bindir)/$(firstword $(EXECUTABLES)) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) -ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION) -ALTERNATIVE_mysql$(BASE_VERSION) = $(global_bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 -ALTERNATIVE_mysql$(BASE_VERSION) += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ +ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client +ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) -ALTERNATIVE_mysql$(BASE_VERSION) += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ +ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 09:22:28 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 07:22:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[15845] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15845 http://gar.svn.sourceforge.net/gar/?rev=15845&view=rev Author: wahwah Date: 2011-10-04 07:22:28 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: corrected a typo Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 07:20:20 UTC (rev 15844) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 07:22:28 UTC (rev 15845) @@ -250,7 +250,7 @@ EXECUTABLES += resolveip ALTERNATIVES = -ALTERNATIVES_CSW$(NAME) = mysq$(BASE_VERSION)_main +ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql $(bindir)/$(firstword $(EXECUTABLES)) 50 ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 10:48:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 08:48:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[15846] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15846 http://gar.svn.sourceforge.net/gar/?rev=15846&view=rev Author: wahwah Date: 2011-10-04 08:48:34 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: Alternatives don't work. Maybe this will help? Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 07:22:28 UTC (rev 15845) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 08:48:34 UTC (rev 15846) @@ -54,7 +54,7 @@ OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1 ALTERNATIVES_CSWmysql-dev = mysql_dev -ALTERNATIVE_mysql_dev = $(global_bindir)/$(firstword $(CSWmysql-dev_programs)) mysql $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 +ALTERNATIVE_mysql_dev = $(global_bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ @@ -251,12 +251,12 @@ ALTERNATIVES = ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main -ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql $(bindir)/$(firstword $(EXECUTABLES)) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES)) 50 ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client -ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql_client $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 11:33:54 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 09:33:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[15847] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 15847 http://gar.svn.sourceforge.net/gar/?rev=15847&view=rev Author: wahwah Date: 2011-10-04 09:33:54 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: use versions better Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0006-Use-my_print_defaults-5.0.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 08:48:34 UTC (rev 15846) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 09:33:54 UTC (rev 15847) @@ -133,6 +133,8 @@ # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch PATCHFILES += 0004-looking-for-ps-use-basename-0.patch +# Perhaps using sed would be better, but we have a patch for now. +PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch # Enable 64 bits build BUILD64 = 1 Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0006-Use-my_print_defaults-5.0.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0006-Use-my_print_defaults-5.0.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0006-Use-my_print_defaults-5.0.patch 2011-10-04 09:33:54 UTC (rev 15847) @@ -0,0 +1,46 @@ +From 6e4feb9221edd2d3992c68c56bfecaf3a0551563 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 4 Oct 2011 11:30:30 +0200 +Subject: [PATCH] Use my_print_defaults-5.0 + +--- + scripts/mysqld_safe.sh | 18 +++++++++--------- + 1 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh +index 71b833c..bb79476 100644 +--- a/scripts/mysqld_safe.sh ++++ b/scripts/mysqld_safe.sh +@@ -192,20 +192,20 @@ err_log= + + # Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe] + # and then merge with the command line arguments +-if test -x "$MY_BASEDIR_VERSION/bin/my_print_defaults" ++if test -x "$MY_BASEDIR_VERSION/bin/my_print_defaults-5.0" + then +- print_defaults="$MY_BASEDIR_VERSION/bin/my_print_defaults" +-elif test -x ./bin/my_print_defaults ++ print_defaults="$MY_BASEDIR_VERSION/bin/my_print_defaults-5.0" ++elif test -x ./bin/my_print_defaults-5.0 + then +- print_defaults="./bin/my_print_defaults" +-elif test -x @bindir@/my_print_defaults ++ print_defaults="./bin/my_print_defaults-5.0" ++elif test -x @bindir@/my_print_defaults-5.0 + then +- print_defaults="@bindir@/my_print_defaults" +-elif test -x @bindir@/mysql_print_defaults ++ print_defaults="@bindir@/my_print_defaults-5.0" ++elif test -x @bindir@/mysql_print_defaults-5.0 + then +- print_defaults="@bindir@/mysql_print_defaults" ++ print_defaults="@bindir@/mysql_print_defaults"-5.0 + else +- print_defaults="my_print_defaults" ++ print_defaults="my_print_defaults-5.0" + fi + + args= +-- +1.7.6.1 + Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-10-04 08:48:34 UTC (rev 15846) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-10-04 09:33:54 UTC (rev 15847) @@ -22,6 +22,7 @@ BINDIR="@bindir@" MYSQL_VAR="@localstatedir@" sysconfdir="@sysconfdir@" +BASE_VERSION="@BASE_VERSION@" MYSQLD_DATADIR=$MYSQL_VAR MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid CONFFILE=${sysconfdir}/my.cnf @@ -96,7 +97,8 @@ # fi # 2006-04-16 --defaults-file is changed to --defaults-extra-file - ${BINDIR}/mysqld_safe \ + ${BINDIR}/mysqld_safe-${BASE_VERSION} \ + --mysqld-version=${BASE_VERSION} \ `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ --pid-file=$MYSQLD_PID_FILE \ `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 11:37:21 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 09:37:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[15848] csw/mgar/pkg/mono/trunk Message-ID: Revision: 15848 http://gar.svn.sourceforge.net/gar/?rev=15848&view=rev Author: wahwah Date: 2011-10-04 09:37:21 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mono/trunk: the build breaks with 'rm: Unable to remove directory .dtrace/libmonoruntime.la: File exists' Modified Paths: -------------- csw/mgar/pkg/mono/trunk/Makefile csw/mgar/pkg/mono/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/mono/trunk/files/CSWmono.depend csw/mgar/pkg/mono/trunk/files/CSWmono.gspec csw/mgar/pkg/mono/trunk/files/CSWmono.prototype Property Changed: ---------------- csw/mgar/pkg/mono/trunk/ csw/mgar/pkg/mono/trunk/Makefile Property changes on: csw/mgar/pkg/mono/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/mono/trunk/Makefile =================================================================== --- csw/mgar/pkg/mono/trunk/Makefile 2011-10-04 09:33:54 UTC (rev 15847) +++ csw/mgar/pkg/mono/trunk/Makefile 2011-10-04 09:37:21 UTC (rev 15848) @@ -1,6 +1,8 @@ +# $Id$ + NAME = mono -VERSION = 2.10.1 -GARTYPE = v1 +VERSION = 2.10.6 +GARTYPE = v2 CATEGORIES = lang DESCRIPTION = Mono Runtime @@ -11,16 +13,12 @@ based on the ECMA standards for C# and the Common Language Infrastructure. endef -MASTER_SITES = http://ftp.novell.com/pub/mono/sources/mono/ +MASTER_SITES = http://download.mono-project.com/sources/mono/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += CSWmono.gspec CSWmono.depend CSWmono.prototype -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU -TEST_TARGET = check -TEST_SCRIPTS = - include gar/category.mk Property changes on: csw/mgar/pkg/mono/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mono/trunk/checksums =================================================================== --- csw/mgar/pkg/mono/trunk/checksums 2011-10-04 09:33:54 UTC (rev 15847) +++ csw/mgar/pkg/mono/trunk/checksums 2011-10-04 09:37:21 UTC (rev 15848) @@ -1 +1 @@ -ae8d1875447527599e68dd6c1d82bc11 mono-2.10.1.tar.bz2 +c442cef4cd6668b0a1391a661f6815a9 mono-2.10.6.tar.bz2 Deleted: csw/mgar/pkg/mono/trunk/files/CSWmono.depend =================================================================== --- csw/mgar/pkg/mono/trunk/files/CSWmono.depend 2011-10-04 09:33:54 UTC (rev 15847) +++ csw/mgar/pkg/mono/trunk/files/CSWmono.depend 2011-10-04 09:37:21 UTC (rev 15848) @@ -1,5 +0,0 @@ -P CSWggettext ggettext - GNU gettext -P CSWglib2 glib2 - Low-level core library that forms the basis of GTK+ -P CSWiconv libiconv - GNU iconv library -P CSWsunmath libsunmath - Sun maths library -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/mono/trunk/files/CSWmono.gspec =================================================================== --- csw/mgar/pkg/mono/trunk/files/CSWmono.gspec 2011-10-04 09:33:54 UTC (rev 15847) +++ csw/mgar/pkg/mono/trunk/files/CSWmono.gspec 2011-10-04 09:37:21 UTC (rev 15848) @@ -1,4 +0,0 @@ -%var bitname mono -%var pkgname CSWmono -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/COPYING.LIB Deleted: csw/mgar/pkg/mono/trunk/files/CSWmono.prototype =================================================================== --- csw/mgar/pkg/mono/trunk/files/CSWmono.prototype 2011-10-04 09:33:54 UTC (rev 15847) +++ csw/mgar/pkg/mono/trunk/files/CSWmono.prototype 2011-10-04 09:37:21 UTC (rev 15848) @@ -1,815 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/al 0755 root bin -f none /opt/csw/bin/caspol 0755 root bin -f none /opt/csw/bin/cert2spc 0755 root bin -f none /opt/csw/bin/certmgr 0755 root bin -f none /opt/csw/bin/chktrust 0755 root bin -f none /opt/csw/bin/cilc 0755 root bin -f none /opt/csw/bin/disco 0755 root bin -f none /opt/csw/bin/dtd2xsd 0755 root bin -f none /opt/csw/bin/gacutil 0755 root bin -f none /opt/csw/bin/genxs 0755 root bin -f none /opt/csw/bin/gmcs 0755 root bin -f none /opt/csw/bin/ilasm 0755 root bin -f none /opt/csw/bin/jay 0755 root bin -f none /opt/csw/bin/macpack 0755 root bin -f none /opt/csw/bin/makecert 0755 root bin -f none /opt/csw/bin/mbas 0755 root bin -f none /opt/csw/bin/mcs 0755 root bin -f none /opt/csw/bin/mjs 0755 root bin -f none /opt/csw/bin/mkbundle 0755 root bin -f none /opt/csw/bin/mono-find-provides 0755 root bin -f none /opt/csw/bin/mono-find-requires 0755 root bin -f none /opt/csw/bin/mono-service 0755 root bin -f none /opt/csw/bin/mono-shlib-cop 0755 root bin -f none /opt/csw/bin/mono 0755 root bin -f none /opt/csw/bin/monodiet 0755 root bin -f none /opt/csw/bin/monodis 0755 root bin -f none /opt/csw/bin/monograph 0755 root bin -f none /opt/csw/bin/monop2 0755 root bin -f none /opt/csw/bin/monop 0755 root bin -f none /opt/csw/bin/mozroots 0755 root bin -f none /opt/csw/bin/nunit-console 0755 root bin -f none /opt/csw/bin/pedump 0755 root bin -f none /opt/csw/bin/permview 0755 root bin -f none /opt/csw/bin/prj2make 0755 root bin -f none /opt/csw/bin/resgen 0755 root bin -f none /opt/csw/bin/secutil 0755 root bin -f none /opt/csw/bin/setreg 0755 root bin -f none /opt/csw/bin/signcode 0755 root bin -f none /opt/csw/bin/sn 0755 root bin -f none /opt/csw/bin/soapsuds 0755 root bin -f none /opt/csw/bin/sqlsharp 0755 root bin -f none /opt/csw/bin/wsdl2 0755 root bin -f none /opt/csw/bin/wsdl 0755 root bin -f none /opt/csw/bin/xbuild 0755 root bin -f none /opt/csw/bin/xsd 0755 root bin -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/mono 0755 root bin -d none /opt/csw/etc/mono/1.0 0755 root bin -f none /opt/csw/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx 0644 root bin -f none /opt/csw/etc/mono/1.0/machine.config 0644 root bin -d none /opt/csw/etc/mono/2.0 0755 root bin -f none /opt/csw/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx 0644 root bin -f none /opt/csw/etc/mono/2.0/machine.config 0644 root bin -f none /opt/csw/etc/mono/browscap.ini 0644 root bin -f none /opt/csw/etc/mono/config 0644 root bin -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/mono 0755 root bin -d none /opt/csw/include/mono/cil 0755 root bin -f none /opt/csw/include/mono/cil/opcode.def 0644 root bin -d none /opt/csw/include/mono/interpreter 0755 root bin -f none /opt/csw/include/mono/interpreter/embed.h 0644 root bin -d none /opt/csw/include/mono/io-layer 0755 root bin -f none /opt/csw/include/mono/io-layer/access.h 0644 root bin -f none /opt/csw/include/mono/io-layer/atomic.h 0644 root bin -f none /opt/csw/include/mono/io-layer/collection.h 0644 root bin -f none /opt/csw/include/mono/io-layer/context.h 0644 root bin -f none /opt/csw/include/mono/io-layer/critical-sections.h 0644 root bin -f none /opt/csw/include/mono/io-layer/error.h 0644 root bin -f none /opt/csw/include/mono/io-layer/events.h 0644 root bin -f none /opt/csw/include/mono/io-layer/handles.h 0644 root bin -f none /opt/csw/include/mono/io-layer/io-layer.h 0644 root bin -f none /opt/csw/include/mono/io-layer/io.h 0644 root bin -f none /opt/csw/include/mono/io-layer/macros.h 0644 root bin -f none /opt/csw/include/mono/io-layer/mono-mutex.h 0644 root bin -f none /opt/csw/include/mono/io-layer/mutexes.h 0644 root bin -f none /opt/csw/include/mono/io-layer/processes.h 0644 root bin -f none /opt/csw/include/mono/io-layer/security.h 0644 root bin -f none /opt/csw/include/mono/io-layer/semaphores.h 0644 root bin -f none /opt/csw/include/mono/io-layer/sockets.h 0644 root bin -f none /opt/csw/include/mono/io-layer/status.h 0644 root bin -f none /opt/csw/include/mono/io-layer/system.h 0644 root bin -f none /opt/csw/include/mono/io-layer/threads.h 0644 root bin -f none /opt/csw/include/mono/io-layer/timefuncs.h 0644 root bin -f none /opt/csw/include/mono/io-layer/types.h 0644 root bin -f none /opt/csw/include/mono/io-layer/uglify.h 0644 root bin -f none /opt/csw/include/mono/io-layer/versioninfo.h 0644 root bin -f none /opt/csw/include/mono/io-layer/wait.h 0644 root bin -f none /opt/csw/include/mono/io-layer/wapi.h 0644 root bin -d none /opt/csw/include/mono/jit 0755 root bin -f none /opt/csw/include/mono/jit/jit.h 0644 root bin -d none /opt/csw/include/mono/metadata 0755 root bin -f none /opt/csw/include/mono/metadata/appdomain.h 0644 root bin -f none /opt/csw/include/mono/metadata/assembly.h 0644 root bin -f none /opt/csw/include/mono/metadata/blob.h 0644 root bin -f none /opt/csw/include/mono/metadata/class.h 0644 root bin -f none /opt/csw/include/mono/metadata/debug-helpers.h 0644 root bin -f none /opt/csw/include/mono/metadata/debug-mono-symfile.h 0644 root bin -f none /opt/csw/include/mono/metadata/environment.h 0644 root bin -f none /opt/csw/include/mono/metadata/exception.h 0644 root bin -f none /opt/csw/include/mono/metadata/image.h 0644 root bin -f none /opt/csw/include/mono/metadata/loader.h 0644 root bin -f none /opt/csw/include/mono/metadata/mempool.h 0644 root bin -f none /opt/csw/include/mono/metadata/metadata.h 0644 root bin -f none /opt/csw/include/mono/metadata/mono-debug-debugger.h 0644 root bin -f none /opt/csw/include/mono/metadata/mono-debug.h 0644 root bin -f none /opt/csw/include/mono/metadata/mono-gc.h 0644 root bin -f none /opt/csw/include/mono/metadata/object.h 0644 root bin -f none /opt/csw/include/mono/metadata/opcodes.h 0644 root bin -f none /opt/csw/include/mono/metadata/profiler.h 0644 root bin -f none /opt/csw/include/mono/metadata/reflection.h 0644 root bin -f none /opt/csw/include/mono/metadata/row-indexes.h 0644 root bin -f none /opt/csw/include/mono/metadata/threads.h 0644 root bin -f none /opt/csw/include/mono/metadata/tokentype.h 0644 root bin -f none /opt/csw/include/mono/metadata/verify.h 0644 root bin -d none /opt/csw/include/mono/private 0755 root bin -f none /opt/csw/include/mono/private/libgc-mono-debugger.h 0644 root bin -d none /opt/csw/include/mono/utils 0755 root bin -f none /opt/csw/include/mono/utils/mono-codeman.h 0644 root bin -f none /opt/csw/include/mono/utils/mono-digest.h 0644 root bin -f none /opt/csw/include/mono/utils/mono-hash.h 0644 root bin -f none /opt/csw/include/mono/utils/mono-logger.h 0644 root bin -f none /opt/csw/include/mono/utils/mono-math.h 0644 root bin -f none /opt/csw/include/mono/utils/mono-poll.h 0644 root bin -f none /opt/csw/include/mono/utils/mono-uri.h 0644 root bin -f none /opt/csw/include/mono/utils/monobitset.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libMonoPosixHelper.a 0644 root bin -f none /opt/csw/lib/libMonoPosixHelper.la 0755 root bin -f none /opt/csw/lib/libMonoPosixHelper.so 0755 root bin -f none /opt/csw/lib/libMonoSupportW.a 0644 root bin -f none /opt/csw/lib/libMonoSupportW.la 0755 root bin -f none /opt/csw/lib/libMonoSupportW.so 0755 root bin -f none /opt/csw/lib/libikvm-native.a 0644 root bin -f none /opt/csw/lib/libikvm-native.la 0755 root bin -f none /opt/csw/lib/libikvm-native.so 0755 root bin -f none /opt/csw/lib/libmono-profiler-aot.a 0644 root bin -f none /opt/csw/lib/libmono-profiler-aot.la 0755 root bin -f none /opt/csw/lib/libmono-profiler-aot.so.0.0.0 0755 root bin -s none /opt/csw/lib/libmono-profiler-aot.so.0=libmono-profiler-aot.so.0.0.0 root bin -s none /opt/csw/lib/libmono-profiler-aot.so=libmono-profiler-aot.so.0.0.0 root bin -f none /opt/csw/lib/libmono-profiler-cov.a 0644 root bin -f none /opt/csw/lib/libmono-profiler-cov.la 0755 root bin -f none /opt/csw/lib/libmono-profiler-cov.so.0.0.0 0755 root bin -s none /opt/csw/lib/libmono-profiler-cov.so.0=libmono-profiler-cov.so.0.0.0 root bin -s none /opt/csw/lib/libmono-profiler-cov.so=libmono-profiler-cov.so.0.0.0 root bin -f none /opt/csw/lib/libmono.a 0644 root bin -f none /opt/csw/lib/libmono.la 0755 root bin -f none /opt/csw/lib/libmono.so.0.0.0 0755 root bin -s none /opt/csw/lib/libmono.so.0=libmono.so.0.0.0 root bin -s none /opt/csw/lib/libmono.so=libmono.so.0.0.0 root bin -d none /opt/csw/lib/mono 0755 root bin -d none /opt/csw/lib/mono/1.0 0755 root bin -s none /opt/csw/lib/mono/1.0/Accessibility.dll=../gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll root bin -s none /opt/csw/lib/mono/1.0/ByteFX.Data.dll=../gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756/ByteFX.Data.dll root bin -s none /opt/csw/lib/mono/1.0/Commons.Xml.Relaxng.dll=../gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll root bin -f none /opt/csw/lib/mono/1.0/CorCompare.exe 0755 root bin -s none /opt/csw/lib/mono/1.0/FirebirdSql.Data.Firebird.dll=../gac/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4/FirebirdSql.Data.Firebird.dll root bin -s none /opt/csw/lib/mono/1.0/I18N.CJK.dll=../gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/I18N.CJK.dll root bin -s none /opt/csw/lib/mono/1.0/I18N.MidEast.dll=../gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756/I18N.MidEast.dll root bin -s none /opt/csw/lib/mono/1.0/I18N.Other.dll=../gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll root bin -s none /opt/csw/lib/mono/1.0/I18N.Rare.dll=../gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll root bin -s none /opt/csw/lib/mono/1.0/I18N.West.dll=../gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll root bin -s none /opt/csw/lib/mono/1.0/I18N.dll=../gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll root bin -s none /opt/csw/lib/mono/1.0/IBM.Data.DB2.dll=../gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208/IBM.Data.DB2.dll root bin -s none /opt/csw/lib/mono/1.0/ICSharpCode.SharpZipLib.dll=../gac/ICSharpCode.SharpZipLib/0.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll root bin -s none /opt/csw/lib/mono/1.0/Microsoft.JScript.dll=../gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.JScript.dll root bin -s none /opt/csw/lib/mono/1.0/Microsoft.VisualBasic.dll=../gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll root bin -s none /opt/csw/lib/mono/1.0/Microsoft.VisualC.dll=../gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll root bin -s none /opt/csw/lib/mono/1.0/Microsoft.Vsa.dll=../gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Cairo.dll=../gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll=../gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Data.SqliteClient.dll=../gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Data.SybaseClient.dll=../gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Data.Tds.dll=../gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756/Mono.Data.Tds.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Data.TdsClient.dll=../gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.TdsClient.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Data.dll=../gac/Mono.Data/1.0.5000.0__0738eb9f132ed756/Mono.Data.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.GetOptions.dll=../gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Http.dll=../gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Posix.dll=../gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Security.Win32.dll=../gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756/Mono.Security.Win32.dll root bin -s none /opt/csw/lib/mono/1.0/Mono.Security.dll=../gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll root bin -s none /opt/csw/lib/mono/1.0/Novell.Directory.Ldap.dll=../gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll root bin -s none /opt/csw/lib/mono/1.0/Npgsql.dll=../gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll root bin -s none /opt/csw/lib/mono/1.0/PEAPI.dll=../gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll root bin -s none /opt/csw/lib/mono/1.0/System.Configuration.Install.dll=../gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a/System.Configuration.Install.dll root bin -s none /opt/csw/lib/mono/1.0/System.Data.OracleClient.dll=../gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll root bin -s none /opt/csw/lib/mono/1.0/System.Data.dll=../gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll root bin -s none /opt/csw/lib/mono/1.0/System.Design.dll=../gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Design.dll root bin -s none /opt/csw/lib/mono/1.0/System.DirectoryServices.dll=../gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a/System.DirectoryServices.dll root bin -s none /opt/csw/lib/mono/1.0/System.Drawing.Design.dll=../gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.Design.dll root bin -s none /opt/csw/lib/mono/1.0/System.Drawing.dll=../gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.dll root bin -s none /opt/csw/lib/mono/1.0/System.EnterpriseServices.dll=../gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll root bin -s none /opt/csw/lib/mono/1.0/System.Management.dll=../gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll root bin -s none /opt/csw/lib/mono/1.0/System.Messaging.dll=../gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll root bin -s none /opt/csw/lib/mono/1.0/System.Runtime.Remoting.dll=../gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime.Remoting.dll root bin -s none /opt/csw/lib/mono/1.0/System.Runtime.Serialization.Formatters.Soap.dll=../gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll root bin -s none /opt/csw/lib/mono/1.0/System.Security.dll=../gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/System.Security.dll root bin -s none /opt/csw/lib/mono/1.0/System.ServiceProcess.dll=../gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll root bin -s none /opt/csw/lib/mono/1.0/System.Web.Services.dll=../gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll root bin -s none /opt/csw/lib/mono/1.0/System.Web.dll=../gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a/System.Web.dll root bin -s none /opt/csw/lib/mono/1.0/System.Windows.Forms.dll=../gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Forms.dll root bin -s none /opt/csw/lib/mono/1.0/System.Xml.dll=../gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll root bin -s none /opt/csw/lib/mono/1.0/System.dll=../gac/System/1.0.5000.0__b77a5c561934e089/System.dll root bin -f none /opt/csw/lib/mono/1.0/al.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/al.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/browsercaps-updater.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/browsercaps-updater.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/caspol.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/caspol.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/cert2spc.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/cert2spc.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/certmgr.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/certmgr.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/chktrust.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/chktrust.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/cilc.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/cilc.exe 0755 root bin -s none /opt/csw/lib/mono/1.0/cscompmgd.dll=../gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll root bin -f none /opt/csw/lib/mono/1.0/disco.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/disco.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/dtd2xsd.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/dtd2xsd.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/gacutil.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/gacutil.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/genxs.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/genxs.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/ictool.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/ictool.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/ilasm.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/ilasm.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/macpack.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/macpack.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/makecert.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/makecert.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mbas.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/mbas.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mcs.exe.config 0644 root bin -f none /opt/csw/lib/mono/1.0/mcs.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/mcs.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mjs.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/mjs.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mkbundle.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/mkbundle.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mono-api-diff.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mono-api-info.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mono-service.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/mono-service.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mono-shlib-cop.exe.config 0644 root bin -f none /opt/csw/lib/mono/1.0/mono-shlib-cop.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/mono-shlib-cop.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/monop.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/monop.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mozroots.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/mozroots.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/mscorlib.dll.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/mscorlib.dll 0755 root bin -f none /opt/csw/lib/mono/1.0/nunit-console.exe.config 0644 root bin -f none /opt/csw/lib/mono/1.0/nunit-console.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/nunit-console.exe 0755 root bin -s none /opt/csw/lib/mono/1.0/nunit.core.dll=../gac/nunit.core/2.2.0.0__96d09a1eb7f44a77/nunit.core.dll root bin -s none /opt/csw/lib/mono/1.0/nunit.framework.dll=../gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77/nunit.framework.dll root bin -s none /opt/csw/lib/mono/1.0/nunit.util.dll=../gac/nunit.util/2.2.0.0__96d09a1eb7f44a77/nunit.util.dll root bin -f none /opt/csw/lib/mono/1.0/permview.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/permview.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/prj2make.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/prj2make.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/resgen.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/resgen.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/secutil.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/secutil.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/setreg.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/setreg.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/signcode.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/signcode.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/sn.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/sn.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/soapsuds.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/soapsuds.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/sqlsharp.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/sqlsharp.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/wsdl.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/wsdl.exe 0755 root bin -f none /opt/csw/lib/mono/1.0/xsd.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/1.0/xsd.exe 0755 root bin -d none /opt/csw/lib/mono/2.0 0755 root bin -s none /opt/csw/lib/mono/2.0/Accessibility.dll=../gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a/Accessibility.dll root bin -s none /opt/csw/lib/mono/2.0/ByteFX.Data.dll=../gac/ByteFX.Data/0.7.6.2__0738eb9f132ed756/ByteFX.Data.dll root bin -s none /opt/csw/lib/mono/2.0/Commons.Xml.Relaxng.dll=../gac/Commons.Xml.Relaxng/2.0.0.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll root bin -s none /opt/csw/lib/mono/2.0/FirebirdSql.Data.Firebird.dll=../gac/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4/FirebirdSql.Data.Firebird.dll root bin -s none /opt/csw/lib/mono/2.0/I18N.CJK.dll=../gac/I18N.CJK/2.0.0.0__0738eb9f132ed756/I18N.CJK.dll root bin -s none /opt/csw/lib/mono/2.0/I18N.MidEast.dll=../gac/I18N.MidEast/2.0.0.0__0738eb9f132ed756/I18N.MidEast.dll root bin -s none /opt/csw/lib/mono/2.0/I18N.Other.dll=../gac/I18N.Other/2.0.0.0__0738eb9f132ed756/I18N.Other.dll root bin -s none /opt/csw/lib/mono/2.0/I18N.Rare.dll=../gac/I18N.Rare/2.0.0.0__0738eb9f132ed756/I18N.Rare.dll root bin -s none /opt/csw/lib/mono/2.0/I18N.West.dll=../gac/I18N.West/2.0.0.0__0738eb9f132ed756/I18N.West.dll root bin -s none /opt/csw/lib/mono/2.0/I18N.dll=../gac/I18N/2.0.0.0__0738eb9f132ed756/I18N.dll root bin -s none /opt/csw/lib/mono/2.0/ICSharpCode.SharpZipLib.dll=../gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll root bin -s none /opt/csw/lib/mono/2.0/Microsoft.JScript.dll=../gac/Microsoft.JScript/8.0.0.0__b03f5f7f11d50a3a/Microsoft.JScript.dll root bin -s none /opt/csw/lib/mono/2.0/Microsoft.VisualBasic.dll=../gac/Microsoft.VisualBasic/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll root bin -s none /opt/csw/lib/mono/2.0/Microsoft.VisualC.dll=../gac/Microsoft.VisualC/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll root bin -s none /opt/csw/lib/mono/2.0/Microsoft.Vsa.dll=../gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.C5.dll=../gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd/Mono.C5.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Cairo.dll=../gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll=../gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Data.SqliteClient.dll=../gac/Mono.Data.SqliteClient/2.0.0.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Data.SybaseClient.dll=../gac/Mono.Data.SybaseClient/2.0.0.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Data.Tds.dll=../gac/Mono.Data.Tds/2.0.0.0__0738eb9f132ed756/Mono.Data.Tds.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Data.TdsClient.dll=../gac/Mono.Data.TdsClient/2.0.0.0__0738eb9f132ed756/Mono.Data.TdsClient.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Data.dll=../gac/Mono.Data/2.0.0.0__0738eb9f132ed756/Mono.Data.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.GetOptions.dll=../gac/Mono.GetOptions/2.0.0.0__0738eb9f132ed756/Mono.GetOptions.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Http.dll=../gac/Mono.Http/2.0.0.0__0738eb9f132ed756/Mono.Http.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Posix.dll=../gac/Mono.Posix/2.0.0.0__0738eb9f132ed756/Mono.Posix.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Security.Win32.dll=../gac/Mono.Security.Win32/2.0.0.0__0738eb9f132ed756/Mono.Security.Win32.dll root bin -s none /opt/csw/lib/mono/2.0/Mono.Security.dll=../gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll root bin -s none /opt/csw/lib/mono/2.0/Novell.Directory.Ldap.dll=../gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756/Novell.Directory.Ldap.dll root bin -s none /opt/csw/lib/mono/2.0/Npgsql.dll=../gac/Npgsql/2.0.0.0__5d8b90d52f46fda7/Npgsql.dll root bin -s none /opt/csw/lib/mono/2.0/PEAPI.dll=../gac/PEAPI/2.0.0.0__0738eb9f132ed756/PEAPI.dll root bin -s none /opt/csw/lib/mono/2.0/System.Configuration.Install.dll=../gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.Install.dll root bin -s none /opt/csw/lib/mono/2.0/System.Configuration.dll=../gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.dll root bin -s none /opt/csw/lib/mono/2.0/System.Data.OracleClient.dll=../gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll root bin -s none /opt/csw/lib/mono/2.0/System.Data.dll=../gac/System.Data/2.0.0.0__b77a5c561934e089/System.Data.dll root bin -s none /opt/csw/lib/mono/2.0/System.Design.dll=../gac/System.Design/2.0.0.0__b03f5f7f11d50a3a/System.Design.dll root bin -s none /opt/csw/lib/mono/2.0/System.DirectoryServices.dll=../gac/System.DirectoryServices/2.0.0.0__b03f5f7f11d50a3a/System.DirectoryServices.dll root bin -s none /opt/csw/lib/mono/2.0/System.Drawing.Design.dll=../gac/System.Drawing.Design/2.0.0.0__b03f5f7f11d50a3a/System.Drawing.Design.dll root bin -s none /opt/csw/lib/mono/2.0/System.Drawing.dll=../gac/System.Drawing/2.0.0.0__b03f5f7f11d50a3a/System.Drawing.dll root bin -s none /opt/csw/lib/mono/2.0/System.EnterpriseServices.dll=../gac/System.EnterpriseServices/2.0.0.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll root bin -s none /opt/csw/lib/mono/2.0/System.Management.dll=../gac/System.Management/2.0.0.0__b03f5f7f11d50a3a/System.Management.dll root bin -s none /opt/csw/lib/mono/2.0/System.Messaging.dll=../gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll root bin -s none /opt/csw/lib/mono/2.0/System.Runtime.Remoting.dll=../gac/System.Runtime.Remoting/2.0.0.0__b77a5c561934e089/System.Runtime.Remoting.dll root bin -s none /opt/csw/lib/mono/2.0/System.Runtime.Serialization.Formatters.Soap.dll=../gac/System.Runtime.Serialization.Formatters.Soap/2.0.0.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll root bin -s none /opt/csw/lib/mono/2.0/System.Security.dll=../gac/System.Security/2.0.0.0__b03f5f7f11d50a3a/System.Security.dll root bin -s none /opt/csw/lib/mono/2.0/System.ServiceProcess.dll=../gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a/System.ServiceProcess.dll root bin -s none /opt/csw/lib/mono/2.0/System.Web.Services.dll=../gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a/System.Web.Services.dll root bin -s none /opt/csw/lib/mono/2.0/System.Web.dll=../gac/System.Web/2.0.0.0__b03f5f7f11d50a3a/System.Web.dll root bin -s none /opt/csw/lib/mono/2.0/System.Windows.Forms.dll=../gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089/System.Windows.Forms.dll root bin -s none /opt/csw/lib/mono/2.0/System.Xml.dll=../gac/System.Xml/2.0.0.0__b77a5c561934e089/System.Xml.dll root bin -s none /opt/csw/lib/mono/2.0/System.dll=../gac/System/2.0.0.0__b77a5c561934e089/System.dll root bin -s none /opt/csw/lib/mono/2.0/cscompmgd.dll=../gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a/cscompmgd.dll root bin -f none /opt/csw/lib/mono/2.0/gmcs.exe.config 0644 root bin -f none /opt/csw/lib/mono/2.0/gmcs.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/2.0/gmcs.exe 0755 root bin -f none /opt/csw/lib/mono/2.0/mono-api-info.exe 0755 root bin -f none /opt/csw/lib/mono/2.0/monop.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/2.0/monop.exe 0755 root bin -f none /opt/csw/lib/mono/2.0/mscorlib.dll.mdb 0755 root bin -f none /opt/csw/lib/mono/2.0/mscorlib.dll 0755 root bin -f none /opt/csw/lib/mono/2.0/nunit-console.exe.config 0644 root bin -f none /opt/csw/lib/mono/2.0/nunit-console.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/2.0/nunit-console.exe 0755 root bin -f none /opt/csw/lib/mono/2.0/wsdl.exe.mdb 0755 root bin -f none /opt/csw/lib/mono/2.0/wsdl.exe 0755 root bin -d none /opt/csw/lib/mono/gac 0755 root bin -d none /opt/csw/lib/mono/gac/Accessibility 0755 root bin -d none /opt/csw/lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a/Accessibility.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a/Accessibility.dll 0755 root bin -d none /opt/csw/lib/mono/gac/ByteFX.Data 0755 root bin -d none /opt/csw/lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756/ByteFX.Data.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756/ByteFX.Data.dll 0755 root bin -d none /opt/csw/lib/mono/gac/ByteFX.Data/0.7.6.2__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/ByteFX.Data/0.7.6.2__0738eb9f132ed756/ByteFX.Data.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/ByteFX.Data/0.7.6.2__0738eb9f132ed756/ByteFX.Data.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Commons.Xml.Relaxng 0755 root bin -d none /opt/csw/lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Commons.Xml.Relaxng/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Commons.Xml.Relaxng/2.0.0.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Commons.Xml.Relaxng/2.0.0.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll 0755 root bin -d none /opt/csw/lib/mono/gac/FirebirdSql.Data.Firebird 0755 root bin -d none /opt/csw/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4 0755 root bin -f none /opt/csw/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4/FirebirdSql.Data.Firebird.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4/FirebirdSql.Data.Firebird.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.CJK 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/I18N.CJK.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/I18N.CJK.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.CJK/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.CJK/2.0.0.0__0738eb9f132ed756/I18N.CJK.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.CJK/2.0.0.0__0738eb9f132ed756/I18N.CJK.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.MidEast 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756/I18N.MidEast.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756/I18N.MidEast.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.MidEast/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.MidEast/2.0.0.0__0738eb9f132ed756/I18N.MidEast.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.MidEast/2.0.0.0__0738eb9f132ed756/I18N.MidEast.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.Other 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.Other/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.Other/2.0.0.0__0738eb9f132ed756/I18N.Other.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.Other/2.0.0.0__0738eb9f132ed756/I18N.Other.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.Rare 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.Rare/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.Rare/2.0.0.0__0738eb9f132ed756/I18N.Rare.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.Rare/2.0.0.0__0738eb9f132ed756/I18N.Rare.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.West 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N.West/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N.West/2.0.0.0__0738eb9f132ed756/I18N.West.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N.West/2.0.0.0__0738eb9f132ed756/I18N.West.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll 0755 root bin -d none /opt/csw/lib/mono/gac/I18N/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/I18N/2.0.0.0__0738eb9f132ed756/I18N.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/I18N/2.0.0.0__0738eb9f132ed756/I18N.dll 0755 root bin -d none /opt/csw/lib/mono/gac/IBM.Data.DB2 0755 root bin -d none /opt/csw/lib/mono/gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208 0755 root bin -f none /opt/csw/lib/mono/gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208/IBM.Data.DB2.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208/IBM.Data.DB2.dll 0755 root bin -d none /opt/csw/lib/mono/gac/ICSharpCode.SharpZipLib 0755 root bin -d none /opt/csw/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.0.0__1b03e6acf1164f73 0755 root bin -f none /opt/csw/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll 0755 root bin -d none /opt/csw/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73 0755 root bin -f none /opt/csw/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.JScript 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.JScript.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.JScript.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.JScript/8.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Microsoft.JScript/8.0.0.0__b03f5f7f11d50a3a/Microsoft.JScript.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Microsoft.JScript/8.0.0.0__b03f5f7f11d50a3a/Microsoft.JScript.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.VisualBasic 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll 0644 root bin -d none /opt/csw/lib/mono/gac/Microsoft.VisualBasic/8.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Microsoft.VisualBasic/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll 0644 root bin -d none /opt/csw/lib/mono/gac/Microsoft.VisualC 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.VisualC/8.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Microsoft.VisualC/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Microsoft.VisualC/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.Vsa 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.C5 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd/Mono.C5.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd/Mono.C5.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Cairo 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.CompilerServices.SymbolWriter 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.SqliteClient 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.SqliteClient/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.SqliteClient/2.0.0.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.SqliteClient/2.0.0.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.SybaseClient 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.Tds 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756/Mono.Data.Tds.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756/Mono.Data.Tds.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.Tds/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.Tds/2.0.0.0__0738eb9f132ed756/Mono.Data.Tds.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.Tds/2.0.0.0__0738eb9f132ed756/Mono.Data.Tds.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.TdsClient 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.TdsClient.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.TdsClient.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__0738eb9f132ed756/Mono.Data.TdsClient.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__0738eb9f132ed756/Mono.Data.TdsClient.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756/Mono.Data.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756/Mono.Data.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Data/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Data/2.0.0.0__0738eb9f132ed756/Mono.Data.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Data/2.0.0.0__0738eb9f132ed756/Mono.Data.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.GetOptions 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.GetOptions/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.GetOptions/2.0.0.0__0738eb9f132ed756/Mono.GetOptions.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.GetOptions/2.0.0.0__0738eb9f132ed756/Mono.GetOptions.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Http 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756/Mono.Http.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756/Mono.Http.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Posix 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Posix/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Posix/2.0.0.0__0738eb9f132ed756/Mono.Posix.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Posix/2.0.0.0__0738eb9f132ed756/Mono.Posix.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Security 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Security.Win32 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756/Mono.Security.Win32.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756/Mono.Security.Win32.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Security.Win32/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Security.Win32/2.0.0.0__0738eb9f132ed756/Mono.Security.Win32.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Security.Win32/2.0.0.0__0738eb9f132ed756/Mono.Security.Win32.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Novell.Directory.Ldap 0755 root bin -d none /opt/csw/lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756/Novell.Directory.Ldap.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756/Novell.Directory.Ldap.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Npgsql 0755 root bin -d none /opt/csw/lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7 0755 root bin -f none /opt/csw/lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll 0755 root bin -d none /opt/csw/lib/mono/gac/Npgsql/2.0.0.0__5d8b90d52f46fda7 0755 root bin -f none /opt/csw/lib/mono/gac/Npgsql/2.0.0.0__5d8b90d52f46fda7/Npgsql.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/Npgsql/2.0.0.0__5d8b90d52f46fda7/Npgsql.dll 0755 root bin -d none /opt/csw/lib/mono/gac/PEAPI 0755 root bin -d none /opt/csw/lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll 0755 root bin -d none /opt/csw/lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756 0755 root bin -f none /opt/csw/lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756/PEAPI.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756/PEAPI.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System 0755 root bin -d none /opt/csw/lib/mono/gac/System.Configuration 0755 root bin -d none /opt/csw/lib/mono/gac/System.Configuration.Install 0755 root bin -d none /opt/csw/lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a/System.Configuration.Install.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a/System.Configuration.Install.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.Install.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.Install.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Data 0755 root bin -d none /opt/csw/lib/mono/gac/System.Data.OracleClient 0755 root bin -d none /opt/csw/lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Data/2.0.0.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Data/2.0.0.0__b77a5c561934e089/System.Data.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Data/2.0.0.0__b77a5c561934e089/System.Data.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Design 0755 root bin -d none /opt/csw/lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Design.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Design.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Design/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Design/2.0.0.0__b03f5f7f11d50a3a/System.Design.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Design/2.0.0.0__b03f5f7f11d50a3a/System.Design.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.DirectoryServices 0755 root bin -d none /opt/csw/lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a/System.DirectoryServices.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a/System.DirectoryServices.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.DirectoryServices/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.DirectoryServices/2.0.0.0__b03f5f7f11d50a3a/System.DirectoryServices.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.DirectoryServices/2.0.0.0__b03f5f7f11d50a3a/System.DirectoryServices.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Drawing 0755 root bin -d none /opt/csw/lib/mono/gac/System.Drawing.Design 0755 root bin -d none /opt/csw/lib/mono/gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.Design.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.Design.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Drawing.Design/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Drawing.Design/2.0.0.0__b03f5f7f11d50a3a/System.Drawing.Design.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Drawing.Design/2.0.0.0__b03f5f7f11d50a3a/System.Drawing.Design.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Drawing/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Drawing/2.0.0.0__b03f5f7f11d50a3a/System.Drawing.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Drawing/2.0.0.0__b03f5f7f11d50a3a/System.Drawing.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.EnterpriseServices 0755 root bin -d none /opt/csw/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.EnterpriseServices/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.EnterpriseServices/2.0.0.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.EnterpriseServices/2.0.0.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Management 0755 root bin -d none /opt/csw/lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Management/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Management/2.0.0.0__b03f5f7f11d50a3a/System.Management.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Management/2.0.0.0__b03f5f7f11d50a3a/System.Management.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Messaging 0755 root bin -d none /opt/csw/lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Runtime.Remoting 0755 root bin -d none /opt/csw/lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime.Remoting.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime.Remoting.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Runtime.Remoting/2.0.0.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Runtime.Remoting/2.0.0.0__b77a5c561934e089/System.Runtime.Remoting.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Runtime.Remoting/2.0.0.0__b77a5c561934e089/System.Runtime.Remoting.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap 0755 root bin -d none /opt/csw/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/2.0.0.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/2.0.0.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Security 0755 root bin -d none /opt/csw/lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/System.Security.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/System.Security.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Security/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Security/2.0.0.0__b03f5f7f11d50a3a/System.Security.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Security/2.0.0.0__b03f5f7f11d50a3a/System.Security.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.ServiceProcess 0755 root bin -d none /opt/csw/lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a/System.ServiceProcess.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a/System.ServiceProcess.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Web 0755 root bin -d none /opt/csw/lib/mono/gac/System.Web.Services 0755 root bin -d none /opt/csw/lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a/System.Web.Services.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a/System.Web.Services.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a/System.Web.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a/System.Web.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Web/2.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/System.Web/2.0.0.0__b03f5f7f11d50a3a/System.Web.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Web/2.0.0.0__b03f5f7f11d50a3a/System.Web.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Windows.Forms 0755 root bin -d none /opt/csw/lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Forms.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Forms.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089/System.Windows.Forms.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089/System.Windows.Forms.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Xml 0755 root bin -d none /opt/csw/lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089/System.Xml.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089/System.Xml.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System/1.0.5000.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll 0755 root bin -d none /opt/csw/lib/mono/gac/System/2.0.0.0__b77a5c561934e089 0755 root bin -f none /opt/csw/lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll 0755 root bin -d none /opt/csw/lib/mono/gac/cscompmgd 0755 root bin -d none /opt/csw/lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll 0755 root bin -d none /opt/csw/lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a 0755 root bin -f none /opt/csw/lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a/cscompmgd.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a/cscompmgd.dll 0755 root bin -d none /opt/csw/lib/mono/gac/nunit.core 0755 root bin -d none /opt/csw/lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77 0755 root bin -f none /opt/csw/lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77/nunit.core.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77/nunit.core.dll 0755 root bin -d none /opt/csw/lib/mono/gac/nunit.framework 0755 root bin -d none /opt/csw/lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77 0755 root bin -f none /opt/csw/lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77/nunit.framework.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77/nunit.framework.dll 0755 root bin -d none /opt/csw/lib/mono/gac/nunit.util 0755 root bin -d none /opt/csw/lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77 0755 root bin -f none /opt/csw/lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77/nunit.util.dll.mdb 0644 root bin -f none /opt/csw/lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77/nunit.util.dll 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/dotnet.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/mint.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/mono-nunit.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/mono.pc 0644 root bin -d none /opt/csw/man/man1 0755 root bin -f none /opt/csw/man/man1/jay.1 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/jay 0755 root bin -f none /opt/csw/share/jay/ACKNOWLEDGEMENTS 0644 root bin -f none /opt/csw/share/jay/NEW_FEATURES 0644 root bin -f none /opt/csw/share/jay/NOTES 0644 root bin -f none /opt/csw/share/jay/README.jay 0644 root bin -f none /opt/csw/share/jay/README 0644 root bin -f none /opt/csw/share/jay/skeleton.cs 0644 root bin -f none /opt/csw/share/jay/skeleton 0644 root bin -d none /opt/csw/share/libgc-mono 0755 root bin -f none /opt/csw/share/libgc-mono/README.DGUX386 0644 root bin -f none /opt/csw/share/libgc-mono/README.Mac 0644 root bin -f none /opt/csw/share/libgc-mono/README.MacOSX 0644 root bin -f none /opt/csw/share/libgc-mono/README.OS2 0644 root bin -f none /opt/csw/share/libgc-mono/README.amiga 0644 root bin -f none /opt/csw/share/libgc-mono/README.arm.cross 0644 root bin -f none /opt/csw/share/libgc-mono/README.autoconf 0644 root bin -f none /opt/csw/share/libgc-mono/README.changes 0644 root bin -f none /opt/csw/share/libgc-mono/README.contributors 0644 root bin -f none /opt/csw/share/libgc-mono/README.cords 0644 root bin -f none /opt/csw/share/libgc-mono/README.darwin 0644 root bin -f none /opt/csw/share/libgc-mono/README.dj 0644 root bin -f none /opt/csw/share/libgc-mono/README.environment 0644 root bin -f none /opt/csw/share/libgc-mono/README.ews4800 0644 root bin -f none /opt/csw/share/libgc-mono/README.hp 0644 root bin -f none /opt/csw/share/libgc-mono/README.linux 0644 root bin -f none /opt/csw/share/libgc-mono/README.macros 0644 root bin -f none /opt/csw/share/libgc-mono/README.rs6000 0644 root bin -f none /opt/csw/share/libgc-mono/README.sgi 0644 root bin -f none /opt/csw/share/libgc-mono/README.solaris2 0644 root bin -f none /opt/csw/share/libgc-mono/README.uts 0644 root bin -f none /opt/csw/share/libgc-mono/README.win32 0644 root bin -f none /opt/csw/share/libgc-mono/README 0644 root bin -f none /opt/csw/share/libgc-mono/barrett_diagram 0644 root bin -f none /opt/csw/share/libgc-mono/debugging.html 0644 root bin -f none /opt/csw/share/libgc-mono/gc.man 0644 root bin -f none /opt/csw/share/libgc-mono/gcdescr.html 0644 root bin -f none /opt/csw/share/libgc-mono/gcinterface.html 0644 root bin -f none /opt/csw/share/libgc-mono/leak.html 0644 root bin -f none /opt/csw/share/libgc-mono/scale.html 0644 root bin -f none /opt/csw/share/libgc-mono/simple_example.html 0644 root bin -f none /opt/csw/share/libgc-mono/tree.html 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/al.1 0644 root bin -f none /opt/csw/share/man/man1/cert2spc.1 0644 root bin -f none /opt/csw/share/man/man1/certmgr.1 0644 root bin -f none /opt/csw/share/man/man1/chktrust.1 0644 root bin -f none /opt/csw/share/man/man1/cilc.1 0644 root bin -f none /opt/csw/share/man/man1/disco.1 0644 root bin -f none /opt/csw/share/man/man1/dtd2xsd.1 0644 root bin -f none /opt/csw/share/man/man1/gacutil.1 0644 root bin -f none /opt/csw/share/man/man1/genxs.1 0644 root bin -f none /opt/csw/share/man/man1/ilasm.1 0644 root bin -f none /opt/csw/share/man/man1/macpack.1 0644 root bin -f none /opt/csw/share/man/man1/makecert.1 0644 root bin -f none /opt/csw/share/man/man1/mcs.1 0644 root bin -f none /opt/csw/share/man/man1/mint.1 0644 root bin -f none /opt/csw/share/man/man1/mkbundle.1 0644 root bin -f none /opt/csw/share/man/man1/mono-service.1 0644 root bin -f none /opt/csw/share/man/man1/mono-shlib-cop.1 0644 root bin -f none /opt/csw/share/man/man1/mono.1 0644 root bin -f none /opt/csw/share/man/man1/monoburg.1 0644 root bin -f none /opt/csw/share/man/man1/monodis.1 0644 root bin -f none /opt/csw/share/man/man1/monop.1 0644 root bin -f none /opt/csw/share/man/man1/monostyle.1 0644 root bin -f none /opt/csw/share/man/man1/mozroots.1 0644 root bin -f none /opt/csw/share/man/man1/oldmono.1 0644 root bin -f none /opt/csw/share/man/man1/permview.1 0644 root bin -f none /opt/csw/share/man/man1/prj2make.1 0644 root bin -f none /opt/csw/share/man/man1/secutil.1 0644 root bin -f none /opt/csw/share/man/man1/setreg.1 0644 root bin -f none /opt/csw/share/man/man1/signcode.1 0644 root bin -f none /opt/csw/share/man/man1/sn.1 0644 root bin -f none /opt/csw/share/man/man1/soapsuds.1 0644 root bin -f none /opt/csw/share/man/man1/sqlsharp.1 0644 root bin -f none /opt/csw/share/man/man1/wsdl.1 0644 root bin -f none /opt/csw/share/man/man1/xsd.1 0644 root bin -d none /opt/csw/share/man/man5 0755 root bin -f none /opt/csw/share/man/man5/mono-config.5 0644 root bin -d none /opt/csw/share/mono 0755 root bin -d none /opt/csw/share/mono/cil 0755 root bin -f none /opt/csw/share/mono/cil/cil-opcodes.xml 0644 root bin -i copyright=CSWmono.copyright -i depend=CSWmono.depend -i pkginfo=CSWmono.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 11:41:20 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 09:41:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[15849] csw/mgar/pkg/mysql5/branches/mysql-5.0.x-old-layout / Message-ID: Revision: 15849 http://gar.svn.sourceforge.net/gar/?rev=15849&view=rev Author: wahwah Date: 2011-10-04 09:41:19 +0000 (Tue, 04 Oct 2011) Log Message: ----------- Let's try libdir_install Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x-old-layout/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 11:44:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 09:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[15850] csw/mgar/pkg/mysql5/branches/mysql-5.0.x-old-layout /Makefile Message-ID: Revision: 15850 http://gar.svn.sourceforge.net/gar/?rev=15850&view=rev Author: wahwah Date: 2011-10-04 09:44:19 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x-old-layout: use libdir_install Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x-old-layout/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x-old-layout/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x-old-layout/Makefile 2011-10-04 09:41:19 UTC (rev 15849) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x-old-layout/Makefile 2011-10-04 09:44:19 UTC (rev 15850) @@ -30,7 +30,7 @@ prefix = $(BUILD_PREFIX)/$(NAME) localstatedir = /var$(prefix) sysconfdir = /etc$(prefix) -libdir = $(BUILD_PREFIX)/lib +libdir_install = $(BUILD_PREFIX)/lib includedir = $(BUILD_PREFIX)/include # --bindir=/opt/csw/mysql5/bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 13:13:10 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 11:13:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15851] csw/mgar/pkg/schily/trunk/Makefile Message-ID: Revision: 15851 http://gar.svn.sourceforge.net/gar/?rev=15851&view=rev Author: wahwah Date: 2011-10-04 11:13:10 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/schily/trunk: A similar script worked without GAR Modified Paths: -------------- csw/mgar/pkg/schily/trunk/Makefile Modified: csw/mgar/pkg/schily/trunk/Makefile =================================================================== --- csw/mgar/pkg/schily/trunk/Makefile 2011-10-04 09:44:19 UTC (rev 15850) +++ csw/mgar/pkg/schily/trunk/Makefile 2011-10-04 11:13:10 UTC (rev 15851) @@ -19,15 +19,14 @@ INS_BASE = $(BUILD_PREFIX) INS_RBASE = $(BUILD_PREFIX) EXTRA_COMMON_EXPORTS = INS_BASE INS_RBASE -# Shared libraries don't work at the moment. -# LINKMODE = dynamic -# EXTRA_COMMON_EXPORTS += LINKMODE -BUILD_ARGS = INS_BASE=$(INS_BASE) INS_RBASE=$(INS_RBASE) +BUILD_ARGS = INS_BASE=$(INS_BASE) +BUILD_ARGS += INS_RBASE=$(INS_RBASE) +BUILD_ARGS += LINKMODE=dynamic -PATH = /opt/csw/bin:/usr/ccs/bin:/usr/bin - include gar/category.mk +PATH := /usr/ccs/bin:/usr/bin:/opt/csw/bin + build-custom: (cd $(WORKSRC) && /usr/bin/env -i PATH=$(PATH) /opt/csw/bin/smake $(BUILD_ARGS)) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 15:35:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 13:35:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[15852] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15852 http://gar.svn.sourceforge.net/gar/?rev=15852&view=rev Author: wahwah Date: 2011-10-04 13:35:25 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: removing double mysql_config alternative definition Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 11:13:10 UTC (rev 15851) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 13:35:25 UTC (rev 15852) @@ -201,7 +201,7 @@ CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) -CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/mysqlaccess-5.0.1 +CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess-$(BASE_VERSION).1 # This could be reviewed. CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content @@ -215,7 +215,6 @@ EXECUTABLES += myisampack EXECUTABLES += mysql EXECUTABLES += mysql_client_test -EXECUTABLES += mysql_config EXECUTABLES += mysql_convert_table_format EXECUTABLES += mysql_explain_log EXECUTABLES += mysql_find_rows This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Oct 4 16:13:14 2011 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 04 Oct 2011 14:13:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15853] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 15853 http://gar.svn.sourceforge.net/gar/?rev=15853&view=rev Author: janholzh Date: 2011-10-04 14:13:13 +0000 (Tue, 04 Oct 2011) Log Message: ----------- ffmpeg: update to 0.8.5 and disabled ASM-code since it is now picked up and does not build Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-10-04 13:35:25 UTC (rev 15852) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-10-04 14:13:13 UTC (rev 15853) @@ -6,10 +6,9 @@ # This also mentions that ffmpeg build static is way faster then shared. So this would need two builds # one static for static ffmpeg and one shared to get the shared libs. # Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common -# They disable all optimizations though. I don't know why. NAME = ffmpeg -VERSION = 0.8.3 +VERSION = 0.8.5 CATEGORIES = lib DESCRIPTION = Very fast video and audio converter (includes libavcodec) @@ -46,6 +45,9 @@ CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --enable-gpl CONFIGURE_ARGS += --enable-version3 +CONFIGURE_ARGS += --enable-runtime-cpudetect +# All ASM code is broke no clue if it yasm that breaks it or solaris in gerneral. As it is disabled in pkgsrc too probably a global problem. +CONFIGURE_ARGS += --disable-asm # Needs two builds one shared one static #CONFIGURE_ARGS += --enable-shared Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2011-10-04 13:35:25 UTC (rev 15852) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2011-10-04 14:13:13 UTC (rev 15853) @@ -1 +1 @@ -556870ccfd6c9c0426c7dd86dd5beb62 ffmpeg-0.8.3.tar.bz2 +726877b19ece7ea64def8b7e6727e182 ffmpeg-0.8.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 17:15:45 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 15:15:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[15854] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15854 http://gar.svn.sourceforge.net/gar/?rev=15854&view=rev Author: wahwah Date: 2011-10-04 15:15:44 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: small refactoring Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 14:13:13 UTC (rev 15853) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 15:15:44 UTC (rev 15854) @@ -26,13 +26,8 @@ (Structured Query Language) database server. endef -# Where to put the init script -global_sysconfdir = /etc$(BUILD_PREFIX) -# Where to link the binaries -global_bindir = $(BUILD_PREFIX)/bin +INITSMF = $(sysconfdir)/init\.d/csw$(NAME) -INITSMF = $(global_sysconfdir)/init\.d/csw$(NAME) - # Existing databases are in this location localstatedir = /var/opt/csw/mysql5 @@ -54,7 +49,7 @@ OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1 ALTERNATIVES_CSWmysql-dev = mysql_dev -ALTERNATIVE_mysql_dev = $(global_bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 +ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ @@ -308,16 +303,16 @@ gln -sf ../../../$(NAME)/share/$(NAME)/doc/README.CSW \ $(PKGROOT)/opt/csw/share/$(NAME)/doc/README.CSW ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql - ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) + ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) + $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) # Create symlinks to binaries - # ginstall -m 755 -d $(PKGROOT)$(global_bindir) + # ginstall -m 755 -d $(PKGROOT)$(bindir) #for f in $(PKGROOT)$(bindir)/*; do \ # if echo $$f | grep amd64$$; then continue; fi; \ # if echo $$f | grep sparcv9$$; then continue; fi; \ # ln -s ../$(NAME)/bin/`basename $$f` \ - # $(PKGROOT)$(global_bindir)/`basename $$f`; \ + # $(PKGROOT)$(bindir)/`basename $$f`; \ #done # http://www.opencsw.org/bugtrack/view.php?id=4149 ginstall -m 755 -d $(PKGROOT)$(sysconfdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 18:33:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 16:33:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[15855] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15855 http://gar.svn.sourceforge.net/gar/?rev=15855&view=rev Author: wahwah Date: 2011-10-04 16:33:25 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: Interpolate BASE_VERSION in the startup script Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 15:15:44 UTC (rev 15854) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 16:33:25 UTC (rev 15855) @@ -283,6 +283,7 @@ -e 's+ at localstatedir@+$(localstatedir)+' \ -e 's+ at sysconfdir@+$(sysconfdir)+' \ -e 's+ at bindir@+$(bindir)+' \ + -e 's+ at BASE_VERSION@+$(BASE_VERSION)+' \ < $(WORKDIR)/csw$(NAME).tpl \ > $(WORKDIR)/csw$(NAME) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 4 19:45:16 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Oct 2011 17:45:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15856] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15856 http://gar.svn.sourceforge.net/gar/?rev=15856&view=rev Author: wahwah Date: 2011-10-04 17:45:16 +0000 (Tue, 04 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: alternatives fixes Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 16:33:25 UTC (rev 15855) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-04 17:45:16 UTC (rev 15856) @@ -69,30 +69,30 @@ # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. -CSW$(NAME)client_programs += myisamlog -CSW$(NAME)client_programs += myisampack -CSW$(NAME)client_programs += mysql -CSW$(NAME)client_programs += mysqlaccess -CSW$(NAME)client_programs += mysqladmin -CSW$(NAME)client_programs += mysqlbin -CSW$(NAME)client_programs += mysqlbinlog -CSW$(NAME)client_programs += mysqlcheck -CSW$(NAME)client_programs += mysql_client_test -CSW$(NAME)client_programs += mysqldump -CSW$(NAME)client_programs += mysqlhotcopy -CSW$(NAME)client_programs += mysqlimport -CSW$(NAME)client_programs += mysqlshow -CSW$(NAME)client_programs += mysql_zap -CSW$(NAME)client_programs += perror -CSW$(NAME)client_programs += replace +client_programs += myisamlog +client_programs += myisampack +client_programs += mysql +client_programs += mysqlaccess +client_programs += mysqladmin +client_programs += mysqlbin +client_programs += mysqlbinlog +client_programs += mysqlcheck +client_programs += mysql_client_test +client_programs += mysqldump +client_programs += mysqlhotcopy +client_programs += mysqlimport +client_programs += mysqlshow +client_programs += mysql_zap +client_programs += perror +client_programs += replace PACKAGES += CSW$(NAME)client SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries PKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)-$(BASE_VERSION)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)-$(BASE_VERSION)\.1) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 @@ -245,17 +245,16 @@ EXECUTABLES += resolve_stack_dump EXECUTABLES += resolveip -ALTERNATIVES = ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main -ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES)) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) 50 ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client -ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql_client $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 -ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ +ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) -ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ +ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 5 02:29:03 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 05 Oct 2011 00:29:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[15857] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 15857 http://gar.svn.sourceforge.net/gar/?rev=15857&view=rev Author: bdwalton Date: 2011-10-05 00:29:03 +0000 (Wed, 05 Oct 2011) Log Message: ----------- apache2/trunk: version bump to 2.2.21 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/checksums Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-10-04 17:45:16 UTC (rev 15856) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-10-05 00:29:03 UTC (rev 15857) @@ -1,7 +1,7 @@ # $Id$ NAME = httpd -VERSION = 2.2.20 +VERSION = 2.2.21 CATEGORIES = server DESCRIPTION = A high performance HTTP server. Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2011-10-04 17:45:16 UTC (rev 15856) +++ csw/mgar/pkg/apache2/trunk/checksums 2011-10-05 00:29:03 UTC (rev 15857) @@ -1 +1 @@ -4504934464c5ee51018dbafa6d99810d httpd-2.2.20.tar.gz +b24ca6db942a4f8e57c357e5e3058d31 httpd-2.2.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Oct 5 07:44:55 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 05 Oct 2011 05:44:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[15858] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 15858 http://gar.svn.sourceforge.net/gar/?rev=15858&view=rev Author: guengel Date: 2011-10-05 05:44:54 +0000 (Wed, 05 Oct 2011) Log Message: ----------- glib2/trunk: Removed debug compiler options. Disable one more failing test on sparcv9. Added some CHECKPKG_OVERRIDES. Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0023-Disable-data-input-stream-read-int-test-on-sparc.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-10-05 00:29:03 UTC (rev 15857) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-10-05 05:44:54 UTC (rev 15858) @@ -47,6 +47,9 @@ PATCHFILES += 0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch PATCHFILES += 0019-Disable-volumemonitor-tests.patch PATCHFILES += 0022-Disable-gsettings-strinfo-on-sparcv9.patch +PATCHFILES += 0023-Disable-data-input-stream-read-int-test-on-sparc.patch + +# SPARCv9 Specific Patches PATCHFILES_isa-sparcv9 += 0023-Disable-run-assert-msg-test.sh.patch PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 @@ -160,8 +163,8 @@ CONFIGURE_ARGS += --disable-dtrace # DEBUGGING -CONFIGURE_ARGS += --enable-debug=yes -EXTRA_CFLAGS += -xO0 -g +# CONFIGURE_ARGS += --enable-debug=yes +# EXTRA_CFLAGS += -xO0 -g # Those are to make the checks work EXTRA_COMMON_EXPORTS = TZ @@ -174,6 +177,16 @@ #provided by iconv MERGE_EXCLUDE_FILES = .*/charset.alias +# The checks below are excluded since /usr/share/ is included in default value of +# XDG_DATA_DIRS. However, /opt/csw/share is also included, so no harm. +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.2800.8 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.2800.8 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.2800.8 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.2800.8 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.2800.8 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.2800.8 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.2800.8 + include gar/category.mk # We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out Added: csw/mgar/pkg/glib2/trunk/files/0023-Disable-data-input-stream-read-int-test-on-sparc.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0023-Disable-data-input-stream-read-int-test-on-sparc.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0023-Disable-data-input-stream-read-int-test-on-sparc.patch 2011-10-05 05:44:54 UTC (rev 15858) @@ -0,0 +1,28 @@ +From a9c0aca79d049618498c61182e7fca862e27c206 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Mon, 3 Oct 2011 16:29:26 +0200 +Subject: [PATCH] Disable data-input-stream/read-int test on sparc + +The test failed when removing '-xO0 -g' from the compile options. +--- + gio/tests/data-input-stream.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/gio/tests/data-input-stream.c b/gio/tests/data-input-stream.c +index 1a34205..fca8ee8 100644 +--- a/gio/tests/data-input-stream.c ++++ b/gio/tests/data-input-stream.c +@@ -422,7 +422,10 @@ main (int argc, + g_test_add_func ("/data-input-stream/read-lines-any", test_read_lines_any); + g_test_add_func ("/data-input-stream/read-until", test_read_until); + g_test_add_func ("/data-input-stream/read-upto", test_read_upto); ++ /* Fails on sparcv8 when compiling without -xO0 -g */ ++#ifndef __sparc + g_test_add_func ("/data-input-stream/read-int", test_read_int); ++#endif + + return g_test_run(); + } +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 10:31:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 08:31:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15859] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15859 http://gar.svn.sourceforge.net/gar/?rev=15859&view=rev Author: wahwah Date: 2011-10-05 08:31:06 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: Try to avoid file conflicts by setting datadir to something version-specific Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 05:44:54 UTC (rev 15858) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 08:31:06 UTC (rev 15859) @@ -30,6 +30,8 @@ # Existing databases are in this location localstatedir = /var/opt/csw/mysql5 +# To avoid file conflicts +datadir = $(prefix)/share/mysql/$(BASE_VERSION) MYSQL_LIB_VER = 15 @@ -43,7 +45,7 @@ PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION)) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) -PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config-$(BASE_VERSION)\.1 PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 10:41:15 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 08:41:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[15860] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw Message-ID: Revision: 15860 http://gar.svn.sourceforge.net/gar/?rev=15860&view=rev Author: wahwah Date: 2011-10-05 08:41:15 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x-optcsw: unify with mysql-5.0 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0004-looking-for-ps-use-basename-0.patch csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51.tpl Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 08:31:06 UTC (rev 15859) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 08:41:15 UTC (rev 15860) @@ -9,6 +9,8 @@ VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# PACKAGING_PLATFORMS = solaris9-sparc solaris10-sparc + # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -21,156 +23,137 @@ (Structured Query Language) database server. endef -bindir_install = $(prefix)/libexec/$(PROJ_NAME)/$(BASE_VERSION)/bin -datadir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION) -docdir = $(prefix)/share/doc/$(PROJ_NAME)/$(BASE_VERSION) -includedir = $(prefix)/include/$(PROJ_NAME)/$(BASE_VERSION) -infodir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION)/info -libdir_install = $(prefix)/lib/$(PROJ_NAME)/$(BASE_VERSION) -libexecdir_install = $(prefix)/libexec/$(PROJ_NAME)/$(BASE_VERSION) -lispdir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION)/emacs/site-lisp -localstatedir = /var$(prefix)/$(PROJ_NAME)/$(BASE_VERSION) -mandir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION)/man -sbindir_install = $(prefix)/sbin/$(PROJ_NAME)/$(BASE_VERSION) -sharedstatedir = $(prefix)/share/$(PROJ_NAME)/$(BASE_VERSION) -sourcedir = $(prefix)/src/$(PROJ_NAME)/$(BASE_VERSION) -sysconfdir = /etc$(prefix)/$(PROJ_NAME)/$(BASE_VERSION) +INITSMF = $(sysconfdir)/init\.d/csw$(NAME) -# Where to put the init script -global_sysconfdir = /etc/opt/csw -# Where to link the binaries -global_bindir = /opt/csw/bin +# Existing databases are in this location +# localstatedir = /var/opt/csw/mysql5 -INITSMF = $(global_sysconfdir)/init\.d/csw$(NAME) +MYSQL_LIB_VER = 16 -PACKAGES = CSW$(NAME) -PACKAGES += CSW$(NAME)bench -PACKAGES += CSW$(NAME)client -PACKAGES += CSW$(NAME)devel -PACKAGES += CSW$(NAME)rt -PACKAGES += CSW$(NAME)test +PACKAGES += CSWmysql-dev +SPKG_DESC_CSWmysql-dev = MySQL development files +PKGFILES_CSWmysql-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient$(MYSQL_LIB_VER) +CSWmysql-dev_programs += mysql_config +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql-dev += $(prefix)/include.* +PKGFILES_CSWmysql-dev += /opt/csw/include/mysql +OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel +CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1 +ALTERNATIVES_CSWmysql-dev = mysql_dev +ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 +ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) +ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ + $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) -PATCHFILES = 0001-Use-libc-not-libcrypt.patch -PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch -# PATCHFILES += 0003-OpenCSW-perl-for-tests.patch -PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch +PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) +PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) +SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt +OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt -SPKG_DESC_CSW$(NAME) = Multithreaded SQL database -SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking +PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) +SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWosslrt +OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt + +# Defining the client programs, which are going to pick up the 32- and 64-bit +# binaries, symbolic links, isaexec stuff and man pages. +client_programs += myisamlog +client_programs += myisampack +client_programs += mysql +client_programs += mysqlaccess +client_programs += mysqladmin +client_programs += mysqlbin +client_programs += mysqlbinlog +client_programs += mysqlcheck +client_programs += mysql_client_test +client_programs += mysqldump +client_programs += mysqlhotcopy +client_programs += mysqlimport +client_programs += mysqlshow +client_programs += mysql_zap +client_programs += perror +client_programs += replace + +PACKAGES += CSW$(NAME)client SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries -SPKG_DESC_CSW$(NAME)devel = MySQL $(BASE_VERSION) header files -SPKG_DESC_CSW$(NAME)rt = MySQL $(BASE_VERSION) runtime files -SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files +PKGFILES_CSW$(NAME)client = $(bindir) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)-$(BASE_VERSION)\.1) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt +CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry -CATALOGNAME_CSW$(NAME) = $(NAME) -CATALOGNAME_CSW$(NAME)bench = $(NAME)bench -CATALOGNAME_CSW$(NAME)client = $(NAME)client -CATALOGNAME_CSW$(NAME)devel = $(NAME)devel -CATALOGNAME_CSW$(NAME)rt = $(NAME)rt -CATALOGNAME_CSW$(NAME)test = $(NAME)test +PACKAGES += CSW$(NAME) +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) +SPKG_DESC_CSW$(NAME) = Multithreaded SQL database +RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt +CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry +CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content - +PACKAGES += CSW$(NAME)bench +SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking ARCHALL_CSW$(NAME)bench = 1 +PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* +RUNTIME_DEP_PKGS_CSW$(NAME)bench = CSW$(NAME) +RUNTIME_DEP_PKGS_CSW$(NAME)bench += CSWperl +CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWperl -# Defining the client programs, which are going to pick up the 32- and 64-bit -# binaries, symbolic links, isaexec stuff and man pages. -CSW$(NAME)client_programs = myisamlog -CSW$(NAME)client_programs += myisampack -CSW$(NAME)client_programs += mysql -CSW$(NAME)client_programs += mysqlaccess -CSW$(NAME)client_programs += mysqladmin -CSW$(NAME)client_programs += mysqlbin -CSW$(NAME)client_programs += mysqlbinlog -CSW$(NAME)client_programs += mysqlcheck -CSW$(NAME)client_programs += mysql_client_test -CSW$(NAME)client_programs += mysqldump -CSW$(NAME)client_programs += mysqlhotcopy -CSW$(NAME)client_programs += mysqlimport -CSW$(NAME)client_programs += mysqlshow -CSW$(NAME)client_programs += mysql_zap -CSW$(NAME)client_programs += perror -CSW$(NAME)client_programs += replace +PACKAGES += CSW$(NAME)test +SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files +# There is one binary there in 5.1 +# ARCHALL_CSW$(NAME)test = 1 +PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* +RUNTIME_DEP_PKGS_CSW$(NAME)test = CSW$(NAME) +RUNTIME_DEP_PKGS_CSW$(NAME)test += CSWperl -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/$(NAME)/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/$(NAME)/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql +PATCHFILES = 0001-Use-libc-not-libcrypt.patch +PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch +# PATCHFILES += 0003-OpenCSW-perl-for-tests.patch +PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch +PATCHFILES += 0004-looking-for-ps-use-basename-0.patch +# Perhaps using sed would be better, but we have a patch for now. +# PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch -CSW$(NAME)devel_programs += mysql_config - # Enable 64 bits build BUILD64 = 1 -PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* -PKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSW$(NAME)devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSW$(NAME)devel += $(prefix)/include.* -PKGFILES_CSW$(NAME)devel += /opt/csw/include/mysql +EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -PKGFILES_CSW$(NAME)rt = $(libdir) -PKGFILES_CSW$(NAME)rt += $(libdir)/.* -PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* - -RUNTIME_DEP_PKGS_CSW$(NAME) = CSW$(NAME)client -RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)rt -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWzlib -RUNTIME_DEP_PKGS_CSW$(NAME)rt = CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWzlib -RUNTIME_DEP_PKGS_CSW$(NAME)bench += CSWperl -RUNTIME_DEP_PKGS_CSW$(NAME)client = CSW$(NAME)rt -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWncurses -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWzlib -RUNTIME_DEP_PKGS_CSW$(NAME)test += CSWperl - -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ +MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(VERSION).tar.gz -DISTFILES += csw$(NAME) quick_start-csw README.CSW ChangeLog +DISTFILES += csw$(NAME).tpl +DISTFILES += quick_start-csw +DISTFILES += README.CSW +DISTFILES += ChangeLog DISTFILES += CSW$(NAME).preinstall DISTFILES += CSW$(NAME).postinstall DISTFILES += cswusergroup -UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz - # TODO: Do the proper prerequsite pkgs. BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -# MySQL-5.1.40 doesn't compile without setting EXTRA_INC. -EXTRA_INC = /opt/csw/include -EXTRA_LIB = /opt/csw/lib -# We're building on Solaris 9 now. -# # The following EXTRA_CFLAGS are necessary to compile on Solaris 8. Otherwise -# # the following problem occurs: -# # -# # "handler/i_s.cc", line 159: Error: The function "localtime_r" must have a -# # prototype. -# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ - -# --with-server-suffix="-3ubuntu12.3" \ -# --with-system-type="debian-linux-gnu" \ -# --with-pstack \ -# --with-unix-socket-path=/var/run/mysqld/mysqld.sock \ -# --without-readline \ -# \ -# --without-ndbcluster \ - - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler @@ -182,8 +165,8 @@ CONFIGURE_ARGS += --with-low-memory CONFIGURE_ARGS += --with-pthread CONFIGURE_ARGS += --with-readline -CONFIGURE_ARGS += --with-zlib-dir=/opt/csw -CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --with-zlib-dir=$(BUILD_PREFIX) +CONFIGURE_ARGS += --with-ssl=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-comment="(OpenCSW)" CONFIGURE_ARGS += --with-mysqld-user=mysql @@ -194,13 +177,13 @@ CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +CONFIGURE_ARGS += --program-suffix=-$(BASE_VERSION) # TODO: Make the tests pass. They don't at the moment. SKIPTEST ?= 1 TEST_SCRIPTS = custom TEST_TARGETS = check - USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup PROTOTYPE_MODIFIERS = dbdir @@ -210,15 +193,79 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -CHECKPKG_OVERRIDES_CSWmysql51 += surplus-dependency|CSWmysql51client -CHECKPKG_OVERRIDES_CSWmysql51rt += bad-rpath-entry +CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client +CHECKPKG_OVERRIDES_CSW$(NAME)bench += file-with-bad-content +CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSW$(NAME) +CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content +CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) +CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess-$(BASE_VERSION).1 +# This could be reviewed. +CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content + +EXECUTABLES += comp_err +EXECUTABLES += innochecksum +EXECUTABLES += msql2mysql +EXECUTABLES += my_print_defaults +EXECUTABLES += myisam_ftdump +EXECUTABLES += myisamchk +EXECUTABLES += myisamlog +EXECUTABLES += myisampack +EXECUTABLES += mysql +EXECUTABLES += mysql_client_test +EXECUTABLES += mysql_convert_table_format +EXECUTABLES += mysql_explain_log +EXECUTABLES += mysql_find_rows +EXECUTABLES += mysql_fix_extensions +EXECUTABLES += mysql_fix_privilege_tables +EXECUTABLES += mysql_install_db +EXECUTABLES += mysql_secure_installation +EXECUTABLES += mysql_setpermission +EXECUTABLES += mysql_tableinfo +EXECUTABLES += mysql_tzinfo_to_sql +EXECUTABLES += mysql_upgrade +EXECUTABLES += mysql_upgrade_shell +EXECUTABLES += mysql_waitpid +EXECUTABLES += mysql_zap +EXECUTABLES += mysqlaccess +EXECUTABLES += mysqladmin +EXECUTABLES += mysqlbinlog +EXECUTABLES += mysqlbug +EXECUTABLES += mysqlcheck +EXECUTABLES += mysqld_multi +EXECUTABLES += mysqld_safe +EXECUTABLES += mysqldump +EXECUTABLES += mysqldumpslow +EXECUTABLES += mysqlhotcopy +EXECUTABLES += mysqlimport +EXECUTABLES += mysqlshow +EXECUTABLES += mysqltest +EXECUTABLES += mysqltestmanager +EXECUTABLES += mysqltestmanager-pwgen +EXECUTABLES += mysqltestmanagerc +EXECUTABLES += perror +EXECUTABLES += replace +EXECUTABLES += resolve_stack_dump +EXECUTABLES += resolveip + +ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main +ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) + +ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client +ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) +ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ + $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) test-custom: - alias sh=/usr/bin/bash; \ + alias sh=/usr/bin/bash; \ cd $(WORKSRC)/mysql-test; \ perl mysql-test-run.pl --mem --big-test --force \ --skip-test=archive-big --skip-test=/gis/ @@ -232,37 +279,47 @@ cd $(WORKSRC) && autoreconf --force --install --symlink @$(MAKECOOKIE) +post-configure-modulated: + gsed \ + -e 's+ at prefix@+$(prefix)+' \ + -e 's+ at localstatedir@+$(localstatedir)+' \ + -e 's+ at sysconfdir@+$(sysconfdir)+' \ + -e 's+ at bindir@+$(bindir)+' \ + -e 's+ at BASE_VERSION@+$(BASE_VERSION)+' \ + < $(WORKDIR)/csw$(NAME).tpl \ + > $(WORKDIR)/csw$(NAME) + @$(MAKECOOKIE) + +post-install-modulated: + (cd $(DESTDIR)$(libdir); gmv -v mysql/* .) + (cd $(DESTDIR)$(libdir); grmdir -v mysql) + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d + @$(MAKECOOKIE) + post-merge: ginstall -m 755 -d $(PKGROOT)$(localstatedir) - ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc - ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc - ln -sf ../../../$(NAME)/share/mysql/doc/README.CSW \ - $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/csw$(NAME) $(PKGROOT)/etc/opt/csw/init.d + ginstall -m 755 -d $(PKGROOT)$(datadir)/$(NAME)/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/$(NAME)/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/$(NAME)/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/$(NAME)/doc + gln -sf ../../../$(NAME)/share/$(NAME)/doc/README.CSW \ + $(PKGROOT)/opt/csw/share/$(NAME)/doc/README.CSW ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql - ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) + ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) - # A symlink for mysql5 include files - # ginstall -m 755 -d $(PKGROOT)/opt/csw/include - # ln -s ../$(NAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql + $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) # Create symlinks to binaries - ginstall -m 755 -d $(PKGROOT)$(global_bindir) - for f in $(PKGROOT)$(bindir)/*; do \ - if echo $$f | grep amd64$$; then continue; fi; \ - if echo $$f | grep sparcv9$$; then continue; fi; \ - ln -s ../..$(bindir)/`basename $$f` \ - $(PKGROOT)$(global_bindir)/`basename $$f`; \ - done - # /opt/csw/$(NAME)/lib/sparc9/mysql -- by GAR, it's logical - # /opt/csw/$(NAME)/lib/mysql/sparcv9 -- expected by other packages - gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) - # For other applications to link against - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 - gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) - gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) + # ginstall -m 755 -d $(PKGROOT)$(bindir) + #for f in $(PKGROOT)$(bindir)/*; do \ + # if echo $$f | grep amd64$$; then continue; fi; \ + # if echo $$f | grep sparcv9$$; then continue; fi; \ + # ln -s ../$(NAME)/bin/`basename $$f` \ + # $(PKGROOT)$(bindir)/`basename $$f`; \ + #done + # http://www.opencsw.org/bugtrack/view.php?id=4149 + ginstall -m 755 -d $(PKGROOT)$(sysconfdir) @$(MAKECOOKIE) + +# We need the GNU userland (nobody knows why) +PATH := /opt/csw/gnu:$(PATH) Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0004-looking-for-ps-use-basename-0.patch (from rev 15804, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-looking-for-ps-use-basename-0.patch) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0004-looking-for-ps-use-basename-0.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0004-looking-for-ps-use-basename-0.patch 2011-10-05 08:41:15 UTC (rev 15860) @@ -0,0 +1,48 @@ +From 111c7574ea02e17df8b2aff8e1b94d6118024f7b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 28 Sep 2011 23:26:47 +0200 +Subject: [PATCH] looking for ps, use `basename $0` + +Upstream bug filed: +http://bugs.mysql.com/bug.php?id=62567 + +--- + configure.in | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.in b/configure.in +index cfae77d..8e6dd43 100644 +--- a/configure.in ++++ b/configure.in +@@ -518,23 +518,23 @@ AC_PATH_PROG(PS, ps, ps) + AC_MSG_CHECKING("how to check if pid exists") + PS=$ac_cv_path_PS + # Linux style +-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null ++if $PS wwwp $$ 2> /dev/null | grep -- "`basename $0`" > /dev/null + then + FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + # Solaris +-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null ++elif $PS -fp $$ 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + # BSD style +-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null ++elif $PS -uaxww 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" + # SysV style +-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null ++elif $PS -ef 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" + # Do anybody use this? +-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null ++elif $PS $$ 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + else +-- +1.7.6.1 + Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51 2011-10-05 08:31:06 UTC (rev 15859) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51 2011-10-05 08:41:15 UTC (rev 15860) @@ -1,183 +0,0 @@ -#!/bin/sh -# -# $Id$ -# Start script for MySQL database. -# -# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod -# 700. -# -# First time installation can use quick_start-csw in -# /opt/csw/mysql5/share/mysql to build the mysql database for the -# grant tables. Or create the initial database yourself. -# -# Use my.cnf for startup options. See MySQL documention -# for 'Using Option Files'. -# Support for mysql5rc still remains in this startup script. -# - -RETVAL=0 -MYSQLHOME=/opt/csw/mysql5 -MYSQL_VAR=/var/opt/csw/mysql5 -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=$MYSQL_VAR/my.cnf - -# -# Source configuration -[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc -[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc - -# To get started quickly, copy a sample configuration file from -# $MYSQLHOME/share/mysql -# For example, -# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf -# -# Or, manually follow the database creation steps below, and have -# mysql just use defaults for everything. - -# 2006-03-11 Changed to only look for the grant tables database -# 2006-04-16 Changed again. Look for either the grant tables database -# or the options file. -# 2006-12-28 Fix problem. Look for either the grant tables database in -# the default location or the default options file. -if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then - exit 0 -fi - -# If CONFFILE is the server default file, unset CONFFILE -if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then - CONFFILE= -fi - -# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR -# Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then - MYSQLD_DATADIR= -fi - -# Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid} - -# If a database already exists, start whether or not there is a conf file. -# If no conf file, the database will just use internal defaults for everything. - -start_it() { - if test -r $MYSQLD_PID_FILE ; then - if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." - return 1 - fi - fi - - printf "%-60s" "Starting mysqld: " -# 2006-03-11 -# This script no longer creates the default database. You may create the -# default database manually or use /opt/csw/mysql5/share/mysql/quick_start-csw -# if [ ! -d "$MYSQLHOME/var/mysql" ] ; then -# echo MySQL core database has not been created. -# echo Creating it now... -# $MYSQLHOME/bin/mysql_install_db -# chown -R mysql:mysql $MYSQLHOME/var -# fi - -# 2006-04-16 --defaults-file is changed to --defaults-extra-file - $MYSQLHOME/bin/mysqld_safe \ - `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ - --pid-file=$MYSQLD_PID_FILE \ - `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ - `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ - `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ - `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ - `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ - `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ - `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ - `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ - `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ - `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ - `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ - `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ - `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ - `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ - `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ - `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ - `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ - `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ - `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ - `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ - `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ - `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ - `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ - `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ - `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ - `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ - `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ - `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ - `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ - `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ - `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ - `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ - `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ - `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ - `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ - `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ - `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ - `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ - `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ - `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ - `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ - `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ - `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ - & >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - return 0 -} - -stop_it() { - - printf "%-60s" "Shutting down mysqld: " - if test -f "$MYSQLD_PID_FILE" ; then - pkill mysqld_safe >/dev/null 2>&1 - kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - echo "" - return 0 -} - -case $1 in - start) - start_it - ;; - - stop) - stop_it - ;; - - restart) - stop_it - while pgrep mysqld > /dev/null - do - sleep 1 - done - start_it - ;; - - *) - echo "Usage: $0 { start | stop | restart } " - ;; -esac - -exit $RETVAL Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51.tpl (from rev 15849, csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51.tpl (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51.tpl 2011-10-05 08:41:15 UTC (rev 15860) @@ -0,0 +1,207 @@ +#!/bin/sh +# vim:ft=sh: +# +# $Id$ +# Start script for MySQL database. +# +# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod +# 700. +# +# First time installation can use quick_start-csw in +# /opt/csw/mysql5/share/mysql to build the mysql database for the +# grant tables. Or create the initial database yourself. +# +# Use my.cnf for startup options. See MySQL documention +# for 'Using Option Files'. +# Support for mysql5rc still remains in this startup script. +# + +RETVAL=0 +prefix="@prefix@" +BASEDIR="${prefix}" +BINDIR="@bindir@" +MYSQL_VAR="@localstatedir@" +sysconfdir="@sysconfdir@" +BASE_VERSION="@BASE_VERSION@" +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=${sysconfdir}/my.cnf + +# Source the configuration +[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc +[ -r @prefix@/etc/mysql5rc ] && . @prefix@/etc/mysql5rc +[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc + +if [ -r "${sysconfdir}/my.cnf" ]; then + MYSQL_HOME="${MYSQL_VAR}" +elif [ -r "${BASEDIR}/my.cnf" ]; then + MYSQL_HOME="${BASEDIR}" +fi +export MYSQL_HOME + +# To get started quickly, copy a sample configuration file from +# $BASEDIR/share/mysql +# For example, +# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf +# +# Or, manually follow the database creation steps below, and have +# mysql just use defaults for everything. + +# 2006-03-11 Changed to only look for the grant tables database +# 2006-04-16 Changed again. Look for either the grant tables database +# or the options file. +# 2006-12-28 Fix problem. Look for either the grant tables database in +# the default location or the default options file. +if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then + exit 0 +fi + +# If CONFFILE is the server default file, unset CONFFILE +if [ "${CONFFILE}" = "${MYSQL_HOME}/my.cnf" \ + -o \ + "${CONFFILE}" = "${sysconfdir}/my.cnf" ]; then + CONFFILE= +fi + +# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR +# Also, check that MYSQLD_DATADIR contains a mysql directory +if [ ! -d "$MYSQL_HOME/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then + MYSQLD_DATADIR= +fi + +# Make sure required vars are set +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_HOME/mysql.pid} + +# If a database already exists, start whether or not there is a conf file. +# If no conf file, the database will just use internal defaults for everything. + +start_it() { + if test -r $MYSQLD_PID_FILE ; then + if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then + echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." + return 1 + fi + fi + + printf "%-60s" "Starting mysqld: " + + # 2006-03-11 + # This script no longer creates the default database. You may create the + # default database manually or use + # /opt/csw/mysql5/share/mysql/quick_start-csw + # if [ ! -d "$BASEDIR/var/mysql" ] ; then + # echo MySQL core database has not been created. + # echo Creating it now... + # $BASEDIR/bin/mysql_install_db + # chown -R mysql:mysql $BASEDIR/var + # fi + + # 2006-04-16 --defaults-file is changed to --defaults-extra-file + ${BINDIR}/mysqld_safe-${BASE_VERSION} \ + --mysqld-version=${BASE_VERSION} \ + `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ + --pid-file=$MYSQLD_PID_FILE \ + `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ + `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ + `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ + `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ + `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ + `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ + `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ + `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ + `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ + `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ + `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ + `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ + `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ + `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ + `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ + `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ + `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ + `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ + `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ + `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ + `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ + `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ + `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ + `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ + `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ + `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ + `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ + `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ + `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ + `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ + `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ + `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ + `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ + `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ + `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ + `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ + `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ + `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ + `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ + `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ + `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ + `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ + `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ + & >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + return 1 + fi + return 0 +} + +stop_it() { + + printf "%-60s" "Shutting down mysqld: " + if test -f "$MYSQLD_PID_FILE" ; then + pkill `pgrep_opts` mysqld_safe >/dev/null 2>&1 + kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 + RETVAL=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + echo "" + return 0 +} + +pgrep_opts() { + if [ -x /bin/zonename ] + then + echo "-z `/bin/zonename`" + fi +} + +case $1 in + start) + start_it + ;; + + stop) + stop_it + ;; + + restart) + stop_it + while pgrep `pgrep_opts` mysqld > /dev/null + do + sleep 1 + done + start_it + ;; + + *) + echo "Usage: $0 { start | stop | restart } " + ;; +esac + +exit $RETVAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 10:47:05 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 08:47:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[15861] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15861 http://gar.svn.sourceforge.net/gar/?rev=15861&view=rev Author: wahwah Date: 2011-10-05 08:47:05 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: Alphabeticize deps Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 08:41:15 UTC (rev 15860) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 08:47:05 UTC (rev 15861) @@ -105,8 +105,8 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) SPKG_DESC_CSW$(NAME) = Multithreaded SQL database RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 12:11:32 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 10:11:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[15862] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15862 http://gar.svn.sourceforge.net/gar/?rev=15862&view=rev Author: wahwah Date: 2011-10-05 10:11:32 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: override update, $(docdir) used Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 08:47:05 UTC (rev 15861) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 10:11:32 UTC (rev 15862) @@ -45,11 +45,11 @@ PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION)) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) -PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config-$(BASE_VERSION)\.1 +PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel -CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1 +CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 ALTERNATIVES_CSWmysql-dev = mysql_dev ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ 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 Oct 5 14:23:37 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Oct 2011 12:23:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[15863] csw/mgar/pkg/mod_auth_kerb/trunk/Makefile Message-ID: Revision: 15863 http://gar.svn.sourceforge.net/gar/?rev=15863&view=rev Author: dmichelsen Date: 2011-10-05 12:23:37 +0000 (Wed, 05 Oct 2011) Log Message: ----------- mod_auth_kerb/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile Modified: csw/mgar/pkg/mod_auth_kerb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2011-10-05 10:11:32 UTC (rev 15862) +++ csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2011-10-05 12:23:37 UTC (rev 15863) @@ -26,13 +26,14 @@ PACKAGES = CSWap2modauthkerb CATALOGNAME = ap2_mod_auth_kerb -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWkrb5lib +CHECKPKG_OVERRIDES_CSWap2modauthkerb += catalogname-does-not-match-pkgname|pkgname=CSWap2modauthkerb|catalogname=ap2_mod_auth_kerb|expected-catalogname=ap2modauthkerb +RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWapache2 CHECKPKG_OVERRIDES_CSWap2modauthkerb += surplus-dependency|CSWapache2 -# That path is almost ok -CHECKPKG_OVERRIDES_CSWap2modauthkerb += bad-rpath-entry|/opt/csw/lib/|opt/csw/apache2/libexec/mod_auth_kerb.so - # Apache paths AP2_ROOT = $(prefix)/apache2 AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 15:07:54 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 13:07:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[15864] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile Message-ID: Revision: 15864 http://gar.svn.sourceforge.net/gar/?rev=15864&view=rev Author: wahwah Date: 2011-10-05 13:07:54 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x-optcsw: small path adjustments Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 12:23:37 UTC (rev 15863) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 13:07:54 UTC (rev 15864) @@ -27,6 +27,8 @@ # Existing databases are in this location # localstatedir = /var/opt/csw/mysql5 +# To avoid file conflicts +datadir = $(prefix)/share/mysql/$(BASE_VERSION) MYSQL_LIB_VER = 16 @@ -40,11 +42,11 @@ PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION)) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) -PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel -CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1 +CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 ALTERNATIVES_CSWmysql-dev = mysql_dev ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 15:13:49 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 13:13:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[15865] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15865 http://gar.svn.sourceforge.net/gar/?rev=15865&view=rev Author: wahwah Date: 2011-10-05 13:13:49 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: parametrize alternatives priority Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 13:07:54 UTC (rev 15864) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 13:13:49 UTC (rev 15865) @@ -9,6 +9,7 @@ NAME = $(PROJ_NAME)5 BASE_VERSION = 5.0 PATCHLEVEL = 92 +ALTS_PRIO = 50 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server @@ -51,7 +52,7 @@ OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 ALTERNATIVES_CSWmysql-dev = mysql_dev -ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 +ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ @@ -248,12 +249,12 @@ EXECUTABLES += resolveip ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main -ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO) ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client -ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) $(ALTS_PRIO) ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 15:14:00 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 13:14:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[15866] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile Message-ID: Revision: 15866 http://gar.svn.sourceforge.net/gar/?rev=15866&view=rev Author: wahwah Date: 2011-10-05 13:14:00 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x-optcsw: parametrize alternatives priority Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 13:13:49 UTC (rev 15865) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 13:14:00 UTC (rev 15866) @@ -6,6 +6,7 @@ NAME = $(PROJ_NAME)51 BASE_VERSION = 5.1 PATCHLEVEL = 59 +ALTS_PRIO = 51 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server @@ -48,7 +49,7 @@ OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 ALTERNATIVES_CSWmysql-dev = mysql_dev -ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50 +ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ @@ -251,12 +252,12 @@ EXECUTABLES += resolveip ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main -ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO) ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client -ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) 50 +ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) $(ALTS_PRIO) ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed Oct 5 15:29:32 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 05 Oct 2011 13:29:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[15867] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 15867 http://gar.svn.sourceforge.net/gar/?rev=15867&view=rev Author: aigoshin Date: 2011-10-05 13:29:31 +0000 (Wed, 05 Oct 2011) Log Message: ----------- proftpd: release 20111005 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2011-10-05 13:14:00 UTC (rev 15866) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2011-10-05 13:29:31 UTC (rev 15867) @@ -37,8 +37,8 @@ MIGRATE_FILES = proftpd.conf -EXTRA_CONFIGURE_ENV = install_user=$(USER) install_group=csw -EXTRA_CONFIGURE_ENV += LD_LIBRARY_PATH="$(libdir)" +EXTRA_CONFIGURE_ENV = install_user=$(USER) install_group=csw +EXTRA_CONFIGURE_ENV += LD_LIBRARY_PATH="$(libdir)" NODIRPATHS = --localstatedir --libexecdir CONFIGURE_ARGS += $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed Oct 5 16:21:12 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 05 Oct 2011 14:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[15868] csw/mgar/pkg/proftpd/trunk/Makefile Message-ID: Revision: 15868 http://gar.svn.sourceforge.net/gar/?rev=15868&view=rev Author: aigoshin Date: 2011-10-05 14:21:12 +0000 (Wed, 05 Oct 2011) Log Message: ----------- proftpd: release 20111005 Modified Paths: -------------- csw/mgar/pkg/proftpd/trunk/Makefile Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2011-10-05 13:29:31 UTC (rev 15867) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2011-10-05 14:21:12 UTC (rev 15868) @@ -21,7 +21,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 -RUNTIME_DEP_PKGS = CSWosslrt CSWlibintl8 CSWiconv CSWoldaprt CSWzlib CSWmysql5rt CSWsqlite3rt +RUNTIME_DEP_PKGS = CSWosslrt CSWlibintl8 CSWlibiconv2 CSWoldaprt CSWlibz1 CSWlibmysqlclient15 CSWlibsqlite3-0 EXTRA_BUILD_ISAS_i386 = amd64 EXTRA_BUILD_ISAS_sparc = sparcv9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 16:42:33 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 14:42:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[15869] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile Message-ID: Revision: 15869 http://gar.svn.sourceforge.net/gar/?rev=15869&view=rev Author: wahwah Date: 2011-10-05 14:42:32 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x-optcsw: updated overrides. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 14:21:12 UTC (rev 15868) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 14:42:32 UTC (rev 15869) @@ -119,7 +119,7 @@ PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* RUNTIME_DEP_PKGS_CSW$(NAME)bench = CSW$(NAME) RUNTIME_DEP_PKGS_CSW$(NAME)bench += CSWperl -CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSWperl PACKAGES += CSW$(NAME)test SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files @@ -128,6 +128,7 @@ PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* RUNTIME_DEP_PKGS_CSW$(NAME)test = CSW$(NAME) RUNTIME_DEP_PKGS_CSW$(NAME)test += CSWperl +CHECKPKG_OVERRIDES_CSWmysql51test += bad-rpath-entry PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch @@ -263,6 +264,12 @@ ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) +# These are harmless, although it would be nice to clean them up eventually. +# Help appreciated? +CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql5devel_stub/README.CSW|CSWmysql5|CSWmysql51 +CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql_dev/README.CSW|CSWmysql5|CSWmysql51 +CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/info/mysql.info|CSWmysql5|CSWmysql51 + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 19:07:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 17:07:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[15870] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw Message-ID: Revision: 15870 http://gar.svn.sourceforge.net/gar/?rev=15870&view=rev Author: wahwah Date: 2011-10-05 17:07:30 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x-optcsw: use versioned mysqld Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0007-versioned-mysqld-during-db-init-5.1.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 14:42:32 UTC (rev 15869) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 17:07:30 UTC (rev 15870) @@ -137,6 +137,7 @@ PATCHFILES += 0004-looking-for-ps-use-basename-0.patch # Perhaps using sed would be better, but we have a patch for now. # PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch +PATCHFILES += 0007-versioned-mysqld-during-db-init-5.1.patch # Enable 64 bits build BUILD64 = 1 Added: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0007-versioned-mysqld-during-db-init-5.1.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0007-versioned-mysqld-during-db-init-5.1.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0007-versioned-mysqld-during-db-init-5.1.patch 2011-10-05 17:07:30 UTC (rev 15870) @@ -0,0 +1,74 @@ +From cacc0eaf3e749f9e4a0a733e5164c16d2af15953 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 5 Oct 2011 19:03:02 +0200 +Subject: [PATCH] versioned mysqld during db init 5.1 + +--- + scripts/mysql_install_db.sh | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh +index b9b31a2..1a00691 100644 +--- a/scripts/mysql_install_db.sh ++++ b/scripts/mysql_install_db.sh +@@ -242,7 +242,7 @@ fi + + # Now we can get arguments from the groups [mysqld] and [mysql_install_db] + # in the my.cfg file, then re-run to merge with command line arguments. +-parse_arguments `$print_defaults $defaults mysqld mysql_install_db` ++parse_arguments `$print_defaults $defaults mysqld-5.1 mysql_install_db` + parse_arguments PICK-ARGS-FROM-ARGV "$@" + + # Configure paths to support files +@@ -251,7 +251,7 @@ then + basedir="$builddir" + bindir="$basedir/client" + extra_bindir="$basedir/extra" +- mysqld="$basedir/sql/mysqld" ++ mysqld="$basedir/sql/mysqld-5.1" + langdir="$srcdir/sql/share/english" + pkgdatadir="$srcdir/scripts" + scriptdir="$srcdir/scripts" +@@ -259,10 +259,10 @@ elif test -n "$basedir" + then + bindir="$basedir/bin" + extra_bindir="$bindir" +- mysqld=`find_in_basedir mysqld libexec sbin bin` ++ mysqld=`find_in_basedir mysqld-5.1 libexec sbin bin` + if test -z "$mysqld" + then +- cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin ++ cannot_find_file mysqld-5.1 $basedir/libexec $basedir/sbin $basedir/bin + exit 1 + fi + langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english` +@@ -282,7 +282,7 @@ else + basedir="@prefix@" + bindir="@bindir@" + extra_bindir="$bindir" +- mysqld="@libexecdir@/mysqld" ++ mysqld="@libexecdir@/mysqld-5.1" + pkgdatadir="@pkgdatadir@" + scriptdir="@scriptdir@" + fi +@@ -400,7 +400,7 @@ else + echo + echo "You can try to start the mysqld daemon with:" + echo +- echo " shell> $mysqld --skip-grant &" ++ echo " shell> $mysqld-5.1 --skip-grant &" + echo + echo "and use the command line tool $bindir/mysql" + echo "to connect to the mysql database and look at the grant tables:" +@@ -408,7 +408,7 @@ else + echo " shell> $bindir/mysql -u root mysql" + echo " mysql> show tables" + echo +- echo "Try 'mysqld --help' if you have problems with paths. Using --log" ++ echo "Try 'mysqld-5.1 --help' if you have problems with paths. Using --log" + echo "gives you a log in $ldata that may be helpful." + echo + echo "Please consult the MySQL manual section" +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 5 19:13:34 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 17:13:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15871] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 15871 http://gar.svn.sourceforge.net/gar/?rev=15871&view=rev Author: wahwah Date: 2011-10-05 17:13:34 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: versioned mysqld for mysql_install_db Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0007-versioned-mysqld-during-db-init-5.0.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 17:07:30 UTC (rev 15870) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 17:13:34 UTC (rev 15871) @@ -133,6 +133,7 @@ PATCHFILES += 0004-looking-for-ps-use-basename-0.patch # Perhaps using sed would be better, but we have a patch for now. PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch +PATCHFILES += 0007-versioned-mysqld-during-db-init-$(BASE_VERSION).patch # Enable 64 bits build BUILD64 = 1 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0007-versioned-mysqld-during-db-init-5.0.patch (from rev 15870, csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0007-versioned-mysqld-during-db-init-5.1.patch) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0007-versioned-mysqld-during-db-init-5.0.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0007-versioned-mysqld-during-db-init-5.0.patch 2011-10-05 17:13:34 UTC (rev 15871) @@ -0,0 +1,74 @@ +From cacc0eaf3e749f9e4a0a733e5164c16d2af15953 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 5 Oct 2011 19:03:02 +0200 +Subject: [PATCH] versioned mysqld during db init 5.0 + +--- + scripts/mysql_install_db.sh | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh +index b9b31a2..1a00691 100644 +--- a/scripts/mysql_install_db.sh ++++ b/scripts/mysql_install_db.sh +@@ -242,7 +242,7 @@ fi + + # Now we can get arguments from the groups [mysqld] and [mysql_install_db] + # in the my.cfg file, then re-run to merge with command line arguments. +-parse_arguments `$print_defaults $defaults mysqld mysql_install_db` ++parse_arguments `$print_defaults $defaults mysqld-5.0 mysql_install_db` + parse_arguments PICK-ARGS-FROM-ARGV "$@" + + # Configure paths to support files +@@ -251,7 +251,7 @@ then + basedir="$builddir" + bindir="$basedir/client" + extra_bindir="$basedir/extra" +- mysqld="$basedir/sql/mysqld" ++ mysqld="$basedir/sql/mysqld-5.0" + langdir="$srcdir/sql/share/english" + pkgdatadir="$srcdir/scripts" + scriptdir="$srcdir/scripts" +@@ -259,10 +259,10 @@ elif test -n "$basedir" + then + bindir="$basedir/bin" + extra_bindir="$bindir" +- mysqld=`find_in_basedir mysqld libexec sbin bin` ++ mysqld=`find_in_basedir mysqld-5.0 libexec sbin bin` + if test -z "$mysqld" + then +- cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin ++ cannot_find_file mysqld-5.0 $basedir/libexec $basedir/sbin $basedir/bin + exit 1 + fi + langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english` +@@ -282,7 +282,7 @@ else + basedir="@prefix@" + bindir="@bindir@" + extra_bindir="$bindir" +- mysqld="@libexecdir@/mysqld" ++ mysqld="@libexecdir@/mysqld-5.0" + pkgdatadir="@pkgdatadir@" + scriptdir="@scriptdir@" + fi +@@ -400,7 +400,7 @@ else + echo + echo "You can try to start the mysqld daemon with:" + echo +- echo " shell> $mysqld --skip-grant &" ++ echo " shell> $mysqld-5.0 --skip-grant &" + echo + echo "and use the command line tool $bindir/mysql" + echo "to connect to the mysql database and look at the grant tables:" +@@ -408,7 +408,7 @@ else + echo " shell> $bindir/mysql -u root mysql" + echo " mysql> show tables" + echo +- echo "Try 'mysqld --help' if you have problems with paths. Using --log" ++ echo "Try 'mysqld-5.0 --help' if you have problems with paths. Using --log" + echo "gives you a log in $ldata that may be helpful." + echo + echo "Please consult the MySQL manual section" +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed Oct 5 19:41:14 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 05 Oct 2011 17:41:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15872] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 15872 http://gar.svn.sourceforge.net/gar/?rev=15872&view=rev Author: aigoshin Date: 2011-10-05 17:41:13 +0000 (Wed, 05 Oct 2011) Log Message: ----------- nginx: release 20111005 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-10-05 17:13:34 UTC (rev 15871) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-10-05 17:41:13 UTC (rev 15872) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.1.4 +VERSION = 1.1.5 CATEGORIES = server GARCOMPILER = SOS11 Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2011-10-05 17:13:34 UTC (rev 15871) +++ csw/mgar/pkg/nginx/trunk/checksums 2011-10-05 17:41:13 UTC (rev 15872) @@ -1 +1 @@ -ae0b6d4c229817c247331750c7613d8b nginx-1.1.4.tar.gz +5f5d8c982ed0a2494b4f9347d407490d nginx-1.1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 6 00:32:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 22:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15873] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 15873 http://gar.svn.sourceforge.net/gar/?rev=15873&view=rev Author: wahwah Date: 2011-10-05 22:32:13 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: mysql_install_db versioned files Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0008-versioned-mysqld-in-mysql_install_db.patch csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 17:41:13 UTC (rev 15872) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 22:32:13 UTC (rev 15873) @@ -134,6 +134,8 @@ # Perhaps using sed would be better, but we have a patch for now. PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch PATCHFILES += 0007-versioned-mysqld-during-db-init-$(BASE_VERSION).patch +PATCHFILES += 0008-versioned-mysqld-in-mysql_install_db.patch +PATCHFILES += 0009-versioned-datadir-in-mysql_install_db-$(BASE_VERSION).patch # Enable 64 bits build BUILD64 = 1 Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0008-versioned-mysqld-in-mysql_install_db.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0008-versioned-mysqld-in-mysql_install_db.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0008-versioned-mysqld-in-mysql_install_db.patch 2011-10-05 22:32:13 UTC (rev 15873) @@ -0,0 +1,100 @@ +From a2fe1a2ed1f7488f2638478024e2829c84eded58 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 6 Oct 2011 00:27:23 +0200 +Subject: [PATCH 1/2] versioned mysqld in mysql_install_db + +--- + scripts/mysql_install_db.sh | 24 ++++++++++++------------ + 1 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh +index bc887c8..cca6244 100644 +--- a/scripts/mysql_install_db.sh ++++ b/scripts/mysql_install_db.sh +@@ -16,7 +16,7 @@ + + # This scripts creates the MySQL Server system tables + # +-# All unrecognized arguments to this script are passed to mysqld. ++# All unrecognized arguments to this script are passed to mysqld-5.0. + + basedir="" + ldata="" +@@ -53,13 +53,13 @@ Usage: $0 [OPTIONS] + mysql_install_db looks for support files such as the + error message file and the file for popoulating the + help tables. +- --user=user_name The login username to use for running mysqld. Files +- and directories created by mysqld will be owned by this ++ --user=user_name The login username to use for running mysqld-5.0. Files ++ and directories created by mysqld-5.0 will be owned by this + user. You must be root to use this option. By default +- mysqld runs using your current login name and files and ++ mysqld-5.0 runs using your current login name and files and + directories that it creates will be owned by you. + +-All other options are passed to the mysqld program ++All other options are passed to the mysqld-5.0 program + + EOF + exit 1 +@@ -98,7 +98,7 @@ parse_arguments() + --srcdir=*) srcdir=`parse_arg "$arg"` ;; + --ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;; + --user=*) +- # Note that the user will be passed to mysqld so that it runs ++ # Note that the user will be passed to mysqld-5.0 so that it runs + # as 'user' (crucial e.g. if log-bin=/some_other_path/ + # where a chown of datadir won't help) + user=`parse_arg "$arg"` ;; +@@ -181,7 +181,7 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@" + # location or in the installed area. + if test -n "$basedir" + then +- print_defaults=`find_in_basedir my_print_defaults bin extra` ++ print_defaults=`find_in_basedir my_print_defaults-5.0 bin extra` + if test ! -x "$print_defaults" + then + missing_in_basedir my_print_defaults +@@ -200,9 +200,9 @@ else + fi + fi + +-# Now we can get arguments from the groups [mysqld] and [mysql_install_db] ++# Now we can get arguments from the groups [mysqld-5.0] and [mysql_install_db] + # in the my.cfg file, then re-run to merge with command line arguments. +-parse_arguments `$print_defaults $defaults mysqld mysql_install_db` ++parse_arguments `$print_defaults $defaults mysqld-5.0 mysql_install_db` + parse_arguments PICK-ARGS-FROM-ARGV "$@" + + # Path to MySQL installation directory +@@ -210,7 +210,7 @@ if test -z "$basedir" + then + basedir="@prefix@" + bindir="@bindir@" +- mysqld="@libexecdir@/mysqld" ++ mysqld="@libexecdir@/mysqld-5.0" + pkgdatadir="@pkgdatadir@" + else + bindir="$basedir/bin" +@@ -223,7 +223,7 @@ else + missing_in_basedir fill_help_tables.sql + exit 1 + fi +- mysqld=`find_in_basedir mysqld libexec sbin bin` ++ mysqld=`find_in_basedir mysqld-5.0 libexec sbin bin` + if test ! -x "$mysqld" + then + missing_in_basedir mysqld +@@ -260,7 +260,7 @@ done + # Set up bootstrap-specific paths + if test "$cross_bootstrap" -eq 1 + then +- mysqld="./sql/mysqld" ++ mysqld="./sql/mysqld-5.0" + if test -n "$srcdir" -a -f "$srcdir/sql/share/english/errmsg.sys" + then + mysqld_opt="--language=$srcdir/sql/share/english" +-- +1.7.6.1 + Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch 2011-10-05 22:32:13 UTC (rev 15873) @@ -0,0 +1,25 @@ +From fdd0d9cafc923f2a4eab29f8a1a1f3b76867dbae Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 6 Oct 2011 00:27:44 +0200 +Subject: [PATCH 2/2] versioned datadir in mysql_install_db 5.0 + +--- + scripts/mysql_install_db.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh +index cca6244..1cdaa0d 100644 +--- a/scripts/mysql_install_db.sh ++++ b/scripts/mysql_install_db.sh +@@ -217,7 +217,7 @@ else + # We set up bootstrap-specific paths later, so skip this for now + if test "$cross_bootstrap" -eq 0 + then +- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` ++ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mysql/5.1/mysql` + if test -z "$pkgdatadir" + then + missing_in_basedir fill_help_tables.sql +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 6 00:37:18 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Oct 2011 22:37:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[15874] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw Message-ID: Revision: 15874 http://gar.svn.sourceforge.net/gar/?rev=15874&view=rev Author: wahwah Date: 2011-10-05 22:37:18 +0000 (Wed, 05 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x-optcsw: versioned datadir Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0008-versioned-datadir-in-mysql_install_db-5.1.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 22:32:13 UTC (rev 15873) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-05 22:37:18 UTC (rev 15874) @@ -138,6 +138,7 @@ # Perhaps using sed would be better, but we have a patch for now. # PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch PATCHFILES += 0007-versioned-mysqld-during-db-init-5.1.patch +PATCHFILES += 0008-versioned-datadir-in-mysql_install_db-5.1.patch # Enable 64 bits build BUILD64 = 1 Added: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0008-versioned-datadir-in-mysql_install_db-5.1.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0008-versioned-datadir-in-mysql_install_db-5.1.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0008-versioned-datadir-in-mysql_install_db-5.1.patch 2011-10-05 22:37:18 UTC (rev 15874) @@ -0,0 +1,32 @@ +From 2af244ab762435df59046f19ad492bd6d8862e62 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 6 Oct 2011 00:34:17 +0200 +Subject: [PATCH] versioned datadir in mysql_install_db 5.1 + +--- + scripts/mysql_install_db.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh +index 1a00691..8792c2b 100644 +--- a/scripts/mysql_install_db.sh ++++ b/scripts/mysql_install_db.sh +@@ -265,13 +265,13 @@ then + cannot_find_file mysqld-5.1 $basedir/libexec $basedir/sbin $basedir/bin + exit 1 + fi +- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english` ++ langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english share/mysql/5.1/mysql/english` + if test -z "$langdir" + then + cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english + exit 1 + fi +- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` ++ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mysql/5.1/mysql` + if test -z "$pkgdatadir" + then + cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 6 09:14:11 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Oct 2011 07:14:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[15875] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15875 http://gar.svn.sourceforge.net/gar/?rev=15875&view=rev Author: wahwah Date: 2011-10-06 07:14:11 +0000 (Thu, 06 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: No need for the test and bench packages Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 22:37:18 UTC (rev 15874) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-06 07:14:11 UTC (rev 15875) @@ -30,7 +30,7 @@ INITSMF = $(sysconfdir)/init\.d/csw$(NAME) # Existing databases are in this location -localstatedir = /var/opt/csw/mysql5 +localstatedir = /var$(BUILD_PREFIX)/$(NAME) # To avoid file conflicts datadir = $(prefix)/share/mysql/$(BASE_VERSION) @@ -111,21 +111,9 @@ CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content -PACKAGES += CSW$(NAME)bench -SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking -ARCHALL_CSW$(NAME)bench = 1 -PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* -RUNTIME_DEP_PKGS_CSW$(NAME)bench = CSW$(NAME) -RUNTIME_DEP_PKGS_CSW$(NAME)bench += CSWperl -CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWperl +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* -PACKAGES += CSW$(NAME)test -SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files -ARCHALL_CSW$(NAME)test = 1 -PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* -RUNTIME_DEP_PKGS_CSW$(NAME)test = CSW$(NAME) -RUNTIME_DEP_PKGS_CSW$(NAME)test += CSWperl - PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 6 09:15:46 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Oct 2011 07:15:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[15876] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile Message-ID: Revision: 15876 http://gar.svn.sourceforge.net/gar/?rev=15876&view=rev Author: wahwah Date: 2011-10-06 07:15:46 +0000 (Thu, 06 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x-optcsw: no need for test and bench Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-06 07:14:11 UTC (rev 15875) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2011-10-06 07:15:46 UTC (rev 15876) @@ -27,7 +27,7 @@ INITSMF = $(sysconfdir)/init\.d/csw$(NAME) # Existing databases are in this location -# localstatedir = /var/opt/csw/mysql5 +localstatedir = /var$(BUILD_PREFIX)/$(NAME) # To avoid file conflicts datadir = $(prefix)/share/mysql/$(BASE_VERSION) @@ -113,23 +113,9 @@ CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content -PACKAGES += CSW$(NAME)bench -SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking -ARCHALL_CSW$(NAME)bench = 1 -PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* -RUNTIME_DEP_PKGS_CSW$(NAME)bench = CSW$(NAME) -RUNTIME_DEP_PKGS_CSW$(NAME)bench += CSWperl -CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSWperl +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* -PACKAGES += CSW$(NAME)test -SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files -# There is one binary there in 5.1 -# ARCHALL_CSW$(NAME)test = 1 -PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* -RUNTIME_DEP_PKGS_CSW$(NAME)test = CSW$(NAME) -RUNTIME_DEP_PKGS_CSW$(NAME)test += CSWperl -CHECKPKG_OVERRIDES_CSWmysql51test += bad-rpath-entry - PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 6 09:37:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Oct 2011 07:37:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15877] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 15877 http://gar.svn.sourceforge.net/gar/?rev=15877&view=rev Author: wahwah Date: 2011-10-06 07:37:13 +0000 (Thu, 06 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: separate patch for 5.0 mysqld versioning Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-06 07:15:46 UTC (rev 15876) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-06 07:37:13 UTC (rev 15877) @@ -121,7 +121,7 @@ PATCHFILES += 0004-looking-for-ps-use-basename-0.patch # Perhaps using sed would be better, but we have a patch for now. PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch -PATCHFILES += 0007-versioned-mysqld-during-db-init-$(BASE_VERSION).patch +# PATCHFILES += 0007-versioned-mysqld-during-db-init-$(BASE_VERSION).patch PATCHFILES += 0008-versioned-mysqld-in-mysql_install_db.patch PATCHFILES += 0009-versioned-datadir-in-mysql_install_db-$(BASE_VERSION).patch @@ -251,6 +251,12 @@ ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) +# These are harmless, although it would be nice to clean them up eventually. +# Help appreciated? +CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql5devel_stub/README.CSW|CSWmysql5|CSWmysql51 +CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql_dev/README.CSW|CSWmysql5|CSWmysql51 +CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/info/mysql.info|CSWmysql5|CSWmysql51 + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 6 09:47:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Oct 2011 07:47:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[15878] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ files/0004-basedir-and-datadir-in-the-cnf-files.patch Message-ID: Revision: 15878 http://gar.svn.sourceforge.net/gar/?rev=15878&view=rev Author: wahwah Date: 2011-10-06 07:47:31 +0000 (Thu, 06 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x-optcsw: Update my.cnf basedir and datadir Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0004-basedir-and-datadir-in-the-cnf-files.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0004-basedir-and-datadir-in-the-cnf-files.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2011-10-06 07:37:13 UTC (rev 15877) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2011-10-06 07:47:31 UTC (rev 15878) @@ -19,8 +19,8 @@ # The MySQL server [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw ++datadir = /var/opt/csw/mysql51 port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking @@ -32,8 +32,8 @@ # The MySQL server # [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw ++datadir = /var/opt/csw/mysql51 # generic configuration options port = @MYSQL_TCP_PORT@ @@ -45,8 +45,8 @@ # The MySQL server [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw ++datadir = /var/opt/csw/mysql51 port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking @@ -58,8 +58,8 @@ # The MySQL server [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw ++datadir = /var/opt/csw/mysql51 port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking @@ -71,8 +71,8 @@ # The MySQL server [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw ++datadir = /var/opt/csw/mysql51 port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 6 10:10:34 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Oct 2011 08:10:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15879] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ files/CSWmysql51.postinstall Message-ID: Revision: 15879 http://gar.svn.sourceforge.net/gar/?rev=15879&view=rev Author: wahwah Date: 2011-10-06 08:10:34 +0000 (Thu, 06 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.1.x-optcsw: postinstall script fixes Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall 2011-10-06 07:47:31 UTC (rev 15878) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall 2011-10-06 08:10:34 UTC (rev 15879) @@ -9,8 +9,8 @@ # Input may be provided for DATADIR and DEFAULTS_FILE # BASEDIR=/opt/csw -MYSQL_VAR=/var/opt/csw/mysql/@MYSQL_BASE_VERSION@ -DEFAULTS_FILE=$BASEDIR/my.cnf +MYSQL_VAR=/var/opt/csw/mysql51 +DEFAULTS_FILE=$BASEDIR/etc/my.cnf SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf MYSQLD_USER=mysql # Provide the default data directory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 6 10:26:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Oct 2011 08:26:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[15880] csw/mgar/pkg/postgresql/branches/postgresql-8.3/ Makefile Message-ID: Revision: 15880 http://gar.svn.sourceforge.net/gar/?rev=15880&view=rev Author: wahwah Date: 2011-10-06 08:26:19 +0000 (Thu, 06 Oct 2011) Log Message: ----------- pkg/postgresql/branches/postgresql-8.3: dependency updates Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2011-10-06 08:10:34 UTC (rev 15879) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2011-10-06 08:26:19 UTC (rev 15880) @@ -27,16 +27,16 @@ # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG -SPKG_SOURCEURL = http://www.postgresql.org/ +VENDOR_URL = http://www.postgresql.org/ define BLURB endef version_dependent = /lib/$(NAME)/$(BASE_VERSION) bindir_install = $(prefix)$(version_dependent)/bin -bindir = $(prefix)$(version_dependent)/bin +# bindir = $(prefix)$(version_dependent)/bin sbindir_install = $(prefix)$(version_dependent)/sbin -sbindir = $(prefix)$(version_dependent)/sbin +# sbindir = $(prefix)$(version_dependent)/sbin libdir_install = $(prefix)$(version_dependent)/lib # libdir = $(prefix)$(version_dependent)/lib # Otherwise initdb can't find the right libraries, see: @@ -74,15 +74,17 @@ SPKG_DESC_CSWpostgresql = An advanced open source database SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-doc = PostgreSQL $(BASE_VERSION).x Documentation -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxslt -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibgnugetopt -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWzlib -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWreadline -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibz1 RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWosslrt -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpq5 +CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += file-with-bad-content + ARCHALL_CSWpostgresql = 1 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 @@ -202,8 +204,8 @@ CATALOGNAME_CSWlibpq5 = libpq5 PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5(\.\d+)*) SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5 +RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibpq5 += CSWkrb5lib PACKAGES += CSWlibecpg6 CATALOGNAME_CSWlibecpg6 = libecpg6 @@ -229,13 +231,13 @@ PACKAGES += CSWlibpq-dev CATALOGNAME_CSWlibpq-dev = libpq_dev SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxslt -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWreadline -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgnugetopt -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWzlib PKGFILES_CSWlibpq-dev += $(prefix)/include/postgresql.* PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpq.so PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg.so 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 Oct 6 12:29:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Oct 2011 10:29:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15881] csw/mgar/pkg/openldap23/trunk/Makefile Message-ID: Revision: 15881 http://gar.svn.sourceforge.net/gar/?rev=15881&view=rev Author: dmichelsen Date: 2011-10-06 10:29:16 +0000 (Thu, 06 Oct 2011) Log Message: ----------- openldap23: Add comment about libnet Modified Paths: -------------- csw/mgar/pkg/openldap23/trunk/Makefile Modified: csw/mgar/pkg/openldap23/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap23/trunk/Makefile 2011-10-06 08:26:19 UTC (rev 15880) +++ csw/mgar/pkg/openldap23/trunk/Makefile 2011-10-06 10:29:16 UTC (rev 15881) @@ -44,6 +44,8 @@ EXTRA_INC = $(prefix)/bdb44/include # Not released yet. +# !! OpenLDAP does not use libnet *at all*. This is an artifact from BeOS where libnet +# !! is a completely different library needed for socket operations. EXTRA_LDFLAGS = -L$(libdir)/libnet-new # Is this causing this? 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 Oct 6 15:00:52 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Oct 2011 13:00:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[15882] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2 Message-ID: Revision: 15882 http://gar.svn.sourceforge.net/gar/?rev=15882&view=rev Author: dmichelsen Date: 2011-10-06 13:00:52 +0000 (Thu, 06 Oct 2011) Log Message: ----------- sasl/branches-2.1.x: Update to 2.1.25, package split, general rework Modified Paths: -------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2011-10-06 10:29:16 UTC (rev 15881) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2011-10-06 13:00:52 UTC (rev 15882) @@ -1,6 +1,6 @@ NAME = sasl -VERSION = 2.1.24 -FILEVERSION = $(VERSION)rc1 +VERSION = 2.1.25 +FILEVERSION = $(VERSION) CATEGORIES = lib DESCRIPTION = Simple Authentication and Security Layer @@ -20,48 +20,63 @@ # PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff -PACKAGES = CSWsasl CSWsaslauthd CSWsaslgssapi CSWsaslsql +VENDOR_URL = http://asg.web.cmu.edu/sasl/ -SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/ +PACKAGES += CSWsasl +CATALOGNAME_CSWsasl = sasl +SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer +RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt +RUNTIME_DEP_PKGS_CSWsasl += CSWbdb47 +RUNTIME_DEP_PKGS_CSWsasl += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsasl += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2 -CATALOGNAME_CSWsasl = sasl +PACKAGES += CSWsaslauthd CATALOGNAME_CSWsaslauthd = saslauthd +SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWosslrt +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5support0 + +PACKAGES += CSWsaslgssapi CATALOGNAME_CSWsaslgssapi = sasl_gssapi -CATALOGNAME_CSWsaslsql = sasl_sql - -RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt CSWbdb47 CSWoldaprt CSWkrb5lib -RUNTIME_DEP_PKGS_CSWsaslauthd = CSWosslrt CSWoldaprt CSWkrb5lib +SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib -RUNTIME_DEP_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql5rt CSWsqlite - CHECKPKG_OVERRIDES_CSWsaslgssapi += surplus-dependency|CSWsasl -CHECKPKG_OVERRIDES_CSWsaslsql += surplus-dependency|CSWsasl -SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer -SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon -SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding +PACKAGES += CSWsaslsql +CATALOGNAME_CSWsaslsql = sasl_sql SPKG_DESC_CSWsaslsql = Cyrus Simple Authentication and Security Layer SQL Binding +RUNTIME_DEP_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql5rt CSWsqlite +CHECKPKG_OVERRIDES_CSWsaslsql += surplus-dependency|CSWsasl -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = cyrus-$(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibsasl2-2 +SPKG_DESC_CSWlibsasl2-2 = Simple authentication and security layer library, libsasl2.so.2 +PKGFILES_CSWlibsasl2-2 += $(call pkgfiles_lib,libsasl2.so.2) +PACKAGES += CSWsasl-dev +SPKG_DESC_CSWsasl-dev = Development files for SASL +PKGFILES_CSWsasl-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-2 + EXTRA_CFLAGS = -D__EXTENSIONS__ -BUILD_ENV = _REENTRANT=1 +EXTRA_BUILD_ENV = _REENTRANT=1 -EXTRA_LIB = $(prefix)/bdb47/lib +# EXTRA_LIB = $(prefix)/bdb47/lib EXTRA_INC = /opt/csw/include/gssapi -EXTRA_INC += /opt/csw/mysql5/include/mysql +EXTRA_INC += /opt/csw/include/mysql EXTRA_INC += /opt/csw/postgresql/include -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw - # Do not use LD_OPTIONS as it breaks tests by using the installed libraries # before the newly built ones. EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -LD_OPTIONS = +LD_OPTIONS = -L$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) BUILD64 = 1 NOISALIST = 1 @@ -73,7 +88,7 @@ CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-sql -CONFIGURE_ARGS += --with-bdb-libdir=/opt/csw/bdb47/lib +CONFIGURE_ARGS += --with-bdb-libdir=$(abspath /opt/csw/bdb47/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd CONFIGURE_ARGS += --with-ipctype=unix @@ -81,19 +96,20 @@ # Autoconf tries to find the directory with the shared lib in it. Because of the # ISA suffix for 64 bit we must specify the exact library location and add # the include directories manually. -CONFIGURE_ARGS += --with-mysql=$(abspath $(prefix)/mysql5/lib/$(MM_LIBDIR)/mysql) +#CONFIGURE_ARGS += --with-mysql=$(libdir) +CONFIGURE_ARGS += --with-mysql=$(libdir) CONFIGURE_ARGS += --with-pgsql=$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += --with-openssl=$(libdir) CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2 CONFIGURE_ARGS += --with-plugindir=$(libdir)/sasl2 CONFIGURE_ARGS += --enable-login +# This is for 32/64 switching. We do this all by ourselves, do not use SASLs mechanism +CONFIGURE_ARGS += --without-lib-subdir SED=/usr/bin/sed EGREP=/usr/bin/egrep max_cmd_line=65535 -TEST_TARGET = check - #INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir PKGFILES_CSWsaslauthd = /etc/opt/csw/init.d/cswsaslauthd.init Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2011-10-06 10:29:16 UTC (rev 15881) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2011-10-06 13:00:52 UTC (rev 15882) @@ -1 +1 @@ -8b5a26d973523b0676026ad4f45e5e6d cyrus-sasl-2.1.24rc1.tar.gz +341cffe829a4d71f2a6503d669d5a946 cyrus-sasl-2.1.25.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Oct 6 20:03:26 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 6 Oct 2011 19:03:26 +0100 Subject: [csw-devel] SF.net SVN: gar:[15882] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2 In-Reply-To: References: Message-ID: Why does it depend on libkrb5? -------------- next part -------------- An HTML attachment was scrubbed... URL: From guengel at users.sourceforge.net Thu Oct 6 21:04:57 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 06 Oct 2011 19:04:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[15883] csw/mgar/pkg/glib2/trunk/files Message-ID: Revision: 15883 http://gar.svn.sourceforge.net/gar/?rev=15883&view=rev Author: guengel Date: 2011-10-06 19:04:57 +0000 (Thu, 06 Oct 2011) Log Message: ----------- Merged patches for gio/tests/gsettings.c. Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0023-Disable-failing-gsettings-tests.patch Removed Paths: ------------- csw/mgar/pkg/glib2/trunk/files/0022-Disable-gsettings-strinfo-on-sparcv9.patch Deleted: csw/mgar/pkg/glib2/trunk/files/0022-Disable-gsettings-strinfo-on-sparcv9.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0022-Disable-gsettings-strinfo-on-sparcv9.patch 2011-10-06 13:00:52 UTC (rev 15882) +++ csw/mgar/pkg/glib2/trunk/files/0022-Disable-gsettings-strinfo-on-sparcv9.patch 2011-10-06 19:04:57 UTC (rev 15883) @@ -1,28 +0,0 @@ -From 4be33dc73d5fcefc53ce37b440d2502bb6c4c5d3 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 2 Oct 2011 22:05:01 +0200 -Subject: [PATCH] Disable gsettings/strinfo on sparcv9 - -This test fails on sparcv9 (SIGBUS) ---- - gio/tests/gsettings.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c -index b2f9d4f..fed5d89 100644 ---- a/gio/tests/gsettings.c -+++ b/gio/tests/gsettings.c -@@ -1961,7 +1961,10 @@ main (int argc, char *argv[]) - - g_test_add_func ("/gsettings/keyfile", test_keyfile); - g_test_add_func ("/gsettings/child-schema", test_child_schema); -+ /* Fails on sparcv9 */ -+#ifndef __sparcv9 - g_test_add_func ("/gsettings/strinfo", test_strinfo); -+#endif - g_test_add_func ("/gsettings/enums", test_enums); - g_test_add_func ("/gsettings/flags", test_flags); - g_test_add_func ("/gsettings/range", test_range); --- -1.7.6.1 - Added: csw/mgar/pkg/glib2/trunk/files/0023-Disable-failing-gsettings-tests.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0023-Disable-failing-gsettings-tests.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0023-Disable-failing-gsettings-tests.patch 2011-10-06 19:04:57 UTC (rev 15883) @@ -0,0 +1,31 @@ +From 810a4ad30917c327ff4dc05c9a9c469aa320cf3c Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Thu, 6 Oct 2011 20:56:49 +0200 +Subject: [PATCH] Disable failing gsettings tests + +--- + gio/tests/gsettings.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c +index b2f9d4f..5548d92 100644 +--- a/gio/tests/gsettings.c ++++ b/gio/tests/gsettings.c +@@ -1959,9 +1959,14 @@ main (int argc, char *argv[]) + g_test_add_func ("/gsettings/no-write-binding", test_no_write_binding); + } + ++ /* Fails sporadically + g_test_add_func ("/gsettings/keyfile", test_keyfile); ++ */ + g_test_add_func ("/gsettings/child-schema", test_child_schema); ++ /* Fails on sparcv9 */ ++#ifndef __sparcv9 + g_test_add_func ("/gsettings/strinfo", test_strinfo); ++#endif + g_test_add_func ("/gsettings/enums", test_enums); + g_test_add_func ("/gsettings/flags", test_flags); + g_test_add_func ("/gsettings/range", test_range); +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 6 23:53:50 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Oct 2011 21:53:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[15884] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 15884 http://gar.svn.sourceforge.net/gar/?rev=15884&view=rev Author: wahwah Date: 2011-10-06 21:53:50 +0000 (Thu, 06 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: partial progress Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql51 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-06 19:04:57 UTC (rev 15883) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-06 21:53:50 UTC (rev 15884) @@ -5,10 +5,13 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)55 BASE_VERSION = 5.5 -PATCHLEVEL = 9 +PATCHLEVEL = 16 +ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server +# PACKAGING_PLATFORMS = solaris9-sparc solaris10-sparc + # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -21,150 +24,141 @@ (Structured Query Language) database server. endef -prefix = /opt/csw/$(NAME) -localstatedir = /var$(prefix) -sysconfdir = /etc$(prefix) +INITSMF = $(sysconfdir)/init\.d/csw$(NAME) -# Where to put the init script -global_sysconfdir = $(sysconfdir) -# Where to link the binaries -global_bindir = /opt/csw/bin +# Existing databases are in this location +localstatedir = /var$(BUILD_PREFIX)/$(NAME) +# To avoid file conflicts +datadir = $(prefix)/share/mysql/$(BASE_VERSION) -INITSMF = $(global_sysconfdir)/init\.d/csw$(NAME) +MYSQL_LIB_VER = 17 -PACKAGES = CSW$(NAME) -PACKAGES += CSW$(NAME)bench -PACKAGES += CSW$(NAME)client -PACKAGES += CSW$(NAME)devel -PACKAGES += CSW$(NAME)rt -PACKAGES += CSW$(NAME)test +PACKAGES += CSWmysql-dev +SPKG_DESC_CSWmysql-dev = MySQL development files +PKGFILES_CSWmysql-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient$(MYSQL_LIB_VER) +CSWmysql-dev_programs += mysql_config +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* +PKGFILES_CSWmysql-dev += $(prefix)/include.* +PKGFILES_CSWmysql-dev += /opt/csw/include/mysql +OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel +CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 +ALTERNATIVES_CSWmysql-dev = mysql_dev +ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO) +ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) +ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ + $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) -#PATCHFILES = 0001-Use-libc-not-libcrypt.patch -#PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch -#PATCHFILES += 0003-OpenCSW-perl-for-tests.patch -#PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch +PATCHFILES = 0001-Use-libc-not-libcrypt.patch +PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch +# PATCHFILES += 0003-OpenCSW-perl-for-tests.patch +PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch -SPKG_DESC_CSW$(NAME) = Multithreaded SQL database -SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking -SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries -SPKG_DESC_CSW$(NAME)devel = MySQL $(BASE_VERSION) header files -SPKG_DESC_CSW$(NAME)rt = MySQL $(BASE_VERSION) runtime files -SPKG_DESC_CSW$(NAME)test = MySQL $(BASE_VERSION) testing files +PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) +PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) +SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt +OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt -CATALOGNAME_CSW$(NAME) = $(NAME) -CATALOGNAME_CSW$(NAME)bench = $(NAME)bench -CATALOGNAME_CSW$(NAME)client = $(NAME)client -CATALOGNAME_CSW$(NAME)devel = $(NAME)devel -CATALOGNAME_CSW$(NAME)rt = $(NAME)rt -CATALOGNAME_CSW$(NAME)test = $(NAME)test +PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) +SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWosslrt +OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt - -ARCHALL_CSW$(NAME)bench = 1 - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. -CSW$(NAME)client_programs = myisamlog -CSW$(NAME)client_programs += myisampack -CSW$(NAME)client_programs += mysql -CSW$(NAME)client_programs += mysqlaccess -CSW$(NAME)client_programs += mysqladmin -CSW$(NAME)client_programs += mysqlbin -CSW$(NAME)client_programs += mysqlbinlog -CSW$(NAME)client_programs += mysqlcheck -CSW$(NAME)client_programs += mysql_client_test -CSW$(NAME)client_programs += mysqldump -CSW$(NAME)client_programs += mysqlhotcopy -CSW$(NAME)client_programs += mysqlimport -CSW$(NAME)client_programs += mysqlshow -CSW$(NAME)client_programs += mysql_zap -CSW$(NAME)client_programs += perror -CSW$(NAME)client_programs += replace +client_programs += myisamlog +client_programs += myisampack +client_programs += mysql +client_programs += mysqlaccess +client_programs += mysqladmin +client_programs += mysqlbin +client_programs += mysqlbinlog +client_programs += mysqlcheck +client_programs += mysql_client_test +client_programs += mysqldump +client_programs += mysqlhotcopy +client_programs += mysqlimport +client_programs += mysqlshow +client_programs += mysql_zap +client_programs += perror +client_programs += replace -# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared -# library not found. EXTRA_LIB was tried too, but did not work, as the -R path -# ended up with having two $ISALIST tokens. -# -# Without this setting it looks for: -# /opt/csw/$(NAME)/lib/amd64/libmysqlclient.so.15 -# The library is at: -# /opt/csw/$(NAME)/lib/amd64/mysql/libmysqlclient.so.15 -EXTRA_LD_OPTIONS = -R$(libdir)/\$$ISALIST/mysql +PACKAGES += CSW$(NAME)client +SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries +PKGFILES_CSW$(NAME)client = $(bindir) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)-$(BASE_VERSION)\.1) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt +CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry -COMMON_CFLAGS = -mt -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt +PACKAGES += CSW$(NAME) +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) +SPKG_DESC_CSW$(NAME) = Multithreaded SQL database +RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt +CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry +CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content -EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) -EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_CFLAGS) -EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* -EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) -EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS) -EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) +PATCHFILES = 0001-Use-libc-not-libcrypt.patch +PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch +# PATCHFILES += 0003-OpenCSW-perl-for-tests.patch +# PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch +# PATCHFILES += 0004-looking-for-ps-use-basename-0.patch +# Perhaps using sed would be better, but we have a patch for now. +# PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch +# PATCHFILES += 0007-versioned-mysqld-during-db-init-5.1.patch +# PATCHFILES += 0008-versioned-datadir-in-mysql_install_db-5.1.patch - -CSW$(NAME)devel_programs += mysql_config - # Enable 64 bits build BUILD64 = 1 -PKGFILES_CSW$(NAME)bench = $(prefix)/sql-bench.* -PKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)devel += $(foreach bin_name,$(CSW$(NAME)devel_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSW$(NAME)devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSW$(NAME)devel += $(prefix)/include.* -PKGFILES_CSW$(NAME)devel += /opt/csw/include/mysql +# EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) +# EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_CFLAGS) +# EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) +# EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) +# EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS) +# EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) +# COMMON_CFLAGS = -mt -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt +# +EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -PKGFILES_CSW$(NAME)rt = $(libdir) -PKGFILES_CSW$(NAME)rt += $(libdir)/.* -PKGFILES_CSW$(NAME)test = $(prefix)/mysql-test.* - -RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client -RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)rt -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWtcpwrap -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWzlib -RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWzlib -RUNTIME_DEP_PKGS_CSW$(NAME)bench += CSWperl -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)rt -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWncurses -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWzlib -RUNTIME_DEP_PKGS_CSW$(NAME)test += CSWperl - -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ +MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(VERSION).tar.gz -DISTFILES += csw$(NAME) quick_start-csw README.CSW ChangeLog +DISTFILES += csw$(NAME).tpl +DISTFILES += quick_start-csw +DISTFILES += README.CSW +DISTFILES += ChangeLog DISTFILES += CSW$(NAME).preinstall DISTFILES += CSW$(NAME).postinstall DISTFILES += cswusergroup -UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz - # TODO: Do the proper prerequsite pkgs. BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -# MySQL-5.1.40 doesn't compile without setting EXTRA_INC. -EXTRA_INC = /opt/csw/include -EXTRA_LIB = /opt/csw/lib -# We're building on Solaris 9 now. -# # The following EXTRA_CFLAGS are necessary to compile on Solaris 8. Otherwise -# # the following problem occurs: -# # -# # "handler/i_s.cc", line 159: Error: The function "localtime_r" must have a -# # prototype. -# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ - -# TBD: MySQL 5.5 uses CMake :-( - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler @@ -176,8 +170,8 @@ CONFIGURE_ARGS += --with-low-memory CONFIGURE_ARGS += --with-pthread CONFIGURE_ARGS += --with-readline -CONFIGURE_ARGS += --with-zlib-dir=/opt/csw -CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --with-zlib-dir=$(BUILD_PREFIX) +CONFIGURE_ARGS += --with-ssl=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-comment="(OpenCSW)" CONFIGURE_ARGS += --with-mysqld-user=mysql @@ -188,13 +182,13 @@ CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +CONFIGURE_ARGS += --program-suffix=-$(BASE_VERSION) # TODO: Make the tests pass. They don't at the moment. SKIPTEST ?= 1 TEST_SCRIPTS = custom TEST_TARGETS = check - USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup PROTOTYPE_MODIFIERS = dbdir @@ -204,19 +198,87 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -CHECKPKG_OVERRIDES_CSWmysql51 += surplus-dependency|CSWmysql51client -CHECKPKG_OVERRIDES_CSWmysql51rt += bad-rpath-entry +CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client +CHECKPKG_OVERRIDES_CSW$(NAME)bench += file-with-bad-content +CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSW$(NAME) +CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content +CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) -# CHECKPKG_OVERRIDES_CSWmysql51 += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswmysql51|class=none -# CHECKPKG_OVERRIDES_CSWmysql51 += surplus-dependency|CSWmysql51client +CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess-$(BASE_VERSION).1 +# This could be reviewed. +CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content +EXECUTABLES += comp_err +EXECUTABLES += innochecksum +EXECUTABLES += msql2mysql +EXECUTABLES += my_print_defaults +EXECUTABLES += myisam_ftdump +EXECUTABLES += myisamchk +EXECUTABLES += myisamlog +EXECUTABLES += myisampack +EXECUTABLES += mysql +EXECUTABLES += mysql_client_test +EXECUTABLES += mysql_convert_table_format +EXECUTABLES += mysql_explain_log +EXECUTABLES += mysql_find_rows +EXECUTABLES += mysql_fix_extensions +EXECUTABLES += mysql_fix_privilege_tables +EXECUTABLES += mysql_install_db +EXECUTABLES += mysql_secure_installation +EXECUTABLES += mysql_setpermission +EXECUTABLES += mysql_tableinfo +EXECUTABLES += mysql_tzinfo_to_sql +EXECUTABLES += mysql_upgrade +EXECUTABLES += mysql_upgrade_shell +EXECUTABLES += mysql_waitpid +EXECUTABLES += mysql_zap +EXECUTABLES += mysqlaccess +EXECUTABLES += mysqladmin +EXECUTABLES += mysqlbinlog +EXECUTABLES += mysqlbug +EXECUTABLES += mysqlcheck +EXECUTABLES += mysqld_multi +EXECUTABLES += mysqld_safe +EXECUTABLES += mysqldump +EXECUTABLES += mysqldumpslow +EXECUTABLES += mysqlhotcopy +EXECUTABLES += mysqlimport +EXECUTABLES += mysqlshow +EXECUTABLES += mysqltest +EXECUTABLES += mysqltestmanager +EXECUTABLES += mysqltestmanager-pwgen +EXECUTABLES += mysqltestmanagerc +EXECUTABLES += perror +EXECUTABLES += replace +EXECUTABLES += resolve_stack_dump +EXECUTABLES += resolveip +ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main +ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO) +ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) + +ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client +ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) $(ALTS_PRIO) +ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ + $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) +ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ + $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) + +# These are harmless, although it would be nice to clean them up eventually. +# Help appreciated? +CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql5devel_stub/README.CSW|CSWmysql5|CSWmysql51 +CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql_dev/README.CSW|CSWmysql5|CSWmysql51 +CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/info/mysql.info|CSWmysql5|CSWmysql51 + +CONFIGURE_SCRIPTS = custom + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) test-custom: - alias sh=/usr/bin/bash; \ + alias sh=/usr/bin/bash; \ cd $(WORKSRC)/mysql-test; \ perl mysql-test-run.pl --mem --big-test --force \ --skip-test=archive-big --skip-test=/gis/ @@ -227,40 +289,54 @@ # libtool: definition of this LT_INIT comes from libtool 2.2.6b. # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6 # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html - cd $(WORKSRC) && autoreconf --force --install --symlink + # cd $(WORKSRC) && autoreconf --force --install --symlink @$(MAKECOOKIE) +configure-custom: + (cd $(WORKSRC); cmake . -DCMAKE_INSTALL_PREFIX=$(prefix)) + @$(MAKECOOKIE) + +post-configure-modulated: + gsed \ + -e 's+ at prefix@+$(prefix)+' \ + -e 's+ at localstatedir@+$(localstatedir)+' \ + -e 's+ at sysconfdir@+$(sysconfdir)+' \ + -e 's+ at bindir@+$(bindir)+' \ + -e 's+ at BASE_VERSION@+$(BASE_VERSION)+' \ + < $(WORKDIR)/csw$(NAME).tpl \ + > $(WORKDIR)/csw$(NAME) + @$(MAKECOOKIE) + +post-install-modulated: + (cd $(DESTDIR)$(libdir); gmv -v mysql/* .) + (cd $(DESTDIR)$(libdir); grmdir -v mysql) + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d + @$(MAKECOOKIE) + post-merge: ginstall -m 755 -d $(PKGROOT)$(localstatedir) - ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc - ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc - ln -sf ../../../$(NAME)/share/mysql/doc/README.CSW \ - $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW - ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/init.d - ginstall -m 755 $(FILEDIR)/csw$(NAME) $(PKGROOT)$(global_sysconfdir)/init.d + ginstall -m 755 -d $(PKGROOT)$(datadir)/$(NAME)/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/$(NAME)/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/$(NAME)/doc + ginstall -m 755 -d $(PKGROOT)/opt/csw/share/$(NAME)/doc + gln -sf ../../../$(NAME)/share/$(NAME)/doc/README.CSW \ + $(PKGROOT)/opt/csw/share/$(NAME)/doc/README.CSW ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql - ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) + ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ - $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) - # A symlink for mysql5 include files - ginstall -m 755 -d $(PKGROOT)/opt/csw/include - ln -s ../$(NAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql + $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) # Create symlinks to binaries - ginstall -m 755 -d $(PKGROOT)$(global_bindir) - for f in $(PKGROOT)$(bindir)/*; do \ - if echo $$f | grep amd64$$; then continue; fi; \ - if echo $$f | grep sparcv9$$; then continue; fi; \ - ln -s ../$(NAME)/bin/`basename $$f` \ - $(PKGROOT)$(global_bindir)/`basename $$f`; \ - done - # /opt/csw/$(NAME)/lib/sparc9/mysql -- by GAR, it's logical - # /opt/csw/$(NAME)/lib/mysql/sparcv9 -- expected by other packages - gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64) - # For other applications to link against - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64 - gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT) - gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT) + # ginstall -m 755 -d $(PKGROOT)$(bindir) + #for f in $(PKGROOT)$(bindir)/*; do \ + # if echo $$f | grep amd64$$; then continue; fi; \ + # if echo $$f | grep sparcv9$$; then continue; fi; \ + # ln -s ../$(NAME)/bin/`basename $$f` \ + # $(PKGROOT)$(bindir)/`basename $$f`; \ + #done + # http://www.opencsw.org/bugtrack/view.php?id=4149 + ginstall -m 755 -d $(PKGROOT)$(sysconfdir) @$(MAKECOOKIE) + +# We need the GNU userland (nobody knows why) +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2011-10-06 19:04:57 UTC (rev 15883) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2011-10-06 21:53:50 UTC (rev 15884) @@ -1 +1 @@ -701c0c44b7f1c2300adc0dc45729f903 mysql-5.5.9.tar.gz +462ab3752dd666ec06ca32f92673b59e mysql-5.5.16.tar.gz Copied: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch (from rev 15860, csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0004-looking-for-ps-use-basename-0.patch) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch 2011-10-06 21:53:50 UTC (rev 15884) @@ -0,0 +1,48 @@ +From 111c7574ea02e17df8b2aff8e1b94d6118024f7b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 28 Sep 2011 23:26:47 +0200 +Subject: [PATCH] looking for ps, use `basename $0` + +Upstream bug filed: +http://bugs.mysql.com/bug.php?id=62567 + +--- + configure.in | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.in b/configure.in +index cfae77d..8e6dd43 100644 +--- a/configure.in ++++ b/configure.in +@@ -518,23 +518,23 @@ AC_PATH_PROG(PS, ps, ps) + AC_MSG_CHECKING("how to check if pid exists") + PS=$ac_cv_path_PS + # Linux style +-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null ++if $PS wwwp $$ 2> /dev/null | grep -- "`basename $0`" > /dev/null + then + FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + # Solaris +-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null ++elif $PS -fp $$ 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + # BSD style +-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null ++elif $PS -uaxww 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" + # SysV style +-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null ++elif $PS -ef 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" + # Do anybody use this? +-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null ++elif $PS $$ 2> /dev/null | grep -- `basename $0` > /dev/null + then + FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + else +-- +1.7.6.1 + Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.postinstall 2011-10-06 19:04:57 UTC (rev 15883) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.postinstall 2011-10-06 21:53:50 UTC (rev 15884) @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -MYSQLDATADIR=/var/opt/csw/mysql51 -if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then - echo "No database directory found in the default location:" - echo "${MYSQLDATADIR}/mysql" - echo "If you need to build the initial database directory," - echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" - echo "If you are using a non-default database directory location," - echo " please start mysql manually." - exit 0 -fi Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.preinstall 2011-10-06 19:04:57 UTC (rev 15883) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.preinstall 2011-10-06 21:53:50 UTC (rev 15884) @@ -1,40 +0,0 @@ -#!/bin/sh -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# $Id$ -# - -obsolete_directories="/opt/csw/mysql51/var:/var/opt/csw/mysql51" - -obsolete_dir_information=" -This directory is obsolete. Files in this directory are going to be ignored. -Please move your data to the new location. - -Feel free to remove this file afterwards. -" -obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" - -for dirpair in ${obsolete_directories}; do - obsolete_dir=`echo ${dirpair} | cut -d: -f1` - new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory ${obsolete_dir} still exists. " - echo "* Please move your configuration to ${new_dir}. " - echo "* " - echo "* Installation will continue in 10 seconds. " - echo "* Press CTRL+C if you want to stop now. " - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" - fi - fi -done - -exit 0 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.postinstall (from rev 11033, csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.postinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.postinstall 2011-10-06 21:53:50 UTC (rev 15884) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $Id$ +# + +MYSQLDATADIR=/var/opt/csw/mysql51 +if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then + echo "No database directory found in the default location:" + echo "${MYSQLDATADIR}/mysql" + echo "If you need to build the initial database directory," + echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" + echo "If you are using a non-default database directory location," + echo " please start mysql manually." + exit 0 +fi Copied: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.preinstall (from rev 11033, csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql51.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql55.preinstall 2011-10-06 21:53:50 UTC (rev 15884) @@ -0,0 +1,40 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_directories="/opt/csw/mysql51/var:/var/opt/csw/mysql51" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql51 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql51 2011-10-06 19:04:57 UTC (rev 15883) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql51 2011-10-06 21:53:50 UTC (rev 15884) @@ -1,183 +0,0 @@ -#!/bin/sh -# -# $Id$ -# Start script for MySQL database. -# -# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod -# 700. -# -# First time installation can use quick_start-csw in -# /opt/csw/mysql51/share/mysql to build the mysql database for the -# grant tables. Or create the initial database yourself. -# -# Use my.cnf for startup options. See MySQL documention -# for 'Using Option Files'. -# Support for mysql51rc still remains in this startup script. -# - -RETVAL=0 -MYSQLHOME=/opt/csw/mysql51 -MYSQL_VAR=/var/opt/csw/mysql51 -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=$MYSQL_VAR/my.cnf - -# -# Source configuration -[ -r /opt/csw/mysql51/etc/mysql51rc ] && . /opt/csw/mysql51/etc/mysql51rc -[ -r /etc/opt/csw/mysql51rc ] && . /etc/opt/csw/mysql51rc - -# To get started quickly, copy a sample configuration file from -# $MYSQLHOME/share/mysql -# For example, -# cp /opt/csw/mysql51/share/mysql/my-medium.cnf /opt/csw/mysql51/var/my.cnf -# -# Or, manually follow the database creation steps below, and have -# mysql just use defaults for everything. - -# 2006-03-11 Changed to only look for the grant tables database -# 2006-04-16 Changed again. Look for either the grant tables database -# or the options file. -# 2006-12-28 Fix problem. Look for either the grant tables database in -# the default location or the default options file. -if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then - exit 0 -fi - -# If CONFFILE is the server default file, unset CONFFILE -if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then - CONFFILE= -fi - -# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR -# Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then - MYSQLD_DATADIR= -fi - -# Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid} - -# If a database already exists, start whether or not there is a conf file. -# If no conf file, the database will just use internal defaults for everything. - -start_it() { - if test -r $MYSQLD_PID_FILE ; then - if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." - return 1 - fi - fi - - printf "%-60s" "Starting mysqld: " -# 2006-03-11 -# This script no longer creates the default database. You may create the -# default database manually or use /opt/csw/mysql51/share/mysql/quick_start-csw -# if [ ! -d "$MYSQLHOME/var/mysql" ] ; then -# echo MySQL core database has not been created. -# echo Creating it now... -# $MYSQLHOME/bin/mysql_install_db -# chown -R mysql:mysql $MYSQLHOME/var -# fi - -# 2006-04-16 --defaults-file is changed to --defaults-extra-file - $MYSQLHOME/bin/mysqld_safe \ - `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ - --pid-file=$MYSQLD_PID_FILE \ - `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ - `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ - `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ - `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ - `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ - `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ - `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ - `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ - `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ - `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ - `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ - `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ - `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ - `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ - `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ - `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ - `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ - `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ - `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ - `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ - `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ - `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ - `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ - `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ - `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ - `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ - `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ - `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ - `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ - `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ - `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ - `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ - `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ - `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ - `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ - `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ - `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ - `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ - `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ - `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ - `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ - `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ - `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ - & >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - return 0 -} - -stop_it() { - - printf "%-60s" "Shutting down mysqld: " - if test -f "$MYSQLD_PID_FILE" ; then - pkill mysqld_safe >/dev/null 2>&1 - kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - echo "" - return 0 -} - -case $1 in - start) - start_it - ;; - - stop) - stop_it - ;; - - restart) - stop_it - while pgrep mysqld > /dev/null - do - sleep 1 - done - start_it - ;; - - *) - echo "Usage: $0 { start | stop | restart } " - ;; -esac - -exit $RETVAL Copied: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl (from rev 11033, csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql51) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl 2011-10-06 21:53:50 UTC (rev 15884) @@ -0,0 +1,207 @@ +#!/bin/sh +# vim:ft=sh: +# +# $Id$ +# Start script for MySQL database. +# +# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod +# 700. +# +# First time installation can use quick_start-csw in +# /opt/csw/mysql55/share/mysql to build the mysql database for the +# grant tables. Or create the initial database yourself. +# +# Use my.cnf for startup options. See MySQL documention +# for 'Using Option Files'. +# Support for mysql55rc still remains in this startup script. +# + +RETVAL=0 +prefix="@prefix@" +BASEDIR="${prefix}" +BINDIR="@bindir@" +MYSQL_VAR="@localstatedir@" +sysconfdir="@sysconfdir@" +BASE_VERSION="@BASE_VERSION@" +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=${sysconfdir}/my.cnf + +# Source the configuration +[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc +[ -r @prefix@/etc/mysql5rc ] && . @prefix@/etc/mysql5rc +[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc + +if [ -r "${sysconfdir}/my.cnf" ]; then + MYSQL_HOME="${MYSQL_VAR}" +elif [ -r "${BASEDIR}/my.cnf" ]; then + MYSQL_HOME="${BASEDIR}" +fi +export MYSQL_HOME + +# To get started quickly, copy a sample configuration file from +# $BASEDIR/share/mysql +# For example, +# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf +# +# Or, manually follow the database creation steps below, and have +# mysql just use defaults for everything. + +# 2006-03-11 Changed to only look for the grant tables database +# 2006-04-16 Changed again. Look for either the grant tables database +# or the options file. +# 2006-12-28 Fix problem. Look for either the grant tables database in +# the default location or the default options file. +if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then + exit 0 +fi + +# If CONFFILE is the server default file, unset CONFFILE +if [ "${CONFFILE}" = "${MYSQL_HOME}/my.cnf" \ + -o \ + "${CONFFILE}" = "${sysconfdir}/my.cnf" ]; then + CONFFILE= +fi + +# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR +# Also, check that MYSQLD_DATADIR contains a mysql directory +if [ ! -d "$MYSQL_HOME/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then + MYSQLD_DATADIR= +fi + +# Make sure required vars are set +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_HOME/mysql.pid} + +# If a database already exists, start whether or not there is a conf file. +# If no conf file, the database will just use internal defaults for everything. + +start_it() { + if test -r $MYSQLD_PID_FILE ; then + if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then + echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." + return 1 + fi + fi + + printf "%-60s" "Starting mysqld: " + + # 2006-03-11 + # This script no longer creates the default database. You may create the + # default database manually or use + # /opt/csw/mysql5/share/mysql/quick_start-csw + # if [ ! -d "$BASEDIR/var/mysql" ] ; then + # echo MySQL core database has not been created. + # echo Creating it now... + # $BASEDIR/bin/mysql_install_db + # chown -R mysql:mysql $BASEDIR/var + # fi + + # 2006-04-16 --defaults-file is changed to --defaults-extra-file + ${BINDIR}/mysqld_safe-${BASE_VERSION} \ + --mysqld-version=${BASE_VERSION} \ + `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ + --pid-file=$MYSQLD_PID_FILE \ + `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ + `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ + `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ + `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ + `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ + `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ + `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ + `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ + `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ + `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ + `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ + `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ + `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ + `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ + `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ + `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ + `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ + `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ + `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ + `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ + `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ + `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ + `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ + `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ + `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ + `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ + `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ + `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ + `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ + `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ + `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ + `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ + `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ + `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ + `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ + `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ + `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ + `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ + `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ + `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ + `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ + `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ + `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ + & >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + return 1 + fi + return 0 +} + +stop_it() { + + printf "%-60s" "Shutting down mysqld: " + if test -f "$MYSQLD_PID_FILE" ; then + pkill `pgrep_opts` mysqld_safe >/dev/null 2>&1 + kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 + RETVAL=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + echo "" + return 0 +} + +pgrep_opts() { + if [ -x /bin/zonename ] + then + echo "-z `/bin/zonename`" + fi +} + +case $1 in + start) + start_it + ;; + + stop) + stop_it + ;; + + restart) + stop_it + while pgrep `pgrep_opts` mysqld > /dev/null + do + sleep 1 + done + start_it + ;; + + *) + echo "Usage: $0 { start | stop | restart } " + ;; +esac + +exit $RETVAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 7 11:41:48 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Oct 2011 09:41:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[15885] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 15885 http://gar.svn.sourceforge.net/gar/?rev=15885&view=rev Author: wahwah Date: 2011-10-07 09:41:47 +0000 (Fri, 07 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: no need for *rt packages Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-06 21:53:50 UTC (rev 15884) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 09:41:47 UTC (rev 15885) @@ -46,7 +46,6 @@ PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql -OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 ALTERNATIVES_CSWmysql-dev = mysql_dev ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO) @@ -55,24 +54,22 @@ ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) -PATCHFILES = 0001-Use-libc-not-libcrypt.patch -PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch +# PATCHFILES = 0001-Use-libc-not-libcrypt.patch +# PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch -PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch +# PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt -OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWosslrt -OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. @@ -121,7 +118,7 @@ EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* -PATCHFILES = 0001-Use-libc-not-libcrypt.patch +# PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch # PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch @@ -308,8 +305,8 @@ @$(MAKECOOKIE) post-install-modulated: - (cd $(DESTDIR)$(libdir); gmv -v mysql/* .) - (cd $(DESTDIR)$(libdir); grmdir -v mysql) + # (cd $(DESTDIR)$(libdir); gmv -v mysql/* .) + # (cd $(DESTDIR)$(libdir); grmdir -v mysql) ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 7 11:42:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Oct 2011 09:42:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[15886] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 15886 http://gar.svn.sourceforge.net/gar/?rev=15886&view=rev Author: wahwah Date: 2011-10-07 09:42:30 +0000 (Fri, 07 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: cmake is a build dependency Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 09:41:47 UTC (rev 15885) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 09:42:30 UTC (rev 15886) @@ -154,8 +154,8 @@ # TODO: Do the proper prerequsite pkgs. BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS = CSWcmake - # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 7 11:57:03 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Oct 2011 09:57:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[15887] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 15887 http://gar.svn.sourceforge.net/gar/?rev=15887&view=rev Author: wahwah Date: 2011-10-07 09:57:03 +0000 (Fri, 07 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: Set the configure environment for cmake Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 09:42:30 UTC (rev 15886) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 09:57:03 UTC (rev 15887) @@ -290,7 +290,11 @@ @$(MAKECOOKIE) configure-custom: - (cd $(WORKSRC); cmake . -DCMAKE_INSTALL_PREFIX=$(prefix)) + (cd $(WORKSRC) && \ + /usr/bin/env -i \ + $(CONFIGURE_ENV) \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=$(prefix)) @$(MAKECOOKIE) post-configure-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 7 12:11:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Oct 2011 10:11:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[15888] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 15888 http://gar.svn.sourceforge.net/gar/?rev=15888&view=rev Author: wahwah Date: 2011-10-07 10:11:01 +0000 (Fri, 07 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: compilation with Solaris Studio fails Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 09:57:03 UTC (rev 15887) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 10:11:01 UTC (rev 15888) @@ -24,6 +24,12 @@ (Structured Query Language) database server. endef +# Compilation with Solaris Studio fails: +# cg error (as) : ".../mysql-5.5.16/mysys/my_timer_cycles.il (template for +# my_timer_cycles_il_sparc32)", line 27 : cannot use SPARC v9 instructions +# with this target architecture +GARCOMPILER = GNU + INITSMF = $(sysconfdir)/init\.d/csw$(NAME) # Existing databases are in this location This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 7 12:16:04 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Oct 2011 10:16:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[15889] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 15889 http://gar.svn.sourceforge.net/gar/?rev=15889&view=rev Author: wahwah Date: 2011-10-07 10:16:04 +0000 (Fri, 07 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: removing gcc-incomaptible flags Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 10:11:01 UTC (rev 15888) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 10:16:04 UTC (rev 15889) @@ -144,10 +144,11 @@ # EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS) # EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) # COMMON_CFLAGS = -mt -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt -# -EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# These flags don't work with GCC +# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ + MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(VERSION).tar.gz DISTFILES += csw$(NAME).tpl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 7 20:36:24 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Oct 2011 18:36:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[15890] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 15890 http://gar.svn.sourceforge.net/gar/?rev=15890&view=rev Author: wahwah Date: 2011-10-07 18:36:24 +0000 (Fri, 07 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: it builds, but it needs to be adapted to use --program-suffix and alternatives Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 10:16:04 UTC (rev 15889) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 18:36:24 UTC (rev 15890) @@ -37,7 +37,7 @@ # To avoid file conflicts datadir = $(prefix)/share/mysql/$(BASE_VERSION) -MYSQL_LIB_VER = 17 +MYSQL_LIB_VER = 18 PACKAGES += CSWmysql-dev SPKG_DESC_CSWmysql-dev = MySQL development files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 9 01:24:24 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 Oct 2011 23:24:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[15891] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 15891 http://gar.svn.sourceforge.net/gar/?rev=15891&view=rev Author: wahwah Date: 2011-10-08 23:24:24 +0000 (Sat, 08 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: it's a bit better, but still a long way to go Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-07 18:36:24 UTC (rev 15890) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-08 23:24:24 UTC (rev 15891) @@ -45,20 +45,20 @@ RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient$(MYSQL_LIB_VER) CSWmysql-dev_programs += mysql_config -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION)) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)$(PROGRAM_SUFFIX))) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1$(PROGRAM_SUFFIX)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)$(PROGRAM_SUFFIX)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)$(PROGRAM_SUFFIX)) PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql -CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 +CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config$(PROGRAM_SUFFIX).1 ALTERNATIVES_CSWmysql-dev = mysql_dev ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ - $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) + $(bindir)/$C $C $(bindir)/$C$(PROGRAM_SUFFIX)) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ - $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) + $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)$(PROGRAM_SUFFIX).1) # PATCHFILES = 0001-Use-libc-not-libcrypt.patch # PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch @@ -99,10 +99,10 @@ PACKAGES += CSW$(NAME)client SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries PKGFILES_CSW$(NAME)client = $(bindir) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)-$(BASE_VERSION))) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)-$(BASE_VERSION)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name)$(PROGRAM_SUFFIX))) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)$(PROGRAM_SUFFIX)\.1) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)$(PROGRAM_SUFFIX)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)$(PROGRAM_SUFFIX)) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 @@ -130,7 +130,7 @@ # PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch # PATCHFILES += 0004-looking-for-ps-use-basename-0.patch # Perhaps using sed would be better, but we have a patch for now. -# PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch +# PATCHFILES += 0006-Use-my_print_defaults$(PROGRAM_SUFFIX).patch # PATCHFILES += 0007-versioned-mysqld-during-db-init-5.1.patch # PATCHFILES += 0008-versioned-datadir-in-mysql_install_db-5.1.patch @@ -163,6 +163,7 @@ BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) BUILD_DEP_PKGS = CSWcmake +PROGRAM_SUFFIX = -$(BASE_VERSION) # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler @@ -186,8 +187,24 @@ CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -CONFIGURE_ARGS += --program-suffix=-$(BASE_VERSION) +CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX) +# http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide +CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix) +CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir) +CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir) +CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) +CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) +CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir)) +CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) +CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/$(MM_LIBDIR)/plugin +CMAKE_ARGS += -DWITH_READLINE=1 +CMAKE_ARGS += -DWITH_SSL=system +CMAKE_ARGS += -DWITH_ZLIB=system +CMAKE_ARGS += -DDEFAULT_CHARSET=utf8 +CMAKE_ARGS += -DDEFAULT_COLLATION=utf8_general_ci +CMAKE_ARGS += -DWITH_COMMENT='OpenCSW' + # TODO: Make the tests pass. They don't at the moment. SKIPTEST ?= 1 TEST_SCRIPTS = custom @@ -208,11 +225,10 @@ CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) -CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess-$(BASE_VERSION).1 +CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess$(PROGRAM_SUFFIX).1 # This could be reviewed. CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content -EXECUTABLES += comp_err EXECUTABLES += innochecksum EXECUTABLES += msql2mysql EXECUTABLES += my_print_defaults @@ -222,25 +238,24 @@ EXECUTABLES += myisampack EXECUTABLES += mysql EXECUTABLES += mysql_client_test +EXECUTABLES += mysql_config EXECUTABLES += mysql_convert_table_format -EXECUTABLES += mysql_explain_log EXECUTABLES += mysql_find_rows EXECUTABLES += mysql_fix_extensions -EXECUTABLES += mysql_fix_privilege_tables -EXECUTABLES += mysql_install_db +EXECUTABLES += mysql_plugin EXECUTABLES += mysql_secure_installation EXECUTABLES += mysql_setpermission -EXECUTABLES += mysql_tableinfo EXECUTABLES += mysql_tzinfo_to_sql EXECUTABLES += mysql_upgrade -EXECUTABLES += mysql_upgrade_shell EXECUTABLES += mysql_waitpid EXECUTABLES += mysql_zap EXECUTABLES += mysqlaccess +EXECUTABLES += mysqlaccess.conf EXECUTABLES += mysqladmin EXECUTABLES += mysqlbinlog EXECUTABLES += mysqlbug EXECUTABLES += mysqlcheck +EXECUTABLES += mysqld EXECUTABLES += mysqld_multi EXECUTABLES += mysqld_safe EXECUTABLES += mysqldump @@ -248,26 +263,24 @@ EXECUTABLES += mysqlhotcopy EXECUTABLES += mysqlimport EXECUTABLES += mysqlshow +EXECUTABLES += mysqlslap EXECUTABLES += mysqltest -EXECUTABLES += mysqltestmanager -EXECUTABLES += mysqltestmanager-pwgen -EXECUTABLES += mysqltestmanagerc EXECUTABLES += perror EXECUTABLES += replace EXECUTABLES += resolve_stack_dump EXECUTABLES += resolveip ALTERNATIVES_CSW$(NAME) = mysql$(BASE_VERSION)_main -ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))-$(BASE_VERSION) $(ALTS_PRIO) +ALTERNATIVE_mysql$(BASE_VERSION)_main = $(bindir)/$(firstword $(EXECUTABLES)) mysql_main $(bindir)/$(firstword $(EXECUTABLES))$(PROGRAM_SUFFIX) $(ALTS_PRIO) ALTERNATIVE_mysql$(BASE_VERSION)_main += $(foreach C,$(wordlist 2,$(words $(EXECUTABLES)),$(EXECUTABLES)),\ - $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) + $(bindir)/$C $C $(bindir)/$C$(PROGRAM_SUFFIX)) ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)_client ALTERNATIVE_mysql$(BASE_VERSION)_client = $(bindir)/$(firstword $(client_programs)) mysql_client $(bindir)/$(firstword $(client_programs)) $(ALTS_PRIO) ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ - $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) + $(bindir)/$C $C $(bindir)/$C$(PROGRAM_SUFFIX)) ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\ - $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1) + $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)$(PROGRAM_SUFFIX).1) # These are harmless, although it would be nice to clean them up eventually. # Help appreciated? @@ -301,7 +314,7 @@ /usr/bin/env -i \ $(CONFIGURE_ENV) \ cmake . \ - -DCMAKE_INSTALL_PREFIX=$(prefix)) + $(CMAKE_ARGS)) @$(MAKECOOKIE) post-configure-modulated: @@ -320,6 +333,11 @@ # (cd $(DESTDIR)$(libdir); grmdir -v mysql) ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d + # Add versions to binary names + for f in $(EXECUTABLES); do \ + gmv -v "$(DESTDIR)$(bindir)/$${f}" \ + "$(DESTDIR)$(bindir)/$${f}$(PROGRAM_SUFFIX)"; \ + done @$(MAKECOOKIE) post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 9 09:28:39 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 09 Oct 2011 07:28:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[15892] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 15892 http://gar.svn.sourceforge.net/gar/?rev=15892&view=rev Author: wahwah Date: 2011-10-09 07:28:39 +0000 (Sun, 09 Oct 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: add a patch to stop cmake from breaking CFLAGS Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-08 23:24:24 UTC (rev 15891) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-10-09 07:28:39 UTC (rev 15892) @@ -64,6 +64,7 @@ # PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch # PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch +PATCHFILES += 0002-stop-cmake-from-messing-with-cflags.patch PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -292,7 +293,7 @@ include gar/category.mk -CFLAGS := $(filter-out -I%,$(CFLAGS)) +# CFLAGS := $(filter-out -I%,$(CFLAGS)) test-custom: alias sh=/usr/bin/bash; \ Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch 2011-10-09 07:28:39 UTC (rev 15892) @@ -0,0 +1,29 @@ +From 813fc9123c5b461d1f06b56c7398f28d56a3f1dd Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 9 Oct 2011 09:25:28 +0200 +Subject: [PATCH] stop cmake from messing with cflags + +--- + cmake/os/SunOS.cmake | 5 ----- + 1 files changed, 0 insertions(+), 5 deletions(-) + +diff --git a/cmake/os/SunOS.cmake b/cmake/os/SunOS.cmake +index 3d2b4b8..300d20e 100644 +--- a/cmake/os/SunOS.cmake ++++ b/cmake/os/SunOS.cmake +@@ -84,12 +84,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4 + } ") + CHECK_C_SOURCE_COMPILES(${SOURCE} HAVE_SPARC32_TICK) + IF(NOT HAVE_SPARC32_TICK) +- SET(CMAKE_REQUIRED_FLAGS "-mcpu=v9") + CHECK_C_SOURCE_COMPILES(${SOURCE} HAVE_SPARC32_TICK_WITH_V9) + SET(CMAKE_REQUIRED_FLAGS) +- IF(HAVE_SPARC32_TICK_WITH_V9) +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=v9") +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=v9") +- ENDIF() + ENDIF() + ENDIF() +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 9 11:15:16 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Oct 2011 09:15:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15893] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 15893 http://gar.svn.sourceforge.net/gar/?rev=15893&view=rev Author: rthurner Date: 2011-10-09 09:15:16 +0000 (Sun, 09 Oct 2011) Log Message: ----------- subversion, upgrade to svn-1.7-rc4 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-10-09 07:28:39 UTC (rev 15892) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-10-09 09:15:16 UTC (rev 15893) @@ -25,7 +25,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.7.0-rc3 +VERSION = 1.7.0-rc4 CATEGORIES = utils DESCRIPTION = Version control rethought Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2011-10-09 07:28:39 UTC (rev 15892) +++ csw/mgar/pkg/subversion/trunk/checksums 2011-10-09 09:15:16 UTC (rev 15893) @@ -1 +1 @@ -c27b70bd8a73fef0ec54c62312c528b9 subversion-1.7.0-rc3.tar.bz2 +f892a9835a474840314cfedc4c6fa709 subversion-1.7.0-rc4.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 Sun Oct 9 11:16:08 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Oct 2011 09:16:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[15894] csw/mgar/pkg/cmake/trunk Message-ID: Revision: 15894 http://gar.svn.sourceforge.net/gar/?rev=15894&view=rev Author: rthurner Date: 2011-10-09 09:16:08 +0000 (Sun, 09 Oct 2011) Log Message: ----------- cmake, upgrade to cmake-2.8.6 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 2011-10-09 09:15:16 UTC (rev 15893) +++ csw/mgar/pkg/cmake/trunk/Makefile 2011-10-09 09:16:08 UTC (rev 15894) @@ -1,7 +1,7 @@ # $Id$ NAME = cmake -VERSION = 2.8.4 +VERSION = 2.8.6 CATEGORIES = devel DESCRIPTION = Cross-platform make Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2011-10-09 09:15:16 UTC (rev 15893) +++ csw/mgar/pkg/cmake/trunk/checksums 2011-10-09 09:16:08 UTC (rev 15894) @@ -1 +1 @@ -209b7d1d04b2e00986538d74ba764fcf cmake-2.8.4.tar.gz +2147da452fd9212bb9b4542a9eee9d5b cmake-2.8.6.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 Sun Oct 9 11:25:26 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Oct 2011 09:25:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[15895] csw/mgar/pkg/sudo_ldap/trunk Message-ID: Revision: 15895 http://gar.svn.sourceforge.net/gar/?rev=15895&view=rev Author: rthurner Date: 2011-10-09 09:25:25 +0000 (Sun, 09 Oct 2011) Log Message: ----------- sudo_ldap: upgrade to sudo-1.8.2 Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile csw/mgar/pkg/sudo_ldap/trunk/checksums Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-10-09 09:16:08 UTC (rev 15894) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-10-09 09:25:25 UTC (rev 15895) @@ -1,5 +1,5 @@ NAME = sudo -VERSION = 1.7.4p4 +VERSION = 1.8.2 CATEGORIES = utils DESCRIPTION = Provides limited super user privileges (LDAP Enabled) Modified: csw/mgar/pkg/sudo_ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/checksums 2011-10-09 09:16:08 UTC (rev 15894) +++ csw/mgar/pkg/sudo_ldap/trunk/checksums 2011-10-09 09:25:25 UTC (rev 15895) @@ -1 +1 @@ -55d9906535d70a1de347cd3d3550ee87 sudo-1.7.4p4.tar.gz +000f458e7391be9fdf459a9ad6a4912a sudo-1.8.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 Sun Oct 9 11:34:51 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Oct 2011 09:34:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[15896] csw/mgar/pkg/sudo_ldap/trunk/Makefile Message-ID: Revision: 15896 http://gar.svn.sourceforge.net/gar/?rev=15896&view=rev Author: rthurner Date: 2011-10-09 09:34:51 +0000 (Sun, 09 Oct 2011) Log Message: ----------- sudo_ldap, README refers to the license Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-10-09 09:25:25 UTC (rev 15895) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-10-09 09:34:51 UTC (rev 15896) @@ -58,7 +58,7 @@ PROTOTYPE_FILES_sudo = $(bindir)/sudo(|edit).ldap PROTOTYPE_PERMS_sudo = 4755 -LICENSE = LICENSE +LICENSE = README ALTERNATIVES_CSWsudoldap = sudoldap ALTERNATIVE_sudoldap = $(bindir)/sudo sudo $(bindir)/sudo.ldap 60 ALTERNATIVE_sudoldap += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.ldap This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 9 11:50:34 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Oct 2011 09:50:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15897] csw/mgar/pkg/sudo_ldap/trunk/Makefile Message-ID: Revision: 15897 http://gar.svn.sourceforge.net/gar/?rev=15897&view=rev Author: rthurner Date: 2011-10-09 09:50:34 +0000 (Sun, 09 Oct 2011) Log Message: ----------- sudo_ldap, adjust dependencies Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-10-09 09:34:51 UTC (rev 15896) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-10-09 09:50:34 UTC (rev 15897) @@ -22,7 +22,7 @@ RUNTIME_DEP_PKGS_CSWsudoldap += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsudoldap += CSWoldaprt RUNTIME_DEP_PKGS_CSWsudoldap += CSWsudo-common -RUNTIME_DEP_PKGS_CSWsudoldap += CSWzlib +RUNTIME_DEP_PKGS_CSWsudoldap += CSWlibz1 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsudoldap) CSWggettext CHECKPKG_OVERRIDES_CSWsudoldap += surplus-dependency|CSWalternatives This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 9 12:05:37 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Oct 2011 10:05:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[15898] csw/mgar/pkg/sudo_ldap/trunk/Makefile Message-ID: Revision: 15898 http://gar.svn.sourceforge.net/gar/?rev=15898&view=rev Author: rthurner Date: 2011-10-09 10:05:37 +0000 (Sun, 09 Oct 2011) Log Message: ----------- sudo_ldap, checkpkg makes difference between 9s, and 9x ??? Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-10-09 09:50:34 UTC (rev 15897) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2011-10-09 10:05:37 UTC (rev 15898) @@ -25,7 +25,7 @@ RUNTIME_DEP_PKGS_CSWsudoldap += CSWlibz1 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsudoldap) CSWggettext -CHECKPKG_OVERRIDES_CSWsudoldap += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWsudoldap += surplus-dependency|CSWoldaprt CHECKPKG_OVERRIDES_CSWsudoldap += surplus-dependency|CSWsudo-common LOGPATH = /var$(prefix)/log/sudo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 9 12:30:06 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Oct 2011 10:30:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[15899] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: Revision: 15899 http://gar.svn.sourceforge.net/gar/?rev=15899&view=rev Author: rthurner Date: 2011-10-09 10:30:06 +0000 (Sun, 09 Oct 2011) Log Message: ----------- cmake, remove old chkpkg error preventions Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2011-10-09 10:05:37 UTC (rev 15898) +++ csw/mgar/pkg/cmake/trunk/Makefile 2011-10-09 10:30:06 UTC (rev 15899) @@ -42,73 +42,6 @@ # switch off tests as two of them fail TEST_TARGET = -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakemodules.1 -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmake.1 -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake-modules.html -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake.txt -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake-modules.txt -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake-variables.html -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake.html -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake-variables.txt -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.4/cmake.docbook -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPostgreSQL.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindTCL.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/CMakeDetermineSystem.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_mixer.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindTclStub.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindMatlab.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPhysFS.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindUnixCommands.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindOpenAL.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindJava.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindFLTK.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindQt3.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindFreetype.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/CMakeDetermineJavaCompiler.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/CMakeGenericSystem.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindGTK.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindJNI.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindwxWidgets.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSquish.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindMPEG.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindQt.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindKDE3.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/GetPrerequisites.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindCUDA.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_net.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindGTK2.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindFLTK2.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindAVIFile.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindLAPACK.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindLua50.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPHP4.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_image.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindGIF.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindBLAS.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_sound.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSDL_ttf.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPike.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindPNG.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindLua51.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindProducer.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindMPEG2.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/FindSelfPackers.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/Platform/UnixPaths.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.4/Modules/Platform/BlueGeneP-base.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ccmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cpack -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ctest -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindDart.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindJava.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindQt3.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindOpenGL.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/CMakeDetermineJavaCompiler.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.4/Modules/FindQt.cmake -CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakevars.1 - - include gar/category.mk FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(NAME)-$(VERSION)/Modules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 9 12:40:09 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Oct 2011 10:40:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[15900] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: Revision: 15900 http://gar.svn.sourceforge.net/gar/?rev=15900&view=rev Author: rthurner Date: 2011-10-09 10:40:09 +0000 (Sun, 09 Oct 2011) Log Message: ----------- cmake, checkpkg requires still .... Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2011-10-09 10:30:06 UTC (rev 15899) +++ csw/mgar/pkg/cmake/trunk/Makefile 2011-10-09 10:40:09 UTC (rev 15900) @@ -24,8 +24,8 @@ CATALOGNAME_CSWcmake = cmake SPKG_DESC_CSWcmake = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWcmake = CSWcurlrt CSWexpat -RUNTIME_DEP_PKGS_CSWcmake += CSWzlib +RUNTIME_DEP_PKGS_CSWcmake = CSWlibcurl4 CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWcmake += CSWlibz1 # We define upstream file regex so we can be notifed of @@ -42,6 +42,81 @@ # switch off tests as two of them fail TEST_TARGET = +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ctest +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ccmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cpack +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/UseJava.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_image.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_sound.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_ttf.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/CMakeGenericSystem.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/GetPrerequisites.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindLAPACK.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_net.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindAVIFile.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindJava.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindProducer.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindFLTK.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSelfPackers.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPNG.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPostgreSQL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindFreetype.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindUnixCommands.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindLua50.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindTCL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindMatlab.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPhysFS.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindQt3.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPike.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindwxWidgets.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindOpenAL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindLua51.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindBLAS.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPHP4.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindMPEG2.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindGTK.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindGTK2.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_mixer.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindCUDA.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindQt.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/CMakeDetermineSystem.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindKDE3.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindTclStub.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindFLTK2.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindJNI.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindMPEG.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSquish.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/Platform/BlueGeneP-base.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/Platform/UnixPaths.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmake.1 +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakevars.1 +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakemodules.1 +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake.html +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-variables.txt +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.txt +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake.txt +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.html +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-variables.html +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake.docbook +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/UseJava.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindJava.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindDart.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindQt3.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindOpenGL.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindQt.cmake +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/cmake.1 +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/cmakemodules.1 +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake.html +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.txt +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake.txt +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.html +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake.docbook + + include gar/category.mk FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(NAME)-$(VERSION)/Modules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Oct 9 15:54:47 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sun, 9 Oct 2011 14:54:47 +0100 Subject: [csw-devel] SF.net SVN: gar:[15900] csw/mgar/pkg/cmake/trunk/Makefile In-Reply-To: References: Message-ID: Em 09/10/2011 11:40, escreveu: > > Revision: 15900 > http://gar.svn.sourceforge.net/gar/?rev=15900&view=rev > Author: rthurner > Date: 2011-10-09 10:40:09 +0000 (Sun, 09 Oct 2011) > Log Message: > ----------- > cmake, checkpkg requires still .... > > Modified Paths: > -------------- > csw/mgar/pkg/cmake/trunk/Makefile > > Modified: csw/mgar/pkg/cmake/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/cmake/trunk/Makefile 2011-10-09 10:30:06 UTC (rev 15899) > +++ csw/mgar/pkg/cmake/trunk/Makefile 2011-10-09 10:40:09 UTC (rev 15900) > @@ -24,8 +24,8 @@ > CATALOGNAME_CSWcmake = cmake > SPKG_DESC_CSWcmake = $(DESCRIPTION) > > -RUNTIME_DEP_PKGS_CSWcmake = CSWcurlrt CSWexpat > -RUNTIME_DEP_PKGS_CSWcmake += CSWzlib > +RUNTIME_DEP_PKGS_CSWcmake = CSWlibcurl4 CSWlibexpat1 > +RUNTIME_DEP_PKGS_CSWcmake += CSWlibz1 > > > # We define upstream file regex so we can be notifed of > @@ -42,6 +42,81 @@ > # switch off tests as two of them fail > TEST_TARGET = > > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cmake Do you know that you can write one line instead? CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ctest > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ccmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cpack > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/UseJava.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_image.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_sound.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_ttf.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/CMakeGenericSystem.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/GetPrerequisites.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindLAPACK.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_net.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindAVIFile.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindJava.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindProducer.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindFLTK.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSelfPackers.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPNG.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPostgreSQL.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindFreetype.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindUnixCommands.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindLua50.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindTCL.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindMatlab.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPhysFS.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindQt3.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPike.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindwxWidgets.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindOpenAL.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindLua51.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindBLAS.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPHP4.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindMPEG2.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindGTK.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindGTK2.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_mixer.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindCUDA.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindQt.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/CMakeDetermineSystem.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindKDE3.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindTclStub.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindFLTK2.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindJNI.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindMPEG.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSquish.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/Platform/BlueGeneP-base.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/Platform/UnixPaths.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmake.1 > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakevars.1 > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakemodules.1 > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake.html > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-variables.txt > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.txt > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake.txt > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.html > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-variables.html > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake.docbook > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/UseJava.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindJava.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindDart.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindQt3.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindOpenGL.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindQt.cmake > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/cmake.1 > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/cmakemodules.1 > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake.html > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.txt > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake.txt > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.html > +CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake.docbook > + > + > include gar/category.mk > > FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(NAME)-$(VERSION)/Modules > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -------------- next part -------------- An HTML attachment was scrubbed... URL: From guengel at users.sourceforge.net Sun Oct 9 18:58:19 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 09 Oct 2011 16:58:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[15901] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 15901 http://gar.svn.sourceforge.net/gar/?rev=15901&view=rev Author: guengel Date: 2011-10-09 16:58:18 +0000 (Sun, 09 Oct 2011) Log Message: ----------- glib2/trunk: Dependency cleanup. Made checkpage happy. Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-10-09 10:40:09 UTC (rev 15900) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-10-09 16:58:18 UTC (rev 15901) @@ -1,7 +1,10 @@ -# TBD: -# - python files are produced for 32/64 bit: we don't have 64 bit python, wtf? -# - python files are not in the python lib dir, but directly in lib. The dir in configure is not used +# $Id$ +# NOTE +# +# The test /gsettings/keyfile may fail on first attempt, rerunning the tests +# should make it pass, though. --raos + NAME = glib VERSION = 2.28.8 CATEGORIES = lib @@ -46,8 +49,8 @@ PATCHFILES += 0018-Disable-gdbus-connection-large_message-on-sparc.patch PATCHFILES += 0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch PATCHFILES += 0019-Disable-volumemonitor-tests.patch -PATCHFILES += 0022-Disable-gsettings-strinfo-on-sparcv9.patch PATCHFILES += 0023-Disable-data-input-stream-read-int-test-on-sparc.patch +PATCHFILES += 0023-Disable-failing-gsettings-tests.patch # SPARCv9 Specific Patches PATCHFILES_isa-sparcv9 += 0023-Disable-run-assert-msg-test.sh.patch @@ -66,9 +69,11 @@ RUNTIME_DEP_PKGS_CSWglib2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWglib2 += CSWgamin -RUNTIME_DEP_PKGS_CSWglib2 += CSWpython +# Did not see any runtime dependency +#RUNTIME_DEP_PKGS_CSWglib2 += CSWpython RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibffi5 +# Is this really a runtime dep? No ref found to this lib. +#RUNTIME_DEP_PKGS_CSWglib2 += CSWlibffi5 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgio2-0-0 ## No package split yet @@ -83,7 +88,8 @@ RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibffi5 +# Is this really a runtime dep? No ref found to this lib. +#RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibffi5 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWsharedmimeinfo @@ -106,7 +112,8 @@ RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi5 +# Is this really a runtime dep? No ref found to this lib. +#RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi5 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibglib2-0-0 PACKAGES += CSWlibgthread2-0-0 @@ -119,11 +126,13 @@ PACKAGES += CSWlibglib2-dev SPKG_DESC_CSWlibglib2-dev = Development files for libglib-2.0.so.0 and assorted libglib, libgmodule, libgobject and libgthread RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibffi5 +# Is this really a runtime dep? No ref found to this lib. +#RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibffi5 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgamin RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWglib2 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWiconv -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWpython +# Did not see any runtime dependency +#RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWpython RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWzlib RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibglib2-0-0 @@ -134,9 +143,11 @@ OBSOLETED_BY_CSWlibglib2-dev = CSWglib2devel CATALOGNAME_CSWglib2devel = glib2_devel_stub -BUILD_DEP_PKGS = CSWggettext CSWlibpcre-dev CSWlibiconv-dev +BUILD_DEP_PKGS = CSWggettext CSWlibpcre-dev CSWlibiconv-dev CSWlibffi5 # To make the tests working -BUILD_DEP_PKGS += CSWdbuspython CSWsharedmimeinfo +BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo +# This is used to adjust paths in documentation +BUILD_DEP_PKGS += CSWgsed # We don't need it and if defined the test breaks LD_OPTIONS = @@ -172,22 +183,54 @@ EXTRA_COMMON_EXPORTS += TERM EXTRA_COMMON_EXPORTS += HOME -PYCOMPILE = 1 +# AFAICS Python is only used for tests +#PYCOMPILE = 1 #provided by iconv MERGE_EXCLUDE_FILES = .*/charset.alias +# Do we support gdb? +MERGE_EXCLUDE_FILES += .*/gdb .*/gdb/.* # The checks below are excluded since /usr/share/ is included in default value of # XDG_DATA_DIRS. However, /opt/csw/share is also included, so no harm. +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.2800.8 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.2800.8 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.2800.8 +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.2800.8 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.2800.8 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.2800.8 -CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.2800.8 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.2800.8 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.2800.8 +CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.2800.8 +# libgio uses the mime info for determining the type of files +CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += surplus-dependency|CSWsharedmimeinfo + +# This is ok since -dev has no binaries, hence checkpkg may not find +# references +CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWglib2 +CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWiconv +CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWzlib + +# That's ok, too. /usr/local appears in an example text. +CHECKPKG_OVERRIDES_CSWglib2 += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html + include gar/category.mk # We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out PATH := /opt/csw/gnu:$(PATH) + +# This is in place to fix paths that make checkpkg complain +pre-install-modulated: + @echo "=== Fixing paths in documentation ===" + for d in gio glib gobject ; do \ + DOCBASEDIR="$(WORKSRC)/docs/reference/$$d/" ; \ + if [ -d "$$DOCBASEDIR" ] ; then \ + for f in $$DOCBASEDIR/html/*.html $$DOCBASEDIR/*.[123456789] ; do \ + echo "Adjusting path in $$f" ; \ + /opt/csw/bin/gsed -e "s|/usr/share/|$(prefix)/share/|g" -e "s|/usr/local/|$(prefix)/|g" $$f > $$f.tmp ; \ + mv $$f.tmp $$f ; \ + done ; \ + fi ; \ + done Property changes on: csw/mgar/pkg/glib2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 10 09:44:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Oct 2011 07:44:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[15902] csw/mgar/pkg/di/trunk Message-ID: Revision: 15902 http://gar.svn.sourceforge.net/gar/?rev=15902&view=rev Author: dmichelsen Date: 2011-10-10 07:44:44 +0000 (Mon, 10 Oct 2011) Log Message: ----------- di/trunk: Update to 4.30 Modified Paths: -------------- csw/mgar/pkg/di/trunk/Makefile csw/mgar/pkg/di/trunk/checksums Modified: csw/mgar/pkg/di/trunk/Makefile =================================================================== --- csw/mgar/pkg/di/trunk/Makefile 2011-10-09 16:58:18 UTC (rev 15901) +++ csw/mgar/pkg/di/trunk/Makefile 2011-10-10 07:44:44 UTC (rev 15902) @@ -1,5 +1,5 @@ NAME = di -VERSION = 4.29 +VERSION = 4.30 CATEGORIES = utils DESCRIPTION = Disk information utility Modified: csw/mgar/pkg/di/trunk/checksums =================================================================== --- csw/mgar/pkg/di/trunk/checksums 2011-10-09 16:58:18 UTC (rev 15901) +++ csw/mgar/pkg/di/trunk/checksums 2011-10-10 07:44:44 UTC (rev 15902) @@ -1 +1 @@ -1445008c4720ec68727326a94c5e5de8 di-4.29.tar.gz +1ed38a896f704c63105c636b54258bdc di-4.30.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Oct 10 11:07:58 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 10 Oct 2011 09:07:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[15903] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 15903 http://gar.svn.sourceforge.net/gar/?rev=15903&view=rev Author: skayser Date: 2011-10-10 09:07:57 +0000 (Mon, 10 Oct 2011) Log Message: ----------- gar/v2: fix CATALOG_RELEASE regex Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-10-10 07:44:44 UTC (rev 15902) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-10-10 09:07:57 UTC (rev 15903) @@ -62,7 +62,7 @@ # set CATALOG_RELEASE to 'current'. Used by checkpkg to query the right branch # in the buildfarm pkgdb. For off-site usage this can default to unstable. HOSTNAME := $(shell hostname) -CATALOG_RELEASE ?= $(shell echo $(HOSTNAME) | gsed -e 's/[0-9][sx]*$$//') +CATALOG_RELEASE ?= $(shell echo $(HOSTNAME) | gsed -re 's/[0-9]{1,2}[sx]$$//') ifeq ($(HOSTNAME),$(CATALOG_RELEASE)) CATALOG_RELEASE=unstable endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Oct 10 11:40:04 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 10 Oct 2011 10:40:04 +0100 Subject: [csw-devel] SF.net SVN: gar:[15903] csw/mgar/gar/v2/gar.pkg.mk In-Reply-To: References: Message-ID: 2011/10/10 : > Revision: 15903 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=15903&view=rev > Author: ? skayser > Date: ? ? 2011-10-10 09:07:57 +0000 (Mon, 10 Oct 2011) > Log Message: > ----------- > gar/v2: fix CATALOG_RELEASE regex > > Modified Paths: > -------------- > ? ?csw/mgar/gar/v2/gar.pkg.mk > > Modified: csw/mgar/gar/v2/gar.pkg.mk > =================================================================== > --- csw/mgar/gar/v2/gar.pkg.mk ?2011-10-10 07:44:44 UTC (rev 15902) > +++ csw/mgar/gar/v2/gar.pkg.mk ?2011-10-10 09:07:57 UTC (rev 15903) > @@ -62,7 +62,7 @@ > ?# set CATALOG_RELEASE to 'current'. Used by checkpkg to query the right branch > ?# in the buildfarm pkgdb. For off-site usage this can default to unstable. > ?HOSTNAME := $(shell hostname) > -CATALOG_RELEASE ?= $(shell echo $(HOSTNAME) | gsed -e 's/[0-9][sx]*$$//') > +CATALOG_RELEASE ?= $(shell echo $(HOSTNAME) | gsed -re 's/[0-9]{1,2}[sx]$$//') Oh, the missing count spec after [0-9], sorry for not catching that! Maciej From dmichelsen at users.sourceforge.net Mon Oct 10 12:13:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Oct 2011 10:13:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[15904] csw/mgar/pkg/mod_auth_kerb/trunk Message-ID: Revision: 15904 http://gar.svn.sourceforge.net/gar/?rev=15904&view=rev Author: dmichelsen Date: 2011-10-10 10:13:41 +0000 (Mon, 10 Oct 2011) Log Message: ----------- mod_auth_kerb/trunk: Move to ap2mod CAS Modified Paths: -------------- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/mod_auth_kerb/trunk/files/CSWap2modauthkerb.postinstall csw/mgar/pkg/mod_auth_kerb/trunk/files/CSWap2modauthkerb.preremove Modified: csw/mgar/pkg/mod_auth_kerb/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2011-10-10 09:07:57 UTC (rev 15903) +++ csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2011-10-10 10:13:41 UTC (rev 15904) @@ -12,15 +12,11 @@ SF_PROJ = modauthkerb MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWap2modauthkerb.postinstall -DISTFILES += CSWap2modauthkerb.preremove # Apply patch until this is fixed: # https://sourceforge.net/tracker/?func=detail&atid=464524&aid=3172644&group_id=51775 PATCHFILES += 0001-Fix-install-destination.patch -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - VENDOR_URL = http://modauthkerb.sourceforge.net/ LICENSE = LICENSE @@ -49,6 +45,9 @@ INSTALL_OVERRIDE_VARS = AP2_LIBEXEC INSTALL_OVERRIDE_VAR_AP2_LIBEXEC = $(AP2_LIBEXEC) +AP2_MODS = 1 +AP2_MODFILES += \*auth_kerb\*so + include gar/category.mk pre-install-modulated: Deleted: csw/mgar/pkg/mod_auth_kerb/trunk/files/CSWap2modauthkerb.postinstall =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/files/CSWap2modauthkerb.postinstall 2011-10-10 09:07:57 UTC (rev 15903) +++ csw/mgar/pkg/mod_auth_kerb/trunk/files/CSWap2modauthkerb.postinstall 2011-10-10 10:13:41 UTC (rev 15904) @@ -1,25 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_EXTRADIR=$AP2_CONFDIR/extra -AP2_CONFIG=$AP2_CONFDIR/httpd.conf - -# Enable the auth_kerb modules -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -chroot $PKG_INSTALL_ROOT \ - $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \ - auth_kerb mod_auth_kerb.so - -# Finito -cat < Revision: 15905 http://gar.svn.sourceforge.net/gar/?rev=15905&view=rev Author: dmichelsen Date: 2011-10-10 15:07:40 +0000 (Mon, 10 Oct 2011) Log Message: ----------- openldap: Works towards package split Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2011-10-10 10:13:41 UTC (rev 15904) +++ csw/mgar/pkg/openldap/trunk/Makefile 2011-10-10 15:07:40 UTC (rev 15905) @@ -31,34 +31,87 @@ # /usr/local/var/ldapi # should be replaced by something more sane in the future. +VENDOR_URL = http://www.openldap.org + LICENSE = COPYRIGHT -PACKAGES = CSWoldap CSWoldapclient CSWoldapdevel CSWoldaprt +PACKAGES += CSWopenldap +SPKG_DESC_CSWopenldap = OpenLDAP server for Lightweight Directory Access Protocol +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWopenldap += CSWbdb48 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWopenldap += CSWosslrt +RUNTIME_DEP_PKGS_CSWopenldap += CSWsasl +RUNTIME_DEP_PKGS_CSWopenldap += CSWunixodbc +RUNTIME_DEP_PKGS_CSWopenldap += CSWperl +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibslp1 +RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicu46 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibwrap1 +OBSOLETED_BY_CSWopenldap += CSWoldap +CATALOGNAME_CSWoldap = openldap_stub -CATALOGNAME_CSWoldap = openldap -CATALOGNAME_CSWoldapclient = openldap_client -CATALOGNAME_CSWoldapdevel = openldap_devel -CATALOGNAME_CSWoldaprt = openldap_rt +# Evaluate later +CHECKPKG_OVERRIDES_CSWopenldap += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/slapd.8 -SPKG_DESC_CSWoldap = OpenLDAP server for Lightweight Directory Access Protocol -SPKG_DESC_CSWoldapclient = OpenLDAP client executables -SPKG_DESC_CSWoldapdevel = OpenLDAP development support -SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries +PACKAGES += CSWopenldap-client +SPKG_DESC_CSWopenldap-client = OpenLDAP client executables +PKGFILES_CSWopenldap-client += $(bindir)/.* +PKGFILES_CSWopenldap-client += $(mandir)/man1/.* +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWosslrt +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWsasl +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-2 +OBSOLETED_BY_CSWopenldap-client += CSWoldapclient +CATALOGNAME_CSWoldapclient = openldap_client_stub -RUNTIME_DEP_PKGS_CSWoldap = CSWbdb48 CSWlibnet -RUNTIME_DEP_PKGS_CSWoldap += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc -RUNTIME_DEP_PKGS_CSWoldap += CSWlibicu CSWperl -RUNTIME_DEP_PKGS_CSWoldap += CSWoldaprt -RUNTIME_DEP_PKGS_CSWoldapclient = CSWlibnet CSWosslrt CSWsasl -RUNTIME_DEP_PKGS_CSWoldapclient += CSWoldaprt -RUNTIME_DEP_PKGS_CSWoldaprt = CSWlibnet CSWosslrt CSWsasl +PACKAGES += CSWopenldap-dev +SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.2, libldap_r-2.4.so.2 and liblber-2.4.so.2 +PKGFILES_CSWopenldap-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWopenldap-dev += $(mandir)/man3/.* +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-2 +OBSOLETED_BY_CSWopenldap-dev += CSWoldapdevel +CATALOGNAME_CSWoldapdevel = openldap_devel_stub -SPKG_SOURCEURL = http://www.openldap.org +PACKAGES += CSWliblber2-4-2 +SPKG_DESC_CSWliblber2-4-2 = OpenLDAP ASN.1 BER library, liblber-2.4.so.2 +PKGFILES_CSWliblber2-4-2 += $(call pkgfiles_lib,liblber-2.4.so.2) +OBSOLETED_BY_CSWliblber2-4-2 += CSWoldaprt +CATALOGNAME_CSWoldaprt = openldap_rt_stub -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibldap2-4-2 +SPKG_DESC_CSWlibldap2-4-2 = OpenLDAP LDAP library, libldap-2.4.so.2 +PKGFILES_CSWlibldap2-4-2 += $(call pkgfiles_lib,libldap-2.4.so.2) +PKGFILES_CSWlibldap2-4-2 += $(sysconfdir)/ldap.conf +PKGFILES_CSWlibldap2-4-2 += $(mandir)/man5/ldap.conf.5 +RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWsasl +OBSOLETED_BY_CSWlibldap2-4-2 += CSWoldaprt +# Evaluate later +CHECKPKG_OVERRIDES_CSWlibldap2-4-2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5 + +PACKAGES += CSWlibldap-r2-4-2 +SPKG_DESC_CSWlibldap-r2-4-2 = OpenLDAP reentrant LDAP library, libldap_r-2.4.so.2 +PKGFILES_CSWlibldap-r2-4-2 += $(call pkgfiles_lib,libldap_r-2.4.so.2) +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWsasl +OBSOLETED_BY_CSWlibldap-r2-4-2 += CSWoldaprt + +FOREIGN_PACKAGES += CSWliblber2-3-0 +OBSOLETED_BY_CSWliblber2-3-0 += CSWoldaprt + +FOREIGN_PACKAGES += CSWlibldap2-3-0 +OBSOLETED_BY_CSWlibldap2-3-0 += CSWoldaprt + +FOREIGN_PACKAGES += CSWlibldap-r2-3-0 +OBSOLETED_BY_CSWlibldap-r2-3-0 += CSWoldaprt + EXTRA_DOCS = README.CSW $(PATCHFILES) openldaprc # This is also used during EXPANDVARS @@ -67,13 +120,10 @@ EXTRA_LIB = $(bdbdir)/lib EXTRA_INC = $(bdbdir)/include -# Not released yet. -#EXTRA_LDFLAGS = -L$(libdir)/libnet-new - sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw -MIGRATE_FILES = openldap +MIGRATE_FILES_CSWoldapclient = openldap # Is this causing this? # https://www.opencsw.org/mantis/view.php?id=4555 @@ -99,6 +149,10 @@ # Disable MySQL Cluster CONFIGURE_ARGS += --disable-ndb +# This libnet is meant to be provided for BeOS only, the libnet.so picked up from OpenCSW +# is completely unrelated. Disable the linkage. +CONFIGURE_ARGS += ac_cv_lib_net_main=no + # Disable TCPwrappers in 64 bit until the libraries are available # CONFIGURE_ARGS_32 = --enable-wrappers @@ -129,49 +183,8 @@ PRESERVECONF = /etc/opt/csw/openldap/ldap.conf PRESERVECONF += /etc/opt/csw/openldap/slapd.conf -PKGFILES_CSWoldapclient = $(bindir)/.* -PKGFILES_CSWoldapclient += $(mandir)/man1/.* +INITSMF = /etc/opt/csw/init.d/cswopenldap -PKGFILES_CSWoldapdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWoldapdevel += $(mandir)/man3/.* - -PKGFILES_CSWoldaprt = $(PKGFILES_RT) -PKGFILES_CSWoldaprt += $(sysconfdir)/ldap.conf -PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5 - -INITSMF = /opt/csw/etc/init.d/cswopenldap - -CHECKPKG_OVERRIDES_CSWoldap += init-file-wrong-location|/opt/csw/etc/init.d/cswopenldap - -# New libnet not released yet -CHECKPKG_OVERRIDES_CSWoldap += deprecated-library -CHECKPKG_OVERRIDES_CSWoldapclient += deprecated-library -CHECKPKG_OVERRIDES_CSWoldaprt += deprecated-library - -# Split libraries later -CHECKPKG_OVERRIDES_CSWoldaprt += non-uniform-lib-versions-in-package - -# These are all overrides because the new libnet is not in place yet. -CHECKPKG_OVERRIDES_CSWoldapclient += soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapdelete -CHECKPKG_OVERRIDES_CSWoldapclient += soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldappasswd -CHECKPKG_OVERRIDES_CSWoldapclient += soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapmodrdn -CHECKPKG_OVERRIDES_CSWoldapclient += soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapmodify -CHECKPKG_OVERRIDES_CSWoldapclient += soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapwhoami -CHECKPKG_OVERRIDES_CSWoldapclient += soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapexop -CHECKPKG_OVERRIDES_CSWoldapclient += soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapcompare -CHECKPKG_OVERRIDES_CSWoldapclient += soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapsearch -CHECKPKG_OVERRIDES_CSWoldapclient += soname-not-found|libnet.so|is|needed|by|opt/csw/bin/ldapurl -CHECKPKG_OVERRIDES_CSWoldapclient += surplus-dependency|CSWlibnet -CHECKPKG_OVERRIDES_CSWoldaprt += soname-not-found|libnet.so|is|needed|by|opt/csw/lib/libldap_r-2.3.so.0.2.31 -CHECKPKG_OVERRIDES_CSWoldaprt += soname-not-found|libnet.so|is|needed|by|opt/csw/lib/liblber-2.4.so.2.5.6 -CHECKPKG_OVERRIDES_CSWoldaprt += soname-not-found|libnet.so|is|needed|by|opt/csw/lib/libldap-2.3.so.0.2.31 -CHECKPKG_OVERRIDES_CSWoldaprt += soname-not-found|libnet.so|is|needed|by|opt/csw/lib/libldap_r-2.4.so.2.5.6 -CHECKPKG_OVERRIDES_CSWoldaprt += soname-not-found|libnet.so|is|needed|by|opt/csw/lib/libldap-2.4.so.2.5.6 -CHECKPKG_OVERRIDES_CSWoldaprt += surplus-dependency|CSWlibnet -CHECKPKG_OVERRIDES_CSWoldap += soname-not-found|libnet.so|is|needed|by|opt/csw/libexec/slapd -CHECKPKG_OVERRIDES_CSWoldap += surplus-dependency|CSWlibnet - - include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) @@ -179,7 +192,7 @@ post-merge: ginstall -D $(WORKDIR)/cswopenldap \ - $(PKGROOT)/opt/csw/etc/init.d/cswopenldap + $(PKGROOT)/etc/opt/csw/init.d/cswopenldap $(foreach F,$(EXTRA_DOCS),ginstall --mode=644 -D $(WORKDIR)/$F $(PKGROOT)$(docdir)/$(NAME)/$F;) @# Enable BDB backend so OpenLDAP can start perl -pi -e 's/#\s*(modulepath)/$$1/; s/#\s*(moduleload\s*back_bdb.la)/$$1/' $(PKGROOT)$(sysconfdir)/openldap/slapd.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 11 11:49:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Oct 2011 09:49:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15906] csw/mgar/gar/v2-raised-buildlevel/ Message-ID: Revision: 15906 http://gar.svn.sourceforge.net/gar/?rev=15906&view=rev Author: dmichelsen Date: 2011-10-11 09:49:15 +0000 (Tue, 11 Oct 2011) Log Message: ----------- mGAR v2-raised-buildlevel: Make branch Added Paths: ----------- csw/mgar/gar/v2-raised-buildlevel/ Property changes on: csw/mgar/gar/v2-raised-buildlevel ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /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-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 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 Oct 11 11:51:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Oct 2011 09:51:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15907] csw/mgar/gar/v2-raised-buildlevel/gar.conf.mk Message-ID: Revision: 15907 http://gar.svn.sourceforge.net/gar/?rev=15907&view=rev Author: dmichelsen Date: 2011-10-11 09:51:07 +0000 (Tue, 11 Oct 2011) Log Message: ----------- mGAR v2-raised-buildlevel: Apply patch to raise buildlevel for Solaris 10 Modified Paths: -------------- csw/mgar/gar/v2-raised-buildlevel/gar.conf.mk Modified: csw/mgar/gar/v2-raised-buildlevel/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-raised-buildlevel/gar.conf.mk 2011-10-11 09:49:15 UTC (rev 15906) +++ csw/mgar/gar/v2-raised-buildlevel/gar.conf.mk 2011-10-11 09:51:07 UTC (rev 15907) @@ -411,11 +411,20 @@ FLAVOR_FLAGS += $(EXTRA_$(GARFLAVOR)_FLAGS_$(GARCOMPILER)_$(GARCH)) $(EXTRA_$(GARFLAVOR)_FLAGS_$(GARCOMPILER)) # Raise these in your .garrc if needed -ISA_DEFAULT_sparc ?= sparcv8 -ISA_DEFAULT_i386 ?= i386 -ISA_DEFAULT64_sparc ?= sparcv9 -ISA_DEFAULT64_i386 ?= amd64 +ISA_DEFAULT_sparc-5.9 ?= sparcv8 +ISA_DEFAULT_sparc-5.10 ?= sparcv8plus +ISA_DEFAULT_i386-5.9 ?= i386 +ISA_DEFAULT_i386-5.10 ?= pentium_pro +ISA_DEFAULT64_sparc-5.9 ?= sparcv9 +ISA_DEFAULT64_sparc-5.10 ?= sparcv9 +ISA_DEFAULT64_i386-5.9 ?= amd64 +ISA_DEFAULT64_i386-5.10 ?= amd64 +ISA_DEFAULT_sparc ?= $(ISA_DEFAULT_sparc-$(GAROSREL)) +ISA_DEFAULT_i386 ?= $(ISA_DEFAULT_i386-$(GAROSREL)) +ISA_DEFAULT64_sparc ?= $(ISA_DEFAULT64_sparc-$(GAROSREL)) +ISA_DEFAULT64_i386 ?= $(ISA_DEFAULT64_i386-$(GAROSREL)) + # These are the ISAs that are always build for 32 bit and 64 bit # Do not overwrite these as they are used to control expansion at several other places ISA_DEFAULT = $(ISA_DEFAULT_$(GARCH)) @@ -450,8 +459,8 @@ # Subdirectories for specialized binaries and libraries # Use defaults for sparcv8 and i386 as those are symlinks -ISALIBDIR_sparcv8 ?= . -ISALIBDIR_i386 ?= . +ISALIBDIR_$(ISA_DEFAULT_sparc) ?= . +ISALIBDIR_$(ISA_DEFAULT_i386) ?= . $(foreach I,$(ISALIST),$(eval ISALIBDIR_$(I) ?= $I)) # These are the directories where the optimized libraries should go to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Oct 11 19:15:29 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 11 Oct 2011 19:15:29 +0200 Subject: [csw-devel] SF.net SVN: gar:[15882] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2 In-Reply-To: References: Message-ID: <4020ABF6-0BF2-46EA-B802-D8F359AB3C46@opencsw.org> Hi Maciej, Am 06.10.2011 um 20:03 schrieb Maciej (Matchek) Blizi?ski: > Why does it depend on libkrb5? Because it is 90% ready ;-) The dep can most certainly be dropped. Best regards -- Dago -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dmichelsen at users.sourceforge.net Tue Oct 11 19:42:04 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Oct 2011 17:42:04 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[567] buildfarm/bin/push-opencsw-to-mirror Message-ID: Revision: 567 http://opencsw.svn.sourceforge.net/opencsw/?rev=567&view=rev Author: dmichelsen Date: 2011-10-11 17:42:04 +0000 (Tue, 11 Oct 2011) Log Message: ----------- pushing to mirrors by IP Modified Paths: -------------- buildfarm/bin/push-opencsw-to-mirror Modified: buildfarm/bin/push-opencsw-to-mirror =================================================================== --- buildfarm/bin/push-opencsw-to-mirror 2011-09-30 13:07:21 UTC (rev 566) +++ buildfarm/bin/push-opencsw-to-mirror 2011-10-11 17:42:04 UTC (rev 567) @@ -1,7 +1,35 @@ #!/bin/sh -# The official mirror push -/opt/csw/bin/rsync -raHv --delete-after /export/mirror/opencsw-official/ mirror at rsync.opencsw.org:/csw/rsync/csw/ +# push_target_hosts="rsync.opencsw.org" +push_target_hosts="131.188.40.80" -# The development mirror push -/opt/csw/bin/rsync -raHv --delete-after /export/mirror/opencsw-future/ mirror at rsync.opencsw.org:/csw/rsync/csw-future/ +for push_target_host in $push_target_hosts +do + # The official mirror push + /opt/csw/bin/rsync -raHv --delete-after \ + --rsync-path=/opt/csw/bin/rsync \ + /export/mirror/opencsw-official/ mirror@${push_target_host}:/csw/rsync/csw/ + + # The development mirror push + /opt/csw/bin/rsync -raHv --delete-after \ + --rsync-path=/opt/csw/bin/rsync \ + /export/mirror/opencsw-future/ mirror@${push_target_host}:/csw/rsync/csw-future/ +done + +# push_target_hosts="opencsw-mirror.informatik.uni-erlangen.de" +push_target_hosts="131.188.40.82" + +for push_target_host in $push_target_hosts +do + + # The new mirror (as of 2011-09) + /opt/csw/bin/rsync -raHv --delete-after \ + --rsync-path=/opt/csw/bin/rsync \ + /export/mirror/opencsw-official/ \ + mirror@${push_target_host}:/vhost/mirror.opencsw.org/htdocs/opencsw + + /opt/csw/bin/rsync -raHv --delete-after \ + --rsync-path=/opt/csw/bin/rsync \ + /export/mirror/opencsw-future/ \ + mirror@${push_target_host}:/vhost/mirror.opencsw.org/htdocs/opencsw-future +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 12 01:31:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 11 Oct 2011 23:31:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[15908] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 15908 http://gar.svn.sourceforge.net/gar/?rev=15908&view=rev Author: bdwalton Date: 2011-10-11 23:31:40 +0000 (Tue, 11 Oct 2011) Log Message: ----------- asciidoc/trunk: version bump to 8.6.6 Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/checksums Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2011-10-11 09:51:07 UTC (rev 15907) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2011-10-11 23:31:40 UTC (rev 15908) @@ -1,5 +1,5 @@ NAME = asciidoc -VERSION = 8.6.4 +VERSION = 8.6.6 CATEGORIES = utils DESCRIPTION = A Documentation Generator Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2011-10-11 09:51:07 UTC (rev 15907) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2011-10-11 23:31:40 UTC (rev 15908) @@ -1 +1 @@ -180512ef2b07b52ef351088f54e5803e asciidoc-8.6.4.tar.gz +44b872d9c300ffa5a8fe8b3c4d10957c asciidoc-8.6.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 12 15:06:46 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 12 Oct 2011 13:06:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[15909] csw/mgar/pkg/openssl/branches/split/ Message-ID: Revision: 15909 http://gar.svn.sourceforge.net/gar/?rev=15909&view=rev Author: wahwah Date: 2011-10-12 13:06:45 +0000 (Wed, 12 Oct 2011) Log Message: ----------- openssl: A branch to split packages Added Paths: ----------- csw/mgar/pkg/openssl/branches/split/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 12 15:09:45 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 12 Oct 2011 13:09:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[15910] csw/mgar/pkg/openssl/branches/split Message-ID: Revision: 15910 http://gar.svn.sourceforge.net/gar/?rev=15910&view=rev Author: wahwah Date: 2011-10-12 13:09:45 +0000 (Wed, 12 Oct 2011) Log Message: ----------- pkg/openssl/trunk: work in progress Modified Paths: -------------- csw/mgar/pkg/openssl/branches/split/Makefile Added Paths: ----------- csw/mgar/pkg/openssl/branches/split/files/prototypes-old/ csw/mgar/pkg/openssl/branches/split/files/prototypes-old/CSWossl.prototype csw/mgar/pkg/openssl/branches/split/files/prototypes-old/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/branches/split/files/prototypes-old/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/branches/split/files/prototypes-old/CSWosslrt.prototype-i386 csw/mgar/pkg/openssl/branches/split/files/prototypes-old/CSWosslrt.prototype-sparc csw/mgar/pkg/openssl/branches/split/files/prototypes-old/CSWosslutils.prototype csw/mgar/pkg/openssl/branches/split/files/prototypes-old/README Removed Paths: ------------- csw/mgar/pkg/openssl/branches/split/files/CSWossl.prototype csw/mgar/pkg/openssl/branches/split/files/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/branches/split/files/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/branches/split/files/CSWosslrt.prototype-i386 csw/mgar/pkg/openssl/branches/split/files/CSWosslrt.prototype-sparc csw/mgar/pkg/openssl/branches/split/files/CSWosslutils.prototype Modified: csw/mgar/pkg/openssl/branches/split/Makefile =================================================================== --- csw/mgar/pkg/openssl/branches/split/Makefile 2011-10-12 13:06:45 UTC (rev 15909) +++ csw/mgar/pkg/openssl/branches/split/Makefile 2011-10-12 13:09:45 UTC (rev 15910) @@ -19,6 +19,8 @@ VERSION = 0.9.8r CATEGORIES = lib +PARALLELMFLAGS = + DESCRIPTION = The Open Source toolkit for SSL and TLS define BLURB The OpenSSL Project is a collaborative effort to develop a robust, @@ -27,42 +29,56 @@ as a full-strength general-purpose cryptography library. endef -PACKAGES = CSWossl CSWosslrt CSWossldevel CSWosslutils CSWossldoc +# STRIP_LIBTOOL = 1 +# Parallel compilation doesn't work. +PARALLELMFLAGS = -SPKG_DESC_CSWossl = Openssl meta package -CATALOGNAME_CSWossl = openssl -RUNTIME_DEP_PKGS_CSWossl = CSWossldevel CSWosslutils CSWosslrt -ARCHALL_CSWossl = 1 +# PACKAGES = CSWossl CSWosslrt CSWossldevel CSWosslutils CSWossldoc -SPKG_DESC_CSWosslrt = Openssl runtime libraries -CATALOGNAME_CSWosslrt = openssl_rt -RUNTIME_DEP_PKGS_CSWosslrt = CSWcacertificates +PACKAGES = CSWopenssl +SPKG_DESC_CSWopenssl = Openssl meta package +CATALOGNAME_CSWopenssl = openssl +RUNTIME_DEP_PKGS_CSWopenssl = CSWopenssl-dev +RUNTIME_DEP_PKGS_CSWopenssl += CSWopenssl-utils +ARCHALL_CSWopenssl = 1 +OBSOLETED_BY_CSWopenssl = CSWossl +CHECKPKG_OVERRIDES_CSWopenssl += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWopenssl += surplus-dependency|CSWopenssl-utils +CHECKPKG_OVERRIDES_CSWopenssl += surplus-dependency|CSWopenssl-dev -SPKG_DESC_CSWossldevel = Openssl development libraries and headers -CATALOGNAME_CSWossldevel = openssl_devel -RUNTIME_DEP_PKGS_CSWossldevel = CSWosslrt +# SPKG_DESC_CSWosslrt = Openssl runtime libraries +# CATALOGNAME_CSWosslrt = openssl_rt +# RUNTIME_DEP_PKGS_CSWosslrt = CSWcacertificates -SPKG_DESC_CSWossldoc = Openssl development documentation files -CATALOGNAME_CSWossldoc = openssl_doc +PACKAGES += CSWopenssl-dev +SPKG_DESC_CSWopenssl-dev = Openssl development libraries and headers +OBSOLETED_BY_CSWopenssl-dev = CSWossldevel +PKGFILES_CSWopenssl-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWopenssl-dev += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWopenssl-dev += CSWlibcrypto0-9-8 +# The .a files are shipped in the *-dev package (not sure why). +CHECKPKG_OVERRIDES_CSWopenssl-dev += discouraged-path-in-pkgmap -SPKG_DESC_CSWosslutils = Openssl binaries and related tools -CATALOGNAME_CSWosslutils = openssl_utils -RUNTIME_DEP_PKGS_CSWosslutils = CSWosslrt -SPKG_CLASSES_CSWosslutils = none cswpreserveconf +PACKAGES += CSWopenssl-doc +SPKG_DESC_CSWopenssl-doc = Openssl development documentation files +CATALOGNAME_CSWopenssl-doc = openssl_doc +PKGFILES_CSWopenssl-doc = $(docdir).* +ARCHALL_CSWopenssl-doc = 1 +OBSOLETED_BY_CSWopenssl-doc = CSWossldoc +CHECKPKG_OVERRIDES_CSWopenssl-doc += file-with-bad-content -# openssl is a meta-package -CHECKPKG_OVERRIDES_CSWossl += surplus-dependency|CSWosslutils -CHECKPKG_OVERRIDES_CSWossl += surplus-dependency|CSWossldevel -CHECKPKG_OVERRIDES_CSWossl += surplus-dependency|CSWosslrt - +PACKAGES += CSWopenssl-utils +SPKG_DESC_CSWopenssl-utils = Openssl binaries and related tools +SPKG_CLASSES_CSWopenssl-utils = none cswpreserveconf +OBSOLETED_BY_CSWopenssl-utils = CSWosslutils # we use sun perl not csw one CHECKPKG_OVERRIDES_CSWosslutils += missing-dependency|CSWperl +PKGFILES_CSWopenssl-utils += $(bindir)/c_rehash +PKGFILES_CSWopenssl-utils += $(bindir)/openssl +PKGFILES_CSWopenssl-utils += $(mandir) +RUNTIME_DEP_PKGS_CSWopenssl-utils += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWopenssl-utils += CSWlibcrypto0-9-8 -#CHECKPKG_OVERRIDES_CSWosslrt += surplus-dependency|CSWcacertificates - -# this package doesn't yet obey the new shared libraries standard -CHECKPKG_OVERRIDES_CSWosslrt += non-uniform-lib-versions-in-package|sonames=libcrypto.so.0.9.7,libcrypto.so.0.9.8,libssl.so.0.9.7,libssl.so.0.9.8 - # we will not recompile old 0.9.7 version for now ifeq ($(shell /usr/bin/uname -p),sparc) CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7 @@ -73,7 +89,6 @@ CHECKPKG_OVERRIDES_CSWosslrt += file-with-bad-content|/export/home|root/opt/csw/lib/libcrypto.so.0.9.7 CHECKPKG_OVERRIDES_CSWosslrt += file-with-bad-content|/export/home|root/opt/csw/lib/libssl.so.0.9.7 - # we do ship .a files in the devel package CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a @@ -90,30 +105,9 @@ endif # the /usr/local references in the documents files are relevant -CHECKPKG_OVERRIDES_CSWosslutils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/FAQ -CHECKPKG_OVERRIDES_CSWosslutils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/INSTALL -CHECKPKG_OVERRIDES_CSWosslutils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/CHANGES -CHECKPKG_OVERRIDES_CSWossl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl/INSTALL -CHECKPKG_OVERRIDES_CSWossl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl/CHANGES -CHECKPKG_OVERRIDES_CSWossl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl/FAQ -CHECKPKG_OVERRIDES_CSWosslrt += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_rt/FAQ -CHECKPKG_OVERRIDES_CSWosslrt += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_rt/INSTALL -CHECKPKG_OVERRIDES_CSWosslrt += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_rt/CHANGES -CHECKPKG_OVERRIDES_CSWossldevel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_devel/CHANGES -CHECKPKG_OVERRIDES_CSWossldevel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_devel/INSTALL -CHECKPKG_OVERRIDES_CSWossldevel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_devel/FAQ -CHECKPKG_OVERRIDES_CSWossldoc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_doc/CHANGES -CHECKPKG_OVERRIDES_CSWossldoc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_doc/INSTALL -CHECKPKG_OVERRIDES_CSWossldoc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_doc/FAQ +CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content +CHECKPKG_OVERRIDES_CSWopenssl += file-with-bad-content -# We will not fix this today -CHECKPKG_OVERRIDES_CSWosslutils += catalogname-does-not-match-pkgname|pkgname=CSWosslutils|catalogname=openssl_utils|expected-catalogname=osslutils -CHECKPKG_OVERRIDES_CSWossldevel += catalogname-does-not-match-pkgname|pkgname=CSWossldevel|catalogname=openssl_devel|expected-catalogname=ossldevel -CHECKPKG_OVERRIDES_CSWossldoc += catalogname-does-not-match-pkgname|pkgname=CSWossldoc|catalogname=openssl_doc|expected-catalogname=ossldoc -CHECKPKG_OVERRIDES_CSWossl += catalogname-does-not-match-pkgname|pkgname=CSWossl|catalogname=openssl|expected-catalogname=ossl -CHECKPKG_OVERRIDES_CSWosslrt += catalogname-does-not-match-pkgname|pkgname=CSWosslrt|catalogname=openssl_rt|expected-catalogname=osslrt - - ###### Upstream and opencsw files information ####### MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/ @@ -123,11 +117,11 @@ UFILES_REGEX = $(NAME)-(0.9.8[a-z]).tar.gz DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWossl.prototype -DISTFILES += CSWosslrt.checkinstall CSWosslrt.preinstall CSWosslrt.postinstall CSWosslrt.prototype-i386 CSWosslrt.prototype-sparc -DISTFILES += CSWossldevel.prototype-i386 CSWossldevel.prototype-sparc -DISTFILES += CSWosslutils.prototype -DISTFILES += changelog.CSW README.CSW +DISTFILES += CSWosslrt.checkinstall +DISTFILES += CSWosslrt.postinstall +DISTFILES += CSWosslrt.preinstall +DISTFILES += README.CSW +DISTFILES += changelog.CSW DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE @@ -142,7 +136,7 @@ # (patch taken from Debian Package) PATCHFILES += block_diginotar.patch -LICENSE=LICENSE +LICENSE = LICENSE ##### Build and installation information ##### @@ -207,6 +201,36 @@ TEST_SCRIPTS = +PACKAGES += CSWlibcrypto0-9-7 +CATALOGNAME_CSWlibcrypto0-9-7 = libcrypto0_9_7 +PKGFILES_CSWlibcrypto0-9-7 += $(call baseisadirs,$(libdir),libcrypto\.so\.0\.9\.7) +SPKG_DESC_CSWlibcrypto0-9-7 += $(DESCRIPTION), libcrypto.so.0.9.7 +OBSOLETED_BY_CSWlibcrypto0-9-7 = CSWosslrt + +PACKAGES += CSWlibcrypto0-9-8 +CATALOGNAME_CSWlibcrypto0-9-8 = libcrypto0_9_8 +PKGFILES_CSWlibcrypto0-9-8 += $(call baseisadirs,$(libdir),libcrypto\.so\.0\.9\.8) +SPKG_DESC_CSWlibcrypto0-9-8 += $(DESCRIPTION), libcrypto.so.0.9.8 +OBSOLETED_BY_CSWlibcrypto0-9-8 = CSWosslrt +CHECKPKG_OVERRIDES_CSWlibcrypto0-9-7 += bad-rpath-entry + +PACKAGES += CSWlibssl0-9-7 +CATALOGNAME_CSWlibssl0-9-7 = libssl0_9_7 +PKGFILES_CSWlibssl0-9-7 += $(call baseisadirs,$(libdir),libssl\.so\.0\.9\.7) +SPKG_DESC_CSWlibssl0-9-7 += $(DESCRIPTION), libssl.so.0.9.7 +RUNTIME_DEP_PKGS_CSWlibssl0-9-7 += CSWlibcrypto0-9-7 +OBSOLETED_BY_CSWlibssl0-9-7 = CSWosslrt +CHECKPKG_OVERRIDES_CSWlibssl0-9-7 += bad-rpath-entry + +PACKAGES += CSWlibssl0-9-8 +CATALOGNAME_CSWlibssl0-9-8 = libssl0_9_8 +PKGFILES_CSWlibssl0-9-8 += $(call baseisadirs,$(libdir),libssl\.so\.0\.9\.8) +# The engines subdirectory belongs to the libssl library. +PKGFILES_CSWlibssl0-9-8 += $(call baseisadirs,$(libdir),engines.*) +RUNTIME_DEP_PKGS_CSWlibssl0-9-8 += CSWlibcrypto0-9-8 +SPKG_DESC_CSWlibssl0-9-8 += $(DESCRIPTION), libssl.so.0.9.8 +OBSOLETED_BY_CSWlibssl0-9-8 = CSWosslrt + include gar/category.mk Deleted: csw/mgar/pkg/openssl/branches/split/files/CSWossl.prototype =================================================================== --- csw/mgar/pkg/openssl/branches/split/files/CSWossl.prototype 2011-10-12 13:06:45 UTC (rev 15909) +++ csw/mgar/pkg/openssl/branches/split/files/CSWossl.prototype 2011-10-12 13:09:45 UTC (rev 15910) @@ -1,14 +0,0 @@ -d none /opt/csw/share/doc/openssl 0755 root bin -f none /opt/csw/share/doc/openssl/changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl/license 644 root bin -f none /opt/csw/share/doc/openssl/CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/CHANGES.SSLeay 644 root bin -f none /opt/csw/share/doc/openssl/PROBLEMS 644 root bin -f none /opt/csw/share/doc/openssl/README 644 root bin -f none /opt/csw/share/doc/openssl/FAQ 644 root bin -f none /opt/csw/share/doc/openssl/README.ASN1 644 root bin -f none /opt/csw/share/doc/openssl/INSTALL 644 root bin -f none /opt/csw/share/doc/openssl/NEWS 644 root bin -f none /opt/csw/share/doc/openssl/README.ENGINE 644 root bin -f none /opt/csw/share/doc/openssl/README.CSW 644 root bin -i checkpkg_override=checkpkg_override.CSWossl Deleted: csw/mgar/pkg/openssl/branches/split/files/CSWossldevel.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/branches/split/files/CSWossldevel.prototype-i386 2011-10-12 13:06:45 UTC (rev 15909) +++ csw/mgar/pkg/openssl/branches/split/files/CSWossldevel.prototype-i386 2011-10-12 13:09:45 UTC (rev 15910) @@ -1,1061 +0,0 @@ -d none /opt/csw/include/openssl 0755 root bin -f none /opt/csw/include/openssl/aes.h 0644 root bin -f none /opt/csw/include/openssl/asn1.h 0644 root bin -f none /opt/csw/include/openssl/asn1_mac.h 0644 root bin -f none /opt/csw/include/openssl/asn1t.h 0644 root bin -f none /opt/csw/include/openssl/bio.h 0644 root bin -f none /opt/csw/include/openssl/blowfish.h 0644 root bin -f none /opt/csw/include/openssl/bn.h 0644 root bin -f none /opt/csw/include/openssl/buffer.h 0644 root bin -f none /opt/csw/include/openssl/cast.h 0644 root bin -f none /opt/csw/include/openssl/comp.h 0644 root bin -f none /opt/csw/include/openssl/conf.h 0644 root bin -f none /opt/csw/include/openssl/conf_api.h 0644 root bin -f none /opt/csw/include/openssl/crypto.h 0644 root bin -f none /opt/csw/include/openssl/des.h 0644 root bin -f none /opt/csw/include/openssl/des_old.h 0644 root bin -f none /opt/csw/include/openssl/dh.h 0644 root bin -f none /opt/csw/include/openssl/dsa.h 0644 root bin -f none /opt/csw/include/openssl/dso.h 0644 root bin -f none /opt/csw/include/openssl/dtls1.h 0644 root bin -f none /opt/csw/include/openssl/e_os2.h 0644 root bin -f none /opt/csw/include/openssl/ebcdic.h 0644 root bin -f none /opt/csw/include/openssl/ec.h 0644 root bin -f none /opt/csw/include/openssl/ecdh.h 0644 root bin -f none /opt/csw/include/openssl/ecdsa.h 0644 root bin -f none /opt/csw/include/openssl/engine.h 0644 root bin -f none /opt/csw/include/openssl/err.h 0644 root bin -f none /opt/csw/include/openssl/evp.h 0644 root bin -f none /opt/csw/include/openssl/hmac.h 0644 root bin -f none /opt/csw/include/openssl/idea.h 0644 root bin -f none /opt/csw/include/openssl/krb5_asn.h 0644 root bin -f none /opt/csw/include/openssl/kssl.h 0644 root bin -f none /opt/csw/include/openssl/lhash.h 0644 root bin -f none /opt/csw/include/openssl/md2.h 0644 root bin -f none /opt/csw/include/openssl/md4.h 0644 root bin -f none /opt/csw/include/openssl/md5.h 0644 root bin -f none /opt/csw/include/openssl/obj_mac.h 0644 root bin -f none /opt/csw/include/openssl/objects.h 0644 root bin -f none /opt/csw/include/openssl/ocsp.h 0644 root bin -f none /opt/csw/include/openssl/opensslconf.h 0644 root bin -f none /opt/csw/include/openssl/opensslv.h 0644 root bin -f none /opt/csw/include/openssl/ossl_typ.h 0644 root bin -f none /opt/csw/include/openssl/pem.h 0644 root bin -f none /opt/csw/include/openssl/pem2.h 0644 root bin -f none /opt/csw/include/openssl/pkcs12.h 0644 root bin -f none /opt/csw/include/openssl/pkcs7.h 0644 root bin -f none /opt/csw/include/openssl/pq_compat.h 0644 root bin -f none /opt/csw/include/openssl/pqueue.h 0644 root bin -f none /opt/csw/include/openssl/rand.h 0644 root bin -f none /opt/csw/include/openssl/rc2.h 0644 root bin -f none /opt/csw/include/openssl/rc4.h 0644 root bin -f none /opt/csw/include/openssl/ripemd.h 0644 root bin -f none /opt/csw/include/openssl/rsa.h 0644 root bin -f none /opt/csw/include/openssl/safestack.h 0644 root bin -f none /opt/csw/include/openssl/sha.h 0644 root bin -f none /opt/csw/include/openssl/ssl.h 0644 root bin -f none /opt/csw/include/openssl/ssl2.h 0644 root bin -f none /opt/csw/include/openssl/ssl23.h 0644 root bin -f none /opt/csw/include/openssl/ssl3.h 0644 root bin -f none /opt/csw/include/openssl/stack.h 0644 root bin -f none /opt/csw/include/openssl/store.h 0644 root bin -f none /opt/csw/include/openssl/symhacks.h 0644 root bin -f none /opt/csw/include/openssl/tls1.h 0644 root bin -f none /opt/csw/include/openssl/tmdiff.h 0644 root bin -f none /opt/csw/include/openssl/txt_db.h 0644 root bin -f none /opt/csw/include/openssl/ui.h 0644 root bin -f none /opt/csw/include/openssl/ui_compat.h 0644 root bin -f none /opt/csw/include/openssl/x509.h 0644 root bin -f none /opt/csw/include/openssl/x509_vfy.h 0644 root bin -f none /opt/csw/include/openssl/x509v3.h 0644 root bin -f none /opt/csw/lib/libssl.a 0644 root bin -f none /opt/csw/lib/libcrypto.a 0644 root bin -s none /opt/csw/lib/libcrypto.so=libcrypto.so.0.9.8 -s none /opt/csw/lib/libssl.so=libssl.so.0.9.8 -d none /opt/csw/lib/pentium_pro 0755 root bin -f none /opt/csw/lib/pentium_pro/libcrypto.a 0644 root bin -f none /opt/csw/lib/pentium_pro/libssl.a 0644 root bin -f none /opt/csw/lib/amd64/libcrypto.a 0644 root bin -f none /opt/csw/lib/amd64/libssl.a 0644 root bin -s none /opt/csw/lib/amd64/libcrypto.so=libcrypto.so.0.9.8 -s none /opt/csw/lib/amd64/libssl.so=libssl.so.0.9.8 -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/libcrypto.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/libssl.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/openssl.pc 0644 root bin -d none /opt/csw/share/doc/openssl_devel 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -s none /opt/csw/share/man/man3/ASN1_OBJECT_free.3=ASN1_OBJECT_new.3 -f none /opt/csw/share/man/man3/ASN1_OBJECT_new.3 0644 root bin -s none /opt/csw/share/man/man3/ASN1_STRING_cmp.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_data.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_dup.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_free.3=ASN1_STRING_new.3 -f none /opt/csw/share/man/man3/ASN1_STRING_length.3 0644 root bin -s none /opt/csw/share/man/man3/ASN1_STRING_length_set.3=ASN1_STRING_length.3 -f none /opt/csw/share/man/man3/ASN1_STRING_new.3 0644 root bin -f none /opt/csw/share/man/man3/ASN1_STRING_print_ex.3 0644 root bin -s none /opt/csw/share/man/man3/ASN1_STRING_print_ex_fp.3=ASN1_STRING_print_ex.3 -s none /opt/csw/share/man/man3/ASN1_STRING_set.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_type.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_type_new.3=ASN1_STRING_new.3 -f none /opt/csw/share/man/man3/ASN1_generate_nconf.3 0644 root bin -s none /opt/csw/share/man/man3/ASN1_generate_v3.3=ASN1_generate_nconf.3 -s none /opt/csw/share/man/man3/BF_cbc_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_cfb64_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_decrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_ecb_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_ofb64_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_options.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_set_key.3=blowfish.3 -s none /opt/csw/share/man/man3/BIO_append_filename.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_callback_ctrl.3=BIO_ctrl.3 -f none /opt/csw/share/man/man3/BIO_ctrl.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_ctrl_get_read_request.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_ctrl_get_write_guarantee.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_ctrl_pending.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_ctrl_reset_read_request.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_ctrl_wpending.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_debug_callback.3=BIO_set_callback.3 -s none /opt/csw/share/man/man3/BIO_destroy_bio_pair.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_do_accept.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_do_connect.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_eof.3=BIO_ctrl.3 -f none /opt/csw/share/man/man3/BIO_f_base64.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_buffer.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_cipher.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_md.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_null.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_ssl.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_find_type.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_flush.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_free.3=BIO_new.3 -s none /opt/csw/share/man/man3/BIO_free_all.3=BIO_new.3 -s none /opt/csw/share/man/man3/BIO_get_accept_port.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_get_bind_mode.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_get_callback.3=BIO_set_callback.3 -s none /opt/csw/share/man/man3/BIO_get_callback_arg.3=BIO_set_callback.3 -s none /opt/csw/share/man/man3/BIO_get_cipher_ctx.3=BIO_f_cipher.3 -s none /opt/csw/share/man/man3/BIO_get_cipher_status.3=BIO_f_cipher.3 -s none /opt/csw/share/man/man3/BIO_get_close.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_get_conn_hostname.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_get_conn_int_port.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_get_conn_ip.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_get_conn_port.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_get_fd.3=BIO_s_fd.3 -s none /opt/csw/share/man/man3/BIO_get_fp.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_get_info_callback.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_get_md.3=BIO_f_md.3 -s none /opt/csw/share/man/man3/BIO_get_md_ctx.3=BIO_f_md.3 -s none /opt/csw/share/man/man3/BIO_get_mem_data.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_get_mem_ptr.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_get_num_renegotiates.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_get_read_request.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_get_retry_BIO.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_get_retry_reason.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_get_ssl.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_get_write_buf_size.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_get_write_guarantee.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_gets.3=BIO_read.3 -s none /opt/csw/share/man/man3/BIO_int_ctrl.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_make_bio_pair.3=BIO_s_bio.3 -f none /opt/csw/share/man/man3/BIO_new.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_new_bio_pair.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_new_buffer_ssl_connect.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_new_fd.3=BIO_s_fd.3 -s none /opt/csw/share/man/man3/BIO_new_file.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_new_fp.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_new_mem_buf.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_new_socket.3=BIO_s_socket.3 -s none /opt/csw/share/man/man3/BIO_new_ssl.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_new_ssl_connect.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_next.3=BIO_find_type.3 -s none /opt/csw/share/man/man3/BIO_pending.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_pop.3=BIO_push.3 -s none /opt/csw/share/man/man3/BIO_ptr_ctrl.3=BIO_ctrl.3 -f none /opt/csw/share/man/man3/BIO_push.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_puts.3=BIO_read.3 -f none /opt/csw/share/man/man3/BIO_read.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_read_filename.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_reset.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_retry_type.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_rw_filename.3=BIO_s_file.3 -f none /opt/csw/share/man/man3/BIO_s_accept.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_bio.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_connect.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_fd.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_file.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_mem.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_null.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_socket.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_seek.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_set.3=BIO_new.3 -s none /opt/csw/share/man/man3/BIO_set_accept_bios.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_set_accept_port.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_set_bind_mode.3=BIO_s_accept.3 -f none /opt/csw/share/man/man3/BIO_set_callback.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_set_callback_arg.3=BIO_set_callback.3 -s none /opt/csw/share/man/man3/BIO_set_cipher.3=BIO_f_cipher.3 -s none /opt/csw/share/man/man3/BIO_set_close.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_set_conn_hostname.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_conn_int_port.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_conn_ip.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_conn_port.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_fd.3=BIO_s_fd.3 -s none /opt/csw/share/man/man3/BIO_set_fp.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_set_info_callback.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_set_md.3=BIO_f_md.3 -s none /opt/csw/share/man/man3/BIO_set_mem_buf.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_set_mem_eof_return.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_set_nbio.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_nbio_accept.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_set_ssl.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_set_ssl_mode.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_set_ssl_renegotiate_bytes.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_set_ssl_renegotiate_timeout.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_set_write_buf_size.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_should_io_special.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_should_read.3=BIO_should_retry.3 -f none /opt/csw/share/man/man3/BIO_should_retry.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_should_write.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_shutdown_wr.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_ssl_copy_session_id.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_ssl_shutdown.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_tell.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_vfree.3=BIO_new.3 -s none /opt/csw/share/man/man3/BIO_wpending.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_write.3=BIO_read.3 -s none /opt/csw/share/man/man3/BIO_write_filename.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BN_BLINDING_convert.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_convert_ex.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_create_param.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_free.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_get_flags.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_get_thread_id.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_invert.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_invert_ex.3=BN_BLINDING_new.3 -f none /opt/csw/share/man/man3/BN_BLINDING_new.3 0644 root bin -s none /opt/csw/share/man/man3/BN_BLINDING_set_flags.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_set_thread_id.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_update.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_CTX_end.3=BN_CTX_start.3 -s none /opt/csw/share/man/man3/BN_CTX_free.3=BN_CTX_new.3 -s none /opt/csw/share/man/man3/BN_CTX_get.3=BN_CTX_start.3 -s none /opt/csw/share/man/man3/BN_CTX_init.3=BN_CTX_new.3 -f none /opt/csw/share/man/man3/BN_CTX_new.3 0644 root bin -f none /opt/csw/share/man/man3/BN_CTX_start.3 0644 root bin -s none /opt/csw/share/man/man3/BN_MONT_CTX_copy.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_MONT_CTX_free.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_MONT_CTX_init.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_MONT_CTX_new.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_MONT_CTX_set.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_RECP_CTX_free.3=BN_mod_mul_reciprocal.3 -s none /opt/csw/share/man/man3/BN_RECP_CTX_init.3=BN_mod_mul_reciprocal.3 -s none /opt/csw/share/man/man3/BN_RECP_CTX_new.3=BN_mod_mul_reciprocal.3 -s none /opt/csw/share/man/man3/BN_RECP_CTX_set.3=BN_mod_mul_reciprocal.3 -f none /opt/csw/share/man/man3/BN_add.3 0644 root bin -f none /opt/csw/share/man/man3/BN_add_word.3 0644 root bin -s none /opt/csw/share/man/man3/BN_bin2bn.3=BN_bn2bin.3 -f none /opt/csw/share/man/man3/BN_bn2bin.3 0644 root bin -s none /opt/csw/share/man/man3/BN_bn2dec.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_bn2hex.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_bn2mpi.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_clear.3=BN_new.3 -s none /opt/csw/share/man/man3/BN_clear_bit.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_clear_free.3=BN_new.3 -f none /opt/csw/share/man/man3/BN_cmp.3 0644 root bin -f none /opt/csw/share/man/man3/BN_copy.3 0644 root bin -s none /opt/csw/share/man/man3/BN_dec2bn.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_div.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_div_recp.3=BN_mod_mul_reciprocal.3 -s none /opt/csw/share/man/man3/BN_div_word.3=BN_add_word.3 -s none /opt/csw/share/man/man3/BN_dup.3=BN_copy.3 -s none /opt/csw/share/man/man3/BN_exp.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_free.3=BN_new.3 -s none /opt/csw/share/man/man3/BN_from_montgomery.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_gcd.3=BN_add.3 -f none /opt/csw/share/man/man3/BN_generate_prime.3 0644 root bin -s none /opt/csw/share/man/man3/BN_get_word.3=BN_zero.3 -s none /opt/csw/share/man/man3/BN_hex2bn.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_init.3=BN_new.3 -s none /opt/csw/share/man/man3/BN_is_bit_set.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_is_odd.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_is_one.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_is_prime.3=BN_generate_prime.3 -s none /opt/csw/share/man/man3/BN_is_prime_fasttest.3=BN_generate_prime.3 -s none /opt/csw/share/man/man3/BN_is_word.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_is_zero.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_lshift.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_lshift1.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_mask_bits.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_mod.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mod_add.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mod_exp.3=BN_add.3 -f none /opt/csw/share/man/man3/BN_mod_inverse.3 0644 root bin -s none /opt/csw/share/man/man3/BN_mod_mul.3=BN_add.3 -f none /opt/csw/share/man/man3/BN_mod_mul_montgomery.3 0644 root bin -f none /opt/csw/share/man/man3/BN_mod_mul_reciprocal.3 0644 root bin -s none /opt/csw/share/man/man3/BN_mod_sqr.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mod_sub.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mod_word.3=BN_add_word.3 -s none /opt/csw/share/man/man3/BN_mpi2bn.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_mul.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mul_word.3=BN_add_word.3 -f none /opt/csw/share/man/man3/BN_new.3 0644 root bin -s none /opt/csw/share/man/man3/BN_nnmod.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_num_bits.3=BN_num_bytes.3 -s none /opt/csw/share/man/man3/BN_num_bits_word.3=BN_num_bytes.3 -f none /opt/csw/share/man/man3/BN_num_bytes.3 0644 root bin -s none /opt/csw/share/man/man3/BN_one.3=BN_zero.3 -s none /opt/csw/share/man/man3/BN_print.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_print_fp.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_pseudo_rand.3=BN_rand.3 -f none /opt/csw/share/man/man3/BN_rand.3 0644 root bin -s none /opt/csw/share/man/man3/BN_rshift.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_rshift1.3=BN_set_bit.3 -f none /opt/csw/share/man/man3/BN_set_bit.3 0644 root bin -s none /opt/csw/share/man/man3/BN_set_word.3=BN_zero.3 -s none /opt/csw/share/man/man3/BN_sqr.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_sub.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_sub_word.3=BN_add_word.3 -f none /opt/csw/share/man/man3/BN_swap.3 0644 root bin -s none /opt/csw/share/man/man3/BN_to_montgomery.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_ucmp.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_value_one.3=BN_zero.3 -f none /opt/csw/share/man/man3/BN_zero.3 0644 root bin -s none /opt/csw/share/man/man3/BUF_MEM_free.3=buffer.3 -s none /opt/csw/share/man/man3/BUF_MEM_grow.3=buffer.3 -s none /opt/csw/share/man/man3/BUF_MEM_new.3=buffer.3 -s none /opt/csw/share/man/man3/BUF_strdup.3=buffer.3 -f none /opt/csw/share/man/man3/CONF_modules_free.3 0644 root bin -s none /opt/csw/share/man/man3/CONF_modules_load.3=CONF_modules_load_file.3 -f none /opt/csw/share/man/man3/CONF_modules_load_file.3 0644 root bin -s none /opt/csw/share/man/man3/CONF_modules_unload.3=CONF_modules_free.3 -s none /opt/csw/share/man/man3/CRYPTO_destroy_dynlockid.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_get_ex_data.3=CRYPTO_set_ex_data.3 -s none /opt/csw/share/man/man3/CRYPTO_get_new_dynlockid.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_lock.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_num_locks.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_set_dynlock_create_callback.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_set_dynlock_destroy_callback.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_set_dynlock_lock_callback.3=threads.3 -f none /opt/csw/share/man/man3/CRYPTO_set_ex_data.3 0644 root bin -s none /opt/csw/share/man/man3/CRYPTO_set_id_callback.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_set_locking_callback.3=threads.3 -s none /opt/csw/share/man/man3/DES_cbc_cksum.3=des.3 -s none /opt/csw/share/man/man3/DES_cfb64_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_cfb_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_crypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ecb2_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ecb3_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ecb_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ede2_cbc_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ede2_cfb64_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ede2_ofb64_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ede3_cbc_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ede3_cbcm_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ede3_cfb64_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ede3_ofb64_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_enc_read.3=des.3 -s none /opt/csw/share/man/man3/DES_enc_write.3=des.3 -s none /opt/csw/share/man/man3/DES_fcrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_is_weak_key.3=des.3 -s none /opt/csw/share/man/man3/DES_key_sched.3=des.3 -s none /opt/csw/share/man/man3/DES_ncbc_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ofb64_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_ofb_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_pcbc_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DES_quad_cksum.3=des.3 -s none /opt/csw/share/man/man3/DES_random_key.3=des.3 -s none /opt/csw/share/man/man3/DES_set_key.3=des.3 -s none /opt/csw/share/man/man3/DES_set_key_checked.3=des.3 -s none /opt/csw/share/man/man3/DES_set_key_unchecked.3=des.3 -s none /opt/csw/share/man/man3/DES_set_odd_parity.3=des.3 -s none /opt/csw/share/man/man3/DES_string_to_2keys.3=des.3 -s none /opt/csw/share/man/man3/DES_string_to_key.3=des.3 -s none /opt/csw/share/man/man3/DES_xcbc_encrypt.3=des.3 -s none /opt/csw/share/man/man3/DH_OpenSSL.3=DH_set_method.3 -s none /opt/csw/share/man/man3/DH_check.3=DH_generate_parameters.3 -s none /opt/csw/share/man/man3/DH_compute_key.3=DH_generate_key.3 -s none /opt/csw/share/man/man3/DH_free.3=DH_new.3 -f none /opt/csw/share/man/man3/DH_generate_key.3 0644 root bin -f none /opt/csw/share/man/man3/DH_generate_parameters.3 0644 root bin -s none /opt/csw/share/man/man3/DH_get_default_method.3=DH_set_method.3 -s none /opt/csw/share/man/man3/DH_get_ex_data.3=DH_get_ex_new_index.3 -f none /opt/csw/share/man/man3/DH_get_ex_new_index.3 0644 root bin -f none /opt/csw/share/man/man3/DH_new.3 0644 root bin -s none /opt/csw/share/man/man3/DH_new_method.3=DH_set_method.3 -s none /opt/csw/share/man/man3/DH_set_default_method.3=DH_set_method.3 -s none /opt/csw/share/man/man3/DH_set_ex_data.3=DH_get_ex_new_index.3 -f none /opt/csw/share/man/man3/DH_set_method.3 0644 root bin -f none /opt/csw/share/man/man3/DH_size.3 0644 root bin -s none /opt/csw/share/man/man3/DHparams_print.3=RSA_print.3 -s none /opt/csw/share/man/man3/DHparams_print_fp.3=RSA_print.3 -s none /opt/csw/share/man/man3/DSA_OpenSSL.3=DSA_set_method.3 -s none /opt/csw/share/man/man3/DSA_SIG_free.3=DSA_SIG_new.3 -f none /opt/csw/share/man/man3/DSA_SIG_new.3 0644 root bin -f none /opt/csw/share/man/man3/DSA_do_sign.3 0644 root bin -s none /opt/csw/share/man/man3/DSA_do_verify.3=DSA_do_sign.3 -f none /opt/csw/share/man/man3/DSA_dup_DH.3 0644 root bin -s none /opt/csw/share/man/man3/DSA_free.3=DSA_new.3 -f none /opt/csw/share/man/man3/DSA_generate_key.3 0644 root bin -f none /opt/csw/share/man/man3/DSA_generate_parameters.3 0644 root bin -s none /opt/csw/share/man/man3/DSA_get_default_method.3=DSA_set_method.3 -s none /opt/csw/share/man/man3/DSA_get_ex_data.3=DSA_get_ex_new_index.3 -f none /opt/csw/share/man/man3/DSA_get_ex_new_index.3 0644 root bin -f none /opt/csw/share/man/man3/DSA_new.3 0644 root bin -s none /opt/csw/share/man/man3/DSA_new_method.3=DSA_set_method.3 -s none /opt/csw/share/man/man3/DSA_print.3=RSA_print.3 -s none /opt/csw/share/man/man3/DSA_print_fp.3=RSA_print.3 -s none /opt/csw/share/man/man3/DSA_set_default_method.3=DSA_set_method.3 -s none /opt/csw/share/man/man3/DSA_set_ex_data.3=DSA_get_ex_new_index.3 -f none /opt/csw/share/man/man3/DSA_set_method.3 0644 root bin -f none /opt/csw/share/man/man3/DSA_sign.3 0644 root bin -s none /opt/csw/share/man/man3/DSA_sign_setup.3=DSA_sign.3 -f none /opt/csw/share/man/man3/DSA_size.3 0644 root bin -s none /opt/csw/share/man/man3/DSA_verify.3=DSA_sign.3 -s none /opt/csw/share/man/man3/DSAparams_print.3=RSA_print.3 -s none /opt/csw/share/man/man3/DSAparams_print_fp.3=RSA_print.3 -s none /opt/csw/share/man/man3/ERR_GET_FUNC.3=ERR_GET_LIB.3 -f none /opt/csw/share/man/man3/ERR_GET_LIB.3 0644 root bin -s none /opt/csw/share/man/man3/ERR_GET_REASON.3=ERR_GET_LIB.3 -s none /opt/csw/share/man/man3/ERR_PACK.3=ERR_load_strings.3 -s none /opt/csw/share/man/man3/ERR_add_error_data.3=ERR_put_error.3 -f none /opt/csw/share/man/man3/ERR_clear_error.3 0644 root bin -f none /opt/csw/share/man/man3/ERR_error_string.3 0644 root bin -s none /opt/csw/share/man/man3/ERR_error_string_n.3=ERR_error_string.3 -s none /opt/csw/share/man/man3/ERR_free_strings.3=ERR_load_crypto_strings.3 -s none /opt/csw/share/man/man3/ERR_func_error_string.3=ERR_error_string.3 -f none /opt/csw/share/man/man3/ERR_get_error.3 0644 root bin -s none /opt/csw/share/man/man3/ERR_get_error_line.3=ERR_get_error.3 -s none /opt/csw/share/man/man3/ERR_get_error_line_data.3=ERR_get_error.3 -s none /opt/csw/share/man/man3/ERR_get_next_error_library.3=ERR_load_strings.3 -s none /opt/csw/share/man/man3/ERR_lib_error_string.3=ERR_error_string.3 -s none /opt/csw/share/man/man3/ERR_load_UI_strings.3=ui.3 -f none /opt/csw/share/man/man3/ERR_load_crypto_strings.3 0644 root bin -f none /opt/csw/share/man/man3/ERR_load_strings.3 0644 root bin -s none /opt/csw/share/man/man3/ERR_peek_error.3=ERR_get_error.3 -s none /opt/csw/share/man/man3/ERR_peek_error_line.3=ERR_get_error.3 -s none /opt/csw/share/man/man3/ERR_peek_error_line_data.3=ERR_get_error.3 -s none /opt/csw/share/man/man3/ERR_peek_last_error.3=ERR_get_error.3 -s none /opt/csw/share/man/man3/ERR_peek_last_error_line.3=ERR_get_error.3 -s none /opt/csw/share/man/man3/ERR_peek_last_error_line_data.3=ERR_get_error.3 -s none /opt/csw/share/man/man3/ERR_pop_to_mark.3=ERR_set_mark.3 -f none /opt/csw/share/man/man3/ERR_print_errors.3 0644 root bin -s none /opt/csw/share/man/man3/ERR_print_errors_fp.3=ERR_print_errors.3 -f none /opt/csw/share/man/man3/ERR_put_error.3 0644 root bin -s none /opt/csw/share/man/man3/ERR_reason_error_string.3=ERR_error_string.3 -f none /opt/csw/share/man/man3/ERR_remove_state.3 0644 root bin -f none /opt/csw/share/man/man3/ERR_set_mark.3 0644 root bin -f none /opt/csw/share/man/man3/EVP_BytesToKey.3 0644 root bin -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_block_size.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_cipher.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_cleanup.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_ctrl.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_flags.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_get_app_data.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_init.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_iv_length.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_key_length.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_mode.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_nid.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_set_app_data.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_set_key_length.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_set_padding.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_CTX_type.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_asn1_to_param.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_block_size.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_flags.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_iv_length.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_key_length.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_mode.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_nid.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_param_to_asn1.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CIPHER_type.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CipherFinal.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CipherFinal_ex.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CipherInit.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CipherInit_ex.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_CipherUpdate.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_DecryptFinal.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_DecryptFinal_ex.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_DecryptInit.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_DecryptInit_ex.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_DecryptUpdate.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_DigestFinal_ex.3=EVP_DigestInit.3 -f none /opt/csw/share/man/man3/EVP_DigestInit.3 0644 root bin -s none /opt/csw/share/man/man3/EVP_DigestInit_ex.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_DigestUpdate.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_EncryptFinal.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_EncryptFinal_ex.3=EVP_EncryptInit.3 -f none /opt/csw/share/man/man3/EVP_EncryptInit.3 0644 root bin -s none /opt/csw/share/man/man3/EVP_EncryptInit_ex.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_EncryptUpdate.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_MAX_MD_SIZE.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_block_size.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_cleanup.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_copy.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_copy_ex.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_create.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_destroy.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_init.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_md.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_size.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_CTX_type.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_block_size.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_pkey_type.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_size.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_MD_type.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_OpenFinal.3=EVP_OpenInit.3 -f none /opt/csw/share/man/man3/EVP_OpenInit.3 0644 root bin -s none /opt/csw/share/man/man3/EVP_OpenUpdate.3=EVP_OpenInit.3 -s none /opt/csw/share/man/man3/EVP_PKEY_assign_DH.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_PKEY_assign_DSA.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_PKEY_assign_EC_KEY.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_PKEY_assign_RSA.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_PKEY_free.3=EVP_PKEY_new.3 -s none /opt/csw/share/man/man3/EVP_PKEY_get1_DH.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_PKEY_get1_DSA.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_PKEY_get1_EC_KEY.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_PKEY_get1_RSA.3=EVP_PKEY_set1_RSA.3 -f none /opt/csw/share/man/man3/EVP_PKEY_new.3 0644 root bin -s none /opt/csw/share/man/man3/EVP_PKEY_set1_DH.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_PKEY_set1_DSA.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_PKEY_set1_EC_KEY.3=EVP_PKEY_set1_RSA.3 -f none /opt/csw/share/man/man3/EVP_PKEY_set1_RSA.3 0644 root bin -s none /opt/csw/share/man/man3/EVP_PKEY_type.3=EVP_PKEY_set1_RSA.3 -s none /opt/csw/share/man/man3/EVP_SealFinal.3=EVP_SealInit.3 -f none /opt/csw/share/man/man3/EVP_SealInit.3 0644 root bin -s none /opt/csw/share/man/man3/EVP_SealUpdate.3=EVP_SealInit.3 -s none /opt/csw/share/man/man3/EVP_SignFinal.3=EVP_SignInit.3 -f none /opt/csw/share/man/man3/EVP_SignInit.3 0644 root bin -s none /opt/csw/share/man/man3/EVP_SignUpdate.3=EVP_SignInit.3 -s none /opt/csw/share/man/man3/EVP_VerifyFinal.3=EVP_VerifyInit.3 -f none /opt/csw/share/man/man3/EVP_VerifyInit.3 0644 root bin -s none /opt/csw/share/man/man3/EVP_VerifyUpdate.3=EVP_VerifyInit.3 -s none /opt/csw/share/man/man3/EVP_dss.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_dss1.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_get_cipherbyname.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_get_cipherbynid.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_get_cipherbyobj.3=EVP_EncryptInit.3 -s none /opt/csw/share/man/man3/EVP_get_digestbyname.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_get_digestbynid.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_get_digestbyobj.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_md2.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_md5.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_md_null.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_mdc2.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_ripemd160.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_sha.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/EVP_sha1.3=EVP_DigestInit.3 -s none /opt/csw/share/man/man3/HMAC.3=hmac.3 -s none /opt/csw/share/man/man3/HMAC_Final.3=hmac.3 -s none /opt/csw/share/man/man3/HMAC_Init.3=hmac.3 -s none /opt/csw/share/man/man3/HMAC_Update.3=hmac.3 -s none /opt/csw/share/man/man3/HMAC_cleanup.3=hmac.3 -s none /opt/csw/share/man/man3/MD2.3=md5.3 -s none /opt/csw/share/man/man3/MD2_Final.3=md5.3 -s none /opt/csw/share/man/man3/MD2_Init.3=md5.3 -s none /opt/csw/share/man/man3/MD2_Update.3=md5.3 -s none /opt/csw/share/man/man3/MD4.3=md5.3 -s none /opt/csw/share/man/man3/MD4_Final.3=md5.3 -s none /opt/csw/share/man/man3/MD4_Init.3=md5.3 -s none /opt/csw/share/man/man3/MD4_Update.3=md5.3 -s none /opt/csw/share/man/man3/MD5.3=md5.3 -s none /opt/csw/share/man/man3/MD5_Final.3=md5.3 -s none /opt/csw/share/man/man3/MD5_Init.3=md5.3 -s none /opt/csw/share/man/man3/MD5_Update.3=md5.3 -s none /opt/csw/share/man/man3/MDC2.3=mdc2.3 -s none /opt/csw/share/man/man3/MDC2_Final.3=mdc2.3 -s none /opt/csw/share/man/man3/MDC2_Init.3=mdc2.3 -s none /opt/csw/share/man/man3/MDC2_Update.3=mdc2.3 -s none /opt/csw/share/man/man3/OBJ_cleanup.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_cmp.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_create.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_dup.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_ln2nid.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_nid2ln.3=OBJ_nid2obj.3 -f none /opt/csw/share/man/man3/OBJ_nid2obj.3 0644 root bin -s none /opt/csw/share/man/man3/OBJ_nid2sn.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_obj2nid.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_obj2txt.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_sn2nid.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_txt2nid.3=OBJ_nid2obj.3 -s none /opt/csw/share/man/man3/OBJ_txt2obj.3=OBJ_nid2obj.3 -f none /opt/csw/share/man/man3/OPENSSL_Applink.3 0644 root bin -f none /opt/csw/share/man/man3/OPENSSL_VERSION_NUMBER.3 0644 root bin -f none /opt/csw/share/man/man3/OPENSSL_config.3 0644 root bin -f none /opt/csw/share/man/man3/OPENSSL_ia32cap.3 0644 root bin -f none /opt/csw/share/man/man3/OPENSSL_load_builtin_modules.3 0644 root bin -s none /opt/csw/share/man/man3/OPENSSL_no_config.3=OPENSSL_config.3 -f none /opt/csw/share/man/man3/OpenSSL_add_all_algorithms.3 0644 root bin -s none /opt/csw/share/man/man3/OpenSSL_add_all_ciphers.3=OpenSSL_add_all_algorithms.3 -s none /opt/csw/share/man/man3/OpenSSL_add_all_digests.3=OpenSSL_add_all_algorithms.3 -s none /opt/csw/share/man/man3/OpenSSL_add_ssl_algorithms.3=SSL_library_init.3 -s none /opt/csw/share/man/man3/PEM.3=pem.3 -f none /opt/csw/share/man/man3/PKCS12_create.3 0644 root bin -f none /opt/csw/share/man/man3/PKCS12_parse.3 0644 root bin -f none /opt/csw/share/man/man3/PKCS7_decrypt.3 0644 root bin -f none /opt/csw/share/man/man3/PKCS7_encrypt.3 0644 root bin -f none /opt/csw/share/man/man3/PKCS7_sign.3 0644 root bin -f none /opt/csw/share/man/man3/PKCS7_verify.3 0644 root bin -s none /opt/csw/share/man/man3/RAND_SSLeay.3=RAND_set_rand_method.3 -f none /opt/csw/share/man/man3/RAND_add.3 0644 root bin -f none /opt/csw/share/man/man3/RAND_bytes.3 0644 root bin -f none /opt/csw/share/man/man3/RAND_cleanup.3 0644 root bin -f none /opt/csw/share/man/man3/RAND_egd.3 0644 root bin -s none /opt/csw/share/man/man3/RAND_event.3=RAND_add.3 -s none /opt/csw/share/man/man3/RAND_file_name.3=RAND_load_file.3 -s none /opt/csw/share/man/man3/RAND_get_rand_method.3=RAND_set_rand_method.3 -f none /opt/csw/share/man/man3/RAND_load_file.3 0644 root bin -s none /opt/csw/share/man/man3/RAND_pseudo_bytes.3=RAND_bytes.3 -s none /opt/csw/share/man/man3/RAND_screen.3=RAND_add.3 -s none /opt/csw/share/man/man3/RAND_seed.3=RAND_add.3 -f none /opt/csw/share/man/man3/RAND_set_rand_method.3 0644 root bin -s none /opt/csw/share/man/man3/RAND_status.3=RAND_add.3 -s none /opt/csw/share/man/man3/RAND_write_file.3=RAND_load_file.3 -s none /opt/csw/share/man/man3/RC4.3=rc4.3 -s none /opt/csw/share/man/man3/RC4_set_key.3=rc4.3 -s none /opt/csw/share/man/man3/RIPEMD160.3=ripemd.3 -s none /opt/csw/share/man/man3/RIPEMD160_Final.3=ripemd.3 -s none /opt/csw/share/man/man3/RIPEMD160_Init.3=ripemd.3 -s none /opt/csw/share/man/man3/RIPEMD160_Update.3=ripemd.3 -s none /opt/csw/share/man/man3/RSA_PKCS1_SSLeay.3=RSA_set_method.3 -s none /opt/csw/share/man/man3/RSA_blinding_off.3=RSA_blinding_on.3 -f none /opt/csw/share/man/man3/RSA_blinding_on.3 0644 root bin -f none /opt/csw/share/man/man3/RSA_check_key.3 0644 root bin -s none /opt/csw/share/man/man3/RSA_flags.3=RSA_set_method.3 -s none /opt/csw/share/man/man3/RSA_free.3=RSA_new.3 -f none /opt/csw/share/man/man3/RSA_generate_key.3 0644 root bin -s none /opt/csw/share/man/man3/RSA_get_default_method.3=RSA_set_method.3 -s none /opt/csw/share/man/man3/RSA_get_ex_data.3=RSA_get_ex_new_index.3 -f none /opt/csw/share/man/man3/RSA_get_ex_new_index.3 0644 root bin -s none /opt/csw/share/man/man3/RSA_get_method.3=RSA_set_method.3 -f none /opt/csw/share/man/man3/RSA_new.3 0644 root bin -s none /opt/csw/share/man/man3/RSA_new_method.3=RSA_set_method.3 -s none /opt/csw/share/man/man3/RSA_null_method.3=RSA_set_method.3 -s none /opt/csw/share/man/man3/RSA_padding_add_PKCS1_OAEP.3=RSA_padding_add_PKCS1_type_1.3 -f none /opt/csw/share/man/man3/RSA_padding_add_PKCS1_type_1.3 0644 root bin -s none /opt/csw/share/man/man3/RSA_padding_add_PKCS1_type_2.3=RSA_padding_add_PKCS1_type_1.3 -s none /opt/csw/share/man/man3/RSA_padding_add_SSLv23.3=RSA_padding_add_PKCS1_type_1.3 -s none /opt/csw/share/man/man3/RSA_padding_add_none.3=RSA_padding_add_PKCS1_type_1.3 -s none /opt/csw/share/man/man3/RSA_padding_check_PKCS1_OAEP.3=RSA_padding_add_PKCS1_type_1.3 -s none /opt/csw/share/man/man3/RSA_padding_check_PKCS1_type_1.3=RSA_padding_add_PKCS1_type_1.3 -s none /opt/csw/share/man/man3/RSA_padding_check_PKCS1_type_2.3=RSA_padding_add_PKCS1_type_1.3 -s none /opt/csw/share/man/man3/RSA_padding_check_SSLv23.3=RSA_padding_add_PKCS1_type_1.3 -s none /opt/csw/share/man/man3/RSA_padding_check_none.3=RSA_padding_add_PKCS1_type_1.3 -f none /opt/csw/share/man/man3/RSA_print.3 0644 root bin -s none /opt/csw/share/man/man3/RSA_print_fp.3=RSA_print.3 -s none /opt/csw/share/man/man3/RSA_private_decrypt.3=RSA_public_encrypt.3 -f none /opt/csw/share/man/man3/RSA_private_encrypt.3 0644 root bin -s none /opt/csw/share/man/man3/RSA_public_decrypt.3=RSA_private_encrypt.3 -f none /opt/csw/share/man/man3/RSA_public_encrypt.3 0644 root bin -s none /opt/csw/share/man/man3/RSA_set_default_method.3=RSA_set_method.3 -s none /opt/csw/share/man/man3/RSA_set_ex_data.3=RSA_get_ex_new_index.3 -f none /opt/csw/share/man/man3/RSA_set_method.3 0644 root bin -f none /opt/csw/share/man/man3/RSA_sign.3 0644 root bin -f none /opt/csw/share/man/man3/RSA_sign_ASN1_OCTET_STRING.3 0644 root bin -f none /opt/csw/share/man/man3/RSA_size.3 0644 root bin -s none /opt/csw/share/man/man3/RSA_verify.3=RSA_sign.3 -s none /opt/csw/share/man/man3/RSA_verify_ASN1_OCTET_STRING.3=RSA_sign_ASN1_OCTET_STRING.3 -s none /opt/csw/share/man/man3/SHA1.3=sha.3 -s none /opt/csw/share/man/man3/SHA1_Final.3=sha.3 -s none /opt/csw/share/man/man3/SHA1_Init.3=sha.3 -s none /opt/csw/share/man/man3/SHA1_Update.3=sha.3 -f none /opt/csw/share/man/man3/SMIME_read_PKCS7.3 0644 root bin -f none /opt/csw/share/man/man3/SMIME_write_PKCS7.3 0644 root bin -s none /opt/csw/share/man/man3/SSL.3=ssl.3 -s none /opt/csw/share/man/man3/SSL_CIPHER_description.3=SSL_CIPHER_get_name.3 -s none /opt/csw/share/man/man3/SSL_CIPHER_get_bits.3=SSL_CIPHER_get_name.3 -f none /opt/csw/share/man/man3/SSL_CIPHER_get_name.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CIPHER_get_version.3=SSL_CIPHER_get_name.3 -f none /opt/csw/share/man/man3/SSL_COMP_add_compression_method.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_add_client_CA.3=SSL_CTX_set_client_CA_list.3 -f none /opt/csw/share/man/man3/SSL_CTX_add_extra_chain_cert.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_add_session.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_callback_ctrl.3=SSL_CTX_ctrl.3 -s none /opt/csw/share/man/man3/SSL_CTX_check_private_key.3=SSL_CTX_use_certificate.3 -f none /opt/csw/share/man/man3/SSL_CTX_ctrl.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_flush_sessions.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_free.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_get_cert_store.3=SSL_CTX_set_cert_store.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_client_CA_list.3=SSL_get_client_CA_list.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_client_cert_cb.3=SSL_CTX_set_client_cert_cb.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_ex_data.3=SSL_CTX_get_ex_new_index.3 -f none /opt/csw/share/man/man3/SSL_CTX_get_ex_new_index.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_get_info_callback.3=SSL_CTX_set_info_callback.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_max_cert_list.3=SSL_CTX_set_max_cert_list.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_mode.3=SSL_CTX_set_mode.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_options.3=SSL_CTX_set_options.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_quiet_shutdown.3=SSL_CTX_set_quiet_shutdown.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_session_cache_mode.3=SSL_CTX_set_session_cache_mode.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_timeout.3=SSL_CTX_set_timeout.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_verify_callback.3=SSL_CTX_get_verify_mode.3 -s none /opt/csw/share/man/man3/SSL_CTX_get_verify_depth.3=SSL_CTX_get_verify_mode.3 -f none /opt/csw/share/man/man3/SSL_CTX_get_verify_mode.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_load_verify_locations.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_need_tmp_rsa.3=SSL_CTX_set_tmp_rsa_callback.3 -f none /opt/csw/share/man/man3/SSL_CTX_new.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_remove_session.3=SSL_CTX_add_session.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_accept.3=SSL_CTX_sess_number.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_accept_good.3=SSL_CTX_sess_number.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_accept_renegotiate.3=SSL_CTX_sess_number.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_cache_full.3=SSL_CTX_sess_number.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_cb_hits.3=SSL_CTX_sess_number.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_connect.3=SSL_CTX_sess_number.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_connect_good.3=SSL_CTX_sess_number.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_connect_renegotiate.3=SSL_CTX_sess_number.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_get_cache_size.3=SSL_CTX_sess_set_cache_size.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_get_get_cb.3=SSL_CTX_sess_set_get_cb.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_get_new_cb.3=SSL_CTX_sess_set_get_cb.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_get_remove_cb.3=SSL_CTX_sess_set_get_cb.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_hits.3=SSL_CTX_sess_number.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_misses.3=SSL_CTX_sess_number.3 -f none /opt/csw/share/man/man3/SSL_CTX_sess_number.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_sess_set_cache_size.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_sess_set_get_cb.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_sess_set_new_cb.3=SSL_CTX_sess_set_get_cb.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_set_remove_cb.3=SSL_CTX_sess_set_get_cb.3 -s none /opt/csw/share/man/man3/SSL_CTX_sess_timeouts.3=SSL_CTX_sess_number.3 -f none /opt/csw/share/man/man3/SSL_CTX_sessions.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_cert_store.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_cert_verify_callback.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_cipher_list.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_client_CA_list.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_client_cert_cb.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_default_passwd_cb.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_set_default_passwd_cb_userdata.3=SSL_CTX_set_default_passwd_cb.3 -s none /opt/csw/share/man/man3/SSL_CTX_set_ex_data.3=SSL_CTX_get_ex_new_index.3 -f none /opt/csw/share/man/man3/SSL_CTX_set_generate_session_id.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_info_callback.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_max_cert_list.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_mode.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_msg_callback.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_set_msg_callback_arg.3=SSL_CTX_set_msg_callback.3 -f none /opt/csw/share/man/man3/SSL_CTX_set_options.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_quiet_shutdown.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_session_cache_mode.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_session_id_context.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_ssl_version.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_timeout.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_set_tmp_dh.3=SSL_CTX_set_tmp_dh_callback.3 -f none /opt/csw/share/man/man3/SSL_CTX_set_tmp_dh_callback.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_set_tmp_rsa.3=SSL_CTX_set_tmp_rsa_callback.3 -f none /opt/csw/share/man/man3/SSL_CTX_set_tmp_rsa_callback.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_CTX_set_verify.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_set_verify_depth.3=SSL_CTX_set_verify.3 -s none /opt/csw/share/man/man3/SSL_CTX_use_PrivateKey.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_CTX_use_PrivateKey_ASN1.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_CTX_use_PrivateKey_file.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_CTX_use_RSAPrivateKey.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_CTX_use_RSAPrivateKey_ASN1.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_CTX_use_RSAPrivateKey_file.3=SSL_CTX_use_certificate.3 -f none /opt/csw/share/man/man3/SSL_CTX_use_certificate.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_CTX_use_certificate_ASN1.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_CTX_use_certificate_chain_file.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_CTX_use_certificate_file.3=SSL_CTX_use_certificate.3 -f none /opt/csw/share/man/man3/SSL_SESSION_free.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_SESSION_get_ex_data.3=SSL_SESSION_get_ex_new_index.3 -f none /opt/csw/share/man/man3/SSL_SESSION_get_ex_new_index.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_SESSION_get_time.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_SESSION_get_timeout.3=SSL_SESSION_get_time.3 -s none /opt/csw/share/man/man3/SSL_SESSION_set_ex_data.3=SSL_SESSION_get_ex_new_index.3 -s none /opt/csw/share/man/man3/SSL_SESSION_set_time.3=SSL_SESSION_get_time.3 -f none /opt/csw/share/man/man3/SSL_accept.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_add_client_CA.3=SSL_CTX_set_client_CA_list.3 -s none /opt/csw/share/man/man3/SSL_add_session.3=SSL_CTX_add_session.3 -s none /opt/csw/share/man/man3/SSL_alert_desc_string.3=SSL_alert_type_string.3 -s none /opt/csw/share/man/man3/SSL_alert_desc_string_long.3=SSL_alert_type_string.3 -f none /opt/csw/share/man/man3/SSL_alert_type_string.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_alert_type_string_long.3=SSL_alert_type_string.3 -s none /opt/csw/share/man/man3/SSL_callback_ctrl.3=SSL_CTX_ctrl.3 -s none /opt/csw/share/man/man3/SSL_check_private_key.3=SSL_CTX_use_certificate.3 -f none /opt/csw/share/man/man3/SSL_clear.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_connect.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_ctrl.3=SSL_CTX_ctrl.3 -f none /opt/csw/share/man/man3/SSL_do_handshake.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_flush_sessions.3=SSL_CTX_flush_sessions.3 -f none /opt/csw/share/man/man3/SSL_free.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_SSL_CTX.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_get_accept_state.3=SSL_set_connect_state.3 -s none /opt/csw/share/man/man3/SSL_get_cipher.3=SSL_get_current_cipher.3 -s none /opt/csw/share/man/man3/SSL_get_cipher_bits.3=SSL_get_current_cipher.3 -s none /opt/csw/share/man/man3/SSL_get_cipher_list.3=SSL_get_ciphers.3 -s none /opt/csw/share/man/man3/SSL_get_cipher_name.3=SSL_get_current_cipher.3 -s none /opt/csw/share/man/man3/SSL_get_cipher_version.3=SSL_get_current_cipher.3 -f none /opt/csw/share/man/man3/SSL_get_ciphers.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_client_CA_list.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_current_cipher.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_default_timeout.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_error.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_get_ex_data.3=SSL_get_ex_new_index.3 -f none /opt/csw/share/man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_ex_new_index.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_fd.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_get_info_callback.3=SSL_CTX_set_info_callback.3 -s none /opt/csw/share/man/man3/SSL_get_max_cert_list.3=SSL_CTX_set_max_cert_list.3 -s none /opt/csw/share/man/man3/SSL_get_mode.3=SSL_CTX_set_mode.3 -s none /opt/csw/share/man/man3/SSL_get_msg_callback_arg.3=SSL_CTX_set_msg_callback.3 -s none /opt/csw/share/man/man3/SSL_get_options.3=SSL_CTX_set_options.3 -f none /opt/csw/share/man/man3/SSL_get_peer_cert_chain.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_peer_certificate.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_get_quiet_shutdown.3=SSL_CTX_set_quiet_shutdown.3 -f none /opt/csw/share/man/man3/SSL_get_rbio.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_session.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_get_shutdown.3=SSL_set_shutdown.3 -s none /opt/csw/share/man/man3/SSL_get_ssl_method.3=SSL_CTX_set_ssl_version.3 -s none /opt/csw/share/man/man3/SSL_get_verify_callback.3=SSL_CTX_get_verify_mode.3 -s none /opt/csw/share/man/man3/SSL_get_verify_depth.3=SSL_CTX_get_verify_mode.3 -s none /opt/csw/share/man/man3/SSL_get_verify_mode.3=SSL_CTX_get_verify_mode.3 -f none /opt/csw/share/man/man3/SSL_get_verify_result.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_get_version.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_has_matching_session_id.3=SSL_CTX_set_generate_session_id.3 -f none /opt/csw/share/man/man3/SSL_library_init.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_load_client_CA_file.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_load_error_strings.3=ERR_load_crypto_strings.3 -s none /opt/csw/share/man/man3/SSL_need_tmp_rsa.3=SSL_CTX_set_tmp_rsa_callback.3 -f none /opt/csw/share/man/man3/SSL_new.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_pending.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_read.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_remove_session.3=SSL_CTX_add_session.3 -f none /opt/csw/share/man/man3/SSL_rstate_string.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_rstate_string_long.3=SSL_rstate_string.3 -f none /opt/csw/share/man/man3/SSL_session_reused.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_set_bio.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_set_cipher_list.3=SSL_CTX_set_cipher_list.3 -s none /opt/csw/share/man/man3/SSL_set_client_CA_list.3=SSL_CTX_set_client_CA_list.3 -f none /opt/csw/share/man/man3/SSL_set_connect_state.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_set_ex_data.3=SSL_get_ex_new_index.3 -f none /opt/csw/share/man/man3/SSL_set_fd.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_set_generate_session_id.3=SSL_CTX_set_generate_session_id.3 -s none /opt/csw/share/man/man3/SSL_set_info_callback.3=SSL_CTX_set_info_callback.3 -s none /opt/csw/share/man/man3/SSL_set_max_cert_list.3=SSL_CTX_set_max_cert_list.3 -s none /opt/csw/share/man/man3/SSL_set_mode.3=SSL_CTX_set_mode.3 -s none /opt/csw/share/man/man3/SSL_set_msg_callback.3=SSL_CTX_set_msg_callback.3 -s none /opt/csw/share/man/man3/SSL_set_options.3=SSL_CTX_set_options.3 -s none /opt/csw/share/man/man3/SSL_set_quiet_shutdown.3=SSL_CTX_set_quiet_shutdown.3 -f none /opt/csw/share/man/man3/SSL_set_session.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_set_session_id_context.3=SSL_CTX_set_session_id_context.3 -f none /opt/csw/share/man/man3/SSL_set_shutdown.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_set_ssl_method.3=SSL_CTX_set_ssl_version.3 -s none /opt/csw/share/man/man3/SSL_set_tmp_dh.3=SSL_CTX_set_tmp_dh_callback.3 -s none /opt/csw/share/man/man3/SSL_set_tmp_dh_callback.3=SSL_CTX_set_tmp_dh_callback.3 -s none /opt/csw/share/man/man3/SSL_set_tmp_rsa.3=SSL_CTX_set_tmp_rsa_callback.3 -s none /opt/csw/share/man/man3/SSL_set_tmp_rsa_callback.3=SSL_CTX_set_tmp_rsa_callback.3 -s none /opt/csw/share/man/man3/SSL_set_verify.3=SSL_CTX_set_verify.3 -s none /opt/csw/share/man/man3/SSL_set_verify_depth.3=SSL_CTX_set_verify.3 -f none /opt/csw/share/man/man3/SSL_set_verify_result.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_shutdown.3 0644 root bin -f none /opt/csw/share/man/man3/SSL_state_string.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_state_string_long.3=SSL_state_string.3 -s none /opt/csw/share/man/man3/SSL_use_PrivateKey.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_use_PrivateKey_ASN1.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_use_PrivateKey_file.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_use_RSAPrivateKey.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_use_RSAPrivateKey_ASN1.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_use_RSAPrivateKey_file.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_use_certificate.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_use_certificate_ASN1.3=SSL_CTX_use_certificate.3 -s none /opt/csw/share/man/man3/SSL_use_certificate_file.3=SSL_CTX_use_certificate.3 -f none /opt/csw/share/man/man3/SSL_want.3 0644 root bin -s none /opt/csw/share/man/man3/SSL_want_nothing.3=SSL_want.3 -s none /opt/csw/share/man/man3/SSL_want_read.3=SSL_want.3 -s none /opt/csw/share/man/man3/SSL_want_write.3=SSL_want.3 -s none /opt/csw/share/man/man3/SSL_want_x509_lookup.3=SSL_want.3 -f none /opt/csw/share/man/man3/SSL_write.3 0644 root bin -s none /opt/csw/share/man/man3/SSLeay.3=OPENSSL_VERSION_NUMBER.3 -s none /opt/csw/share/man/man3/SSLeay_add_ssl_algorithms.3=SSL_library_init.3 -s none /opt/csw/share/man/man3/SSLeay_version.3=OPENSSL_VERSION_NUMBER.3 -s none /opt/csw/share/man/man3/UI_OpenSSL.3=ui.3 -s none /opt/csw/share/man/man3/UI_add_error_string.3=ui.3 -s none /opt/csw/share/man/man3/UI_add_info_string.3=ui.3 -s none /opt/csw/share/man/man3/UI_add_input_boolean.3=ui.3 -s none /opt/csw/share/man/man3/UI_add_input_string.3=ui.3 -s none /opt/csw/share/man/man3/UI_add_user_data.3=ui.3 -s none /opt/csw/share/man/man3/UI_add_verify_string.3=ui.3 -s none /opt/csw/share/man/man3/UI_construct_prompt.3=ui.3 -s none /opt/csw/share/man/man3/UI_ctrl.3=ui.3 -s none /opt/csw/share/man/man3/UI_dup_error_string.3=ui.3 -s none /opt/csw/share/man/man3/UI_dup_info_string.3=ui.3 -s none /opt/csw/share/man/man3/UI_dup_input_boolean.3=ui.3 -s none /opt/csw/share/man/man3/UI_dup_input_string.3=ui.3 -s none /opt/csw/share/man/man3/UI_dup_verify_string.3=ui.3 -s none /opt/csw/share/man/man3/UI_free.3=ui.3 -s none /opt/csw/share/man/man3/UI_get0_result.3=ui.3 -s none /opt/csw/share/man/man3/UI_get0_user_data.3=ui.3 -s none /opt/csw/share/man/man3/UI_get_default_method.3=ui.3 -s none /opt/csw/share/man/man3/UI_get_method.3=ui.3 -s none /opt/csw/share/man/man3/UI_new.3=ui.3 -s none /opt/csw/share/man/man3/UI_new_method.3=ui.3 -s none /opt/csw/share/man/man3/UI_process.3=ui.3 -s none /opt/csw/share/man/man3/UI_set_default_method.3=ui.3 -s none /opt/csw/share/man/man3/UI_set_method.3=ui.3 -s none /opt/csw/share/man/man3/X509_NAME_ENTRY_create_by_NID.3=X509_NAME_ENTRY_get_object.3 -s none /opt/csw/share/man/man3/X509_NAME_ENTRY_create_by_OBJ.3=X509_NAME_ENTRY_get_object.3 -s none /opt/csw/share/man/man3/X509_NAME_ENTRY_create_by_txt.3=X509_NAME_ENTRY_get_object.3 -s none /opt/csw/share/man/man3/X509_NAME_ENTRY_get_data.3=X509_NAME_ENTRY_get_object.3 -f none /opt/csw/share/man/man3/X509_NAME_ENTRY_get_object.3 0644 root bin -s none /opt/csw/share/man/man3/X509_NAME_ENTRY_set_data.3=X509_NAME_ENTRY_get_object.3 -s none /opt/csw/share/man/man3/X509_NAME_ENTRY_set_object.3=X509_NAME_ENTRY_get_object.3 -s none /opt/csw/share/man/man3/X509_NAME_add_entry.3=X509_NAME_add_entry_by_txt.3 -s none /opt/csw/share/man/man3/X509_NAME_add_entry_by_NID.3=X509_NAME_add_entry_by_txt.3 -s none /opt/csw/share/man/man3/X509_NAME_add_entry_by_OBJ.3=X509_NAME_add_entry_by_txt.3 -f none /opt/csw/share/man/man3/X509_NAME_add_entry_by_txt.3 0644 root bin -s none /opt/csw/share/man/man3/X509_NAME_delete_entry.3=X509_NAME_add_entry_by_txt.3 -s none /opt/csw/share/man/man3/X509_NAME_entry_count.3=X509_NAME_get_index_by_NID.3 -s none /opt/csw/share/man/man3/X509_NAME_get_entry.3=X509_NAME_get_index_by_NID.3 -f none /opt/csw/share/man/man3/X509_NAME_get_index_by_NID.3 0644 root bin -s none /opt/csw/share/man/man3/X509_NAME_get_index_by_OBJ.3=X509_NAME_get_index_by_NID.3 -s none /opt/csw/share/man/man3/X509_NAME_get_text_by_NID.3=X509_NAME_get_index_by_NID.3 -s none /opt/csw/share/man/man3/X509_NAME_get_text_by_OBJ.3=X509_NAME_get_index_by_NID.3 -s none /opt/csw/share/man/man3/X509_NAME_oneline.3=X509_NAME_print_ex.3 -s none /opt/csw/share/man/man3/X509_NAME_print.3=X509_NAME_print_ex.3 -f none /opt/csw/share/man/man3/X509_NAME_print_ex.3 0644 root bin -s none /opt/csw/share/man/man3/X509_NAME_print_ex_fp.3=X509_NAME_print_ex.3 -s none /opt/csw/share/man/man3/X509_free.3=X509_new.3 -f none /opt/csw/share/man/man3/X509_new.3 0644 root bin -f none /opt/csw/share/man/man3/bio.3 0644 root bin -f none /opt/csw/share/man/man3/blowfish.3 0644 root bin -f none /opt/csw/share/man/man3/bn.3 0644 root bin -s none /opt/csw/share/man/man3/bn_add_words.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_check_top.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_cmp_words.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_div_words.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_dump.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_expand.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_expand2.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_fix_top.3=bn_internal.3 -f none /opt/csw/share/man/man3/bn_internal.3 0644 root bin -s none /opt/csw/share/man/man3/bn_mul_add_words.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_mul_comba4.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_mul_comba8.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_mul_high.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_mul_low_normal.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_mul_low_recursive.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_mul_normal.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_mul_part_recursive.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_mul_recursive.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_mul_words.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_print.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_set_high.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_set_low.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_set_max.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_sqr_comba4.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_sqr_comba8.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_sqr_normal.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_sqr_recursive.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_sqr_words.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_sub_words.3=bn_internal.3 -s none /opt/csw/share/man/man3/bn_wexpand.3=bn_internal.3 -f none /opt/csw/share/man/man3/buffer.3 0644 root bin -f none /opt/csw/share/man/man3/crypto.3 0644 root bin -s none /opt/csw/share/man/man3/d2i_509_CRL_fp.3=d2i_X509_CRL.3 -f none /opt/csw/share/man/man3/d2i_ASN1_OBJECT.3 0644 root bin -f none /opt/csw/share/man/man3/d2i_DHparams.3 0644 root bin -s none /opt/csw/share/man/man3/d2i_DSAPrivateKey.3=d2i_DSAPublicKey.3 -f none /opt/csw/share/man/man3/d2i_DSAPublicKey.3 0644 root bin -s none /opt/csw/share/man/man3/d2i_DSA_PUBKEY.3=d2i_DSAPublicKey.3 -s none /opt/csw/share/man/man3/d2i_DSA_SIG.3=d2i_DSAPublicKey.3 -s none /opt/csw/share/man/man3/d2i_Netscape_RSA.3=d2i_RSAPublicKey.3 -f none /opt/csw/share/man/man3/d2i_PKCS8PrivateKey.3 0644 root bin -s none /opt/csw/share/man/man3/d2i_PKCS8PrivateKey_bio.3=d2i_PKCS8PrivateKey.3 -s none /opt/csw/share/man/man3/d2i_PKCS8PrivateKey_fp.3=d2i_PKCS8PrivateKey.3 -s none /opt/csw/share/man/man3/d2i_RSAPrivateKey.3=d2i_RSAPublicKey.3 -f none /opt/csw/share/man/man3/d2i_RSAPublicKey.3 0644 root bin -s none /opt/csw/share/man/man3/d2i_RSA_PUBKEY.3=d2i_RSAPublicKey.3 -f none /opt/csw/share/man/man3/d2i_SSL_SESSION.3 0644 root bin -f none /opt/csw/share/man/man3/d2i_X509.3 0644 root bin -f none /opt/csw/share/man/man3/d2i_X509_ALGOR.3 0644 root bin -f none /opt/csw/share/man/man3/d2i_X509_CRL.3 0644 root bin -s none /opt/csw/share/man/man3/d2i_X509_CRL_bio.3=d2i_X509_CRL.3 -f none /opt/csw/share/man/man3/d2i_X509_NAME.3 0644 root bin -f none /opt/csw/share/man/man3/d2i_X509_REQ.3 0644 root bin -s none /opt/csw/share/man/man3/d2i_X509_REQ_bio.3=d2i_X509_REQ.3 -s none /opt/csw/share/man/man3/d2i_X509_REQ_fp.3=d2i_X509_REQ.3 -f none /opt/csw/share/man/man3/d2i_X509_SIG.3 0644 root bin -s none /opt/csw/share/man/man3/d2i_X509_bio.3=d2i_X509.3 -s none /opt/csw/share/man/man3/d2i_X509_fp.3=d2i_X509.3 -f none /opt/csw/share/man/man3/des.3 0644 root bin -s none /opt/csw/share/man/man3/des_read_2passwords.3=ui_compat.3 -s none /opt/csw/share/man/man3/des_read_password.3=ui_compat.3 -s none /opt/csw/share/man/man3/des_read_pw.3=ui_compat.3 -s none /opt/csw/share/man/man3/des_read_pw_string.3=ui_compat.3 -f none /opt/csw/share/man/man3/dh.3 0644 root bin -f none /opt/csw/share/man/man3/dsa.3 0644 root bin -f none /opt/csw/share/man/man3/ecdsa.3 0644 root bin -f none /opt/csw/share/man/man3/engine.3 0644 root bin -f none /opt/csw/share/man/man3/err.3 0644 root bin -f none /opt/csw/share/man/man3/evp.3 0644 root bin -f none /opt/csw/share/man/man3/hmac.3 0644 root bin -s none /opt/csw/share/man/man3/i2d_ASN1_OBJECT.3=d2i_ASN1_OBJECT.3 -s none /opt/csw/share/man/man3/i2d_DHparams.3=d2i_DHparams.3 -s none /opt/csw/share/man/man3/i2d_DSAPrivateKey.3=d2i_DSAPublicKey.3 -s none /opt/csw/share/man/man3/i2d_DSAPublicKey.3=d2i_DSAPublicKey.3 -s none /opt/csw/share/man/man3/i2d_DSA_PUBKEY.3=d2i_DSAPublicKey.3 -s none /opt/csw/share/man/man3/i2d_DSA_SIG.3=d2i_DSAPublicKey.3 -s none /opt/csw/share/man/man3/i2d_Netscape_RSA.3=d2i_RSAPublicKey.3 -s none /opt/csw/share/man/man3/i2d_PKCS8PrivateKey_bio.3=d2i_PKCS8PrivateKey.3 -s none /opt/csw/share/man/man3/i2d_PKCS8PrivateKey_fp.3=d2i_PKCS8PrivateKey.3 -s none /opt/csw/share/man/man3/i2d_PKCS8PrivateKey_nid_bio.3=d2i_PKCS8PrivateKey.3 -s none /opt/csw/share/man/man3/i2d_PKCS8PrivateKey_nid_fp.3=d2i_PKCS8PrivateKey.3 -s none /opt/csw/share/man/man3/i2d_RSAPrivateKey.3=d2i_RSAPublicKey.3 -s none /opt/csw/share/man/man3/i2d_RSAPublicKey.3=d2i_RSAPublicKey.3 -s none /opt/csw/share/man/man3/i2d_RSA_PUBKEY.3=d2i_RSAPublicKey.3 -s none /opt/csw/share/man/man3/i2d_SSL_SESSION.3=d2i_SSL_SESSION.3 -s none /opt/csw/share/man/man3/i2d_X509.3=d2i_X509.3 -s none /opt/csw/share/man/man3/i2d_X509_ALGOR.3=d2i_X509_ALGOR.3 -s none /opt/csw/share/man/man3/i2d_X509_CRL.3=d2i_X509_CRL.3 -s none /opt/csw/share/man/man3/i2d_X509_CRL_bio.3=d2i_X509_CRL.3 -s none /opt/csw/share/man/man3/i2d_X509_CRL_fp.3=d2i_X509_CRL.3 -s none /opt/csw/share/man/man3/i2d_X509_NAME.3=d2i_X509_NAME.3 -s none /opt/csw/share/man/man3/i2d_X509_REQ.3=d2i_X509_REQ.3 -s none /opt/csw/share/man/man3/i2d_X509_REQ_bio.3=d2i_X509_REQ.3 -s none /opt/csw/share/man/man3/i2d_X509_REQ_fp.3=d2i_X509_REQ.3 -s none /opt/csw/share/man/man3/i2d_X509_SIG.3=d2i_X509_SIG.3 -s none /opt/csw/share/man/man3/i2d_X509_bio.3=d2i_X509.3 -s none /opt/csw/share/man/man3/i2d_X509_fp.3=d2i_X509.3 -s none /opt/csw/share/man/man3/lh_delete.3=lhash.3 -s none /opt/csw/share/man/man3/lh_doall.3=lhash.3 -s none /opt/csw/share/man/man3/lh_doall_arg.3=lhash.3 -s none /opt/csw/share/man/man3/lh_error.3=lhash.3 -s none /opt/csw/share/man/man3/lh_free.3=lhash.3 -s none /opt/csw/share/man/man3/lh_insert.3=lhash.3 -s none /opt/csw/share/man/man3/lh_new.3=lhash.3 -s none /opt/csw/share/man/man3/lh_node_stats.3=lh_stats.3 -s none /opt/csw/share/man/man3/lh_node_stats_bio.3=lh_stats.3 -s none /opt/csw/share/man/man3/lh_node_usage_stats.3=lh_stats.3 -s none /opt/csw/share/man/man3/lh_node_usage_stats_bio.3=lh_stats.3 -s none /opt/csw/share/man/man3/lh_retrieve.3=lhash.3 -f none /opt/csw/share/man/man3/lh_stats.3 0644 root bin -s none /opt/csw/share/man/man3/lh_stats_bio.3=lh_stats.3 -f none /opt/csw/share/man/man3/lhash.3 0644 root bin -f none /opt/csw/share/man/man3/md5.3 0644 root bin -f none /opt/csw/share/man/man3/mdc2.3 0644 root bin -f none /opt/csw/share/man/man3/pem.3 0644 root bin -f none /opt/csw/share/man/man3/rand.3 0644 root bin -f none /opt/csw/share/man/man3/rc4.3 0644 root bin -f none /opt/csw/share/man/man3/ripemd.3 0644 root bin -f none /opt/csw/share/man/man3/rsa.3 0644 root bin -f none /opt/csw/share/man/man3/sha.3 0644 root bin -f none /opt/csw/share/man/man3/ssl.3 0644 root bin -f none /opt/csw/share/man/man3/threads.3 0644 root bin -f none /opt/csw/share/man/man3/ui.3 0644 root bin -f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin -f none /opt/csw/share/man/man3/x509.3 0644 root bin -f none /opt/csw/share/doc/openssl_devel/changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_devel/license 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay 644 root bin -f none /opt/csw/share/doc/openssl_devel/PROBLEMS 644 root bin -f none /opt/csw/share/doc/openssl_devel/README 644 root bin -f none /opt/csw/share/doc/openssl_devel/FAQ 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ASN1 644 root bin -f none /opt/csw/share/doc/openssl_devel/INSTALL 644 root bin -f none /opt/csw/share/doc/openssl_devel/NEWS 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin -i checkpkg_override=checkpkg_override.CSWossldevel -i copyright=CSWossldevel.copyright -i depend=CSWossldevel.depend -i pkginfo=CSWossldevel.pkginfo Deleted: csw/mgar/pkg/openssl/branches/split/files/CSWossldevel.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/branches/split/files/CSWossldevel.prototype-sparc 2011-10-12 13:06:45 UTC (rev 15909) +++ csw/mgar/pkg/openssl/branches/split/files/CSWossldevel.prototype-sparc 2011-10-12 13:09:45 UTC (rev 15910) @@ -1,1060 +0,0 @@ -d none /opt/csw/include/openssl 0755 root bin -f none /opt/csw/include/openssl/aes.h 0644 root bin -f none /opt/csw/include/openssl/asn1.h 0644 root bin -f none /opt/csw/include/openssl/asn1_mac.h 0644 root bin -f none /opt/csw/include/openssl/asn1t.h 0644 root bin -f none /opt/csw/include/openssl/bio.h 0644 root bin -f none /opt/csw/include/openssl/blowfish.h 0644 root bin -f none /opt/csw/include/openssl/bn.h 0644 root bin -f none /opt/csw/include/openssl/buffer.h 0644 root bin -f none /opt/csw/include/openssl/cast.h 0644 root bin -f none /opt/csw/include/openssl/comp.h 0644 root bin -f none /opt/csw/include/openssl/conf.h 0644 root bin -f none /opt/csw/include/openssl/conf_api.h 0644 root bin -f none /opt/csw/include/openssl/crypto.h 0644 root bin -f none /opt/csw/include/openssl/des.h 0644 root bin -f none /opt/csw/include/openssl/des_old.h 0644 root bin -f none /opt/csw/include/openssl/dh.h 0644 root bin -f none /opt/csw/include/openssl/dsa.h 0644 root bin -f none /opt/csw/include/openssl/dso.h 0644 root bin -f none /opt/csw/include/openssl/dtls1.h 0644 root bin -f none /opt/csw/include/openssl/e_os2.h 0644 root bin -f none /opt/csw/include/openssl/ebcdic.h 0644 root bin -f none /opt/csw/include/openssl/ec.h 0644 root bin -f none /opt/csw/include/openssl/ecdh.h 0644 root bin -f none /opt/csw/include/openssl/ecdsa.h 0644 root bin -f none /opt/csw/include/openssl/engine.h 0644 root bin -f none /opt/csw/include/openssl/err.h 0644 root bin -f none /opt/csw/include/openssl/evp.h 0644 root bin -f none /opt/csw/include/openssl/hmac.h 0644 root bin -f none /opt/csw/include/openssl/idea.h 0644 root bin -f none /opt/csw/include/openssl/krb5_asn.h 0644 root bin -f none /opt/csw/include/openssl/kssl.h 0644 root bin -f none /opt/csw/include/openssl/lhash.h 0644 root bin -f none /opt/csw/include/openssl/md2.h 0644 root bin -f none /opt/csw/include/openssl/md4.h 0644 root bin -f none /opt/csw/include/openssl/md5.h 0644 root bin -f none /opt/csw/include/openssl/obj_mac.h 0644 root bin -f none /opt/csw/include/openssl/objects.h 0644 root bin -f none /opt/csw/include/openssl/ocsp.h 0644 root bin -f none /opt/csw/include/openssl/opensslconf.h 0644 root bin -f none /opt/csw/include/openssl/opensslv.h 0644 root bin -f none /opt/csw/include/openssl/ossl_typ.h 0644 root bin -f none /opt/csw/include/openssl/pem.h 0644 root bin -f none /opt/csw/include/openssl/pem2.h 0644 root bin -f none /opt/csw/include/openssl/pkcs12.h 0644 root bin -f none /opt/csw/include/openssl/pkcs7.h 0644 root bin -f none /opt/csw/include/openssl/pq_compat.h 0644 root bin -f none /opt/csw/include/openssl/pqueue.h 0644 root bin -f none /opt/csw/include/openssl/rand.h 0644 root bin -f none /opt/csw/include/openssl/rc2.h 0644 root bin -f none /opt/csw/include/openssl/rc4.h 0644 root bin -f none /opt/csw/include/openssl/ripemd.h 0644 root bin -f none /opt/csw/include/openssl/rsa.h 0644 root bin -f none /opt/csw/include/openssl/safestack.h 0644 root bin -f none /opt/csw/include/openssl/sha.h 0644 root bin -f none /opt/csw/include/openssl/ssl.h 0644 root bin -f none /opt/csw/include/openssl/ssl2.h 0644 root bin -f none /opt/csw/include/openssl/ssl23.h 0644 root bin -f none /opt/csw/include/openssl/ssl3.h 0644 root bin -f none /opt/csw/include/openssl/stack.h 0644 root bin -f none /opt/csw/include/openssl/store.h 0644 root bin -f none /opt/csw/include/openssl/symhacks.h 0644 root bin -f none /opt/csw/include/openssl/tls1.h 0644 root bin -f none /opt/csw/include/openssl/tmdiff.h 0644 root bin -f none /opt/csw/include/openssl/txt_db.h 0644 root bin -f none /opt/csw/include/openssl/ui.h 0644 root bin -f none /opt/csw/include/openssl/ui_compat.h 0644 root bin -f none /opt/csw/include/openssl/x509.h 0644 root bin -f none /opt/csw/include/openssl/x509_vfy.h 0644 root bin -f none /opt/csw/include/openssl/x509v3.h 0644 root bin -f none /opt/csw/lib/libssl.a 0644 root bin -f none /opt/csw/lib/libcrypto.a 0644 root bin -s none /opt/csw/lib/libcrypto.so=libcrypto.so.0.9.8 -s none /opt/csw/lib/libssl.so=libssl.so.0.9.8 -f none /opt/csw/lib/sparcv8plus+vis/libcrypto.a 0644 root bin -f none /opt/csw/lib/sparcv8plus+vis/libssl.a 0644 root bin -f none /opt/csw/lib/sparcv9/libcrypto.a 0644 root bin -f none /opt/csw/lib/sparcv9/libssl.a 0644 root bin -s none /opt/csw/lib/sparcv9/libcrypto.so=libcrypto.so.0.9.8 -s none /opt/csw/lib/sparcv9/libssl.so=libssl.so.0.9.8 -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/libcrypto.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/libssl.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/openssl.pc 0644 root bin -d none /opt/csw/share/doc/openssl_devel 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -s none /opt/csw/share/man/man3/ASN1_OBJECT_free.3=ASN1_OBJECT_new.3 -f none /opt/csw/share/man/man3/ASN1_OBJECT_new.3 0644 root bin -s none /opt/csw/share/man/man3/ASN1_STRING_cmp.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_data.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_dup.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_free.3=ASN1_STRING_new.3 -f none /opt/csw/share/man/man3/ASN1_STRING_length.3 0644 root bin -s none /opt/csw/share/man/man3/ASN1_STRING_length_set.3=ASN1_STRING_length.3 -f none /opt/csw/share/man/man3/ASN1_STRING_new.3 0644 root bin -f none /opt/csw/share/man/man3/ASN1_STRING_print_ex.3 0644 root bin -s none /opt/csw/share/man/man3/ASN1_STRING_print_ex_fp.3=ASN1_STRING_print_ex.3 -s none /opt/csw/share/man/man3/ASN1_STRING_set.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_type.3=ASN1_STRING_length.3 -s none /opt/csw/share/man/man3/ASN1_STRING_type_new.3=ASN1_STRING_new.3 -f none /opt/csw/share/man/man3/ASN1_generate_nconf.3 0644 root bin -s none /opt/csw/share/man/man3/ASN1_generate_v3.3=ASN1_generate_nconf.3 -s none /opt/csw/share/man/man3/BF_cbc_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_cfb64_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_decrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_ecb_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_ofb64_encrypt.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_options.3=blowfish.3 -s none /opt/csw/share/man/man3/BF_set_key.3=blowfish.3 -s none /opt/csw/share/man/man3/BIO_append_filename.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_callback_ctrl.3=BIO_ctrl.3 -f none /opt/csw/share/man/man3/BIO_ctrl.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_ctrl_get_read_request.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_ctrl_get_write_guarantee.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_ctrl_pending.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_ctrl_reset_read_request.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_ctrl_wpending.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_debug_callback.3=BIO_set_callback.3 -s none /opt/csw/share/man/man3/BIO_destroy_bio_pair.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_do_accept.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_do_connect.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_eof.3=BIO_ctrl.3 -f none /opt/csw/share/man/man3/BIO_f_base64.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_buffer.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_cipher.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_md.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_null.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_f_ssl.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_find_type.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_flush.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_free.3=BIO_new.3 -s none /opt/csw/share/man/man3/BIO_free_all.3=BIO_new.3 -s none /opt/csw/share/man/man3/BIO_get_accept_port.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_get_bind_mode.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_get_callback.3=BIO_set_callback.3 -s none /opt/csw/share/man/man3/BIO_get_callback_arg.3=BIO_set_callback.3 -s none /opt/csw/share/man/man3/BIO_get_cipher_ctx.3=BIO_f_cipher.3 -s none /opt/csw/share/man/man3/BIO_get_cipher_status.3=BIO_f_cipher.3 -s none /opt/csw/share/man/man3/BIO_get_close.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_get_conn_hostname.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_get_conn_int_port.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_get_conn_ip.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_get_conn_port.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_get_fd.3=BIO_s_fd.3 -s none /opt/csw/share/man/man3/BIO_get_fp.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_get_info_callback.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_get_md.3=BIO_f_md.3 -s none /opt/csw/share/man/man3/BIO_get_md_ctx.3=BIO_f_md.3 -s none /opt/csw/share/man/man3/BIO_get_mem_data.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_get_mem_ptr.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_get_num_renegotiates.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_get_read_request.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_get_retry_BIO.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_get_retry_reason.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_get_ssl.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_get_write_buf_size.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_get_write_guarantee.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_gets.3=BIO_read.3 -s none /opt/csw/share/man/man3/BIO_int_ctrl.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_make_bio_pair.3=BIO_s_bio.3 -f none /opt/csw/share/man/man3/BIO_new.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_new_bio_pair.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_new_buffer_ssl_connect.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_new_fd.3=BIO_s_fd.3 -s none /opt/csw/share/man/man3/BIO_new_file.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_new_fp.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_new_mem_buf.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_new_socket.3=BIO_s_socket.3 -s none /opt/csw/share/man/man3/BIO_new_ssl.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_new_ssl_connect.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_next.3=BIO_find_type.3 -s none /opt/csw/share/man/man3/BIO_pending.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_pop.3=BIO_push.3 -s none /opt/csw/share/man/man3/BIO_ptr_ctrl.3=BIO_ctrl.3 -f none /opt/csw/share/man/man3/BIO_push.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_puts.3=BIO_read.3 -f none /opt/csw/share/man/man3/BIO_read.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_read_filename.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_reset.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_retry_type.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_rw_filename.3=BIO_s_file.3 -f none /opt/csw/share/man/man3/BIO_s_accept.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_bio.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_connect.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_fd.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_file.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_mem.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_null.3 0644 root bin -f none /opt/csw/share/man/man3/BIO_s_socket.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_seek.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_set.3=BIO_new.3 -s none /opt/csw/share/man/man3/BIO_set_accept_bios.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_set_accept_port.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_set_bind_mode.3=BIO_s_accept.3 -f none /opt/csw/share/man/man3/BIO_set_callback.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_set_callback_arg.3=BIO_set_callback.3 -s none /opt/csw/share/man/man3/BIO_set_cipher.3=BIO_f_cipher.3 -s none /opt/csw/share/man/man3/BIO_set_close.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_set_conn_hostname.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_conn_int_port.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_conn_ip.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_conn_port.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_fd.3=BIO_s_fd.3 -s none /opt/csw/share/man/man3/BIO_set_fp.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BIO_set_info_callback.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_set_md.3=BIO_f_md.3 -s none /opt/csw/share/man/man3/BIO_set_mem_buf.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_set_mem_eof_return.3=BIO_s_mem.3 -s none /opt/csw/share/man/man3/BIO_set_nbio.3=BIO_s_connect.3 -s none /opt/csw/share/man/man3/BIO_set_nbio_accept.3=BIO_s_accept.3 -s none /opt/csw/share/man/man3/BIO_set_ssl.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_set_ssl_mode.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_set_ssl_renegotiate_bytes.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_set_ssl_renegotiate_timeout.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_set_write_buf_size.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_should_io_special.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_should_read.3=BIO_should_retry.3 -f none /opt/csw/share/man/man3/BIO_should_retry.3 0644 root bin -s none /opt/csw/share/man/man3/BIO_should_write.3=BIO_should_retry.3 -s none /opt/csw/share/man/man3/BIO_shutdown_wr.3=BIO_s_bio.3 -s none /opt/csw/share/man/man3/BIO_ssl_copy_session_id.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_ssl_shutdown.3=BIO_f_ssl.3 -s none /opt/csw/share/man/man3/BIO_tell.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_vfree.3=BIO_new.3 -s none /opt/csw/share/man/man3/BIO_wpending.3=BIO_ctrl.3 -s none /opt/csw/share/man/man3/BIO_write.3=BIO_read.3 -s none /opt/csw/share/man/man3/BIO_write_filename.3=BIO_s_file.3 -s none /opt/csw/share/man/man3/BN_BLINDING_convert.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_convert_ex.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_create_param.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_free.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_get_flags.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_get_thread_id.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_invert.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_invert_ex.3=BN_BLINDING_new.3 -f none /opt/csw/share/man/man3/BN_BLINDING_new.3 0644 root bin -s none /opt/csw/share/man/man3/BN_BLINDING_set_flags.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_set_thread_id.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_BLINDING_update.3=BN_BLINDING_new.3 -s none /opt/csw/share/man/man3/BN_CTX_end.3=BN_CTX_start.3 -s none /opt/csw/share/man/man3/BN_CTX_free.3=BN_CTX_new.3 -s none /opt/csw/share/man/man3/BN_CTX_get.3=BN_CTX_start.3 -s none /opt/csw/share/man/man3/BN_CTX_init.3=BN_CTX_new.3 -f none /opt/csw/share/man/man3/BN_CTX_new.3 0644 root bin -f none /opt/csw/share/man/man3/BN_CTX_start.3 0644 root bin -s none /opt/csw/share/man/man3/BN_MONT_CTX_copy.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_MONT_CTX_free.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_MONT_CTX_init.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_MONT_CTX_new.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_MONT_CTX_set.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_RECP_CTX_free.3=BN_mod_mul_reciprocal.3 -s none /opt/csw/share/man/man3/BN_RECP_CTX_init.3=BN_mod_mul_reciprocal.3 -s none /opt/csw/share/man/man3/BN_RECP_CTX_new.3=BN_mod_mul_reciprocal.3 -s none /opt/csw/share/man/man3/BN_RECP_CTX_set.3=BN_mod_mul_reciprocal.3 -f none /opt/csw/share/man/man3/BN_add.3 0644 root bin -f none /opt/csw/share/man/man3/BN_add_word.3 0644 root bin -s none /opt/csw/share/man/man3/BN_bin2bn.3=BN_bn2bin.3 -f none /opt/csw/share/man/man3/BN_bn2bin.3 0644 root bin -s none /opt/csw/share/man/man3/BN_bn2dec.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_bn2hex.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_bn2mpi.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_clear.3=BN_new.3 -s none /opt/csw/share/man/man3/BN_clear_bit.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_clear_free.3=BN_new.3 -f none /opt/csw/share/man/man3/BN_cmp.3 0644 root bin -f none /opt/csw/share/man/man3/BN_copy.3 0644 root bin -s none /opt/csw/share/man/man3/BN_dec2bn.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_div.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_div_recp.3=BN_mod_mul_reciprocal.3 -s none /opt/csw/share/man/man3/BN_div_word.3=BN_add_word.3 -s none /opt/csw/share/man/man3/BN_dup.3=BN_copy.3 -s none /opt/csw/share/man/man3/BN_exp.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_free.3=BN_new.3 -s none /opt/csw/share/man/man3/BN_from_montgomery.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_gcd.3=BN_add.3 -f none /opt/csw/share/man/man3/BN_generate_prime.3 0644 root bin -s none /opt/csw/share/man/man3/BN_get_word.3=BN_zero.3 -s none /opt/csw/share/man/man3/BN_hex2bn.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_init.3=BN_new.3 -s none /opt/csw/share/man/man3/BN_is_bit_set.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_is_odd.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_is_one.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_is_prime.3=BN_generate_prime.3 -s none /opt/csw/share/man/man3/BN_is_prime_fasttest.3=BN_generate_prime.3 -s none /opt/csw/share/man/man3/BN_is_word.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_is_zero.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_lshift.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_lshift1.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_mask_bits.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_mod.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mod_add.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mod_exp.3=BN_add.3 -f none /opt/csw/share/man/man3/BN_mod_inverse.3 0644 root bin -s none /opt/csw/share/man/man3/BN_mod_mul.3=BN_add.3 -f none /opt/csw/share/man/man3/BN_mod_mul_montgomery.3 0644 root bin -f none /opt/csw/share/man/man3/BN_mod_mul_reciprocal.3 0644 root bin -s none /opt/csw/share/man/man3/BN_mod_sqr.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mod_sub.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mod_word.3=BN_add_word.3 -s none /opt/csw/share/man/man3/BN_mpi2bn.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_mul.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_mul_word.3=BN_add_word.3 -f none /opt/csw/share/man/man3/BN_new.3 0644 root bin -s none /opt/csw/share/man/man3/BN_nnmod.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_num_bits.3=BN_num_bytes.3 -s none /opt/csw/share/man/man3/BN_num_bits_word.3=BN_num_bytes.3 -f none /opt/csw/share/man/man3/BN_num_bytes.3 0644 root bin -s none /opt/csw/share/man/man3/BN_one.3=BN_zero.3 -s none /opt/csw/share/man/man3/BN_print.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_print_fp.3=BN_bn2bin.3 -s none /opt/csw/share/man/man3/BN_pseudo_rand.3=BN_rand.3 -f none /opt/csw/share/man/man3/BN_rand.3 0644 root bin -s none /opt/csw/share/man/man3/BN_rshift.3=BN_set_bit.3 -s none /opt/csw/share/man/man3/BN_rshift1.3=BN_set_bit.3 -f none /opt/csw/share/man/man3/BN_set_bit.3 0644 root bin -s none /opt/csw/share/man/man3/BN_set_word.3=BN_zero.3 -s none /opt/csw/share/man/man3/BN_sqr.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_sub.3=BN_add.3 -s none /opt/csw/share/man/man3/BN_sub_word.3=BN_add_word.3 -f none /opt/csw/share/man/man3/BN_swap.3 0644 root bin -s none /opt/csw/share/man/man3/BN_to_montgomery.3=BN_mod_mul_montgomery.3 -s none /opt/csw/share/man/man3/BN_ucmp.3=BN_cmp.3 -s none /opt/csw/share/man/man3/BN_value_one.3=BN_zero.3 -f none /opt/csw/share/man/man3/BN_zero.3 0644 root bin -s none /opt/csw/share/man/man3/BUF_MEM_free.3=buffer.3 -s none /opt/csw/share/man/man3/BUF_MEM_grow.3=buffer.3 -s none /opt/csw/share/man/man3/BUF_MEM_new.3=buffer.3 -s none /opt/csw/share/man/man3/BUF_strdup.3=buffer.3 -f none /opt/csw/share/man/man3/CONF_modules_free.3 0644 root bin -s none /opt/csw/share/man/man3/CONF_modules_load.3=CONF_modules_load_file.3 -f none /opt/csw/share/man/man3/CONF_modules_load_file.3 0644 root bin -s none /opt/csw/share/man/man3/CONF_modules_unload.3=CONF_modules_free.3 -s none /opt/csw/share/man/man3/CRYPTO_destroy_dynlockid.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_get_ex_data.3=CRYPTO_set_ex_data.3 -s none /opt/csw/share/man/man3/CRYPTO_get_new_dynlockid.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_lock.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_num_locks.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_set_dynlock_create_callback.3=threads.3 -s none /opt/csw/share/man/man3/CRYPTO_set_dynlock_destroy_callback.3=threads.3 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 13 03:53:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 13 Oct 2011 01:53:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[15911] csw/mgar/pkg/pkg-get/trunk Message-ID: Revision: 15911 http://gar.svn.sourceforge.net/gar/?rev=15911&view=rev Author: bdwalton Date: 2011-10-13 01:53:41 +0000 (Thu, 13 Oct 2011) Log Message: ----------- pkg-get/trunk: take Sebastian's suggestion and remove dependence on alternatives (no CAS for core package) Modified Paths: -------------- csw/mgar/pkg/pkg-get/trunk/Makefile csw/mgar/pkg/pkg-get/trunk/files/pkg-get Added Paths: ----------- csw/mgar/pkg/pkg-get/trunk/files/CSWpkgget.postinstall Removed Paths: ------------- csw/mgar/pkg/pkg-get/trunk/files/CSWpkgget-deprecated.postinstall Modified: csw/mgar/pkg/pkg-get/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkg-get/trunk/Makefile 2011-10-12 13:09:45 UTC (rev 15910) +++ csw/mgar/pkg/pkg-get/trunk/Makefile 2011-10-13 01:53:41 UTC (rev 15911) @@ -12,53 +12,35 @@ endef MASTER_SITES = http://opencsw.org -DISTFILES = CSWpkgget-deprecated.postinstall +DISTFILES = CSWpkgget.postinstall CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PACKAGES = CSWpkgget CSWpkgget-deprecated +PACKAGES = CSWpkgget CATALOGNAME_CSWpkgget = pkg_get_stub SPKG_DESC_CSWpkgget = A deprecated package delivery tool (User notice version) -RUNTIME_DEP_PKGS_CSWpkgget = CSWpkgutil CSWpkgget-deprecated +RUNTIME_DEP_PKGS_CSWpkgget = CSWpkgutil ARCHALL_CSWpkgget = 1 CHECKPKG_OVERRIDES_CSWpkgget += surplus-dependency|CSWpkgutil CHECKPKG_OVERRIDES_CSWpkgget += catalogname-does-not-match-pkgname|pkgname=CSWpkgget|catalogname=pkg_get_stub|expected-catalogname=pkgget -PKGFILES_CSWpkgget = $(bindir)/pkg-get.deprecationnotice +CHECKPKG_OVERRIDES_CSWpkgget += file-with-bad-content|/usr/local|root/opt/csw/bin/pkg-get.deprecated -SPKG_DESC_CSWpkgget-deprecated = A deprecated package delivery tool (Working legacy version) -RUNTIME_DEP_PKGS_CSWpkgget-deprecated = CSWpkgutil -ARCHALL_CSWpkgget-deprecated = 1 -CHECKPKG_OVERRIDES_CSWpkgget-deprecated += surplus-dependency|CSWpkgutil -# going to extra effort to find wget, add /usr/local/bin to the path -CHECKPKG_OVERRIDES_CSWpkgget-deprecated += file-with-bad-content|/usr/local|root/opt/csw/bin/pkg-get.deprecated -PKGFILES_CSWpkgget-deprecated = $(bindir)/pkg-get.deprecated -PKGFILES_CSWpkgget-deprecated += $(sharedstatedir).* $(docdir)/pkg_get - -ALTERNATIVES_CSWpkgget = deprecationnotice -ALTERNATIVE_deprecationnotice = $(bindir)/pkg-get pkg-get $(bindir)/pkg-get.deprecationnotice 10 - -ALTERNATIVES_CSWpkgget-deprecated = deprecated -ALTERNATIVE_deprecated = $(bindir)/pkg-get pkg-get $(bindir)/pkg-get.deprecated 5 - - include gar/category.mk install-custom: @(mkdir -p $(DESTDIR)$(bindir); \ mkdir -p $(DESTDIR)$(docdir)/pkg_get_stub; \ - mkdir -p $(DESTDIR)$(docdir)/pkgget_deprecated; \ mkdir -p $(DESTDIR)$(sharedstatedir); \ mkdir -p $(DESTDIR)$(sysconfdir); \ ginstall -m 0755 $(FILEDIR)/pkg-get $(DESTDIR)$(bindir)/pkg-get.deprecationnotice; \ + ln -s $(bindir)/pkg-get.deprecationnotice $(DESTDIR)$(bindir)/pkg-get; \ rsync -a --exclude=.svn $(FILEDIR)/bin/ $(DESTDIR)$(bindir)/;\ rsync -a --exclude=.svn $(FILEDIR)/share/ $(DESTDIR)$(sharedstatedir)/; \ rsync -a --exclude=.svn $(FILEDIR)/etc/ $(DESTDIR)$(sysconfdir)/; \ ginstall -m 0644 $(FILEDIR)/license $(DESTDIR)$(docdir)/pkg_get_stub; \ - ginstall -m 0644 $(FILEDIR)/license $(DESTDIR)$(docdir)/pkgget_deprecated; \ - ginstall -m 0644 $(FILEDIR)/license $(DESTDIR)$(docdir)/pkgget_deprecated; \ - ln -s $(docdir)/pkgget_deprecated $(DESTDIR)$(docdir)/pkg_get) + ln -s $(docdir)/pkg_get_stub $(DESTDIR)$(docdir)/pkg_get) @$(MAKECOOKIE) Deleted: csw/mgar/pkg/pkg-get/trunk/files/CSWpkgget-deprecated.postinstall =================================================================== --- csw/mgar/pkg/pkg-get/trunk/files/CSWpkgget-deprecated.postinstall 2011-10-12 13:09:45 UTC (rev 15910) +++ csw/mgar/pkg/pkg-get/trunk/files/CSWpkgget-deprecated.postinstall 2011-10-13 01:53:41 UTC (rev 15911) @@ -1,78 +0,0 @@ -#!/bin/sh - - -# This needs to somewhat track the CONFFILE handling in pkg-get itself now -# to be more relocation friendly. technically. -CONFFILE=$BASEDIR/etc/pkg-get.conf -shortprefix=`echo $BASEDIR |sed 's:.*/::'` -localconffile=/etc/opt/$shortprefix/pkg-get.conf - -echo "" - - -## -## Create a default pkg-get.conf file. -# Note: "normally", i would depend on CSWcswclassutils. -# However, i want this to not be dependant on anything else. -# Additionally, i need to check for both a global, OR a local, -# config file, before deciding to copy over a default one somewhere. -# - -if [ -f $CONFFILE ] ; then - echo $CONFFILE already exists. Not altering it. -elif [ -f $localconffile ] ; then - echo Local conf file $localconffile exists. - echo Not copying $CONFFILE.csw - -else - # Note: "normally", i would depend on CSWcswclassutils. - # However, i want this to not be dependant on anything else. - # - - echo Installing $CONFFILE.csw to pkg-get.conf - cp $CONFFILE.csw $CONFFILE - echo "" - echo '**** IMPORTANT ****' - echo 'A default configuration file for pkg-get has been created in' - echo " $CONFFILE" - echo "You should edit it to change the 'site' configuration, to point to" - echo "the most appropriate mirror for you, from the list at" - echo " http://www.opencsw.org/mirrors" - echo "" -fi - -case $BASEDIR in - */opt/csw) - : - # fall through and do long hairy stuff - ;; - *) - exit 0 - ;; -esac - -################################################## -# Fix perms. -# Really, the "default" line in prototype should take care of -# this.. but it doesnt?!! -#If the directory did not exist previously, it gets set to -#root:other. -# SO, fix that, in keeping with csw standards! - -# But.. only if we're not in read-only-PREFIX mode. -# since there is no /bin/stat call, fake it and test by creating a file. - -touch $BASEDIR/testfile.$$ -if [ $? -ne 0 ] ; then - echo No permissions to create $BASEDIR/testfile. - echo Presuming read-only $BASEDIR. Quitting cleanly now - exit 0 -fi - -rm $BASEDIR/testfile.$$ - -chown root:bin $BASEDIR -for d in bin etc share share/man share/man/man1m ; do - chown root:bin $BASEDIR/$d -done - Copied: csw/mgar/pkg/pkg-get/trunk/files/CSWpkgget.postinstall (from rev 15774, csw/mgar/pkg/pkg-get/trunk/files/CSWpkgget-deprecated.postinstall) =================================================================== --- csw/mgar/pkg/pkg-get/trunk/files/CSWpkgget.postinstall (rev 0) +++ csw/mgar/pkg/pkg-get/trunk/files/CSWpkgget.postinstall 2011-10-13 01:53:41 UTC (rev 15911) @@ -0,0 +1,78 @@ +#!/bin/sh + + +# This needs to somewhat track the CONFFILE handling in pkg-get itself now +# to be more relocation friendly. technically. +CONFFILE=$BASEDIR/etc/pkg-get.conf +shortprefix=`echo $BASEDIR |sed 's:.*/::'` +localconffile=/etc/opt/$shortprefix/pkg-get.conf + +echo "" + + +## +## Create a default pkg-get.conf file. +# Note: "normally", i would depend on CSWcswclassutils. +# However, i want this to not be dependant on anything else. +# Additionally, i need to check for both a global, OR a local, +# config file, before deciding to copy over a default one somewhere. +# + +if [ -f $CONFFILE ] ; then + echo $CONFFILE already exists. Not altering it. +elif [ -f $localconffile ] ; then + echo Local conf file $localconffile exists. + echo Not copying $CONFFILE.csw + +else + # Note: "normally", i would depend on CSWcswclassutils. + # However, i want this to not be dependant on anything else. + # + + echo Installing $CONFFILE.csw to pkg-get.conf + cp $CONFFILE.csw $CONFFILE + echo "" + echo '**** IMPORTANT ****' + echo 'A default configuration file for pkg-get has been created in' + echo " $CONFFILE" + echo "You should edit it to change the 'site' configuration, to point to" + echo "the most appropriate mirror for you, from the list at" + echo " http://www.opencsw.org/mirrors" + echo "" +fi + +case $BASEDIR in + */opt/csw) + : + # fall through and do long hairy stuff + ;; + *) + exit 0 + ;; +esac + +################################################## +# Fix perms. +# Really, the "default" line in prototype should take care of +# this.. but it doesnt?!! +#If the directory did not exist previously, it gets set to +#root:other. +# SO, fix that, in keeping with csw standards! + +# But.. only if we're not in read-only-PREFIX mode. +# since there is no /bin/stat call, fake it and test by creating a file. + +touch $BASEDIR/testfile.$$ +if [ $? -ne 0 ] ; then + echo No permissions to create $BASEDIR/testfile. + echo Presuming read-only $BASEDIR. Quitting cleanly now + exit 0 +fi + +rm $BASEDIR/testfile.$$ + +chown root:bin $BASEDIR +for d in bin etc share share/man share/man/man1m ; do + chown root:bin $BASEDIR/$d +done + Modified: csw/mgar/pkg/pkg-get/trunk/files/pkg-get =================================================================== --- csw/mgar/pkg/pkg-get/trunk/files/pkg-get 2011-10-12 13:09:45 UTC (rev 15910) +++ csw/mgar/pkg/pkg-get/trunk/files/pkg-get 2011-10-13 01:53:41 UTC (rev 15911) @@ -11,7 +11,8 @@ echo "have been installed at the same time as this CSWpkgget update." echo echo "If you _really_ want to run pkg-get still, you can enable it by:" -echo "/opt/csw/sbin/alternatives --set pkg-get /opt/csw/bin/pkg-get.deprecated" +echo "rm /opt/csw/bin/pkg-get" +echo " ln -s /opt/csw/bin/pkg-get.deprecated /opt/csw/bin/pkg-get" echo echo "We apologize for any inconveniences this causes you." echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Oct 15 09:14:34 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 15 Oct 2011 07:14:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15912] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 15912 http://gar.svn.sourceforge.net/gar/?rev=15912&view=rev Author: rthurner Date: 2011-10-15 07:14:34 +0000 (Sat, 15 Oct 2011) Log Message: ----------- subversion: upgrade to svn-1.7.0 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-10-13 01:53:41 UTC (rev 15911) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-10-15 07:14:34 UTC (rev 15912) @@ -25,7 +25,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.7.0-rc4 +VERSION = 1.7.0 CATEGORIES = utils DESCRIPTION = Version control rethought Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2011-10-13 01:53:41 UTC (rev 15911) +++ csw/mgar/pkg/subversion/trunk/checksums 2011-10-15 07:14:34 UTC (rev 15912) @@ -1 +1 @@ -f892a9835a474840314cfedc4c6fa709 subversion-1.7.0-rc4.tar.bz2 +930e6644a1b6094efd268fde6a318f04 subversion-1.7.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at opencsw.org Sun Oct 16 13:01:53 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Sun, 16 Oct 2011 13:01:53 +0200 Subject: [csw-devel] SF.net SVN: gar:[15903] csw/mgar/gar/v2/gar.pkg.mk In-Reply-To: References: Message-ID: <20111016110153.GL26160@sebastiankayser.de> * Maciej (Matchek) Blizi??ski wrote: > 2011/10/10 : > > Revision: 15903 > > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=15903&view=rev > > Author: ? skayser > > Date: ? ? 2011-10-10 09:07:57 +0000 (Mon, 10 Oct 2011) > > Log Message: > > ----------- > > gar/v2: fix CATALOG_RELEASE regex > > > > Modified Paths: > > -------------- > > ? ?csw/mgar/gar/v2/gar.pkg.mk > > > > Modified: csw/mgar/gar/v2/gar.pkg.mk > > =================================================================== > > --- csw/mgar/gar/v2/gar.pkg.mk ?2011-10-10 07:44:44 UTC (rev 15902) > > +++ csw/mgar/gar/v2/gar.pkg.mk ?2011-10-10 09:07:57 UTC (rev 15903) > > @@ -62,7 +62,7 @@ > > ?# set CATALOG_RELEASE to 'current'. Used by checkpkg to query the right branch > > ?# in the buildfarm pkgdb. For off-site usage this can default to unstable. > > ?HOSTNAME := $(shell hostname) > > -CATALOG_RELEASE ?= $(shell echo $(HOSTNAME) | gsed -e 's/[0-9][sx]*$$//') > > +CATALOG_RELEASE ?= $(shell echo $(HOSTNAME) | gsed -re 's/[0-9]{1,2}[sx]$$//') > > Oh, the missing count spec after [0-9], sorry for not catching that! No problem. I briefly thought about encoding the valid catalog names in GAR to catch an invalid catalog name earlier than at the checkpkg stage, but then we'd store the catalog names in yet another location. Thus, the quick fix for now. Sebastian From skayser at opencsw.org Sun Oct 16 13:09:38 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Sun, 16 Oct 2011 13:09:38 +0200 Subject: [csw-devel] SF.net SVN: gar:[15906] csw/mgar/gar/v2-raised-buildlevel/ In-Reply-To: References: Message-ID: <20111016110938.GM26160@sebastiankayser.de> * dmichelsen at users.sourceforge.net wrote: > Revision: 15906 > http://gar.svn.sourceforge.net/gar/?rev=15906&view=rev > Author: dmichelsen > Date: 2011-10-11 09:49:15 +0000 (Tue, 11 Oct 2011) > Log Message: > ----------- > mGAR v2-raised-buildlevel: Make branch Just adding as you've recently migrated to mgar: OVERRIDE_BUILDSYS in mgar eases globally testing a GAR branch. If set, the logic for locating the recipe-specific GAR branch (svn:externals, GARTYPE, default v2) is overriden by the given path for all recipes. Example from my ~/.garrc: OVERRIDE_BUILDSYS = /home/skayser/mgar/pkg/.buildsys/v2-speedup-fetch Sebastian From rthurner at users.sourceforge.net Sun Oct 16 13:14:52 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 Oct 2011 11:14:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[15913] csw/mgar/pkg/lang-python/python3/trunk Message-ID: Revision: 15913 http://gar.svn.sourceforge.net/gar/?rev=15913&view=rev Author: rthurner Date: 2011-10-16 11:14:52 +0000 (Sun, 16 Oct 2011) Log Message: ----------- python3: upgrade to python-3.2.2 Modified Paths: -------------- csw/mgar/pkg/lang-python/python3/trunk/Makefile csw/mgar/pkg/lang-python/python3/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/lang-python/python3/trunk/ Property changes on: csw/mgar/pkg/lang-python/python3/trunk ___________________________________________________________________ Added: svn:ignore + work Modified: csw/mgar/pkg/lang-python/python3/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python3/trunk/Makefile 2011-10-15 07:14:34 UTC (rev 15912) +++ csw/mgar/pkg/lang-python/python3/trunk/Makefile 2011-10-16 11:14:52 UTC (rev 15913) @@ -1,5 +1,5 @@ NAME = Python -VERSION = 3.0 +VERSION = 3.2.2 CATEGORIES = lang PACKAGES = CSWpython3 CSWpython3-tk CSWidle3 @@ -14,8 +14,8 @@ an extension language for applications that need a programmable interface. endef -SPKG_SOURCEURL = http://www.python.org/ -MASTER_SITES = http://www.python.org/ftp/python/$(VERSION)/ +SPKG_SOURCEURL = http://python.org/ +MASTER_SITES = http://python.org/ftp/python/$(VERSION)/ DISTFILES = $(DISTNAME).tar.bz2 @@ -31,26 +31,24 @@ CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWidle = $(libdir)/python(\d+(?:\.\d+)*)/idlelib/.* -PKGFILES_CSWidle += $(bindir)/idle -PKGFILES_CSWpython-tk = $(libdir)/python(\d+(?:\.\d+)*)/lib-tk/.* -PKGFILES_CSWpython-tk += $(libdir)/python(\d+(?:\.\d+)*)/lib-dynload/_tkinter.so.* +PKGFILES_CSWidle3 = $(libdir)/python(\d+(?:\.\d+)*)/idlelib/.* +PKGFILES_CSWidle3 += $(bindir)/idle +PKGFILES_CSWpython3-tk = $(libdir)/python(\d+(?:\.\d+)*)/lib-tk/.* +PKGFILES_CSWpython3-tk += $(libdir)/python(\d+(?:\.\d+)*)/lib-dynload/_tkinter.so.* -RUNTIME_DEP_PKGS_CSWpython = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline CSWzlib -RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3 CSWtcl CSWtk -RUNTIME_DEP_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk -RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk +RUNTIME_DEP_PKGS_CSWpython3 = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt +RUNTIME_DEP_PKGS_CSWpython3 += CSWncurses CSWosslrt CSWreadline CSWzlib +RUNTIME_DEP_PKGS_CSWpython3 += CSWsqlite3 CSWtcl CSWtk +RUNTIME_DEP_PKGS_CSWpython3-tk = CSWpython3 CSWtcl CSWtk +RUNTIME_DEP_PKGS_CSWidle3 = CSWpython3 CSWpython3-tk -CATALOGNAME_CSWpython = python -CATALOGNAME_CSWpython-tk = python_tk -CATALOGNAME_CSWidle = idle +CATALOGNAME_CSWpython3 = python +CATALOGNAME_CSWpython3-tk = python_tk +CATALOGNAME_CSWidle3 = idle -SPKG_DESC_CSWpython = A high-level scripting language. -SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWidle = Python IDE +SPKG_DESC_CSWpython3 = A high-level scripting language. +SPKG_DESC_CSWpython3-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWidle3 = Python IDE include gar/category.mk - - Modified: csw/mgar/pkg/lang-python/python3/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python3/trunk/checksums 2011-10-15 07:14:34 UTC (rev 15912) +++ csw/mgar/pkg/lang-python/python3/trunk/checksums 2011-10-16 11:14:52 UTC (rev 15913) @@ -1 +1 @@ -d31a19f8ef795bec0ea1f69a19410f63 download/Python-3.0.tar.bz2 +9d763097a13a59ff53428c9e4d098a05 Python-3.2.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Oct 16 13:50:41 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 16 Oct 2011 11:50:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[15914] csw/mgar/pkg/sasl/trunk Message-ID: Revision: 15914 http://gar.svn.sourceforge.net/gar/?rev=15914&view=rev Author: guengel Date: 2011-10-16 11:50:40 +0000 (Sun, 16 Oct 2011) Log Message: ----------- Merged sasl-2.1.23-mGARv2 branch into trunk. Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile csw/mgar/pkg/sasl/trunk/checksums csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init Removed Paths: ------------- csw/mgar/pkg/sasl/trunk/files/CSWsasl.depend csw/mgar/pkg/sasl/trunk/files/CSWsasl.gspec csw/mgar/pkg/sasl/trunk/files/CSWsasl.postinstall csw/mgar/pkg/sasl/trunk/files/CSWsasl.preinstall csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.depend csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.gspec csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.depend csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.gspec csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.prototype csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.depend csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.gspec csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.prototype Property Changed: ---------------- csw/mgar/pkg/sasl/trunk/ Property changes on: csw/mgar/pkg/sasl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: svn:mergeinfo + /csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2:6997-15913 Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/Makefile 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,6 +1,6 @@ NAME = sasl -VERSION = 2.1.22 -GARTYPE = v1 +VERSION = 2.1.25 +FILEVERSION = $(VERSION) CATEGORIES = lib DESCRIPTION = Simple Authentication and Security Layer @@ -12,70 +12,130 @@ layer is inserted between the protocol and the connection. endef -# Source location -MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail +MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ +DISTNAME = cyrus-$(NAME)-$(VERSION) +DISTFILES = cyrus-$(NAME)-$(FILEVERSION).tar.gz +DISTFILES += cswsaslauthd.init saslauthd.init.CSW +DISTFILES += README.sasl README.saslauthd -# Visitor information -SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/ +# PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff -WORKSRC = $(WORKDIR)/cyrus-$(NAME)-$(VERSION) +VENDOR_URL = http://asg.web.cmu.edu/sasl/ -DISTFILES = cyrus-$(NAME)-$(VERSION).tar.gz +PACKAGES += CSWsasl +CATALOGNAME_CSWsasl = sasl +SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer +RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt +RUNTIME_DEP_PKGS_CSWsasl += CSWbdb47 +RUNTIME_DEP_PKGS_CSWsasl += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsasl += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = cyrus-$(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWsaslauthd +CATALOGNAME_CSWsaslauthd = saslauthd +SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWosslrt +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5support0 -BUILD_ENV = _REENTRANT=1 +PACKAGES += CSWsaslgssapi +CATALOGNAME_CSWsaslgssapi = sasl_gssapi +SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding +RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib +CHECKPKG_OVERRIDES_CSWsaslgssapi += surplus-dependency|CSWsasl -TEST_TARGET = check +PACKAGES += CSWsaslsql +CATALOGNAME_CSWsaslsql = sasl_sql +SPKG_DESC_CSWsaslsql = Cyrus Simple Authentication and Security Layer SQL Binding +RUNTIME_DEP_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql5rt CSWsqlite +CHECKPKG_OVERRIDES_CSWsaslsql += surplus-dependency|CSWsasl -SED=/usr/bin/sed -EGREP=/usr/bin/egrep -max_cmd_line=65535 +PACKAGES += CSWlibsasl2-2 +SPKG_DESC_CSWlibsasl2-2 = Simple authentication and security layer library, libsasl2.so.2 +PKGFILES_CSWlibsasl2-2 += $(call pkgfiles_lib,libsasl2.so.2) -# SASL libraries and utilities -DISTFILES += $(call admfiles,CSWsasl,$(ADMSTANDARD) $(ADMISCRIPTS)) -# SASL authentication server -DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON)) -# SASL sql plugin -DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD)) -# SASL gssapi plugin -DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD)) +PACKAGES += CSWsasl-dev +SPKG_DESC_CSWsasl-dev = Development files for SASL +PKGFILES_CSWsasl-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-2 -# Init files for SASLAUTHD -DISTFILES += cswsaslauthd.init saslauthd.init.CSW +EXTRA_CFLAGS = -D__EXTENSIONS__ -PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff +EXTRA_BUILD_ENV = _REENTRANT=1 -#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir +# EXTRA_LIB = $(prefix)/bdb47/lib -EXTRA_LIBS += /opt/csw/bdb4/lib -EXTRA_LIBS += /opt/csw/mysql4/lib -EXTRA_LIBS += /opt/csw/postgresql/lib +EXTRA_INC = /opt/csw/include/gssapi +EXTRA_INC += /opt/csw/include/mysql +EXTRA_INC += /opt/csw/postgresql/include +# Do not use LD_OPTIONS as it breaks tests by using the installed libraries +# before the newly built ones. +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +LD_OPTIONS = -L$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) + +BUILD64 = 1 +NOISALIST = 1 + +NODIRPATHS = --docdir + # SASL configuration CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-sql -CONFIGURE_ARGS += --with-bdb-libdir=/opt/csw/bdb4/lib -CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb4/include/ -CONFIGURE_ARGS += --with-saslauthd=/var/opt/csw/saslauthd +CONFIGURE_ARGS += --with-bdb-libdir=$(abspath /opt/csw/bdb47/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ +CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd CONFIGURE_ARGS += --with-ipctype=unix -CONFIGURE_ARGS += --with-ldap=/opt/csw -CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql4/ -CONFIGURE_ARGS += --with-pgsql=/opt/csw/postgresql -CONFIGURE_ARGS += --with-openssl=/opt/csw -CONFIGURE_ARGS += --with-dbpath=/opt/csw/etc/sasldb2 -CONFIGURE_ARGS += --with-plugindir=/opt/csw/lib/sasl2 +CONFIGURE_ARGS += --with-ldap=$(libdir) +# Autoconf tries to find the directory with the shared lib in it. Because of the +# ISA suffix for 64 bit we must specify the exact library location and add +# the include directories manually. +#CONFIGURE_ARGS += --with-mysql=$(libdir) +CONFIGURE_ARGS += --with-mysql=$(libdir) +CONFIGURE_ARGS += --with-pgsql=$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --with-openssl=$(libdir) +CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2 +CONFIGURE_ARGS += --with-plugindir=$(libdir)/sasl2 CONFIGURE_ARGS += --enable-login +# This is for 32/64 switching. We do this all by ourselves, do not use SASLs mechanism +CONFIGURE_ARGS += --without-lib-subdir +SED=/usr/bin/sed +EGREP=/usr/bin/egrep +max_cmd_line=65535 -all: .DEFAULT -.DEFAULT: - @true +#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir -post-install: testsaslauthd install-testsaslauthd install-doc +PKGFILES_CSWsaslauthd = /etc/opt/csw/init.d/cswsaslauthd.init +PKGFILES_CSWsaslauthd += $(bindir)/testsaslauthd +PKGFILES_CSWsaslauthd += $(sbindir)/saslauthd +PKGFILES_CSWsaslauthd += $(mandir)/.*/saslauthd\.8 +PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/LDAP_SASLAUTHD +PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/README.saslauthd +PKGFILES_CSWsaslauthd += /var/opt/csw/saslauthd +PKGFILES_CSWsaslgssapi = $(libdir)/sasl2/libgssapiv2\..* +PKGFILES_CSWsaslsql = $(libdir)/sasl2/libsql\..* +MIGRATECONF = saslauthd.conf sasldb2 +PRESERVECONF = saslauthd.conf + +INITSMF = /etc/opt/csw/init.d/cswsaslauthd.init + +CSWsasl_usergroup = :sasl:::::: + +include gar/category.mk + +post-install-modulated: testsaslauthd install-testsaslauthd install-doc + ginstall -d $(DESTDIR)/etc/opt/csw/init.d/ + ginstall $(WORKDIR)/cswsaslauthd.init $(DESTDIR)/etc/opt/csw/init.d + @$(MAKECOOKIE) + DOC_FILES = rfc1321.txt \ rfc1939.txt \ rfc2104.txt \ @@ -120,25 +180,21 @@ TODO \ ONEWS -INSTDIR = $(DESTDIR)/opt/csw - - testsaslauthd: cd $(WORKSRC)/saslauthd && make testsaslauthd install-testsaslauthd: - -mkdir -p $(INSTDIR)/bin - cp $(WORKSRC)/saslauthd/testsaslauthd $(INSTDIR)/bin + mkdir -p $(DESTDIR)$(bindir) + cp $(WORKSRC)/saslauthd/testsaslauthd $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)/var/opt/csw/saslauthd install-doc: - -mkdir -p $(INSTDIR)/share/doc/sasl + mkdir -p $(DESTDIR)$(docdir)/sasl + cp $(WORKDIR)/README.sasl $(DESTDIR)$(docdir)/sasl/README.CSW list='$(DOC_FILES)'; for file in $$list; do \ - cp $(WORKSRC)/doc/$$file $(INSTDIR)/share/doc/sasl; \ + cp $(WORKSRC)/doc/$$file $(DESTDIR)$(docdir)/sasl; \ done - cp files/README.sasl $(INSTDIR)/share/doc/sasl/README.CSW - -mkdir -p $(INSTDIR)/share/doc/saslauthd - cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(INSTDIR)/share/doc/saslauthd - cp files/README.saslauthd $(INSTDIR)/share/doc/saslauthd/README.CSW + mkdir -p $(DESTDIR)$(docdir)/saslauthd + cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(DESTDIR)$(docdir)/saslauthd + cp $(WORKDIR)/README.saslauthd $(DESTDIR)$(docdir)/saslauthd/README.CSW - -include gar/category.mk Modified: csw/mgar/pkg/sasl/trunk/checksums =================================================================== --- csw/mgar/pkg/sasl/trunk/checksums 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/checksums 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,22 +1 @@ -45dde9d19193ae9dd388eb68b2027bc9 download/cyrus-sasl-2.1.22.tar.gz -f4a742f252ee3b840ffe062d4288e4d4 download/CSWsasl.gspec -b8dd69fab29e6e9706536229572dbca5 download/CSWsasl.prototype -773caf5b10e823266e785ec1ac5ea20e download/CSWsasl.depend -2762eafea57ec2e5e28e5a5a95937fa7 download/CSWsasl.preinstall -614bb55932ed32486c1fd57a0059059a download/CSWsasl.postinstall -b9b51f830b9524f2d6f35fe428cbce5a download/CSWsaslauthd.gspec -8974319c29e07c5b44470c85d91859c8 download/CSWsaslauthd.prototype -1114b8288fe48e24922fca60ef00da79 download/CSWsaslauthd.depend -ab89fa9937d1337e30de070bb8b0174b download/CSWsaslauthd.postinstall -177c98fa0d192eafe569a3c379388652 download/CSWsaslauthd.preremove -e2962c2cfefee8bada31b15af8817b52 download/CSWsaslsql.gspec -5936c0208fc18f2a47f716013171cdf2 download/CSWsaslsql.prototype -1dbe229bbe3c1f944f95a1ecef65fa49 download/CSWsaslsql.depend -033ca04bd0d1d5467495af765a890df2 download/CSWsaslgssapi.gspec -486fb367a3d53ad5125f7678065bfd8d download/CSWsaslgssapi.prototype -4c009a25ddbe4325f515a8d605a62ec6 download/CSWsaslgssapi.depend -b2491dcfbb2be4a4a09f3003cffb1bc7 download/cswsaslauthd.init -b190992e18cc7add35a6934d896a1130 download/saslauthd.init.CSW -40b526754554c46d5b134f5ca21fe371 download/saslauthd-doc.diff -21cbef68d9f2dc2447326cbda8bf842e download/saslauthd-groff.diff -48af784184961368ce250c7b33d207b8 download/ltmain.diff +341cffe829a4d71f2a6503d669d5a946 cyrus-sasl-2.1.25.tar.gz Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsasl.depend =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsasl.depend 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsasl.depend 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,5 +0,0 @@ -P SUNWcsr - Core Solaris, (Root) -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWlibms - Sun WorkShop Bundled shared libm -P CSWossl - OpenSSL Secure Sockets Layer lib and utilities -P CSWbdb4 - berkeleydb4, embedded database libraries and utilities Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsasl.gspec =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsasl.gspec 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsasl.gspec 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,5 +0,0 @@ -%var bitname sasl -%var pkgname CSWsasl -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsasl.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsasl.postinstall =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsasl.postinstall 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsasl.postinstall 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,6 +0,0 @@ -# Display message -echo '***' -echo '*** See README.CSW in /opt/csw/share/doc/sasl **' -echo '***' - -exit 0 Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsasl.preinstall =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsasl.preinstall 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsasl.preinstall 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi - -# Next, verify that group sasl exists. -# First check target machines group file, THEN check -# NIS/NIS+/whatever - -${BASEDIR}/usr/bin/grep '^sasl:' ${BASEDIR}/etc/group >/dev/null -if [ $? -ne 0 ] ; then - ${BASEDIR}/usr/bin/getent group sasl >/dev/null - if [ $? -ne 0 ] ; then - ADDGROUP=1 - fi -fi - -if [ "$ADDGROUP" = 1 ] ; then - chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd sasl - echo "sasl group added" -else - echo "sasl group detected" -fi - -exit 0 Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.depend =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.depend 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.depend 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,5 +0,0 @@ -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWgss - GSSAPI V2 -P CSWossl - OpenSSL Secure Sockets Layer lib and utilities -P CSWoldaprt - openldap, ldap clients,libraries and server -P CSWkrb5lib - A Kerberos 5 implementation: libraries Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.gspec =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.gspec 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.gspec 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,5 +0,0 @@ -%var bitname saslauthd -%var pkgname CSWsaslauthd -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsaslauthd.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.depend =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.depend 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.depend 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,5 +0,0 @@ -P SUNWcsr - Core Solaris, (Root) -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWlibms - Sun WorkShop Bundled shared libm -P CSWsasl - sasl, Simple Authentication and Security Layer -P CSWkrb5lib - MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.gspec =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.gspec 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.gspec 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,5 +0,0 @@ -%var bitname sasl_gssapi -%var pkgname CSWsaslgssapi -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsaslgssapi.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.prototype =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.prototype 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslgssapi.prototype 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,7 +0,0 @@ -i copyright=CSWsaslgssapi.copyright -i depend=CSWsaslgssapi.depend -i pkginfo=CSWsaslgssapi.pkginfo -f none /opt/csw/lib/sasl2/libgssapiv2.la 0755 root bin -f none /opt/csw/lib/sasl2/libgssapiv2.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libgssapiv2.so.2=libgssapiv2.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libgssapiv2.so=libgssapiv2.so.2.0.22 root bin Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.depend =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.depend 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.depend 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,7 +0,0 @@ -P SUNWcsr - Core Solaris, (Root) -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWlibms - Sun WorkShop Bundled shared libm -P CSWsasl - sasl, Simple Authentication and Security Layer -P CSWlibpq - libraries needed by postgresql server and clients -P CSWmysql4rt - run-time lib for mysql4 -P CSWsqlite - An embeddable SQL engine in a C library Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.gspec =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.gspec 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.gspec 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,5 +0,0 @@ -%var bitname sasl_sql -%var pkgname CSWsaslsql -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsaslsql.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.prototype =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.prototype 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslsql.prototype 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,7 +0,0 @@ -i copyright=CSWsaslsql.copyright -i depend=CSWsaslsql.depend -i pkginfo=CSWsaslsql.pkginfo -f none /opt/csw/lib/sasl2/libsql.la 0755 root bin -f none /opt/csw/lib/sasl2/libsql.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libsql.so.2=libsql.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libsql.so=libsql.so.2.0.22 root bin Modified: csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init =================================================================== --- csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init 2011-10-16 11:14:52 UTC (rev 15913) +++ csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init 2011-10-16 11:50:40 UTC (rev 15914) @@ -1,6 +1,18 @@ #!/bin/sh # Startup script for saslauthd +# s none /etc/rc2.d/S85cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rc0.d/K15cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rc1.d/K15cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rc2.d/K15cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rcS.d/K15cswsaslauthd=../init.d/cswsaslauthd + +# Magic setting for CSWcswclassutils +#RC_KNUM 15 +#RC_SNUM 85 +#RC_KLEV 0,1,2,S +#RC_SLEV 2 + INIT_FILE=/etc/opt/csw/saslauthd.init if [ -f "${INIT_FILE}" ]; then INIT_FILE=/opt/csw/etc/saslauthd.init This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 16 14:19:06 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 Oct 2011 12:19:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[15915] csw/mgar/pkg/lang-python/python3/trunk/Makefile Message-ID: Revision: 15915 http://gar.svn.sourceforge.net/gar/?rev=15915&view=rev Author: rthurner Date: 2011-10-16 12:19:05 +0000 (Sun, 16 Oct 2011) Log Message: ----------- python3: copy 2.6 recipe Modified Paths: -------------- csw/mgar/pkg/lang-python/python3/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python3/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python3/trunk/Makefile 2011-10-16 11:50:40 UTC (rev 15914) +++ csw/mgar/pkg/lang-python/python3/trunk/Makefile 2011-10-16 12:19:05 UTC (rev 15915) @@ -1,8 +1,24 @@ +# $Id: Makefile 14947 2011-06-30 14:55:12Z wahwah $ + NAME = Python VERSION = 3.2.2 CATEGORIES = lang -PACKAGES = CSWpython3 CSWpython3-tk CSWidle3 +VER = 3.2 +DVER = 3-2 +UVER = 3_2 +PVER = python$(VER) +CVER = +# Known issues: +# +# - No 64-bit build +# - ctypes module doesn't compile +# - http://forums.sun.com/thread.jspa?threadID=5148204 +# - http://bugs.python.org/issue4902 +# - Python-2.6.1/Modules/_ctypes/libffi/src/x86/sysv.S + +SPKG_SOURCEURL = http://python.org/download/releases/$(VERSION) + DESCRIPTION = A high-level scripting language. define BLURB Python is an interpreted, interactive, object-oriented programming language. @@ -14,41 +30,172 @@ an extension language for applications that need a programmable interface. endef -SPKG_SOURCEURL = http://python.org/ MASTER_SITES = http://python.org/ftp/python/$(VERSION)/ +UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ DISTFILES = $(DISTNAME).tar.bz2 -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - # Patches -PATCHFILES += +#PATCHFILES += faqwiz.diff +#PATCHFILES += makesetup.diff +#PATCHFILES += modules.diff +#PATCHFILES += multiprocess.diff +#PATCHFILES += pyport.diff +#PATCHFILES += site.diff +#PATCHFILES += python-config-in.diff +#PATCHFILES += setup.diff +#PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch +# PATCHFILES += 0010-Hardcoding-the-use-of-libffi.patch +# PATCHFILES += 0011-OpenCSW-specific-libffi-include-dir.patch +# PATCHFILES += 0012-temporary-hack-to-compile-against-system-ffi.patch +#PATCHFILES += 0013-Use-opt-csw-bin-python-in-cgi.py.patch +#PATCHFILES += 0015-Adding-opt-csw-lib-to-dyld.py.patch +#PATCHFILES += 0016-CSW-mimetypes.patch +#PATCHFILES += 0017-Random-insignificant-removals-of-usr-local.patch +#PATCHFILES += 0018-Removing-usr-local-from-mailcap.patch # Test for sunaudiodev fails. SKIPTEST = 1 +EXTRA_INC += $(prefix)/bdb47/include +EXTRA_LIB += $(prefix)/bdb47/lib + +# There is a file name conflict over libffi.so symlink between libffi package +# and a gcc-java package. While it will ultimately belong to libffi_dev, the +# symlink is currently under a subdirectory. +# pkgchk -L CSWlibffi-dev +# (...) +# /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev +EXTRA_LIB += $(libdir)/ffi + +BASECFLAGS = $(CFLAGS) +EXTRA_COMMON_EXPORTS = BASECFLAGS + +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS += --enable-unicode=ucs4 +CONFIGURE_ARGS += --without-gcc +CONFIGURE_ARGS += --with-signal-module +CONFIGURE_ARGS += --with-fpectl +CONFIGURE_ARGS += --with-system-ffi -PKGFILES_CSWidle3 = $(libdir)/python(\d+(?:\.\d+)*)/idlelib/.* -PKGFILES_CSWidle3 += $(bindir)/idle -PKGFILES_CSWpython3-tk = $(libdir)/python(\d+(?:\.\d+)*)/lib-tk/.* -PKGFILES_CSWpython3-tk += $(libdir)/python(\d+(?:\.\d+)*)/lib-dynload/_tkinter.so.* +# This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. +# PYCOMPILE = 1 +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc +# use prototype filters to set the class +PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -RUNTIME_DEP_PKGS_CSWpython3 = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython3 += CSWncurses CSWosslrt CSWreadline CSWzlib -RUNTIME_DEP_PKGS_CSWpython3 += CSWsqlite3 CSWtcl CSWtk -RUNTIME_DEP_PKGS_CSWpython3-tk = CSWpython3 CSWtcl CSWtk -RUNTIME_DEP_PKGS_CSWidle3 = CSWpython3 CSWpython3-tk +PACKAGES = CSWidle$(CVER) +PACKAGES += CSWpython$(CVER) +PACKAGES += CSWpython$(CVER)-dev +PACKAGES += CSWpython$(CVER)-test +PACKAGES += CSWpython$(CVER)-tk +PACKAGES += CSWlibpython$(DVER)-1-0 +CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 +PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython$(VER)\.so\.1\.0(\.\d+)*) +SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) -CATALOGNAME_CSWpython3 = python -CATALOGNAME_CSWpython3-tk = python_tk -CATALOGNAME_CSWidle3 = idle +INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils +OBSOLETED_BY_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel -SPKG_DESC_CSWpython3 = A high-level scripting language. -SPKG_DESC_CSWpython3-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWidle3 = Python IDE +PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* +PKGFILES_CSWidle$(CVER) += $(bindir)/idle +PKGFILES_CSWpython$(CVER)-dev = $(includedir)/.* +PKGFILES_CSWpython$(CVER)-dev += $(libdir)/.*/config/.* +PKGFILES_CSWpython$(CVER)-dev += $(bindir)/.*config.* +PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER).so +# No idea why would this be in CSWpython, and no good idea for a better package +# to put it. +PKGFILES_CSWpython$(CVER)-dev += $(bindir)/smtpd.py +PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* +PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* +PKGFILES_CSWpython$(CVER)-test = $(libdir)/python/test/.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/bsddb/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/ctypes/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/email/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/distutils/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/json/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/lib2to3/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/sqlite3/test.* + +ARCHALL_CSWpython$(CVER)-test = 1 +ARCHALL_CSWidle$(CVER) = 1 + +RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER)-tk +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbdb47 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm3 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWzlib +RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtcl +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk + +BUILD_DEP_PKGS += CSWlibffi-dev + +# There are packages depending on libpython2.5, and listing CSWpython as the +# dependency. +RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-5-1-0 +CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWlibpython2-5-1-0 + +# This could be handled by automatic dependency detection +CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk + +# This package is not meant to be released +CHECKPKG_OVERRIDES_CSWpython-test += file-with-bad-content + +CATALOGNAME_CSWidle$(CVER) = idle +CATALOGNAME_CSWpython$(CVER) = python +CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev +CATALOGNAME_CSWpython$(CVER)-tk = python$(CVER)_tk +CATALOGNAME_CSWpython$(CVER)-test = python$(CVER)_test + +SPKG_DESC_CSWidle$(CVER) = Python IDE +SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series +SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python +SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWpython$(CVER)-test = Python Test modules + +LICENSE = LICENSE + +# This is an exception, since these are original Python packages. +CHECKPKG_OVERRIDES_CSWidle$(CVER) += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ + include gar/category.mk +post-configure-modulated: + for f in Modules/Setup \ + Makefile \ + Makefile.pre \ + Lib/idlelib/EditorWindow.py \ + Lib/pydoc_topics.py \ + Lib/idlelib/config-main.def \ + ; do \ + gsed -i -e 's+/usr/local+/opt/csw+g' $(WORKSRC)/$${f}; \ + gsed -i -e 's+/usr/share+/opt/csw/share+g' $(WORKSRC)/$${f}; \ + done + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 16 17:48:41 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 Oct 2011 15:48:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[15916] csw/mgar/pkg/lang-python/python3/trunk/Makefile Message-ID: Revision: 15916 http://gar.svn.sourceforge.net/gar/?rev=15916&view=rev Author: rthurner Date: 2011-10-16 15:48:41 +0000 (Sun, 16 Oct 2011) Log Message: ----------- python3, try to get rid of checkpkg errors ... Modified Paths: -------------- csw/mgar/pkg/lang-python/python3/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python3/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python3/trunk/Makefile 2011-10-16 12:19:05 UTC (rev 15915) +++ csw/mgar/pkg/lang-python/python3/trunk/Makefile 2011-10-16 15:48:41 UTC (rev 15916) @@ -98,7 +98,6 @@ SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils -OBSOLETED_BY_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* PKGFILES_CSWidle$(CVER) += $(bindir)/idle @@ -126,18 +125,15 @@ RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER)-tk -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbdb47 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm3 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWzlib +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) @@ -150,15 +146,12 @@ # There are packages depending on libpython2.5, and listing CSWpython as the # dependency. -RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-5-1-0 -CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWlibpython2-5-1-0 +RUNTIME_DEP_PKGS_CSWpython += CSWlibpython3-2-1-0 +CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWlibpython3-2-1-0 # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk -# This package is not meant to be released -CHECKPKG_OVERRIDES_CSWpython-test += file-with-bad-content - CATALOGNAME_CSWidle$(CVER) = idle CATALOGNAME_CSWpython$(CVER) = python CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev @@ -176,15 +169,43 @@ # This is an exception, since these are original Python packages. CHECKPKG_OVERRIDES_CSWidle$(CVER) += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ +#CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- +#CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ +#CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- +#CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/lib/pkgconfig/python3.pc|CSWpython|CSWpython31-dev +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/bin/python3|CSWpython|CSWpython31 +CHECKPKG_OVERRIDES_CSWpython-tk += surplus-dependency|CSWlibpython3-2-1-0 +CHECKPKG_OVERRIDES_CSWpython-tk += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWidle += file-with-bad-content|/usr/share|root/opt/csw/lib/python3.2/idlelib/EditorWindow.py +CHECKPKG_OVERRIDES_CSWidle += file-with-bad-content|/usr/share|root/opt/csw/lib/python3.2/idlelib/config-main.def +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/trace.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/site.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/mailcap.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/cgi.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/mimetypes.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/ctypes/macholib/dyld.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/pydoc_data/topics.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/config-3.2m/Makefile +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/config-3.2m/Setup +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/distutils/unixccompiler.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/test/test_subprocess.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/python3.2.1 +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/share|root/opt/csw/lib/python3.2/test/test_posixpath.py +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/share|root/opt/csw/lib/python3.2/test/cfgparser.2 +CHECKPKG_OVERRIDES_CSWpython += wrong-docdir|expected=/opt/csw/shared/doc/python/...|in-package=/opt/csw/share/doc/python_devel_stub/license +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/share/doc/python_devel_stub/license|CSWpython|CSWpython-devel +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/lib/pkgconfig/python3.pc|CSWpython|CSWpython31-dev +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/bin/python3|CSWpython|CSWpython31 +CHECKPKG_OVERRIDES_CSWlibpython3-2-1-0 += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWpython-dev += file-collision|/opt/csw/bin/python3-config|CSWpython-dev|CSWpython31-dev +CHECKPKG_OVERRIDES_CSWpython-test += surplus-dependency|CSWpython + include gar/category.mk post-configure-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 16 18:24:41 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 16 Oct 2011 16:24:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[15917] csw/mgar/pkg/lang-python/python3/trunk/Makefile Message-ID: Revision: 15917 http://gar.svn.sourceforge.net/gar/?rev=15917&view=rev Author: wahwah Date: 2011-10-16 16:24:41 +0000 (Sun, 16 Oct 2011) Log Message: ----------- pkg/lang-python/python3/trunk: add a reference to the python-3.1 build recipe Modified Paths: -------------- csw/mgar/pkg/lang-python/python3/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/lang-python/python3/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python3/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python3/trunk/Makefile 2011-10-16 15:48:41 UTC (rev 15916) +++ csw/mgar/pkg/lang-python/python3/trunk/Makefile 2011-10-16 16:24:41 UTC (rev 15917) @@ -1,4 +1,7 @@ -# $Id: Makefile 14947 2011-06-30 14:55:12Z wahwah $ +# $Id$ +# +# See also: +# pkg/lang-python/python/branches/python-3.1 NAME = Python VERSION = 3.2.2 Property changes on: csw/mgar/pkg/lang-python/python3/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Oct 16 18:26:59 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sun, 16 Oct 2011 17:26:59 +0100 Subject: [csw-devel] SF.net SVN: gar:[15913] csw/mgar/pkg/lang-python/python3/trunk In-Reply-To: References: Message-ID: 2011/10/16 : > Revision: 15913 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=15913&view=rev > Author: ? rthurner > Date: ? ? 2011-10-16 11:14:52 +0000 (Sun, 16 Oct 2011) > Log Message: > ----------- > python3: upgrade to python-3.2.2 Hi Rupert, In case you're interested, Python 3.1 packages are available from unstable. The build recipe is here: http://sourceforge.net/apps/trac/gar/browser/csw/mgar/pkg/lang-python/python/branches/python-3.1 Maciej From maciej at opencsw.org Sun Oct 16 18:32:10 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sun, 16 Oct 2011 17:32:10 +0100 Subject: [csw-devel] SF.net SVN: gar:[15916] csw/mgar/pkg/lang-python/python3/trunk/Makefile In-Reply-To: References: Message-ID: Hi Rupert, I've commented on this commit below in this email. 2011/10/16 : > Revision: 15916 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=15916&view=rev > Author: ? rthurner > Date: ? ? 2011-10-16 15:48:41 +0000 (Sun, 16 Oct 2011) > Log Message: > ----------- > python3, try to get rid of checkpkg errors ... > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/lang-python/python3/trunk/Makefile > > Modified: csw/mgar/pkg/lang-python/python3/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/lang-python/python3/trunk/Makefile ? ? 2011-10-16 12:19:05 UTC (rev 15915) > +++ csw/mgar/pkg/lang-python/python3/trunk/Makefile ? ? 2011-10-16 15:48:41 UTC (rev 15916) > @@ -98,7 +98,6 @@ > ?SPKG_DESC_CSWlibpython$(DVER)-1-0 ?= Python shared library ($(VER)) > > ?INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils > -OBSOLETED_BY_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel > > ?PKGFILES_CSWidle$(CVER) ?= $(libdir)/.*/idlelib/.* > ?PKGFILES_CSWidle$(CVER) += $(bindir)/idle > @@ -126,18 +125,15 @@ > > ?RUNTIME_DEP_PKGS_CSWidle$(CVER) ? += CSWpython$(CVER) > ?RUNTIME_DEP_PKGS_CSWidle$(CVER) ? += CSWpython$(CVER)-tk > -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbdb47 > -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 > +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 > ?RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 > -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 > ?RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm3 > -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 > -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 > +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncurses5 > ?RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 > ?RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt > -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline > -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt > -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWzlib > +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 > +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 > +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 > ?RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 > ?RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) > ?RUNTIME_DEP_PKGS_CSWpython$(CVER)-test ?+= CSWpython$(CVER) > @@ -150,15 +146,12 @@ > > ?# There are packages depending on libpython2.5, and listing CSWpython as the > ?# dependency. > -RUNTIME_DEP_PKGS_CSWpython ? ? ? ? ? ? ? += CSWlibpython2-5-1-0 > -CHECKPKG_OVERRIDES_CSWpython ? ? ? += surplus-dependency|CSWlibpython2-5-1-0 > +RUNTIME_DEP_PKGS_CSWpython ? ? ? ? ? ? ? += CSWlibpython3-2-1-0 > +CHECKPKG_OVERRIDES_CSWpython ? ? ? += surplus-dependency|CSWlibpython3-2-1-0 > > ?# This could be handled by automatic dependency detection > ?CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk > > -# This package is not meant to be released > -CHECKPKG_OVERRIDES_CSWpython-test += file-with-bad-content > - > ?CATALOGNAME_CSWidle$(CVER) ? ? ? ? = idle > ?CATALOGNAME_CSWpython$(CVER) ? ? ? = python > ?CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev > @@ -176,15 +169,43 @@ > ?# This is an exception, since these are original Python packages. > ?CHECKPKG_OVERRIDES_CSWidle$(CVER) ? ? ? ? += pkgname-does-not-start-with-CSWpy- > ?CHECKPKG_OVERRIDES_CSWidle$(CVER) ? ? ? ? += catalogname-does-not-start-with-py_ > -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test ?+= pkgname-does-not-start-with-CSWpy- > -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test ?+= catalogname-does-not-start-with-py_ > -CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- > -CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ > +#CHECKPKG_OVERRIDES_CSWpython$(CVER)-test ?+= pkgname-does-not-start-with-CSWpy- > +#CHECKPKG_OVERRIDES_CSWpython$(CVER)-test ?+= catalogname-does-not-start-with-py_ > +#CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- > +#CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ > ?CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk ? ?+= pkgname-does-not-start-with-CSWpy- > ?CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk ? ?+= catalogname-does-not-start-with-py_ > ?CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- > ?CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ > +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/lib/pkgconfig/python3.pc|CSWpython|CSWpython31-dev > +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/bin/python3|CSWpython|CSWpython31 > > +CHECKPKG_OVERRIDES_CSWpython-tk += surplus-dependency|CSWlibpython3-2-1-0 > +CHECKPKG_OVERRIDES_CSWpython-tk += surplus-dependency|CSWpython > +CHECKPKG_OVERRIDES_CSWidle += file-with-bad-content|/usr/share|root/opt/csw/lib/python3.2/idlelib/EditorWindow.py > +CHECKPKG_OVERRIDES_CSWidle += file-with-bad-content|/usr/share|root/opt/csw/lib/python3.2/idlelib/config-main.def > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/trace.py You can replace multiple file-with-bad-content overrides with a single one: CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content This improves the readability of the build recipe. > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/site.py > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/mailcap.py > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/cgi.py > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/mimetypes.py > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/ctypes/macholib/dyld.py > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/pydoc_data/topics.py > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/config-3.2m/Makefile > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/config-3.2m/Setup > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/distutils/unixccompiler.py > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python3.2/test/test_subprocess.py > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/python3.2.1 > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/share|root/opt/csw/lib/python3.2/test/test_posixpath.py > +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/share|root/opt/csw/lib/python3.2/test/cfgparser.2 > +CHECKPKG_OVERRIDES_CSWpython += wrong-docdir|expected=/opt/csw/shared/doc/python/...|in-package=/opt/csw/share/doc/python_devel_stub/license The wrong-docdir error should never be overridden. > +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/share/doc/python_devel_stub/license|CSWpython|CSWpython-devel > +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/lib/pkgconfig/python3.pc|CSWpython|CSWpython31-dev > +CHECKPKG_OVERRIDES_CSWpython += file-collision|/opt/csw/bin/python3|CSWpython|CSWpython31 If there are file collisions, especially in the bin directory, you need to either rename files, or handle multiple versions of the same file using alternatives. > +CHECKPKG_OVERRIDES_CSWlibpython3-2-1-0 += pkginfo-opencsw-repository-uncommitted The pkginfo-opencsw-repository-uncommitted error should never be overridden. It's only says that the package has been built from uncommitted sources. When you commit your changes and do "mgar repackage", this error will go away, so there's no point in overriding it. > +CHECKPKG_OVERRIDES_CSWpython-dev += file-collision|/opt/csw/bin/python3-config|CSWpython-dev|CSWpython31-dev Please use alternatives or rename files, or have a single -dev package for all versions of Python. Maciej From rthurner at users.sourceforge.net Sun Oct 16 20:42:16 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 Oct 2011 18:42:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15918] csw/mgar/pkg/lang-python/python3/trunk/ Message-ID: Revision: 15918 http://gar.svn.sourceforge.net/gar/?rev=15918&view=rev Author: rthurner Date: 2011-10-16 18:42:16 +0000 (Sun, 16 Oct 2011) Log Message: ----------- python3: base on python-3.1 seems better, so remove this one Removed Paths: ------------- csw/mgar/pkg/lang-python/python3/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 16 20:45:30 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 Oct 2011 18:45:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[15919] csw/mgar/pkg/lang-python/python3/ Message-ID: Revision: 15919 http://gar.svn.sourceforge.net/gar/?rev=15919&view=rev Author: rthurner Date: 2011-10-16 18:45:29 +0000 (Sun, 16 Oct 2011) Log Message: ----------- python3: base on python-3.1 seems better, so remove this one Removed Paths: ------------- csw/mgar/pkg/lang-python/python3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 16 20:47:54 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 Oct 2011 18:47:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[15920] csw/mgar/pkg/lang-python/python/branches Message-ID: Revision: 15920 http://gar.svn.sourceforge.net/gar/?rev=15920&view=rev Author: rthurner Date: 2011-10-16 18:47:53 +0000 (Sun, 16 Oct 2011) Log Message: ----------- python3: create a python-3.2 branch Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/python-3.2/ Modified: csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile 2011-10-16 18:42:16 UTC (rev 15918) +++ csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile 2011-10-16 18:47:53 UTC (rev 15920) @@ -1,13 +1,13 @@ # $Id$ NAME = Python -VERSION = 3.1.2 +VERSION = 3.2.2 CATEGORIES = lang -VER = 3.1 -DVER = 3-1 -UVER = 3_1 +VER = 3.2 +DVER = 3-2 +UVER = 3_2 PVER = python$(VER) -CVER = 31 +CVER = 32 # Known issues: # @@ -101,12 +101,12 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm3 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt -RUNTIME_DEP_PKGS_CSWpython31 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWpython31 += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWpython31 += CSWlibncursesw5 -RUNTIME_DEP_PKGS_CSWpython31 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpython31 += CSWlibpanel5 -RUNTIME_DEP_PKGS_CSWpython31 += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 16 21:05:37 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 Oct 2011 19:05:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[15921] csw/mgar/pkg/lang-python/python/branches/python-3.2 Message-ID: Revision: 15921 http://gar.svn.sourceforge.net/gar/?rev=15921&view=rev Author: rthurner Date: 2011-10-16 19:05:37 +0000 (Sun, 16 Oct 2011) Log Message: ----------- python3: python-3.2.2 checksums and ignores Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.2/checksums Property Changed: ---------------- csw/mgar/pkg/lang-python/python/branches/python-3.2/ Property changes on: csw/mgar/pkg/lang-python/python/branches/python-3.2 ___________________________________________________________________ Modified: svn:ignore - cookies download work + gar work Modified: csw/mgar/pkg/lang-python/python/branches/python-3.2/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.2/checksums 2011-10-16 18:47:53 UTC (rev 15920) +++ csw/mgar/pkg/lang-python/python/branches/python-3.2/checksums 2011-10-16 19:05:37 UTC (rev 15921) @@ -1,9 +1 @@ -45350b51b58a46b029fb06c61257e350 Python-3.1.2.tar.bz2 -42dd6523beb94a805d5764ae1276091c faqwiz.diff -33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff -22c5f741b1744213eaef0818ab280ad5 modules.diff -afcc79a94e2f8a576c7906a9700e35a0 multiprocess.diff -05724da367b025ce525de2bb704af6e3 pyport.diff -a1d114e8a20870675649aeef007a9cac python-config-in.diff -1d2763e140ff30a491b3ce11d1a44f97 setup.diff -d6c86beae46033be70c44c8e0e4c1908 site.diff +9d763097a13a59ff53428c9e4d098a05 Python-3.2.2.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 Sun Oct 16 23:17:40 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 16 Oct 2011 21:17:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[15922] csw/mgar/pkg/lang-python/python/branches/python-3.2 Message-ID: Revision: 15922 http://gar.svn.sourceforge.net/gar/?rev=15922&view=rev Author: rthurner Date: 2011-10-16 21:17:40 +0000 (Sun, 16 Oct 2011) Log Message: ----------- python3-2, remove not used patchfiles Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/python/branches/python-3.2/files/faqwiz.diff Modified: csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile 2011-10-16 19:05:37 UTC (rev 15921) +++ csw/mgar/pkg/lang-python/python/branches/python-3.2/Makefile 2011-10-16 21:17:40 UTC (rev 15922) @@ -36,14 +36,9 @@ DISTFILES = $(DISTNAME).tar.bz2 # Patches -PATCHFILES += faqwiz.diff PATCHFILES += makesetup.diff PATCHFILES += modules.diff PATCHFILES += multiprocess.diff -# PATCHFILES += pyport.diff -# PATCHFILES += site.diff -# PATCHFILES += python-config-in.diff -# PATCHFILES += setup.diff # The test for sunaudiodev fails. Not that it's a good practice to skip # tests. Deleted: csw/mgar/pkg/lang-python/python/branches/python-3.2/files/faqwiz.diff =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.2/files/faqwiz.diff 2011-10-16 19:05:37 UTC (rev 15921) +++ csw/mgar/pkg/lang-python/python/branches/python-3.2/files/faqwiz.diff 2011-10-16 21:17:40 UTC (rev 15922) @@ -1,11 +0,0 @@ ---- Python-2.6.1/Tools/faqwiz/faqconf.py 2005-12-11 20:02:24.000000000 -0600 -+++ faqconf.py 2009-02-08 18:17:58.938102953 -0600 -@@ -21,7 +21,7 @@ - OWNEREMAIL = "nobody at anywhere.org" # Email for feedback - HOMEURL = "http://www.python.org" # Related home page - HOMENAME = "Python home" # Name of related home page --RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands -+RCSBINDIR = "/opt/csw/bin/" # Directory containing RCS commands - # (must end in a slash) - - # Parameters you can normally leave alone 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 Oct 17 10:43:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Oct 2011 08:43:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[15923] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 15923 http://gar.svn.sourceforge.net/gar/?rev=15923&view=rev Author: dmichelsen Date: 2011-10-17 08:43:54 +0000 (Mon, 17 Oct 2011) Log Message: ----------- msmtp: Update to 1.4.25 and updated lib package names Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2011-10-16 21:17:40 UTC (rev 15922) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2011-10-17 08:43:54 UTC (rev 15923) @@ -1,5 +1,5 @@ NAME = msmtp -VERSION = 1.4.24 +VERSION = 1.4.25 CATEGORIES = net DESCRIPTION = SMTP client @@ -35,7 +35,7 @@ RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWmsmtp += CSWglib2 -RUNTIME_DEP_PKGS_5.9 = CSWlibgnugetopt +RUNTIME_DEP_PKGS_5.9 = CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSWmsmtp += $(RUNTIME_DEP_PKGS_$(GAROSREL)) EXTRA_LINKER_FLAGS_5.9 = -lgnugetopt @@ -43,9 +43,10 @@ VENDOR_URL = http://msmtp.sourceforge.net/ -BUILD_DEP_PKGS += CSWgnutlsdevel +BUILD_DEP_PKGS += CSWlibgnutls-dev BUILD_DEP_PKGS += CSWlibgsasldevel -BUILD_DEP_PKGS += CSWggettext +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWgnomekeyring-dev PRESERVECONF = $(sysconfdir)/msmtprc Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2011-10-16 21:17:40 UTC (rev 15922) +++ csw/mgar/pkg/msmtp/trunk/checksums 2011-10-17 08:43:54 UTC (rev 15923) @@ -1 +1 @@ -3ed704fbd3e7419cab5c65bb7928d9ba msmtp-1.4.24.tar.bz2 +2d9603a7b5c1ebd83ea289ac2aa3a634 msmtp-1.4.25.tar.bz2 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 Oct 17 10:58:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Oct 2011 08:58:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[15924] csw/mgar/pkg/rbgems/bundler/trunk Message-ID: Revision: 15924 http://gar.svn.sourceforge.net/gar/?rev=15924&view=rev Author: dmichelsen Date: 2011-10-17 08:58:49 +0000 (Mon, 17 Oct 2011) Log Message: ----------- rbgems/bundler/trunk: Update to 1.0.13 Modified Paths: -------------- csw/mgar/pkg/rbgems/bundler/trunk/Makefile csw/mgar/pkg/rbgems/bundler/trunk/checksums Modified: csw/mgar/pkg/rbgems/bundler/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/bundler/trunk/Makefile 2011-10-17 08:43:54 UTC (rev 15923) +++ csw/mgar/pkg/rbgems/bundler/trunk/Makefile 2011-10-17 08:58:49 UTC (rev 15924) @@ -1,5 +1,5 @@ NAME = bundler -VERSION = 0.9.26 +VERSION = 1.0.13 CATEGORIES = rbgems DESCRIPTION = Manages an application's dependencies through its entire life, @@ -10,8 +10,15 @@ PACKAGES = CSWgem-bundler CATALOGNAME = gem_bundler +# This is docs only +CHECKPKG_OVERRIDES_CSWgem-bundler += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/bundler-1.0.13/lib/bundler/man/bundle-config +CHECKPKG_OVERRIDES_CSWgem-bundler += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/bundler-1.0.13/lib/bundler/man/bundle-config.txt +CHECKPKG_OVERRIDES_CSWgem-bundler += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/bundler-1.0.13/man/bundle-config.ronn + LICENSE = LICENSE ARCHALL = 1 +EXTRA_MERGE_EXCLUDE_FILES += .*/\.gitignore + include gar/category.mk Modified: csw/mgar/pkg/rbgems/bundler/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/bundler/trunk/checksums 2011-10-17 08:43:54 UTC (rev 15923) +++ csw/mgar/pkg/rbgems/bundler/trunk/checksums 2011-10-17 08:58:49 UTC (rev 15924) @@ -1 +1 @@ -f74627d17d20b8ba491f9507ad551827 bundler-0.9.26.gem +7719d404a388f8c62c61d4e09e2f66cb bundler-1.0.13.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Mon Oct 17 17:52:33 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 17 Oct 2011 15:52:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[15925] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 15925 http://gar.svn.sourceforge.net/gar/?rev=15925&view=rev Author: aigoshin Date: 2011-10-17 15:52:33 +0000 (Mon, 17 Oct 2011) Log Message: ----------- nginx: release 20111017 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-10-17 08:58:49 UTC (rev 15924) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-10-17 15:52:33 UTC (rev 15925) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.1.5 +VERSION = 1.1.6 CATEGORIES = server GARCOMPILER = SOS11 Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2011-10-17 08:58:49 UTC (rev 15924) +++ csw/mgar/pkg/nginx/trunk/checksums 2011-10-17 15:52:33 UTC (rev 15925) @@ -1 +1 @@ -5f5d8c982ed0a2494b4f9347d407490d nginx-1.1.5.tar.gz +976bd857e7d2327aa9977efaacea2c8f nginx-1.1.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 17 22:32:49 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 17 Oct 2011 20:32:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[15926] csw/mgar/pkg/libgmp/branches/on-current/ Message-ID: Revision: 15926 http://gar.svn.sourceforge.net/gar/?rev=15926&view=rev Author: wahwah Date: 2011-10-17 20:32:49 +0000 (Mon, 17 Oct 2011) Log Message: ----------- Branching to build on current*. Added Paths: ----------- csw/mgar/pkg/libgmp/branches/on-current/ 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 Oct 18 11:19:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 Oct 2011 09:19:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[15927] csw/mgar/pkg/pca/trunk Message-ID: Revision: 15927 http://gar.svn.sourceforge.net/gar/?rev=15927&view=rev Author: dmichelsen Date: 2011-10-18 09:19:44 +0000 (Tue, 18 Oct 2011) Log Message: ----------- pca/trunk: Update to 20111018-01, move contrib to special directory Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2011-10-17 20:32:49 UTC (rev 15926) +++ csw/mgar/pkg/pca/trunk/Makefile 2011-10-18 09:19:44 UTC (rev 15927) @@ -1,5 +1,5 @@ NAME = pca -VERSION = 20110812-01 +VERSION = 20111018-01 CATEGORIES = utils DESCRIPTION = Patch Check Advanced @@ -17,6 +17,9 @@ MASTER_SITES += http://www.par.univie.ac.at/solaris/pca/contrib/ DISTFILES = $(NAME)-$(VERSION) DISTFILES += chkmin +DISTFILES += mkxref +DISTFILES += clean +DISTFILES += cleanup_sadm DISTFILES += COPYING DISTFILES += pca.conf @@ -51,7 +54,11 @@ install-custom: ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKSRC)/pca $(DESTDIR)$(bindir)/pca - ginstall $(WORKSRC)/chkmin $(DESTDIR)$(bindir)/chkmin + ginstall -d $(DESTDIR)$(sharedstatedir)/pca/contrib + ginstall $(WORKSRC)/chkmin $(DESTDIR)$(sharedstatedir)/pca/contrib/chkmin + ginstall $(WORKSRC)/mkxref $(DESTDIR)$(sharedstatedir)/pca/contrib/mkxref + ginstall $(WORKSRC)/clean $(DESTDIR)$(sharedstatedir)/pca/contrib/clean + ginstall $(WORKSRC)/cleanup_sadm $(DESTDIR)$(sharedstatedir)/pca/contrib/cleanup_sadm ginstall -d $(DESTDIR)/etc/opt/csw ginstall $(WORKSRC)/pca.conf $(DESTDIR)/etc/opt/csw ginstall -d $(DESTDIR)$(mandir)/man8 Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2011-10-17 20:32:49 UTC (rev 15926) +++ csw/mgar/pkg/pca/trunk/checksums 2011-10-18 09:19:44 UTC (rev 15927) @@ -1,2 +1,5 @@ f0a009f889da56e5a0de7f322dbfa0a8 chkmin -c9fff1a8be19209aae7d435ea888afd7 pca-20110812-01 +def9838b9f704ec17a32dd2aeec8bf02 clean +3027cc2e36a52704e4443cb5c7a91427 cleanup_sadm +9032b788b8a494082368ea0881146078 mkxref +3f095c2d03da4fb68f9b16f336d591bb pca-20111018-01 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 Oct 18 11:33:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 Oct 2011 09:33:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[15928] csw/mgar/pkg/rbgems/bundler/trunk Message-ID: Revision: 15928 http://gar.svn.sourceforge.net/gar/?rev=15928&view=rev Author: dmichelsen Date: 2011-10-18 09:33:18 +0000 (Tue, 18 Oct 2011) Log Message: ----------- rbgems/bundler/trunk: Update to 1.0.14 Modified Paths: -------------- csw/mgar/pkg/rbgems/bundler/trunk/Makefile csw/mgar/pkg/rbgems/bundler/trunk/checksums Modified: csw/mgar/pkg/rbgems/bundler/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/bundler/trunk/Makefile 2011-10-18 09:19:44 UTC (rev 15927) +++ csw/mgar/pkg/rbgems/bundler/trunk/Makefile 2011-10-18 09:33:18 UTC (rev 15928) @@ -1,5 +1,5 @@ NAME = bundler -VERSION = 1.0.13 +VERSION = 1.0.14 CATEGORIES = rbgems DESCRIPTION = Manages an application's dependencies through its entire life, @@ -11,9 +11,9 @@ CATALOGNAME = gem_bundler # This is docs only -CHECKPKG_OVERRIDES_CSWgem-bundler += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/bundler-1.0.13/lib/bundler/man/bundle-config -CHECKPKG_OVERRIDES_CSWgem-bundler += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/bundler-1.0.13/lib/bundler/man/bundle-config.txt -CHECKPKG_OVERRIDES_CSWgem-bundler += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/bundler-1.0.13/man/bundle-config.ronn +CHECKPKG_OVERRIDES_CSWgem-bundler += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/bundler-1.0.14/lib/bundler/man/bundle-config +CHECKPKG_OVERRIDES_CSWgem-bundler += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/bundler-1.0.14/lib/bundler/man/bundle-config.txt +CHECKPKG_OVERRIDES_CSWgem-bundler += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/bundler-1.0.14/man/bundle-config.ronn LICENSE = LICENSE Modified: csw/mgar/pkg/rbgems/bundler/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/bundler/trunk/checksums 2011-10-18 09:19:44 UTC (rev 15927) +++ csw/mgar/pkg/rbgems/bundler/trunk/checksums 2011-10-18 09:33:18 UTC (rev 15928) @@ -1 +1 @@ -7719d404a388f8c62c61d4e09e2f66cb bundler-1.0.13.gem +5da9d3ac952a2408a8d8a41d301dd6cd bundler-1.0.14.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 19 00:25:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 18 Oct 2011 22:25:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[15929] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ CSWmysql5.postinstall Message-ID: Revision: 15929 http://gar.svn.sourceforge.net/gar/?rev=15929&view=rev Author: wahwah Date: 2011-10-18 22:25:19 +0000 (Tue, 18 Oct 2011) Log Message: ----------- Updates to the postinstall file Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2011-10-18 09:33:18 UTC (rev 15928) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2011-10-18 22:25:19 UTC (rev 15929) @@ -10,9 +10,9 @@ # # http://dev.mysql.com/doc/refman/5.0/en/option-files.html # -prefix="/opt/csw/mysql5" +prefix="/opt/csw" BASEDIR="${prefix}" -MYSQL_HOME="/var${prefix}" +MYSQL_HOME="/var${prefix}/mysql5" sysconfdir="/etc${prefix}" # https://www.opencsw.org/mantis/view.php?id=4646 DEFAULTS_FILE="${sysconfdir}/my.cnf" @@ -64,7 +64,7 @@ echo "Creating MySQL core database in $MYSQLD_DATADIR" echo echo "### The following messages are from mysql_install_db." -$BASEDIR/bin/mysql_install_db \ +"$BASEDIR/bin/mysql_install_db-5.0" \ --defaults-extra-file="$DEFAULTS_FILE" \ --user="$MYSQLD_USER" \ --basedir="$BASEDIR" \ @@ -72,7 +72,7 @@ # Fix permissions on the data directory, since mysql_install_db was run as # root. -chown -R mysql:mysql $MYSQLD_DATADIR +chown -R ${MYSQLD_USER}:mysql $MYSQLD_DATADIR # Update --datadir in the cnf file with the correct value if file was copied if [ x"$CNFCOPIED" = xyes ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 19 09:23:29 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 19 Oct 2011 07:23:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[15930] csw/mgar/pkg/gcc4/branches/dublin-fix/ Message-ID: Revision: 15930 http://gar.svn.sourceforge.net/gar/?rev=15930&view=rev Author: wahwah Date: 2011-10-19 07:23:29 +0000 (Wed, 19 Oct 2011) Log Message: ----------- A temporary fix for the dublin catalog. Added Paths: ----------- csw/mgar/pkg/gcc4/branches/dublin-fix/ Property changes on: csw/mgar/pkg/gcc4/branches/dublin-fix ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: svn:mergeinfo + /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15321-15435 /csw/mgar/pkg/gcc4/branches/opt-csw-prefix:15436-15623 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 19 09:55:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 19 Oct 2011 07:55:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[15931] csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile Message-ID: Revision: 15931 http://gar.svn.sourceforge.net/gar/?rev=15931&view=rev Author: wahwah Date: 2011-10-19 07:55:19 +0000 (Wed, 19 Oct 2011) Log Message: ----------- gcc4/branches/dublin-fix: Dummy CSWlibstdc++6 and CSWlibgcc_s1 for the dublin catalog Modified Paths: -------------- csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile Modified: csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile =================================================================== --- csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile 2011-10-19 07:23:29 UTC (rev 15930) +++ csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile 2011-10-19 07:55:19 UTC (rev 15931) @@ -1,558 +1,23 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 # $Id$ -# -# ! Ada is not built yet, it requires PPL which isn't built yet. -# -# amd64 compilation fails -# potentially related bug: -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39048 -NAME = gcc -VERSION = 4.6.1 -CATEGORIES = lang -GARTYPE = v2 -BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') -PKG_VERSION_TOKEN = gcc4 -PKG_BASENAME = CSW$(PKG_VERSION_TOKEN) -# PKG_BASENAME = CSWgcc-$(subst .,-,$(BASE_VERION)) - -DESCRIPTION = The GNU Compiler Collection +NAME = temporary-fix +VERSION = 0.1 +CATEGORIES = lib +DESCRIPTION = A fix for the dublin catalog define BLURB - The GNU Compiler Collection includes front ends for C, C++, - Objective-C, Fortran, Java, and Ada, as well as libraries - for these languages (libstdc++, libgcj,...). endef +SPKG_SOURCEURL = http://www.opencsw.org/ +MASTER_SITES = +DISTFILES = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = +TEST_SCRIPTS = -DISTFILES = $(DISTNAME).tar.bz2 -MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ +PACKAGES = +OBSOLETED_BY_CSWgcc4corert = CSWlibgcc-s1 +OBSOLETED_BY_CSWgcc4g++rt = CSWlibstdc++6 -LIBOBJC = 3 - -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 - -# GIT init takes a long time, disable for now, reenable if build works -NOGITPATCH ?= 1 - -## Source URLs -VENDOR_URL = http://gcc.gnu.org - -## Copyright File -LICENSE = COPYING3 - -# prefix = $(BUILD_PREFIX)/$(PKG_VERSION_TOKEN) -# libdir_install = $(BUILD_PREFIX)/lib -# libdir = $(abspath $(BUILD_PREFIX)/lib/$(MM_LIBDIR)) -# CONFIGURE_ARGS += --prefix=$(prefix) -# CONFIGURE_ARGS += --libdir=$(libdir) -# CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/$(PKG_VERSION_TOKEN) - -BUILD_DEP_PKGS += CSWlibz-dev -BUILD_DEP_PKGS += CSWlibgmp-dev -BUILD_DEP_PKGS += CSWlibmpc-dev -BUILD_DEP_PKGS += CSWlibmpfr-dev -BUILD_DEP_PKGS += CSWlibppl-dev -BUILD_DEP_PKGS += CSWcloog-dev - -## build options -# http://gcc.gnu.org/install/configure.html - -# Could be used to break out of the /opt/csw/$(PKG_VERSION_TOKEN) prefix -PROGRAM_SUFFIX = -$(BASE_VERSION) -CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX) - -CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --with-gnu-as -CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas -CONFIGURE_ARGS += --without-gnu-ld -CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld -CONFIGURE_ARGS += --enable-nls -CONFIGURE_ARGS += --with-included-gettext -CONFIGURE_ARGS += --with-libiconv-prefix=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-x -CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX) -# To be enabled when PPL is built -CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX) -CONFIGURE_ARGS += --enable-cloog-backend=isl -CONFIGURE_ARGS += --enable-java-awt=xlib -# CONFIGURE_ARGS += --enable-libada -CONFIGURE_ARGS += --enable-libssp -CONFIGURE_ARGS += --enable-objc-gc -CONFIGURE_ARGS += --enable-threads=posix -# We'll build ada later. It requires the PPL library. -# CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc -CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc -CONFIGURE_ARGS += --with-system-zlib=/opt/csw - -# there could be some abstractions in gar.conf.mk, but at the moment there -# aren't so let's specify architectures by hand. -# -# This avoids the sparcv8+ binaries. -CPU_sparc_32 = v8 -CPU_sparc_64 = v9 -CPU_i386_32 = i386 -CPU_i386_64 = x86-64 - -CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32) -# These two should not be defined, otherwise the Intel build breaks. -# CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32) -# CONFIGURE_ARGS_i386 += --with-cpu-64=$(CPU_$(GARCH)_64) -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) - -# GCC can't be built in the same directory with the sources. -# It also can't be built in a subdirectory of the sources. -OBJDIR = $(abspath $(WORKDIR)/objdir) - -# These flags are passed when gcc is built with gcc. -# Needed to remove FLAVOR_FLAGS, because they were Sun Studio specific. -CFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) -CXXFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -CFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET_$(GARCH)) -CXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET_$(GARCH)) -EXTRA_EXPORTS += CFLAGS_FOR_TARGET -EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET - -# The theory goes that the CFLAGS and CXXFLAGS cause problems with the -# multilib builds where 64-bit binaries are built. This is triggered by the -# gcc build; the compiler binaries are 32-bit only, but since the compiler can -# generate 32-bit and 64-bit binaries, the libraries have to be built for both -# architectures. -CFLAGS = -CXXFLAGS = - -# Might be necessary, but CFLAGS_FOR_TARGET seem to be enough for now. -# BOOT_CFLAGS = $(CFLAGS_FOR_TARGET) -# EXTRA_EXPORTS += BOOT_FLAGS - -# bash must be used, otherwise: -# http://fixunix.com/solaris/490396-gcc-build-fails-cannot-compute-suffix-object-files.html -CONFIG_SHELL = /opt/csw/bin/bash -EXTRA_EXPORTS += CONFIG_SHELL - -EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET -EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET - -# Only required for Sun Studio bootstrapping -# PATCHFILES += 0001-clear-AM_CFLAGS-in-lto-plugin.patch - -# Bootstrapping with Sun Studio has issues -# http://gcc.gnu.org/ml/gcc-help/2011-08/msg00191.html -GARCOMPILER = GNU - -# There's a lot of failing checks. Probably a lot of porting work. -SKIPTEST ?= 1 - -# Used multiple times in package definitions -JAVA_LIB_VERSION = 12 - -ALTERNATIVES_PRIO = 460 - -PACKAGES = $(PKG_BASENAME)core -SPKG_DESC_$(PKG_BASENAME)core = GNU C compiler -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibcloog-isl2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibffi4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj-tools$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgij$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgomp1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibisl7 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibpwl5 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibssp0 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibz1 - -# checkpkg-undetectable dependencies -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWbinutils -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWgsed -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWcoreutils -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWggrep - -ALTERNATIVES_$(PKG_BASENAME)core += $(PKG_VERSION_TOKEN)core -ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/cpp gcc_core $(bindir)/cpp$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) -ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gcc gcc_core $(bindir)/gcc$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gcov gcc_core $(bindir)/gcov$(PROGRAM_SUFFIX) - -# Because I can. -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-with-bad-content -CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += file-with-bad-content -CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += file-with-bad-content -CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += file-with-bad-content -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la -CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-with-bad-content -CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += file-with-bad-content -# Due to complex regular expressions -CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|$(PKG_BASENAME)g++|$(PKG_BASENAME)java -CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|$(PKG_BASENAME)g++|$(PKG_BASENAME)java -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWbinutils -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWcoreutils -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWggrep -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWgsed - -# Only man pages, so not a big problem. Alternatives could be used, but it -# requires rebuilding libffi. -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_call.3|$(PKG_BASENAME)core|CSWlibffi-dev -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi.3|$(PKG_BASENAME)core|CSWlibffi-dev -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_prep_cif.3|$(PKG_BASENAME)core|CSWlibffi-dev - -# The .a files are necessary -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap -CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += discouraged-path-in-pkgmap -CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += discouraged-path-in-pkgmap - -CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += discouraged-path-in-pkgmap - -# From the 'hopeless errors' department: -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libffi.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libgcc_s.so|CSWgcc3core|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libgcj.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libffi.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libgcj.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)objc -CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)objc -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/lib-gnu-awt-xlib.so|CSWgcc3javart|$(PKG_BASENAME)core - -# Some static libraries are required to build binaries with gcc, for example -# libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found -MERGE_EXCLUDE_LIBTOOL = -MERGE_EXCLUDE_STATICLIBS = -EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/libiberty\.a - -# Catch-all package - -PACKAGES += CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) -CATALOGNAME_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) = lib_gnu_awt_xlib$(JAVA_LIB_VERSION) -PKGFILES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += $(call baseisadirs,$(libdir),lib-gnu-awt-xlib\.so\.$(JAVA_LIB_VERSION)(\.\d+)*) -SPKG_DESC_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += $(DESCRIPTION), lib-gnu-awt-xlib.so.$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += CSWlibstdc++$(LIBSTDCXX_VERSION) -RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += CSWlibgcc-s1 - -PACKAGES += CSWlibffi4 -CATALOGNAME_CSWlibffi4 = libffi4 -PKGFILES_CSWlibffi4 += $(call baseisadirs,$(libdir),libffi\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibffi4 += $(DESCRIPTION), libffi.so.4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibffi4 -RUNTIME_DEP_PKGS_CSWlibffi4 += CSWlibgcc-s1 - -PACKAGES += CSWlibgcc-s1 -CATALOGNAME_CSWlibgcc-s1 = libgcc_s1 -PKGFILES_CSWlibgcc-s1 += $(call baseisadirs,$(libdir),libgcc_s\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibgcc-s1 += $(DESCRIPTION), libgcc_s.so.1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibgcc-s1 -# For reference, the old CSWgcc3corert: -# http://buildfarm.opencsw.org/pkgdb/srv4/1991387f2cb9f545b2a1b254b50638ef/ -OBSOLETED_BY_CSWlibgcc-s1 = CSWgcc3corert - -PACKAGES += CSWlibgcj-tools$(JAVA_LIB_VERSION) -CATALOGNAME_CSWlibgcj-tools$(JAVA_LIB_VERSION) = libgcj_tools$(JAVA_LIB_VERSION) -PKGFILES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += $(call baseisadirs,$(libdir),libgcj-tools\.so\.$(JAVA_LIB_VERSION)(\.\d+)*) -SPKG_DESC_CSWlibgcj-tools$(JAVA_LIB_VERSION) += $(DESCRIPTION), libgcj-tools.so.$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibgcj-tools$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_CSWlibgcj-tools$(JAVA_LIB_VERSION) += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgcj-tools$(JAVA_LIB_VERSION) += CSWlibgcj$(JAVA_LIB_VERSION) - -PACKAGES += CSWlibgcj$(JAVA_LIB_VERSION) -CATALOGNAME_CSWlibgcj$(JAVA_LIB_VERSION) = libgcj$(JAVA_LIB_VERSION) -PKGFILES_CSWlibgcj$(JAVA_LIB_VERSION) += $(call baseisadirs,$(libdir),libgcj\.so\.$(JAVA_LIB_VERSION)(\.\d+)*) -SPKG_DESC_CSWlibgcj$(JAVA_LIB_VERSION) += $(DESCRIPTION), libgcj.so.$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_CSWlibgcj$(JAVA_LIB_VERSION) += CSWlibgcc-s1 - -PACKAGES += CSWlibgfortran3 -CATALOGNAME_CSWlibgfortran3 = libgfortran3 -PKGFILES_CSWlibgfortran3 += $(call baseisadirs,$(libdir),libgfortran\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibgfortran3 += $(DESCRIPTION), libgfortran.so.3 -RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibgfortran3 -RUNTIME_DEP_PKGS_CSWlibgfortran3 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibgfortran3 = $(PKG_BASENAME)gfortranrt - -PACKAGES += CSWlibgij$(JAVA_LIB_VERSION) -CATALOGNAME_CSWlibgij$(JAVA_LIB_VERSION) = libgij$(JAVA_LIB_VERSION) -PKGFILES_CSWlibgij$(JAVA_LIB_VERSION) += $(call baseisadirs,$(libdir),libgij\.so\.$(JAVA_LIB_VERSION)(\.\d+)*) -SPKG_DESC_CSWlibgij$(JAVA_LIB_VERSION) += $(DESCRIPTION), libgij.so.$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION) += CSWlibgcj$(JAVA_LIB_VERSION) - -PACKAGES += CSWlibgomp1 -CATALOGNAME_CSWlibgomp1 = libgomp1 -PKGFILES_CSWlibgomp1 += $(call baseisadirs,$(libdir),libgomp\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibgomp1 += $(DESCRIPTION), libgomp.so.1 -RUNTIME_DEP_PKGS_CSWlibgomp1 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibgomp1 += $(PKG_BASENAME)corert - - -PACKAGES += CSWlibobjc$(LIBOBJC) -CATALOGNAME_CSWlibobjc$(LIBOBJC) = libobjc$(LIBOBJC) -PKGFILES_CSWlibobjc$(LIBOBJC) += $(call baseisadirs,$(libdir),libobjc\.so\.$(LIBOBJC)(\.\d+)*) -SPKG_DESC_CSWlibobjc$(LIBOBJC) += $(DESCRIPTION), libobjc.so.$(LIBOBJC) -RUNTIME_DEP_PKGS_CSWlibobjc$(LIBOBJC) += CSWlibgcc-s1 - -PACKAGES += CSWlibobjc-gc$(LIBOBJC) -CATALOGNAME_CSWlibobjc-gc$(LIBOBJC) = libobjc_gc$(LIBOBJC) -PKGFILES_CSWlibobjc-gc$(LIBOBJC) += $(call baseisadirs,$(libdir),libobjc_gc\.so\.$(LIBOBJC)(\.\d+)*) -SPKG_DESC_CSWlibobjc-gc$(LIBOBJC) += $(DESCRIPTION), libobjc_gc.so.$(LIBOBJC) -RUNTIME_DEP_PKGS_CSWlibobjc-gc$(LIBOBJC) += CSWlibgcc-s1 - -PACKAGES += CSWlibssp0 -CATALOGNAME_CSWlibssp0 = libssp0 -PKGFILES_CSWlibssp0 += $(call baseisadirs,$(libdir),libssp\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibssp0 += $(DESCRIPTION), libssp.so.0 -RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibssp0 += $(PKG_BASENAME)corert - -LIBSTDCXX_VERSION = 6 - -PACKAGES += CSWlibstdc++$(LIBSTDCXX_VERSION) -CATALOGNAME_CSWlibstdc++$(LIBSTDCXX_VERSION) = libstdc++$(LIBSTDCXX_VERSION) -PKGFILES_CSWlibstdc++$(LIBSTDCXX_VERSION) += $(call baseisadirs,$(libdir),libstdc\+\+\.so\.$(LIBSTDCXX_VERSION)(\.\d+)*) -SPKG_DESC_CSWlibstdc++$(LIBSTDCXX_VERSION) += $(DESCRIPTION), libstdc++.so.$(LIBSTDCXX_VERSION) -RUNTIME_DEP_PKGS_CSWlibstdc++$(LIBSTDCXX_VERSION) += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibstdc++$(LIBSTDCXX_VERSION) = $(PKG_BASENAME)g++rt - -# The libquadmath.so.0 library is only build on Intel -PACKAGES_i386 += CSWlibquadmath0 -CATALOGNAME_CSWlibquadmath0 = libquadmath0 -PKGFILES_CSWlibquadmath0 += $(call baseisadirs,$(libdir),libquadmath\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibquadmath0 += GNU C compiler, libquadmath.so.0 -RUNTIME_DEP_PKGS_CSWlibquadmath0 += CSWlibgcc-s1 - -# Dependencies only on Intel -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386 += CSWlibquadmath0 -RUNTIME_DEP_PKGS_CSWlibgfortran3_i386 += CSWlibquadmath0 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH)) -RUNTIME_DEP_PKGS_CSWlibgfortran3 += $(RUNTIME_DEP_PKGS_CSWlibgfortran3_$(GARCH)) - -PACKAGES += $(PKG_BASENAME)g++ -SPKG_DESC_$(PKG_BASENAME)g++ = GNU C++ Compiler -PKGFILES_$(PKG_BASENAME)g++ = $(foreach F,$(CXX_BINARIES),$(bindir)/$(F)$(PROGRAM_SUFFIX)) -PKGFILES_$(PKG_BASENAME)g++ += $(foreach F,$(CXX_BINARIES),$(prefix)/$(PKG_VERSION_TOKEN)/bin/$(F)) -PKGFILES_$(PKG_BASENAME)g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-[cg]\+\+$(PROGRAM_SUFFIX) -PKGFILES_$(PKG_BASENAME)g++ += $(libexecdir)/.*cc1plus -PKGFILES_$(PKG_BASENAME)g++ += $(libdir)/.*libstdc.*a -PKGFILES_$(PKG_BASENAME)g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so) -PKGFILES_$(PKG_BASENAME)g++ += $(mandir)/.*g\+\+.1 -# I do not understand this regular expression. -PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.* -PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.* -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibcloog-isl2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibisl7 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibpwl5 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibstdc++$(LIBSTDCXX_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibz1 - -# The C++ compiler needs the C compiler. -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += $(PKG_BASENAME)core - -ALTERNATIVES_$(PKG_BASENAME)g++ += $(PKG_VERSION_TOKEN)g++ -ALTERNATIVE_$(PKG_VERSION_TOKEN)g++ += $(bindir)/g++ gcc_gplusplus $(bindir)/g++$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) - -OBSOLETED_BY_CSWlibgcc-s1 += $(PKG_BASENAME)corert -RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION) += CSWlibgcc-s1 - -PACKAGES += $(PKG_BASENAME)gfortran -SPKG_DESC_$(PKG_BASENAME)gfortran = GNU Fortran Compiler -PKGFILES_$(PKG_BASENAME)gfortran += $(foreach F,$(FORTRAN_BINARIES),$(bindir)/$(F)$(PROGRAM_SUFFIX)) -PKGFILES_$(PKG_BASENAME)gfortran += $(foreach F,$(FORTRAN_BINARIES),$(prefix)/$(PKG_VERSION_TOKEN)/bin/$(F)) -PKGFILES_$(PKG_BASENAME)gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-gfortran$(PROGRAM_SUFFIX) -PKGFILES_$(PKG_BASENAME)gfortran += $(libdir)/.*libgfortran.*a -PKGFILES_$(PKG_BASENAME)gfortran += $(libexecdir)/.*f951 -PKGFILES_$(PKG_BASENAME)gfortran += $(mandir)/.*gfortran.1 -PKGFILES_$(PKG_BASENAME)gfortran += $(infodir)/gfortran.* -PKGFILES_$(PKG_BASENAME)gfortran += $(call baseisadirs,$(libdir),libgfortran\.so) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibcloog-isl2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgfortran3 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibisl7 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibpwl5 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibz1 - -OBSOLETED_BY_$(PKG_BASENAME)gfortran = $(PKG_BASENAME)g95 -OBSOLETED_BY_$(PKG_BASENAME)gfortran += $(PKG_BASENAME)g95rt - -ALTERNATIVES_$(PKG_BASENAME)gfortran += gfortran -ALTERNATIVE_gfortran += $(bindir)/gfortran gcc_gfortran $(bindir)/gfortran$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) - -PACKAGES += $(PKG_BASENAME)java -SPKG_DESC_$(PKG_BASENAME)java = GNU Java Compiler -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibcloog-isl2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcj$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcj-tools$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgij$(JAVA_LIB_VERSION) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibisl7 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibpwl5 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibz1 - -PKGFILES_$(PKG_BASENAME)java = $(foreach F,$(JAVA_BINARIES),$(bindir)/$(F)$(PROGRAM_SUFFIX)) -PKGFILES_$(PKG_BASENAME)java += $(foreach F,$(JAVA_BINARIES),$(prefix)/$(PKG_VERSION_TOKEN)/bin/$(F)) -PKGFILES_$(PKG_BASENAME)java += $(bindir)/\w+-\w+-solaris[\d\.]+-gcj$(PROGRAM_SUFFIX) -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gcj.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gij.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/jv.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/jcf.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/grmi.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*jar.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*jni.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*java.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gorbd.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gapplet.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gkeytool.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gserialver.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gtnameserv.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gnative2ascii.* -PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gc-analyze.* -PKGFILES_$(PKG_BASENAME)java += $(datadir)/java/.* -PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*libgij.*a -PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*libffi.*a -PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*lib-gnu-awt.*a -PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*security.* -PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*logging.properties -PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*pkgconfig.* -PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*gcj.*a -PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*libgcj.*a -PKGFILES_$(PKG_BASENAME)java += $(libexecdir)/.*collect.* -PKGFILES_$(PKG_BASENAME)java += $(libexecdir)/.*jvgenmain -PKGFILES_$(PKG_BASENAME)java += $(libexecdir)/.*jc1.* -PKGFILES_$(PKG_BASENAME)java += $(infodir)/gcj.* -PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*gcj/.* -PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*awt/.* -PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*classpath/.* -PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*java.* -PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*ffi.h -PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*org/.* - -# The following list could be probably expanded from $(JAVA_BINARIES) -ALTERNATIVES_$(PKG_BASENAME)java += $(PKG_VERSION_TOKEN)java -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/aot-compile gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gappletviewer gcc_gjava $(bindir)/gappletviewer$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gc-analyze gcc_gjava $(bindir)/gc-analyze$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gcj gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gcj-dbtool gcc_gjava $(bindir)/gcj-dbtool$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gcjh gcc_gjava $(bindir)/gcjh$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gij gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gjar gcc_gjava $(bindir)/gjar$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gjarsigner gcc_gjava $(bindir)/gjarsigner$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gjavah gcc_gjava $(bindir)/gjavah$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gkeytool gcc_gjava $(bindir)/gkeytool$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gnative2ascii gcc_gjava $(bindir)/$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gorbd gcc_gjava $(bindir)/gorbd$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmic gcc_gjava $(bindir)/grmic$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmid gcc_gjava $(bindir)/grmid$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmregistry gcc_gjava $(bindir)/grmregistry$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmregistry gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gserialver gcc_gjava $(bindir)/gserialver$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gtnameserv gcc_gjava $(bindir)/gtnameserv$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/jcf-dump gcc_gjava $(bindir)/jcf-dump$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/jv-convert gcc_gjava $(bindir)/jv-convert$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/rebuild-gcj-db gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX) - -PACKAGES += $(PKG_BASENAME)objc -SPKG_DESC_$(PKG_BASENAME)objc = GNU Objective C Compiler -PKGFILES_$(PKG_BASENAME)objc = $(libexecdir)/.*cc1obj -PKGFILES_$(PKG_BASENAME)objc += $(libdir)/.*libobjc.*a -PKGFILES_$(PKG_BASENAME)objc += $(includedir)/.*objc/.* -PKGFILES_$(PKG_BASENAME)objc += $(libdir)/.*/include/objc/.* -PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc.so) -PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc_gc.so) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibcloog-isl2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibisl7 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc3 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc3 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibppl-c4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibppl9 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibpwl5 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibz1 - -# libiconv deps cropped up relatively late in the porting process. Perhaps -# they apply to all arch/OS combinations. -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibiconv2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibiconv2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibiconv2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibiconv2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibiconv2 - -# Maybe it's unnecessary. -# # Solaris 10 on i386 specific: -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)java_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)java_$(GARCH)_$(GAROSREL)) - -# Not needed even on i386/5.10? -# -# # These dependencies seem to exist only in the i386 packages on 5.10 -# RUNTIME_DEP_PKGS_CSWlibgcj$(JAVA_LIB_VERSION)_i386_5.10 = CSWlibz1 -# RUNTIME_DEP_PKGS_CSWlibgcj$(JAVA_LIB_VERSION) += $(RUNTIME_DEP_PKGS_CSWlibgcj$(JAVA_LIB_VERSION)_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION)_i386_5.10 = CSWlibz1 -# RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION) += $(RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION)_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_CSWlibgcj-tools$(JAVA_LIB_VERSION)_i386_5.10 += CSWlibz1 -# RUNTIME_DEP_PKGS_CSWlibgcj-tools$(JAVA_LIB_VERSION) += $(RUNTIME_DEP_PKGS_CSWlibgcj-tools$(JAVA_LIB_VERSION)_$(GARCH)_$(GAROSREL)) - -PACKAGES += $(PACKAGES_$(GARCH)) -CORE_BINARIES = cpp gcc gcov -CXX_BINARIES = g\+\+ c\+\+ -FORTRAN_BINARIES = gfortran -JAVA_BINARIES = gcj gij aot-compile grmiregistry -JAVA_BINARIES += gappletviewer gc-analyze gcj-dbtool gcjh gjar gjarsigner gjavah -JAVA_BINARIES += gkeytool gnative2ascii gorbd grmic grmid grmregistry -JAVA_BINARIES += gserialver gtnameserv jcf-dump jv-convert rebuild-gcj-db - -include files/scripts.mk include gar/category.mk - -post-install-modulated: - ginstall -d -m 755 $(DESTDIR)$(prefix)/$(PKG_VERSION_TOKEN)/bin - for b in $(CORE_BINARIES) $(CXX_BINARIES) \ - $(FORTRAN_BINARIES) $(JAVA_BINARIES); do \ - gln -v -s ../../bin/$${b}$(PROGRAM_SUFFIX) \ - $(DESTDIR)$(prefix)/$(PKG_VERSION_TOKEN)/bin/$${b}; \ - done - @$(MAKECOOKIE) - -# We need GNU find as find -PATH := /opt/csw/gnu:$(PATH) - -# This override sets the right RPATH on libstdc++ and other libraries. -LD_OPTIONS := -R/opt/csw/lib -R/opt/csw/lib/\$$ISALIST -CONFIGURE_ENV := PATH=$(PATH) CC=$(CC) LD_OPTIONS="$(LD_OPTIONS)" -BUILD_ENV := PATH=$(PATH) LD_OPTIONS="$(LD_OPTIONS)" -INSTALL_ENV := PATH=$(PATH) 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 Oct 19 10:12:47 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 19 Oct 2011 08:12:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[15932] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 15932 http://gar.svn.sourceforge.net/gar/?rev=15932&view=rev Author: dmichelsen Date: 2011-10-19 08:12:47 +0000 (Wed, 19 Oct 2011) Log Message: ----------- mGAR v2: Require at least one package to be build, remove unnecessary duplicate definition of _PKG_SPECS Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-10-19 07:55:19 UTC (rev 15931) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-10-19 08:12:47 UTC (rev 15932) @@ -91,6 +91,7 @@ $(foreach P,$(OBSOLETED_PKGS),$(eval $(call obsoleted_pkg,$P))) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) +$(if $(_PKG_SPECS),,$(error No packages for building defined)) # The is the name of the package containing the sourcefiles for all packages generated from this GAR recipe. # It defaults to the first defined package name or gspec. SRCPACKAGE_BASE is guaranteed @@ -114,8 +115,6 @@ $(if $(REQUIRED_PKGS),$(error The deprecated variable 'REQUIRED_PKGS' is defined, please replace it with RUNTIME_DEP_PKGS)) $(foreach P,$(SPKG_SPECS),$(if $(REQUIRED_PKGS_$P),$(error The deprecated variable 'REQUIRED_PACKAGES_$P' is defined, please replace it with RUNTIME_DEP_PKGS_$P))) -_PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) - BUNDLE ?= $(NAME) # pkgname - Get the name of a package from a gspec-name or package-name 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 Oct 19 10:14:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 19 Oct 2011 08:14:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[15933] csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile Message-ID: Revision: 15933 http://gar.svn.sourceforge.net/gar/?rev=15933&view=rev Author: dmichelsen Date: 2011-10-19 08:14:48 +0000 (Wed, 19 Oct 2011) Log Message: ----------- gcc4/branches/dublin-fix: Make sure to know the new packages Modified Paths: -------------- csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile Modified: csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile =================================================================== --- csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile 2011-10-19 08:12:47 UTC (rev 15932) +++ csw/mgar/pkg/gcc4/branches/dublin-fix/Makefile 2011-10-19 08:14:48 UTC (rev 15933) @@ -17,6 +17,8 @@ TEST_SCRIPTS = PACKAGES = +FOREIGN_PACKAGES += CSWgcc4corert +FOREIGN_PACKAGES += CSWgcc4g++rt OBSOLETED_BY_CSWgcc4corert = CSWlibgcc-s1 OBSOLETED_BY_CSWgcc4g++rt = CSWlibstdc++6 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 Oct 19 10:39:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 19 Oct 2011 08:39:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[15934] csw/mgar/pkg Message-ID: Revision: 15934 http://gar.svn.sourceforge.net/gar/?rev=15934&view=rev Author: dmichelsen Date: 2011-10-19 08:39:29 +0000 (Wed, 19 Oct 2011) Log Message: ----------- mod_httpbl: Initial commit, does not compile Modified Paths: -------------- csw/mgar/pkg/mod_httpbl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mod_httpbl/ csw/mgar/pkg/mod_httpbl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/mod_httpbl/trunk/Makefile csw/mgar/pkg/mod_httpbl/trunk/files/0001-Fix-install-destination.patch csw/mgar/pkg/mod_httpbl/trunk/files/CSWap2modauthkerb.postinstall csw/mgar/pkg/mod_httpbl/trunk/files/CSWap2modauthkerb.preremove Deleted: csw/mgar/pkg/mod_httpbl/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2011-08-28 19:44:23 UTC (rev 15455) +++ csw/mgar/pkg/mod_httpbl/trunk/Makefile 2011-10-19 08:39:29 UTC (rev 15934) @@ -1,57 +0,0 @@ -NAME = mod_auth_kerb -VERSION = 5.4 -CATEGORIES = server - -DESCRIPTION = Apache Kerberos authentication module -define BLURB - This is the Apache RADIUS authentication module. It allows any Apache web-server - to become a RADIUS client for authentication and accounting requests. You will, - however, need to supply your own RADIUS server to perform the actual authentication. -endef - -SF_PROJ = modauthkerb -MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWap2modauthkerb.postinstall -DISTFILES += CSWap2modauthkerb.preremove - -# Apply patch until this is fixed: -# https://sourceforge.net/tracker/?func=detail&atid=464524&aid=3172644&group_id=51775 -PATCHFILES += 0001-Fix-install-destination.patch - -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -VENDOR_URL = http://modauthkerb.sourceforge.net/ -LICENSE = LICENSE - -PACKAGES = CSWap2modauthkerb -CATALOGNAME = ap2_mod_auth_kerb -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWapache2 -CHECKPKG_OVERRIDES_CSWap2modauthkerb += surplus-dependency|CSWapache2 - -# That path is almost ok -CHECKPKG_OVERRIDES_CSWap2modauthkerb += bad-rpath-entry|/opt/csw/lib/|opt/csw/apache2/libexec/mod_auth_kerb.so - -# Apache paths -AP2_ROOT = $(prefix)/apache2 -AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec - -CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --without-krb4 -CONFIGURE_ARGS += --with-krb5=$(prefix) -CONFIGURE_ARGS += --with-apache=$(prefix)/apache2 - -# The package does not provide a check -TEST_SCRIPTS = - -INSTALL_OVERRIDE_VARS = AP2_LIBEXEC -INSTALL_OVERRIDE_VAR_AP2_LIBEXEC = $(AP2_LIBEXEC) - -include gar/category.mk - -pre-install-modulated: - ginstall -d $(AP2_LIBEXEC) - ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME) - ginstall $(WORKSRC)/README $(WORKSRC)/INSTALL $(DESTDIR)$(docdir)/$(CATALOGNAME) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/mod_httpbl/trunk/Makefile (from rev 15904, csw/mgar/pkg/mod_auth_kerb/trunk/Makefile) =================================================================== --- csw/mgar/pkg/mod_httpbl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mod_httpbl/trunk/Makefile 2011-10-19 08:39:29 UTC (rev 15934) @@ -0,0 +1,60 @@ +# TBD: +# - Recipe not ready, does not compile due to missing strsep and possibly other things + +NAME = mod_httpbl +VERSION = 1.5 +CATEGORIES = server + +DESCRIPTION = Apache blacklist module +define BLURB + The mod_httpbl Apache module is ideal for leveraging the Project Honey pot http:BL services + within the context of an Apache web server. Built on the Apache APIs, the mod enables web + admins to block comment spammers, harvesters, and other malicious IPs. +endef + +SF_PROJ = httpbl +# Project for download on CVS +MASTER_SITES = http://httpbl.cvs.sourceforge.net/viewvc/httpbl/mod_httpbl_for_apache_2.0/mod_httpbl_source/ +DISTNAME = +DISTFILES += mod_httpbl.c +DISTFILES += install.txt + +VENDOR_URL = http://sourceforge.net/projects/httpbl/ +#LICENSE = LICENSE + +PACKAGES = CSWap2modhttpbl +CATALOGNAME = ap2_mod_httpbl +RUNTIME_DEP_PKGS_CSWap2modhttpbl += CSWapache2 +CHECKPKG_OVERRIDES_CSWap2modhttpbl += surplus-dependency|CSWapache2 + +# Apache paths +AP2_ROOT = $(prefix)/apache2 +AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec +AP2_APXS = $(AP2_ROOT)/sbin/apxs + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +INSTALL_SCRIPTS = custom + +# The package does not provide a check +TEST_SCRIPTS = + +AP2_MODS = 1 +AP2_MODFILES += \*auth_kerb\*so + +include gar/category.mk + +build-custom: + $(AP2_APXS) -c $(WORKSRC)/mod_httpbl.c + +# install: +#- ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS}" "-c -i" "src/mod_auth_kerb.c" +#+ ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "" "${APXS}" "-i -S LIBEXECDIR=$(AP2_LIBEXEC)" "src/mod_auth_kerb.la" + + +install-custom: + ginstall -d $(AP2_LIBEXEC) + ginstall + ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME) + #ginstall $(WORKSRC)/README $(WORKSRC)/INSTALL $(DESTDIR)$(docdir)/$(CATALOGNAME) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/mod_httpbl/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/checksums 2011-08-28 19:44:23 UTC (rev 15455) +++ csw/mgar/pkg/mod_httpbl/trunk/checksums 2011-10-19 08:39:29 UTC (rev 15934) @@ -1 +1,2 @@ -642b81763ad3ca81dba359cb952da5e3 mod_auth_kerb-5.4.tar.gz +b7c1114788c0b43221221069f663b812 install.txt +8a13dec4c2434c4f4dabaab57ec074b7 mod_httpbl.c Deleted: csw/mgar/pkg/mod_httpbl/trunk/files/0001-Fix-install-destination.patch =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Fix-install-destination.patch 2011-08-28 19:44:23 UTC (rev 15455) +++ csw/mgar/pkg/mod_httpbl/trunk/files/0001-Fix-install-destination.patch 2011-10-19 08:39:29 UTC (rev 15934) @@ -1,37 +0,0 @@ -From f60dd9c4b6212a72c125f40f4112795ee22c2fe9 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 4 Feb 2011 12:25:23 +0100 -Subject: [PATCH] Fix install destination - ---- - Makefile.in | 2 +- - apxs.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 36f6046..6c1cb62 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -16,7 +16,7 @@ src/mod_auth_kerb.so: src/mod_auth_kerb.c $(SPNEGO_SRCS) - ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS}" "-c" "src/mod_auth_kerb.c" - - install: -- ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS}" "-c -i" "src/mod_auth_kerb.c" -+ ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "" "${APXS}" "-i -S LIBEXECDIR=$(AP2_LIBEXEC)" "src/mod_auth_kerb.la" - - clean: - for i in . src spnegokrb5; do \ -diff --git a/apxs.sh b/apxs.sh -index cdb3e65..dfe893a 100755 ---- a/apxs.sh -+++ b/apxs.sh -@@ -1,5 +1,5 @@ - #!/bin/sh - cppflags=`[ -n "$1" ] && echo $1 | sed -e 's/\([^ ]*\)/-Wc,\1/g'` - ldflags=`[ -n "$2" ] && echo $2 | sed -e 's/\([^ ]*\)/-Wl,\1/g'` --ret=eval "$4" $5 $cppflags $ldflags src/mod_auth_kerb.c $3 -+ret=eval "$4" $5 $cppflags $ldflags $6 $3 - exit $ret --- -1.7.3.2 - Deleted: csw/mgar/pkg/mod_httpbl/trunk/files/CSWap2modauthkerb.postinstall =================================================================== --- csw/mgar/pkg/mod_auth_kerb/trunk/files/CSWap2modauthkerb.postinstall 2011-08-28 19:44:23 UTC (rev 15455) +++ csw/mgar/pkg/mod_httpbl/trunk/files/CSWap2modauthkerb.postinstall 2011-10-19 08:39:29 UTC (rev 15934) @@ -1,25 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_EXTRADIR=$AP2_CONFDIR/extra -AP2_CONFIG=$AP2_CONFDIR/httpd.conf - -# Enable the auth_kerb modules -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -chroot $PKG_INSTALL_ROOT \ - $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \ - auth_kerb mod_auth_kerb.so - -# Finito -cat < Revision: 15935 http://gar.svn.sourceforge.net/gar/?rev=15935&view=rev Author: dmichelsen Date: 2011-10-19 12:10:44 +0000 (Wed, 19 Oct 2011) Log Message: ----------- libneon27/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/libneon27/trunk/Makefile Modified: csw/mgar/pkg/libneon27/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon27/trunk/Makefile 2011-10-19 08:39:29 UTC (rev 15934) +++ csw/mgar/pkg/libneon27/trunk/Makefile 2011-10-19 12:10:44 UTC (rev 15935) @@ -30,9 +30,9 @@ SPKG_DESC_CSWlibneon27 = Neon HTTP and WebDAV client library, libneon.so.27 PKGFILES_CSWlibneon27 += $(call pkgfiles_lib,libneon.so.27) PKGFILES_CSWlibneon27 += $(sharedstatedir)/locale/.* -RUNTIME_DEP_PKGS_CSWlibneon27 += CSWexpat +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWlibneon27 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibneon27 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibintl8 OBSOLETED_BY_CSWlibneon27 = CSWneon @@ -42,13 +42,17 @@ PKGFILES_CSWlibneon27-feature += $(call pkgfiles_lib,libneon-feature.so.27) RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibneon27 CHECKPKG_OVERRIDES_CSWlibneon27-feature += surplus-dependency|CSWlibneon27 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWexpat RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWzlib RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWpakchois RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibproxy +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibpakchois0 OBSOLETED_BY_CSWlibneon27-feature = CSWneonfull PACKAGES += CSWlibneon-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 19 14:39:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 19 Oct 2011 12:39:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[15936] csw/mgar/pkg/libneon27/trunk/Makefile Message-ID: Revision: 15936 http://gar.svn.sourceforge.net/gar/?rev=15936&view=rev Author: dmichelsen Date: 2011-10-19 12:39:39 +0000 (Wed, 19 Oct 2011) Log Message: ----------- libneon27/trunk: Update dependencies and fix typos Modified Paths: -------------- csw/mgar/pkg/libneon27/trunk/Makefile Modified: csw/mgar/pkg/libneon27/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon27/trunk/Makefile 2011-10-19 12:10:44 UTC (rev 15935) +++ csw/mgar/pkg/libneon27/trunk/Makefile 2011-10-19 12:39:39 UTC (rev 15936) @@ -47,7 +47,6 @@ RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibproxy RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibkrb5support0 RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibgssapi-krb5-2 @@ -65,20 +64,13 @@ # This describes the defaults during configure CHECKPKG_OVERRIDES_CSWlibneon-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/neon/html/using.html -# This comes from krb5-config --libs -CHECKPKG_OVERRIDES_CSWlibneon27-feature += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-feature.so.27.2.5 - # These are artifacts of the feature lib being a regular one. # As it is never linked against the soname doesn't matter here and the package name # is obviously different from the soname in this case. -CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.5 -CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.5 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.6 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.6 CHECKPKG_OVERRIDES_CSWlibneon27-feature += shared-lib-pkgname-mismatch -# These will go away after release -CHECKPKG_OVERRIDES_CSWlibneon27 += file-collision|/opt/csw/lib/libneon.so.27|CSWlibneon27|CSWneon -CHECKPKG_OVERRIDES_CSWlibneon27 += file-collision|/opt/csw/lib/sparcv9/libneon.so.27|CSWlibneon27|CSWneon - BUILD_DEP_PKGS = CSWossldevel CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois --without-gssapi @@ -135,6 +127,6 @@ @# This is needed because the substitutions from pax args do not change the @# contents of the symlink rm -f $(PKGROOT)$(libdir)/libneon-feature.so.27 - ln -s libneon-feature.so.27.2.5 $(PKGROOT)$(libdir)/libneon-feature.so.27 + ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/libneon-feature.so.27 rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 - ln -s libneon-feature.so.27.2.5 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 + ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Oct 19 23:50:40 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 19 Oct 2011 21:50:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[15937] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 15937 http://gar.svn.sourceforge.net/gar/?rev=15937&view=rev Author: rthurner Date: 2011-10-19 21:50:40 +0000 (Wed, 19 Oct 2011) Log Message: ----------- subversion-1.7, add pytohn binding again Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-10-19 12:39:39 UTC (rev 15936) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-10-19 21:50:40 UTC (rev 15937) @@ -266,8 +266,7 @@ include gar/category.mk -BINDING_LANGS = java perl ruby -#BINDING_LANGS = java perl python ruby +BINDING_LANGS = java perl python ruby BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS)) PI_DEPENDS += copy-templates This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 20 11:35:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 Oct 2011 09:35:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[15938] csw/mgar/gar/v2/lib/python Message-ID: Revision: 15938 http://gar.svn.sourceforge.net/gar/?rev=15938&view=rev Author: wahwah Date: 2011-10-20 09:35:43 +0000 (Thu, 20 Oct 2011) Log Message: ----------- checkpkg: Small cleanups Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/pkgdb_test.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2011-10-19 21:50:40 UTC (rev 15937) +++ csw/mgar/gar/v2/lib/python/models.py 2011-10-20 09:35:43 UTC (rev 15938) @@ -312,7 +312,8 @@ catrel = sqlobject.ForeignKey('CatalogRelease', notNone=True) def __unicode__(self): - return u"Error: %s %s %s" % (self.pkgname, self.tag_name, self.tag_info) + return (u"CheckpkgErrorTag: %s %s %s" + % (self.pkgname, self.tag_name, self.tag_info)) class CheckpkgOverride(sqlobject.SQLObject): Modified: csw/mgar/gar/v2/lib/python/pkgdb_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb_test.py 2011-10-19 21:50:40 UTC (rev 15937) +++ csw/mgar/gar/v2/lib/python/pkgdb_test.py 2011-10-20 09:35:43 UTC (rev 15938) @@ -1,4 +1,5 @@ #!/usr/bin/env python2.6 +# coding=utf-8 import unittest import pkgdb @@ -10,7 +11,8 @@ ci = pkgdb.CatalogImporter() self.assertEquals( "/home/mirror/opencsw/current/sparc/5.9/catalog", - ci.ComposeCatalogFilePath("/home/mirror/opencsw/current", "SunOS5.9", "sparc")) + ci.ComposeCatalogFilePath( + "/home/mirror/opencsw/current", "SunOS5.9", "sparc")) class FunctionUnitTest(unittest.TestCase): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 20 11:36:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 Oct 2011 09:36:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15939] csw/mgar/gar/v2/lib/python/common_constants.py Message-ID: Revision: 15939 http://gar.svn.sourceforge.net/gar/?rev=15939&view=rev Author: wahwah Date: 2011-10-20 09:36:13 +0000 (Thu, 20 Oct 2011) Log Message: ----------- checkpkg: 'legacy' as one of default catalogs Modified Paths: -------------- csw/mgar/gar/v2/lib/python/common_constants.py Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2011-10-20 09:35:43 UTC (rev 15938) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2011-10-20 09:36:13 UTC (rev 15939) @@ -60,7 +60,7 @@ DEFAULT_CATALOG_RELEASES = frozenset([ 'dublin', 'unstable', - 'stable', + 'legacy', ]) # At some point, it was used to prevent people from linking against This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 20 11:36:44 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 Oct 2011 09:36:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[15940] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 15940 http://gar.svn.sourceforge.net/gar/?rev=15940&view=rev Author: wahwah Date: 2011-10-20 09:36:43 +0000 (Thu, 20 Oct 2011) Log Message: ----------- pkgdb/html-gen: Cope with missing repo tag OPENCSW_REPOSITORY might be missing from pkginfo. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2011-10-20 09:36:13 UTC (rev 15939) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2011-10-20 09:36:43 UTC (rev 15940) @@ -128,7 +128,10 @@ data = srv4.GetStatsStruct() build_src_url_svn = srv4.GetSvnUrl() build_src_url_trac = srv4.GetTracUrl() - data["build_src"] = data["pkginfo"]["OPENCSW_REPOSITORY"] + if "OPENCSW_REPOSITORY" in data["pkginfo"]: + data["build_src"] = data["pkginfo"]["OPENCSW_REPOSITORY"] + else: + data["build_src"] = u"Repository address unknown" data["build_src_url_svn"] = build_src_url_svn data["build_src_url_trac"] = build_src_url_trac data["error_tags"] = list(self.GetErrorTagsResult(srv4)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 20 11:43:15 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 Oct 2011 09:43:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[15941] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 15941 http://gar.svn.sourceforge.net/gar/?rev=15941&view=rev Author: wahwah Date: 2011-10-20 09:43:15 +0000 (Thu, 20 Oct 2011) Log Message: ----------- pkgdb: Use the unstable catalog by default The 'current' catalog is now deprecated. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2011-10-20 09:36:43 UTC (rev 15940) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2011-10-20 09:43:15 UTC (rev 15941) @@ -365,8 +365,8 @@ default="sparc", help="'i386' or 'sparc'") parser.add_option("-c", "--catalog-release", dest="catrel", - default="current", - help="E.g. current, unstable, testing, stable") + default="unstable", + help="E.g. unstable, dublin") parser.add_option("--replace", dest="replace", default=False, action="store_true", help="Replace packages when importing (importpkg)") 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 Oct 20 22:16:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 20 Oct 2011 20:16:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15942] csw/mgar/pkg/libcurl4/trunk Message-ID: Revision: 15942 http://gar.svn.sourceforge.net/gar/?rev=15942&view=rev Author: dmichelsen Date: 2011-10-20 20:16:34 +0000 (Thu, 20 Oct 2011) Log Message: ----------- libcurl4/trunk: Update to 7.21.7, add librtmp support, adjust package names Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile csw/mgar/pkg/libcurl4/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2011-10-20 09:43:15 UTC (rev 15941) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-10-20 20:16:34 UTC (rev 15942) @@ -1,5 +1,9 @@ +# TBD: +# - Link against new libfbopenssl0 +# - Link against new librtmp0 + NAME = curl -VERSION = 7.21.6 +VERSION = 7.21.7 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers @@ -16,10 +20,6 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -# Use patch until this is fixed: -# https://sourceforge.net/tracker/?func=detail&aid=3294509&group_id=976&atid=100976 -PATCHFILES += 0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch - FOREIGN_PACKAGES += CSWlibcurl2 OBSOLETED_BY_CSWlibcurl2 += CSWcurlrt CATALOGNAME_CSWcurlrt = curl_rt_stub @@ -33,20 +33,21 @@ PKGFILES_CSWlibcurl4 = $(call pkgfiles_lib,libcurl.so.4) OBSOLETED_BY_CSWlibcurl4 = CSWcurlrt RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibidn11 PACKAGES += CSWlibcurl4-feature CATALOGNAME_CSWlibcurl4-feature = libcurl4_feature SPKG_DESC_CSWlibcurl4-feature = Full-features library for client-side URL transfers superseding libcurl.so.4 PKGFILES_CSWlibcurl4-feature = $(call pkgfiles_lib,libcurl-feature.so.4) -RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWzlib -RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibfbopenssl +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibfbopenssl0 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibidn11 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWosslrt RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWoldaprt RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibssh2 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibrtmp0 # These are artifacts of the feature lib being a regular one. # As it is never linked against the soname doesn't matter here and the package name @@ -66,7 +67,7 @@ CATALOGNAME_CSWcurl = curl SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWcurl += CSWzlib +RUNTIME_DEP_PKGS_CSWcurl += CSWlibz1 RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWcurl += CSWosslrt @@ -79,8 +80,10 @@ BUILD_DEP_PKGS += CSWoldapdevel BUILD_DEP_PKGS += CSWossldevel -BUILD_DEP_PKGS += CSWlibcaresdevel +BUILD_DEP_PKGS += CSWlibcares-dev BUILD_DEP_PKGS += CSWlibssh2devel +BUILD_DEP_PKGS += CSWlibfbopenssl-dev +BUILD_DEP_PKGS += CSWlibrtmp-dev VENDOR_URL = http://curl.haxx.se @@ -90,6 +93,7 @@ EXTRA_CONFIGURE_ARGS_features-minimal += --disable-ldap EXTRA_CONFIGURE_ARGS_features-minimal += --without-libssh2 EXTRA_CONFIGURE_ARGS_features-minimal += --disable-ares +EXTRA_CONFIGURE_ARGS_features-minimal += --without-librtmp EXTRA_CONFIGURE_ARGS_features-full += --enable-ares EXTRA_CONFIGURE_ARGS_features-full += --with-spnego=$(libdir) Modified: csw/mgar/pkg/libcurl4/trunk/checksums =================================================================== --- csw/mgar/pkg/libcurl4/trunk/checksums 2011-10-20 09:43:15 UTC (rev 15941) +++ csw/mgar/pkg/libcurl4/trunk/checksums 2011-10-20 20:16:34 UTC (rev 15942) @@ -1 +1 @@ -6611989a81ebd7b03a35adc3001ddee0 curl-7.21.6.tar.bz2 +5f6d50c4d4ee38c57fe37e3cff75adbd curl-7.21.7.tar.bz2 Deleted: csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch =================================================================== --- csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch 2011-10-20 09:43:15 UTC (rev 15941) +++ csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch 2011-10-20 20:16:34 UTC (rev 15942) @@ -1,30 +0,0 @@ -From d3924ea3a11fe747edf84bd4e907ce17f61beaad Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 28 Apr 2011 19:34:10 +0200 -Subject: [PATCH] Use stdint.h only when it is available, fall back to inttypes.h - ---- - docs/examples/anyauthput.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c -index 6b3d74a..679b0f3 100644 ---- a/docs/examples/anyauthput.c -+++ b/docs/examples/anyauthput.c -@@ -27,7 +27,12 @@ - # ifdef __VMS - typedef int intptr_t; - # else --# include -+# ifdef CURL_PULL_STDINT_H -+# include -+# endif -+# ifdef CURL_PULL_INTTYPES_H -+# include -+# endif - # endif - # include - #endif --- -1.7.3.2 - 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 Oct 20 23:41:02 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 20 Oct 2011 21:41:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[15943] csw/mgar/pkg/libcurl4/trunk Message-ID: Revision: 15943 http://gar.svn.sourceforge.net/gar/?rev=15943&view=rev Author: dmichelsen Date: 2011-10-20 21:41:02 +0000 (Thu, 20 Oct 2011) Log Message: ----------- libcurl4/trunk: Update to 7.22.0 Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile csw/mgar/pkg/libcurl4/trunk/checksums Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2011-10-20 20:16:34 UTC (rev 15942) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-10-20 21:41:02 UTC (rev 15943) @@ -3,7 +3,7 @@ # - Link against new librtmp0 NAME = curl -VERSION = 7.21.7 +VERSION = 7.22.0 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers Modified: csw/mgar/pkg/libcurl4/trunk/checksums =================================================================== --- csw/mgar/pkg/libcurl4/trunk/checksums 2011-10-20 20:16:34 UTC (rev 15942) +++ csw/mgar/pkg/libcurl4/trunk/checksums 2011-10-20 21:41:02 UTC (rev 15943) @@ -1 +1 @@ -5f6d50c4d4ee38c57fe37e3cff75adbd curl-7.21.7.tar.bz2 +bdb5c226d37c4a6082c70e7ef6f63060 curl-7.22.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 21 09:25:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 Oct 2011 07:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[15944] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 15944 http://gar.svn.sourceforge.net/gar/?rev=15944&view=rev Author: wahwah Date: 2011-10-21 07:25:35 +0000 (Fri, 21 Oct 2011) Log Message: ----------- pkgdb-web: Serve file lists by md5 sums vs REST Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-20 21:41:02 UTC (rev 15943) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-21 07:25:35 UTC (rev 15944) @@ -34,6 +34,7 @@ r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname', r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail', + r'/rest/srv4/([0-9a-f]{32})/files/', 'RestSrv4DetailFiles', ) # render = web.template.render('templates/') @@ -282,6 +283,27 @@ raise web.notfound() +class RestSrv4DetailFiles(object): + + def GET(self, md5_sum): + ConnectToDatabase() + try: + pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() + files = models.CswFile.selectBy(srv4_file=pkg) + web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=file-list') + web.header('Access-Control-Allow-Origin', '*') + def FileDict(file_obj): + return { + "basename": file_obj.basename, + "path": file_obj.path, + "line": file_obj.line, + } + serializable_files = [FileDict(x) for x in files] + return json.dumps(serializable_files) + except sqlobject.main.SQLObjectNotFound, e: + raise web.notfound() + + class Srv4ByCatAndCatalogname(object): def GET(self, catrel_name, arch_name, osrel_name, catalogname): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 21 10:06:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 Oct 2011 08:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[15945] csw/mgar/gar/v2/lib/python Message-ID: Revision: 15945 http://gar.svn.sourceforge.net/gar/?rev=15945&view=rev Author: wahwah Date: 2011-10-21 08:06:40 +0000 (Fri, 21 Oct 2011) Log Message: ----------- checkpkg: unit tests updated for GAR suggestions Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks_test.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2011-10-21 07:25:35 UTC (rev 15944) +++ csw/mgar/gar/v2/lib/python/dependency_checks_test.py 2011-10-21 08:06:40 UTC (rev 15945) @@ -297,7 +297,7 @@ r'PKGFILES_CSWfoo-bar += ' r'$(call baseisadirs,$(libdir),libfoo\.so\.1(\.\d+)*)') messenger_mock.SuggestGarLine( - 'SPKG_DESC_CSWfoo-bar += A foo bar package, libfoo.so.1') + 'SPKG_DESC_CSWfoo-bar += $(DESCRIPTION), libfoo.so.1') messenger_mock.SuggestGarLine( r'RUNTIME_DEP_PKGS_CSWfoo += CSWfoo-bar') messenger_mock.SuggestGarLine( Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-21 07:25:35 UTC (rev 15944) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-21 08:06:40 UTC (rev 15945) @@ -1515,15 +1515,25 @@ 'file=/opt/csw/lib/sparcv9/libneon.so') self.messenger.SuggestGarLine("# (If CSWneon-dev doesn't exist yet)") self.messenger.SuggestGarLine('PACKAGES += CSWneon-dev') + self.messenger.SuggestGarLine('CATALOGNAME_CSWneon-dev = neon_dev') self.messenger.SuggestGarLine( + 'SPKG_DESC_CSWneon-dev += $(DESCRIPTION), development files') + self.messenger.SuggestGarLine( 'PKGFILES_CSWneon-dev += /opt/csw/lib/libneon.so') - self.messenger.SuggestGarLine('CATALOGNAME_CSWneon-dev = neon_dev') + self.messenger.SuggestGarLine('# Maybe also the generic:') + self.messenger.SuggestGarLine( + '# PKGFILES_CSWneon-dev += $(PKGFILES_DEVEL)') self.messenger.Message(mox.IsA(str)) self.messenger.SuggestGarLine("# (If CSWneon-dev doesn't exist yet)") self.messenger.SuggestGarLine('PACKAGES += CSWneon-dev') + self.messenger.SuggestGarLine('CATALOGNAME_CSWneon-dev = neon_dev') self.messenger.SuggestGarLine( + 'SPKG_DESC_CSWneon-dev += $(DESCRIPTION), development files') + self.messenger.SuggestGarLine( 'PKGFILES_CSWneon-dev += /opt/csw/lib/sparcv9/libneon.so') - self.messenger.SuggestGarLine('CATALOGNAME_CSWneon-dev = neon_dev') + self.messenger.SuggestGarLine('# Maybe also the generic:') + self.messenger.SuggestGarLine( + '# PKGFILES_CSWneon-dev += $(PKGFILES_DEVEL)') self.messenger.Message(mox.IsA(str)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 21 10:07:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 Oct 2011 08:07:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15946] csw/mgar/gar/v2/lib/python Message-ID: Revision: 15946 http://gar.svn.sourceforge.net/gar/?rev=15946&view=rev Author: wahwah Date: 2011-10-21 08:07:12 +0000 (Fri, 21 Oct 2011) Log Message: ----------- checkpkg: unit tests updated for relocated support Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2011-10-21 08:06:40 UTC (rev 15945) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2011-10-21 08:07:12 UTC (rev 15946) @@ -126,12 +126,16 @@ self.CheckPkgpathExists() remove_prefix = "%s/" % self.pkgpath self.file_paths = self.GetPathsInSubdir(remove_prefix, "root") - self.file_paths += self.GetPathsInSubdir(remove_prefix, "reloc") + if self.RelocPresent(): + self.file_paths += self.GetPathsInSubdir(remove_prefix, "reloc") return self.file_paths + def RelocPresent(self): + return os.path.exists(os.path.join(self.directory, "reloc")) + def GetFilesDir(self): """Returns the subdirectory in which files, are either "reloc" or "root".""" - if os.path.exists(os.path.join(self.directory, "reloc")): + if self.RelocPresent(): return "reloc" else: return "root" Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2011-10-21 08:06:40 UTC (rev 15945) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2011-10-21 08:07:12 UTC (rev 15946) @@ -46,10 +46,14 @@ u'/fake/path/CSWfoo/root/foo-file').AndReturn( "application/x-executable") self.mox.StubOutWithMock(os.path, 'isdir') + self.mox.StubOutWithMock(os.path, 'exists') self.mox.StubOutWithMock(os, 'walk') + # self.mox.StubOutWithMock(__builtins__, 'open') os.path.isdir("/fake/path/CSWfoo").AndReturn(True) os.path.isdir("/fake/path/CSWfoo").AndReturn(True) os.path.isdir("/fake/path/CSWfoo").AndReturn(True) + os.path.exists("/fake/path/CSWfoo/reloc").AndReturn(False) + os.path.exists("/fake/path/CSWfoo/reloc").AndReturn(False) os.walk("/fake/path/CSWfoo/root").AndReturn( [ ("/fake/path/CSWfoo/root", [], ["foo-file"]), @@ -57,6 +61,9 @@ ) self.mox.ReplayAll() ip = inspective_package.InspectivePackage("/fake/path/CSWfoo") + ip.pkginfo_dict = { + "BASEDIR": "", + } self.assertEqual(["foo-file"], ip.ListBinaries()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 21 10:07:45 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 Oct 2011 08:07:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[15947] csw/mgar/gar/v2/lib/python Message-ID: Revision: 15947 http://gar.svn.sourceforge.net/gar/?rev=15947&view=rev Author: wahwah Date: 2011-10-21 08:07:45 +0000 (Fri, 21 Oct 2011) Log Message: ----------- Check name correction. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-21 08:07:12 UTC (rev 15946) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-21 08:07:45 UTC (rev 15947) @@ -187,7 +187,7 @@ return new_ppbs -def CatalognameLowercase(pkg_data, error_mgr, logger, messenger): +def CheckCatalognameLowercase(pkg_data, error_mgr, logger, messenger): catalogname = pkg_data["basic_stats"]["catalogname"] if catalogname != catalogname.lower(): error_mgr.ReportError("catalogname-not-lowercase") Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-21 08:07:12 UTC (rev 15946) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-21 08:07:45 UTC (rev 15947) @@ -169,18 +169,18 @@ class TestCatalognameLowercase_1(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CatalognameLowercase' + FUNCTION_NAME = 'CheckCatalognameLowercase' def CheckpkgTest(self): self.pkg_data["basic_stats"]["catalogname"] = "Foo" self.error_mgr_mock.ReportError('catalogname-not-lowercase') class TestCatalognameLowercase_2(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CatalognameLowercase' + FUNCTION_NAME = 'CheckCatalognameLowercase' def CheckpkgTest(self): self.pkg_data["basic_stats"]["catalogname"] = "foo" class TestCatalognameLowercase_3(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CatalognameLowercase' + FUNCTION_NAME = 'CheckCatalognameLowercase' def CheckpkgTest(self): self.pkg_data["basic_stats"]["catalogname"] = "foo+abc&123" self.error_mgr_mock.ReportError('catalogname-is-not-a-simple-word') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 21 10:08:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 Oct 2011 08:08:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[15949] csw/mgar/gar/v2/lib/python Message-ID: Revision: 15949 http://gar.svn.sourceforge.net/gar/?rev=15949&view=rev Author: wahwah Date: 2011-10-21 08:08:51 +0000 (Fri, 21 Oct 2011) Log Message: ----------- checkpkg: Raising the architecture for SunOS5.10 >From October 2011, it's okay, in Solaris 10, for pentium_pro and sparcv8+ binaries to be in the /opt/csw/bin and /opt/csw/lib directories. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/common_constants.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2011-10-21 08:08:15 UTC (rev 15948) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2011-10-21 08:08:51 UTC (rev 15949) @@ -51,6 +51,10 @@ pass +class InternalDataError(Error): + """Problem with internal checkpkg data structures.""" + + def ExtractDescription(pkginfo): desc_re = re.compile(DESCRIPTION_RE) m = re.match(desc_re, pkginfo["NAME"]) Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2011-10-21 08:08:15 UTC (rev 15948) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2011-10-21 08:08:51 UTC (rev 15949) @@ -3,11 +3,15 @@ ARCH_ALL = "all" PHYSICAL_ARCHITECTURES = [ARCH_SPARC, ARCH_i386] ARCHITECTURES = PHYSICAL_ARCHITECTURES + [ARCH_ALL] +OS_REL_58 = u"SunOS5.8" +OS_REL_59 = u"SunOS5.9" +OS_REL_510 = u"SunOS5.10" +OS_REL_511 = u"SunOS5.11" OS_RELS = ( - u"SunOS5.8", - u"SunOS5.9", - u"SunOS5.10", - u"SunOS5.11", + OS_REL_58, + OS_REL_59, + OS_REL_510, + OS_REL_511, ) OBSOLETE_OS_RELS = ( u"SunOS5.8", Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-21 08:08:15 UTC (rev 15948) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-21 08:08:51 UTC (rev 15949) @@ -119,41 +119,84 @@ # Valid URLs in the VENDOR field in pkginfo VENDORURL_RE = r"^(http|ftp)s?\://.+\..+$" +# Settings for binary placements: which architectures can live in which +# directories. BASE_BINARY_PATHS = ('bin', 'sbin', 'lib', 'libexec', 'cgi-bin') HACHOIR_MACHINES = { # id: (name, allowed_paths, disallowed_paths) -1: {"name": "Unknown", - "allowed": (), "disallowed": (), + "allowed": { + common_constants.OS_REL_58: (), + common_constants.OS_REL_59: (), + common_constants.OS_REL_510: (), + common_constants.OS_REL_511: (), + }, "disallowed": (), "type": "unknown"}, 2: {"name": "sparcv8", "type": common_constants.ARCH_SPARC, - "allowed": BASE_BINARY_PATHS + su.SPARCV8_PATHS, + "allowed": { + common_constants.OS_REL_58: BASE_BINARY_PATHS + su.SPARCV8_PATHS, + common_constants.OS_REL_59: BASE_BINARY_PATHS + su.SPARCV8_PATHS, + common_constants.OS_REL_510: BASE_BINARY_PATHS + su.SPARCV8_PATHS, + common_constants.OS_REL_511: BASE_BINARY_PATHS + su.SPARCV8_PATHS, + }, "disallowed": su.SPARCV9_PATHS + su.INTEL_386_PATHS + su.AMD64_PATHS, }, + # pentium_pro binaries are also identified as 3. 3: {"name": "i386", "type": common_constants.ARCH_i386, - "allowed": BASE_BINARY_PATHS + su.INTEL_386_PATHS, - "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + su.SPARCV9_PATHS + su.AMD64_PATHS, + "allowed": { + common_constants.OS_REL_58: BASE_BINARY_PATHS + su.INTEL_386_PATHS, + common_constants.OS_REL_59: BASE_BINARY_PATHS + su.INTEL_386_PATHS, + common_constants.OS_REL_510: BASE_BINARY_PATHS + su.INTEL_386_PATHS, + common_constants.OS_REL_511: BASE_BINARY_PATHS + su.INTEL_386_PATHS, + }, + "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + + su.SPARCV9_PATHS + su.AMD64_PATHS, }, 6: {"name": "i486", "type": common_constants.ARCH_i386, - "allowed": su.INTEL_386_PATHS, - "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + su.SPARCV9_PATHS + su.AMD64_PATHS, + "allowed": { + common_constants.OS_REL_58: su.INTEL_386_PATHS, + common_constants.OS_REL_59: su.INTEL_386_PATHS, + common_constants.OS_REL_510: su.INTEL_386_PATHS, + common_constants.OS_REL_511: su.INTEL_386_PATHS, }, + "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + + su.SPARCV9_PATHS + su.AMD64_PATHS, + }, 18: {"name": "sparcv8+", "type": common_constants.ARCH_SPARC, - "allowed": su.SPARCV8PLUS_PATHS, - "disallowed": su.SPARCV8_PATHS + su.SPARCV9_PATHS + su.AMD64_PATHS + su.INTEL_386_PATHS, + "allowed": { + common_constants.OS_REL_58: su.SPARCV8PLUS_PATHS, + common_constants.OS_REL_59: su.SPARCV8PLUS_PATHS, + # We allow sparcv8+ as the base architecture on Solaris 10+. + common_constants.OS_REL_510: BASE_BINARY_PATHS + su.SPARCV8PLUS_PATHS, + common_constants.OS_REL_511: BASE_BINARY_PATHS + su.SPARCV8PLUS_PATHS, + }, + "disallowed": su.SPARCV8_PATHS + su.SPARCV9_PATHS + + su.AMD64_PATHS + su.INTEL_386_PATHS, }, 43: {"name": "sparcv9", "type": common_constants.ARCH_SPARC, - "allowed": su.SPARCV9_PATHS, + "allowed": { + common_constants.OS_REL_58: su.SPARCV9_PATHS, + common_constants.OS_REL_59: su.SPARCV9_PATHS, + common_constants.OS_REL_510: su.SPARCV9_PATHS, + common_constants.OS_REL_511: su.SPARCV9_PATHS, + }, "disallowed": su.INTEL_386_PATHS + su.AMD64_PATHS, }, 62: {"name": "amd64", "type": common_constants.ARCH_i386, - "allowed": su.AMD64_PATHS, - "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + su.SPARCV9_PATHS, + "allowed": { + common_constants.OS_REL_58: su.AMD64_PATHS, + common_constants.OS_REL_59: su.AMD64_PATHS, + common_constants.OS_REL_510: su.AMD64_PATHS, + common_constants.OS_REL_511: su.AMD64_PATHS, + }, + "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + + su.SPARCV9_PATHS, }, } @@ -910,7 +953,13 @@ logger.debug("CheckArchitecture(): %s", metadata) machine_data = HACHOIR_MACHINES[metadata["machine_id"]] cpu_type = machine_data["name"] - allowed_paths = set(machine_data["allowed"]) + # allowed_paths needs to depend on the OS release. The OS release is + # only available from the file name. + os_release = pkg_data["basic_stats"]["parsed_basename"]["osrel"] + if os_release not in machine_data["allowed"]: + raise checkpkg.InternalDataError( + "%s not found in machine_data" % os_release) + allowed_paths = set(machine_data["allowed"][os_release]) disallowed_paths = set(machine_data["disallowed"]) path_parts = set(metadata["path"].split(os.path.sep)) if not path_parts.intersection(allowed_paths): Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-21 08:08:15 UTC (rev 15948) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-21 08:08:51 UTC (rev 15949) @@ -264,7 +264,7 @@ mox.IsA(str), mox.IsA(str), mox.IsA(str)) -class TestCheckArchitecture(CheckTestHelper, unittest.TestCase): +class TestCheckArchitectureSanity(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckArchitectureSanity' def testSimple(self): self.pkg_data["pkginfo"]["ARCH"] = "i386" @@ -272,7 +272,7 @@ 'srv4-filename-architecture-mismatch', 'pkginfo=i386 filename=rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz') -class TestCheckArchitecture(CheckTestHelper, unittest.TestCase): +class TestCheckArchitectureVsContents(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckArchitectureVsContents' def testArchallDevel(self): @@ -901,6 +901,24 @@ 'path': 'opt/csw/bin/sparcv8plus/tree'}, ] + def testGoodSparcv8PlusInBin(self): + # From October 2011 on, the sparcv8+ binaries can be in bin on + # Solaris 10. + parsed_basename = self.pkg_data["basic_stats"]["parsed_basename"] + parsed_basename["osrel"] = "SunOS5.10" + self.pkg_data["files_metadata"] = [ + {'endian': 'Big endian', + 'machine_id': 18, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bin/tree'}, + ] + # No error here. + + # A similar test can't be written for i386, because pentium_pro and + # i386 have the same machine_id, so we can't distinguish between the + # two. + def testGoodBinary(self): self.pkg_data["files_metadata"] = [ {'endian': 'Big endian', Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2011-10-21 08:08:15 UTC (rev 15948) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2011-10-21 08:08:51 UTC (rev 15949) @@ -7,13 +7,28 @@ # TODO: Merge with common_constants -SPARCV8_PATHS = ('sparcv8', 'sparcv8-fsmuld', - 'sparcv7', 'sparc') -SPARCV8PLUS_PATHS = ('sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus') -SPARCV9_PATHS = ('sparcv9+vis2', 'sparcv9+vis', 'sparcv9') -INTEL_386_PATHS = ('pentium_pro+mmx', 'pentium_pro', - 'pentium+mmx', 'pentium', - 'i486', 'i386', 'i86') +SPARCV8_PATHS = ( + 'sparcv8', + 'sparcv8-fsmuld', + 'sparcv7', + 'sparc') +SPARCV8PLUS_PATHS = ( + 'sparcv8plus+vis2', + 'sparcv8plus+vis', + 'sparcv8plus') +SPARCV9_PATHS = ( + 'sparcv9+vis2', + 'sparcv9+vis', + 'sparcv9') +INTEL_386_PATHS = ( + 'i486', + 'i386', + 'i86') +INTEL_PENTIUM_PATHS = ( + 'pentium_pro+mmx', + 'pentium_pro', + 'pentium+mmx', + 'pentium') AMD64_PATHS = ('amd64',) LEGIT_CHAR_RE = re.compile(r"[a-zA-Z0-9\+]+") SONAME_VERSION_RE = re.compile("^(?P.*)\.so\.(?P[\d\.]+)$") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 21 10:08:16 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 Oct 2011 08:08:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15948] csw/mgar/gar/v2/lib/python Message-ID: Revision: 15948 http://gar.svn.sourceforge.net/gar/?rev=15948&view=rev Author: wahwah Date: 2011-10-21 08:08:15 +0000 (Fri, 21 Oct 2011) Log Message: ----------- checkpkg: Simplify package checks Mock object support can be handled by setUp and tearDown functions. It is now possible to easily define multiple checking functions within one checking class. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-21 08:07:45 UTC (rev 15947) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-21 08:08:15 UTC (rev 15948) @@ -187,14 +187,6 @@ return new_ppbs -def CheckCatalognameLowercase(pkg_data, error_mgr, logger, messenger): - catalogname = pkg_data["basic_stats"]["catalogname"] - if catalogname != catalogname.lower(): - error_mgr.ReportError("catalogname-not-lowercase") - if not re.match(r"^[\w_]+$", catalogname): - error_mgr.ReportError("catalogname-is-not-a-simple-word") - - def CheckDirectoryPermissions(pkg_data, error_mgr, logger, messenger): for entry in pkg_data["pkgmap"]: if (entry["type"] == "d" @@ -261,9 +253,15 @@ def CheckCatalogname(pkg_data, error_mgr, logger, messenger): pkginfo = pkg_data["pkginfo"] catalogname = pkginfo["NAME"].split(" ")[0] + catalogname_2 = pkg_data["basic_stats"]["catalogname"] + if catalogname != catalogname_2: + error_mgr.ReportError("pkginfo-catalogname-disagreement pkginfo=%s filename=%s" + % (catalogname, catalogname_2)) catalogname_re = r"^([\w\+]+)$" if not re.match(catalogname_re, catalogname): error_mgr.ReportError("pkginfo-bad-catalogname", catalogname) + if catalogname != catalogname.lower(): + error_mgr.ReportError("catalogname-not-lowercase") def CheckSmfIntegration(pkg_data, error_mgr, logger, messenger): Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-21 08:07:45 UTC (rev 15947) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-21 08:08:15 UTC (rev 15948) @@ -31,101 +31,105 @@ DEFAULT_PKG_DATA = rsync_stats[0] -class CheckpkgUnitTestHelper(object): - """Wraps common components of checkpkg tests.""" +class CheckTestHelper(object): def setUp(self): - super(CheckpkgUnitTestHelper, self).setUp() + super(CheckTestHelper, self).setUp() self.mox = mox.Mox() - self.pkg_stats = DEFAULT_PKG_STATS self.pkg_data = copy.deepcopy(DEFAULT_PKG_DATA) - - def SetMessenger(self): - self.messenger = stubs.MessengerStub() - - def SetErrorManagerMock(self): + self.logger_mock = stubs.LoggerStub() + self.SetMessenger() if self.FUNCTION_NAME.startswith("Set"): self.error_mgr_mock = self.mox.CreateMock( checkpkg_lib.SetCheckInterface) else: self.error_mgr_mock = self.mox.CreateMock( checkpkg_lib.IndividualCheckInterface) + self.mox.ResetAll() - def testDefault(self): - self.RunCheckpkgTest(self.CheckpkgTest) + def SetMessenger(self): + """To be overridden in subclasses if needed.""" + self.messenger = stubs.MessengerStub() - def RunCheckpkgTest(self, callback): - self.logger_mock = stubs.LoggerStub() - self.SetMessenger() - self.SetErrorManagerMock() - callback() + def tearDown(self): + super(CheckTestHelper, self).tearDown() self.mox.ReplayAll() - getattr(pc, self.FUNCTION_NAME)(self.pkg_data, - self.error_mgr_mock, - self.logger_mock, - self.messenger) + function_under_test = getattr(pc, self.FUNCTION_NAME) + function_under_test(self.pkg_data, self.error_mgr_mock, + self.logger_mock, self.messenger) self.mox.VerifyAll() -class TestMultipleDepends(CheckpkgUnitTestHelper, unittest.TestCase): +class TestMultipleDepends(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckMultipleDepends' - def CheckpkgTest(self): + def testMultipleDependency(self): self.pkg_data["depends"].append(("CSWcommon", "This is surplus")) self.error_mgr_mock.ReportError('dependency-listed-more-than-once', 'CSWcommon') -class TestDescription(CheckpkgUnitTestHelper, unittest.TestCase): + +class TestDescription(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckDescription' - def CheckpkgTest(self): + def testMissingDescription(self): self.pkg_data["pkginfo"]["NAME"] = 'foo' self.error_mgr_mock.ReportError('pkginfo-description-missing') - -class TestDescriptionLong(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckDescription' - def CheckpkgTest(self): + def testLongDescription(self): self.pkg_data["pkginfo"]["NAME"] = 'foo - ' + ('A' * 200) self.error_mgr_mock.ReportError('pkginfo-description-too-long', 'length=200') - -class TestDescriptionNotCapitalized(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckDescription' - def CheckpkgTest(self): + def testUppercaseDescription(self): self.pkg_data["pkginfo"]["NAME"] = 'foo - lowercase' self.error_mgr_mock.ReportError( 'pkginfo-description-not-starting-with-uppercase', 'lowercase') -class TestCheckEmailGood(CheckpkgUnitTestHelper, unittest.TestCase): + +class TestCheckEmailGood(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckEmail' - def CheckpkgTest(self): + def testGoodEmail(self): self.pkg_data["pkginfo"]["EMAIL"] = 'somebody at opencsw.org' - -class TestCheckEmailBadDomain(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckEmail' - def CheckpkgTest(self): + def testBadDomain(self): self.pkg_data["pkginfo"]["EMAIL"] = 'somebody at opencsw.com' self.error_mgr_mock.ReportError( 'pkginfo-email-not-opencsw-org', 'email=somebody at opencsw.com') -class TestCheckCatalogname_1(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckCatalogname(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckCatalogname' - def CheckpkgTest(self): + def testPkginfoAndFileDisagreement(self): + self.pkg_data["pkginfo"]["NAME"] = 'foo - foo' + self.pkg_data["basic_stats"]["catalogname"] = "bar" + self.error_mgr_mock.ReportError('pkginfo-catalogname-disagreement pkginfo=foo filename=bar') + + def testWithDash(self): self.pkg_data["pkginfo"]["NAME"] = 'foo-bar - This catalog name is bad' + self.pkg_data["basic_stats"]["catalogname"] = "foo-bar" self.error_mgr_mock.ReportError('pkginfo-bad-catalogname', 'foo-bar') + def testGoodComplex(self): + self.pkg_data["pkginfo"]["NAME"] = (u'libsigc++_devel - ' + u'This catalog name is good') + self.pkg_data["basic_stats"]["catalogname"] = u"libsigc++_devel" -class TestCheckCatalogname_2(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckCatalogname' - def CheckpkgTest(self): - self.pkg_data["pkginfo"]["NAME"] = ('libsigc++_devel - ' - 'This catalog name is good') + def testUppercase(self): + self.pkg_data["pkginfo"]["NAME"] = 'Foo - This catalog name is bad' + self.pkg_data["basic_stats"]["catalogname"] = "Foo" + self.error_mgr_mock.ReportError('catalogname-not-lowercase') + def testLowercase(self): + self.pkg_data["pkginfo"]["NAME"] = 'foo - This catalog name is good' + self.pkg_data["basic_stats"]["catalogname"] = "foo" -class TestCheckSmfIntegrationBad(CheckpkgUnitTestHelper, unittest.TestCase): + def testBadCharacters(self): + self.pkg_data["basic_stats"]["catalogname"] = "foo+abc&123" + self.pkg_data["pkginfo"]["NAME"] = 'foo+abc&123 - This catalog name is bad' + self.error_mgr_mock.ReportError('pkginfo-bad-catalogname', 'foo+abc&123') + + +class TestCheckSmfIntegrationBad(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSmfIntegration' - def CheckpkgTest(self): + def testMissingSmfClass(self): self.pkg_data["pkgmap"].append({ "class": "none", "group": "bin", @@ -138,9 +142,7 @@ self.error_mgr_mock.ReportError('init-file-missing-cswinitsmf-class', '/etc/opt/csw/init.d/foo class=none') -class TestCheckCheckSmfIntegrationGood(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckSmfIntegration' - def CheckpkgTest(self): + def testSmfIntegrationGood(self): self.pkg_data["pkgmap"].append({ "class": "cswinitsmf", "group": "bin", @@ -151,10 +153,7 @@ "user": "root" }) - -class TestCheckCheckSmfIntegrationWrongLocation(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckSmfIntegration' - def CheckpkgTest(self): + def testWrongLocation(self): self.pkg_data["pkgmap"].append({ "class": "cswinitsmf", "group": "bin", @@ -168,27 +167,10 @@ '/opt/csw/etc/init.d/foo') -class TestCatalognameLowercase_1(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckCatalognameLowercase' - def CheckpkgTest(self): - self.pkg_data["basic_stats"]["catalogname"] = "Foo" - self.error_mgr_mock.ReportError('catalogname-not-lowercase') -class TestCatalognameLowercase_2(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckCatalognameLowercase' - def CheckpkgTest(self): - self.pkg_data["basic_stats"]["catalogname"] = "foo" - -class TestCatalognameLowercase_3(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckCatalognameLowercase' - def CheckpkgTest(self): - self.pkg_data["basic_stats"]["catalogname"] = "foo+abc&123" - self.error_mgr_mock.ReportError('catalogname-is-not-a-simple-word') - - -class TestSetCheckDependencies(CheckpkgUnitTestHelper, unittest.TestCase): +class TestSetCheckDependencies(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'SetCheckDependencies' - def CheckpkgTest(self): + def testUnidentifiedDependency(self): self.pkg_data_single = self.pkg_data self.pkg_data = [self.pkg_data_single] self.pkg_data[0]["depends"].append(["CSWmartian", "A package from Mars."]) @@ -197,19 +179,13 @@ self.error_mgr_mock.ReportError( 'CSWrsync', 'unidentified-dependency', 'CSWmartian') - -class TestSetCheckDependenciesGood(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckDependencies' - def CheckpkgTest(self): + def testInterface(self): self.pkg_data_single = self.pkg_data self.pkg_data = [self.pkg_data_single] installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) - -class TestSetCheckDependenciesTwoPkgsBad(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckDependencies' - def CheckpkgTest(self): + def testTwoPackagesBad(self): self.pkg_data_single = self.pkg_data self.pkg_data = [self.pkg_data_single, copy.deepcopy(self.pkg_data_single)] self.pkg_data[1]["basic_stats"]["pkgname"] = "CSWsecondpackage" @@ -219,10 +195,7 @@ self.error_mgr_mock.ReportError( 'CSWsecondpackage', 'unidentified-dependency', 'CSWmartian') - -class TestSetCheckDependenciesTwoPkgsGood(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckDependencies' - def CheckpkgTest(self): + def testTwoPackagesGood(self): self.pkg_data_single = self.pkg_data self.pkg_data = [self.pkg_data_single, copy.deepcopy(self.pkg_data_single)] self.pkg_data[1]["basic_stats"]["pkgname"] = "CSWsecondpackage" @@ -230,7 +203,15 @@ installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) +class TestSetCheckDependencies(CheckTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckDependsOnSelf' + def testDependencyOnSelf(self): + self.pkg_data["depends"].append(("CSWrsync", "")) + installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] + # self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) + self.error_mgr_mock.ReportError('depends-on-self') + class DatabaseMockingMixin(object): def MockDbInteraction(self): @@ -258,29 +239,12 @@ self.error_mgr_mock.GetPkgByPath(pth).AndReturn(common_path_pkgs) -class TestSetCheckDependenciesDoNotReportSurplusForDevel( - DatabaseMockingMixin, CheckpkgUnitTestHelper, unittest.TestCase): +class TestSetCheckDependenciesWithDb( + DatabaseMockingMixin, CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testDoNotReportSurplusForDev(self): self.pkg_data_single = self.pkg_data self.pkg_data = [self.pkg_data_single] - self.pkg_data[0]["basic_stats"]["pkgname"] = "CSWfoo-devel" - self.pkg_data[0]["depends"].append(["CSWfoo", ""]) - self.pkg_data[0]["depends"].append(["CSWbar", ""]) - self.pkg_data[0]["depends"].append(["CSWlibiconv", ""]) - self.MockDbInteraction() - for i in range(12): - self.error_mgr_mock.NeedFile( - mox.IsA(str), mox.IsA(str), mox.IsA(str)) - # There should be no error about the dependency on CSWfoo or CSWbar. - - -class TestSetCheckDependenciesDoNotReportSurplusForDev( - DatabaseMockingMixin, CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): - self.pkg_data_single = self.pkg_data - self.pkg_data = [self.pkg_data_single] self.pkg_data[0]["basic_stats"]["pkgname"] = "CSWfoo-dev" self.pkg_data[0]["depends"].append(["CSWfoo", ""]) self.pkg_data[0]["depends"].append(["CSWbar", ""]) @@ -291,56 +255,27 @@ mox.IsA(str), mox.IsA(str), mox.IsA(str)) # There should be no error about the dependency on CSWfoo or CSWbar. - -class TestSetCheckDependenciesDoNotReportSurplusForDevNoDash( - DatabaseMockingMixin, CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testReportDeps(self): self.pkg_data_single = self.pkg_data self.pkg_data = [self.pkg_data_single] - self.pkg_data[0]["basic_stats"]["pkgname"] = "CSWfoodev" - self.pkg_data[0]["depends"].append(["CSWfoo", ""]) - self.pkg_data[0]["depends"].append(["CSWbar", ""]) - self.pkg_data[0]["depends"].append(["CSWlibiconv", ""]) self.MockDbInteraction() for i in range(12): self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(str), mox.IsA(str)) - # There should be no error about the dependency on CSWfoo or CSWbar. -class TestSetCheckDependenciesReportDeps( - DatabaseMockingMixin, - CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): - self.pkg_data_single = self.pkg_data - self.pkg_data = [self.pkg_data_single] - self.MockDbInteraction() - for i in range(12): - self.error_mgr_mock.NeedFile( - mox.IsA(str), mox.IsA(str), mox.IsA(str)) - - -class TestCheckDependsOnSelf(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckDependsOnSelf' - def CheckpkgTest(self): - self.pkg_data["depends"].append(["CSWrsync", ""]) - installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] - self.error_mgr_mock.ReportError('depends-on-self') - - -class TestCheckArchitectureSanity(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckArchitecture(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckArchitectureSanity' - def CheckpkgTest(self): + def testSimple(self): self.pkg_data["pkginfo"]["ARCH"] = "i386" self.error_mgr_mock.ReportError( 'srv4-filename-architecture-mismatch', 'pkginfo=i386 filename=rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz') -class TestCheckArchitectureVsContents_Devel_1(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckArchitecture(CheckTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckArchitectureVsContents' - def CheckpkgTest(self): + def testArchallDevel(self): self.pkg_data["binaries"] = [] self.pkg_data["binaries_dump_info"] = [] self.pkg_data["pkgmap"] = [] @@ -348,9 +283,7 @@ self.pkg_data["pkginfo"]["ARCH"] = "all" self.error_mgr_mock.ReportError('archall-devel-package', None, None) -class TestCheckArchitectureVsContents_Devel_2(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckArchitectureVsContents' - def CheckpkgTest(self): + def testArchitectureVsContents(self): self.pkg_data["binaries"] = [] self.pkg_data["binaries_dump_info"] = [] self.pkg_data["pkgmap"] = [] @@ -358,22 +291,21 @@ self.pkg_data["pkginfo"]["ARCH"] = "all" self.error_mgr_mock.ReportError('archall-devel-package', None, None) -class TestCheckFileNameSanity(CheckpkgUnitTestHelper, unittest.TestCase): + +class TestCheckFileNameSanity(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckFileNameSanity' - def CheckpkgTest(self): + def testMissingRevision(self): del(self.pkg_data["basic_stats"]["parsed_basename"]["revision_info"]["REV"]) self.error_mgr_mock.ReportError('rev-tag-missing-in-filename') -class TestCheckLinkingAgainstSunX11(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckLinkingAgainstSunX11(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckLinkingAgainstSunX11' - def CheckpkgTest(self): + def testAllowLinkingAgainstSunX11(self): self.pkg_data["binaries_dump_info"][0]["needed sonames"].append("libX11.so.4") + # No errors reported here. - -class TestCheckLinkingAgainstSunX11_Bad(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckLinkingAgainstSunX11' - def CheckpkgTest(self): + def testDoNotReportDiscouragedLib(self): self.pkg_data["binaries_dump_info"].append({ 'base_name': 'libImlib2.so.1.4.2', 'needed sonames': ['libfreetype.so.6', @@ -397,10 +329,10 @@ # self.error_mgr_mock.ReportError('linked-against-discouraged-library', # 'libImlib2.so.1.4.2 libX11.so.4') -class TestSetCheckSharedLibraryConsistency2_1(CheckpkgUnitTestHelper, - unittest.TestCase): + +class TestSetCheckLibraries(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testInterface(self): self.pkg_data = [td_1.pkg_data] self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libCrun.so.1').AndReturn( {u'/usr/lib': [u'SUNWlibC'], @@ -447,9 +379,9 @@ mox.IsA(str), mox.IsA(unicode), mox.IsA(str)) -class TestCheckPstamp(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckPstamp(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckPstamp' - def CheckpkgTest(self): + def testPstampRegex(self): self.pkg_data["pkginfo"]["PSTAMP"] = "build8s20090904191054" self.error_mgr_mock.ReportError( 'pkginfo-pstamp-in-wrong-format', 'build8s20090904191054', @@ -457,9 +389,9 @@ "'build8s20090904191054'.") -class TestCheckRpath(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckRpath(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckRpath' - def CheckpkgTest(self): + def testRpathList(self): binaries_dump_info = self.pkg_data["binaries_dump_info"] binaries_dump_info[0]["runpath"] = tuple(testdata.rpaths.all_rpaths) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] @@ -555,12 +487,12 @@ ] # Calculating the parameters on the fly, it allows to write it a terse manner. for bad_path in BAD_PATHS: - self.error_mgr_mock.ReportError('bad-rpath-entry', '%s opt/csw/bin/sparcv8/rsync' % bad_path) + self.error_mgr_mock.ReportError( + 'bad-rpath-entry', '%s opt/csw/bin/sparcv8/rsync' % bad_path) - -class TestCheckRpathBadPath(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckLibraries(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testDeprecatedLibrary(self): binaries_dump_info = self.pkg_data["binaries_dump_info"] binaries_dump_info[0]["runpath"] = ("/opt/csw/lib",) binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] @@ -588,10 +520,7 @@ mox.IsA(unicode)) self.pkg_data = [self.pkg_data] - -class TestDeprecatedLibraries_GoodRpath(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testDeprecatedLibrary(self): binaries_dump_info = self.pkg_data["binaries_dump_info"] binaries_dump_info[0]["runpath"] = ("/opt/csw/bdb47/lib", "/opt/csw/lib",) binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] @@ -619,10 +548,7 @@ self.error_mgr_mock.NeedFile( mox.IsA(str), mox.Or(mox.IsA(str), mox.IsA(unicode)), mox.IsA(str)) - -class TestDeprecatedLibraries_BadRpath(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testBadRpath(self): binaries_dump_info = self.pkg_data["binaries_dump_info"] binaries_dump_info[0]["runpath"] = ("/opt/csw/lib", "/opt/csw/bdb47/lib",) binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] @@ -657,10 +583,9 @@ self.error_mgr_mock.NeedFile( mox.IsA(str), mox.Or(mox.IsA(str), mox.IsA(unicode)), mox.IsA(str)) - -class TestSetCheckLibmLinking(CheckpkgUnitTestHelper, unittest.TestCase): +class TestLibmLinking(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testLibmLinking(self): binaries_dump_info = self.pkg_data["binaries_dump_info"] binaries_dump_info[0]["runpath"] = ("/opt/csw/lib",) binaries_dump_info[0]["needed sonames"] = ["libm.so.2"] @@ -678,36 +603,10 @@ '/opt/csw/bin/sparcv9').AndReturn(["CSWcommon"]) self.error_mgr_mock.GetPkgByPath( '/opt/csw/share/doc').AndReturn(["CSWcommon"]) - # self.error_mgr_mock.ReportError( - # 'CSWrsync', - # 'deprecated-library', - # u'opt/csw/bin/sparcv8/rsync Deprecated Berkeley DB location ' - # u'/opt/csw/lib/libdb-4.7.so') self.pkg_data = [self.pkg_data] -class TestRemovePackagesUnderInstallation(unittest.TestCase): - - def testRemoveNone(self): - paths_and_pkgs_by_soname = { - 'libfoo.so.1': {u'/opt/csw/lib': [u'CSWlibfoo']}} - packages_to_be_installed = [u'CSWbar'] - self.assertEqual( - paths_and_pkgs_by_soname, - pc.RemovePackagesUnderInstallation(paths_and_pkgs_by_soname, - packages_to_be_installed)) - - def testRemoveOne(self): - paths_and_pkgs_by_soname = { - 'libfoo.so.1': {u'/opt/csw/lib': [u'CSWlibfoo']}} - packages_to_be_installed = [u'CSWlibfoo'] - self.assertEqual( - {'libfoo.so.1': {}}, - pc.RemovePackagesUnderInstallation(paths_and_pkgs_by_soname, - packages_to_be_installed)) - - -class TestSharedLibsInAnInstalledPackageToo(CheckpkgUnitTestHelper, +class TestSharedLibsInAnInstalledPackageToo(CheckTestHelper, unittest.TestCase): """If a shared library is provided by one of the packages that are in the set under test, take into account that the installed library will be removed at @@ -747,7 +646,7 @@ 'pkgmap': [], } - def CheckpkgTest(self): + def testMissingLibFromNewPackage(self): self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libfoo.so.1').AndReturn({ u'/opt/csw/lib': [u'CSWlibfoo'], }) @@ -755,12 +654,10 @@ 'CSWbar', 'soname-not-found', 'libfoo.so.1 is needed by opt/csw/bin/bar') - # self.error_mgr_mock.ReportErrorForPkgname('CSWbar', 'surplus-dependency', 'CSWlibfoo') self.pkg_data = [self.CSWbar_DATA, self.CSWlibfoo_DATA] -class TestSharedLibsOnlyIsalist(CheckpkgUnitTestHelper, - unittest.TestCase): +class TestSharedLibsOnlyIsalist(CheckTestHelper, unittest.TestCase): """/opt/csw/lib/$ISALIST in RPATH without the bare /opt/csw/lib.""" FUNCTION_NAME = 'SetCheckLibraries' # Contains only necessary bits. The data listed in full. @@ -788,7 +685,7 @@ { 'path': '/opt/csw/bin/bar', }, ], } - def CheckpkgTest(self): + def testInterface(self): self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libfoo.so.1').AndReturn({}) self.error_mgr_mock.GetPkgByPath('/opt/csw/lib').AndReturn([u"CSWcommon"]) self.error_mgr_mock.GetPkgByPath('/opt/csw/bin').AndReturn([u"CSWcommon"]) @@ -797,11 +694,11 @@ self.pkg_data = [self.CSWbar_DATA] -class TestCheckLibrariesDlopenLibs_1(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckLibrariesDlopenLibs_1(CheckTestHelper, unittest.TestCase): """For dlopen-style shared libraries, libraries from /opt/csw/lib should be counted as dependencies. It's only a heuristic though.""" FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testMissingLibbar(self): binaries_dump_info = self.pkg_data["binaries_dump_info"] binaries_dump_info[0]["runpath"] = () binaries_dump_info[0]["needed sonames"] = ["libbar.so"] @@ -827,10 +724,7 @@ 'opt/csw/lib/python/site-packages/foo.so') self.pkg_data = [self.pkg_data] - -class TestCheckLibrariesDlopenLibs_2(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testLibNotFound(self): binaries_dump_info = self.pkg_data["binaries_dump_info"] binaries_dump_info[0]["runpath"] = () binaries_dump_info[0]["needed sonames"] = ["libnotfound.so"] @@ -855,9 +749,9 @@ self.pkg_data = [self.pkg_data] -class TestCheckVendorURL_BadUrl(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckVendorURL(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = "CheckVendorURL" - def CheckpkgTest(self): + def testBadUrl(self): # Injecting the data to be examined. self.pkg_data["pkginfo"]["VENDOR"] = "badurl" # Expecting the following method to be called. @@ -866,24 +760,18 @@ "badurl", "Solution: add VENDOR_URL to GAR Recipe") - -class TestCheckVendorURL_Good(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = "CheckVendorURL" - def CheckpkgTest(self): + def testGoodUrl(self): self.pkg_data["pkginfo"]["VENDOR"] = "http://www.example.com/" # No call to error_mgr_mock means that no errors should be reported: the # URL is okay. - -class TestCheckVendorURL_Https(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = "CheckVendorURL" - def CheckpkgTest(self): + def testHttps(self): self.pkg_data["pkginfo"]["VENDOR"] = "https://www.example.com/" -class TestCheckPythonPackageName(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckPythonPackageName(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = "CheckPythonPackageName" - def CheckpkgTest(self): + def testBad(self): self.pkg_data["pkgmap"].append({ "class": "none", "group": "bin", @@ -896,10 +784,7 @@ self.error_mgr_mock.ReportError('pkgname-does-not-start-with-CSWpy-') self.error_mgr_mock.ReportError('catalogname-does-not-start-with-py_') - -class TestCheckPythonPackageName_good(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = "CheckPythonPackageName" - def CheckpkgTest(self): + def testGood(self): self.pkg_data["pkgmap"].append({ "class": "none", "group": "bin", @@ -913,16 +798,16 @@ self.pkg_data["basic_stats"]["pkgname"] = "CSWpy-foo" -class TestCheckDisallowedPaths_1(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckDisallowedPaths(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = "CheckDisallowedPaths" - def CheckpkgTest(self): + def testManDir(self): self.pkg_data["pkgmap"].append({ "class": "none", "group": "bin", "line": "doesn't matter here", "mode": '0755', "path": "/opt/csw/man", - "type": "f", + "type": "d", "user": "root" }) self.error_mgr_mock.GetCommonPaths('sparc').AndReturn([]) @@ -931,10 +816,7 @@ 'This path is already provided by CSWcommon ' 'or is not allowed for other reasons.') - -class TestCheckDisallowedPaths_2(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = "CheckDisallowedPaths" - def CheckpkgTest(self): + def testManFile(self): self.pkg_data["pkgmap"].append({ "class": "none", "group": "bin", @@ -951,9 +833,9 @@ 'or is not allowed for other reasons.') -class TestCheckGzippedManpages(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckGzippedManpages(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = "CheckGzippedManpages" - def CheckpkgTest(self): + def testGzippedManpageBad(self): self.pkg_data["pkgmap"].append({ "class": "none", "group": "bin", @@ -968,10 +850,7 @@ "Solaris' man cannot automatically inflate man pages. " "Solution: man page should be gunzipped.") - -class TestCheckGzippedManpages_good(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = "CheckGzippedManpages" - def CheckpkgTest(self): + def testUncompressedManpage(self): self.pkg_data["pkgmap"].append({ "class": "none", "group": "bin", @@ -982,12 +861,9 @@ "user": "root" }) - -# Although this is a gzipped manpage, it is not in a directory associated with -# manpages, so we should not trigger an error here. -class TestCheckGzippedManpages_misplaced(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = "CheckGzippedManpages" - def CheckpkgTest(self): + # Although this is a gzipped manpage, it is not in a directory associated with + # manpages, so we should not trigger an error here. + def testGzippedFileGood(self): self.pkg_data["pkgmap"].append({ "class": "none", "group": "bin", @@ -999,10 +875,9 @@ }) -class TestCheckArchitecture_sparcv8plus(CheckpkgUnitTestHelper, - unittest.TestCase): +class TestCheckArchitecture(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = "CheckArchitecture" - def CheckpkgTest(self): + def testBadSparcv8Plus(self): self.pkg_data["files_metadata"] = [ {'endian': 'Big endian', 'machine_id': 18, @@ -1013,14 +888,11 @@ 'path': 'opt/csw/share/man/man1/tree.1'}, {'mime_type': 'text/plain; charset=us-ascii', 'path': 'opt/csw/share/doc/tree/license'}] - self.error_mgr_mock.ReportError('binary-wrong-architecture', - 'id=18 name=sparcv8+ subdir=bin') + self.error_mgr_mock.ReportError( + 'binary-architecture-does-not-match-placement', + 'file=opt/csw/bin/tree arch_id=18 arch_name=sparcv8+') - -class TestCheckArchitecture_sparcv8plus(CheckpkgUnitTestHelper, - unittest.TestCase): - FUNCTION_NAME = "CheckArchitecture" - def CheckpkgTest(self): + def testGoodSparcv8Plus(self): self.pkg_data["files_metadata"] = [ {'endian': 'Big endian', 'machine_id': 18, @@ -1029,11 +901,7 @@ 'path': 'opt/csw/bin/sparcv8plus/tree'}, ] - -class TestCheckArchitecture_sparcv8(CheckpkgUnitTestHelper, - unittest.TestCase): - FUNCTION_NAME = "CheckArchitecture" - def CheckpkgTest(self): + def testGoodBinary(self): self.pkg_data["files_metadata"] = [ {'endian': 'Big endian', 'machine_id': 2, @@ -1041,22 +909,14 @@ 'mime_type_by_hachoir': u'application/x-executable', 'path': 'opt/csw/bin/tree'}] - -class TestCheckArchitecture_LibSubdir(CheckpkgUnitTestHelper, - unittest.TestCase): - FUNCTION_NAME = "CheckArchitecture" - def CheckpkgTest(self): + def testGoodLibrary(self): self.pkg_data["files_metadata"] = [ {'endian': 'Big endian', 'machine_id': 2, 'mime_type': 'application/x-sharedlib; charset=binary', 'path': 'opt/csw/lib/foo/subdir/libfoo.so.1'}] - -class TestCheckArchitecture_LibSubdirWrong(CheckpkgUnitTestHelper, - unittest.TestCase): - FUNCTION_NAME = "CheckArchitecture" - def CheckpkgTest(self): + def testBadPlacement(self): self.pkg_data["files_metadata"] = [ {'endian': 'Big endian', 'machine_id': 2, @@ -1068,7 +928,7 @@ 'arch_id=2 arch_name=sparcv8 bad_path=sparcv9') -class TestConflictingFiles(CheckpkgUnitTestHelper, +class TestConflictingFiles(CheckTestHelper, unittest.TestCase): """Throw an error if there's a conflicting file in the package set.""" FUNCTION_NAME = 'SetCheckFileCollisions' @@ -1102,7 +962,7 @@ } ], } - def CheckpkgTest(self): + def testFileCollision(self): self.error_mgr_mock.GetPkgByPath('/opt/csw/share/foo').AndReturn( frozenset(['CSWfoo', 'CSWbar'])) self.error_mgr_mock.GetPkgByPath('/opt/csw/share/foo').AndReturn( @@ -1113,7 +973,7 @@ 'CSWfoo', 'file-collision', '/opt/csw/share/foo CSWbar CSWfoo') self.pkg_data = [self.CSWbar_DATA, self.CSWfoo_DATA] - def CheckpkgTest2(self): + def testFileCollisionNotInCatalog(self): # What if these two packages are not currently in the catalog? self.error_mgr_mock.GetPkgByPath('/opt/csw/share/foo').AndReturn( frozenset([])) @@ -1125,16 +985,13 @@ 'CSWfoo', 'file-collision', '/opt/csw/share/foo CSWbar CSWfoo') self.pkg_data = [self.CSWbar_DATA, self.CSWfoo_DATA] - def testTwo(self): - self.RunCheckpkgTest(self.CheckpkgTest2) - -class TestSetCheckSharedLibraryConsistencyIvtools(CheckpkgUnitTestHelper, +class TestSetCheckSharedLibraryConsistencyIvtools(CheckTestHelper, unittest.TestCase): """This tests for a case in which the SONAME that we're looking for doesn't match the filename.""" FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testNeedsSoname(self): self.pkg_data = ivtools_stats self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libComUnidraw.so').AndReturn({}) self.error_mgr_mock.GetPkgByPath('/opt/csw').AndReturn([u"CSWcommon"]) @@ -1145,12 +1002,12 @@ # self.error_mgr_mock.ReportError('CSWivtools', 'missing-dependency', u'CSWcommon') -class TestSetCheckDirectoryDependencies(CheckpkgUnitTestHelper, +class TestSetCheckDirectoryDependencies(CheckTestHelper, unittest.TestCase): """Test whether appropriate files are provided.""" FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testDirectoryNeeded(self): self.pkg_data = ivtools_stats self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libComUnidraw.so').AndReturn({}) self.error_mgr_mock.GetPkgByPath('/opt/csw').AndReturn([u"CSWcommon"]) @@ -1158,15 +1015,14 @@ self.error_mgr_mock.NeedFile("CSWivtools", "/opt/csw/lib/libComUnidraw.so", mox.IsA(str)) -class TestSetCheckDirectoryDependenciesTree( - # This test is disabled for the - # time being. - # CheckpkgUnitTestHelper, +class TestSetCheckDirectoryDependenciesTree(CheckTestHelper, unittest.TestCase): """Test whether appropriate files are provided.""" FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + # This test is disabled for the time being. + + def disabled_testGiveMeAName(self): self.pkg_data = tree_stats self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",), @@ -1241,7 +1097,7 @@ self.error_mgr_mock.NeedFile("CSWtree", mox.IsA(str), mox.IsA(str)) -class TestCheckDiscouragedFileNamePatterns(CheckpkgUnitTestHelper, +class TestCheckDiscouragedFileNamePatterns(CheckTestHelper, unittest.TestCase): """Throw an error if there's a conflicting file in the package set.""" FUNCTION_NAME = 'CheckDiscouragedFileNamePatterns' @@ -1257,16 +1113,12 @@ { "type": "d", "path": "/opt/csw/bin", }, ], } - def CheckpkgTest(self): + def testBadVar(self): self.pkg_data = self.CSWfoo_DATA self.error_mgr_mock.ReportError( 'discouraged-path-in-pkgmap', '/opt/csw/var') - -class TestCheckDiscouragedFileNamePatternsGit(CheckpkgUnitTestHelper, - unittest.TestCase): - FUNCTION_NAME = 'CheckDiscouragedFileNamePatterns' - def CheckpkgTest(self): + def testGitFiles(self): # The data need to be copied, because otherwise all other tests will # also process modified data. self.pkg_data = copy.deepcopy(rsync_stats[0]) @@ -1276,7 +1128,7 @@ 'discouraged-path-in-pkgmap', '/opt/csw/share/.git/foo') -class TestSetCheckDirectoryDepsTwoPackages(CheckpkgUnitTestHelper, +class TestSetCheckDirectoryDepsTwoPackages(CheckTestHelper, unittest.TestCase): """Test whether appropriate files are provided. @@ -1284,7 +1136,7 @@ """ FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testDirectoryDeps(self): self.pkg_data = sudo_stats self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",)}) @@ -1315,7 +1167,7 @@ self.error_mgr_mock.NeedFile("CSWsudo", mox.IsA(str), mox.IsA(str)) -class TestSetCheckDirectoryDepsMissing(CheckpkgUnitTestHelper, +class TestSetCheckDirectoryDepsMissing(CheckTestHelper, unittest.TestCase): """Test whether appropriate files are provided. @@ -1323,7 +1175,7 @@ """ FUNCTION_NAME = 'SetCheckLibraries' - def CheckpkgTest(self): + def testNeededDirectories(self): self.pkg_data = sudo_stats self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",)}) @@ -1359,7 +1211,7 @@ # 'CSWsudo-common', 'base-dir-not-found', '/opt/csw/share/man') -class TestSetCheckDoubleDepends(CheckpkgUnitTestHelper, unittest.TestCase): +class TestSetCheckDoubleDepends(CheckTestHelper, unittest.TestCase): """This is a class that was used for debugging. It can be removed if becomes annoying. @@ -1367,9 +1219,10 @@ FUNCTION_NAME = 'SetCheckLibraries' def SetMessenger(self): + """We want to have control over the messenger object.""" self.messenger = self.mox.CreateMock(stubs.MessengerStub) - def CheckpkgTest(self): + def testNeededFiles(self): self.pkg_data = javasvn_stats self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libCrun.so.1').AndReturn({u'/usr/lib': [u'SUNWlibC'], u'/usr/lib/sparcv9': [u'SUNWlibCx']}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libCstd.so.1').AndReturn({u'/usr/lib': [u'SUNWlibC'], u'/usr/lib/sparcv9': [u'SUNWlibCx']}) @@ -1456,9 +1309,9 @@ mox.IsA(str), mox.IsA(unicode), mox.IsA(str)) -class TestCheckWrongArchitecture(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckWrongArchitecture(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckWrongArchitecture' - def CheckpkgTest(self): + def testSparcBinariesInIntelPackage(self): self.pkg_data = neon_stats[0] self.error_mgr_mock.ReportError( 'binary-wrong-architecture', @@ -1468,26 +1321,23 @@ 'file=opt/csw/lib/sparcv9/libneon.so.26.0.4 pkginfo-says=i386 actual-binary=sparc') -class TestCheckSharedLibraryNamingPolicy(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckSharedLibraryNamingPolicy(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSharedLibraryNamingPolicy' - def CheckpkgTest(self): + def testNonUniformLibs(self): self.pkg_data = neon_stats[0] self.error_mgr_mock.ReportError( 'non-uniform-lib-versions-in-package', "sonames=libneon.so.26,libneon.so.27") - -class TestCheckSharedLibraryNamingPolicyBerkeley(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckSharedLibraryNamingPolicy' - def CheckpkgTest(self): + def testGood(self): self.pkg_data = bdb48_stats[0] -class TestCheckSharedLibraryPkgDoesNotHaveTheSoFile(CheckpkgUnitTestHelper, +class TestCheckSharedLibraryPkgDoesNotHaveTheSoFile(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSharedLibraryPkgDoesNotHaveTheSoFile' - def CheckpkgTest(self): + def testBad(self): self.pkg_data = neon_stats[0] self.error_mgr_mock.ReportError( 'shared-lib-package-contains-so-symlink', @@ -1496,16 +1346,11 @@ 'shared-lib-package-contains-so-symlink', 'file=/opt/csw/lib/sparcv9/libneon.so') - -class TestCheckSharedLibraryPkgDoesNotHaveTheSoFileSuggestion( - CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckSharedLibraryPkgDoesNotHaveTheSoFile' - def SetMessenger(self): """Overriding this method to use mock instead of a stub.""" self.messenger = self.mox.CreateMock(stubs.MessengerStub) - def CheckpkgTest(self): + def testSuggestions(self): self.pkg_data = neon_stats[0] self.error_mgr_mock.ReportError( 'shared-lib-package-contains-so-symlink', @@ -1538,17 +1383,13 @@ class TestCheckSharedLibraryNameMustBeAsubstringOfSonameGood( - CheckpkgUnitTestHelper, unittest.TestCase): + CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSharedLibraryNameMustBeAsubstringOfSoname' - def CheckpkgTest(self): + def testGood(self): self.pkg_data = neon_stats[0] # TODO: Implement this - -class TestCheckSharedLibraryNameMustBeAsubstringOfSonameGood( - CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckSharedLibraryNameMustBeAsubstringOfSoname' - def CheckpkgTest(self): + def testBad(self): self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["binaries_dump_info"][3]["base_name"] = "foo.so.1" self.error_mgr_mock.ReportError( @@ -1556,10 +1397,10 @@ 'soname=libneon.so.27 filename=foo.so.1') -class TestCheckLicenseFilePlacementLicense(CheckpkgUnitTestHelper, +class TestCheckLicenseFilePlacementLicense(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckLicenseFilePlacement' - def CheckpkgTest(self): + def testBadLicensePlacement(self): self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["pkgmap"].append({ "class": "none", "type": "f", "line": "", @@ -1571,12 +1412,8 @@ 'expected=/opt/csw/shared/doc/neon/... ' 'in-package=/opt/csw/share/doc/alien/license') - -class TestCheckLicenseFilePlacementLicenseDifferentSuffix( - CheckpkgUnitTestHelper, unittest.TestCase): - """A differently suffixed file should not trigger an error.""" - FUNCTION_NAME = 'CheckLicenseFilePlacement' - def CheckpkgTest(self): + def testGoodRandomFileWithSuffix(self): + """A differently suffixed file should not trigger an error.""" self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["pkgmap"].append({ "class": "none", "type": "f", "line": "", @@ -1584,12 +1421,8 @@ "path": "/opt/csw/share/doc/alien/license.html", }) - -class TestCheckLicenseFilePlacementRandomFile( - CheckpkgUnitTestHelper, unittest.TestCase): - "A random file should not trigger the message; only license files." - FUNCTION_NAME = 'CheckLicenseFilePlacement' - def CheckpkgTest(self): + def testGoodRandomFile(self): + "A random file should not trigger the message; only license files." self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["pkgmap"].append({ "class": "none", "type": "f", "line": "", @@ -1598,21 +1431,21 @@ }) -class TestCheckObsoleteDepsCups(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckObsoleteDepsCups(CheckTestHelper, unittest.TestCase): "A random file should not trigger the message; only license files." FUNCTION_NAME = 'CheckObsoleteDeps' - def CheckpkgTest(self): + def testObsoleteDependency(self): self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["depends"].append(("CSWlibcups", None)) self.error_mgr_mock.ReportError('obsolete-dependency', 'CSWlibcups') -class TestCheckBaseDirs(CheckpkgUnitTestHelper, +class TestCheckBaseDirs(CheckTestHelper, unittest.TestCase): """Test whether appropriate base directories are provided.""" FUNCTION_NAME = 'CheckBaseDirs' - def CheckpkgTest(self): + def testBaseDirectoryNeeded(self): self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkgmap"].append( {'class': 'none', @@ -1625,11 +1458,11 @@ self.error_mgr_mock.NeedFile('/opt/csw/lib', mox.IsA(str)) -class TestCheckBaseDirsNotNoneClass(CheckpkgUnitTestHelper, +class TestCheckBaseDirsNotNoneClass(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckBaseDirs' - def CheckpkgTest(self): + def testNeedBaseDir(self): self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkgmap"].append( {'class': 'cswinitsmf', @@ -1642,11 +1475,11 @@ self.error_mgr_mock.NeedFile('/etc/opt/csw/init.d', mox.IsA(str)) -class TestCheckDanglingSymlinks(CheckpkgUnitTestHelper, +class TestCheckDanglingSymlinks(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckDanglingSymlinks' - def CheckpkgTest(self): + def testSymlinkTargetNeeded(self): self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkgmap"].append( {'class': 'none', @@ -1660,7 +1493,7 @@ self.error_mgr_mock.NeedFile('/opt/csw/lib/libpq.so.5', mox.IsA(str)) # Hardlinks work the same way. - def CheckpkgTest2(self): + def testHardlinkTargetNeeded(self): self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkgmap"].append( {'class': 'none', @@ -1673,15 +1506,12 @@ 'target': '/opt/csw/lib/libpq.so.5'}) self.error_mgr_mock.NeedFile('/opt/csw/lib/libpq.so.5', mox.IsA(str)) - def testTwo(self): - self.RunCheckpkgTest(self.CheckpkgTest2) - -class TestCheckPrefixDirs(CheckpkgUnitTestHelper, +class TestCheckPrefixDirs(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckPrefixDirs' - def CheckpkgTest(self): + def testGoodPrefix(self): self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkgmap"].append( {'class': 'none', @@ -1693,7 +1523,7 @@ 'user': None, 'target': None}) - def CheckpkgTest2(self): + def testBadPrefix(self): self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkgmap"].append( {'class': 'none', @@ -1708,7 +1538,7 @@ 'bad-location-of-file', 'file=/opt/cswbin/foo') - def CheckpkgTest3(self): + def testGoodVar(self): self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkgmap"].append( {'class': 'none', @@ -1720,7 +1550,7 @@ 'user': None, 'target': None}) - def CheckpkgTest4(self): + def testBadVar(self): self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkgmap"].append( {'class': 'none', @@ -1735,20 +1565,9 @@ 'bad-location-of-file', 'file=/var/foo') - # These three utility functions allow to run 3 tests in a single - # class. - def testTwo(self): - self.RunCheckpkgTest(self.CheckpkgTest2) - def testThree(self): - self.RunCheckpkgTest(self.CheckpkgTest3) - - def testFour(self): - self.RunCheckpkgTest(self.CheckpkgTest4) - - class TestCheckSonameMustNotBeEqualToFileNameIfFilenameEndsWithSo( - CheckpkgUnitTestHelper, unittest.TestCase): + CheckTestHelper, unittest.TestCase): FUNCTION_NAME = ('CheckSonameMustNotBeEqualToFileName' 'IfFilenameEndsWithSo') FOO_METADATA = { @@ -1759,7 +1578,7 @@ 'path': 'opt/csw/lib/libfoo.so', } - def CheckpkgTest(self): + def testBad(self): self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["binaries_dump_info"][0]["soname"] = "libfoo.so" self.pkg_data["binaries_dump_info"][0]["base_name"] = "libfoo.so" @@ -1769,27 +1588,21 @@ 'soname-equals-filename', 'file=/opt/csw/lib/libfoo.so') - def CheckpkgTest2(self): + def testGood(self): self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["binaries_dump_info"][0]["soname"] = "libfoo.so.1" self.pkg_data["binaries_dump_info"][0]["base_name"] = "libfoo.so.1" self.pkg_data["files_metadata"].append(self.FOO_METADATA) - def testTwo(self): - self.RunCheckpkgTest(self.CheckpkgTest2) - - def testThree(self): - self.RunCheckpkgTest(self.CheckpkgTest3) - - def CheckpkgTest3(self): + def testGoodMercurialExample(self): self.pkg_data = mercurial_stats[0] -class TestCheckCatalognameMatchesPkgname(CheckpkgUnitTestHelper, +class TestCheckCatalognameMatchesPkgname(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckCatalognameMatchesPkgname' - def CheckpkgTest(self): + def testMismatch(self): self.pkg_data = copy.deepcopy(tree_stats[0]) basic_stats = self.pkg_data["basic_stats"] basic_stats["catalogname"] = "foo_bar" @@ -1799,37 +1612,35 @@ 'pkgname=CSWfoo-bar-baz catalogname=foo_bar ' 'expected-catalogname=foo_bar_baz') - def CheckpkgTest2(self): + def testGoodMatch(self): self.pkg_data = copy.deepcopy(tree_stats[0]) - def testTwo(self): - self.RunCheckpkgTest(self.CheckpkgTest2) - -class TestCheckCatalognameMatchesPkgname(CheckpkgUnitTestHelper, +class TestCheckCatalognameMatchesPkgname(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckPkginfoOpencswRepository' - def CheckpkgTest(self): + def testRepositoryInfoGood(self): self.pkg_data = copy.deepcopy(tree_stats[0]) + # No errors reported. + + def testRepositoryInfoMissing(self): + self.pkg_data = copy.deepcopy(tree_stats[0]) del self.pkg_data["pkginfo"]["OPENCSW_REPOSITORY"] self.error_mgr_mock.ReportError('pkginfo-opencsw-repository-missing') - def CheckpkgTest2(self): + def testRepositoryInfoUncommitted(self): self.pkg_data = copy.deepcopy(tree_stats[0]) self.pkg_data["pkginfo"]["OPENCSW_REPOSITORY"] = ( "https://gar.svn.sourceforge.net/svnroot/gar/" "csw/mgar/pkg/puppet/trunk at UNCOMMITTED") self.error_mgr_mock.ReportError('pkginfo-opencsw-repository-uncommitted') - def testTwo(self): - self.RunCheckpkgTest(self.CheckpkgTest2) - -class TestCheckAlternativesDependency(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckAlternativesDependency(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckAlternativesDependency' ALTERNATIVES_EXECUTABLE = "/opt/csw/sbin/alternatives" - def CheckpkgTest(self): + def testAlternativesNeeded(self): self.pkg_data["pkgmap"].append({ 'class': 'cswalternatives', 'group': 'bin', @@ -1846,21 +1657,39 @@ "The alternatives subsystem is used") -class TestCheckSharedLibrarySoExtension( - CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckSharedLibrarySoExtension(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSharedLibrarySoExtension' - def CheckpkgTest(self): + def testGoodExtension(self): self.pkg_data = copy.deepcopy(neon_stats[0]) - def CheckpkgTest2(self): + def testBadExtension(self): self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["files_metadata"][11]["path"] = "foo.1" self.error_mgr_mock.ReportError( 'shared-library-missing-dot-so', 'file=foo.1') - def testTwo(self): - self.RunCheckpkgTest(self.CheckpkgTest2) +class TestRemovePackagesUnderInstallation(unittest.TestCase): + def testRemoveNone(self): + paths_and_pkgs_by_soname = { + 'libfoo.so.1': {u'/opt/csw/lib': [u'CSWlibfoo']}} + packages_to_be_installed = [u'CSWbar'] + self.assertEqual( + paths_and_pkgs_by_soname, + pc.RemovePackagesUnderInstallation(paths_and_pkgs_by_soname, + packages_to_be_installed)) + + def testRemoveOne(self): + paths_and_pkgs_by_soname = { + 'libfoo.so.1': {u'/opt/csw/lib': [u'CSWlibfoo']}} + packages_to_be_installed = [u'CSWlibfoo'] + self.assertEqual( + {'libfoo.so.1': {}}, + pc.RemovePackagesUnderInstallation(paths_and_pkgs_by_soname, + packages_to_be_installed)) + + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 21 10:13:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 Oct 2011 08:13:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15950] csw/mgar/gar/v2 Message-ID: Revision: 15950 http://gar.svn.sourceforge.net/gar/?rev=15950&view=rev Author: wahwah Date: 2011-10-21 08:13:14 +0000 (Fri, 21 Oct 2011) Log Message: ----------- mGAR v2: Raising default ISAs for Solaris 10, merging in the v2-raised-buildlevel branch Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Property Changed: ---------------- csw/mgar/gar/v2/ Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /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-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /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-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-10-21 08:08:51 UTC (rev 15949) +++ csw/mgar/gar/v2/gar.conf.mk 2011-10-21 08:13:14 UTC (rev 15950) @@ -411,11 +411,20 @@ FLAVOR_FLAGS += $(EXTRA_$(GARFLAVOR)_FLAGS_$(GARCOMPILER)_$(GARCH)) $(EXTRA_$(GARFLAVOR)_FLAGS_$(GARCOMPILER)) # Raise these in your .garrc if needed -ISA_DEFAULT_sparc ?= sparcv8 -ISA_DEFAULT_i386 ?= i386 -ISA_DEFAULT64_sparc ?= sparcv9 -ISA_DEFAULT64_i386 ?= amd64 +ISA_DEFAULT_sparc-5.9 ?= sparcv8 +ISA_DEFAULT_sparc-5.10 ?= sparcv8plus +ISA_DEFAULT_i386-5.9 ?= i386 +ISA_DEFAULT_i386-5.10 ?= pentium_pro +ISA_DEFAULT64_sparc-5.9 ?= sparcv9 +ISA_DEFAULT64_sparc-5.10 ?= sparcv9 +ISA_DEFAULT64_i386-5.9 ?= amd64 +ISA_DEFAULT64_i386-5.10 ?= amd64 +ISA_DEFAULT_sparc ?= $(ISA_DEFAULT_sparc-$(GAROSREL)) +ISA_DEFAULT_i386 ?= $(ISA_DEFAULT_i386-$(GAROSREL)) +ISA_DEFAULT64_sparc ?= $(ISA_DEFAULT64_sparc-$(GAROSREL)) +ISA_DEFAULT64_i386 ?= $(ISA_DEFAULT64_i386-$(GAROSREL)) + # These are the ISAs that are always build for 32 bit and 64 bit # Do not overwrite these as they are used to control expansion at several other places ISA_DEFAULT = $(ISA_DEFAULT_$(GARCH)) @@ -450,8 +459,8 @@ # Subdirectories for specialized binaries and libraries # Use defaults for sparcv8 and i386 as those are symlinks -ISALIBDIR_sparcv8 ?= . -ISALIBDIR_i386 ?= . +ISALIBDIR_$(ISA_DEFAULT_sparc) ?= . +ISALIBDIR_$(ISA_DEFAULT_i386) ?= . $(foreach I,$(ISALIST),$(eval ISALIBDIR_$(I) ?= $I)) # These are the directories where the optimized libraries should go to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Oct 21 10:13:48 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 21 Oct 2011 08:13:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[15951] csw/mgar/gar/v2-raised-buildlevel/ Message-ID: Revision: 15951 http://gar.svn.sourceforge.net/gar/?rev=15951&view=rev Author: wahwah Date: 2011-10-21 08:13:48 +0000 (Fri, 21 Oct 2011) Log Message: ----------- mGAR v2: removing a merged branch Removed Paths: ------------- csw/mgar/gar/v2-raised-buildlevel/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Oct 21 11:20:20 2011 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 21 Oct 2011 09:20:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[15952] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 15952 http://gar.svn.sourceforge.net/gar/?rev=15952&view=rev Author: janholzh Date: 2011-10-21 09:20:20 +0000 (Fri, 21 Oct 2011) Log Message: ----------- ffmpeg: add RUNTIME_DEP and LICENSE Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-10-21 08:13:48 UTC (rev 15951) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-10-21 09:20:20 UTC (rev 15952) @@ -19,12 +19,23 @@ MASTER_SITES = http://ffmpeg.org/releases/ DISTFILES = $(DISTNAME).tar.bz2 +LICENSE = COPYING.GPLv3 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PATCHFILES = 0001-fix-version.sh.patch PATCHFILES += 0002-change-linker-flags.patch PATCHFILES += 0003-fix-testsuite-shells.patch +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibsdl +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibz1 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWftype2 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibspeex1 + BUILD64 = 1 # Tests only work with static build #TEST_SCRIPTS = 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 Oct 21 22:11:21 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 Oct 2011 20:11:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[15953] csw/mgar/pkg/cpan Message-ID: Revision: 15953 http://gar.svn.sourceforge.net/gar/?rev=15953&view=rev Author: dmichelsen Date: 2011-10-21 20:11:21 +0000 (Fri, 21 Oct 2011) Log Message: ----------- cpan/File-ReadBackwards/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/File-ReadBackwards/ csw/mgar/pkg/cpan/File-ReadBackwards/branches/ csw/mgar/pkg/cpan/File-ReadBackwards/tags/ csw/mgar/pkg/cpan/File-ReadBackwards/trunk/ csw/mgar/pkg/cpan/File-ReadBackwards/trunk/Makefile csw/mgar/pkg/cpan/File-ReadBackwards/trunk/checksums csw/mgar/pkg/cpan/File-ReadBackwards/trunk/files/ Property changes on: csw/mgar/pkg/cpan/File-ReadBackwards/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/File-ReadBackwards/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-ReadBackwards/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-ReadBackwards/trunk/Makefile 2011-10-21 20:11:21 UTC (rev 15953) @@ -0,0 +1,16 @@ +NAME = File-ReadBackwards +VERSION = 1.05 +CATEGORIES = cpan +AUTHOR = URI + +DESCRIPTION = Read a file backwards by lines +define BLURB +endef + +LICENSE = README + +PACKAGES += CSWpm-file-readbackwards +CATALOGNAME_CSWpm-file-readbackwards = pm_file_readbackwards +ARCHALL_CSWpm-file-readbackwards = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-ReadBackwards/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-ReadBackwards/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-ReadBackwards/trunk/checksums 2011-10-21 20:11:21 UTC (rev 15953) @@ -0,0 +1 @@ +613d9d02de6c1d86d5fa5b8816a6b214 File-ReadBackwards-1.05.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 21 23:13:32 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 Oct 2011 21:13:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[15954] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 15954 http://gar.svn.sourceforge.net/gar/?rev=15954&view=rev Author: dmichelsen Date: 2011-10-21 21:13:32 +0000 (Fri, 21 Oct 2011) Log Message: ----------- pcre/trunk: Update to 8.20 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2011-10-21 20:11:21 UTC (rev 15953) +++ csw/mgar/pkg/pcre/trunk/Makefile 2011-10-21 21:13:32 UTC (rev 15954) @@ -1,5 +1,5 @@ NAME = pcre -VERSION = 8.13 +VERSION = 8.20 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools @@ -72,6 +72,9 @@ CONFIGURE_ARGS += --enable-pcregrep-libbz2 CONFIGURE_ARGS += --enable-pcretest-libreadline +# No JIT for Sparc, may try for x86 at some later time +#CONFIGURE_ARGS += --enable-jit + include gar/category.mk # The testcases need 'diff -u' which Solaris 8 diff does not have, Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2011-10-21 20:11:21 UTC (rev 15953) +++ csw/mgar/pkg/pcre/trunk/checksums 2011-10-21 21:13:32 UTC (rev 15954) @@ -1 +1 @@ -5e595edbcded141813fa1a10dbce05cb pcre-8.13.tar.bz2 +a1931c70e1273e3450d5036fe273d25c pcre-8.20.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Oct 21 23:42:19 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 21 Oct 2011 21:42:19 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[568] web/wordpresscsw/wp-content/themes/opencsw/ packages.php Message-ID: Revision: 568 http://opencsw.svn.sourceforge.net/opencsw/?rev=568&view=rev Author: skayser Date: 2011-10-21 21:42:19 +0000 (Fri, 21 Oct 2011) Log Message: ----------- packages.php: reduce and simplify, point out 'current' freeze Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/packages.php Modified: web/wordpresscsw/wp-content/themes/opencsw/packages.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/packages.php 2011-10-11 17:42:04 UTC (rev 567) +++ web/wordpresscsw/wp-content/themes/opencsw/packages.php 2011-10-21 21:42:19 UTC (rev 568) @@ -12,21 +12,21 @@
-

Here is a list of Solaris software packages we currently have in the 'current' archive. Please note that we also have a pre-release "experimental" area, that OpenCSW packages are often put into, just before official public release to our mirror sites.

+

+This is the list of Solaris software packages in our 'current' branch. Please +note that our release model is currently being overhauled. While this is the +case, 'current' doesn't see updates. You'll find more recent packages in the +'unstable' branch. +

+

+To request a Solaris package for something that is not currently here, please +use the Package Request Form. +However, you will greatly improve the chances of the package actually being +made, if you sign up to be a maintainer +yourself. Come on in and join the party! +


-

If you would like to volunteer to maintain a package for software not listed here, you can use the standard signup form

-
-

Documentation about how to install one or more of these packages under Solaris is available from this page. This page describes the different installation methods and automated tools.

-
-

If you wish to manually download OpenCSW packages, please choose one of the mirror sites to download from. This website does not have the bandwidth to serve package downloads directly.

-
-

To request that someone make a Solaris package for something that is not currently here, you may use the Package Request Form. However, you will greatly improve the chances of the package actually being made, if you sign up to be a maintainer yourself. Come on in and join the party!

-
-

If any of the software listed here has had a more recent official version released, please file a "bug" against the package, in our bugtracking area

-
-

There is a separate place to go, if you wish to see OpenCSW packages organized by category

-
-
+
@@ -62,9 +62,6 @@ ?>
-

-

If a newer (stable) version of any software listed here has been released, please file a "bug" against the package, in our bugtracking area

-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at opencsw.org Fri Oct 21 23:47:54 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Fri, 21 Oct 2011 23:47:54 +0200 Subject: [csw-devel] SF.net SVN: opencsw:[568] web/wordpresscsw/wp-content/themes/opencsw/ packages.php In-Reply-To: References: Message-ID: <20111021214754.GF26160@sebastiankayser.de> * skayser at users.sourceforge.net wrote: > Revision: 568 > http://opencsw.svn.sourceforge.net/opencsw/?rev=568&view=rev > Author: skayser > Date: 2011-10-21 21:42:19 +0000 (Fri, 21 Oct 2011) > Log Message: > ----------- > packages.php: reduce and simplify, point out 'current' freeze > > Modified Paths: > -------------- > web/wordpresscsw/wp-content/themes/opencsw/packages.php This is an example for cleanup work mentioned at summercamp. Okay if I push this? Mainly going for less interlinks and duplicated content on our site to reduce confusion and surplus information. Also, points out the fact that the shown package list is currently frozen. Sebastian From wilbury at users.sourceforge.net Fri Oct 21 23:49:14 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 21 Oct 2011 21:49:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15955] csw/mgar/pkg/libmemcached/trunk Message-ID: Revision: 15955 http://gar.svn.sourceforge.net/gar/?rev=15955&view=rev Author: wilbury Date: 2011-10-21 21:49:13 +0000 (Fri, 21 Oct 2011) Log Message: ----------- libmemcached/trunk: Fix build, another try. Modified Paths: -------------- csw/mgar/pkg/libmemcached/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/libmemcached/trunk/ Property changes on: csw/mgar/pkg/libmemcached/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libmemcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-21 21:13:32 UTC (rev 15954) +++ csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-21 21:49:13 UTC (rev 15955) @@ -15,7 +15,8 @@ PATCHFILES += 0002-Use-opt-csw-bin-ggrep.patch BUILD_DEP_PKGS += CSWlibevent-dev -RUNTIME_DEP_PKGS += CSWlibevent2-0-5 +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibstdc++6 DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -31,6 +32,16 @@ OPT_FLAGS_GCC = -O2 -pipe GARCOMPILER = GCC4 +GARTYPE = 2 +PACKAGING_PLATFORMS = solaris10-i386 solaris10-amd64 + +PACKAGES += CSWlibhashkit1 +CATALOGNAME_CSWlibhashkit1 = libhashkit1 +PKGFILES_CSWlibhashkit1 += $(call baseisadirs,$(libdir),libhashkit\.so\.1\.0\.0) +PKGFILES_CSWlibhashkit1 += $(call baseisadirs,$(libdir),libhashkit\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibhashkit1 += $(DESCRIPTION), libhashkit.so.1 +RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibhashkit1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Oct 22 00:09:55 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 21 Oct 2011 22:09:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[15956] csw/mgar/pkg/libmemcached/trunk/Makefile Message-ID: Revision: 15956 http://gar.svn.sourceforge.net/gar/?rev=15956&view=rev Author: wilbury Date: 2011-10-21 22:09:55 +0000 (Fri, 21 Oct 2011) Log Message: ----------- libmemcached/trunk: Fix build, another try. Modified Paths: -------------- csw/mgar/pkg/libmemcached/trunk/Makefile Modified: csw/mgar/pkg/libmemcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-21 21:49:13 UTC (rev 15955) +++ csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-21 22:09:55 UTC (rev 15956) @@ -15,8 +15,6 @@ PATCHFILES += 0002-Use-opt-csw-bin-ggrep.patch BUILD_DEP_PKGS += CSWlibevent-dev -RUNTIME_DEP_PKGS += CSWlibgcc-s1 -RUNTIME_DEP_PKGS += CSWlibstdc++6 DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -36,12 +34,47 @@ PACKAGING_PLATFORMS = solaris10-i386 solaris10-amd64 +PACKAGES += CSWlibmemcached +RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibstdc++6 +SPKG_DESC_CSWlibmemcached = $(DESCRIPTION), main library + PACKAGES += CSWlibhashkit1 CATALOGNAME_CSWlibhashkit1 = libhashkit1 PKGFILES_CSWlibhashkit1 += $(call baseisadirs,$(libdir),libhashkit\.so\.1\.0\.0) PKGFILES_CSWlibhashkit1 += $(call baseisadirs,$(libdir),libhashkit\.so\.1(\.\d+)*) SPKG_DESC_CSWlibhashkit1 += $(DESCRIPTION), libhashkit.so.1 +RUNTIME_DEP_PKGS_CSWlibhashkit1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibhashkit1 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibhashkit1 +PACKAGES += CSWlibmemcached8 +CATALOGNAME_CSWlibmemcached8 = libmemcached8 +PKGFILES_CSWlibmemcached8 += $(call baseisadirs,$(libdir),libmemcached\.so\.8\.0\.0) +PKGFILES_CSWlibmemcached8 += $(call baseisadirs,$(libdir),libmemcached\.so\.8(\.\d+)*) +SPKG_DESC_CSWlibmemcached8 += $(DESCRIPTION), libmemcached.so.8 +RUNTIME_DEP_PKGS_CSWlibmemcached8 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmemcached8 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibmemcached8 + +PACKAGES += CSWlibmemcachedutil2 +CATALOGNAME_CSWlibmemcachedutil2 = libmemcachedutil2 +PKGFILES_CSWlibmemcachedutil2 += $(call baseisadirs,$(libdir),libmemcachedutil\.so\.2\.0\.0) +PKGFILES_CSWlibmemcachedutil2 += $(call baseisadirs,$(libdir),libmemcachedutil\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibmemcachedutil2 += $(DESCRIPTION), libmemcachedutil.so.2 +RUNTIME_DEP_PKGS_CSWlibmemcachedutil2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmemcachedutil2 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibmemcachedutil2 += CSWlibmemcached8 +RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibmemcachedutil2 + +PACKAGES += CSWlibmemcachedprotocol0 +CATALOGNAME_CSWlibmemcachedprotocol0 = libmemcachedprotocol0 +PKGFILES_CSWlibmemcachedprotocol0 += $(call baseisadirs,$(libdir),libmemcachedprotocol\.so\.0\.0\.0) +PKGFILES_CSWlibmemcachedprotocol0 += $(call baseisadirs,$(libdir),libmemcachedprotocol\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibmemcachedprotocol0 += $(DESCRIPTION), libmemcachedprotocol.so.0 +RUNTIME_DEP_PKGS_CSWlibmemcachedprotocol0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmemcachedprotocol0 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibmemcachedprotocol0 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Oct 22 01:40:37 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 21 Oct 2011 23:40:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[15957] csw/mgar/pkg/libmemcached/trunk Message-ID: Revision: 15957 http://gar.svn.sourceforge.net/gar/?rev=15957&view=rev Author: wilbury Date: 2011-10-21 23:40:37 +0000 (Fri, 21 Oct 2011) Log Message: ----------- libmemcached/trunk: Upgrade to version 0.53 Modified Paths: -------------- csw/mgar/pkg/libmemcached/trunk/Makefile csw/mgar/pkg/libmemcached/trunk/checksums Modified: csw/mgar/pkg/libmemcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-21 22:09:55 UTC (rev 15956) +++ csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-21 23:40:37 UTC (rev 15957) @@ -1,7 +1,7 @@ # $Id$ # NAME = libmemcached -VERSION = 0.52 +VERSION = 0.53 VENDOR_URL = http://libmemcached.org/ CATEGORIES = lib DESCRIPTION = Library memcached interface Modified: csw/mgar/pkg/libmemcached/trunk/checksums =================================================================== --- csw/mgar/pkg/libmemcached/trunk/checksums 2011-10-21 22:09:55 UTC (rev 15956) +++ csw/mgar/pkg/libmemcached/trunk/checksums 2011-10-21 23:40:37 UTC (rev 15957) @@ -1 +1 @@ -c3a735c6db51de5ce457565179fc40f2 libmemcached-0.52.tar.gz +b22ea3698111f12075fe50a4097e2bbc libmemcached-0.53.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Oct 22 14:11:11 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 22 Oct 2011 13:11:11 +0100 Subject: [csw-devel] SF.net SVN: opencsw:[568] web/wordpresscsw/wp-content/themes/opencsw/ packages.php In-Reply-To: <20111021214754.GF26160@sebastiankayser.de> References: <20111021214754.GF26160@sebastiankayser.de> Message-ID: 2011/10/21 Sebastian Kayser : > This is an example for cleanup work mentioned at summercamp. Okay if I > push this? Looks good overall. A comment about the pushes to current: There are some pushes. current is a symlink to dublin, and dublin does get occasional updates. They are done by me, manually. I plan a bigger push when I sort out the Ada frontend to GCC (timeline unknown). Maciej From dmichelsen at users.sourceforge.net Sat Oct 22 21:53:25 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 22 Oct 2011 19:53:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[15958] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 15958 http://gar.svn.sourceforge.net/gar/?rev=15958&view=rev Author: dmichelsen Date: 2011-10-22 19:53:24 +0000 (Sat, 22 Oct 2011) Log Message: ----------- openldap/trunk: Update comment on libnet issue Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2011-10-21 23:40:37 UTC (rev 15957) +++ csw/mgar/pkg/openldap/trunk/Makefile 2011-10-22 19:53:24 UTC (rev 15958) @@ -150,7 +150,8 @@ CONFIGURE_ARGS += --disable-ndb # This libnet is meant to be provided for BeOS only, the libnet.so picked up from OpenCSW -# is completely unrelated. Disable the linkage. +# is completely unrelated. Disable the linkage until this is fixed: +# http://www.openldap.org/its/index.cgi?findid=7071 CONFIGURE_ARGS += ac_cv_lib_net_main=no # Disable TCPwrappers in 64 bit until the libraries are available This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 22 22:05:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 22 Oct 2011 20:05:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[15959] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 15959 http://gar.svn.sourceforge.net/gar/?rev=15959&view=rev Author: dmichelsen Date: 2011-10-22 20:05:32 +0000 (Sat, 22 Oct 2011) Log Message: ----------- mGAR v2: Add LC_ALL=C to standard environment Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-10-22 19:53:24 UTC (rev 15958) +++ csw/mgar/gar/v2/gar.conf.mk 2011-10-22 20:05:32 UTC (rev 15959) @@ -691,7 +691,13 @@ GARPACKAGE = $(shell basename $(CURDIR)) STANDARD_EXPORTS ?= PATH +LANG_EXPORTS ?= LC_ALL +CONFIGURE_ENV_LC_ALL = C +BUILD_ENV_LC_ALL = C +TEST_ENV_LC_ALL = C +INSTALL_ENV_LC_ALL = C + # Put these variables in the environment during the # configure, build, test, and install stages ifeq ($(origin DIRECTORY_EXPORTS), undefined) @@ -712,7 +718,7 @@ GARPKG_EXPORTS += GARCH GAROSREL GARPACKAGE endif -COMMON_EXPORTS ?= $(STANDARD_EXPORTS) $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) $(_CATEGORY_COMMON_EXPORTS) +COMMON_EXPORTS ?= $(STANDARD_EXPORTS) $(LANG_EXPORTS) $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) $(_CATEGORY_COMMON_EXPORTS) ifneq ($(LD_OPTIONS),) COMMON_EXPORTS += LD_OPTIONS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 22 22:49:59 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 22 Oct 2011 20:49:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[15960] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 15960 http://gar.svn.sourceforge.net/gar/?rev=15960&view=rev Author: dmichelsen Date: 2011-10-22 20:49:59 +0000 (Sat, 22 Oct 2011) Log Message: ----------- mGAR v2: Make LC_ALL in phases adjustable Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-10-22 20:05:32 UTC (rev 15959) +++ csw/mgar/gar/v2/gar.conf.mk 2011-10-22 20:49:59 UTC (rev 15960) @@ -693,10 +693,10 @@ STANDARD_EXPORTS ?= PATH LANG_EXPORTS ?= LC_ALL -CONFIGURE_ENV_LC_ALL = C -BUILD_ENV_LC_ALL = C -TEST_ENV_LC_ALL = C -INSTALL_ENV_LC_ALL = C +CONFIGURE_ENV_LC_ALL ?= C +BUILD_ENV_LC_ALL ?= C +TEST_ENV_LC_ALL ?= C +INSTALL_ENV_LC_ALL ?= C # Put these variables in the environment during the # configure, build, test, and install stages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Oct 23 11:10:27 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 23 Oct 2011 09:10:27 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[569] web/wordpresscsw/wp-content/themes/opencsw/ packages.php Message-ID: Revision: 569 http://opencsw.svn.sourceforge.net/opencsw/?rev=569&view=rev Author: skayser Date: 2011-10-23 09:10:27 +0000 (Sun, 23 Oct 2011) Log Message: ----------- packages.php: adjust 'current' state, it does receive some updates Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/packages.php Modified: web/wordpresscsw/wp-content/themes/opencsw/packages.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/packages.php 2011-10-21 21:42:19 UTC (rev 568) +++ web/wordpresscsw/wp-content/themes/opencsw/packages.php 2011-10-23 09:10:27 UTC (rev 569) @@ -15,8 +15,8 @@

This is the list of Solaris software packages in our 'current' branch. Please note that our release model is currently being overhauled. While this is the -case, 'current' doesn't see updates. You'll find more recent packages in the -'unstable' branch. +case, 'current' receives only partial and infrequent updates. You'll find more +recent packages in the 'unstable' branch.

To request a Solaris package for something that is not currently here, please This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at opencsw.org Sun Oct 23 11:25:09 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Sun, 23 Oct 2011 11:25:09 +0200 Subject: [csw-devel] SF.net SVN: opencsw:[568] web/wordpresscsw/wp-content/themes/opencsw/ packages.php In-Reply-To: References: <20111021214754.GF26160@sebastiankayser.de> Message-ID: <20111023092509.GH26160@sebastiankayser.de> * Maciej (Matchek) Blizi??ski wrote: > 2011/10/21 Sebastian Kayser : > > This is an example for cleanup work mentioned at summercamp. Okay if I > > push this? > > Looks good overall. > > A comment about the pushes to current: There are some pushes. > > current is a symlink to dublin, and dublin does get occasional > updates. They are done by me, manually. I plan a bigger push when I > sort out the Ada frontend to GCC (timeline unknown). Thanks, Maciej. Wording adjusted and pushed to www. More changes to follow over the next days. Sebastian From skayser at users.sourceforge.net Sun Oct 23 11:31:04 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 23 Oct 2011 09:31:04 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[570] web/wordpresscsw/wp-content/themes/opencsw/ packages.php Message-ID: Revision: 570 http://opencsw.svn.sourceforge.net/opencsw/?rev=570&view=rev Author: skayser Date: 2011-10-23 09:31:04 +0000 (Sun, 23 Oct 2011) Log Message: ----------- packages.php: further simplify, drop link to maintainer signup We tend to test contribution willingness upon pkgreq and there's also "Extend it" (subject to rename to "Contribute") for people interested in contributing. Ties into the main theme of having less page-interlinks in favor of more concise website sections which are navigated top down. Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/packages.php Modified: web/wordpresscsw/wp-content/themes/opencsw/packages.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/packages.php 2011-10-23 09:10:27 UTC (rev 569) +++ web/wordpresscsw/wp-content/themes/opencsw/packages.php 2011-10-23 09:31:04 UTC (rev 570) @@ -16,15 +16,10 @@ This is the list of Solaris software packages in our 'current' branch. Please note that our release model is currently being overhauled. While this is the case, 'current' receives only partial and infrequent updates. You'll find more -recent packages in the 'unstable' branch. +recent packages in the 'unstable' branch. To request a Solaris package for +something that is not currently here, please use the +Package Request Form.

-

-To request a Solaris package for something that is not currently here, please -use the Package Request Form. -However, you will greatly improve the chances of the package actually being -made, if you sign up to be a maintainer -yourself. Come on in and join the party! -


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Oct 23 12:18:46 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 23 Oct 2011 10:18:46 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[571] web/wordpresscsw/wp-content/themes/opencsw/ sidebar.php Message-ID: Revision: 571 http://opencsw.svn.sourceforge.net/opencsw/?rev=571&view=rev Author: skayser Date: 2011-10-23 10:18:46 +0000 (Sun, 23 Oct 2011) Log Message: ----------- sidebar.php: rename 'get it' to 'get started', swap with 'search' Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/sidebar.php Modified: web/wordpresscsw/wp-content/themes/opencsw/sidebar.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/sidebar.php 2011-10-23 09:31:04 UTC (rev 570) +++ web/wordpresscsw/wp-content/themes/opencsw/sidebar.php 2011-10-23 10:18:46 UTC (rev 571) @@ -4,12 +4,13 @@
  • - +
    - +
    - Search packages content + Get Started + Download packages
    • @@ -27,13 +28,12 @@
  • - +
    - +
    - Get it - Download packages + Search packages content
    • This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Oct 23 12:44:14 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 23 Oct 2011 10:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15961] csw/mgar/pkg/libmemcached/trunk/Makefile Message-ID: Revision: 15961 http://gar.svn.sourceforge.net/gar/?rev=15961&view=rev Author: wilbury Date: 2011-10-23 10:44:13 +0000 (Sun, 23 Oct 2011) Log Message: ----------- libmemcached/trunk: Depend on CSWlibevent2-0-5 in runtime. Modified Paths: -------------- csw/mgar/pkg/libmemcached/trunk/Makefile Modified: csw/mgar/pkg/libmemcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-22 20:49:59 UTC (rev 15960) +++ csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-23 10:44:13 UTC (rev 15961) @@ -37,13 +37,17 @@ PACKAGES += CSWlibmemcached RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibevent2-0-5 SPKG_DESC_CSWlibmemcached = $(DESCRIPTION), main library +SPKG_FULL_REVSTAMP_CSWlibmemcached = 1 +CHECKPKG_OVERRIDES_CSWlibmemcached += surplus-dependency|CSWlibevent2-0-5 PACKAGES += CSWlibhashkit1 CATALOGNAME_CSWlibhashkit1 = libhashkit1 PKGFILES_CSWlibhashkit1 += $(call baseisadirs,$(libdir),libhashkit\.so\.1\.0\.0) PKGFILES_CSWlibhashkit1 += $(call baseisadirs,$(libdir),libhashkit\.so\.1(\.\d+)*) SPKG_DESC_CSWlibhashkit1 += $(DESCRIPTION), libhashkit.so.1 +SPKG_FULL_REVSTAMP_CSWlibhashkit1 = 1 RUNTIME_DEP_PKGS_CSWlibhashkit1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibhashkit1 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibhashkit1 @@ -53,6 +57,7 @@ PKGFILES_CSWlibmemcached8 += $(call baseisadirs,$(libdir),libmemcached\.so\.8\.0\.0) PKGFILES_CSWlibmemcached8 += $(call baseisadirs,$(libdir),libmemcached\.so\.8(\.\d+)*) SPKG_DESC_CSWlibmemcached8 += $(DESCRIPTION), libmemcached.so.8 +SPKG_FULL_REVSTAMP_CSWlibmemcached8 = 1 RUNTIME_DEP_PKGS_CSWlibmemcached8 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibmemcached8 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibmemcached8 @@ -62,6 +67,7 @@ PKGFILES_CSWlibmemcachedutil2 += $(call baseisadirs,$(libdir),libmemcachedutil\.so\.2\.0\.0) PKGFILES_CSWlibmemcachedutil2 += $(call baseisadirs,$(libdir),libmemcachedutil\.so\.2(\.\d+)*) SPKG_DESC_CSWlibmemcachedutil2 += $(DESCRIPTION), libmemcachedutil.so.2 +SPKG_FULL_REVSTAMP_CSWlibmemcachedutil2 = 1 RUNTIME_DEP_PKGS_CSWlibmemcachedutil2 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibmemcachedutil2 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibmemcachedutil2 += CSWlibmemcached8 @@ -72,6 +78,7 @@ PKGFILES_CSWlibmemcachedprotocol0 += $(call baseisadirs,$(libdir),libmemcachedprotocol\.so\.0\.0\.0) PKGFILES_CSWlibmemcachedprotocol0 += $(call baseisadirs,$(libdir),libmemcachedprotocol\.so\.0(\.\d+)*) SPKG_DESC_CSWlibmemcachedprotocol0 += $(DESCRIPTION), libmemcachedprotocol.so.0 +SPKG_FULL_REVSTAMP_CSWlibmemcachedprotocol0 = 1 RUNTIME_DEP_PKGS_CSWlibmemcachedprotocol0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibmemcachedprotocol0 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibmemcachedprotocol0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Oct 23 14:12:01 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 23 Oct 2011 12:12:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[15962] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 15962 http://gar.svn.sourceforge.net/gar/?rev=15962&view=rev Author: wilbury Date: 2011-10-23 12:12:01 +0000 (Sun, 23 Oct 2011) Log Message: ----------- memcached/trunk: Update to 1.4.9 Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/memcached/trunk/checksums Added Paths: ----------- csw/mgar/pkg/memcached/trunk/files/0001-Fix-memcached_dtrace.d-and-add-touch-command.patch Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2011-10-23 10:44:13 UTC (rev 15961) +++ csw/mgar/pkg/memcached/trunk/Makefile 2011-10-23 12:12:01 UTC (rev 15962) @@ -1,5 +1,5 @@ NAME = memcached -VERSION = 1.4.5 +VERSION = 1.4.9 CATEGORIES = net DESCRIPTION = Distributed memory object caching system @@ -12,18 +12,20 @@ MASTER_SITES = http://memcached.googlecode.com/files/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# Use patches until this is applied: -# https://github.com/memcached/memcached/pull/3 +## Use patches until this is applied: +## https://github.com/memcached/memcached/pull/3 PATCHFILES += 0001-Fix-alignment-check-as-84148994-0x05040302.patch PATCHFILES += 0002-Take-endianness-into-account-on-alignment-check.patch - -# The addition of more status field made the data arrive in multiple packets -# leading to broken tests when it is not waited for more packages. +# +## The addition of more status field made the data arrive in multiple packets +## leading to broken tests when it is not waited for more packages. PATCHFILES += 0003-Make-sure-to-wait-for-data.patch - -# Looks like the data structure is not clean on sparcv9 (only!) +# +## Looks like the data structure is not clean on sparcv9 (only!) PATCHFILES += 0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch +PATCHFILES += 0001-Fix-memcached_dtrace.d-and-add-touch-command.patch + # If we enable GIT patching this makes a .git repo in $WORKSRC. # Unfortunatly this triggers maintainer mode for t/whitespace.t which # then fails because the developer GIT repo contains more things than the @@ -35,7 +37,7 @@ VENDOR_URL = http://memcached.org/ -BUILD_DEP_PKGS = CSWlibevent-devel +BUILD_DEP_PKGS = CSWlibevent-dev RUNTIME_DEP_PKGS = CSWlibevent2-0-5 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 @@ -51,5 +53,7 @@ CONFIGURE_ARGS-sol5.10 += --enable-dtrace CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL)) +PACKAGING_PLATFORMS = solaris10-i386 solaris10-amd64 + include gar/category.mk Modified: csw/mgar/pkg/memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/memcached/trunk/checksums 2011-10-23 10:44:13 UTC (rev 15961) +++ csw/mgar/pkg/memcached/trunk/checksums 2011-10-23 12:12:01 UTC (rev 15962) @@ -1 +1 @@ -583441a25f937360624024f2881e5ea8 memcached-1.4.5.tar.gz +e55fd8144f3a36189f42c12ceb22832b memcached-1.4.9.tar.gz Added: csw/mgar/pkg/memcached/trunk/files/0001-Fix-memcached_dtrace.d-and-add-touch-command.patch =================================================================== --- csw/mgar/pkg/memcached/trunk/files/0001-Fix-memcached_dtrace.d-and-add-touch-command.patch (rev 0) +++ csw/mgar/pkg/memcached/trunk/files/0001-Fix-memcached_dtrace.d-and-add-touch-command.patch 2011-10-23 12:12:01 UTC (rev 15962) @@ -0,0 +1,34 @@ +From b8f575fd06bcb98a44d633e290358361543645f7 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Sun, 23 Oct 2011 13:59:56 +0200 +Subject: [PATCH] Fix memcached_dtrace.d and add ``touch'' command. + +--- + memcached_dtrace.d | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/memcached_dtrace.d b/memcached_dtrace.d +index eeffb6f..59a1a89 100644 +--- a/memcached_dtrace.d ++++ b/memcached_dtrace.d +@@ -207,6 +207,17 @@ provider memcached { + probe command__add(int connid, const char *key, int keylen, int size, int64_t casid); + + /** ++ * Fired for an touch-command. ++ * @param connid connection id ++ * @param key requested key ++ * @param keylen length of the key ++ * @param size the new size of the key's data (or signed int -1 if ++ * not found) ++ * @param casid the casid for the item ++ */ ++ probe command__touch(int connid, const char *key, int keylen, int size, int64_t casid); ++ ++ /** + * Fired for a set-command. + * @param connid connection id + * @param key requested key +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 23 16:05:21 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 23 Oct 2011 14:05:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[15963] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 15963 http://gar.svn.sourceforge.net/gar/?rev=15963&view=rev Author: rthurner Date: 2011-10-23 14:05:21 +0000 (Sun, 23 Oct 2011) Log Message: ----------- subversion, upgrade to svn-1.7.1, switch off python binding compile again Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-10-23 12:12:01 UTC (rev 15962) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-10-23 14:05:21 UTC (rev 15963) @@ -25,7 +25,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.7.0 +VERSION = 1.7.1 CATEGORIES = utils DESCRIPTION = Version control rethought @@ -266,7 +266,9 @@ include gar/category.mk -BINDING_LANGS = java perl python ruby +# pygthon bindings do not link since svn-1.6.5 ... +#BINDING_LANGS = java perl python ruby +BINDING_LANGS = java perl ruby BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS)) PI_DEPENDS += copy-templates This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Oct 23 16:09:41 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 23 Oct 2011 14:09:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[15964] csw/mgar/pkg/subversion/trunk/checksums Message-ID: Revision: 15964 http://gar.svn.sourceforge.net/gar/?rev=15964&view=rev Author: rthurner Date: 2011-10-23 14:09:41 +0000 (Sun, 23 Oct 2011) Log Message: ----------- subversion: update svn-1.7.1 checksum Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2011-10-23 14:05:21 UTC (rev 15963) +++ csw/mgar/pkg/subversion/trunk/checksums 2011-10-23 14:09:41 UTC (rev 15964) @@ -1 +1 @@ -930e6644a1b6094efd268fde6a318f04 subversion-1.7.0.tar.bz2 +8a4fa74385df85a9702141b6b68b8307 subversion-1.7.1.tar.bz2 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 Oct 24 11:30:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 09:30:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15965] csw/mgar/pkg/rsync/trunk Message-ID: Revision: 15965 http://gar.svn.sourceforge.net/gar/?rev=15965&view=rev Author: dmichelsen Date: 2011-10-24 09:30:13 +0000 (Mon, 24 Oct 2011) Log Message: ----------- rsync/trunk: Update to 3.0.9 Modified Paths: -------------- csw/mgar/pkg/rsync/trunk/Makefile csw/mgar/pkg/rsync/trunk/checksums Modified: csw/mgar/pkg/rsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsync/trunk/Makefile 2011-10-23 14:09:41 UTC (rev 15964) +++ csw/mgar/pkg/rsync/trunk/Makefile 2011-10-24 09:30:13 UTC (rev 15965) @@ -1,12 +1,9 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ -# - TBD: Add RC and SMF Manifest -# /opt/csw/bin/rsync --daemon -v -# /usr/bin/pkill -x -u 0 rsync NAME = rsync -VERSION = 3.0.8 +VERSION = 3.0.9 CATEGORIES = utils DESCRIPTION = Utility which provides fast incremental file transfer Modified: csw/mgar/pkg/rsync/trunk/checksums =================================================================== --- csw/mgar/pkg/rsync/trunk/checksums 2011-10-23 14:09:41 UTC (rev 15964) +++ csw/mgar/pkg/rsync/trunk/checksums 2011-10-24 09:30:13 UTC (rev 15965) @@ -1 +1 @@ -0ee8346ce16bdfe4c88a236e94c752b4 rsync-3.0.8.tar.gz +5ee72266fe2c1822333c407e1761b92b rsync-3.0.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 24 11:42:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 09:42:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15966] csw/mgar/pkg/parallel/trunk Message-ID: Revision: 15966 http://gar.svn.sourceforge.net/gar/?rev=15966&view=rev Author: dmichelsen Date: 2011-10-24 09:42:07 +0000 (Mon, 24 Oct 2011) Log Message: ----------- parallel/trunk: Update to 20111022 Modified Paths: -------------- csw/mgar/pkg/parallel/trunk/Makefile csw/mgar/pkg/parallel/trunk/checksums Modified: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile 2011-10-24 09:30:13 UTC (rev 15965) +++ csw/mgar/pkg/parallel/trunk/Makefile 2011-10-24 09:42:07 UTC (rev 15966) @@ -1,6 +1,6 @@ # $Id$ NAME = parallel -VERSION = 20110622 +VERSION = 20111022 CATEGORIES = utils DESCRIPTION = Shell tool for executing jobs in parallel @@ -22,19 +22,15 @@ ARCHALL = 1 +EXTRA_COMMON_EXPORTS = HOME + # Some idioms are used that the system Perl doesn't have # (good that they show up during the testsuite run) RUNTIME_DEP_PKGS = CSWperl CHECKPKG_OVERRIDES_CSWparallel += surplus-dependency|CSWperl # This references a special ssh like /usr/local/bin/myssh -CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/parallel/parallel.html -# This references a special ssh like /usr/local/bin/myssh CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/parallel.1 -# This is only in a comment -CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/bin/parallel -# This is only in a comment -CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/bin/sem include gar/category.mk Modified: csw/mgar/pkg/parallel/trunk/checksums =================================================================== --- csw/mgar/pkg/parallel/trunk/checksums 2011-10-24 09:30:13 UTC (rev 15965) +++ csw/mgar/pkg/parallel/trunk/checksums 2011-10-24 09:42:07 UTC (rev 15966) @@ -1 +1 @@ -101ce0d674d43b3051c868bbc8b3ed60 parallel-20110622.tar.bz2 +ed5710d204fe8981ba44f771af72955b parallel-20111022.tar.bz2 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 Oct 24 13:42:21 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 11:42:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[15967] csw/mgar/pkg/wdiff/trunk Message-ID: Revision: 15967 http://gar.svn.sourceforge.net/gar/?rev=15967&view=rev Author: dmichelsen Date: 2011-10-24 11:42:21 +0000 (Mon, 24 Oct 2011) Log Message: ----------- wdiff/trunk: Update to 1.0.1 Modified Paths: -------------- csw/mgar/pkg/wdiff/trunk/Makefile csw/mgar/pkg/wdiff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wdiff/trunk/files/wdiff-1.0.1-testsuite.patch Modified: csw/mgar/pkg/wdiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/wdiff/trunk/Makefile 2011-10-24 09:42:07 UTC (rev 15966) +++ csw/mgar/pkg/wdiff/trunk/Makefile 2011-10-24 11:42:21 UTC (rev 15967) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = wdiff -VERSION = 0.6.5 +VERSION = 1.0.1 CATEGORIES = utils DESCRIPTION = A front end to diff for comparing files on a word per word basis @@ -10,17 +10,14 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# Use patch until this is fixed: +# http://lists.gnu.org/archive/html/wdiff-bugs/2011-09/msg00006.html +PATCHFILES += wdiff-1.0.1-testsuite.patch VENDOR_URL = http://www.gnu.org/software/wdiff/ -DEP_PKGS = CSWggettextrt +RUNTIME_DEP_PKGS_CSWwdiff += CSWlibintl8 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk Modified: csw/mgar/pkg/wdiff/trunk/checksums =================================================================== --- csw/mgar/pkg/wdiff/trunk/checksums 2011-10-24 09:42:07 UTC (rev 15966) +++ csw/mgar/pkg/wdiff/trunk/checksums 2011-10-24 11:42:21 UTC (rev 15967) @@ -1 +1 @@ -1828209a14d01ad38c7267985f365cbf wdiff-0.6.5.tar.gz +c3b8e48a113fd064731d7372aae782f5 wdiff-1.0.1.tar.gz Added: csw/mgar/pkg/wdiff/trunk/files/wdiff-1.0.1-testsuite.patch =================================================================== --- csw/mgar/pkg/wdiff/trunk/files/wdiff-1.0.1-testsuite.patch (rev 0) +++ csw/mgar/pkg/wdiff/trunk/files/wdiff-1.0.1-testsuite.patch 2011-10-24 11:42:21 UTC (rev 15967) @@ -0,0 +1,45 @@ +--- a/tests/wdiff.at ++++ b/tests/wdiff.at +@@ -173,7 +173,7 @@ + # Due to the istty call in the sources, we have to use screen here. + + LC_ALL=C +-AT_TESTED([wdiff diff screen env sed grep]) ++AT_TESTED([wdiff diff screen env sed tr grep]) + AT_DATA([foo.txt], [start foo end + ]) + AT_DATA([bar.txt], [start bar end +@@ -193,7 +193,7 @@ + AT_SKIP_IF([grep 'terminal type.*not defined' screenlog.0]) + # Need to work around a screen bug which might cause the first + # character to be lost: https://savannah.gnu.org/bugs/index.php?34200 +-AT_CHECK([sed 's/^ager/Pager/;s/\r//g;' screenlog.0], 0, ++AT_CHECK([tr -d '\r' < screenlog.0 | sed 's/^ager/Pager/'], 0, + [Pager starting. + Pager line start WfooX YbarZ end printed. + Pager now done. +--- a/tests/testsuite ++++ b/tests/testsuite +@@ -593,7 +593,8 @@ + grep + diff + screen +-sed' ++sed ++tr' + # As many question marks as there are digits in the last test group number. + # Used to normalize the test group numbers so that `ls' lists them in + # numerical order. +@@ -2380,9 +2381,9 @@ + # Need to work around a screen bug which might cause the first + # character to be lost: https://savannah.gnu.org/bugs/index.php?34200 + { set +x +-$as_echo "$at_srcdir/wdiff.at:196: sed 's/^ager/Pager/;s/\\r//g;' screenlog.0" +-at_fn_check_prepare_trace "wdiff.at:196" +-( $at_check_trace; sed 's/^ager/Pager/;s/\r//g;' screenlog.0 ++$as_echo "$at_srcdir/wdiff.at:196: tr -d '\\r' < screenlog.0 | sed 's/^ager/Pager/'" ++at_fn_check_prepare_notrace 'a shell pipeline' "wdiff.at:196" ++( $at_check_trace; tr -d '\r' < screenlog.0 | sed 's/^ager/Pager/' + ) >>"$at_stdout" 2>>"$at_stderr" + at_status=$? at_failed=false + $at_check_filter This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Oct 24 14:10:27 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 24 Oct 2011 12:10:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[15968] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 15968 http://gar.svn.sourceforge.net/gar/?rev=15968&view=rev Author: bonivart Date: 2011-10-24 12:10:26 +0000 (Mon, 24 Oct 2011) Log Message: ----------- memconf/trunk: update to 2.19 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 2011-10-24 11:42:21 UTC (rev 15967) +++ csw/mgar/pkg/memconf/trunk/Makefile 2011-10-24 12:10:26 UTC (rev 15968) @@ -1,5 +1,5 @@ NAME = memconf -VERSION = 2.18 +VERSION = 2.19 CATEGORIES = utils DESCRIPTION = Perl script that displays memory modules installed @@ -21,7 +21,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -# We prepended /opt/csw/bin but keep /usr/lcoal/bin +# We prepended /opt/csw/bin but keep /usr/local/bin CHECKPKG_OVERRIDES_CSWmemconf += file-with-bad-content|/usr/local|root/opt/csw/bin/memconf include gar/category.mk Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2011-10-24 11:42:21 UTC (rev 15967) +++ csw/mgar/pkg/memconf/trunk/checksums 2011-10-24 12:10:26 UTC (rev 15968) @@ -1,2 +1,2 @@ -7421a8b10a8a4523a245c2dd055631ea memconf.gz -423147c99408674d29fd161772335072 memconf.man +a69bcfae3528736efff12f85bf1b320b memconf.gz +b637907201825406e433ff015a3b3fd0 memconf.man 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 Oct 24 14:15:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 12:15:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[15969] csw/mgar/pkg/diffutils/trunk Message-ID: Revision: 15969 http://gar.svn.sourceforge.net/gar/?rev=15969&view=rev Author: dmichelsen Date: 2011-10-24 12:15:45 +0000 (Mon, 24 Oct 2011) Log Message: ----------- diffutils/trunk: Update to 3.2, update dependencies Modified Paths: -------------- csw/mgar/pkg/diffutils/trunk/Makefile csw/mgar/pkg/diffutils/trunk/checksums Modified: csw/mgar/pkg/diffutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffutils/trunk/Makefile 2011-10-24 12:10:26 UTC (rev 15968) +++ csw/mgar/pkg/diffutils/trunk/Makefile 2011-10-24 12:15:45 UTC (rev 15969) @@ -1,5 +1,5 @@ NAME = diffutils -VERSION = 3.0 +VERSION = 3.2 CATEGORIES = utils DESCRIPTION = Diff utilities @@ -8,21 +8,21 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.xz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_DEP_PKGS += CSWlibsigsegv-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibiconv-dev -RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWlibsigsegv -BUILD_DEP_PKGS = CSWggettext CSWiconv CSWlibsigsegv +RUNTIME_DEP_PKGS_CSWdiffutils += CSWlibsigsegv2 +RUNTIME_DEP_PKGS_CSWdiffutils += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWdiffutils += CSWlibiconv2 VENDOR_URL = http://www.gnu.org/software/diffutils/ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g -TEST_TARGET = check - EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/lib/charset.alias include gar/category.mk Modified: csw/mgar/pkg/diffutils/trunk/checksums =================================================================== --- csw/mgar/pkg/diffutils/trunk/checksums 2011-10-24 12:10:26 UTC (rev 15968) +++ csw/mgar/pkg/diffutils/trunk/checksums 2011-10-24 12:15:45 UTC (rev 15969) @@ -1 +1 @@ -684aaba1baab743a2a90e52162ff07da diffutils-3.0.tar.gz +26ff64c332429c830c154be46b393382 diffutils-3.2.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 24 15:51:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 13:51:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[15970] csw/mgar/pkg/libgdbm3/ Message-ID: Revision: 15970 http://gar.svn.sourceforge.net/gar/?rev=15970&view=rev Author: dmichelsen Date: 2011-10-24 13:51:17 +0000 (Mon, 24 Oct 2011) Log Message: ----------- gdbm: Make snapshot for libgdbm3 Added Paths: ----------- csw/mgar/pkg/libgdbm3/ 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 Oct 24 15:57:27 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 13:57:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[15971] csw/mgar/pkg/gdbm/trunk Message-ID: Revision: 15971 http://gar.svn.sourceforge.net/gar/?rev=15971&view=rev Author: dmichelsen Date: 2011-10-24 13:57:27 +0000 (Mon, 24 Oct 2011) Log Message: ----------- gdbm/trunk: Update to 1.9 Modified Paths: -------------- csw/mgar/pkg/gdbm/trunk/Makefile csw/mgar/pkg/gdbm/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/gdbm/trunk/files/perms.diff Modified: csw/mgar/pkg/gdbm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdbm/trunk/Makefile 2011-10-24 13:51:17 UTC (rev 15970) +++ csw/mgar/pkg/gdbm/trunk/Makefile 2011-10-24 13:57:27 UTC (rev 15971) @@ -1,5 +1,5 @@ NAME = gdbm -VERSION = 1.8.3 +VERSION = 1.9 CATEGORIES = lib DESCRIPTION = GNU database library for C @@ -12,32 +12,27 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# Makefile install permissions patch -PATCHFILES = perms.diff - PACKAGES = CSWgdbm CATALOGNAME_CSWgdbm = gdbm SPKG_DESC_CSWgdbm = Legacy package as contents moved to CSWlibgdbm3 PKGFILES_CSWgdbm = NOFILES ARCHALL_CSWgdbm = 1 +# This is the legacy dependency for applications depending on CSWgdbm to require libgdbm.so.3 RUNTIME_DEP_PKGS_CSWgdbm = CSWlibgdbm3 CHECKPKG_OVERRIDES_CSWgdbm += surplus-dependency|CSWlibgdbm3 -PACKAGES += CSWlibgdbm3 -CATALOGNAME_CSWlibgdbm3 = libgdbm3 -SPKG_DESC_CSWlibgdbm3 = GDBM share library, libgdbm.so.3 -PKGFILES_CSWlibgdbm3 = $(call baseisadirs,$(libdir),libgdbm\.so\.3(\.\d+)*) +PACKAGES += CSWlibgdbm4 +CATALOGNAME_CSWlibgdbm4 = libgdbm4 +SPKG_DESC_CSWlibgdbm4 = GDBM share library, libgdbm.so.4 +PKGFILES_CSWlibgdbm4 = $(call pkgfiles_lib,libgdbm.so.4) PACKAGES += CSWlibgdbm-dev CATALOGNAME_CSWlibgdbm-dev = libgdbm_dev -SPKG_DESC_CSWlibgdbm-dev = Development Files for libgdbm +SPKG_DESC_CSWlibgdbm-dev = Development files for libgdbm.so.4 # This is catchall -RUNTIME_DEP_PKGS_CSWlibgdbm-dev = CSWlibgdbm3 +RUNTIME_DEP_PKGS_CSWlibgdbm-dev = CSWlibgdbm4 BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) # gdbm package has no test suite TEST_SCRIPTS = Modified: csw/mgar/pkg/gdbm/trunk/checksums =================================================================== --- csw/mgar/pkg/gdbm/trunk/checksums 2011-10-24 13:51:17 UTC (rev 15970) +++ csw/mgar/pkg/gdbm/trunk/checksums 2011-10-24 13:57:27 UTC (rev 15971) @@ -1,3 +1 @@ -1d1b1d5c0245b1c00aff92da751e9aa1 download/gdbm-1.8.3.tar.gz -992e8b713af2c76bdc413fb25267de9a download/CSWgdbm.gspec -9c27130ad52d25600ad1d0ed6f5a1fc1 download/perms.diff +1f0e8e6691edd61bdd6b697b8c02528d gdbm-1.9.tar.gz Deleted: csw/mgar/pkg/gdbm/trunk/files/perms.diff =================================================================== --- csw/mgar/pkg/gdbm/trunk/files/perms.diff 2011-10-24 13:51:17 UTC (rev 15970) +++ csw/mgar/pkg/gdbm/trunk/files/perms.diff 2011-10-24 13:57:27 UTC (rev 15971) @@ -1,30 +0,0 @@ -diff -Nru --speed-large-files gdbm-1.8.3.orig/Makefile.in gdbm-1.8.3/Makefile.in ---- gdbm-1.8.3.orig/Makefile.in 2002-10-08 09:09:12.000000000 -0700 -+++ gdbm-1.8.3/Makefile.in 2003-07-28 09:34:37.113976000 -0700 -@@ -131,11 +131,11 @@ - $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ - $(INSTALL_ROOT)$(infodir) - $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ -+ $(INSTALL_DATA) gdbm.h \ - $(INSTALL_ROOT)$(includedir)/gdbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ -+ $(INSTALL_DATA) $(srcdir)/gdbm.3 \ - $(INSTALL_ROOT)$(man3dir)/gdbm.3 -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ -+ $(INSTALL_DATA) $(srcdir)/gdbm.info \ - $(INSTALL_ROOT)$(infodir)/gdbm.info - - install-compat: -@@ -143,9 +143,9 @@ - $(INSTALL_ROOT)$(includedir) - $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ - $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ -+ $(INSTALL_DATA) $(srcdir)/dbm.h \ - $(INSTALL_ROOT)$(includedir)/dbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ -+ $(INSTALL_DATA) $(srcdir)/ndbm.h \ - $(INSTALL_ROOT)$(includedir)/ndbm.h - - #libgdbm.a: $(OBJS) gdbm.h 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 Oct 24 16:00:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 14:00:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[15972] csw/mgar/pkg/glpk/trunk Message-ID: Revision: 15972 http://gar.svn.sourceforge.net/gar/?rev=15972&view=rev Author: dmichelsen Date: 2011-10-24 14:00:57 +0000 (Mon, 24 Oct 2011) Log Message: ----------- glpk/trunk: Update to 4.47, split packages Modified Paths: -------------- csw/mgar/pkg/glpk/trunk/Makefile csw/mgar/pkg/glpk/trunk/checksums Modified: csw/mgar/pkg/glpk/trunk/Makefile =================================================================== --- csw/mgar/pkg/glpk/trunk/Makefile 2011-10-24 13:57:27 UTC (rev 15971) +++ csw/mgar/pkg/glpk/trunk/Makefile 2011-10-24 14:00:57 UTC (rev 15972) @@ -1,5 +1,5 @@ NAME = glpk -VERSION = 4.43 +VERSION = 4.47 CATEGORIES = lib DESCRIPTION = GNU Linear Programming Kit @@ -12,17 +12,22 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWlibglpk0 +SPKG_DESC_CSWlibglpk0 = GNU linear programming kit library, libglpk.so.0 +PKGFILES_CSWlibglpk0 += $(call pkgfiles_lib,libglpk.so.0) +OBSOLETED_BY_CSWlibglpk0 = CSWlibglpk -PACKAGES = CSWlibglpk +PACKAGES += CSWlibglpk-dev +SPKG_DESC_CSWlibglpk-dev = Development files for libglpk.so.0 +PKGFILES_CSWlibglpk-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibglpk-dev += CSWlibglpk0 +PACKAGES += CSWglpk +SPKG_DESC_CSWglpk = GNU linear programming kit +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWglpk += CSWlibglpk0 + BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) +ISAEXEC = 1 -TEST_TARGET = check - -# This is normal for amd64 on i386 -CHECKPKG_OVERRIDES_CSWlibglpk += soname-not-found|libm.so.2 - include gar/category.mk Modified: csw/mgar/pkg/glpk/trunk/checksums =================================================================== --- csw/mgar/pkg/glpk/trunk/checksums 2011-10-24 13:57:27 UTC (rev 15971) +++ csw/mgar/pkg/glpk/trunk/checksums 2011-10-24 14:00:57 UTC (rev 15972) @@ -1 +1 @@ -b984e9e6451399c8dd46e18889c80148 glpk-4.43.tar.gz +8653bf20c1f7db96b9ed369a8598a1ce glpk-4.47.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Oct 24 16:01:34 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 24 Oct 2011 14:01:34 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[572] twitter Message-ID: Revision: 572 http://opencsw.svn.sourceforge.net/opencsw/?rev=572&view=rev Author: skayser Date: 2011-10-24 14:01:34 +0000 (Mon, 24 Oct 2011) Log Message: ----------- twitter: twitter search to rss, early stage commit Added Paths: ----------- twitter/ twitter/sweets/ twitter/sweets/README twitter/sweets/sample-search-results.txt twitter/sweets/sweets.py Property changes on: twitter/sweets ___________________________________________________________________ Added: svn:ignore + *.pyc Added: twitter/sweets/README =================================================================== --- twitter/sweets/README (rev 0) +++ twitter/sweets/README 2011-10-24 14:01:34 UTC (rev 572) @@ -0,0 +1,7 @@ +sweets - tools to search tweets and re-publish them through a feed + +Twitter has search feeds which have gone from official to unofficial but still +present. These have caused us troubles in the past, as they contained +duplicates and ceeswi on #opencsw happily broadcasted redundant items. This is +a "hacking for fun" attempt to get a sanitized feed version. Early stage, not +yet usable. Added: twitter/sweets/sample-search-results.txt =================================================================== --- twitter/sweets/sample-search-results.txt (rev 0) +++ twitter/sweets/sample-search-results.txt 2011-10-24 14:01:34 UTC (rev 572) @@ -0,0 +1 @@ +{"completed_in":0.138,"max_id":127469256991449088,"max_id_str":"127469256991449088","page":1,"query":"opencsw","refresh_url":"?since_id=127469256991449088&q=opencsw","results":[{"created_at":"Fri, 21 Oct 2011 19:40:13 +0000","from_user":"toxickore","from_user_id":402981916,"from_user_id_str":"402981916","geo":null,"id":127469256991449088,"id_str":"127469256991449088","iso_language_code":"es","metadata":{"result_type":"recent"},"profile_image_url":"http://a3.twimg.com/profile_images/1566913558/avatar01_normal.jpg","source":"<a href="http://twitter.com/">web</a>","text":"pft! que basura, el sshd_config se apendeja con el AuthorizedKeysFile http://t.co/PwV8hUgH","to_user_id":null,"to_user_id_str":null},{"created_at":"Fri, 21 Oct 2011 13:16:23 +0000","from_user":"opencsw","from_user_id":83587657,"from_user_id_str":"83587657","geo":null,"id":127372661499236353,"id_str":"127372661499236353","iso_language_code":"en","metadata":{"result_type":"recent"},"profile _image_url":"http://a3.twimg.com/profile_images/775037952/opencsw_med_normal.png","source":"<a href="http://twitter.com/download/android" rel="nofollow">Twitter for Android</a>","text":"@esz try pkgutil, it makes upgrades safer, and has additional functionality you might like!","to_user":"esz","to_user_id":29389,"to_user_id_str":"29389"},{"created_at":"Thu, 20 Oct 2011 19:41:34 +0000","from_user":"bonivart","from_user_id":7366785,"from_user_id_str":"7366785","geo":null,"id":127107208226942976,"id_str":"127107208226942976","iso_language_code":"en","metadata":{"result_type":"recent"},"profile_image_url":"http://a1.twimg.com/profile_images/1067284645/0220-0415-RU-1-005_220_normal.jpg","source":"<a href="http://itunes.apple.com/us/app/twitter/id409789998?mt=12" rel="nofollow">Twitter for Mac</a>","text":"@DoctorOctagon: Make a request at http://t.co/azIAV17O. Also, pkgutil -a ccze is eq. to your pipe grep :)","to_us er":"DoctorOctagon","to_user_id":1060152,"to_user_id_str":"1060152"},{"created_at":"Tue, 18 Oct 2011 07:31:20 +0000","from_user":"esz","from_user_id":29389,"from_user_id_str":"29389","geo":null,"id":126198664342405120,"id_str":"126198664342405120","iso_language_code":"th","metadata":{"result_type":"recent"},"profile_image_url":"http://a2.twimg.com/profile_images/1543638533/AVT-III_normal.jpg","source":"<a href="http://twitter.com/">web</a>","text":"\u0E16\u0E49\u0E32\u0E04\u0E38\u0E13\u0E43\u0E0A\u0E49 Solaris \u0E08\u0E07\u0E15\u0E34\u0E14\u0E15\u0E31\u0E49\u0E07 pkg-get \u0E41\u0E25\u0E30 OpenCSW \u0E42\u0E14\u0E22\u0E1E\u0E25\u0E31\u0E19 \u0E0A\u0E35\u0E27\u0E34\u0E15 admin \u0E08\u0E30\u0E21\u0E35\u0E04\u0E27\u0E32\u0E21\u0E2A\u0E38\u0E02\u0E02\u0E36\u0E49\u0E19\u0E40\u0E22\u0E2D\u0E30","to_user_id":null,"to_user_id_str":null}],"results_per_page":15,"since_id":0,"since_id_str":"0"} \ No newline at end of file Added: twitter/sweets/sweets.py =================================================================== --- twitter/sweets/sweets.py (rev 0) +++ twitter/sweets/sweets.py 2011-10-24 14:01:34 UTC (rev 572) @@ -0,0 +1,68 @@ +#!/usr/bin/env python +# +# sweets_search.py: +# Search twitter with a search term and store results in a JSON file which +# can be used for further processing (e.g. to generate RSS) +# +# TODO: +# * Implement twitter_search (http://search.twitter.com/search.json?q=opencsw) +# * twitter_search: catch and log twitter API HTTP status codes <> 200 +# * run: write result JSON to output file +# * get_results: use refresh_url from response for follow up queries +# * Rewrite file open/close blocks with "with" once python2.5+ on dev box +# + +import json +import sys +import time +import types +from optparse import OptionParser,SUPPRESS_HELP + +def twitter_search_mock(query = "", since = ""): + """Search twitter (mockup), returns a single-line, JSON search result.""" + f = open("sample-search-results.txt", "r") + data = ''.join(f.readlines()) # ensure single line result + f.close() + return data +twitter_search = twitter_search_mock + +def get_results(query): + """Trigger twitter search and extract results from JSON response.""" + json_data = twitter_search(query) + response = json.read(json_data) + return response['results'] + +def run(interval, query): + """Run the main loop which queries Twitter and writes the output.""" + while 1: + results = get_results(query) + for result in results: + print "%s - http://twitter.com/#!/%s/status/%s" % ( + result['text'], + result['from_user'], + result['id_str'] + ) + # Tweet URL #http://twitter.com/#!//status/ + if hasattr(interval, "__call__"): interval() + else: time.sleep(float(interval)) + +if __name__ == '__main__': + usage = "%prog -s -t " + parser = OptionParser(usage=usage) + parser.add_option("-s", dest="searchterm", help="search term to run on Twitter") + parser.add_option("-t", dest="interval", default=300, + help="query every X seconds (default 300)") + parser.add_option("-d", dest="debug", action="store_true", + help=SUPPRESS_HELP) + (options, args) = parser.parse_args() + + required_options = ( "searchterm", ) + for o in required_options: + if not getattr(options, o): + parser.print_help() + sys.exit(1) + + try: + if options.debug: options.interval = sys.stdin.readline + run(options.interval, options.searchterm) + except KeyboardInterrupt: pass Property changes on: twitter/sweets/sweets.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 24 16:05:43 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 14:05:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[15973] csw/mgar/pkg/gdbm/trunk/Makefile Message-ID: Revision: 15973 http://gar.svn.sourceforge.net/gar/?rev=15973&view=rev Author: dmichelsen Date: 2011-10-24 14:05:43 +0000 (Mon, 24 Oct 2011) Log Message: ----------- gdbm/trunk: Use standard for obsoleting CSWgdbm Modified Paths: -------------- csw/mgar/pkg/gdbm/trunk/Makefile Modified: csw/mgar/pkg/gdbm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdbm/trunk/Makefile 2011-10-24 14:00:57 UTC (rev 15972) +++ csw/mgar/pkg/gdbm/trunk/Makefile 2011-10-24 14:05:43 UTC (rev 15973) @@ -12,14 +12,8 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWgdbm -CATALOGNAME_CSWgdbm = gdbm -SPKG_DESC_CSWgdbm = Legacy package as contents moved to CSWlibgdbm3 -PKGFILES_CSWgdbm = NOFILES -ARCHALL_CSWgdbm = 1 -# This is the legacy dependency for applications depending on CSWgdbm to require libgdbm.so.3 -RUNTIME_DEP_PKGS_CSWgdbm = CSWlibgdbm3 -CHECKPKG_OVERRIDES_CSWgdbm += surplus-dependency|CSWlibgdbm3 +FOREIGN_PACKAGES = CSWlibgdbm3 +OBSOLETED_BY_CSWlibgdbm3 += CSWgdbm PACKAGES += CSWlibgdbm4 CATALOGNAME_CSWlibgdbm4 = libgdbm4 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 Oct 24 17:43:28 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 15:43:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[15974] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 15974 http://gar.svn.sourceforge.net/gar/?rev=15974&view=rev Author: dmichelsen Date: 2011-10-24 15:43:28 +0000 (Mon, 24 Oct 2011) Log Message: ----------- doxygen/trunk: Update to 1.7.5.1 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 2011-10-24 14:05:43 UTC (rev 15973) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2011-10-24 15:43:28 UTC (rev 15974) @@ -1,5 +1,5 @@ NAME = doxygen -VERSION = 1.7.4 +VERSION = 1.7.5.1 CATEGORIES = utils DESCRIPTION = A documentation system for programming languages @@ -14,7 +14,12 @@ PACKAGES += CSWdoxygen CATALOGNAME_CSWdoxygen = doxygen SPKG_DESC_CSWdoxygen = A documentation system for programming languages +# PKGFILES is catchall +# That is from the BibTeX-style: +# %%% Modification of BibTeX style file /usr/local/texlive/2008/texmf-dist/bibtex/bst/base/plain.bst +CHECKPKG_OVERRIDES_CSWdoxygen += file-with-bad-content|/usr/local|root/opt/csw/bin/doxygen + PACKAGES += CSWdoxygen-doc CATALOGNAME_CSWdoxygen-doc = doxygen_doc SPKG_DESC_CSWdoxygen-doc = Documentation for doxygen @@ -34,7 +39,8 @@ BUILD_DEP_PKGS = CSWgraphviz -EXTRA_CXXFLAGS = -features=tmplrefstatic +EXTRA_CXXFLAGS += -features=tmplrefstatic +EXTRA_CXXFLAGS += -features=extensions -D__FUNCTION__=__func__ EXTRA_LINKER_FLAGS = -norunpath CONFIGURE_ARGS = --prefix $(prefix) Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2011-10-24 14:05:43 UTC (rev 15973) +++ csw/mgar/pkg/doxygen/trunk/checksums 2011-10-24 15:43:28 UTC (rev 15974) @@ -1 +1 @@ -ff908759ff7cd9464424b04ae6c68e48 doxygen-1.7.4.src.tar.gz +f5355c442c5bc2481dbef7fdea8f0556 doxygen-1.7.5.1.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 Oct 24 19:01:12 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 17:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[15975] csw/mgar/pkg/tin/trunk Message-ID: Revision: 15975 http://gar.svn.sourceforge.net/gar/?rev=15975&view=rev Author: dmichelsen Date: 2011-10-24 17:01:12 +0000 (Mon, 24 Oct 2011) Log Message: ----------- tin/trunk: Update to 2.0.0, new dependencies, still some /usr/local reference Modified Paths: -------------- csw/mgar/pkg/tin/trunk/Makefile csw/mgar/pkg/tin/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/tin/trunk/files/configure.patch Modified: csw/mgar/pkg/tin/trunk/Makefile =================================================================== --- csw/mgar/pkg/tin/trunk/Makefile 2011-10-24 15:43:28 UTC (rev 15974) +++ csw/mgar/pkg/tin/trunk/Makefile 2011-10-24 17:01:12 UTC (rev 15975) @@ -1,5 +1,5 @@ NAME = tin -VERSION = 1.9.6 +VERSION = 2.0.0 CATEGORIES = net DESCRIPTION = Terminal-based news reader @@ -9,24 +9,28 @@ useful things. It has also support for different languages. endef -MASTER_SITES = ftp://ftp.tin.org/pub/news/clients/tin/unstable/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = ftp://ftp.tin.org/pub/news/clients/tin/stable/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += COPYING -PATCHFILES = configure.patch -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_DEP_PKGS += CSWperl +BUILD_DEP_PKGS += CSWlibpcre-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibidn-dev +BUILD_DEP_PKGS += CSWlibicu-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWgsasl-dev -RUNTIME_DEP_PKGS_CSWtin += CSWpcrert -RUNTIME_DEP_PKGS_CSWtin += CSWggettextrt RUNTIME_DEP_PKGS_CSWtin += CSWperl -RUNTIME_DEP_PKGS_CSWtin += CSWlibidn +RUNTIME_DEP_PKGS_CSWtin += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWtin += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWtin += CSWlibidn11 RUNTIME_DEP_PKGS_CSWtin += CSWlibicu46 -RUNTIME_DEP_PKGS_CSWtin += CSWiconv -RUNTIME_DEP_PKGS_CSWtin += CSWncurses +RUNTIME_DEP_PKGS_CSWtin += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWtin += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSWtin += CSWlibgsasl7 -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpcre - VENDOR_URL = http://www.tin.org/ CONFIGURE_ARGS = $(DIRPATHS) @@ -50,14 +54,9 @@ EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/man5/mmdf\.5 EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/man5/mbox\.5 -# These will be necessary until CSWlibicu46 has been officially released -CHECKPKG_OVERRIDES_CSWtin += unidentified-dependency|CSWlibicu46 -CHECKPKG_OVERRIDES_CSWtin += soname-not-found|libicuuc.so.46|is|needed|by|opt/csw/bin/tin -CHECKPKG_OVERRIDES_CSWtin += surplus-dependency|CSWlibicu46 - include gar/category.mk -post-install-modulated: - /usr/ccs/bin/strip $(DESTDIR)$(prefix)/bin/tin - /usr/ccs/bin/mcs -d $(DESTDIR)$(prefix)/bin/tin +#post-install-modulated: +# /usr/ccs/bin/strip $(DESTDIR)$(prefix)/bin/tin +# /usr/ccs/bin/mcs -d $(DESTDIR)$(prefix)/bin/tin Modified: csw/mgar/pkg/tin/trunk/checksums =================================================================== --- csw/mgar/pkg/tin/trunk/checksums 2011-10-24 15:43:28 UTC (rev 15974) +++ csw/mgar/pkg/tin/trunk/checksums 2011-10-24 17:01:12 UTC (rev 15975) @@ -1 +1 @@ -2102f3efd82a342005bd9afd30e03778 tin-1.9.6.tar.gz +b4072dc8004a7e5ee7dd16c887ffa09c tin-2.0.0.tar.bz2 Deleted: csw/mgar/pkg/tin/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/tin/trunk/files/configure.patch 2011-10-24 15:43:28 UTC (rev 15974) +++ csw/mgar/pkg/tin/trunk/files/configure.patch 2011-10-24 17:01:12 UTC (rev 15975) @@ -1,8 +0,0 @@ ---- tin-1.8.2.orig/configure 2006-06-07 18:30:19.764885000 -0700 -+++ tin-1.8.2/configure 2006-06-08 20:21:32.160150000 -0700 -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/ksh - - # Guess values for system-dependent variables and create Makefiles. - # Generated automatically using autoconf version 2.13.20030927 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 Oct 24 19:08:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 24 Oct 2011 17:08:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[15976] csw/mgar/pkg Message-ID: Revision: 15976 http://gar.svn.sourceforge.net/gar/?rev=15976&view=rev Author: dmichelsen Date: 2011-10-24 17:08:30 +0000 (Mon, 24 Oct 2011) Log Message: ----------- fetchmail/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/fetchmail/ csw/mgar/pkg/fetchmail/Makefile csw/mgar/pkg/fetchmail/branches/ csw/mgar/pkg/fetchmail/tags/ csw/mgar/pkg/fetchmail/trunk/ csw/mgar/pkg/fetchmail/trunk/Makefile csw/mgar/pkg/fetchmail/trunk/checksums csw/mgar/pkg/fetchmail/trunk/files/ csw/mgar/pkg/fetchmail/trunk/files/cswfetchmail Added: csw/mgar/pkg/fetchmail/Makefile =================================================================== --- csw/mgar/pkg/fetchmail/Makefile (rev 0) +++ csw/mgar/pkg/fetchmail/Makefile 2011-10-24 17:08:30 UTC (rev 15976) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/fetchmail/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/fetchmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/fetchmail/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fetchmail/trunk/Makefile 2011-10-24 17:08:30 UTC (rev 15976) @@ -0,0 +1,60 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = fetchmail +VERSION = 6.3.21 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Fetchmail mail retrieval and forwarding utility +define BLURB +endef + +MASTER_SITES = $(BERLIOS_MIRROR) +DISTFILES = $(DISTNAME).tar.xz +DISTFILES += cswfetchmail + +PACKAGES += CSWfetchmail +SPKG_DESC_CSWfetchmail = Fetchmail mail retrieval and forwarding utility +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWfetchmail += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWfetchmail += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWfetchmail += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWfetchmail += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWfetchmail += CSWosslrt + +PACKAGES += CSWfetchmailconf +SPKG_DESC_CSWfetchmailconf = A GUI to configure and run fetchmail +PKGFILES_CSWfetchmailconf += .*fetchmailconf.* +# This is pure Python +ARCHALL_CSWfetchmailconf = 1 +RUNTIME_DEP_PKGS_CSWfetchmailconf += CSWpython + +# checkpkg can't know about these +RUNTIME_DEP_PKGS_CSWfetchmailconf += CSWfetchmail +RUNTIME_DEP_PKGS_CSWfetchmailconf += CSWpython-tk +CHECKPKG_OVERRIDES_CSWfetchmailconf += surplus-dependency|CSWfetchmail +CHECKPKG_OVERRIDES_CSWfetchmailconf += surplus-dependency|CSWpython-tk + +# This is not a Python module, but an application +CHECKPKG_OVERRIDES_CSWfetchmailconf += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWfetchmailconf += catalogname-does-not-start-with-py_ + +INITSMF = /etc/opt/csw/init.d/cswfetchmail + +PYCOMPILE = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-RPA +CONFIGURE_ARGS += --enable-NTLM +CONFIGURE_ARGS += --enable-SDPS +# CONFIGURE_ARGS += --enable-opie +# CONFIGURE_ARGS += --with-socks5=$(prefix) +CONFIGURE_ARGS += --with-kerberos5=$(prefix) +CONFIGURE_ARGS += --with-ssl=$(prefix) + +include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 0755 $(WORKDIR)/cswfetchmail $(DESTDIR)/etc/opt/csw/init.d/cswfetchmail Property changes on: csw/mgar/pkg/fetchmail/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/fetchmail/trunk/checksums =================================================================== --- csw/mgar/pkg/fetchmail/trunk/checksums (rev 0) +++ csw/mgar/pkg/fetchmail/trunk/checksums 2011-10-24 17:08:30 UTC (rev 15976) @@ -0,0 +1 @@ +db75ef2058423599386add311bc954ce fetchmail-6.3.21.tar.xz Added: csw/mgar/pkg/fetchmail/trunk/files/cswfetchmail =================================================================== --- csw/mgar/pkg/fetchmail/trunk/files/cswfetchmail (rev 0) +++ csw/mgar/pkg/fetchmail/trunk/files/cswfetchmail 2011-10-24 17:08:30 UTC (rev 15976) @@ -0,0 +1,56 @@ +#!/bin/ksh + +#RC_KNUM 01 # Number used for kill script symlink, e.g. K20cswfoo +#RC_SNUM 99 # Number used for start script symlink, e.g. S80cswfoo +##RC_KLEV 0,1,2,S # Run levels that should have a kill script symlink +##RC_SLEV 3 # Run levels that should have a start script symlink +##FMRI network # FMRI path for service (S10+), the example would give + + + +findConf(){ + # look for fetchmailrc file in this order: + # /etc/opt/csw/fetchmailrc + # /opt/csw/etc/fetchmailrc + + if [ -f /etc/opt/csw/fetchmailrc ] ; then + FETCHMAILRC=/etc/opt/csw/fetchmailrc + else + if [ -f /opt/csw/etc/fetchmailrc ] ; then + FETCHMAILRC=/opt/csw/etc/fetchmailrc + fi + fi + if [ -z "${FETCHMAILRC}" ] ; then + exit 1 + fi +} + + +case $1 in + + # restart is same as start because start does a stop + start | restart) + findConf + # always stop before start, there is no reason to have two running + $0 stop + echo "Starting the fetchmail daemon using ${FETCHMAILRC}" + /opt/csw/bin/fetchmail -f ${FETCHMAILRC} + ;; + + + stop) + if pgrep -f /opt/csw/bin/fetchmail > /dev/null ; then + echo "Stopping the fetchmail daemon" + /opt/csw/bin/fetchmail --quit + sleep 1 + fi + ;; + + *) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; + +esac + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Oct 24 22:10:58 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 24 Oct 2011 20:10:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[15977] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 15977 http://gar.svn.sourceforge.net/gar/?rev=15977&view=rev Author: phipsy Date: 2011-10-24 20:10:58 +0000 (Mon, 24 Oct 2011) Log Message: ----------- puppet: 2.6.12; security release Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-10-24 17:08:30 UTC (rev 15976) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-10-24 20:10:58 UTC (rev 15977) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.6.11 +VERSION = 2.6.12 CATEGORIES = apps define BLURB Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2011-10-24 17:08:30 UTC (rev 15976) +++ csw/mgar/pkg/puppet/trunk/checksums 2011-10-24 20:10:58 UTC (rev 15977) @@ -6,3 +6,4 @@ 7a0346758af0222dc5e2b2b1a99c44ec puppet-2.7.1.tar.gz f60d8118ee1f3d68b2383acf3dd76d38 puppet-2.7.3.tar.gz c95639073a812a0c91119b10f46a66fb puppet-2.6.11.tar.gz +3851b1a33cde9d697d5c5c21ef795438 puppet-2.6.12.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 Tue Oct 25 00:32:21 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 24 Oct 2011 22:32:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[15978] csw/mgar/pkg/postfix/branches/postfix-2.7/ Message-ID: Revision: 15978 http://gar.svn.sourceforge.net/gar/?rev=15978&view=rev Author: wilbury Date: 2011-10-24 22:32:20 +0000 (Mon, 24 Oct 2011) Log Message: ----------- Branch 2.7, prepare to upgrade trunk to 2.8. Added Paths: ----------- csw/mgar/pkg/postfix/branches/postfix-2.7/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Oct 25 00:37:03 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 24 Oct 2011 22:37:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[15979] csw/mgar/pkg/postfix/trunk Message-ID: Revision: 15979 http://gar.svn.sourceforge.net/gar/?rev=15979&view=rev Author: wilbury Date: 2011-10-24 22:37:03 +0000 (Mon, 24 Oct 2011) Log Message: ----------- Add svn:keywords, just for sanity. Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/postfix/trunk/Makefile csw/mgar/pkg/postfix/trunk/checksums csw/mgar/pkg/postfix/trunk/files/README.upgradefrom.24 csw/mgar/pkg/postfix/trunk/files/changelog.CSW csw/mgar/pkg/postfix/trunk/files/cswpostfix csw/mgar/pkg/postfix/trunk/files/cswusergroup csw/mgar/pkg/postfix/trunk/files/migrate-queuefiles.sh Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2011-10-24 22:32:20 UTC (rev 15978) +++ csw/mgar/pkg/postfix/trunk/Makefile 2011-10-24 22:37:03 UTC (rev 15979) @@ -18,6 +18,8 @@ # - 2.4.6,REV=2008.05.28 preserves modified configuration files via # package-shipped CAS class csw_conf. # +# $Id$ +# NAME = postfix VERSION = 2.7.1 CATEGORIES = server Property changes on: csw/mgar/pkg/postfix/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Property changes on: csw/mgar/pkg/postfix/trunk/checksums ___________________________________________________________________ Added: svn:keywords + Id Property changes on: csw/mgar/pkg/postfix/trunk/files/README.upgradefrom.24 ___________________________________________________________________ Added: svn:keywords + files/README.CSW Property changes on: csw/mgar/pkg/postfix/trunk/files/changelog.CSW ___________________________________________________________________ Added: svn:keywords + files/README.CSW Property changes on: csw/mgar/pkg/postfix/trunk/files/cswpostfix ___________________________________________________________________ Added: svn:keywords + files/README.CSW Property changes on: csw/mgar/pkg/postfix/trunk/files/cswusergroup ___________________________________________________________________ Added: svn:keywords + files/README.CSW Property changes on: csw/mgar/pkg/postfix/trunk/files/migrate-queuefiles.sh ___________________________________________________________________ Added: svn:keywords + files/README.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 25 09:26:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 25 Oct 2011 07:26:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15980] csw/mgar/gar/v2/lib Message-ID: Revision: 15980 http://gar.svn.sourceforge.net/gar/?rev=15980&view=rev Author: wahwah Date: 2011-10-25 07:26:23 +0000 (Tue, 25 Oct 2011) Log Message: ----------- pkgdb-web: Return the full stats object via REST When calling the package details, return (serialized) data structure, containing all information about the package. It allows, among other things, third parties to write package checks. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2011-10-24 22:37:03 UTC (rev 15979) +++ csw/mgar/gar/v2/lib/python/models.py 2011-10-25 07:26:23 UTC (rev 15980) @@ -248,6 +248,12 @@ return vendor_url def GetRestRepr(self): + """The returned data structure needs a bit of fiddling. + + The frozenset and datatime.datetime objects are returned, and require + a specialized JSON serializer. See lib/web/pkgdb_web.py for the + implementation. + """ mimetype = "application/x-vnd.opencsw.pkg;type=srv4-detail" data = { 'arch': self.arch.name, @@ -270,6 +276,7 @@ # 'in_catalogs': unicode([unicode(x) for x in self.in_catalogs]), 'vendor_url': self.GetVendorUrl(), 'repository_url': self.GetSvnUrl(), + 'pkg_stats': self.GetStatsStruct(), } return mimetype, data Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-24 22:37:03 UTC (rev 15979) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-25 07:26:23 UTC (rev 15980) @@ -273,12 +273,21 @@ def GET(self, md5_sum): ConnectToDatabase() + class PkgStatsEncoder(json.JSONEncoder): + def default(self, obj): + if isinstance(obj, frozenset): + # Python 2.6 doesn't have the dictionary comprehension + # return {x: None for x in obj} + return list(obj) + if isinstance(obj, datetime.datetime): + return obj.isoformat() + return json.JSONEncoder.default(self, obj) try: pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() mimetype, data_structure = pkg.GetRestRepr() web.header('Content-type', mimetype) web.header('Access-Control-Allow-Origin', '*') - return json.dumps(data_structure) + return json.dumps(data_structure, cls=PkgStatsEncoder) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Oct 25 09:27:36 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 25 Oct 2011 08:27:36 +0100 Subject: [csw-devel] SF.net SVN: gar:[15979] csw/mgar/pkg/postfix/trunk In-Reply-To: References: Message-ID: 2011/10/24 : > Log Message: > ----------- > Add svn:keywords, just for sanity. This log message doesn't say, which package has been updated. You can either say type it in manually, or say "mgar ci -m ...". mgar can add the recipe path automatically. From dmichelsen at users.sourceforge.net Tue Oct 25 09:34:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Oct 2011 07:34:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[15981] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 15981 http://gar.svn.sourceforge.net/gar/?rev=15981&view=rev Author: dmichelsen Date: 2011-10-25 07:34:00 +0000 (Tue, 25 Oct 2011) Log Message: ----------- lighttpd/trunk: Enable SSL Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-10-25 07:26:23 UTC (rev 15980) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-10-25 07:34:00 UTC (rev 15981) @@ -39,6 +39,7 @@ RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibpcre0 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlighttpd += CSWosslrt EXTRA_LINKER_FLAGS += -lsendfile @@ -52,6 +53,9 @@ CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-openssl=$(prefix) +EXTRA_LINKER_FLAGS += -lcrypto + # Solaris 9 does not have IPV6_V6ONLY. # IPv6 support only works on Solaris 10. CONFIGURE_ARGS_5.9 = --disable-ipv6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Oct 25 10:02:29 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 25 Oct 2011 08:02:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[15982] csw/mgar/pkg/postfix/trunk Message-ID: Revision: 15982 http://gar.svn.sourceforge.net/gar/?rev=15982&view=rev Author: wilbury Date: 2011-10-25 08:02:29 +0000 (Tue, 25 Oct 2011) Log Message: ----------- postfix/trunk: Fix typos, fix PCRE dependencies. Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile csw/mgar/pkg/postfix/trunk/checksums Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2011-10-25 07:34:00 UTC (rev 15981) +++ csw/mgar/pkg/postfix/trunk/Makefile 2011-10-25 08:02:29 UTC (rev 15982) @@ -21,7 +21,7 @@ # $Id$ # NAME = postfix -VERSION = 2.7.1 +VERSION = 2.8.6 CATEGORIES = server DESCRIPTION = A high-performance mail transport agent @@ -171,8 +171,8 @@ # http://www.postfix.org/PCRE_README.html FEATURES += -DHAS_PCRE AUXLIBS += -lpcre -BUILD_DEP_PKGS += CSWpcre -RUNTIME_DEP_PKGS += CSWpcrert +BUILD_DEP_PKGS += CSWlibpcre-dev +RUNTIME_DEP_PKGS += CSWlibpcre0 # Activate support for hash and btree lookup tables # http://www.postfix.org/DB_README.html. !! Takeaway: Use same DB as SASL !! @@ -211,11 +211,11 @@ # Activate support for MySQL # http://www.postfix.org/MYSQL_README.html FEATURES += -DHAS_MYSQL -INCLUDES += -I/opt/csw/mysql5/include/mysql -AUXLIBS += -L/opt/csw/mysql5/lib/mysql -R/opt/csw/mysql5/lib/mysql +INCLUDES += -I/opt/csw/include/mysql +AUXLIBS += -L/opt/csw/lib -R/opt/csw/mysql5/lib/mysql AUXLIBS += -lmysqlclient -BUILD_DEP_PKGS += CSWmysql5devel -RUNTIME_DEP_PKGS += CSWmysql5rt +BUILD_DEP_PKGS += CSWmysql-dev +RUNTIME_DEP_PKGS += CSWlibmysqlclient15 # Activate support for PostgreSQL # http://www.postfix.org/PGSQL_README.html @@ -259,7 +259,7 @@ AUXLIBS='$(AUXLIBS)' \ DEBUG= \ OPT= - @$(MAKECOOIE) + @$(MAKECOOKIE) install-custom: $(MAKE) -C $(WORKSRC) non-interactive-package install_root=$(DESTDIR) \ Modified: csw/mgar/pkg/postfix/trunk/checksums =================================================================== --- csw/mgar/pkg/postfix/trunk/checksums 2011-10-25 07:34:00 UTC (rev 15981) +++ csw/mgar/pkg/postfix/trunk/checksums 2011-10-25 08:02:29 UTC (rev 15982) @@ -1 +1 @@ -b7a5c3ccd309156a65d6f8d2683d4fa1 postfix-2.7.1.tar.gz +c9cb89bfa660379b71fab356d2bf426e postfix-2.8.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 25 10:05:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Oct 2011 08:05:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[15983] csw/mgar/pkg Message-ID: Revision: 15983 http://gar.svn.sourceforge.net/gar/?rev=15983&view=rev Author: dmichelsen Date: 2011-10-25 08:05:26 +0000 (Tue, 25 Oct 2011) Log Message: ----------- global/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/global/ csw/mgar/pkg/global/Makefile csw/mgar/pkg/global/branches/ csw/mgar/pkg/global/tags/ csw/mgar/pkg/global/trunk/ csw/mgar/pkg/global/trunk/Makefile csw/mgar/pkg/global/trunk/checksums csw/mgar/pkg/global/trunk/files/ Added: csw/mgar/pkg/global/Makefile =================================================================== --- csw/mgar/pkg/global/Makefile (rev 0) +++ csw/mgar/pkg/global/Makefile 2011-10-25 08:05:26 UTC (rev 15983) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/global/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/global/trunk/Makefile =================================================================== --- csw/mgar/pkg/global/trunk/Makefile (rev 0) +++ csw/mgar/pkg/global/trunk/Makefile 2011-10-25 08:05:26 UTC (rev 15983) @@ -0,0 +1,43 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = global +VERSION = 6.1 +GARTYPE = v2 +CATEGORIES = devel + +DESCRIPTION = GNU GLOBAL source code tag system +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-exuberant-ctags=$(bindir)/ectags + +# checkpkg can not detect this +CHECKPKG_OVERRIDES_CSWglobal += surplus-dependency|CSWectags + +RUNTIME_DEP_PKGS_CSWglobal += CSWperl +RUNTIME_DEP_PKGS_CSWglobal += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWglobal += CSWectags + +# Just because it ships an emacs mode doesn't mean to depend on it +CHECKPKG_OVERRIDES_CSWglobal += missing-dependency|CSWemacscommon + +# These are docs only, overwrite for now +CHECKPKG_OVERRIDES_CSWglobal += file-with-bad-content|/usr/local|root/opt/csw/share/info/global.info +CHECKPKG_OVERRIDES_CSWglobal += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/htags.1 +CHECKPKG_OVERRIDES_CSWglobal += file-with-bad-content|/usr/local|root/opt/csw/share/gtags/INSTALL +CHECKPKG_OVERRIDES_CSWglobal += file-with-bad-content|/usr/local|root/opt/csw/share/gtags/ChangeLog +CHECKPKG_OVERRIDES_CSWglobal += file-with-bad-content|/usr/local|root/opt/csw/share/gtags/NEWS +CHECKPKG_OVERRIDES_CSWglobal += file-with-bad-content|/usr/local|root/opt/csw/share/gtags/script/README +CHECKPKG_OVERRIDES_CSWglobal += file-with-bad-content|/usr/share|root/opt/csw/share/gtags/ChangeLog + +include gar/category.mk + +post-extract-modulated: + -perl -pi -e 's,/usr/local/apache/conf/http.conf,$(prefix)/apache2/etc/httpd.conf,' \ + $(WORKSRC)/htags/htags.c + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/global/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/global/trunk/checksums =================================================================== --- csw/mgar/pkg/global/trunk/checksums (rev 0) +++ csw/mgar/pkg/global/trunk/checksums 2011-10-25 08:05:26 UTC (rev 15983) @@ -0,0 +1 @@ +4c63b292f94a1cbbcd7737e1b2ccf02f global-6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 25 10:19:16 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 25 Oct 2011 08:19:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15984] csw/mgar/gar/v2/lib Message-ID: Revision: 15984 http://gar.svn.sourceforge.net/gar/?rev=15984&view=rev Author: wahwah Date: 2011-10-25 08:19:15 +0000 (Tue, 25 Oct 2011) Log Message: ----------- pkgdb-web: full pkg stats to a specialized place The generic rest representation function is called from other places too, it's best not to make it too heavy. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2011-10-25 08:05:26 UTC (rev 15983) +++ csw/mgar/gar/v2/lib/python/models.py 2011-10-25 08:19:15 UTC (rev 15984) @@ -248,12 +248,6 @@ return vendor_url def GetRestRepr(self): - """The returned data structure needs a bit of fiddling. - - The frozenset and datatime.datetime objects are returned, and require - a specialized JSON serializer. See lib/web/pkgdb_web.py for the - implementation. - """ mimetype = "application/x-vnd.opencsw.pkg;type=srv4-detail" data = { 'arch': self.arch.name, @@ -276,7 +270,6 @@ # 'in_catalogs': unicode([unicode(x) for x in self.in_catalogs]), 'vendor_url': self.GetVendorUrl(), 'repository_url': self.GetSvnUrl(), - 'pkg_stats': self.GetStatsStruct(), } return mimetype, data Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-25 08:05:26 UTC (rev 15983) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-25 08:19:15 UTC (rev 15984) @@ -285,6 +285,7 @@ try: pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() mimetype, data_structure = pkg.GetRestRepr() + data_structure["pkg_stats"] = pkg.GetStatsStruct() web.header('Content-type', mimetype) web.header('Access-Control-Allow-Origin', '*') return json.dumps(data_structure, cls=PkgStatsEncoder) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Oct 25 10:44:42 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 25 Oct 2011 08:44:42 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[573] twitter/sweets/sweets.py Message-ID: Revision: 573 http://opencsw.svn.sourceforge.net/opencsw/?rev=573&view=rev Author: skayser Date: 2011-10-25 08:44:42 +0000 (Tue, 25 Oct 2011) Log Message: ----------- twitter/sweets: add twitter search, explicitly handle encoding on stdout Modified Paths: -------------- twitter/sweets/sweets.py Modified: twitter/sweets/sweets.py =================================================================== --- twitter/sweets/sweets.py 2011-10-24 14:01:34 UTC (rev 572) +++ twitter/sweets/sweets.py 2011-10-25 08:44:42 UTC (rev 573) @@ -13,19 +13,32 @@ # import json +import pycurl import sys import time import types +import StringIO from optparse import OptionParser,SUPPRESS_HELP -def twitter_search_mock(query = "", since = ""): +def twitter_search_mock(query="", since=""): """Search twitter (mockup), returns a single-line, JSON search result.""" f = open("sample-search-results.txt", "r") - data = ''.join(f.readlines()) # ensure single line result + data = ''.join(f.readlines()) # ensure single line string f.close() return data -twitter_search = twitter_search_mock +def twitter_search_real(query, since=""): + """Search twitter, returns a single-line, JSON search result.""" + output=StringIO.StringIO() + c = pycurl.Curl() + c.setopt(c.URL, 'http://search.twitter.com/search.json?q=' + query) + c.setopt(c.WRITEFUNCTION, output.write) + c.perform() + c.close() + return output.getvalue() + +twitter_search = twitter_search_real + def get_results(query): """Trigger twitter search and extract results from JSON response.""" json_data = twitter_search(query) @@ -35,16 +48,22 @@ def run(interval, query): """Run the main loop which queries Twitter and writes the output.""" while 1: - results = get_results(query) - for result in results: - print "%s - http://twitter.com/#!/%s/status/%s" % ( - result['text'], - result['from_user'], - result['id_str'] - ) - # Tweet URL #http://twitter.com/#!//status/ - if hasattr(interval, "__call__"): interval() - else: time.sleep(float(interval)) + try: + results = get_results(query) + for result in results: + # Tweet URL #http://twitter.com/#!//status/ + msg = "%s - http://twitter.com/#!/%s/status/%s" % ( + result['text'], + result['from_user'], + result['id_str'] + ) + print msg.encode(sys.stdout.encoding, 'replace') + if hasattr(interval, "__call__"): interval() + else: time.sleep(float(interval)) + except pycurl.error: + print "Couldn't retrieve URL" + except json.ReadException: + print "Couldn't read JSON response" if __name__ == '__main__': usage = "%prog -s -t " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Oct 25 11:57:29 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 25 Oct 2011 09:57:29 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[574] twitter/sweets/sweets.py Message-ID: Revision: 574 http://opencsw.svn.sourceforge.net/opencsw/?rev=574&view=rev Author: skayser Date: 2011-10-25 09:57:29 +0000 (Tue, 25 Oct 2011) Log Message: ----------- twitter/sweets: switch from pycurl to urllib, add state tracking, print exception msgs Modified Paths: -------------- twitter/sweets/sweets.py Modified: twitter/sweets/sweets.py =================================================================== --- twitter/sweets/sweets.py 2011-10-25 08:44:42 UTC (rev 573) +++ twitter/sweets/sweets.py 2011-10-25 09:57:29 UTC (rev 574) @@ -5,15 +5,14 @@ # can be used for further processing (e.g. to generate RSS) # # TODO: -# * Implement twitter_search (http://search.twitter.com/search.json?q=opencsw) -# * twitter_search: catch and log twitter API HTTP status codes <> 200 -# * run: write result JSON to output file -# * get_results: use refresh_url from response for follow up queries +# * Add logging for debug purposes (URL fetches, reponses received) +# * run: write or append result JSON to output file # * Rewrite file open/close blocks with "with" once python2.5+ on dev box # import json -import pycurl +import urllib +import urllib2 import sys import time import types @@ -27,29 +26,30 @@ f.close() return data -def twitter_search_real(query, since=""): +def twitter_search_real(query, since_id=""): """Search twitter, returns a single-line, JSON search result.""" - output=StringIO.StringIO() - c = pycurl.Curl() - c.setopt(c.URL, 'http://search.twitter.com/search.json?q=' + query) - c.setopt(c.WRITEFUNCTION, output.write) - c.perform() - c.close() - return output.getvalue() + url_base = "http://search.twitter.com/search.json" + url_params = [] + url_params.append(( "q" , query )) + if since_id: url_params.append(( "since_id" , since_id)) + url = url_base + "?" + urllib.urlencode(url_params) + output = urllib2.urlopen(url).read() + return output twitter_search = twitter_search_real -def get_results(query): +def get_results(query, state): """Trigger twitter search and extract results from JSON response.""" - json_data = twitter_search(query) + json_data = twitter_search(query, state.get('max_seen')) response = json.read(json_data) + state['max_seen'] = response.get('max_id') return response['results'] -def run(interval, query): +def run(interval, query, state={}): """Run the main loop which queries Twitter and writes the output.""" while 1: try: - results = get_results(query) + results = get_results(query, state) for result in results: # Tweet URL #http://twitter.com/#!//status/ msg = "%s - http://twitter.com/#!/%s/status/%s" % ( @@ -58,13 +58,14 @@ result['id_str'] ) print msg.encode(sys.stdout.encoding, 'replace') - if hasattr(interval, "__call__"): interval() - else: time.sleep(float(interval)) - except pycurl.error: - print "Couldn't retrieve URL" - except json.ReadException: - print "Couldn't read JSON response" + except urllib2.URLError, e: + print "Couldn't retrieve URL:", e + except json.ReadException, e: + print "Couldn't read JSON response", e + if hasattr(interval, "__call__"): interval() + else: time.sleep(float(interval)) + if __name__ == '__main__': usage = "%prog -s -t " parser = OptionParser(usage=usage) 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 Oct 25 14:02:36 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Oct 2011 12:02:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[15985] csw/mgar/pkg/fftw/trunk Message-ID: Revision: 15985 http://gar.svn.sourceforge.net/gar/?rev=15985&view=rev Author: dmichelsen Date: 2011-10-25 12:02:36 +0000 (Tue, 25 Oct 2011) Log Message: ----------- fftw/trunk: Update to 3.3 Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile csw/mgar/pkg/fftw/trunk/checksums Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2011-10-25 08:19:15 UTC (rev 15984) +++ csw/mgar/pkg/fftw/trunk/Makefile 2011-10-25 12:02:36 UTC (rev 15985) @@ -1,5 +1,5 @@ NAME = fftw -VERSION = 3.2.2 +VERSION = 3.3 CATEGORIES = lib DESCRIPTION = Library for computing the discrete Fourier transform (DFT) Modified: csw/mgar/pkg/fftw/trunk/checksums =================================================================== --- csw/mgar/pkg/fftw/trunk/checksums 2011-10-25 08:19:15 UTC (rev 15984) +++ csw/mgar/pkg/fftw/trunk/checksums 2011-10-25 12:02:36 UTC (rev 15985) @@ -1 +1 @@ -b616e5c91218cc778b5aa735fefb61ae fftw-3.2.2.tar.gz +0728ab3ec0ebb06631ab3b80a5c3d130 fftw-3.3.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 Tue Oct 25 15:44:07 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 25 Oct 2011 13:44:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15986] csw/mgar/pkg/postfix/trunk/Makefile Message-ID: Revision: 15986 http://gar.svn.sourceforge.net/gar/?rev=15986&view=rev Author: wilbury Date: 2011-10-25 13:44:06 +0000 (Tue, 25 Oct 2011) Log Message: ----------- postfix/trunk: Fix build, change /usr/local into /opt/csw Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2011-10-25 12:02:36 UTC (rev 15985) +++ csw/mgar/pkg/postfix/trunk/Makefile 2011-10-25 13:44:06 UTC (rev 15986) @@ -115,9 +115,9 @@ PROTOTYPE_PERMS_pid = 0755 PROTOTYPE_CLASS_pid = ugfiles -EXTRA_MERGE_EXCLUDE_FILES = /etc/opt/csw/postfix/LICENSE -EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/TLS_LICENSE -EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/makedefs.out +EXTRA_MERGE_EXCLUDE_FILES = $(CONFIG_BASE)/LICENSE +EXTRA_MERGE_EXCLUDE_FILES += $(CONFIG_BASE)/TLS_LICENSE +EXTRA_MERGE_EXCLUDE_FILES += $(CONFIG_BASE)/makedefs.out STRIP_DIRS = $(DESTDIR)$(libexecdir)/postfix @@ -132,7 +132,7 @@ # http://www.postfix.org/PACKAGE_README.html DEF_COMMAND_DIR = /opt/csw/sbin -DEF_CONFIG_DIR = /etc/opt/csw/postfix +DEF_CONFIG_DIR = $(CONFIG_BASE) DEF_DAEMON_DIR = /opt/csw/libexec/postfix DEF_MAILQ_PATH = /opt/csw/bin/mailq DEF_HTML_DIR = /opt/csw/share/doc/postfix/html @@ -293,6 +293,15 @@ # Instructions to replace the system's sendmail ginstall -Dm 644 $(FILEDIR)/README.CSW \ $(DESTDIR)$(docdir)/$(NAME)/README.CSW + @echo "===> Fixing /usr/local into /opt/csw" + find $(DESTDIR)/$(DEF_HTML_DIR) -type f -depth -print | \ + xargs -n 1 gsed -i -e 's|/usr/local|/opt/csw|g' + find $(DESTDIR)/$(DEF_README_DIR) -type f -depth -print | \ + xargs -n 1 gsed -i -e 's|/usr/local|/opt/csw|g' + find $(DESTDIR)/$(DEF_DAEMON_DIR) -type f -name '*.cf' -depth -print | \ + xargs -n 1 gsed -i -e 's|/usr/local|/opt/csw|g' + find $(DESTDIR)/$(CONFIG_BASE) -type f -name '*.cf' -depth -print | \ + xargs -n 1 gsed -i -e 's|/usr/local|/opt/csw|g' @$(MAKECOOKIE) # Fails. A subsequent manual verify-config run is successfull, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Oct 25 16:40:37 2011 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 25 Oct 2011 14:40:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[15987] csw/mgar/pkg/mediawiki/trunk Message-ID: Revision: 15987 http://gar.svn.sourceforge.net/gar/?rev=15987&view=rev Author: janholzh Date: 2011-10-25 14:40:37 +0000 (Tue, 25 Oct 2011) Log Message: ----------- Mediawiki: Update to 1.17 and update README.CSW and DEP Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/Makefile csw/mgar/pkg/mediawiki/trunk/checksums csw/mgar/pkg/mediawiki/trunk/files/README.CSW Modified: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile 2011-10-25 13:44:06 UTC (rev 15986) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2011-10-25 14:40:37 UTC (rev 15987) @@ -1,5 +1,5 @@ NAME = mediawiki -VERSION = 1.16.0 +VERSION = 1.17.0 CATEGORIES = apps RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9].*\)\.[0-9]*/\1/') DESCRIPTION = A free software wiki package written in PHP @@ -10,7 +10,7 @@ by many other wikis, including this website, the home of MediaWiki. endef -MASTER_SITES = http://noc.wikimedia.org/ +MASTER_SITES = http://download.wikimedia.org/mediawiki/1.17/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWmediawiki.postinstall CSWmediawiki.preremove DISTFILES += httpd-mediawiki.conf.CSW README.CSW @@ -25,7 +25,7 @@ CATALOGNAME_CSWmediawiki = mediawiki SPKG_DESC_CSWmediawiki = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWmediawiki = CSWphp5 +RUNTIME_DEP_PKGS_CSWmediawiki = CSWap2modphp5 CHECKPKG_OVERRIDES_CSWmediawiki += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWmediawiki += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWmediawiki += missing-dependency|CSWperl Modified: csw/mgar/pkg/mediawiki/trunk/checksums =================================================================== --- csw/mgar/pkg/mediawiki/trunk/checksums 2011-10-25 13:44:06 UTC (rev 15986) +++ csw/mgar/pkg/mediawiki/trunk/checksums 2011-10-25 14:40:37 UTC (rev 15987) @@ -1 +1 @@ -ddcc4483d34c89c2e61fafb8b97b7890 mediawiki-1.16.0.tar.gz +871a00a8eb6dcae1b7b654ae635af7cd mediawiki-1.17.0.tar.gz Modified: csw/mgar/pkg/mediawiki/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/mediawiki/trunk/files/README.CSW 2011-10-25 13:44:06 UTC (rev 15986) +++ csw/mgar/pkg/mediawiki/trunk/files/README.CSW 2011-10-25 14:40:37 UTC (rev 15987) @@ -10,7 +10,7 @@ Using MySQL =========== - # pkg-get -i mysql5rt mysql5client mysql5 php5_mysqli + # pkgutil -i mysql5 php5_mysqli **** NOTE **** You will need an account with superuser privileges to create the database. @@ -18,7 +18,7 @@ Using PostgreSQL ================ - # pkg-get -i postgresql php5_pgsql + # pkgutil -i postgresql php5_pgsql 2) Point your web browser to http://mydomain/mediawiki/index.php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 25 17:17:53 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 25 Oct 2011 15:17:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[15988] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 15988 http://gar.svn.sourceforge.net/gar/?rev=15988&view=rev Author: wahwah Date: 2011-10-25 15:17:53 +0000 (Tue, 25 Oct 2011) Log Message: ----------- pkgdb-web: Serve full pkg stats separately Implementing the suggestion from: http://lists.opencsw.org/pipermail/maintainers/2011-October/015580.html Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-25 14:40:37 UTC (rev 15987) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-25 15:17:53 UTC (rev 15988) @@ -35,6 +35,7 @@ r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname', r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail', r'/rest/srv4/([0-9a-f]{32})/files/', 'RestSrv4DetailFiles', + r'/rest/srv4/([0-9a-f]{32})/pkg-stats/', 'RestSrv4FullStats', ) # render = web.template.render('templates/') @@ -273,22 +274,12 @@ def GET(self, md5_sum): ConnectToDatabase() - class PkgStatsEncoder(json.JSONEncoder): - def default(self, obj): - if isinstance(obj, frozenset): - # Python 2.6 doesn't have the dictionary comprehension - # return {x: None for x in obj} - return list(obj) - if isinstance(obj, datetime.datetime): - return obj.isoformat() - return json.JSONEncoder.default(self, obj) try: pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() mimetype, data_structure = pkg.GetRestRepr() - data_structure["pkg_stats"] = pkg.GetStatsStruct() web.header('Content-type', mimetype) web.header('Access-Control-Allow-Origin', '*') - return json.dumps(data_structure, cls=PkgStatsEncoder) + return json.dumps(data_structure) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() @@ -314,6 +305,28 @@ raise web.notfound() +class RestSrv4FullStats(object): + + def GET(self, md5_sum): + ConnectToDatabase() + class PkgStatsEncoder(json.JSONEncoder): + def default(self, obj): + if isinstance(obj, frozenset): + # Python 2.6 doesn't have the dictionary comprehension + # return {x: None for x in obj} + return list(obj) + if isinstance(obj, datetime.datetime): + return obj.isoformat() + return json.JSONEncoder.default(self, obj) + try: + pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() + data_structure = pkg.GetStatsStruct() + web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=pkg-stats') + return json.dumps(data_structure, cls=PkgStatsEncoder) + except sqlobject.main.SQLObjectNotFound, e: + raise web.notfound() + + class Srv4ByCatAndCatalogname(object): def GET(self, catrel_name, arch_name, osrel_name, catalogname): 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 Oct 25 18:01:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Oct 2011 16:01:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15989] csw/mgar/pkg/gsasl/trunk Message-ID: Revision: 15989 http://gar.svn.sourceforge.net/gar/?rev=15989&view=rev Author: dmichelsen Date: 2011-10-25 16:01:13 +0000 (Tue, 25 Oct 2011) Log Message: ----------- gsasl/trunk: Update to 1.6.1, rename package to latest standard Modified Paths: -------------- csw/mgar/pkg/gsasl/trunk/Makefile csw/mgar/pkg/gsasl/trunk/checksums Modified: csw/mgar/pkg/gsasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsasl/trunk/Makefile 2011-10-25 15:17:53 UTC (rev 15988) +++ csw/mgar/pkg/gsasl/trunk/Makefile 2011-10-25 16:01:13 UTC (rev 15989) @@ -1,5 +1,5 @@ NAME = gsasl -VERSION = 1.6.0 +VERSION = 1.6.1 CATEGORIES = apps DESCRIPTION = GNU SASL binary @@ -14,61 +14,65 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.gnu.org/software/$(GNU_PROJ) -PACKAGES = CSWlibgsasl CSWlibgsasl7 CSWlibgsasldevel CSWgsasl +BUILD_DEP_PKGS += CSWgnulinks +BUILD_DEP_PKGS += CSWlibkrb5-dev -CATALOGNAME_CSWlibgsasl = libgsasl -CATALOGNAME_CSWlibgsasl7 = libgsasl7 -CATALOGNAME_CSWlibgsasldevel = libgsasl_devel -CATALOGNAME_CSWgsasl = gsasl +PACKAGES += CSWlibgsasl7 +SPKG_DESC_CSWlibgsasl7 = GNU SASL library, libgsasl.so.7 +PKGFILES_CSWlibgsasl7 += $(call pkgfiles_lib,libgsasl.so.7) +PKGFILES_CSWlibgsasl7 += .*/libgsasl\.mo +RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibntlm0 +RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibk5crypto3 +OBSOLETED_BY_CSWlibgsasl7 += CSWlibgsasl -BUILD_DEP_PKGS = CSWkrb5libdev CSWgnulinks -RUNTIME_DEP_PKGS_CSWlibgsasl7 = CSWggettextrt CSWkrb5lib CSWlibidn CSWlibntlm -RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWgcrypt CSWgpgerr -RUNTIME_DEP_PKGS_CSWlibgsasl = CSWlibgsasl7 -RUNTIME_DEP_PKGS_CSWgsasl = CSWlibgsasl7 CSWgnutls CSWggettextrt CSWiconv CSWkrb5lib CSWlibidn CSWlibntlm CSWreadline -RUNTIME_DEP_PKGS_CSWgsasl += CSWgcrypt CSWgpgerr -RUNTIME_DEP_PKGS_CSWlibgsasldevel = CSWlibgsasl7 CSWkrb5libdev +PACKAGES += CSWlibgsasl-dev +SPKG_DESC_CSWlibgsasl-dev = Development files for GNU SASL library libgsasl.so.7 +PKGFILES_CSWlibgsasl-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibgsasl-dev += CSWlibgsasl7 +RUNTIME_DEP_PKGS_CSWlibgsasl-dev += CSWlibkrb5-dev +OBSOLETED_BY_CSWlibgsasl-dev += CSWlibgsasldevel +CATALOGNAME_CSWlibgsasldevel = libgsasl_devel_stub -SPKG_DESC_CSWlibgsasl = Stub for legacy dependencies to CSWlibgsasl7 -SPKG_DESC_CSWlibgsasl7 = GNU SASL Library providing libgsasl.so.7 -SPKG_DESC_CSWlibgsasldevel = GNU SASL Development Files +PACKAGES += CSWgsasl SPKG_DESC_CSWgsasl = GNU SASL +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgsasl7 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibntlm0 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgnutls26 -SPKG_SOURCEURL = http://www.gnu.org/software/$(GNU_PROJ) - # We don't need it and if defined the test breaks LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) # Disable 64 bit until krb5 is available in 64 bit -# BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 -TEST_TARGET = check - # One test inside GNULib fails, reported upstream. This is most -# probably harmless. +# probably harmless. Disable testsuite unless this is fixed: +# http://lists.gnu.org/archive/html/help-gsasl/2009-03/msg00005.html SKIPTEST ?= 1 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias -ARCHALL_CSWlibgsasl = 1 - -# Make sure we do NOT add here /opt/csw/include/gsasl.h -PKGFILES_CSWgsasl = $(bindir)/.* -PKGFILES_CSWgsasl += $(infodir)/gsasl\..* -PKGFILES_CSWgsasl += $(sharedstatedir)/.*/gsasl\..* -PKGFILES_CSWgsasl += $(mandir)/.*/gsasl\..* - -PKGFILES_CSWlibgsasl = NOFILES - -PKGFILES_CSWlibgsasldevel = $(PKGFILES_DEVEL) - -CHECKPKG_OVERRIDES_CSWlibgsasl += surplus-dependency|CSWlibgsasl7 - include gar/category.mk # Tests use 'grep -e' Modified: csw/mgar/pkg/gsasl/trunk/checksums =================================================================== --- csw/mgar/pkg/gsasl/trunk/checksums 2011-10-25 15:17:53 UTC (rev 15988) +++ csw/mgar/pkg/gsasl/trunk/checksums 2011-10-25 16:01:13 UTC (rev 15989) @@ -1 +1 @@ -5a4cc39af4ba8dbd8b66380baf3c3c7d gsasl-1.6.0.tar.gz +7ae813eeb1f90ad52e9a781ac9e17f28 gsasl-1.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 25 20:09:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Oct 2011 18:09:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[15990] csw/mgar/pkg/gsasl/trunk/gar Message-ID: Revision: 15990 http://gar.svn.sourceforge.net/gar/?rev=15990&view=rev Author: dmichelsen Date: 2011-10-25 18:09:44 +0000 (Tue, 25 Oct 2011) Log Message: ----------- gsasl/trunk: Remove extra gar-link Removed Paths: ------------- csw/mgar/pkg/gsasl/trunk/gar Deleted: csw/mgar/pkg/gsasl/trunk/gar =================================================================== --- csw/mgar/pkg/gsasl/trunk/gar 2011-10-25 16:01:13 UTC (rev 15989) +++ csw/mgar/pkg/gsasl/trunk/gar 2011-10-25 18:09:44 UTC (rev 15990) @@ -1 +0,0 @@ -link ../../../gar/v2 \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 25 20:30:19 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Oct 2011 18:30:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[15991] csw/mgar/pkg Message-ID: Revision: 15991 http://gar.svn.sourceforge.net/gar/?rev=15991&view=rev Author: dmichelsen Date: 2011-10-25 18:30:19 +0000 (Tue, 25 Oct 2011) Log Message: ----------- p11-kit/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/p11-kit/ csw/mgar/pkg/p11-kit/Makefile csw/mgar/pkg/p11-kit/branches/ csw/mgar/pkg/p11-kit/tags/ csw/mgar/pkg/p11-kit/trunk/ csw/mgar/pkg/p11-kit/trunk/Makefile csw/mgar/pkg/p11-kit/trunk/checksums csw/mgar/pkg/p11-kit/trunk/files/ csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch Added: csw/mgar/pkg/p11-kit/Makefile =================================================================== --- csw/mgar/pkg/p11-kit/Makefile (rev 0) +++ csw/mgar/pkg/p11-kit/Makefile 2011-10-25 18:30:19 UTC (rev 15991) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/p11-kit/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/p11-kit/trunk/Makefile =================================================================== --- csw/mgar/pkg/p11-kit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/p11-kit/trunk/Makefile 2011-10-25 18:30:19 UTC (rev 15991) @@ -0,0 +1,50 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = p11-kit +VERSION = 0.8 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Load and enumerate PKCS#11 modules +define BLURB +endef + +MASTER_SITES = http://p11-glue.freedesktop.org/releases/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-Hack-around-missing-__argv.patch + +VENDOR_URL = http://p11-glue.freedesktop.org/p11-kit.html + +PACKAGES += CSWlibp11kit0 +SPKG_DESC_CSWlibp11kit0 = Load and enumerate PKCS#11 modules, libp11-kit.so.0 +PKGFILES_CSWlibp11kit0 += $(call pkgfiles_lib,libp11-kit.so.0) +PKGFILES_CSWlibp11kit0 += $(sysconfdir)/.* +RUNTIME_DEP_PKGS_CSWlibp11kit0 += CSWlibintl8 + +PACKAGES += CSWlibp11kit-dev +SPKG_DESC_CSWlibp11kit-dev = Development files for libp11-kit.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibp11kit-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibp11kit-dev += CSWlibp11kit0 + +EXTRA_CPPFLAGS = -features=extensions -D__PRETTY_FUNCTION__=__func__ +EXTRA_LINKER_FLAGS += -lintl + +# For fabs(3m) +EXTRA_LINKER_FLAGS += -lm + +# For nanosleep(3rt) +EXTRA_LINKER_FLAGS += -lrt + +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_PAX_ARGS = -s ,pkcs11.conf.example,pkcs11.conf, + +PRESERVECONF += $(sysconfdir)/pkcs11.conf + +include gar/category.mk + Property changes on: csw/mgar/pkg/p11-kit/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/p11-kit/trunk/checksums =================================================================== --- csw/mgar/pkg/p11-kit/trunk/checksums (rev 0) +++ csw/mgar/pkg/p11-kit/trunk/checksums 2011-10-25 18:30:19 UTC (rev 15991) @@ -0,0 +1 @@ +0928ab06acbdeda48645df4791f4d28d p11-kit-0.8.tar.gz Added: csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch =================================================================== --- csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch (rev 0) +++ csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch 2011-10-25 18:30:19 UTC (rev 15991) @@ -0,0 +1,52 @@ +From 8dbe61abe2af6ce7633337a2d1005b8ddfcf5610 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 25 Oct 2011 17:55:17 +0200 +Subject: [PATCH] Hack around missing __argv + +--- + tools/compat.c | 14 +++++++++----- + 1 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/tools/compat.c b/tools/compat.c +index 93ba77c..a708ac5 100644 +--- a/tools/compat.c ++++ b/tools/compat.c +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + static const char * + calc_prog_name (void) +@@ -51,19 +52,22 @@ calc_prog_name (void) + + if(!prepared) + { +- const char* beg = strrchr(__argv[0], '\\'); +- const char* temp = strrchr(__argv[0], '/'); ++ strcpy( prognamebuf, "" ); ++/* ++ const char* beg = strrchr(argv[0], '\\'); ++ const char* temp = strrchr(argv[0], '/'); + beg = (beg > temp) ? beg : temp; +- beg = (beg) ? beg + 1 : __argv[0]; ++ beg = (beg) ? beg + 1 : argv[0]; + +- temp = strrchr(__argv[0], '.'); +- temp = (temp > beg) ? temp : __argv[0] + strlen(__argv[0]); ++ temp = strrchr(argv[0], '.'); ++ temp = (temp > beg) ? temp : argv[0] + strlen(argv[0]); + + if((temp - beg) > 255) + temp = beg + 255; + + strncpy(prognamebuf, beg, temp - beg); + prognamebuf[temp - beg] = 0; ++*/ + prepared = 1; + } + +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 25 23:28:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Oct 2011 21:28:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[15992] csw/mgar/pkg/nettle/trunk Message-ID: Revision: 15992 http://gar.svn.sourceforge.net/gar/?rev=15992&view=rev Author: dmichelsen Date: 2011-10-25 21:28:39 +0000 (Tue, 25 Oct 2011) Log Message: ----------- nettle/trunk: Update to 2.4 Modified Paths: -------------- csw/mgar/pkg/nettle/trunk/Makefile csw/mgar/pkg/nettle/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch Modified: csw/mgar/pkg/nettle/trunk/Makefile =================================================================== --- csw/mgar/pkg/nettle/trunk/Makefile 2011-10-25 18:30:19 UTC (rev 15991) +++ csw/mgar/pkg/nettle/trunk/Makefile 2011-10-25 21:28:39 UTC (rev 15992) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = nettle -VERSION = 2.1 +VERSION = 2.4 GARTYPE = v2 CATEGORIES = utils @@ -15,14 +15,15 @@ MASTER_SITES = http://www.lysator.liu.se/~nisse/archive/ DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += 0001-Add-dynamic-linkage-information-for-Solaris.patch VENDOR_URL = http://www.lysator.liu.se/~nisse/nettle/ +LICENSE = COPYING.LIB + PACKAGES += CSWlibhogweed2 PKGFILES_CSWlibhogweed2 += $(call pkgfiles_lib,libhogweed.so.2) SPKG_DESC_CSWlibhogweed2 += A low-level cryptographic library, libhogweed.so.2 -RUNTIME_DEP_PKGS_CSWlibhogweed2 += CSWlibgmp +RUNTIME_DEP_PKGS_CSWlibhogweed2 += CSWlibgmp10 RUNTIME_DEP_PKGS_CSWlibhogweed2 += CSWlibnettle4 PACKAGES += CSWlibnettle4 @@ -40,7 +41,7 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibhogweed2 RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibnettle4 -RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibgmp +RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibgmp10 BUILD64 = 1 Modified: csw/mgar/pkg/nettle/trunk/checksums =================================================================== --- csw/mgar/pkg/nettle/trunk/checksums 2011-10-25 18:30:19 UTC (rev 15991) +++ csw/mgar/pkg/nettle/trunk/checksums 2011-10-25 21:28:39 UTC (rev 15992) @@ -1 +1 @@ -2bfaf16234a5d8deb96cd23f53a682bb nettle-2.1.tar.gz +450be8c4886d46c09f49f568ad6fa013 nettle-2.4.tar.gz Deleted: csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch =================================================================== --- csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch 2011-10-25 18:30:19 UTC (rev 15991) +++ csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch 2011-10-25 21:28:39 UTC (rev 15992) @@ -1,61 +0,0 @@ -From 834e429f07e890d943a517501f1d566ad2dbccd7 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 5 May 2011 11:25:05 +0200 -Subject: [PATCH] Add dynamic linkage information for Solaris - ---- - configure | 13 +++++++++++++ - configure.ac | 13 +++++++++++++ - 2 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/configure b/configure -index f7d6767..0f0cbca 100755 ---- a/configure -+++ b/configure -@@ -4198,6 +4198,19 @@ case "$host_os" in - LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)' - LIBHOGWEED_LIBS='' - ;; -+ solaris*) -+ LIBNETTLE_FORLINK=libnettle.so -+ LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' -+ LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)' -+ LIBNETTLE_LINK='$(CC) $(LDFLAGS) -G -h $(LIBNETTLE_SONAME)' -+ LIBNETTLE_LIBS='' -+ -+ LIBHOGWEED_FORLINK=libhogweed.so -+ LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' -+ LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' -+ LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -L. -G -h $(LIBHOGWEED_SONAME)' -+ LIBHOGWEED_LIBS='-lnettle -lgmp' -+ ;; - *) - LIBNETTLE_FORLINK=libnettle.so - LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' -diff --git a/configure.ac b/configure.ac -index 0251ffa..439cee8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -259,6 +259,19 @@ case "$host_os" in - LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)' - LIBHOGWEED_LIBS='' - ;; -+ solaris*) -+ LIBNETTLE_FORLINK=libnettle.so -+ LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' -+ LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)' -+ LIBNETTLE_LINK='$(CC) $(LDFLAGS) -G -h $(LIBNETTLE_SONAME)' -+ LIBNETTLE_LIBS='' -+ -+ LIBHOGWEED_FORLINK=libhogweed.so -+ LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' -+ LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' -+ LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -L. -G -h $(LIBHOGWEED_SONAME)' -+ LIBHOGWEED_LIBS='-lnettle -lgmp' -+ ;; - *) - LIBNETTLE_FORLINK=libnettle.so - LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 26 00:33:22 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 25 Oct 2011 22:33:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[15993] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 15993 http://gar.svn.sourceforge.net/gar/?rev=15993&view=rev Author: wahwah Date: 2011-10-25 22:33:22 +0000 (Tue, 25 Oct 2011) Log Message: ----------- checkpkg: Add a helpful message to wrong-docdir http://sourceforge.net/apps/trac/gar/ticket/59 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-25 21:28:39 UTC (rev 15992) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-25 22:33:22 UTC (rev 15993) @@ -1222,6 +1222,10 @@ m = docpath_re.match(pkgmap_entry["path"]) if m: if m.groupdict()["docname"] != pkg_data["basic_stats"]["catalogname"]: + msg = ("The package contains a docdir which doesn't match its " + "catalog name. To fix, repeat the merge state (mgar remerge " + "repackage).") + error_mgr.Message(msg) error_mgr.ReportError( "wrong-docdir", "expected=/opt/csw/shared/doc/%s/... " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 26 00:34:12 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 25 Oct 2011 22:34:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[15994] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 15994 http://gar.svn.sourceforge.net/gar/?rev=15994&view=rev Author: wahwah Date: 2011-10-25 22:34:12 +0000 (Tue, 25 Oct 2011) Log Message: ----------- checkpkg: Adding .Message calls to a unit test There are more .SuggestGarLine and .Message() calls in one of the checksone of the checks. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-25 22:33:22 UTC (rev 15993) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-10-25 22:34:12 UTC (rev 15994) @@ -1363,6 +1363,10 @@ self.error_mgr_mock.ReportError( 'shared-lib-package-contains-so-symlink', 'file=/opt/csw/lib/sparcv9/libneon.so') + for j in range(2): + for i in range(7): + self.messenger.SuggestGarLine(mox.IsA(str)) + self.messenger.Message(mox.IsA(str)) def SetMessenger(self): """Overriding this method to use mock instead of a stub.""" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 26 00:34:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 25 Oct 2011 22:34:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[15995] csw/mgar/gar/v2/lib/python/package_stats_test.py Message-ID: Revision: 15995 http://gar.svn.sourceforge.net/gar/?rev=15995&view=rev Author: wahwah Date: 2011-10-25 22:34:43 +0000 (Tue, 25 Oct 2011) Log Message: ----------- checkpkg: Adjust a unit test to use 'legacy' ...instead of 'stable'. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_stats_test.py Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2011-10-25 22:34:12 UTC (rev 15994) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2011-10-25 22:34:43 UTC (rev 15995) @@ -307,7 +307,7 @@ sqo_pkg2 = self.TestPackageStats.ImportPkg(neon_stats2) c = self.TestCatalog() c.AddSrv4ToCatalog(sqo_pkg1, 'SunOS5.9', 'i386', 'unstable') - c.AddSrv4ToCatalog(sqo_pkg2, 'SunOS5.9', 'i386', 'stable') + c.AddSrv4ToCatalog(sqo_pkg2, 'SunOS5.9', 'i386', 'legacy') expected = { u'/opt/csw/lib': [u'CSWneon'], u'/opt/csw/lib/sparcv9': [u'CSWneon']} @@ -326,7 +326,7 @@ sqo_pkg2 = self.TestPackageStats.ImportPkg(neon_stats2) c = self.TestCatalog() c.AddSrv4ToCatalog(sqo_pkg1, 'SunOS5.9', 'i386', 'unstable') - c.AddSrv4ToCatalog(sqo_pkg2, 'SunOS5.9', 'i386', 'stable') + c.AddSrv4ToCatalog(sqo_pkg2, 'SunOS5.9', 'i386', 'legacy') sqo_pkg1.registered = False expected = {} self.assertEqual( @@ -419,7 +419,7 @@ self.dbc.InitialDataImport() sqo_pkg1 = self.TestPackageStats.ImportPkg(neon_stats[0]) c = self.TestCatalog() - args = ('SunOS5.9', 'i386', 'stable') + args = ('SunOS5.9', 'i386', 'legacy') c.AddSrv4ToCatalog(sqo_pkg1, *args) self.assertEquals( frozenset([]), 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 Oct 26 04:02:24 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 Oct 2011 02:02:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[15996] csw/mgar/pkg Message-ID: Revision: 15996 http://gar.svn.sourceforge.net/gar/?rev=15996&view=rev Author: dmichelsen Date: 2011-10-26 02:02:23 +0000 (Wed, 26 Oct 2011) Log Message: ----------- libicu42: Move out out libicu46/branch Added Paths: ----------- csw/mgar/pkg/libicu42/ Removed Paths: ------------- csw/mgar/pkg/libicu46/branches/libicu42/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Oct 26 11:51:35 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 26 Oct 2011 09:51:35 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[575] twitter/sweets/sweets.py Message-ID: Revision: 575 http://opencsw.svn.sourceforge.net/opencsw/?rev=575&view=rev Author: skayser Date: 2011-10-26 09:51:35 +0000 (Wed, 26 Oct 2011) Log Message: ----------- twitter/sweets: add JSON file storage for found tweets Modified Paths: -------------- twitter/sweets/sweets.py Modified: twitter/sweets/sweets.py =================================================================== --- twitter/sweets/sweets.py 2011-10-25 09:57:29 UTC (rev 574) +++ twitter/sweets/sweets.py 2011-10-26 09:51:35 UTC (rev 575) @@ -5,18 +5,19 @@ # can be used for further processing (e.g. to generate RSS) # # TODO: +# * Persist state across invocations to make it cron (and Twitter) friendly # * Add logging for debug purposes (URL fetches, reponses received) -# * run: write or append result JSON to output file # * Rewrite file open/close blocks with "with" once python2.5+ on dev box # import json import urllib import urllib2 +import os import sys +import tempfile import time import types -import StringIO from optparse import OptionParser,SUPPRESS_HELP def twitter_search_mock(query="", since=""): @@ -33,56 +34,99 @@ url_params.append(( "q" , query )) if since_id: url_params.append(( "since_id" , since_id)) url = url_base + "?" + urllib.urlencode(url_params) + print "Querying", url output = urllib2.urlopen(url).read() return output twitter_search = twitter_search_real -def get_results(query, state): +def get_tweets(query, state): """Trigger twitter search and extract results from JSON response.""" json_data = twitter_search(query, state.get('max_seen')) response = json.read(json_data) state['max_seen'] = response.get('max_id') return response['results'] -def run(interval, query, state={}): +def read_jsonfile(file): + """Read an object from a JSON file.""" + if not os.path.exists(file): return [] + f = open(file, "r") + content = f.read() + f.close() + return json.read(content) + +def write_jsonfile(destfile, data): + """Write an object to a JSON file.""" + (fd, name) = tempfile.mkstemp() + f = os.fdopen(fd, 'w') + f.write(json.write(data).encode('utf-8')) + f.close() + os.rename(name, destfile) + +def dedup_tweets(tweets): + """Traverse list of tweets, de-dup them by ID and return new list.""" + seen = set() + dtweets = [] + for t in tweets: + if t['id'] in seen: continue + seen.add(t['id']) + dtweets.append(t) + return dtweets + +def log_tweet(tweet): + # Tweet URL #http://twitter.com/#!//status/ + msg = "New tweet: \"%s...\" http://twitter.com/#!/%s/status/%s" % ( + tweet['text'][0:40], + tweet['from_user'], + tweet['id_str'] + ) + print msg.encode(sys.stdout.encoding, 'replace') + +def run(interval, query, outfile, state={}): """Run the main loop which queries Twitter and writes the output.""" + tweets = read_jsonfile(outfile) while 1: try: - results = get_results(query, state) - for result in results: - # Tweet URL #http://twitter.com/#!//status/ - msg = "%s - http://twitter.com/#!/%s/status/%s" % ( - result['text'], - result['from_user'], - result['id_str'] - ) - print msg.encode(sys.stdout.encoding, 'replace') + new_tweets = get_tweets(query, state) + if new_tweets: + tweets.extend(new_tweets) + tweets = dedup_tweets(tweets) + for t in new_tweets: log_tweet(t) + write_jsonfile(outfile, tweets) + else: + print "No new tweets (%s in archive)" % len(tweets) except urllib2.URLError, e: print "Couldn't retrieve URL:", e except json.ReadException, e: print "Couldn't read JSON response", e + except json.WriteException, e: + print "Couldn't write JSON output", e if hasattr(interval, "__call__"): interval() else: time.sleep(float(interval)) if __name__ == '__main__': - usage = "%prog -s -t " - parser = OptionParser(usage=usage) - parser.add_option("-s", dest="searchterm", help="search term to run on Twitter") - parser.add_option("-t", dest="interval", default=300, - help="query every X seconds (default 300)") - parser.add_option("-d", dest="debug", action="store_true", - help=SUPPRESS_HELP) - (options, args) = parser.parse_args() + usage = "%prog -s [options]" + op = OptionParser(usage=usage) + op.add_option("-s", dest="query", help="query term to run on Twitter") + op.add_option("-t", dest="interval", default=300, + help="query every X seconds (def: 300)") + op.add_option("-o", dest="output", metavar="FILE", + help="store tweets in FILE (def: tweets-.json)") + op.add_option("-d", dest="debug", action="store_true", + help=SUPPRESS_HELP) + (options, args) = op.parse_args() - required_options = ( "searchterm", ) + required_options = ( "query", ) for o in required_options: if not getattr(options, o): parser.print_help() sys.exit(1) + if not options.output: + options.output = "tweets-%s.json" % options.query + try: if options.debug: options.interval = sys.stdin.readline - run(options.interval, options.searchterm) + run(options.interval, options.query, options.output) except KeyboardInterrupt: pass 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 Oct 26 13:02:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 Oct 2011 11:02:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[15997] csw/mgar/pkg/libicu46/trunk Message-ID: Revision: 15997 http://gar.svn.sourceforge.net/gar/?rev=15997&view=rev Author: dmichelsen Date: 2011-10-26 11:02:00 +0000 (Wed, 26 Oct 2011) Log Message: ----------- libicu46/trunk: Update to 4.6.1, minor restructuring Modified Paths: -------------- csw/mgar/pkg/libicu46/trunk/Makefile csw/mgar/pkg/libicu46/trunk/checksums Modified: csw/mgar/pkg/libicu46/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu46/trunk/Makefile 2011-10-26 02:02:23 UTC (rev 15996) +++ csw/mgar/pkg/libicu46/trunk/Makefile 2011-10-26 11:02:00 UTC (rev 15997) @@ -1,27 +1,20 @@ # $Id$ NAME = libicu -VERSION = 4.6 +VERSION = 4.6.1 CATEGORIES = lib DESCRIPTION = International Components for Unicode define BLURB endef -# filename = icu4c-$(shell echo $(1) | tr '.' '_')-src.tgz -_V-4.6 = 4_6 -filename = icu4c-$(_V-$(1))-src.tgz - MASTER_SITES = http://download.icu-project.org/files/icu4c/$(VERSION)/ -SOURCEFILES = $(call filename,$(VERSION)) +SOURCEFILES = icu4c-$(subst .,_,$(VERSION))-src.tgz DISTFILES = $(SOURCEFILES) # icu-config is broken with ECHO_N/ECHO_C detection: # http://bugs.icu-project.org/trac/ticket/7768 #PATCHFILES = 0001-Add-workaround-for-echo-n.patch -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:_\d+)*)-src.tgz - PACKAGES += CSWlibicu46 CATALOGNAME_CSWlibicu46 = libicu46 SPKG_DESC_CSWlibicu46 = International Components for Unicode, libicu*.so.46 @@ -36,6 +29,10 @@ # This package is PKGFILES catchall RUNTIME_DEP_PKGS_CSWlibicu-devel = CSWlibicu46 +# This is just a comment for --prefix +CHECKPKG_OVERRIDES_CSWlibicu-devel += file-with-bad-content|/usr/local|root/opt/csw/bin/icu-config +CHECKPKG_OVERRIDES_CSWlibicu-devel += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/icu-config + PACKAGES += CSWlibicu CATALOGNAME_CSWlibicu = libicu SPKG_DESC_CSWlibicu = $(DESCRIPTION) @@ -70,9 +67,9 @@ # packages using the libs will bail out as they assume the libs are self-contained. LINKER_FLAGS = -lCrun -lCstd +EXTRA_CXXFLAGS = -norunpath + BUILD64 = 1 -NOISAEXEC = 1 NOISALIST = 1 -CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/libicu46/trunk/checksums =================================================================== --- csw/mgar/pkg/libicu46/trunk/checksums 2011-10-26 02:02:23 UTC (rev 15996) +++ csw/mgar/pkg/libicu46/trunk/checksums 2011-10-26 11:02:00 UTC (rev 15997) @@ -1 +1 @@ -43e56b71c407be5154de681eaa646a4a icu4c-4_6-src.tgz +da64675d85f0c2191cef93a8cb5eea88 icu4c-4_6_1-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Oct 26 15:45:14 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 26 Oct 2011 13:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15998] csw/mgar/pkg/libmemcached/tags/libmemcached-0.53, REV=2011.10.26/ Message-ID: Revision: 15998 http://gar.svn.sourceforge.net/gar/?rev=15998&view=rev Author: wilbury Date: 2011-10-26 13:45:13 +0000 (Wed, 26 Oct 2011) Log Message: ----------- libmemcached: Tag as release 0.53,REV=2011.10.26 Added Paths: ----------- csw/mgar/pkg/libmemcached/tags/libmemcached-0.53,REV=2011.10.26/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Oct 26 15:46:10 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 26 Oct 2011 13:46:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15999] csw/mgar/pkg/memcached/tags/memcached-1.4.9, REV= 2011.10.26/ Message-ID: Revision: 15999 http://gar.svn.sourceforge.net/gar/?rev=15999&view=rev Author: wilbury Date: 2011-10-26 13:46:10 +0000 (Wed, 26 Oct 2011) Log Message: ----------- memcached: Tag as release 1.4.9,REV=2011.10.26 Added Paths: ----------- csw/mgar/pkg/memcached/tags/memcached-1.4.9,REV=2011.10.26/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Oct 26 15:57:41 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 26 Oct 2011 13:57:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[16000] csw/mgar/pkg/postfix/tags/postfix-2.8.6, REV=2011.10 .26/ Message-ID: Revision: 16000 http://gar.svn.sourceforge.net/gar/?rev=16000&view=rev Author: wilbury Date: 2011-10-26 13:57:41 +0000 (Wed, 26 Oct 2011) Log Message: ----------- postfix: Tag as release 2.8.6,REV=2011.10.26 Added Paths: ----------- csw/mgar/pkg/postfix/tags/postfix-2.8.6,REV=2011.10.26/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 26 18:14:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 26 Oct 2011 16:14:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[16001] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 16001 http://gar.svn.sourceforge.net/gar/?rev=16001&view=rev Author: bdwalton Date: 2011-10-26 16:14:51 +0000 (Wed, 26 Oct 2011) Log Message: ----------- cswutils/trunk: version bump, drop submitpkg symlink Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-10-26 13:57:41 UTC (rev 16000) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-10-26 16:14:51 UTC (rev 16001) @@ -1,7 +1,7 @@ # $Id$ NAME = cswutils -VERSION = 1.21 +VERSION = 1.22 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers @@ -91,8 +91,6 @@ $(DESTDIR)/$(libdir)/python/csw/ @ln -s ../lib/python/csw/compare_pkgs.py \ $(DESTDIR)$(bindir)/comparepkg - @ln -s ../lib/python/csw/submit_to_newpkgs.py \ - $(DESTDIR)$(bindir)/submitpkg @ln -s ../lib/python/csw/csw_upload_pkg.py \ $(DESTDIR)$(bindir)/csw-upload-pkg @ln -s ../lib/python/csw/checkpkg2.py \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Oct 26 18:22:22 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 26 Oct 2011 16:22:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[16002] csw/mgar/pkg/libmemcached/trunk/Makefile Message-ID: Revision: 16002 http://gar.svn.sourceforge.net/gar/?rev=16002&view=rev Author: wilbury Date: 2011-10-26 16:22:22 +0000 (Wed, 26 Oct 2011) Log Message: ----------- libmemcached/trunk: Build both SPARC and i386 platforms for release purposes. Modified Paths: -------------- csw/mgar/pkg/libmemcached/trunk/Makefile Modified: csw/mgar/pkg/libmemcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-26 16:14:51 UTC (rev 16001) +++ csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-26 16:22:22 UTC (rev 16002) @@ -32,7 +32,7 @@ GARCOMPILER = GCC4 GARTYPE = 2 -PACKAGING_PLATFORMS = solaris10-i386 solaris10-amd64 +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc PACKAGES += CSWlibmemcached RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibgcc-s1 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 Oct 26 18:41:57 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 26 Oct 2011 16:41:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[16003] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 16003 http://gar.svn.sourceforge.net/gar/?rev=16003&view=rev Author: bonivart Date: 2011-10-26 16:41:56 +0000 (Wed, 26 Oct 2011) Log Message: ----------- clamav/trunk: update to 0.97.3 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 2011-10-26 16:22:22 UTC (rev 16002) +++ csw/mgar/pkg/clamav/trunk/Makefile 2011-10-26 16:41:56 UTC (rev 16003) @@ -1,5 +1,5 @@ NAME = clamav -VERSION = 0.97.2 +VERSION = 0.97.3 #VERSION = 0.97rc #DISTNAME = $(NAME)-devel-latest CATEGORIES = apps @@ -55,6 +55,7 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 #GARCOMPILER = GCC4 @@ -77,7 +78,8 @@ CONFIGURE_ARGS += --enable-clamdtop # Enable support for files > 2GB in size. -EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +#EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +#EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la @@ -117,9 +119,9 @@ CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node15.html # We don't split to three separate packages -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.11|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.11|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.11|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.12|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.12|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.12|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 include gar/category.mk Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2011-10-26 16:22:22 UTC (rev 16002) +++ csw/mgar/pkg/clamav/trunk/checksums 2011-10-26 16:41:56 UTC (rev 16003) @@ -1 +1 @@ -cb2d78b4790fdfca3b2390d7ce82f0b7 clamav-0.97.2.tar.gz +5cf25ed7778fa0cb6b140ad8f009befb clamav-0.97.3.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 Wed Oct 26 20:56:54 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 26 Oct 2011 18:56:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[16004] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 16004 http://gar.svn.sourceforge.net/gar/?rev=16004&view=rev Author: wilbury Date: 2011-10-26 18:56:53 +0000 (Wed, 26 Oct 2011) Log Message: ----------- memcached/trunk: Build for Solaris 10 only. Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2011-10-26 16:41:56 UTC (rev 16003) +++ csw/mgar/pkg/memcached/trunk/Makefile 2011-10-26 18:56:53 UTC (rev 16004) @@ -53,7 +53,7 @@ CONFIGURE_ARGS-sol5.10 += --enable-dtrace CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL)) -PACKAGING_PLATFORMS = solaris10-i386 solaris10-amd64 +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Oct 26 21:20:58 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 26 Oct 2011 19:20:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[16005] csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init Message-ID: Revision: 16005 http://gar.svn.sourceforge.net/gar/?rev=16005&view=rev Author: guengel Date: 2011-10-26 19:20:58 +0000 (Wed, 26 Oct 2011) Log Message: ----------- Use /sbin/sh as interpreter. Return 1 on configuration errors. Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init Modified: csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init =================================================================== --- csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init 2011-10-26 18:56:53 UTC (rev 16004) +++ csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init 2011-10-26 19:20:58 UTC (rev 16005) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/sbin/sh # Startup script for saslauthd # s none /etc/rc2.d/S85cswsaslauthd=../init.d/cswsaslauthd @@ -14,7 +14,7 @@ #RC_SLEV 2 INIT_FILE=/etc/opt/csw/saslauthd.init -if [ -f "${INIT_FILE}" ]; then +if [ ! -f "${INIT_FILE}" ]; then INIT_FILE=/opt/csw/etc/saslauthd.init fi @@ -23,14 +23,14 @@ . "${INIT_FILE}" else echo "You need to create ${INIT_FILE} and configure mechanism to be used" - exit 0 + exit 1 fi # Check if we have any mechanisms defined if [ "x${MECHANISM}" = "x" ]; then echo "You need to configure ${INIT_FILE} with mechanism to be used" - exit 0 + exit 1 else PARAMS="${PARAMS} -a ${MECHANISM}" fi 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 Oct 26 21:35:19 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 Oct 2011 19:35:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16006] csw/mgar/pkg Message-ID: Revision: 16006 http://gar.svn.sourceforge.net/gar/?rev=16006&view=rev Author: dmichelsen Date: 2011-10-26 19:35:18 +0000 (Wed, 26 Oct 2011) Log Message: ----------- adns/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/adns/ csw/mgar/pkg/adns/Makefile csw/mgar/pkg/adns/branches/ csw/mgar/pkg/adns/tags/ csw/mgar/pkg/adns/trunk/ csw/mgar/pkg/adns/trunk/Makefile csw/mgar/pkg/adns/trunk/checksums csw/mgar/pkg/adns/trunk/files/ Added: csw/mgar/pkg/adns/Makefile =================================================================== --- csw/mgar/pkg/adns/Makefile (rev 0) +++ csw/mgar/pkg/adns/Makefile 2011-10-26 19:35:18 UTC (rev 16006) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/adns/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/adns/trunk/Makefile =================================================================== --- csw/mgar/pkg/adns/trunk/Makefile (rev 0) +++ csw/mgar/pkg/adns/trunk/Makefile 2011-10-26 19:35:18 UTC (rev 16006) @@ -0,0 +1,44 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = adns +VERSION = 1.4 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Advanced, easy to use, asynchronous-capable DNS client library and utilities +define BLURB +endef + +MASTER_SITES = http://www.chiark.greenend.org.uk/~ian/adns/ftp/ +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://www.gnu.org/s/adns/ + +PACKAGES += CSWadns +SPKG_DESC_CSWadns = Advanced, easy to use, asynchronous-capable DNS utilities +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWadns = CSWlibadns1 + +PACKAGES += CSWlibadns-dev +SPKG_DESC_CSWlibadns-dev = Development files for libadns.so.1 +PKGFILES_CSWlibadns-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibadns-dev += CSWlibadns1 + +PACKAGES += CSWlibadns1 +SPKG_DESC_CSWlibadns1 = Advanced, easy to use, asynchronous-capable DNS client library, libadns.so.1 +PKGFILES_CSWlibadns1 += $(call pkgfiles_lib,libadns.so.1) + +BUILD64 = 1 + +BUILD_OVERRIDE_VARS = MKSHLIB_1 MKSHLIB_3 +BUILD_OVERRIDE_VAR_MKSHLIB_1 = $(CC) $(LDFLAGS) -G -h $$(SHLIBSONAME) -o +BUILD_OVERRIDE_VAR_MKSHLIB_3 = + +# The makefile doesn't honour DESTDIR +INSTALL_OVERRIDE_DIRS += bindir +INSTALL_OVERRIDE_DIRS += libdir +INSTALL_OVERRIDE_DIRS += includedir + +include gar/category.mk + Property changes on: csw/mgar/pkg/adns/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/adns/trunk/checksums =================================================================== --- csw/mgar/pkg/adns/trunk/checksums (rev 0) +++ csw/mgar/pkg/adns/trunk/checksums 2011-10-26 19:35:18 UTC (rev 16006) @@ -0,0 +1 @@ +88bc7bbf3f62a8d4fb186b8f72ead853 adns-1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Oct 26 21:58:01 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Wed, 26 Oct 2011 20:58:01 +0100 Subject: [csw-devel] SF.net SVN: gar:[15981] csw/mgar/pkg/lighttpd/trunk/Makefile In-Reply-To: References: Message-ID: 2011/10/25 : > ?CONFIGURE_ARGS ?= $(DIRPATHS) > > +CONFIGURE_ARGS += --with-openssl=$(prefix) Does it actually work with the 64-bit build? From maciej at opencsw.org Wed Oct 26 22:01:06 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Wed, 26 Oct 2011 21:01:06 +0100 Subject: [csw-devel] SF.net SVN: gar:[16002] csw/mgar/pkg/libmemcached/trunk/Makefile In-Reply-To: References: Message-ID: 2011/10/26 : > Revision: 16002 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=16002&view=rev > Author: ? wilbury > Date: ? ? 2011-10-26 16:22:22 +0000 (Wed, 26 Oct 2011) > Log Message: > ----------- > libmemcached/trunk: Build both SPARC and i386 platforms for release purposes. > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/libmemcached/trunk/Makefile > > Modified: csw/mgar/pkg/libmemcached/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/libmemcached/trunk/Makefile ? ?2011-10-26 16:14:51 UTC (rev 16001) > +++ csw/mgar/pkg/libmemcached/trunk/Makefile ? ?2011-10-26 16:22:22 UTC (rev 16002) > @@ -32,7 +32,7 @@ > ?GARCOMPILER = GCC4 GARCOMPILER = GNU The GNU value is better, because it'll progress to the future versions of GCC instead of sticking to one. From wilbury at users.sourceforge.net Wed Oct 26 22:11:45 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 26 Oct 2011 20:11:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[16007] csw/mgar/pkg/libmemcached/trunk/Makefile Message-ID: Revision: 16007 http://gar.svn.sourceforge.net/gar/?rev=16007&view=rev Author: wilbury Date: 2011-10-26 20:11:45 +0000 (Wed, 26 Oct 2011) Log Message: ----------- libmemcached/trunk: Fix GARCOMPILER, GCC4 to GNU. Modified Paths: -------------- csw/mgar/pkg/libmemcached/trunk/Makefile Modified: csw/mgar/pkg/libmemcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-26 19:35:18 UTC (rev 16006) +++ csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-26 20:11:45 UTC (rev 16007) @@ -29,7 +29,7 @@ OPT_FLAGS_SOS = -xO3 OPT_FLAGS_GCC = -O2 -pipe -GARCOMPILER = GCC4 +GARCOMPILER = GNU GARTYPE = 2 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 26 22:18:04 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 Oct 2011 20:18:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[16008] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 16008 http://gar.svn.sourceforge.net/gar/?rev=16008&view=rev Author: dmichelsen Date: 2011-10-26 20:18:04 +0000 (Wed, 26 Oct 2011) Log Message: ----------- wireshark/trunk: Update to 1.6.2 and new dependencies Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2011-10-26 20:11:45 UTC (rev 16007) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2011-10-26 20:18:04 UTC (rev 16008) @@ -1,5 +1,5 @@ NAME = wireshark -VERSION = 1.6.0 +VERSION = 1.6.2 CATEGORIES = apps DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer @@ -16,30 +16,53 @@ VENDOR_URL = http://www.wireshark.org/ +BUILD_DEP_PKGS += CSWlibgcrypt-dev +BUILD_DEP_PKGS += CSWglib2devel +BUILD_DEP_PKGS += CSWlibgpg-error-dev +BUILD_DEP_PKGS += CSWgtk2devel +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibcares-dev +BUILD_DEP_PKGS += CSWlibpcap-dev +BUILD_DEP_PKGS += CSWlibsmi-dev +BUILD_DEP_PKGS += CSWlibkrb5-dev +BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWlibgnutls-dev +BUILD_DEP_PKGS += CSWlua +BUILD_DEP_PKGS += CSWgeoip-dev + PACKAGES += CSWwireshark SPKG_DESC_CSWwireshark = Wireshark (was Ethereal) is a free network protocol analyzer # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWwireshark += CSWgcrypt +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWwireshark += CSWglib2 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWwireshark += CSWgtk2 RUNTIME_DEP_PKGS_CSWwireshark += CSWpango -RUNTIME_DEP_PKGS_CSWwireshark += CSWzlib +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibz1 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibintl8 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcares2 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibpcap1 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi2 -RUNTIME_DEP_PKGS_CSWwireshark += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWwireshark += CSWlua +RUNTIME_DEP_PKGS_CSWwireshark += CSWftype2 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibatk +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWwireshark += CSWgeoip +RUNTIME_DEP_PKGS_CSWwireshark += CSWfconfig # No more library splitting unless absolutely necessary CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink CHECKPKG_OVERRIDES_CSWwireshark += non-uniform-lib-versions-in-package # This is probably from kerberos, revalidate after re-release of krb5 library -CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry +# CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry # example, \fI/usr/local/share/wireshark/preferences\fR) on UNIX-compatible CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/rawshark.1 @@ -56,7 +79,7 @@ # Hardwire largefiles unless this is fixed: # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6012 -EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64 +# EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-usr-local=no Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2011-10-26 20:11:45 UTC (rev 16007) +++ csw/mgar/pkg/wireshark/trunk/checksums 2011-10-26 20:18:04 UTC (rev 16008) @@ -1 +1 @@ -9f9314c89bf1c8b440a7909884838cfd wireshark-1.6.0.tar.bz2 +301677b5f8150265315632fb6247e06e wireshark-1.6.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 26 23:09:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 26 Oct 2011 21:09:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[16009] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 16009 http://gar.svn.sourceforge.net/gar/?rev=16009&view=rev Author: wahwah Date: 2011-10-26 21:09:24 +0000 (Wed, 26 Oct 2011) Log Message: ----------- memcached/trunk: add the Id keyword Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2011-10-26 20:18:04 UTC (rev 16008) +++ csw/mgar/pkg/memcached/trunk/Makefile 2011-10-26 21:09:24 UTC (rev 16009) @@ -1,3 +1,5 @@ +# $Id$ + NAME = memcached VERSION = 1.4.9 CATEGORIES = net @@ -32,9 +34,6 @@ # distributed release tarball. NOGITPATCH = 1 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - VENDOR_URL = http://memcached.org/ BUILD_DEP_PKGS = CSWlibevent-dev Property changes on: csw/mgar/pkg/memcached/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Oct 26 23:13:14 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 26 Oct 2011 21:13:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[16010] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16010 http://gar.svn.sourceforge.net/gar/?rev=16010&view=rev Author: rthurner Date: 2011-10-26 21:13:14 +0000 (Wed, 26 Oct 2011) Log Message: ----------- subversion: include python bindings again Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-10-26 21:09:24 UTC (rev 16009) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-10-26 21:13:14 UTC (rev 16010) @@ -267,8 +267,7 @@ include gar/category.mk # pygthon bindings do not link since svn-1.6.5 ... -#BINDING_LANGS = java perl python ruby -BINDING_LANGS = java perl ruby +BINDING_LANGS = java perl python ruby BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS)) PI_DEPENDS += copy-templates @@ -344,9 +343,7 @@ $(WORKSRC)/subversion/bindings/swig/python/*.c \ $(WORKSRC)/subversion/bindings/swig/python/*.py @$(BUILD_ENV) gmake -C $(WORKSRC) swig-py - @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py \ - swig_pydir=$(libdir)/python2.3/libsvn \ - swig_pydir_extra=$(libdir)/python2.3/svn + @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Oct 26 23:33:44 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 26 Oct 2011 21:33:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[16011] csw/mgar/pkg/libmemcached/trunk/Makefile Message-ID: Revision: 16011 http://gar.svn.sourceforge.net/gar/?rev=16011&view=rev Author: wilbury Date: 2011-10-26 21:33:43 +0000 (Wed, 26 Oct 2011) Log Message: ----------- libmemcached/trunk: Remove surplus dependencies. Modified Paths: -------------- csw/mgar/pkg/libmemcached/trunk/Makefile Modified: csw/mgar/pkg/libmemcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-26 21:13:14 UTC (rev 16010) +++ csw/mgar/pkg/libmemcached/trunk/Makefile 2011-10-26 21:33:43 UTC (rev 16011) @@ -23,24 +23,23 @@ CONFIGURE_ARGS += --disable-dtrace CONFIGURE_ARGS += --disable-rpath +GARCOMPILER = GNU +GARTYPE = 2 +ISAEXEC = 1 + BUILD64 = 1 SKIPTEST = 1 OPT_FLAGS_SOS = -xO3 OPT_FLAGS_GCC = -O2 -pipe -GARCOMPILER = GNU -GARTYPE = 2 - PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc PACKAGES += CSWlibmemcached RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibmemcached += CSWlibevent2-0-5 SPKG_DESC_CSWlibmemcached = $(DESCRIPTION), main library SPKG_FULL_REVSTAMP_CSWlibmemcached = 1 -CHECKPKG_OVERRIDES_CSWlibmemcached += surplus-dependency|CSWlibevent2-0-5 PACKAGES += CSWlibhashkit1 CATALOGNAME_CSWlibhashkit1 = libhashkit1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Oct 26 23:54:39 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 26 Oct 2011 21:54:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[16012] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16012 http://gar.svn.sourceforge.net/gar/?rev=16012&view=rev Author: rthurner Date: 2011-10-26 21:54:39 +0000 (Wed, 26 Oct 2011) Log Message: ----------- subversion: accept python files in the svn default location for the moment ... Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-10-26 21:33:43 UTC (rev 16011) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-10-26 21:54:39 UTC (rev 16012) @@ -191,9 +191,39 @@ PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW CHECKPKG_OVERRIDES_CSWpythonsvn += action-class-only-in-pkginfo|none CHECKPKG_OVERRIDES_CSWpythonsvn += license-missing|/opt/csw/share/doc/pythonsvn/license +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/client.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/core.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/delta.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/diff.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/fs.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/ra.pyc +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWbdb48 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsasl +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibneon27 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWpythonsvn += CSWosslrt +RUNTIME_DEP_PKGS_CSWsvn += CSWpythonsvn +RUNTIME_DEP_PKGS_CSWsvn += CSWpython - DISTFILES += CSWsvn.checkinstall DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Oct 27 00:21:02 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Wed, 26 Oct 2011 23:21:02 +0100 Subject: [csw-devel] SF.net SVN: gar:[16012] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: 2011/10/26 : > +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc Hi Rupert, These errors aren't about the location, they are about the file type: *.pyc. You don't need to include the *.pyc files in the package. They are best excluded. You can exclude them by setting the EXTRA_MERGE_EXCLUDE_FILES to for example .*\.pyc Maciej From maciej at opencsw.org Thu Oct 27 00:31:19 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Wed, 26 Oct 2011 23:31:19 +0100 Subject: [csw-devel] SF.net SVN: gar:[16010] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: 2011/10/26 : > - ? ? ? @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py \ > - ? ? ? ? ? ? ? swig_pydir=$(libdir)/python2.3/libsvn \ > - ? ? ? ? ? ? ? swig_pydir_extra=$(libdir)/python2.3/svn > + ? ? ? @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py Maybe instead of removing the settings entirely, you could hint the svn bindings where the python library directory is? It's in /opt/csw/lib/python/site-packages, and the files would be placed under /opt/csw/lib/python/site-packages/svn. Something like: swig_pydir_extra=$(libdir)/python/site-packages Maciej From maciej at opencsw.org Thu Oct 27 00:31:54 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Wed, 26 Oct 2011 23:31:54 +0100 Subject: [csw-devel] SF.net SVN: gar:[16011] csw/mgar/pkg/libmemcached/trunk/Makefile In-Reply-To: References: Message-ID: 2011/10/26 : > +GARTYPE = 2 I think this needs to match the gar branch string, e.g. "v2". From bwalton at opencsw.org Thu Oct 27 02:10:33 2011 From: bwalton at opencsw.org (Ben Walton) Date: Wed, 26 Oct 2011 20:10:33 -0400 Subject: [csw-devel] SF.net SVN: gar:[16012] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: <1319674231-sup-9337@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej (Matchek) Blizi?ski's message of Wed Oct 26 18:21:02 -0400 2011: > These errors aren't about the location, they are about the file type: > *.pyc. You don't need to include the *.pyc files in the package. They > are best excluded. You can exclude them by setting the > EXTRA_MERGE_EXCLUDE_FILES to for example .*\.pyc I looked at the python category file and it doesn't set this vaule...I'd argue that it should. I think that we should add: _MERGE_EXCLUDE_CATEGORY += .*pyc to v2/categories/python/category.mk Any objections? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From dmichelsen at users.sourceforge.net Thu Oct 27 07:47:02 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 05:47:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[16013] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 16013 http://gar.svn.sourceforge.net/gar/?rev=16013&view=rev Author: dmichelsen Date: 2011-10-27 05:47:02 +0000 (Thu, 27 Oct 2011) Log Message: ----------- sysstat: Update to 20111025 and latest standards Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/sysstat/trunk/checksums Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2011-10-26 21:54:39 UTC (rev 16012) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2011-10-27 05:47:02 UTC (rev 16013) @@ -1,5 +1,5 @@ NAME = sysstat -VERSION = 20100528 +VERSION = 20111025 CATEGORIES = utils DESCRIPTION = Key system statistics at a glance @@ -19,13 +19,10 @@ MASTER_SITES = http://www.maier-komor.de/$(NAME)/ DISTFILES = $(NAME)-$(VERSION).tgz -RUNTIME_DEP_PKGS = CSWncurses +RUNTIME_DEP_PKGS_CSWsysstat += CSWlibncurses5 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.maier-komor.de/sysstat.html -SPKG_SOURCEURL = http://www.maier-komor.de/sysstat.html - LICENSE = LICENSE PATCHFILES = patch-onlyisaexec-sysstatd.diff @@ -60,8 +57,6 @@ PROTOTYPE_FILES_makesuid = .*/sysstatd PROTOTYPE_PERMS_makesuid = 4755 -CHECKPKG_OVERRIDES_CSWsysstat += soname-not-found|libm.so.2|is|needed|by|opt/csw/sbin/amd64/sysstatd - include gar/category.mk # We don't have a autoconf-style configure. The configure script Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2011-10-26 21:54:39 UTC (rev 16012) +++ csw/mgar/pkg/sysstat/trunk/checksums 2011-10-27 05:47:02 UTC (rev 16013) @@ -1,2 +1 @@ -7a7f0f67bb68484b56375d4a922fb63f patch-onlyisaexec-sysstatd.diff -b721313f486f03ae60f7329a0fb54940 sysstat-20100528.tgz +842573fc95aa9e8d8b57a6785e0878da sysstat-20111025.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 27 09:32:35 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 07:32:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[16014] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 16014 http://gar.svn.sourceforge.net/gar/?rev=16014&view=rev Author: dmichelsen Date: 2011-10-27 07:32:35 +0000 (Thu, 27 Oct 2011) Log Message: ----------- memcached/trunk: Reenable test Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2011-10-27 05:47:02 UTC (rev 16013) +++ csw/mgar/pkg/memcached/trunk/Makefile 2011-10-27 07:32:35 UTC (rev 16014) @@ -52,6 +52,8 @@ CONFIGURE_ARGS-sol5.10 += --enable-dtrace CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL)) +TEST_TARGET = test + PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at opencsw.org Thu Oct 27 09:51:20 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Thu, 27 Oct 2011 09:51:20 +0200 Subject: [csw-devel] SF.net SVN: gar:[16012] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: <1319674231-sup-9337@pinkfloyd.chass.utoronto.ca> References: <1319674231-sup-9337@pinkfloyd.chass.utoronto.ca> Message-ID: <20111027075120.GR26160@sebastiankayser.de> * Ben Walton wrote: > Excerpts from Maciej (Matchek) Blizi??ski's message of Wed Oct 26 18:21:02 -0400 2011: > > > These errors aren't about the location, they are about the file type: > > *.pyc. You don't need to include the *.pyc files in the package. They > > are best excluded. You can exclude them by setting the > > EXTRA_MERGE_EXCLUDE_FILES to for example .*\.pyc > > I looked at the python category file and it doesn't set this > vaule...I'd argue that it should. > > I think that we should add: > > _MERGE_EXCLUDE_CATEGORY += .*pyc > > to v2/categories/python/category.mk > > Any objections? A pyc exlusion for the python category is already in place. It's activated by PYCOMPILE=1 [1], located in gar.mk [2] and currently limited to: _PYCOMPILE_FILES=/opt/csw/lib/python/site-packages/.*\.py. I vaguely remember we limited it to this directory, because _PYCOMPILE_FILES not only drives the exclusion, but also the pyc compilation on installation [3] and in some cases compilation outside of site-packages was undesired. Sebastian [1] http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/categories/python/category.mk#L14 [2] http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/gar.mk#L746 [3] http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/gar.pkg.mk#L251 From dmichelsen at users.sourceforge.net Thu Oct 27 14:44:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 12:44:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[16015] csw/mgar/pkg/lang-python/pygobject/trunk Message-ID: Revision: 16015 http://gar.svn.sourceforge.net/gar/?rev=16015&view=rev Author: dmichelsen Date: 2011-10-27 12:44:44 +0000 (Thu, 27 Oct 2011) Log Message: ----------- lang-python/pygobject/trunk: Rework packages, compile against glib 2.22 Modified Paths: -------------- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/pygobject/trunk/files/fixme.sh csw/mgar/pkg/lang-python/pygobject/trunk/files/pygobject.diff Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2011-10-27 07:32:35 UTC (rev 16014) +++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2011-10-27 12:44:44 UTC (rev 16015) @@ -11,33 +11,38 @@ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(RELVER)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -STRIP_LIBTOOL = 1 +PATCHFILES = 0001-forcing-lglib-2.0.patch -PACKAGES = CSWpy-gobject-devel CSWpy-gobject CSWlibpyglib-2-0-py0 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -CATALOGNAME_CSWpy-gobject = py_gobject +PACKAGES += CSWpy-gobject SPKG_DESC_CSWpy-gobject = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWpy-gobject = CSWpython CSWggettextrt CSWglib2 +PKGFILES_CSWpy-gobject = $(libdir)/python/site-packages/.* +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWpython +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWglib2 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibintl8 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib-2-0-py0 -INCOMPATIBLE_PKGS_CSWpy-gobject = CSWpygobject -PKGFILES_CSWpy-gobject = $(libdir)/python/site-packages/.* +OBSOLETED_BY_CSWpy-gobject = CSWpygobject +PACKAGES += CSWlibpyglib-2-0-py0 SPKG_DESC_CSWlibpyglib-2-0-py0 = Runtime library for the Python GObject library -CATALOGNAME_CSWlibpyglib-2-0-py0 = libpyglib_2_0_py0 PKGFILES_CSWlibpyglib-2-0-py0 = $(libdir)/libpyglib-2.0-python.so.0.* -RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 = CSWggettextrt CSWglib2 - +RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWlibintl8 # soname results in a package name that is too long so it was shortened -CHECKPKG_OVERRIDES_CSWlibpyglib-2-0-py0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpyglib-2.0-python.so.0.0.0|soname=libpyglib-2.0-python.so.0|pkgname=CSWlibpyglib-2-0-py0|expected=['CSWlibpyglib-2-0-python0',|'CSWlibpyglib-2-0-python-0'] -SPKG_DESC_CSWpy-gobject-devel = Development files for the Python GObject library -CATALOGNAME_CSWpy-gobject-devel = py_gobject_devel -RUNTIME_DEP_PKGS_CSWpy-gobject-devel = CSWpython +CHECKPKG_OVERRIDES_CSWlibpyglib-2-0-py0 += shared-lib-pkgname-mismatch -PYCOMPILE = 1 +PACKAGES += CSWpy-gobject-dev +SPKG_DESC_CSWpy-gobject-dev = Development files for the Python GObject library +RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib-2-0-py0 +RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWpython -PATCHFILES = 0001-forcing-lglib-2.0.patch +# These are just comments +CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/defsgen.py +CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/h2def.py -EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc +PYCOMPILE = 1 +STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --without-ffi @@ -46,4 +51,6 @@ TEST_TARGET = check TEST_SCRIPTS = +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc + include gar/category.mk Deleted: csw/mgar/pkg/lang-python/pygobject/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/files/fixme.sh 2011-10-27 07:32:35 UTC (rev 16014) +++ csw/mgar/pkg/lang-python/pygobject/trunk/files/fixme.sh 2011-10-27 12:44:44 UTC (rev 16015) @@ -1,49 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - sed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} -done - -LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) -if [ -f ${LTMAIN} ]; then - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} -fi - Deleted: csw/mgar/pkg/lang-python/pygobject/trunk/files/pygobject.diff =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/files/pygobject.diff 2011-10-27 07:32:35 UTC (rev 16014) +++ csw/mgar/pkg/lang-python/pygobject/trunk/files/pygobject.diff 2011-10-27 12:44:44 UTC (rev 16015) @@ -1,13 +0,0 @@ ---- pygobject-2.15.4/gobject/pygobject.c.orig 2009-02-22 20:17:01.681808089 -0600 -+++ pygobject-2.15.4/gobject/pygobject.c 2009-02-22 20:19:53.769734218 -0600 -@@ -419,7 +419,9 @@ - 0 - }; - --struct empty {} _empty; -+struct empty { -+ int* p; -+} _empty; - PYGLIB_DEFINE_TYPE("gobject.GPropsDescr", PyGPropsDescr_Type, _empty); - - static PyObject * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Oct 27 14:54:27 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 27 Oct 2011 14:54:27 +0200 Subject: [csw-devel] SF.net SVN: gar:[16010] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: Hi Maicej, Am 27.10.2011 um 00:31 schrieb Maciej (Matchek) Blizi?ski: > 2011/10/26 : >> - @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py \ >> - swig_pydir=$(libdir)/python2.3/libsvn \ >> - swig_pydir_extra=$(libdir)/python2.3/svn >> + @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py > > Maybe instead of removing the settings entirely, you could hint the > svn bindings where the python library directory is? It's in > /opt/csw/lib/python/site-packages, and the files would be placed under > /opt/csw/lib/python/site-packages/svn. > > Something like: > > swig_pydir_extra=$(libdir)/python/site-packages It is correct by default, so no need for hinting :-) Best regards -- Dago -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From skayser at users.sourceforge.net Thu Oct 27 15:11:33 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 13:11:33 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[576] twitter/sweets/sweets.py Message-ID: Revision: 576 http://opencsw.svn.sourceforge.net/opencsw/?rev=576&view=rev Author: skayser Date: 2011-10-27 13:11:33 +0000 (Thu, 27 Oct 2011) Log Message: ----------- twitter/sweets: add -n to cap the amount of stored results Modified Paths: -------------- twitter/sweets/sweets.py Modified: twitter/sweets/sweets.py =================================================================== --- twitter/sweets/sweets.py 2011-10-26 09:51:35 UTC (rev 575) +++ twitter/sweets/sweets.py 2011-10-27 13:11:33 UTC (rev 576) @@ -82,7 +82,7 @@ ) print msg.encode(sys.stdout.encoding, 'replace') -def run(interval, query, outfile, state={}): +def run(interval, query, outfile, keep, state={}): """Run the main loop which queries Twitter and writes the output.""" tweets = read_jsonfile(outfile) while 1: @@ -92,7 +92,7 @@ tweets.extend(new_tweets) tweets = dedup_tweets(tweets) for t in new_tweets: log_tweet(t) - write_jsonfile(outfile, tweets) + write_jsonfile(outfile, tweets[-keep:]) else: print "No new tweets (%s in archive)" % len(tweets) except urllib2.URLError, e: @@ -111,16 +111,16 @@ op.add_option("-s", dest="query", help="query term to run on Twitter") op.add_option("-t", dest="interval", default=300, help="query every X seconds (def: 300)") + op.add_option("-n", dest="limit", default=100, + help="amount of results to keep (def: 100)") op.add_option("-o", dest="output", metavar="FILE", help="store tweets in FILE (def: tweets-.json)") op.add_option("-d", dest="debug", action="store_true", help=SUPPRESS_HELP) (options, args) = op.parse_args() - required_options = ( "query", ) - for o in required_options: - if not getattr(options, o): - parser.print_help() + if not options.query: + op.print_help() sys.exit(1) if not options.output: @@ -128,5 +128,8 @@ try: if options.debug: options.interval = sys.stdin.readline - run(options.interval, options.query, options.output) + run(interval=options.interval, + query=options.query, + output=options.output, + keep=options.limit) except KeyboardInterrupt: pass This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Thu Oct 27 15:25:57 2011 From: bwalton at opencsw.org (Ben Walton) Date: Thu, 27 Oct 2011 09:25:57 -0400 Subject: [csw-devel] SF.net SVN: gar:[16012] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: <20111027075120.GR26160@sebastiankayser.de> References: <1319674231-sup-9337@pinkfloyd.chass.utoronto.ca> <20111027075120.GR26160@sebastiankayser.de> Message-ID: <1319721873-sup-2526@pinkfloyd.chass.utoronto.ca> Excerpts from Sebastian Kayser's message of Thu Oct 27 03:51:20 -0400 2011: Hi Sebastian, > A pyc exlusion for the python category is already in place. It's > activated by PYCOMPILE=1 [1], located in gar.mk [2] and currently > limited to: So it is. Helpful to read the comments, I guess! :) I guess subversion can't really declare itself to be in the python category though. The manual addition of the excludes in the local recipe is the way to go. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bonivart at users.sourceforge.net Thu Oct 27 16:13:55 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 27 Oct 2011 14:13:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[16016] csw/mgar/pkg/clamav/trunk/Makefile Message-ID: Revision: 16016 http://gar.svn.sourceforge.net/gar/?rev=16016&view=rev Author: bonivart Date: 2011-10-27 14:13:54 +0000 (Thu, 27 Oct 2011) Log Message: ----------- clamav/trunk: test gcc compiler Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2011-10-27 12:44:44 UTC (rev 16015) +++ csw/mgar/pkg/clamav/trunk/Makefile 2011-10-27 14:13:54 UTC (rev 16016) @@ -37,6 +37,7 @@ RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibgcc-s1 INCOMPATIBLE_PKGS_CSWlibclam6 = CSWlibclamav PACKAGES += CSWlibclam6-dev @@ -57,12 +58,12 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 #PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -#GARCOMPILER = GCC4 +GARCOMPILER = GCC4 # Seems to be a compiler bug forcing us to use -xO2 instead of -xO3 # http://bugs.sun.com/view_bug.do?bug_id=6683773 # New bug filed since the above one isn't really solved, no bug id yet -OPT_FLAGS_SOS = -xO2 +#OPT_FLAGS_SOS = -xO2 sysconfdir = /etc/opt/csw @@ -73,7 +74,7 @@ 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 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 Oct 27 17:15:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 15:15:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[16017] csw/mgar/pkg/hdf5-7/trunk/Makefile Message-ID: Revision: 16017 http://gar.svn.sourceforge.net/gar/?rev=16017&view=rev Author: dmichelsen Date: 2011-10-27 15:15:53 +0000 (Thu, 27 Oct 2011) Log Message: ----------- hdf5-7/trunk: Fix dependencies from CSWzlib to CSWlibz1 Modified Paths: -------------- csw/mgar/pkg/hdf5-7/trunk/Makefile Modified: csw/mgar/pkg/hdf5-7/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5-7/trunk/Makefile 2011-10-27 14:13:54 UTC (rev 16016) +++ csw/mgar/pkg/hdf5-7/trunk/Makefile 2011-10-27 15:15:53 UTC (rev 16017) @@ -18,12 +18,13 @@ PKGFILES_CSWlibhdf5-7 += $(call pkgfiles_lib,libhdf5.so.7) OBSOLETED_BY_CSWlibhdf5-7 += CSWhdf5rt CATALOGNAME_CSWhdf5rt = hdf5_rt_stub -RUNTIME_DEP_PKGS_CSWlibhdf5-7 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibhdf5-7 += CSWlibz1 PACKAGES += CSWlibhdf5hl7 SPKG_DESC_CSWlibhdf5hl7 = HDF5 (hierarchical data format 5) library, libhdf5_hl.so.7 PKGFILES_CSWlibhdf5hl7 += $(call pkgfiles_lib,libhdf5_hl.so.7) -RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWlibz1 +# If any of the reported errors were false positives, you can override them RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWlibhdf5-7 OBSOLETED_BY_CSWlibhdf5hl7 += CSWhdf5rt @@ -38,7 +39,7 @@ PKGFILES_CSWhdf5 += $(bindir)/.* RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5-7 RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5hl7 -RUNTIME_DEP_PKGS_CSWhdf5 += CSWzlib +RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibz1 VENDOR_URL = http://www.hdfgroup.org/HDF5/ 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 Oct 27 17:28:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 15:28:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[16018] csw/mgar/pkg/hdf5-6/trunk/Makefile Message-ID: Revision: 16018 http://gar.svn.sourceforge.net/gar/?rev=16018&view=rev Author: dmichelsen Date: 2011-10-27 15:28:56 +0000 (Thu, 27 Oct 2011) Log Message: ----------- hdf5-6/trunk: General package reworking Modified Paths: -------------- csw/mgar/pkg/hdf5-6/trunk/Makefile Modified: csw/mgar/pkg/hdf5-6/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5-6/trunk/Makefile 2011-10-27 15:15:53 UTC (rev 16017) +++ csw/mgar/pkg/hdf5-6/trunk/Makefile 2011-10-27 15:28:56 UTC (rev 16018) @@ -13,32 +13,33 @@ MASTER_SITES += http://www.hdfgroup.org/ftp/HDF5/hdf5-$(VERSION)/src/ DISTFILES += $(DISTNAME).tar.gz -PACKAGES += CSWlibhdf5-7 -SPKG_DESC_CSWlibhdf5-7 = HDF5 (hierarchical data format 5) library, libhdf5.so.7 -PKGFILES_CSWlibhdf5-7 += $(call pkgfiles_lib,libhdf5.so.7) -OBSOLETED_BY_CSWlibhdf5-7 += CSWhdf5rt +PACKAGES += CSWlibhdf5-6 +SPKG_DESC_CSWlibhdf5-6 = HDF5 (hierarchical data format 5) library, libhdf5.so.6 +PKGFILES_CSWlibhdf5-6 += $(call pkgfiles_lib,libhdf5.so.6) +OBSOLETED_BY_CSWlibhdf5-6 += CSWhdf5rt CATALOGNAME_CSWhdf5rt = hdf5_rt_stub -RUNTIME_DEP_PKGS_CSWlibhdf5-7 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibhdf5-6 += CSWlibz1 -PACKAGES += CSWlibhdf5hl7 -SPKG_DESC_CSWlibhdf5hl7 = HDF5 (hierarchical data format 5) library, libhdf5_hl.so.7 -PKGFILES_CSWlibhdf5hl7 += $(call pkgfiles_lib,libhdf5_hl.so.7) -RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWlibhdf5-7 -OBSOLETED_BY_CSWlibhdf5hl7 += CSWhdf5rt +PACKAGES += CSWlibhdf5hl6 +SPKG_DESC_CSWlibhdf5hl6 = HDF5 (hierarchical data format 5) library, libhdf5_hl.so.6 +PKGFILES_CSWlibhdf5hl6 += $(call pkgfiles_lib,libhdf5_hl.so.6) +RUNTIME_DEP_PKGS_CSWlibhdf5hl6 += CSWlibz1 +OBSOLETED_BY_CSWlibhdf5hl6 += CSWhdf5rt -PACKAGES += CSWlibhdf5-dev -SPKG_DESC_CSWlibhdf5-dev = Development files for libhdf5.so.7 and libhdf5_hl.so.7 -# PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5-7 -RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5hl7 +# Now dev is only built for 1.8.7 or newer +#PACKAGES += CSWlibhdf5-dev +#SPKG_DESC_CSWlibhdf5-dev = Development files for libhdf5.so.6 and libhdf5_hl.so.6 +## PKGFILES is catchall +#RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5-6 +#RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5hl6 -PACKAGES += CSWhdf5 -SPKG_DESC_CSWhdf5 = HDF5 (hierarchical data format 5) software utilities -PKGFILES_CSWhdf5 += $(bindir)/.* -RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5-7 -RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5hl7 -RUNTIME_DEP_PKGS_CSWhdf5 += CSWzlib +# Same for the binaries, no point in having old ones around +#PACKAGES += CSWhdf5 +#SPKG_DESC_CSWhdf5 = HDF5 (hierarchical data format 5) software utilities +#PKGFILES_CSWhdf5 += $(bindir)/.* +#RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5-6 +#RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5hl6 +#RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibz1 VENDOR_URL = http://www.hdfgroup.org/HDF5/ 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 Oct 27 17:37:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 15:37:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16019] csw/mgar/pkg/lzlib/trunk Message-ID: Revision: 16019 http://gar.svn.sourceforge.net/gar/?rev=16019&view=rev Author: dmichelsen Date: 2011-10-27 15:37:12 +0000 (Thu, 27 Oct 2011) Log Message: ----------- lzlib/trunk: Update to 1.2 Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile csw/mgar/pkg/lzlib/trunk/checksums Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2011-10-27 15:28:56 UTC (rev 16018) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2011-10-27 15:37:12 UTC (rev 16019) @@ -1,5 +1,5 @@ NAME = lzlib -VERSION = 1.1 +VERSION = 1.2 CATEGORIES = lib DESCRIPTION = A lossless data compression library based on the LZMA algorithm Modified: csw/mgar/pkg/lzlib/trunk/checksums =================================================================== --- csw/mgar/pkg/lzlib/trunk/checksums 2011-10-27 15:28:56 UTC (rev 16018) +++ csw/mgar/pkg/lzlib/trunk/checksums 2011-10-27 15:37:12 UTC (rev 16019) @@ -1 +1 @@ -3e57ebb510b6343e93f56724cfa16510 lzlib-1.1.tar.gz +7a77358000929bb0a31ad6b68a139b9d lzlib-1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Oct 27 19:09:37 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 17:09:37 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[577] twitter/sweets/sweets.py Message-ID: Revision: 577 http://opencsw.svn.sourceforge.net/opencsw/?rev=577&view=rev Author: skayser Date: 2011-10-27 17:09:36 +0000 (Thu, 27 Oct 2011) Log Message: ----------- twitter/sweets: rewrite to persist full response object Modified Paths: -------------- twitter/sweets/sweets.py Modified: twitter/sweets/sweets.py =================================================================== --- twitter/sweets/sweets.py 2011-10-27 13:11:33 UTC (rev 576) +++ twitter/sweets/sweets.py 2011-10-27 17:09:36 UTC (rev 577) @@ -5,12 +5,11 @@ # can be used for further processing (e.g. to generate RSS) # # TODO: -# * Persist state across invocations to make it cron (and Twitter) friendly # * Add logging for debug purposes (URL fetches, reponses received) # * Rewrite file open/close blocks with "with" once python2.5+ on dev box # -import json +import simplejson import urllib import urllib2 import os @@ -20,116 +19,172 @@ import types from optparse import OptionParser,SUPPRESS_HELP -def twitter_search_mock(query="", since=""): +class JsonParseError(Exception): + """Specific error for simplejson which only raises unspecific ValueError.""" + pass + +class TSResponse: + """Holds twitter response data and offers operations on it.""" + def __init__(self, file="", json=""): + self.data = {} + try: + if file and os.path.exists(file): + self.data = self._import_file(file) + elif json: + self.data = simplejson.loads(json) + except ValueError: + raise JsonParseError() + + def _import_file(self, file): + """Import previously stored data. Should cope with older formats.""" + data = simplejson.load(open(file)) + if isinstance(data, list): + return { "results": data } + else: + return data + + def has_tweets(self): + return self.data['results'] + + def export(self, destfile): + """Export result object to a file.""" + (fd, name) = tempfile.mkstemp() + f = os.fdopen(fd, 'w') + f.write(simplejson.dumps(self.data).encode('utf-8')) + f.close() + os.rename(name, destfile) + + def get_tweets(self): + """Get the list of tweets in the response object.""" + return self.data.get('results', []) + + def set_tweets(self, tweets): + """Set the list of tweets in the response object.""" + self.data['results'] = tweets + + def dedup_tweets(self): + """Dedup tweets in the response object by tweet ID.""" + seen = set() + dtweets = [] + for t in self.get_tweets(): + if t['id'] in seen: continue + seen.add(t['id']) + dtweets.append(t) + self.set_tweets(dtweets) + + def cap(self, n): + """Limit tweets in the response object to the last N tweets.""" + self.set_tweets(self.get_tweets()[-n:]) + + def update(self, response): + """ + Joins tweets and state from another response object (implicitly + deduplicates tweets after the join). + """ + self.set_tweets(self.get_tweets() + response.get_tweets()) + self.dedup_tweets() + self.set_state(response) + + def get_state(self): + """Return response meta-data, excluding tweet results.""" + dict = {} + for k, v in self.data.iteritems(): + if not k == "results": dict[k] = v + return dict + + def set_state(self, response): + """Set response meta-data to that of another response.""" + for k, v in response.data.iteritems(): + if not k == "results": self.data[k] = v + + def print_tweets(self): + # Tweet URL #http://twitter.com/#!//status/ + for tweet in self.get_tweets(): + msg = "New tweet: \"%s...\" http://twitter.com/#!/%s/status/%s" % ( + tweet['text'][0:40], + tweet['from_user'], + tweet['id_str'] + ) + print msg.encode(sys.stdout.encoding, 'replace') + + +def twitter_search_mock(query="", state=""): """Search twitter (mockup), returns a single-line, JSON search result.""" f = open("sample-search-results.txt", "r") data = ''.join(f.readlines()) # ensure single line string f.close() return data -def twitter_search_real(query, since_id=""): +def twitter_search_real(query, state=""): """Search twitter, returns a single-line, JSON search result.""" url_base = "http://search.twitter.com/search.json" - url_params = [] - url_params.append(( "q" , query )) - if since_id: url_params.append(( "since_id" , since_id)) - url = url_base + "?" + urllib.urlencode(url_params) + if state.get("refresh_url"): + url = url_base + state.get("refresh_url") + else: + url_params = [] + url_params.append(( "q" , query )) + url = url_base + "?" + urllib.urlencode(url_params) print "Querying", url output = urllib2.urlopen(url).read() - return output + return TSResponse(json=output) twitter_search = twitter_search_real -def get_tweets(query, state): - """Trigger twitter search and extract results from JSON response.""" - json_data = twitter_search(query, state.get('max_seen')) - response = json.read(json_data) - state['max_seen'] = response.get('max_id') - return response['results'] - -def read_jsonfile(file): - """Read an object from a JSON file.""" - if not os.path.exists(file): return [] - f = open(file, "r") - content = f.read() - f.close() - return json.read(content) - -def write_jsonfile(destfile, data): - """Write an object to a JSON file.""" - (fd, name) = tempfile.mkstemp() - f = os.fdopen(fd, 'w') - f.write(json.write(data).encode('utf-8')) - f.close() - os.rename(name, destfile) - -def dedup_tweets(tweets): - """Traverse list of tweets, de-dup them by ID and return new list.""" - seen = set() - dtweets = [] - for t in tweets: - if t['id'] in seen: continue - seen.add(t['id']) - dtweets.append(t) - return dtweets - -def log_tweet(tweet): - # Tweet URL #http://twitter.com/#!//status/ - msg = "New tweet: \"%s...\" http://twitter.com/#!/%s/status/%s" % ( - tweet['text'][0:40], - tweet['from_user'], - tweet['id_str'] - ) - print msg.encode(sys.stdout.encoding, 'replace') - -def run(interval, query, outfile, keep, state={}): - """Run the main loop which queries Twitter and writes the output.""" - tweets = read_jsonfile(outfile) +def run(query, outfile, keep, interval=None): + """ + Run the main loop which queries Twitter and writes the output. Quits after + one pass, unless interval is given upon which it actually loops. + """ + response = TSResponse(file=outfile) while 1: try: - new_tweets = get_tweets(query, state) - if new_tweets: - tweets.extend(new_tweets) - tweets = dedup_tweets(tweets) - for t in new_tweets: log_tweet(t) - write_jsonfile(outfile, tweets[-keep:]) - else: - print "No new tweets (%s in archive)" % len(tweets) + new_response = twitter_search(query, state=response.get_state()) + if new_response.has_tweets(): + new_response.print_tweets() + response.update(new_response) + response.cap(keep) + response.export(outfile) + print "%s new tweets, %s total in archive" % ( + len(new_response.get_tweets()), + len(response.get_tweets())) + except urllib2.URLError, e: print "Couldn't retrieve URL:", e - except json.ReadException, e: - print "Couldn't read JSON response", e - except json.WriteException, e: - print "Couldn't write JSON output", e + except JsonParseError: + print "Couldn't parse JSON data" - if hasattr(interval, "__call__"): interval() - else: time.sleep(float(interval)) + if not interval: + break + elif hasattr(interval, "__call__"): + interval() + else: + time.sleep(float(interval)) if __name__ == '__main__': usage = "%prog -s [options]" op = OptionParser(usage=usage) op.add_option("-s", dest="query", help="query term to run on Twitter") - op.add_option("-t", dest="interval", default=300, - help="query every X seconds (def: 300)") op.add_option("-n", dest="limit", default=100, help="amount of results to keep (def: 100)") op.add_option("-o", dest="output", metavar="FILE", help="store tweets in FILE (def: tweets-.json)") op.add_option("-d", dest="debug", action="store_true", help=SUPPRESS_HELP) + op.add_option("-t", dest="interval", help=SUPPRESS_HELP) (options, args) = op.parse_args() if not options.query: - op.print_help() - sys.exit(1) + op.print_help() + sys.exit(1) - if not options.output: - options.output = "tweets-%s.json" % options.query + if not options.output: options.output = "tweets-%s.json" % options.query + if options.debug: + if not options.interval: + options.interval = sys.stdin.readline try: - if options.debug: options.interval = sys.stdin.readline - run(interval=options.interval, - query=options.query, - output=options.output, - keep=options.limit) + run(query=options.query, + outfile=options.output, + keep=options.limit, + interval=options.interval) except KeyboardInterrupt: pass This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Oct 27 19:31:52 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 17:31:52 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[578] twitter/sweets Message-ID: Revision: 578 http://opencsw.svn.sourceforge.net/opencsw/?rev=578&view=rev Author: skayser Date: 2011-10-27 17:31:52 +0000 (Thu, 27 Oct 2011) Log Message: ----------- twitter/sweets: add ATOM generator and template Added Paths: ----------- twitter/sweets/sweets2feed.py twitter/sweets/template.feed Added: twitter/sweets/sweets2feed.py =================================================================== --- twitter/sweets/sweets2feed.py (rev 0) +++ twitter/sweets/sweets2feed.py 2011-10-27 17:31:52 UTC (rev 578) @@ -0,0 +1,39 @@ +#!/usr/bin/env python +# +# sweets2feed.py: +# Reads a tweets file generated by sweets.py and generates an +# ATOM feed containing the tweets as items. +# +# TODO: +# * Set output file via -o (to be able to redirect stdout for debugging) +# * Add logging for operational purposes + +import sweets +import os +import simplejson +import sys +from dateutil.parser import parse +from datetime import * +from mako.template import Template + +def tweet_to_feeditem(tweet): + """Convert a tweet into a feed item.""" + title = "%s: %s" % (tweet['from_user'], tweet['text']) + url = "http://twitter.com/#!/%s/status/%s" % ( + tweet['from_user'], + tweet['id_str']) + timestamp = parse(tweet['created_at']).isoformat() + return { 'title': title, 'url': url, 'updated': timestamp } + +usage = "%s " % os.path.basename(sys.argv[0]) +if not len(sys.argv) > 1: + print usage + sys.exit(1) + +feedtemplate = Template(filename="template.feed") +r = sweets.TSResponse(file=sys.argv[1]) + +print feedtemplate.render( + items=map(tweet_to_feeditem, r.get_tweets()), + query=r.data['query'], + updated=datetime.now().isoformat()) Property changes on: twitter/sweets/sweets2feed.py ___________________________________________________________________ Added: svn:executable + * Added: twitter/sweets/template.feed =================================================================== --- twitter/sweets/template.feed (rev 0) +++ twitter/sweets/template.feed 2011-10-27 17:31:52 UTC (rev 578) @@ -0,0 +1,28 @@ +<%! + import getpass + import platform + myuser = getpass.getuser() + mynode = platform.node() +%> + + + + Tweets matching "${query}" + tag:opencsw.org,2011-10-27:sweets:${query} + ${myuser}@${mynode} + ${updated} + + sweets2feed.py + + +%for item in items: + + ${item['title']} + ${item['url']} + ${item['url']} + ${item['updated']} + + +%endfor + + 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 Oct 27 20:08:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 18:08:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[16020] csw/mgar/pkg/hdf5-7/trunk/Makefile Message-ID: Revision: 16020 http://gar.svn.sourceforge.net/gar/?rev=16020&view=rev Author: dmichelsen Date: 2011-10-27 18:08:54 +0000 (Thu, 27 Oct 2011) Log Message: ----------- hdf5-7/trunk: Do not generate legacy packages Modified Paths: -------------- csw/mgar/pkg/hdf5-7/trunk/Makefile Modified: csw/mgar/pkg/hdf5-7/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5-7/trunk/Makefile 2011-10-27 15:37:12 UTC (rev 16019) +++ csw/mgar/pkg/hdf5-7/trunk/Makefile 2011-10-27 18:08:54 UTC (rev 16020) @@ -16,17 +16,13 @@ PACKAGES += CSWlibhdf5-7 SPKG_DESC_CSWlibhdf5-7 = HDF5 (hierarchical data format 5) library, libhdf5.so.7 PKGFILES_CSWlibhdf5-7 += $(call pkgfiles_lib,libhdf5.so.7) -OBSOLETED_BY_CSWlibhdf5-7 += CSWhdf5rt -CATALOGNAME_CSWhdf5rt = hdf5_rt_stub RUNTIME_DEP_PKGS_CSWlibhdf5-7 += CSWlibz1 PACKAGES += CSWlibhdf5hl7 SPKG_DESC_CSWlibhdf5hl7 = HDF5 (hierarchical data format 5) library, libhdf5_hl.so.7 PKGFILES_CSWlibhdf5hl7 += $(call pkgfiles_lib,libhdf5_hl.so.7) RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWlibz1 -# If any of the reported errors were false positives, you can override them RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWlibhdf5-7 -OBSOLETED_BY_CSWlibhdf5hl7 += CSWhdf5rt PACKAGES += CSWlibhdf5-dev SPKG_DESC_CSWlibhdf5-dev = Development files for libhdf5.so.7 and libhdf5_hl.so.7 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 Oct 27 20:16:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 18:16:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16021] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 16021 http://gar.svn.sourceforge.net/gar/?rev=16021&view=rev Author: dmichelsen Date: 2011-10-27 18:16:13 +0000 (Thu, 27 Oct 2011) Log Message: ----------- mGAR v2: Fix Python messaging Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-27 18:08:54 UTC (rev 16020) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-27 18:16:13 UTC (rev 16021) @@ -1225,7 +1225,7 @@ msg = ("The package contains a docdir which doesn't match its " "catalog name. To fix, repeat the merge state (mgar remerge " "repackage).") - error_mgr.Message(msg) + messenger.Message(msg) error_mgr.ReportError( "wrong-docdir", "expected=/opt/csw/shared/doc/%s/... " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Oct 27 20:31:16 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 27 Oct 2011 18:31:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16022] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 16022 http://gar.svn.sourceforge.net/gar/?rev=16022&view=rev Author: wahwah Date: 2011-10-27 18:31:16 +0000 (Thu, 27 Oct 2011) Log Message: ----------- gcc4/trunk: version bump to 4.6.2 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2011-10-27 18:16:13 UTC (rev 16021) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2011-10-27 18:31:16 UTC (rev 16022) @@ -7,7 +7,7 @@ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39048 NAME = gcc -VERSION = 4.6.1 +VERSION = 4.6.2 CATEGORIES = lang GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2011-10-27 18:16:13 UTC (rev 16021) +++ csw/mgar/pkg/gcc4/trunk/checksums 2011-10-27 18:31:16 UTC (rev 16022) @@ -1 +1 @@ -c57a9170c677bf795bdc04ed796ca491 gcc-4.6.1.tar.bz2 +028115c4fbfb6cfd75d6369f4a90d87e gcc-4.6.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Oct 27 21:02:13 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 19:02:13 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[579] twitter/sweets Message-ID: Revision: 579 http://opencsw.svn.sourceforge.net/opencsw/?rev=579&view=rev Author: skayser Date: 2011-10-27 19:02:12 +0000 (Thu, 27 Oct 2011) Log Message: ----------- twitter/sweets: add input/output option handling and __main__ block to sweets2feed.py Modified Paths: -------------- twitter/sweets/sweets.py twitter/sweets/sweets2feed.py Modified: twitter/sweets/sweets.py =================================================================== --- twitter/sweets/sweets.py 2011-10-27 17:31:52 UTC (rev 578) +++ twitter/sweets/sweets.py 2011-10-27 19:02:12 UTC (rev 579) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# sweets_search.py: +# sweets.py: # Search twitter with a search term and store results in a JSON file which # can be used for further processing (e.g. to generate RSS) # @@ -54,6 +54,9 @@ f.close() os.rename(name, destfile) + def get_query(self): + return self.data.get('query') + def get_tweets(self): """Get the list of tweets in the response object.""" return self.data.get('results', []) Modified: twitter/sweets/sweets2feed.py =================================================================== --- twitter/sweets/sweets2feed.py 2011-10-27 17:31:52 UTC (rev 578) +++ twitter/sweets/sweets2feed.py 2011-10-27 19:02:12 UTC (rev 579) @@ -5,16 +5,17 @@ # ATOM feed containing the tweets as items. # # TODO: -# * Set output file via -o (to be able to redirect stdout for debugging) # * Add logging for operational purposes import sweets import os import simplejson import sys +import tempfile from dateutil.parser import parse from datetime import * from mako.template import Template +from optparse import OptionParser def tweet_to_feeditem(tweet): """Convert a tweet into a feed item.""" @@ -25,15 +26,36 @@ timestamp = parse(tweet['created_at']).isoformat() return { 'title': title, 'url': url, 'updated': timestamp } -usage = "%s " % os.path.basename(sys.argv[0]) -if not len(sys.argv) > 1: - print usage - sys.exit(1) +def write_via_temp(text, destfile): + (fd, name) = tempfile.mkstemp() + f = os.fdopen(fd, 'w') + f.write(text.encode('utf-8')) + f.close() + os.rename(name, destfile) -feedtemplate = Template(filename="template.feed") -r = sweets.TSResponse(file=sys.argv[1]) +def write_feed(results, template, destfile): + feedtemplate = Template(filename=template) + items = map(tweet_to_feeditem, results.get_tweets()) + feed = feedtemplate.render( + items = items, + query=results.get_query(), + updated=datetime.now().isoformat()) + write_via_temp(feed, destfile) + -print feedtemplate.render( - items=map(tweet_to_feeditem, r.get_tweets()), - query=r.data['query'], - updated=datetime.now().isoformat()) +if __name__ == '__main__': + usage = "%prog -i -o " + parser = OptionParser(usage=usage) + parser.add_option("-i", dest="input", help="read JSON input from FILE") + parser.add_option("-o", dest="output", help="output ATOM feed to FILE") + parser.add_option("-t", dest="template", default="template.feed", + help="template (def: template.feed") + (options, args) = parser.parse_args() + if not (options.input and options.output): + parser.print_usage() + sys.exit(1) + + stored_results = sweets.TSResponse(file=options.input) + write_feed(stored_results, options.template, options.output) + print "Written %s tweets from %s to %s" % ( + len(stored_results.get_tweets()), options.input, options.output) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Oct 27 21:06:01 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 19:06:01 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[580] twitter/sweets Message-ID: Revision: 580 http://opencsw.svn.sourceforge.net/opencsw/?rev=580&view=rev Author: skayser Date: 2011-10-27 19:06:00 +0000 (Thu, 27 Oct 2011) Log Message: ----------- twitter/sweets: update README, tweak template Modified Paths: -------------- twitter/sweets/README twitter/sweets/template.feed Modified: twitter/sweets/README =================================================================== --- twitter/sweets/README 2011-10-27 19:02:12 UTC (rev 579) +++ twitter/sweets/README 2011-10-27 19:06:00 UTC (rev 580) @@ -1,7 +1,27 @@ -sweets - tools to search tweets and re-publish them through a feed +sweets - search tweets and re-publish them through a feed -Twitter has search feeds which have gone from official to unofficial but still -present. These have caused us troubles in the past, as they contained -duplicates and ceeswi on #opencsw happily broadcasted redundant items. This is -a "hacking for fun" attempt to get a sanitized feed version. Early stage, not -yet usable. +Description +=========== + +Twitter has search feeds which have gone from official to unofficial (but +still present). These have caused us troubles in the past, as they contained +duplicate entries and ceeswi on #opencsw happily broadcasted redundant items. + +This is a "hacking for fun" attempt to build a sanitized search result feed +using the Twitter Search API. Could possibly also be done by consuming and +dedupping the inofficial Twitter feeds (as long as they are still around). + + +Usage +===== + +Two stepped process. First, retrieve and store search results with sweets.py. +Then, generate a feed from the stored data via sweets2feed.py. + + sweets.py -s opencsw -o /var/www/sweets-opencsw.json -n 100 + sweets2feed.py -i /var/www/sweets-opencsw.json \ + -o /var/www/sweets-opencsw.atom + +The data stored by sweets.py is JSON and will accumulate a de-dupped history +of search results on subsequent invocations. It will store up to -n tweets, +then starts to act as a FIFO, dropping older results. Modified: twitter/sweets/template.feed =================================================================== --- twitter/sweets/template.feed 2011-10-27 19:02:12 UTC (rev 579) +++ twitter/sweets/template.feed 2011-10-27 19:06:00 UTC (rev 580) @@ -7,7 +7,7 @@ - Tweets matching "${query}" + Twitter search results for "${query}" tag:opencsw.org,2011-10-27:sweets:${query} ${myuser}@${mynode} ${updated} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Oct 27 21:07:30 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 19:07:30 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[581] twitter/sweets/ Message-ID: Revision: 581 http://opencsw.svn.sourceforge.net/opencsw/?rev=581&view=rev Author: skayser Date: 2011-10-27 19:07:30 +0000 (Thu, 27 Oct 2011) Log Message: ----------- twitter/sweets: adjust svn:ignore Property Changed: ---------------- twitter/sweets/ Property changes on: twitter/sweets ___________________________________________________________________ Modified: svn:ignore - *.pyc + *.pyc *.atom *.json *.swp 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 Oct 27 21:15:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 19:15:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[16023] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 16023 http://gar.svn.sourceforge.net/gar/?rev=16023&view=rev Author: dmichelsen Date: 2011-10-27 19:15:09 +0000 (Thu, 27 Oct 2011) Log Message: ----------- wmf/trunk: Fix dependencies Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2011-10-27 18:31:16 UTC (rev 16022) +++ csw/mgar/pkg/wmf/trunk/Makefile 2011-10-27 19:15:09 UTC (rev 16023) @@ -15,10 +15,6 @@ DISTNAME = libwmf-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10501 -UFILES_REGEX = (\d+(?:\.\d+)*) - VENDOR_URL = http://wvware.sourceforge.net PACKAGES += CSWwmf @@ -26,10 +22,10 @@ SPKG_DESC_CSWwmf += Library and tools for manipulating Windows metafiles RUNTIME_DEP_PKGS_CSWwmf += CSWftype2 RUNTIME_DEP_PKGS_CSWwmf += CSWjpeg -RUNTIME_DEP_PKGS_CSWwmf += CSWpng -RUNTIME_DEP_PKGS_CSWwmf += CSWzlib +RUNTIME_DEP_PKGS_CSWwmf += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWwmf += CSWlibz1 RUNTIME_DEP_PKGS_CSWwmf += CSWwmffonts -RUNTIME_DEP_PKGS_CSWwmf += CSWiconv +RUNTIME_DEP_PKGS_CSWwmf += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWwmf += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWwmf += CSWlibwmf0-2-7 RUNTIME_DEP_PKGS_CSWwmf += CSWlibwmflite0-2-7 @@ -37,19 +33,19 @@ PACKAGES += CSWlibwmflite0-2-7 CATALOGNAME_CSWlibwmflite0-2-7 = libwmflite0_2_7 -PKGFILES_CSWlibwmflite0-2-7 += $(call baseisadirs,$(libdir),libwmflite-0\.2\.so\.7(\.\d+)*) +PKGFILES_CSWlibwmflite0-2-7 += $(call pkgfiles_lib,libwmflite-0.2.so.7) SPKG_DESC_CSWlibwmflite0-2-7 += Library and tools for manipulating Windows metafiles - runtime package, libwmflite-0.2.so.7 OBSOLETED_BY_CSWlibwmflite0-2-7 = CSWlibwmf PACKAGES += CSWlibwmf0-2-7 CATALOGNAME_CSWlibwmf0-2-7 = libwmf0_2_7 -PKGFILES_CSWlibwmf0-2-7 += $(call baseisadirs,$(libdir),libwmf-0\.2\.so\.7(\.\d+)*) +PKGFILES_CSWlibwmf0-2-7 += $(call pkgfiles_lib,libwmf-0.2.so.7) SPKG_DESC_CSWlibwmf0-2-7 += Library and tools for manipulating Windows metafiles - runtime package, libwmf-0.2.so.7 RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWjpeg RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWlibwmflite0-2-7 -RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWpng -RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWiconv -RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWftype2 OBSOLETED_BY_CSWlibwmf0-2-7 = CSWlibwmf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Oct 27 21:26:13 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 27 Oct 2011 20:26:13 +0100 Subject: [csw-devel] SF.net SVN: gar:[16010] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: 2011/10/27 Dagobert Michelsen : >> swig_pydir_extra=$(libdir)/python/site-packages > > It is correct by default, so no need for hinting :-) Are you sure Dago? Also, what do you mean by correct? For example, our /opt/csw/lib/python/site-packages path is wrong, it should be /opt/csw/lib/python2.6/site-packages. Subversion could put files into /opt/csw/lib/python/site-packages, which would be right given our wrong setup, but wrong according to the Python installation standard. I've seen that there are overrides for *.pyc files pointing at wrong paths. Maciej From dmichelsen at users.sourceforge.net Thu Oct 27 22:19:11 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Oct 2011 20:19:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[16024] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 16024 http://gar.svn.sourceforge.net/gar/?rev=16024&view=rev Author: dmichelsen Date: 2011-10-27 20:19:11 +0000 (Thu, 27 Oct 2011) Log Message: ----------- wmf/trunk: Adjust package naming to latest standards Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2011-10-27 19:15:09 UTC (rev 16023) +++ csw/mgar/pkg/wmf/trunk/Makefile 2011-10-27 20:19:11 UTC (rev 16024) @@ -53,40 +53,38 @@ PACKAGES += CSWlibwmf-dev CATALOGNAME_CSWlibwmf-dev = libwmf_dev SPKG_DESC_CSWlibwmf-dev += Library and tools for manipulating Windows metafiles - developer package -PKGFILES_CSWlibwmf-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibwmf-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibwmf-dev += $(sharedstatedir)/doc/.* RUNTIME_DEP_PKGS_CSWlibwmf-dev += CSWlibwmflite0-2-7 RUNTIME_DEP_PKGS_CSWlibwmf-dev += CSWlibwmf0-2-7 -OBSOLETED_BY_CSWlibwmf-dev = CSWlibwmfdevel +OBSOLETED_BY_CSWlibwmf-dev += CSWlibwmfdevel CATALOGNAME_CSWlibwmfdevel = libwmf_devel_stub +OBSOLETED_BY_CSWlibwmf-dev += CSWlibwmfdoc +CATALOGNAME_CSWlibwmfdoc = libwmf_doc_stub +# These are docs only +CHECKPKG_OVERRIDES_CSWlibwmf-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libwmf/tutapi.html +CHECKPKG_OVERRIDES_CSWlibwmf-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libwmf/gd.html +CHECKPKG_OVERRIDES_CSWlibwmf-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/libwmf/tutapi.html +CHECKPKG_OVERRIDES_CSWlibwmf-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/libwmf/index.html -PACKAGES += CSWlibwmfdoc -CATALOGNAME_CSWlibwmfdoc = libwmf_doc -# This is a legacy name -CHECKPKG_OVERRIDES_CSWlibwmfdoc += catalogname-does-not-match-pkgname|pkgname=CSWlibwmfdoc|catalogname=libwmf_doc|expected-catalogname=libwmfdoc -SPKG_DESC_CSWlibwmfdoc += Library and tools for manipulating Windows metafiles - documentation -PKGFILES_CSWlibwmfdoc = $(sharedstatedir)/doc/.* -ARCHALL_CSWlibwmfdoc = 1 +PACKAGES += CSWwmf-fonts +SPKG_DESC_CSWwmf-fonts += Windows metafile fonts +PKGFILES_CSWwmf-fonts = $(sharedstatedir)/libwmf/fonts/.* +ARCHALL_CSWwmf-fonts = 1 +OBSOLETED_BY_CSWwmf-fonts += CSWwmffonts +CATALOGNAME_CSWwmffonts = wmf_fonts_stub -PACKAGES += CSWwmffonts -CATALOGNAME_CSWwmffonts = wmf_fonts -# This is a legacy name -CHECKPKG_OVERRIDES_CSWwmffonts += catalogname-does-not-match-pkgname|pkgname=CSWwmffonts|catalogname=wmf_fonts|expected-catalogname=wmffonts -SPKG_DESC_CSWwmffonts += Library and tools for manipulating Windows metafiles - fonts -PKGFILES_CSWwmffonts = $(sharedstatedir)/libwmf/fonts/.* -ARCHALL_CSWwmffonts = 1 - -PACKAGES += CSWlibwmfgtk -CATALOGNAME_CSWlibwmfgtk = libwmf_gtk -# This is a legacy package name -CHECKPKG_OVERRIDES_CSWlibwmfgtk += catalogname-does-not-match-pkgname|pkgname=CSWlibwmfgtk|catalogname=libwmf_gtk|expected-catalogname=libwmfgtk -SPKG_DESC_CSWlibwmfgtk += Library and tools for manipulating Windows metafiles - GTK loader -PKGFILES_CSWlibwmfgtk = $(libdir).*/io-wmf.so -RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWlibwmf0-2-7 -RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWlibwmflite0-2-7 +PACKAGES += CSWlibwmf-gtk +SPKG_DESC_CSWlibwmf-gtk += Library and tools for manipulating Windows metafiles - GTK loader +PKGFILES_CSWlibwmf-gtk = $(libdir).*/io-wmf.so +RUNTIME_DEP_PKGS_CSWlibwmf-gtk += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwmf-gtk += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibwmf-gtk += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibwmf-gtk += CSWlibwmf0-2-7 +RUNTIME_DEP_PKGS_CSWlibwmf-gtk += CSWlibwmflite0-2-7 BUILD_DEP_PKGS += CSWgtk2devel +OBSOLETED_BY_CSWlibwmf-gtk += CSWlibwmfgtk +CATALOGNAME_CSWlibwmfgtk = libwmf_gtk_stub # This *must* be the same as in the GD package CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Oct 27 22:59:35 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 20:59:35 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[582] twitter/sweets/template.feed Message-ID: Revision: 582 http://opencsw.svn.sourceforge.net/opencsw/?rev=582&view=rev Author: skayser Date: 2011-10-27 20:59:35 +0000 (Thu, 27 Oct 2011) Log Message: ----------- twitter/sweets: fix ATOM template Modified Paths: -------------- twitter/sweets/template.feed Modified: twitter/sweets/template.feed =================================================================== --- twitter/sweets/template.feed 2011-10-27 19:07:30 UTC (rev 581) +++ twitter/sweets/template.feed 2011-10-27 20:59:35 UTC (rev 582) @@ -3,14 +3,13 @@ import platform myuser = getpass.getuser() mynode = platform.node() -%> - +%> Twitter search results for "${query}" tag:opencsw.org,2011-10-27:sweets:${query} - ${myuser}@${mynode} - ${updated} + ${myuser}@${mynode} + ${updated}Z sweets2feed.py @@ -18,11 +17,10 @@ %for item in items: ${item['title']} - ${item['url']} + ${item['url']} ${item['updated']} - - + %endfor This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Oct 27 23:01:16 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 21:01:16 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[583] twitter/sweets/sweets.py Message-ID: Revision: 583 http://opencsw.svn.sourceforge.net/opencsw/?rev=583&view=rev Author: skayser Date: 2011-10-27 21:01:16 +0000 (Thu, 27 Oct 2011) Log Message: ----------- twitter/sweets: only encode stdout output when running interactively Modified Paths: -------------- twitter/sweets/sweets.py Modified: twitter/sweets/sweets.py =================================================================== --- twitter/sweets/sweets.py 2011-10-27 20:59:35 UTC (rev 582) +++ twitter/sweets/sweets.py 2011-10-27 21:01:16 UTC (rev 583) @@ -108,7 +108,8 @@ tweet['from_user'], tweet['id_str'] ) - print msg.encode(sys.stdout.encoding, 'replace') + if os.isatty(1): msg = msg.encode(sys.stdout.encoding, 'replace') + print msg def twitter_search_mock(query="", state=""): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Oct 27 23:28:22 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 21:28:22 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[584] twitter/sweets/sweets2feed.py Message-ID: Revision: 584 http://opencsw.svn.sourceforge.net/opencsw/?rev=584&view=rev Author: skayser Date: 2011-10-27 21:28:22 +0000 (Thu, 27 Oct 2011) Log Message: ----------- twitter/sweets: remove redundant author info from feed item title Modified Paths: -------------- twitter/sweets/sweets2feed.py Modified: twitter/sweets/sweets2feed.py =================================================================== --- twitter/sweets/sweets2feed.py 2011-10-27 21:01:16 UTC (rev 583) +++ twitter/sweets/sweets2feed.py 2011-10-27 21:28:22 UTC (rev 584) @@ -19,7 +19,7 @@ def tweet_to_feeditem(tweet): """Convert a tweet into a feed item.""" - title = "%s: %s" % (tweet['from_user'], tweet['text']) + title = tweet['text']) url = "http://twitter.com/#!/%s/status/%s" % ( tweet['from_user'], tweet['id_str']) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Oct 27 23:56:21 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 27 Oct 2011 21:56:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[16025] csw/mgar/pkg Message-ID: Revision: 16025 http://gar.svn.sourceforge.net/gar/?rev=16025&view=rev Author: skayser Date: 2011-10-27 21:56:21 +0000 (Thu, 27 Oct 2011) Log Message: ----------- monit/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/monit/ csw/mgar/pkg/monit/Makefile csw/mgar/pkg/monit/branches/ csw/mgar/pkg/monit/tags/ csw/mgar/pkg/monit/trunk/ csw/mgar/pkg/monit/trunk/Makefile csw/mgar/pkg/monit/trunk/checksums csw/mgar/pkg/monit/trunk/files/ Added: csw/mgar/pkg/monit/Makefile =================================================================== --- csw/mgar/pkg/monit/Makefile (rev 0) +++ csw/mgar/pkg/monit/Makefile 2011-10-27 21:56:21 UTC (rev 16025) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/monit/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/monit/trunk/Makefile =================================================================== --- csw/mgar/pkg/monit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/monit/trunk/Makefile 2011-10-27 21:56:21 UTC (rev 16025) @@ -0,0 +1,28 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# ! Early stage recipe, doesn't build yet +# +#gmake[3]: Entering directory `/home/skayser/mgar/pkg/monit/trunk/work/solaris9-sparc/build-isa-sparcv8/monit-5.3.1/libmonit' +#/bin/bash ./libtool --tag=CC --mode=compile /opt/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I./src -I./src -I./src/exceptions -I./src/io -I./src/net -I./src/util -I./src/thread -I/opt/csw/include -I/opt/csw/include -xO3 -m32 -xarch=v8 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64 -mtune=v9 -c -o src/Bootstrap.lo src/Bootstrap.c +#libtool: compile: /opt/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I./src -I./src -I./src/exceptions -I./src/io -I./src/net -I./src/util -I./src/thread -I/opt/csw/include -I/opt/csw/include -xO3 -m32 -xarch=v8 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64 -mtune=v9 -c src/Bootstrap.c -KPIC -DPIC -o src/.libs/Bootstrap.o +#cc: Warning: illegal option -mtune=v9 +#cc: -xarch=v8 is 32-bit only +# +NAME = monit +VERSION = 5.3.1 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Utility for monitoring and managing daemons or similar programs +define BLURB + Long description +endef + +VENDOR_URL = http://mmonit.com/monit/ +MASTER_SITES = http://mmonit.com/monit/dist/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/monit/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/monit/trunk/checksums =================================================================== --- csw/mgar/pkg/monit/trunk/checksums (rev 0) +++ csw/mgar/pkg/monit/trunk/checksums 2011-10-27 21:56:21 UTC (rev 16025) @@ -0,0 +1 @@ +2e97eac9750f68945ca860028d9ef0f3 monit-5.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 28 01:50:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 27 Oct 2011 23:50:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[16026] csw/mgar/pkg/bacula/branches/5.2.0-beta/ Message-ID: Revision: 16026 http://gar.svn.sourceforge.net/gar/?rev=16026&view=rev Author: bdwalton Date: 2011-10-27 23:50:23 +0000 (Thu, 27 Oct 2011) Log Message: ----------- make a 5.2.0 beta branch to test pending release Added Paths: ----------- csw/mgar/pkg/bacula/branches/5.2.0-beta/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 28 02:51:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 28 Oct 2011 00:51:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[16027] csw/mgar/pkg/bacula/branches/5.2.0-beta Message-ID: Revision: 16027 http://gar.svn.sourceforge.net/gar/?rev=16027&view=rev Author: bdwalton Date: 2011-10-28 00:51:52 +0000 (Fri, 28 Oct 2011) Log Message: ----------- bacula/branches/5.2.0-beta: version bump; drop patches that are now included; update build deps and makesums Modified Paths: -------------- csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile csw/mgar/pkg/bacula/branches/5.2.0-beta/checksums Modified: csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile =================================================================== --- csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile 2011-10-27 23:50:23 UTC (rev 16026) +++ csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile 2011-10-28 00:51:52 UTC (rev 16027) @@ -1,6 +1,6 @@ # $Id$ NAME = bacula -VERSION = 5.0.3 +VERSION = 5.2.0 CATEGORIES = apps DESCRIPTION = The Open Source Network Backup Solution @@ -20,12 +20,8 @@ DISTFILES += CSWbacula-fd.postinstall DISTFILES += CSWbacula-console.postinstall DISTFILES += postmsg -PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch -PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch -PATCHFILES += 0003-Make-the-solaris-init-scripts-user-group-aware.patch -PATCHFILES += 0004-Update-man-page-installation-so-we-don-t-get-gzipped.patch -BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel +BUILD_DEP_PKGS = CSWmysql-dev CSWiconv CSWtcpwrap CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev CSWlibcairo-dev PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd Modified: csw/mgar/pkg/bacula/branches/5.2.0-beta/checksums =================================================================== --- csw/mgar/pkg/bacula/branches/5.2.0-beta/checksums 2011-10-27 23:50:23 UTC (rev 16026) +++ csw/mgar/pkg/bacula/branches/5.2.0-beta/checksums 2011-10-28 00:51:52 UTC (rev 16027) @@ -1 +1 @@ -9de254ae39cab0587fdb2f5d8d90b03b bacula-5.0.3.tar.gz +f72ad9ab47acab2bff50553faa40547d bacula-5.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Oct 28 03:54:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 28 Oct 2011 01:54:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[16028] csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile Message-ID: Revision: 16028 http://gar.svn.sourceforge.net/gar/?rev=16028&view=rev Author: bdwalton Date: 2011-10-28 01:54:45 +0000 (Fri, 28 Oct 2011) Log Message: ----------- bacula/branches/5.2.0-beta: update configure args and drop extra linker flags (for now); configure reports supporting both pgsql and mysql!! Modified Paths: -------------- csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile Modified: csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile =================================================================== --- csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile 2011-10-28 00:51:52 UTC (rev 16027) +++ csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile 2011-10-28 01:54:45 UTC (rev 16028) @@ -212,7 +212,8 @@ CONFIGURE_ARGS += --with-python=$(prefix) CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix) CONFIGURE_ARGS += --with-openssl=$(prefix) -CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5 +CONFIGURE_ARGS += --with-mysql=$(prefix) +CONFIGURE_ARGS += --with-postgresql=$(prefix)/postgresql CONFIGURE_ARGS += --with-scriptdir=$(sysconfdir)/scripts CONFIGURE_ARGS += --with-logdir=$(localstatedir)/log/$(NAME) CONFIGURE_ARGS += --with-pid-dir=$(localstatedir)/run @@ -233,7 +234,7 @@ EXTRA_INC += $(includedir)/ncursesw EXTRA_LIB += $(prefix)/lib/ncursesw $(prefix)/mysql5/lib/mysql -EXTRA_LINKER_FLAGS = -norunpath +#EXTRA_LINKER_FLAGS = -norunpath # no tests supplied. TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Fri Oct 28 07:58:30 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Fri, 28 Oct 2011 07:58:30 +0200 Subject: [csw-devel] SF.net SVN: gar:[16012] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: <1319721873-sup-2526@pinkfloyd.chass.utoronto.ca> References: <1319674231-sup-9337@pinkfloyd.chass.utoronto.ca> <20111027075120.GR26160@sebastiankayser.de> <1319721873-sup-2526@pinkfloyd.chass.utoronto.ca> Message-ID: <3D7F140E-2371-4CFF-B757-49DD1033938F@opencsw.org> Hi Ben, Am 27.10.2011 um 15:25 schrieb Ben Walton: > Excerpts from Sebastian Kayser's message of Thu Oct 27 03:51:20 -0400 2011: >> A pyc exlusion for the python category is already in place. It's >> activated by PYCOMPILE=1 [1], located in gar.mk [2] and currently >> limited to: > > So it is. Helpful to read the comments, I guess! :) > > I guess subversion can't really declare itself to be in the python > category though. The manual addition of the excludes in the local > recipe is the way to go. I was thinking that it would be best to move from static categories to mixin-flavors, however, last time I tried it proved pretty hard due to rule ordering and restricting things to the files belonging to the flavored package. Anyway, for now this is the way to go as it also makes a Perl module and can't be in python and cpan categories at the same time. Best regards -- Dago -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dam at opencsw.org Fri Oct 28 08:01:11 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Fri, 28 Oct 2011 08:01:11 +0200 Subject: [csw-devel] SF.net SVN: gar:[16010] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: <23733EC6-1BC7-4CFC-8262-9BBD9B798E22@opencsw.org> Hi Maciej, Am 27.10.2011 um 21:26 schrieb Maciej (Matchek) Blizi?ski: > 2011/10/27 Dagobert Michelsen : >>> swig_pydir_extra=$(libdir)/python/site-packages >> >> It is correct by default, so no need for hinting :-) > > Are you sure Dago? Also, what do you mean by correct? For example, > our /opt/csw/lib/python/site-packages path is wrong, it should be > /opt/csw/lib/python2.6/site-packages. Than it is wrong, I saw the previous path. The way to go is to move the args to build stage instead of install stage. > Subversion could put files into > /opt/csw/lib/python/site-packages, which would be right given our > wrong setup, but wrong according to the Python installation standard. > > I've seen that there are overrides for *.pyc files pointing at wrong paths. But we have lots of packages with that, right? I suggest sparing this for "kiel" and just release svn 1.7.1 with the current pathes. Best regards -- Dago -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dmichelsen at users.sourceforge.net Fri Oct 28 09:23:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 28 Oct 2011 07:23:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[16029] csw/mgar/pkg/libshout/trunk/Makefile Message-ID: Revision: 16029 http://gar.svn.sourceforge.net/gar/?rev=16029&view=rev Author: dmichelsen Date: 2011-10-28 07:23:45 +0000 (Fri, 28 Oct 2011) Log Message: ----------- libshout/trunk: Add vendor url Modified Paths: -------------- csw/mgar/pkg/libshout/trunk/Makefile Modified: csw/mgar/pkg/libshout/trunk/Makefile =================================================================== --- csw/mgar/pkg/libshout/trunk/Makefile 2011-10-28 01:54:45 UTC (rev 16028) +++ csw/mgar/pkg/libshout/trunk/Makefile 2011-10-28 07:23:45 UTC (rev 16029) @@ -9,6 +9,8 @@ MASTER_SITES = http://downloads.us.xiph.org/releases/libshout/ DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://www.icecast.org + PACKAGES += CSWlibshout3 SPKG_DESC_CSWlibshout3 = Icecast library, libshout.so.3 PKGFILES_CSWlibshout3 = $(call pkgfiles_lib,libshout.so.3) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 28 09:45:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 28 Oct 2011 07:45:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[16030] csw/mgar/pkg/libshout/trunk/Makefile Message-ID: Revision: 16030 http://gar.svn.sourceforge.net/gar/?rev=16030&view=rev Author: dmichelsen Date: 2011-10-28 07:45:56 +0000 (Fri, 28 Oct 2011) Log Message: ----------- libshout/trunk: Add build deps Modified Paths: -------------- csw/mgar/pkg/libshout/trunk/Makefile Modified: csw/mgar/pkg/libshout/trunk/Makefile =================================================================== --- csw/mgar/pkg/libshout/trunk/Makefile 2011-10-28 07:23:45 UTC (rev 16029) +++ csw/mgar/pkg/libshout/trunk/Makefile 2011-10-28 07:45:56 UTC (rev 16030) @@ -11,6 +11,10 @@ VENDOR_URL = http://www.icecast.org +BUILD_DEP_PKGS += CSWlibogg-dev +BUILD_DEP_PKGS += CSWlibvorbis-dev +BUILD_DEP_PKGS += CSWlibtheora-dev + PACKAGES += CSWlibshout3 SPKG_DESC_CSWlibshout3 = Icecast library, libshout.so.3 PKGFILES_CSWlibshout3 = $(call pkgfiles_lib,libshout.so.3) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 28 13:07:27 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 28 Oct 2011 11:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[16031] csw/mgar/pkg/libsndfile/trunk Message-ID: Revision: 16031 http://gar.svn.sourceforge.net/gar/?rev=16031&view=rev Author: dmichelsen Date: 2011-10-28 11:07:26 +0000 (Fri, 28 Oct 2011) Log Message: ----------- libsndfile/trunk: Update to 1.0.25, package split, testsuite does not run yet Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile csw/mgar/pkg/libsndfile/trunk/checksums Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2011-10-28 07:45:56 UTC (rev 16030) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2011-10-28 11:07:26 UTC (rev 16031) @@ -3,7 +3,7 @@ # $Id$ NAME = libsndfile -VERSION = 1.0.23 +VERSION = 1.0.25 CATEGORIES = lib DESCRIPTION = C library for reading and writing files containing sampled sound @@ -36,24 +36,34 @@ PATCHFILES += 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch PATCHFILES += 0004-Add-branch-for-inttypes.h.patch -PATCHFILES += 0005-Test-for-unsigned-or-test-will-fail.patch +# PATCHFILES += 0005-Test-for-unsigned-or-test-will-fail.patch -PACKAGES += CSWlibsndfile -CATALOGNAME_CSWlibsndfile = libsndfile -SPKG_DESC_CSWlibsndfile = Tools for reading and writing files containing sampled sound -RUNTIME_DEP_PKGS_CSWlibsndfile += CSWlibogg -RUNTIME_DEP_PKGS_CSWlibsndfile += CSWflac -RUNTIME_DEP_PKGS_CSWlibsndfile += CSWvorbis -RUNTIME_DEP_PKGS_CSWlibsndfile += CSWsqlite3rt -RUNTIME_DEP_PKGS_CSWlibsndfile += CSWlibsndfile1 +VENDOR_URL = http://www.mega-nerd.com/libsndfile/ +BUILD_DEP_PKGS += CSWlibflac-dev +BUILD_DEP_PKGS += CSWlibsqlite3-dev +BUILD_DEP_PKGS += CSWlibogg-dev +BUILD_DEP_PKGS += CSWlibvorbis-dev + +PACKAGES += CSWlibsndfile-utils +CATALOGNAME_CSWlibsndfile-utils = libsndfile_utils +SPKG_DESC_CSWlibsndfile-utils = Tools for reading and writing files containing sampled sound +RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibflac8 +RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibsndfile1 +RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibvorbisenc2 +OBSOLETED_BY_CSWlibsndfile-utils = CSWlibsndfile + PACKAGES += CSWlibsndfile1 CATALOGNAME_CSWlibsndfile1 = libsndfile1 SPKG_DESC_CSWlibsndfile1 = Library for reading and writing files containing sampled sound, libsndfile.so.1 -PKGFILES_CSWlibsndfile1 = $(call baseisadirs,$(libdir),libsndfile\.so\.1(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWlibogg -RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWflac -RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWvorbis +PKGFILES_CSWlibsndfile1 = $(call pkgfiles_lib,libsndfile.so.1) +RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWlibflac8 PACKAGES += CSWlibsndfile-dev CATALOGNAME_CSWlibsndfile-dev = libsndfile_dev @@ -62,24 +72,8 @@ PKGFILES_CSWlibsndfile-dev += $(docdir)/.* RUNTIME_DEP_PKGS_CSWlibsndfile-dev += CSWlibsndfile1 -BUILD_DEP_PKGS += CSWlibogg -BUILD_DEP_PKGS += CSWflac -BUILD_DEP_PKGS += CSWvorbis -BUILD_DEP_PKGS += CSWsqlite3devel - -VENDOR_URL = http://www.mega-nerd.com/libsndfile/ - -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - -# We want only 64 bit libs, no 64 bit executables -MERGE_DIRS_isa-extra = $(libdir) - # Relocate docs to standard location EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(prefix)/share/doc/$(NAME),' Modified: csw/mgar/pkg/libsndfile/trunk/checksums =================================================================== --- csw/mgar/pkg/libsndfile/trunk/checksums 2011-10-28 07:45:56 UTC (rev 16030) +++ csw/mgar/pkg/libsndfile/trunk/checksums 2011-10-28 11:07:26 UTC (rev 16031) @@ -1 +1 @@ -d0e22b5ff2ef945615db33960376d733 libsndfile-1.0.23.tar.gz +e2b7bb637e01022c7d20f95f9c3990a2 libsndfile-1.0.25.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 28 14:29:35 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 28 Oct 2011 12:29:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[16032] csw/mgar/gar Message-ID: Revision: 16032 http://gar.svn.sourceforge.net/gar/?rev=16032&view=rev Author: dmichelsen Date: 2011-10-28 12:29:35 +0000 (Fri, 28 Oct 2011) Log Message: ----------- Make branch v2-build64only Modified Paths: -------------- csw/mgar/gar/v2-build64only/gar.conf.mk Added Paths: ----------- csw/mgar/gar/v2-build64only/ csw/mgar/gar/v2-build64only/lib/python/package_checks.py Removed Paths: ------------- csw/mgar/gar/v2-build64only/lib/python/package_checks.py Modified: csw/mgar/gar/v2-build64only/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-10-27 07:32:35 UTC (rev 16014) +++ csw/mgar/gar/v2-build64only/gar.conf.mk 2011-10-28 12:29:35 UTC (rev 16032) @@ -445,6 +445,9 @@ endif @$(MAKECOOKIE) +# BUILD64_ONLY means just build 64 bit and use isaexec for the binaries +$(if $(BUILD64_ONLY),$(eval ISAEXEC=1) $(eval BUILD64=1)) + # The package will be built for these architectures # We check automatically what can be build on this kernel architecture # REQUESTED_ISAS contains all ISAs that should be built @@ -452,7 +455,7 @@ # BUILD_ISAS contains all ISAs that can be built on the current kernel # It is guaranteed that all BUILD_ISAS come first in NEEDED_ISAS # Set 'BUILD64 = 1' to build 64 bit versions automatically -REQUESTED_ISAS ?= $(strip $(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(BUILD64),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)) +REQUESTED_ISAS ?= $(strip $(foreach A,$(GARCHLIST),$(if $(BUILD64_ONLY),,$(ISA_DEFAULT_$A)) $(if $(BUILD64),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)) NEEDED_ISAS ?= $(strip $(filter $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \ $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS)))) BUILD_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(NEEDED_ISAS)) Deleted: csw/mgar/gar/v2-build64only/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-10-27 07:32:35 UTC (rev 16014) +++ csw/mgar/gar/v2-build64only/lib/python/package_checks.py 2011-10-28 12:29:35 UTC (rev 16032) @@ -1,1377 +0,0 @@ -# $Id$ -# -# Package checking functions. They come in two flavors: -# - individual package checks -# - set checks -# -# Individual checks need to be named "Check", while set checks are named -# "SetCheck". -# -# def CheckSomething(pkg_data, error_mgr, logger, messenger): -# logger.debug("Checking something.") -# error_mgr.ReportError("something-is-wrong") -# -# TODO(maciej): In general, the development package should depend on all the libraries. -# TODO(maciej): If foo.so links to foo.so.1, the devel package should depend on -# the library package. - -import copy -import re -import operator -import os -import checkpkg -import opencsw -import pprint -import textwrap -import dependency_checks as depchecks -import configuration as c -import sharedlib_utils as su -import struct_util -from Cheetah import Template -import common_constants -import logging - -PATHS_ALLOWED_ONLY_IN = { - # Leading slash must be removed. - # Using strings where possible for performance. - "CSWcommon": {"string": [ - r"opt", - r"opt/csw/man", - r"opt/csw/doc", - r"opt/csw/info", - r"opt/csw/share/locale/locale.alias", - ], - "regex": [r"opt/csw/man/.*"]}, - "CSWiconv": {"string": [r"opt/csw/lib/charset.alias"]}, - "CSWtexinfo": {"string": [r"opt/csw/share/info/dir"]}, -} -MAX_DESCRIPTION_LENGTH = 100 -LICENSE_TMPL = "/opt/csw/share/doc/%s/license" -OBSOLETE_DEPS = { - # "CSWfoo": { - # "hint": "Do this...", - # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." - # }, - "CSWpython-rt": { - "hint": "CSWpython-rt is deprecated, use CSWpython instead.", - "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" - }, - "CSWlibcups": { - "hint": "CSWlibcups is deprecated, please depend on specific " - "shared library packages.", - "url": "http://wiki.opencsw.org/packaging-shared-libraries", - }, - "CSWcswclassutils": { - "hint": "CSWcswclassutils is deprecated, please depend on specific " - "CSWcas-* packages.", - "url": ("http://lists.opencsw.org/pipermail/maintainers/" - "2010-October/012862.html"), - }, -} -ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") -EMAIL_RE = re.compile(r"^.*@opencsw.org$") -MAX_CATALOGNAME_LENGTH = 29 -MAX_PKGNAME_LENGTH = 32 -ARCH_LIST = common_constants.ARCHITECTURES -VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" -# Pkgnames matching these regexes must not be ARCHALL = 1 -ARCH_SPECIFIC_PKGNAMES_RE_LIST = [ - re.compile(r".*dev(el)?$"), -] - -DISCOURAGED_FILE_PATTERNS = ( - (r"\.py[co]$", ("Python compiled files are supposed to be compiled using" - "the cswpycompile class action script. For more " - "information, see " - "http://wiki.opencsw.org/cswclassutils-package")), - (r"/lib\w+\.l?a$", "Static libraries aren't necessary on Solaris."), - (r"opt/csw/var($|/)", ("The /opt/csw/var directory is not writable on " - "sparse non-global zones. " - "Please use /var/opt/csw instead.")), - (r"\.git", ("Git files in most cases shouldn't be included in " - "a package.")), - (r"\.CVS", ("CVS files in most cases shouldn't be included in " - "a package.")), -) -RPATH_PARTS = { - 'prefix': r"(?P/opt/csw)", - 'prefix_extra': r"(?P(/(?!lib)[\w-]+)*)", - 'subdirs': r"(?P(/(?!-R)[\w\-\.]+)*)", - 'isalist': r"(?P/(\$ISALIST|64))", - 'subdir2': r"(?P/[\w\-\.]+)", -} -RPATH_WHITELIST = [ - (r"^" - r"%(prefix)s" - r"%(prefix_extra)s" - r"/(lib|libexec)" - r"%(subdirs)s" - r"%(isalist)s?" - r"%(subdir2)s?" - r"$") % RPATH_PARTS, - r"^\$ORIGIN$", - r"^\$ORIGIN/..$", - r"^/usr(/(ccs|dt|openwin))?/lib(/(sparcv9|amd64|64))?$", -] -# Check ldd -r only for Perl modules -SYMBOLS_CHECK_ONLY_FOR = r"^CSWpm.*$" - -# Valid URLs in the VENDOR field in pkginfo -VENDORURL_RE = r"^(http|ftp)s?\://.+\..+$" - -# Settings for binary placements: which architectures can live in which -# directories. -BASE_BINARY_PATHS = ('bin', 'sbin', 'lib', 'libexec', 'cgi-bin') -HACHOIR_MACHINES = { - # id: (name, allowed_paths, disallowed_paths) - -1: {"name": "Unknown", - "allowed": { - common_constants.OS_REL_58: (), - common_constants.OS_REL_59: (), - common_constants.OS_REL_510: (), - common_constants.OS_REL_511: (), - }, "disallowed": (), - "type": "unknown"}, - 2: {"name": "sparcv8", - "type": common_constants.ARCH_SPARC, - "allowed": { - common_constants.OS_REL_58: BASE_BINARY_PATHS + su.SPARCV8_PATHS, - common_constants.OS_REL_59: BASE_BINARY_PATHS + su.SPARCV8_PATHS, - common_constants.OS_REL_510: BASE_BINARY_PATHS + su.SPARCV8_PATHS, - common_constants.OS_REL_511: BASE_BINARY_PATHS + su.SPARCV8_PATHS, - }, - "disallowed": su.SPARCV9_PATHS + su.INTEL_386_PATHS + su.AMD64_PATHS, - }, - # pentium_pro binaries are also identified as 3. - 3: {"name": "i386", - "type": common_constants.ARCH_i386, - "allowed": { - common_constants.OS_REL_58: BASE_BINARY_PATHS + su.INTEL_386_PATHS, - common_constants.OS_REL_59: BASE_BINARY_PATHS + su.INTEL_386_PATHS, - common_constants.OS_REL_510: BASE_BINARY_PATHS + su.INTEL_386_PATHS, - common_constants.OS_REL_511: BASE_BINARY_PATHS + su.INTEL_386_PATHS, - }, - "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + - su.SPARCV9_PATHS + su.AMD64_PATHS, - }, - 6: {"name": "i486", - "type": common_constants.ARCH_i386, - "allowed": { - common_constants.OS_REL_58: su.INTEL_386_PATHS, - common_constants.OS_REL_59: su.INTEL_386_PATHS, - common_constants.OS_REL_510: su.INTEL_386_PATHS, - common_constants.OS_REL_511: su.INTEL_386_PATHS, - }, - "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + - su.SPARCV9_PATHS + su.AMD64_PATHS, - }, - 18: {"name": "sparcv8+", - "type": common_constants.ARCH_SPARC, - "allowed": { - common_constants.OS_REL_58: su.SPARCV8PLUS_PATHS, - common_constants.OS_REL_59: su.SPARCV8PLUS_PATHS, - # We allow sparcv8+ as the base architecture on Solaris 10+. - common_constants.OS_REL_510: BASE_BINARY_PATHS + su.SPARCV8PLUS_PATHS, - common_constants.OS_REL_511: BASE_BINARY_PATHS + su.SPARCV8PLUS_PATHS, - }, - "disallowed": su.SPARCV8_PATHS + su.SPARCV9_PATHS + - su.AMD64_PATHS + su.INTEL_386_PATHS, - }, - 43: {"name": "sparcv9", - "type": common_constants.ARCH_SPARC, - "allowed": { - common_constants.OS_REL_58: su.SPARCV9_PATHS, - common_constants.OS_REL_59: su.SPARCV9_PATHS, - common_constants.OS_REL_510: su.SPARCV9_PATHS, - common_constants.OS_REL_511: su.SPARCV9_PATHS, - }, - "disallowed": su.INTEL_386_PATHS + su.AMD64_PATHS, - }, - 62: {"name": "amd64", - "type": common_constants.ARCH_i386, - "allowed": { - common_constants.OS_REL_58: su.AMD64_PATHS, - common_constants.OS_REL_59: su.AMD64_PATHS, - common_constants.OS_REL_510: su.AMD64_PATHS, - common_constants.OS_REL_511: su.AMD64_PATHS, - }, - "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + - su.SPARCV9_PATHS, - }, -} - - -ALLOWED_STARTING_PATHS = frozenset([ - "/opt/csw", - "/etc/opt/csw", - "/var/opt/csw", -]) - - -def RemovePackagesUnderInstallation(paths_and_pkgs_by_soname, - pkgs_to_be_installed): - """Emulates uninstallation of packages prior to installation - of the new ones. - {'libfoo.so.1': {u'/opt/csw/lib': [u'CSWlibfoo']}} - """ - # for brevity - ptbi = set(pkgs_to_be_installed) - ppbs = paths_and_pkgs_by_soname - new_ppbs = {} - for soname in ppbs: - if soname not in new_ppbs: - new_ppbs[soname] = {} - for binary_path in ppbs[soname]: - for pkgname in ppbs[soname][binary_path]: - if pkgname not in ptbi: - if binary_path not in new_ppbs[soname]: - new_ppbs[soname][binary_path] = [] - new_ppbs[soname][binary_path].append(pkgname) - return new_ppbs - - -def CheckDirectoryPermissions(pkg_data, error_mgr, logger, messenger): - for entry in pkg_data["pkgmap"]: - if (entry["type"] == "d" - and - entry["mode"] != "?" - and - entry["mode"][1] == "6"): - error_mgr.ReportError("executable-bit-missing-on-a-directory", - entry["path"]) - - -def CheckNonCswPathsDirectoryPerms(pkg_data, error_mgr, logger, messenger): - for entry in pkg_data["pkgmap"]: - if entry["user"] == "?" or entry["group"] == "?" or entry["mode"] == "?": - if entry["path"].startswith("/opt/csw"): - error_mgr.ReportError("pkgmap-question-mark-perms-in-opt-csw", entry["path"]) - - -def CheckPerlLocal(pkg_data, error_mgr, logger, messenger): - perllocal_re = re.compile(r'/perllocal.pod') - for entry in pkg_data["pkgmap"]: - if entry["path"]: - if re.search(perllocal_re, entry["path"]): - error_mgr.ReportError("perllocal-pod-in-pkgmap", entry["path"]) - -def CheckGzippedManpages(pkg_data, error_mgr, logger, messenger): - gzipman_re = re.compile(r'share/man/man.*/.*\.gz$') - for entry in pkg_data["pkgmap"]: - if entry["path"]: - if re.search(gzipman_re, entry["path"]): - error_mgr.ReportError( - 'gzipped-manpage-in-pkgmap', entry["path"], - "Solaris' man cannot automatically inflate man pages. " - "Solution: man page should be gunzipped.") - -def CheckMultipleDepends(pkg_data, error_mgr, logger, messenger): - new_depends = set() - for pkgname, desc in pkg_data["depends"]: - if pkgname in new_depends: - error_mgr.ReportError("dependency-listed-more-than-once", pkgname) - new_depends.add(pkgname) - - -def CheckDescription(pkg_data, error_mgr, logger, messenger): - pkginfo = pkg_data["pkginfo"] - desc = checkpkg.ExtractDescription(pkginfo) - if not desc: - error_mgr.ReportError("pkginfo-description-missing") - else: - if len(desc) > MAX_DESCRIPTION_LENGTH: - error_mgr.ReportError("pkginfo-description-too-long", "length=%s" % len(desc)) - if not desc[0].isupper(): - error_mgr.ReportError("pkginfo-description-not-starting-with-uppercase", - desc) - - -def CheckVendorURL(pkg_data, error_mgr, logger, messenger): - vendorurl = c.WS_RE.split(pkg_data["pkginfo"]["VENDOR"])[0] - if not re.match(VENDORURL_RE, vendorurl): - error_mgr.ReportError("pkginfo-bad-vendorurl", vendorurl, - "Solution: add VENDOR_URL to GAR Recipe") - - -def CheckCatalogname(pkg_data, error_mgr, logger, messenger): - pkginfo = pkg_data["pkginfo"] - catalogname = pkginfo["NAME"].split(" ")[0] - catalogname_2 = pkg_data["basic_stats"]["catalogname"] - if catalogname != catalogname_2: - error_mgr.ReportError("pkginfo-catalogname-disagreement pkginfo=%s filename=%s" - % (catalogname, catalogname_2)) - catalogname_re = r"^([\w\+]+)$" - if not re.match(catalogname_re, catalogname): - error_mgr.ReportError("pkginfo-bad-catalogname", catalogname) - if catalogname != catalogname.lower(): - error_mgr.ReportError("catalogname-not-lowercase") - - -def CheckSmfIntegration(pkg_data, error_mgr, logger, messenger): - init_re = re.compile(r"/init\.d/") - for entry in pkg_data["pkgmap"]: - if not entry["path"]: - continue - if not re.search(init_re, entry["path"]): - continue - if entry["class"] != "cswinitsmf": - error_mgr.ReportError( - "init-file-missing-cswinitsmf-class", - "%s class=%s" % (entry["path"], entry["class"])) - messenger.Message( - "The init file %s in the package has the %s class, while it " - "should have the cswinitsmf class, which takes advantage of " - "the SMF integration automation from cswclassutils." - % (entry["path"], entry["class"])) - messenger.SuggestGarLine("INITSMF = %s" % entry["path"]) - - # This is not an error, in fact, putting files into - # /opt/csw/etc/init.d breaks packages. - - if "/opt/csw/etc/init.d" in entry["path"]: - messenger.Message("Init files under /opt result in broken packages, " - "see http://lists.opencsw.org/pipermail/maintainers/" - "2010-June/012145.html") - error_mgr.ReportError( - "init-file-wrong-location", - entry["path"]) - - -def SetCheckLibraries(pkgs_data, error_mgr, logger, messenger): - """Second version of the library checking code. - - 1. Collect all the needed data from the FS: - {"": {"/path/1": ["CSWfoo1"], "/path/2": ["CSWfoo2"]}} - 1.1. find all needed sonames - 1.2. get all the data for needed sonames - 2. Construct an overlay by applying data from the package set - 3. For each binary - 3.1. Resolve all NEEDED sonames - """ - needed_sonames = [] - pkgs_to_be_installed = [x["basic_stats"]["pkgname"] for x in pkgs_data] - paths_to_verify = set() - pkg_by_path = {} - logger.debug("Building needed_sonames, paths_to_verify and pkg_by_path...") - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - for binary_info in pkg_data["binaries_dump_info"]: - needed_sonames.extend(binary_info["needed sonames"]) - # Creating an index of packages by path - for pkgmap_entry in pkg_data["pkgmap"]: - if "path" in pkgmap_entry and pkgmap_entry["path"]: - base_dir, basename = os.path.split(pkgmap_entry["path"]) - paths_to_verify.add(base_dir) - paths_to_verify.add(pkgmap_entry["path"]) - if pkgmap_entry["path"] not in pkg_by_path: - pkg_by_path[pkgmap_entry["path"]] = [] - pkg_by_path[pkgmap_entry["path"]].append(pkgname) - needed_sonames = sorted(set(needed_sonames)) - # Finding candidate libraries from the filesystem (/var/sadm/install/contents) - path_and_pkg_by_basename = depchecks.GetPathAndPkgByBasename( - error_mgr, logger, needed_sonames) - # Removing files from packages that are to be installed. - path_and_pkg_by_basename = RemovePackagesUnderInstallation( - path_and_pkg_by_basename, pkgs_to_be_installed) - # Populating the mapping using data from the local packages. The call to - # GetPkgByFullPath will complete the mapping using data from the filesystem. - pkg_by_path = depchecks.GetPkgByFullPath( - error_mgr, logger, paths_to_verify, pkg_by_path) - # Adding overlay based on the given package set - # Considering files from the set under examination. - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - # Processing the whole pkgmap. There yet no verification whether the files - # that are put in here are actually shared libraries, or symlinks to shared - # libraries. Implementing symlink resolution would be a nice bonus. - for pkgmap_entry in pkg_data["pkgmap"]: - if "path" not in pkgmap_entry: continue - if not pkgmap_entry["path"]: continue - binary_path, basename = os.path.split(pkgmap_entry["path"]) - if not binary_path.startswith('/'): - binary_path = "/" + binary_path - path_and_pkg_by_basename.setdefault(basename, {}) - path_and_pkg_by_basename[basename][binary_path] = [pkgname] - # Resolving sonames for each binary - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - declared_deps = frozenset(x[0] for x in pkg_data["depends"]) - check_args = (pkg_data, error_mgr, logger, messenger, - path_and_pkg_by_basename, pkg_by_path) - depchecks.Libraries(*check_args) - depchecks.ByFilename(*check_args) - # This test needs more work, or potentially, architectural changes. - # by_directory_reasons = ByDirectory(*check_args) - # req_pkgs_reasons.extend(by_directory_reasons) - - -def SetCheckDependencies(pkgs_data, error_mgr, logger, messenger): - """Dependencies must be either installed in the system, or in the set.""" - known_pkgs = set(error_mgr.GetInstalledPackages()) - pkgs_under_check = [x["basic_stats"]["pkgname"] for x in pkgs_data] - for pkgname in pkgs_under_check: - known_pkgs.add(pkgname) - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - for depname, dep_desc in pkg_data["depends"]: - if depname not in known_pkgs: - error_mgr.ReportError(pkgname, "unidentified-dependency", depname) - - -def CheckDependsOnSelf(pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - for depname, dep_desc in pkg_data["depends"]: - if depname == pkgname: - error_mgr.ReportError("depends-on-self") - - -def CheckArchitectureSanity(pkg_data, error_mgr, logger, messenger): - basic_stats = pkg_data["basic_stats"] - pkgname = basic_stats["pkgname"] - pkginfo = pkg_data["pkginfo"] - filename = basic_stats["pkg_basename"] - arch = pkginfo["ARCH"] - filename_re = r"-%s-" % arch - if not re.search(filename_re, filename): - error_mgr.ReportError("srv4-filename-architecture-mismatch", - "pkginfo=%s filename=%s" % (arch, filename)) - - -def CheckActionClasses(pkg_data, error_mgr, logger, messenger): - """Checks the consistency between classes in the prototype and pkginfo.""" - pkginfo = pkg_data["pkginfo"] - pkgmap = pkg_data["pkgmap"] - if "CLASSES" not in pkginfo: - return - pkginfo_classes = set(re.split(c.WS_RE, pkginfo["CLASSES"])) - pkgmap_classes = set() - for entry in pkgmap: - if entry["class"]: # might be None - pkgmap_classes.add(entry["class"]) - only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) - only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) - for action_class in only_in_pkginfo: - error_mgr.ReportError("action-class-only-in-pkginfo", action_class) - for action_class in only_in_pkgmap: - error_mgr.ReportError("action-class-only-in-pkgmap", action_class) - - -def CheckLicenseFile(pkg_data, error_mgr, logger, messenger): - """Checks for the presence of the license file.""" - # TODO: Write a unit test - pkgmap = pkg_data["pkgmap"] - catalogname = pkg_data["basic_stats"]["catalogname"] - license_path = LICENSE_TMPL % catalogname - pkgmap_paths = [x["path"] for x in pkgmap] - if license_path not in pkgmap_paths: - messenger.Message("The license file needs to be placed " - "at %s. Also see " - "http://sourceforge.net/apps/trac/gar/wiki/CopyRight" - % license_path) - error_mgr.ReportError( - "license-missing", license_path, - "See http://sourceforge.net/apps/trac/gar/wiki/CopyRight") - - -def CheckObsoleteDeps(pkg_data, error_mgr, logger, messenger): - """Checks for obsolete dependencies.""" - deps = frozenset([x for x, y in pkg_data["depends"]]) - obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) - if obsolete_pkg_deps: - for obsolete_pkg in obsolete_pkg_deps: - error_mgr.ReportError("obsolete-dependency", obsolete_pkg) - msg = "" - if "hint" in OBSOLETE_DEPS[obsolete_pkg]: - msg += "Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"] - if "url" in OBSOLETE_DEPS[obsolete_pkg]: - if msg: - msg += ", " - msg += "URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"] - if not msg: - msg = None - messenger.Message(msg) - - -def CheckArchitectureVsContents(pkg_data, error_mgr, logger, messenger): - """Verifies the relationship between package contents and architecture.""" - binaries = pkg_data["binaries"] - pkginfo = pkg_data["pkginfo"] - pkgmap = pkg_data["pkgmap"] - arch = pkginfo["ARCH"] - pkgname = pkg_data["basic_stats"]["pkgname"] - reasons_to_be_arch_specific = [] - pkgmap_paths = [x["path"] for x in pkgmap] - for pkgmap_path in pkgmap_paths: - if re.search(ARCH_RE, str(pkgmap_path)): - reasons_to_be_arch_specific.append(( - "archall-with-arch-paths", - pkgmap_path, - "path %s looks arch-specific" % pkgmap_path)) - for binary in binaries: - reasons_to_be_arch_specific.append(( - "archall-with-binaries", - binary, - "package contains binary %s" % binary)) - for pkgname_re in ARCH_SPECIFIC_PKGNAMES_RE_LIST: - if pkgname_re.match(pkgname): - reasons_to_be_arch_specific.append(( - "archall-devel-package", None, None)) - if arch == "all": - for tag, param, desc in reasons_to_be_arch_specific: - error_mgr.ReportError(tag, param, desc) - elif not reasons_to_be_arch_specific: - messenger.Message("Package %s does not contain any binaries. " - "Consider making it ARCHALL = 1 instead of %s. " - "However, be aware that there might be other reasons " - "to keep it architecture-specific." - % (pkgname, arch)) - messenger.SuggestGarLine("ARCHALL_%s = 1" % pkgname) - - -# TODO: Verify that architecture type of binaries matches the actual binaries. -# Correlate architecture type from files_metadata and HACHOIR_MACHINES with -# pkginfo. - - -def CheckFileNameSanity(pkg_data, error_mgr, logger, messenger): - basic_stats = pkg_data["basic_stats"] - revision_info = basic_stats["parsed_basename"]["revision_info"] - catalogname = pkg_data["basic_stats"]["catalogname"] - pkgname = pkg_data["basic_stats"]["pkgname"] - if "REV" not in revision_info: - error_mgr.ReportError("rev-tag-missing-in-filename") - if len(catalogname) > MAX_CATALOGNAME_LENGTH: - error_mgr.ReportError("catalogname-too-long") - if len(pkgname) > MAX_PKGNAME_LENGTH: - error_mgr.ReportError("pkgname-too-long") - if basic_stats["parsed_basename"]["osrel"] == "unspecified": - error_mgr.ReportError("osrel-tag-not-specified") - - -def CheckPkginfoSanity(pkg_data, error_mgr, logger, messenger): - """pkginfo sanity checks. - -if [ "$maintname" = "" ] ; then - # the old format, in the DESC field - maintname=`sed -n 's/^DESC=.*for CSW by //p' $TMPFILE` - - # Since the DESC field has been coopted, take - # description from second half of NAME field now. - desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` -else - if [ "$desc" = "" ] ; then - desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` - fi -fi - -software=`sed -n 's/^NAME=\([^ -]*\) -.*$/\1/p' $TMPFILE` -version=`sed -n 's/^VERSION=//p' $TMPFILE` -desc=`sed -n 's/^DESC=//p' $TMPFILE` -email=`sed -n 's/^EMAIL=//p' $TMPFILE` -maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` -hotline=`sed -n 's/^HOTLINE=//p' $TMPFILE` -basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` -pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` - -if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi -if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi -if [ "$desc" = "" ] ; then errmsg $f: no description in either NAME or DESC field ; fi -if [ ${#desc} -gt 100 ] ; then errmsg $f: description greater than 100 chars ; fi -if [ "$version" = "" ] ; then errmsg $f: VERSION field blank ; fi -if [ "$maintname" = "" ] ; then errmsg $f: maintainer name not detected. Fill out VENDOR field properly ; fi -if [ "$email" = "" ] ; then errmsg $f: EMAIL field blank ; fi -if [ "$hotline" = "" ] ; then errmsg $f: HOTLINE field blank ; fi - """ - catalogname = pkg_data["basic_stats"]["catalogname"] - pkgname = pkg_data["basic_stats"]["pkgname"] - pkginfo = pkg_data["pkginfo"] - # PKG, NAME, ARCH, VERSION and CATEGORY - for parameter in ("PKG", "NAME", "ARCH", "VERSION", "CATEGORY"): - if parameter not in pkginfo: - error_mgr.ReportError("pkginfo-missing-parameter", parameter) - if not catalogname: - error_mgr.ReportError("pkginfo-empty-catalogname") - if not pkgname: - error_mgr.ReportError("pkginfo-empty-pkgname") - if not "VERSION" in pkginfo or not pkginfo["VERSION"]: - error_mgr.ReportError("pkginfo-version-field-missing") - # maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` - maintname = checkpkg.ExtractMaintainerName(pkginfo) - if not maintname: - error_mgr.ReportError("pkginfo-maintainer-name-not-set") - # email - if not pkginfo["EMAIL"]: - error_mgr.ReportError("pkginfo-email-blank") - # hotline - if not pkginfo["HOTLINE"]: - error_mgr.ReportError("pkginfo-hotline-blank") - pkginfo_version = pkg_data["basic_stats"]["parsed_basename"]["full_version_string"] - if pkginfo_version != pkginfo["VERSION"]: - error_mgr.ReportError("filename-version-does-not-match-pkginfo-version", - "filename=%s pkginfo=%s" - % (pkginfo_version, pkginfo["VERSION"])) - if re.search(r"-", pkginfo["VERSION"]): - error_mgr.ReportError("pkginfo-minus-in-version", pkginfo["VERSION"]) - if not re.match(VERSION_RE, pkginfo["VERSION"]): - msg = "Should match %s" % VERSION_RE - error_mgr.ReportError("pkginfo-version-wrong-format", - pkginfo["VERSION"], - msg) - if pkginfo["ARCH"] not in ARCH_LIST: - error_mgr.ReportError( - "pkginfo-nonstandard-architecture", - pkginfo["ARCH"], - "known architectures: %s" % ARCH_LIST) - - -def CheckEmail(pkg_data, error_mgr, logger, messenger): - """Checks the e-mail address.""" - catalogname = pkg_data["basic_stats"]["catalogname"] - pkgname = pkg_data["basic_stats"]["pkgname"] - pkginfo = pkg_data["pkginfo"] - if not re.match(EMAIL_RE, pkginfo["EMAIL"]): - error_mgr.ReportError("pkginfo-email-not-opencsw-org", - "email=%s" % pkginfo["EMAIL"]) - - -def CheckPstamp(pkg_data, error_mgr, logger, messenger): - pkginfo = pkg_data["pkginfo"] - if "PSTAMP" in pkginfo: - if not re.match(common_constants.PSTAMP_RE, pkginfo["PSTAMP"]): - msg=("It should be 'username at hostname-timestamp', " - "but it's %s." % repr(pkginfo["PSTAMP"])) - error_mgr.ReportError("pkginfo-pstamp-in-wrong-format", pkginfo["PSTAMP"], msg) - else: - error_mgr.ReportError("pkginfo-pstamp-missing") - - -def DisabledCheckMissingSymbols(pkgs_data, error_mgr, logger, messenger): - """Analyzes missing symbols reported by ldd -r. - - 1. Collect triplets: pkgname, binary, missing symbol - 2. If there are any missing symbols, collect all the symbols that are provided - by the set of packages. - 3. From the list of missing symbols, remove all symbols that are provided - by the set of packages. - 4. Report any remaining symbols as errors. - - What indexes do we need? - - symbol -> (pkgname, binary) - set(allsymbols) - """ - missing_symbols = [] - all_symbols = set() - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - binaries = pkg_data["binaries"] - for binary in binaries: - for ldd_elem in pkg_data["ldd_dash_r"][binary]: - if ldd_elem["state"] == "symbol-not-found": - missing_symbols.append((pkgname, - binary, - ldd_elem["symbol"])) - for symbol in pkg_data["defined_symbols"][binary]: - all_symbols.add(symbol) - # Remove symbols defined elsewhere. - while missing_symbols: - ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() - if ms_symbol not in all_symbols: - error_mgr.ReportError("symbol-not-found", "%s %s" % (ms_binary, ms_symbol)) - - -def CheckBuildingUser(pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - username = checkpkg.ExtractBuildUsername(pkg_data["pkginfo"]) - for entry in pkg_data["pkgmap"]: - if entry["user"] and entry["user"] == username: - error_mgr.ReportError("file-owned-by-building-user" - "%s, %s" % (entry["path"], entry["user"])) - - -def CheckDisallowedPaths(pkg_data, error_mgr, logger, messenger): - """Checks for disallowed paths, such as common paths.""" - arch = pkg_data["pkginfo"]["ARCH"] - # Common paths read from the file are absolute, e.g. /opt/csw/lib - # while paths in pkginfo are relative, e.g. opt/csw/lib. - common_paths = [] - for common_path in error_mgr.GetCommonPaths(arch): - if common_path.startswith("/"): - common_path = common_path[1:] - common_paths.append(common_path) - paths_only_allowed_in = copy.copy(PATHS_ALLOWED_ONLY_IN) - ss = paths_only_allowed_in["CSWcommon"]["string"] - paths_only_allowed_in["CSWcommon"]["string"] = set(ss).union(common_paths) - # Compile all the regex expressions ahead of time. - for pkgname in paths_only_allowed_in: - if "regex" in paths_only_allowed_in[pkgname]: - regexes = paths_only_allowed_in[pkgname]["regex"] - paths_only_allowed_in[pkgname]["regex"] = map(re.compile, regexes) - if "string" in paths_only_allowed_in[pkgname]: - paths_only_allowed_in[pkgname]["string"] = set( - paths_only_allowed_in[pkgname]["string"]) - paths_in_pkg = set() - for entry in pkg_data["pkgmap"]: - entry_path = entry["path"] - if not entry_path: - continue - if entry_path.startswith("/"): - entry_path = entry_path[1:] - paths_in_pkg.add(entry_path) - for pkgname in paths_only_allowed_in: - if pkgname != pkg_data["basic_stats"]["pkgname"]: - if "string" in paths_only_allowed_in[pkgname]: - ss = paths_only_allowed_in[pkgname]["string"] - intersection = ss.intersection(paths_in_pkg) - for path_in_pkg in intersection: - error_mgr.ReportError( - "disallowed-path", path_in_pkg, - "This path is already provided by %s " - "or is not allowed for other reasons." % pkgname) - if "regex" in paths_only_allowed_in[pkgname]: - rr = paths_only_allowed_in[pkgname]["regex"] - for disallowed_re in rr: - badpaths = filter(disallowed_re.match, paths_in_pkg) - for path_in_pkg in badpaths: - error_mgr.ReportError( - "disallowed-path", path_in_pkg, - "This path is already provided by %s " - "or is not allowed for other reasons." % pkgname) - - -def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger, messenger): - shared_libs = set(su.GetSharedLibs(pkg_data)) - for binary_info in pkg_data["binaries_dump_info"]: - for soname in binary_info["needed sonames"]: - if (binary_info["path"] in shared_libs - and - soname in common_constants.DO_NOT_LINK_AGAINST_THESE_SONAMES): - error_mgr.ReportError("linked-against-discouraged-library", - "%s %s" % (binary_info["base_name"], soname)) - - -def CheckDiscouragedFileNamePatterns(pkg_data, error_mgr, logger, messenger): - patterns = [(x, re.compile(x), y) for x, y in DISCOURAGED_FILE_PATTERNS] - for entry in pkg_data["pkgmap"]: - if entry["path"]: - for pattern, pattern_re, msg in patterns: - if pattern_re.search(entry["path"]): - error_mgr.ReportError("discouraged-path-in-pkgmap", - entry["path"]) - messenger.OneTimeMessage( - "discouraged-path-in-pkgmap-%s" % pattern, msg) - - -def CheckBadContent(pkg_data, error_mgr, logger, messenger): - for regex in pkg_data["bad_paths"]: - for file_name in pkg_data["bad_paths"][regex]: - messenger.Message( - "File %s contains bad content: %s. " - "If it's a legacy file you can't modify, " - "or if you investigated the issue and the string does not pose " - "a real issue, you can override this error. " - % (file_name, repr(regex))) - error_mgr.ReportError("file-with-bad-content", "%s %s" % (regex, file_name)) - - -def CheckPkgchk(pkg_data, error_mgr, logger, messenger): - if pkg_data["pkgchk"]["return_code"] != 0: - error_mgr.ReportError("pkgchk-failed-with-code", pkg_data["pkgchk"]["return_code"]) - for line in pkg_data["pkgchk"]["stderr_lines"]: - logger.warn(line) - -def CheckRpath(pkg_data, error_mgr, logger, messenger): - regex_whitelist = [re.compile(x) for x in RPATH_WHITELIST] - for binary_info in pkg_data["binaries_dump_info"]: - actual_rpaths = binary_info["runpath"] - matching = [] - not_matching = [] - for rpath in actual_rpaths: - matched = False - for white_re in regex_whitelist: - m = white_re.match(rpath) - if m: - matching.append((rpath, m.groupdict())) - matched = True - break - if matched: - matching.append(rpath) - else: - not_matching.append(rpath) - - for bad in sorted(not_matching): - logger.debug("Bad rpath: %s", bad) - error_mgr.ReportError( - "bad-rpath-entry", - "%s %s" % (bad, binary_info["path"])) - - -def DisabledCheckForMissingSymbols(pkgs_data, debug): - """Analyzes missing symbols reported by ldd -r. - - 1. Collect triplets: pkgname, binary, missing symbol - 2. If there are any missing symbols, collect all the symbols that are provided - by the set of packages. - 3. From the list of missing symbols, remove all symbols that are provided - by the set of packages. - 4. Report any remaining symbols as errors. - - What indexes do we need? - - symbol -> (pkgname, binary) - set(allsymbols) - """ - errors = [] - missing_symbols = [] - all_symbols = set() - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - binaries = pkg_data["binaries"] - for binary in binaries: - for ldd_elem in pkg_data["ldd_dash_r"][binary]: - if ldd_elem["state"] == "symbol-not-found": - missing_symbols.append((pkgname, - binary, - ldd_elem["symbol"])) - for symbol in pkg_data["defined_symbols"][binary]: - all_symbols.add(symbol) - # Remove symbols defined elsewhere. - while missing_symbols: - ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() - if ms_symbol not in all_symbols: - errors.append(checkpkg.CheckpkgTag( - ms_pkgname, "symbol-not-found", "%s %s" % (ms_binary, ms_symbol))) - return errors - - -def DisabledCheckForMissingSymbolsDumb(pkg_data, error_mgr, logger, messenger): - """Analyzes missing symbols reported by ldd -r. - - So far only made sense for perl modules. Disables because it falls over on - big KDE packages. During pickling (serialization), Python runs out of memory. - """ - pkgname = pkg_data["basic_stats"]["pkgname"] - if not re.match(SYMBOLS_CHECK_ONLY_FOR, pkgname): - return - symbol_not_found_was_seen = False - relocation_was_seen = False - for binary_info in pkg_data["binaries_dump_info"]: - for ldd_elem in pkg_data["ldd_dash_r"][binary_info["path"]]: - if not symbol_not_found_was_seen and ldd_elem["state"] == "symbol-not-found": - error_mgr.ReportError("symbol-not-found", - "e.g. %s misses %s" % (binary_info["path"], ldd_elem["symbol"])) - symbol_not_found_was_seen = True - if (not relocation_was_seen - and - ldd_elem["state"] == 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility'): - error_mgr.ReportError(ldd_elem["state"], - "e.g. symbol: %s file: %s " - "relocation bound to a symbol with STV_PROTECTED visibility" - % (ldd_elem["symbol"], ldd_elem["path"])) - - -def SetCheckFileCollisions(pkgs_data, error_mgr, logger, messenger): - """Throw an error if two packages contain the same file. - - Directories don't count. The strategy is to create an in-memory index of - packages by filename. - """ - pkgs_by_path = {} - # File types are described at: - # http://docs.sun.com/app/docs/doc/816-5174/pkgmap-4?l=en&n=1&a=view - skip_file_types = set(["d"]) - pkgnames = set(x["basic_stats"]["pkgname"] for x in pkgs_data) - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - for pkgmap_entry in pkg_data["pkgmap"]: - if pkgmap_entry["path"] and pkgmap_entry["type"] not in skip_file_types: - if pkgmap_entry["path"] not in pkgs_by_path: - pkgs_by_path[pkgmap_entry["path"]] = set() - pkgs_by_path[pkgmap_entry["path"]].add(pkgname) - pkgs_in_db = error_mgr.GetPkgByPath(pkgmap_entry["path"]) - - # We need to simulate package removal before next install. We want to - # throw an error if two new packages have a conflict; however, we - # don't want to throw an error in the following scenario: - # - # db: - # CSWfoo with /opt/csw/bin/foo - # - # new: - # CSWfoo - empty - # CSWfoo-utils with /opt/csw/bin/foo - # - # Here, CSWfoo-utils conflicts with CSWfoo from the database; but we - # don't need to check against CSWfoo in the database, but with with - # one in the package set under examination instead. - pkgs_in_db = pkgs_in_db.difference(pkgnames) - - pkgs_by_path[pkgmap_entry["path"]].update(pkgs_in_db) - # Traversing the data structure - for file_path in pkgs_by_path: - if len(pkgs_by_path[file_path]) > 1: - pkgnames = sorted(pkgs_by_path[file_path]) - for pkgname in pkgnames: - error_mgr.ReportError( - pkgname, - 'file-collision', - '%s %s' % (file_path, " ".join(pkgnames))) - - -def CheckPythonPackageName(pkg_data, error_mgr, logger, messenger): - """Checks for CSWpy-* and py_* package names.""" - pyfile_re = re.compile(r"/opt/csw/lib/python.*/.*") - pkgname = pkg_data["basic_stats"]["pkgname"] - has_py_files = False - example_py_file = "" - for pkgmap_entry in pkg_data["pkgmap"]: - if not pkgmap_entry["path"]: - continue - if pyfile_re.match(pkgmap_entry["path"]): - has_py_files = True - example_py_file = pkgmap_entry["path"] - break - if has_py_files and not pkgname.startswith("CSWpy-"): - error_mgr.ReportError("pkgname-does-not-start-with-CSWpy-") - messenger.Message("The package " - "installs files into /opt/csw/lib/python. For example, %s. " - "However, the pkgname doesn't start with 'CSWpy-'." - % repr(example_py_file)) - if has_py_files and not pkg_data["basic_stats"]["catalogname"].startswith("py_"): - error_mgr.ReportError("catalogname-does-not-start-with-py_") - messenger.Message("The package installs files into /opt/csw/lib/python. " - "For example, %s. " - "However, the catalogname doesn't start with 'py_'." - % repr(example_py_file)) - - -def CheckArchitecture(pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - for metadata in pkg_data["files_metadata"]: - if "machine_id" not in metadata: - continue - logger.debug("CheckArchitecture(): %s", metadata) - machine_data = HACHOIR_MACHINES[metadata["machine_id"]] - cpu_type = machine_data["name"] - # allowed_paths needs to depend on the OS release. The OS release is - # only available from the file name. - os_release = pkg_data["basic_stats"]["parsed_basename"]["osrel"] - if os_release not in machine_data["allowed"]: - raise checkpkg.InternalDataError( - "%s not found in machine_data" % os_release) - allowed_paths = set(machine_data["allowed"][os_release]) - disallowed_paths = set(machine_data["disallowed"]) - path_parts = set(metadata["path"].split(os.path.sep)) - if not path_parts.intersection(allowed_paths): - error_mgr.ReportError( - "binary-architecture-does-not-match-placement", - "file=%s arch_id=%s arch_name=%s" % ( - metadata["path"], - metadata["machine_id"], - cpu_type)) - messenger.OneTimeMessage( - "binary-placement", - "Files compiled for specific architectures must be placed in " - "subdirectories that match the architecture. " - "For example, a sparcv8+ binary must not be placed under " - "/opt/csw/lib, but under /opt/csw/lib/sparcv8plus. " - "Typically, the case is that sparcv8+ binaries end up under bin/ " - "or under lib/ because of ignored CFLAGS. " - "For more information about the OpenCSW binary placement policy, " - "visit " - "http://www.opencsw.org/extend-it/contribute-packages/" - "build-standards/" - "architecture-optimization-using-isaexec-and-isalist/") - else: - for bad_path in path_parts.intersection(disallowed_paths): - error_mgr.ReportError( - "binary-disallowed-placement", - "file=%s arch_id=%s arch_name=%s bad_path=%s" % ( - metadata["path"], - metadata["machine_id"], - cpu_type, - bad_path)) - messenger.Message( - "The %s binary is placed in a disallowed path. " - "For example, a sparcv8+ binary must not be placed " - "under a directory named sparcv9. " - "For more information, visit " - "http://www.opencsw.org/extend-it/contribute-packages/" - "build-standards/" - "architecture-optimization-using-isaexec-and-isalist/") - - -def CheckWrongArchitecture(pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - filename_arch = pkg_data["basic_stats"]["parsed_basename"]["arch"] - pkginfo_arch = pkg_data["pkginfo"]["ARCH"] - files_metadata = pkg_data["files_metadata"] - for file_metadata in files_metadata: - if su.IsBinary(file_metadata): - machine = HACHOIR_MACHINES[file_metadata["machine_id"]] - if machine["type"] != pkginfo_arch: - error_mgr.ReportError( - "binary-wrong-architecture", - "file=%s pkginfo-says=%s actual-binary=%s" % ( - file_metadata["path"], - pkginfo_arch, - machine["type"])) - - -def CheckSharedLibraryNamingPolicy(pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - shared_libs = set(su.GetSharedLibs(pkg_data)) - linkable_shared_libs = [] - for binary_info in pkg_data["binaries_dump_info"]: - if binary_info["path"] in shared_libs: - if su.IsLibraryLinkable(binary_info["path"]): - # It is a shared library and other projects might link to it. - # Some libraries don't declare a soname; compile time linker defaults - # to their file name. - if "soname" in binary_info and binary_info["soname"]: - soname = binary_info["soname"] - else: - soname = os.path.split(binary_info["path"])[1] - linkable_shared_libs.append((soname, binary_info)) - check_names = True - logging.debug("CheckSharedLibraryNamingPolicy(): " - "linkable shared libs of %s: %s" - % (pkgname, linkable_shared_libs)) - if len(linkable_shared_libs) > 1: - sonames = sorted(set([x[0] for x in linkable_shared_libs])) - tmp = su.MakePackageNameBySonameCollection(sonames) - if tmp: - multilib_pkgnames, multilib_catalogname = tmp - else: - multilib_pkgnames, multilib_catalogname = (None, None) - if not multilib_pkgnames: - error_mgr.ReportError( - "non-uniform-lib-versions-in-package", - "sonames=%s" - % (",".join(sonames))) - messenger.Message( - "Package %s contains shared libraries, and their soname " - "versions are not in sync: %s. This means that " - "each soname is likely to be retired at a different time " - "and each soname is best placed in a separate package, " - "named after soname and version. " - % (pkgname, sonames)) - # If the sonames aren't uniform, there's no point in trying to match - # sonames versus pkgname. - messenger.SuggestGarLine( - "# Suggesting how to separate out shared libraries.") - messenger.SuggestGarLine( - "# You will most probably need to further edit these lines. " - "Use with caution!") - for soname, binary_info in linkable_shared_libs: - lib_path, lib_basename = os.path.split(binary_info["path"]) - tmp = su.MakePackageNameBySoname(soname) - policy_pkgname_list, policy_catalogname_list = tmp - pkginfo = pkg_data["pkginfo"] - description = " ".join(pkginfo["NAME"].split(" ")[2:]) - depchecks.SuggestLibraryPackage(error_mgr, messenger, - policy_pkgname_list[0], - policy_catalogname_list[0], - description, - lib_path, lib_basename, soname, - pkgname) - - check_names = False - else: # len(linkable_shared_libs) > 1 - if pkgname not in multilib_pkgnames: - error_mgr.ReportError( - "shared-lib-pkgname-mismatch", - "sonames=%s " - "pkgname=%s " - "expected=%s " - % (",".join(sonames), pkgname, ",".join(multilib_pkgnames))) - messenger.Message( - "The collection of sonames (%s) " - "is expected to be in package " - "named %s, but the package name is %s. " - "More information: " - "http://wiki.opencsw.org/checkpkg-error-tags" - % (sonames, multilib_pkgnames, pkgname)) - check_names = False - if check_names: - for soname, binary_info in linkable_shared_libs: - tmp = su.MakePackageNameBySoname(soname) - policy_pkgname_list, policy_catalogname_list = tmp - if pkgname not in policy_pkgname_list: - error_mgr.ReportError( - "shared-lib-pkgname-mismatch", - "file=%s " - "soname=%s " - "pkgname=%s " - "expected=%s" - % (binary_info["path"], - soname, pkgname, - ",".join(policy_pkgname_list))) - - suggested_pkgname = policy_pkgname_list[0] - lib_path, lib_basename = os.path.split(binary_info["path"]) - pkginfo = pkg_data["pkginfo"] - description = " ".join(pkginfo["NAME"].split(" ")[2:]) - depchecks.SuggestLibraryPackage(error_mgr, messenger, - suggested_pkgname, - policy_catalogname_list[0], - description, - lib_path, lib_basename, soname, - pkgname) - - messenger.OneTimeMessage( - soname, - "This shared library (%s) is in a directory indicating that it " - "is likely to be linked to by other programs. If this is the " - "case, the library is best packaged separately, in a package " - "with a library-specific name. Examples of such names include: " - "%s. If this library is not meant to be linked to by other " - "packages, it's best moved to a 'private' directory. " - "For example, instead of /opt/csw/lib/foo.so, " - "try /opt/csw/lib/projectname/foo.so. " - "More information: http://wiki.opencsw.org/checkpkg-error-tags" - % (binary_info["path"], policy_pkgname_list)) - - -def CheckSharedLibraryPkgDoesNotHaveTheSoFile(pkg_data, error_mgr, logger, messenger): - """If it's a package with shared libraries, it should not contain the .so file. - - For example, libfoo.so.1 should not be in the same package as libfoo.so, - because the latter is used for linking during compilation, and the former is - a shared object that needs to be phased out at some point. - """ - pkgname = pkg_data["basic_stats"]["pkgname"] - shared_libs = set(su.GetSharedLibs(pkg_data)) - shared_libs = filter(su.IsLibraryLinkable, shared_libs) - if shared_libs: - # If the package contains shared libraries, it must not contain - # corrersponding .so files, which are used during linking. - for entry in pkg_data["pkgmap"]: - if entry["path"]: - if entry["path"].endswith(".so") and entry["type"] == "s": - error_mgr.ReportError( - "shared-lib-package-contains-so-symlink", - "file=%s" % entry["path"]) - messenger.SuggestGarLine("# (If %s-dev doesn't exist yet)" % pkgname) - messenger.SuggestGarLine("PACKAGES += %s-dev" % pkgname) - messenger.SuggestGarLine( - "CATALOGNAME_%s-dev = %s_dev" - % (pkgname, pkg_data["basic_stats"]["catalogname"])) - messenger.SuggestGarLine( - "SPKG_DESC_%s-dev += $(DESCRIPTION), development files" % pkgname) - messenger.SuggestGarLine( - "PKGFILES_%s-dev += %s" % (pkgname, entry["path"])) - messenger.SuggestGarLine("# Maybe also the generic:") - messenger.SuggestGarLine( - "# PKGFILES_%s-dev += $(PKGFILES_DEVEL)" % (pkgname)) - messenger.Message( - "The package contains shared libraries together with the " - "symlink of the form libfoo.so -> libfoo.so.1. " - "In this case: %s. " - "This kind of symlink should not be together with the shared " - "libraries; it is only used during compiling and linking. " - "The best practice " - "is to put the shared libraries into a separate package, and " - "the .so file together with the header files in the devel " - "package." % entry["path"]) - -def CheckPackagesWithHeaderFilesMustContainTheSoFile(pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - shared_libs = set(su.GetSharedLibs(pkg_data)) - shared_libs = filter(su.IsLibraryLinkable, shared_libs) - if shared_libs: - # If the package contains shared libraries, it must not contain - # corrersponding .so files, which are used during linking. - for entry in pkg_data["pkgmap"]: - if entry["path"]: - if entry["path"].endswith(".so") and entry["type"] == "s": - error_mgr.ReportError( - "shared-lib-package-contains-so-symlink", - "file=%s" % entry["path"]) - messenger.Message( - "The package contains shared libraries together with the " - "symlink of the form libfoo.so -> libfoo.so.1. " - "In this case: %s. " - "This kind of symlink should not be together with the shared " - "libraries; it is only used during compiling and linking. " - "The best practice " - "is to put the shared libraries into a separate package, and " - "the .so file together with the header files in the devel " - "package." % entry["path"]) - - -def CheckSharedLibraryNameMustBeAsubstringOfSoname( - pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - for binary_info in pkg_data["binaries_dump_info"]: - if "soname" in binary_info: - if binary_info["soname"] not in binary_info["base_name"]: - error_mgr.ReportError( - "soname-not-part-of-filename", - "soname=%s " - "filename=%s" - % (binary_info["soname"], binary_info["base_name"])) - - -def CheckLicenseFilePlacement(pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - docpath_re = re.compile(r"/opt/csw/share/doc/(?P[^/]+)/license$") - for pkgmap_entry in pkg_data["pkgmap"]: - if "path" not in pkgmap_entry: continue - if not pkgmap_entry["path"]: continue - m = docpath_re.match(pkgmap_entry["path"]) - if m: - if m.groupdict()["docname"] != pkg_data["basic_stats"]["catalogname"]: - msg = ("The package contains a docdir which doesn't match its " - "catalog name. To fix, repeat the merge state (mgar remerge " - "repackage).") - error_mgr.Message(msg) - error_mgr.ReportError( - "wrong-docdir", - "expected=/opt/csw/shared/doc/%s/... " - "in-package=%s" - % (pkg_data["basic_stats"]["catalogname"], - pkgmap_entry["path"])) - - -def CheckBaseDirs(pkg_data, error_mgr, logger, messenger): - """Symlinks and nonstandard class files need base directories - - This cannot be made a general check, because there would be too many false - positives. However, symlinks and nonstandard class files are so prone to - this problem that it makes sense to throw errors if they miss base - directories. - """ - pkgname = pkg_data["basic_stats"]["pkgname"] - for pkgmap_entry in pkg_data["pkgmap"]: - if "path" not in pkgmap_entry: continue - if not pkgmap_entry["path"]: continue - if pkgmap_entry["type"] == "s" or pkgmap_entry["class"] != "none": - base_dir = os.path.dirname(pkgmap_entry["path"]) - error_mgr.NeedFile( - base_dir, - "%s contains %s which needs a base directory: %s." - % (pkgname, repr(pkgmap_entry["path"]), repr(base_dir))) - - -def CheckDanglingSymlinks(pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - for pkgmap_entry in pkg_data["pkgmap"]: - if "path" not in pkgmap_entry: continue - if not pkgmap_entry["path"]: continue - if pkgmap_entry["type"] in ("s", "l"): - link_type = "symlink" - if pkgmap_entry["type"] == "l": - link_type = "hardlink" - error_mgr.NeedFile( - pkgmap_entry["target"], - "%s contains a %s (%s) which needs the target file: %s." - % (link_type, pkgname, repr(pkgmap_entry["path"]), repr(pkgmap_entry["target"]))) - - -def CheckPrefixDirs(pkg_data, error_mgr, logger, messenger): - """Files are allowed to be in /opt/csw, /etc/opt/csw and /var/opt/csw.""" - pkgname = pkg_data["basic_stats"]["pkgname"] - paths_with_slashes = [(x, x + "/") for x in ALLOWED_STARTING_PATHS] - for pkgmap_entry in pkg_data["pkgmap"]: - if "path" not in pkgmap_entry: continue - if not pkgmap_entry["path"]: continue - allowed_found = False - for p, pslash in paths_with_slashes: - # We need to handle /opt/csw as an allowed path - if pkgmap_entry["path"] == p: - allowed_found = True - break - if pkgmap_entry["path"].startswith(pslash): - allowed_found = True - break - if not allowed_found: - error_mgr.ReportError( - "bad-location-of-file", - "file=%s" % pkgmap_entry["path"]) - - -def CheckCatalognameMatchesPkgname(pkg_data, error_mgr, logger, messenger): - pkgname = pkg_data["basic_stats"]["pkgname"] - catalogname = pkg_data["basic_stats"]["catalogname"] - std_catalogname = struct_util.MakeCatalognameByPkgname(pkgname) - if catalogname != std_catalogname: - msg = ( - "The catalogname should match the pkgname. " - "For more information, see " - "http://www.opencsw.org/extend-it/contribute-packages/" - "build-standards/package-creation/") - error_mgr.ReportError( - 'catalogname-does-not-match-pkgname', - 'pkgname=%s catalogname=%s expected-catalogname=%s' - % (pkgname, catalogname, std_catalogname)) - - -def CheckSonameMustNotBeEqualToFileNameIfFilenameEndsWithSo( - pkg_data, error_mgr, logger, messenger): - shared_libs = set(su.GetSharedLibs(pkg_data)) - for binary_info in pkg_data["binaries_dump_info"]: - if binary_info["path"] not in shared_libs: - continue - if not su.IsLibraryLinkable(binary_info["path"]): - continue - base_name = binary_info["base_name"] - if "soname" in binary_info: - soname = binary_info["soname"] - else: - soname = base_name - if (base_name.endswith(".so") - and soname == base_name): - msg = ("File /%s is a shared library. Its SONAME is equal to its " - "filename, and the filename ends with .so. " - "This is a serious problem. " - "If such shared library is released and any programs link " - "to it, it is very hard to do any subsequent updates to " - "that shared library. This problem has occurred with relation " - "to libnet. " - "For information how to update such library, please see: " - "http://wiki.opencsw.org/project-libnet") - messenger.Message(msg) - error_mgr.ReportError( - "soname-equals-filename", - "file=/%s" % binary_info["path"]) - - -def CheckLinkableSoFileMustBeAsymlink( - pkg_data, error_mgr, logger, messenger): - pass - - -def CheckPkginfoOpencswRepository( - pkg_data, error_mgr, logger, messenger): - repotag = "OPENCSW_REPOSITORY" - pkginfo = pkg_data["pkginfo"] - if repotag not in pkginfo: - error_mgr.ReportError("pkginfo-opencsw-repository-missing") - return - if "UNCOMMITTED" in pkginfo[repotag]: - error_mgr.ReportError("pkginfo-opencsw-repository-uncommitted") - -def CheckAlternativesDependency( - pkg_data, error_mgr, logger, messenger): - - need_alternatives = False - for entry in pkg_data["pkgmap"]: - if not entry["path"]: - continue - if entry["class"] == "cswalternatives": - need_alternatives = True - break - if need_alternatives: - error_mgr.NeedFile( - "/opt/csw/sbin/alternatives", - "The alternatives subsystem is used") - - -def CheckSharedLibrarySoExtension(pkg_data, error_mgr, logger, messenger): - shared_libs = set(su.GetSharedLibs(pkg_data)) - for shared_lib in shared_libs: - if ".so" not in shared_lib: - error_mgr.ReportError( - "shared-library-missing-dot-so", - "file=%s" % shared_lib) Copied: csw/mgar/gar/v2-build64only/lib/python/package_checks.py (from rev 16021, csw/mgar/gar/v2/lib/python/package_checks.py) =================================================================== --- csw/mgar/gar/v2-build64only/lib/python/package_checks.py (rev 0) +++ csw/mgar/gar/v2-build64only/lib/python/package_checks.py 2011-10-28 12:29:35 UTC (rev 16032) @@ -0,0 +1,1377 @@ +# $Id$ +# +# Package checking functions. They come in two flavors: +# - individual package checks +# - set checks +# +# Individual checks need to be named "Check", while set checks are named +# "SetCheck". +# +# def CheckSomething(pkg_data, error_mgr, logger, messenger): +# logger.debug("Checking something.") +# error_mgr.ReportError("something-is-wrong") +# +# TODO(maciej): In general, the development package should depend on all the libraries. +# TODO(maciej): If foo.so links to foo.so.1, the devel package should depend on +# the library package. + +import copy +import re +import operator +import os +import checkpkg +import opencsw +import pprint +import textwrap +import dependency_checks as depchecks +import configuration as c +import sharedlib_utils as su +import struct_util +from Cheetah import Template +import common_constants +import logging + +PATHS_ALLOWED_ONLY_IN = { + # Leading slash must be removed. + # Using strings where possible for performance. + "CSWcommon": {"string": [ + r"opt", + r"opt/csw/man", + r"opt/csw/doc", + r"opt/csw/info", + r"opt/csw/share/locale/locale.alias", + ], + "regex": [r"opt/csw/man/.*"]}, + "CSWiconv": {"string": [r"opt/csw/lib/charset.alias"]}, + "CSWtexinfo": {"string": [r"opt/csw/share/info/dir"]}, +} +MAX_DESCRIPTION_LENGTH = 100 +LICENSE_TMPL = "/opt/csw/share/doc/%s/license" +OBSOLETE_DEPS = { + # "CSWfoo": { + # "hint": "Do this...", + # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." + # }, + "CSWpython-rt": { + "hint": "CSWpython-rt is deprecated, use CSWpython instead.", + "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" + }, + "CSWlibcups": { + "hint": "CSWlibcups is deprecated, please depend on specific " + "shared library packages.", + "url": "http://wiki.opencsw.org/packaging-shared-libraries", + }, + "CSWcswclassutils": { + "hint": "CSWcswclassutils is deprecated, please depend on specific " + "CSWcas-* packages.", + "url": ("http://lists.opencsw.org/pipermail/maintainers/" + "2010-October/012862.html"), + }, +} +ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") +EMAIL_RE = re.compile(r"^.*@opencsw.org$") +MAX_CATALOGNAME_LENGTH = 29 +MAX_PKGNAME_LENGTH = 32 +ARCH_LIST = common_constants.ARCHITECTURES +VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" +# Pkgnames matching these regexes must not be ARCHALL = 1 +ARCH_SPECIFIC_PKGNAMES_RE_LIST = [ + re.compile(r".*dev(el)?$"), +] + +DISCOURAGED_FILE_PATTERNS = ( + (r"\.py[co]$", ("Python compiled files are supposed to be compiled using" + "the cswpycompile class action script. For more " + "information, see " + "http://wiki.opencsw.org/cswclassutils-package")), + (r"/lib\w+\.l?a$", "Static libraries aren't necessary on Solaris."), + (r"opt/csw/var($|/)", ("The /opt/csw/var directory is not writable on " + "sparse non-global zones. " + "Please use /var/opt/csw instead.")), + (r"\.git", ("Git files in most cases shouldn't be included in " + "a package.")), + (r"\.CVS", ("CVS files in most cases shouldn't be included in " + "a package.")), +) +RPATH_PARTS = { + 'prefix': r"(?P/opt/csw)", + 'prefix_extra': r"(?P(/(?!lib)[\w-]+)*)", + 'subdirs': r"(?P(/(?!-R)[\w\-\.]+)*)", + 'isalist': r"(?P/(\$ISALIST|64))", + 'subdir2': r"(?P/[\w\-\.]+)", +} +RPATH_WHITELIST = [ + (r"^" + r"%(prefix)s" + r"%(prefix_extra)s" + r"/(lib|libexec)" + r"%(subdirs)s" + r"%(isalist)s?" + r"%(subdir2)s?" + r"$") % RPATH_PARTS, + r"^\$ORIGIN$", + r"^\$ORIGIN/..$", + r"^/usr(/(ccs|dt|openwin))?/lib(/(sparcv9|amd64|64))?$", +] +# Check ldd -r only for Perl modules +SYMBOLS_CHECK_ONLY_FOR = r"^CSWpm.*$" + +# Valid URLs in the VENDOR field in pkginfo +VENDORURL_RE = r"^(http|ftp)s?\://.+\..+$" + +# Settings for binary placements: which architectures can live in which +# directories. +BASE_BINARY_PATHS = ('bin', 'sbin', 'lib', 'libexec', 'cgi-bin') +HACHOIR_MACHINES = { + # id: (name, allowed_paths, disallowed_paths) + -1: {"name": "Unknown", + "allowed": { + common_constants.OS_REL_58: (), + common_constants.OS_REL_59: (), + common_constants.OS_REL_510: (), + common_constants.OS_REL_511: (), + }, "disallowed": (), + "type": "unknown"}, + 2: {"name": "sparcv8", + "type": common_constants.ARCH_SPARC, + "allowed": { + common_constants.OS_REL_58: BASE_BINARY_PATHS + su.SPARCV8_PATHS, + common_constants.OS_REL_59: BASE_BINARY_PATHS + su.SPARCV8_PATHS, + common_constants.OS_REL_510: BASE_BINARY_PATHS + su.SPARCV8_PATHS, + common_constants.OS_REL_511: BASE_BINARY_PATHS + su.SPARCV8_PATHS, + }, + "disallowed": su.SPARCV9_PATHS + su.INTEL_386_PATHS + su.AMD64_PATHS, + }, + # pentium_pro binaries are also identified as 3. + 3: {"name": "i386", + "type": common_constants.ARCH_i386, + "allowed": { + common_constants.OS_REL_58: BASE_BINARY_PATHS + su.INTEL_386_PATHS, + common_constants.OS_REL_59: BASE_BINARY_PATHS + su.INTEL_386_PATHS, + common_constants.OS_REL_510: BASE_BINARY_PATHS + su.INTEL_386_PATHS, + common_constants.OS_REL_511: BASE_BINARY_PATHS + su.INTEL_386_PATHS, + }, + "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + + su.SPARCV9_PATHS + su.AMD64_PATHS, + }, + 6: {"name": "i486", + "type": common_constants.ARCH_i386, + "allowed": { + common_constants.OS_REL_58: su.INTEL_386_PATHS, + common_constants.OS_REL_59: su.INTEL_386_PATHS, + common_constants.OS_REL_510: su.INTEL_386_PATHS, + common_constants.OS_REL_511: su.INTEL_386_PATHS, + }, + "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + + su.SPARCV9_PATHS + su.AMD64_PATHS, + }, + 18: {"name": "sparcv8+", + "type": common_constants.ARCH_SPARC, + "allowed": { + common_constants.OS_REL_58: su.SPARCV8PLUS_PATHS, + common_constants.OS_REL_59: su.SPARCV8PLUS_PATHS, + # We allow sparcv8+ as the base architecture on Solaris 10+. + common_constants.OS_REL_510: BASE_BINARY_PATHS + su.SPARCV8PLUS_PATHS, + common_constants.OS_REL_511: BASE_BINARY_PATHS + su.SPARCV8PLUS_PATHS, + }, + "disallowed": su.SPARCV8_PATHS + su.SPARCV9_PATHS + + su.AMD64_PATHS + su.INTEL_386_PATHS, + }, + 43: {"name": "sparcv9", + "type": common_constants.ARCH_SPARC, + "allowed": { + common_constants.OS_REL_58: su.SPARCV9_PATHS, + common_constants.OS_REL_59: su.SPARCV9_PATHS, + common_constants.OS_REL_510: su.SPARCV9_PATHS, + common_constants.OS_REL_511: su.SPARCV9_PATHS, + }, + "disallowed": su.INTEL_386_PATHS + su.AMD64_PATHS, + }, + 62: {"name": "amd64", + "type": common_constants.ARCH_i386, + "allowed": { + common_constants.OS_REL_58: su.AMD64_PATHS, + common_constants.OS_REL_59: su.AMD64_PATHS, + common_constants.OS_REL_510: su.AMD64_PATHS, + common_constants.OS_REL_511: su.AMD64_PATHS, + }, + "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS + + su.SPARCV9_PATHS, + }, +} + + +ALLOWED_STARTING_PATHS = frozenset([ + "/opt/csw", + "/etc/opt/csw", + "/var/opt/csw", +]) + + +def RemovePackagesUnderInstallation(paths_and_pkgs_by_soname, + pkgs_to_be_installed): + """Emulates uninstallation of packages prior to installation + of the new ones. + {'libfoo.so.1': {u'/opt/csw/lib': [u'CSWlibfoo']}} + """ + # for brevity + ptbi = set(pkgs_to_be_installed) + ppbs = paths_and_pkgs_by_soname + new_ppbs = {} + for soname in ppbs: + if soname not in new_ppbs: + new_ppbs[soname] = {} + for binary_path in ppbs[soname]: + for pkgname in ppbs[soname][binary_path]: + if pkgname not in ptbi: + if binary_path not in new_ppbs[soname]: + new_ppbs[soname][binary_path] = [] + new_ppbs[soname][binary_path].append(pkgname) + return new_ppbs + + +def CheckDirectoryPermissions(pkg_data, error_mgr, logger, messenger): + for entry in pkg_data["pkgmap"]: + if (entry["type"] == "d" + and + entry["mode"] != "?" + and + entry["mode"][1] == "6"): + error_mgr.ReportError("executable-bit-missing-on-a-directory", + entry["path"]) + + +def CheckNonCswPathsDirectoryPerms(pkg_data, error_mgr, logger, messenger): + for entry in pkg_data["pkgmap"]: + if entry["user"] == "?" or entry["group"] == "?" or entry["mode"] == "?": + if entry["path"].startswith("/opt/csw"): + error_mgr.ReportError("pkgmap-question-mark-perms-in-opt-csw", entry["path"]) + + +def CheckPerlLocal(pkg_data, error_mgr, logger, messenger): + perllocal_re = re.compile(r'/perllocal.pod') + for entry in pkg_data["pkgmap"]: + if entry["path"]: + if re.search(perllocal_re, entry["path"]): + error_mgr.ReportError("perllocal-pod-in-pkgmap", entry["path"]) + +def CheckGzippedManpages(pkg_data, error_mgr, logger, messenger): + gzipman_re = re.compile(r'share/man/man.*/.*\.gz$') + for entry in pkg_data["pkgmap"]: + if entry["path"]: + if re.search(gzipman_re, entry["path"]): + error_mgr.ReportError( + 'gzipped-manpage-in-pkgmap', entry["path"], + "Solaris' man cannot automatically inflate man pages. " + "Solution: man page should be gunzipped.") + +def CheckMultipleDepends(pkg_data, error_mgr, logger, messenger): + new_depends = set() + for pkgname, desc in pkg_data["depends"]: + if pkgname in new_depends: + error_mgr.ReportError("dependency-listed-more-than-once", pkgname) + new_depends.add(pkgname) + + +def CheckDescription(pkg_data, error_mgr, logger, messenger): + pkginfo = pkg_data["pkginfo"] + desc = checkpkg.ExtractDescription(pkginfo) + if not desc: + error_mgr.ReportError("pkginfo-description-missing") + else: + if len(desc) > MAX_DESCRIPTION_LENGTH: + error_mgr.ReportError("pkginfo-description-too-long", "length=%s" % len(desc)) + if not desc[0].isupper(): + error_mgr.ReportError("pkginfo-description-not-starting-with-uppercase", + desc) + + +def CheckVendorURL(pkg_data, error_mgr, logger, messenger): + vendorurl = c.WS_RE.split(pkg_data["pkginfo"]["VENDOR"])[0] + if not re.match(VENDORURL_RE, vendorurl): + error_mgr.ReportError("pkginfo-bad-vendorurl", vendorurl, + "Solution: add VENDOR_URL to GAR Recipe") + + +def CheckCatalogname(pkg_data, error_mgr, logger, messenger): + pkginfo = pkg_data["pkginfo"] + catalogname = pkginfo["NAME"].split(" ")[0] + catalogname_2 = pkg_data["basic_stats"]["catalogname"] + if catalogname != catalogname_2: + error_mgr.ReportError("pkginfo-catalogname-disagreement pkginfo=%s filename=%s" + % (catalogname, catalogname_2)) + catalogname_re = r"^([\w\+]+)$" + if not re.match(catalogname_re, catalogname): + error_mgr.ReportError("pkginfo-bad-catalogname", catalogname) + if catalogname != catalogname.lower(): + error_mgr.ReportError("catalogname-not-lowercase") + + +def CheckSmfIntegration(pkg_data, error_mgr, logger, messenger): + init_re = re.compile(r"/init\.d/") + for entry in pkg_data["pkgmap"]: + if not entry["path"]: + continue + if not re.search(init_re, entry["path"]): + continue + if entry["class"] != "cswinitsmf": + error_mgr.ReportError( + "init-file-missing-cswinitsmf-class", + "%s class=%s" % (entry["path"], entry["class"])) + messenger.Message( + "The init file %s in the package has the %s class, while it " + "should have the cswinitsmf class, which takes advantage of " + "the SMF integration automation from cswclassutils." + % (entry["path"], entry["class"])) + messenger.SuggestGarLine("INITSMF = %s" % entry["path"]) + + # This is not an error, in fact, putting files into + # /opt/csw/etc/init.d breaks packages. + + if "/opt/csw/etc/init.d" in entry["path"]: + messenger.Message("Init files under /opt result in broken packages, " + "see http://lists.opencsw.org/pipermail/maintainers/" + "2010-June/012145.html") + error_mgr.ReportError( + "init-file-wrong-location", + entry["path"]) + + +def SetCheckLibraries(pkgs_data, error_mgr, logger, messenger): + """Second version of the library checking code. + + 1. Collect all the needed data from the FS: + {"": {"/path/1": ["CSWfoo1"], "/path/2": ["CSWfoo2"]}} + 1.1. find all needed sonames + 1.2. get all the data for needed sonames + 2. Construct an overlay by applying data from the package set + 3. For each binary + 3.1. Resolve all NEEDED sonames + """ + needed_sonames = [] + pkgs_to_be_installed = [x["basic_stats"]["pkgname"] for x in pkgs_data] + paths_to_verify = set() + pkg_by_path = {} + logger.debug("Building needed_sonames, paths_to_verify and pkg_by_path...") + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + for binary_info in pkg_data["binaries_dump_info"]: + needed_sonames.extend(binary_info["needed sonames"]) + # Creating an index of packages by path + for pkgmap_entry in pkg_data["pkgmap"]: + if "path" in pkgmap_entry and pkgmap_entry["path"]: + base_dir, basename = os.path.split(pkgmap_entry["path"]) + paths_to_verify.add(base_dir) + paths_to_verify.add(pkgmap_entry["path"]) + if pkgmap_entry["path"] not in pkg_by_path: + pkg_by_path[pkgmap_entry["path"]] = [] + pkg_by_path[pkgmap_entry["path"]].append(pkgname) + needed_sonames = sorted(set(needed_sonames)) + # Finding candidate libraries from the filesystem (/var/sadm/install/contents) + path_and_pkg_by_basename = depchecks.GetPathAndPkgByBasename( + error_mgr, logger, needed_sonames) + # Removing files from packages that are to be installed. + path_and_pkg_by_basename = RemovePackagesUnderInstallation( + path_and_pkg_by_basename, pkgs_to_be_installed) + # Populating the mapping using data from the local packages. The call to + # GetPkgByFullPath will complete the mapping using data from the filesystem. + pkg_by_path = depchecks.GetPkgByFullPath( + error_mgr, logger, paths_to_verify, pkg_by_path) + # Adding overlay based on the given package set + # Considering files from the set under examination. + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + # Processing the whole pkgmap. There yet no verification whether the files + # that are put in here are actually shared libraries, or symlinks to shared + # libraries. Implementing symlink resolution would be a nice bonus. + for pkgmap_entry in pkg_data["pkgmap"]: + if "path" not in pkgmap_entry: continue + if not pkgmap_entry["path"]: continue + binary_path, basename = os.path.split(pkgmap_entry["path"]) + if not binary_path.startswith('/'): + binary_path = "/" + binary_path + path_and_pkg_by_basename.setdefault(basename, {}) + path_and_pkg_by_basename[basename][binary_path] = [pkgname] + # Resolving sonames for each binary + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + declared_deps = frozenset(x[0] for x in pkg_data["depends"]) + check_args = (pkg_data, error_mgr, logger, messenger, + path_and_pkg_by_basename, pkg_by_path) + depchecks.Libraries(*check_args) + depchecks.ByFilename(*check_args) + # This test needs more work, or potentially, architectural changes. + # by_directory_reasons = ByDirectory(*check_args) + # req_pkgs_reasons.extend(by_directory_reasons) + + +def SetCheckDependencies(pkgs_data, error_mgr, logger, messenger): + """Dependencies must be either installed in the system, or in the set.""" + known_pkgs = set(error_mgr.GetInstalledPackages()) + pkgs_under_check = [x["basic_stats"]["pkgname"] for x in pkgs_data] + for pkgname in pkgs_under_check: + known_pkgs.add(pkgname) + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + for depname, dep_desc in pkg_data["depends"]: + if depname not in known_pkgs: + error_mgr.ReportError(pkgname, "unidentified-dependency", depname) + + +def CheckDependsOnSelf(pkg_data, error_mgr, logger, messenger): + pkgname = pkg_data["basic_stats"]["pkgname"] + for depname, dep_desc in pkg_data["depends"]: + if depname == pkgname: + error_mgr.ReportError("depends-on-self") + + +def CheckArchitectureSanity(pkg_data, error_mgr, logger, messenger): + basic_stats = pkg_data["basic_stats"] + pkgname = basic_stats["pkgname"] + pkginfo = pkg_data["pkginfo"] + filename = basic_stats["pkg_basename"] + arch = pkginfo["ARCH"] + filename_re = r"-%s-" % arch + if not re.search(filename_re, filename): + error_mgr.ReportError("srv4-filename-architecture-mismatch", + "pkginfo=%s filename=%s" % (arch, filename)) + + +def CheckActionClasses(pkg_data, error_mgr, logger, messenger): + """Checks the consistency between classes in the prototype and pkginfo.""" + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] + if "CLASSES" not in pkginfo: + return + pkginfo_classes = set(re.split(c.WS_RE, pkginfo["CLASSES"])) + pkgmap_classes = set() + for entry in pkgmap: + if entry["class"]: # might be None + pkgmap_classes.add(entry["class"]) + only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) + only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) + for action_class in only_in_pkginfo: + error_mgr.ReportError("action-class-only-in-pkginfo", action_class) + for action_class in only_in_pkgmap: + error_mgr.ReportError("action-class-only-in-pkgmap", action_class) + + +def CheckLicenseFile(pkg_data, error_mgr, logger, messenger): + """Checks for the presence of the license file.""" + # TODO: Write a unit test + pkgmap = pkg_data["pkgmap"] + catalogname = pkg_data["basic_stats"]["catalogname"] + license_path = LICENSE_TMPL % catalogname + pkgmap_paths = [x["path"] for x in pkgmap] + if license_path not in pkgmap_paths: + messenger.Message("The license file needs to be placed " + "at %s. Also see " + "http://sourceforge.net/apps/trac/gar/wiki/CopyRight" + % license_path) + error_mgr.ReportError( + "license-missing", license_path, + "See http://sourceforge.net/apps/trac/gar/wiki/CopyRight") + + +def CheckObsoleteDeps(pkg_data, error_mgr, logger, messenger): + """Checks for obsolete dependencies.""" + deps = frozenset([x for x, y in pkg_data["depends"]]) + obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) + if obsolete_pkg_deps: + for obsolete_pkg in obsolete_pkg_deps: + error_mgr.ReportError("obsolete-dependency", obsolete_pkg) + msg = "" + if "hint" in OBSOLETE_DEPS[obsolete_pkg]: + msg += "Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"] + if "url" in OBSOLETE_DEPS[obsolete_pkg]: + if msg: + msg += ", " + msg += "URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"] + if not msg: + msg = None + messenger.Message(msg) + + +def CheckArchitectureVsContents(pkg_data, error_mgr, logger, messenger): + """Verifies the relationship between package contents and architecture.""" + binaries = pkg_data["binaries"] + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] + arch = pkginfo["ARCH"] + pkgname = pkg_data["basic_stats"]["pkgname"] + reasons_to_be_arch_specific = [] + pkgmap_paths = [x["path"] for x in pkgmap] + for pkgmap_path in pkgmap_paths: + if re.search(ARCH_RE, str(pkgmap_path)): + reasons_to_be_arch_specific.append(( + "archall-with-arch-paths", + pkgmap_path, + "path %s looks arch-specific" % pkgmap_path)) + for binary in binaries: + reasons_to_be_arch_specific.append(( + "archall-with-binaries", + binary, + "package contains binary %s" % binary)) + for pkgname_re in ARCH_SPECIFIC_PKGNAMES_RE_LIST: + if pkgname_re.match(pkgname): + reasons_to_be_arch_specific.append(( + "archall-devel-package", None, None)) + if arch == "all": + for tag, param, desc in reasons_to_be_arch_specific: + error_mgr.ReportError(tag, param, desc) + elif not reasons_to_be_arch_specific: + messenger.Message("Package %s does not contain any binaries. " + "Consider making it ARCHALL = 1 instead of %s. " + "However, be aware that there might be other reasons " + "to keep it architecture-specific." + % (pkgname, arch)) + messenger.SuggestGarLine("ARCHALL_%s = 1" % pkgname) + + +# TODO: Verify that architecture type of binaries matches the actual binaries. +# Correlate architecture type from files_metadata and HACHOIR_MACHINES with +# pkginfo. + + +def CheckFileNameSanity(pkg_data, error_mgr, logger, messenger): + basic_stats = pkg_data["basic_stats"] + revision_info = basic_stats["parsed_basename"]["revision_info"] + catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] + if "REV" not in revision_info: + error_mgr.ReportError("rev-tag-missing-in-filename") + if len(catalogname) > MAX_CATALOGNAME_LENGTH: + error_mgr.ReportError("catalogname-too-long") + if len(pkgname) > MAX_PKGNAME_LENGTH: + error_mgr.ReportError("pkgname-too-long") + if basic_stats["parsed_basename"]["osrel"] == "unspecified": + error_mgr.ReportError("osrel-tag-not-specified") + + +def CheckPkginfoSanity(pkg_data, error_mgr, logger, messenger): + """pkginfo sanity checks. + +if [ "$maintname" = "" ] ; then + # the old format, in the DESC field + maintname=`sed -n 's/^DESC=.*for CSW by //p' $TMPFILE` + + # Since the DESC field has been coopted, take + # description from second half of NAME field now. + desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` +else + if [ "$desc" = "" ] ; then + desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` + fi +fi + +software=`sed -n 's/^NAME=\([^ -]*\) -.*$/\1/p' $TMPFILE` +version=`sed -n 's/^VERSION=//p' $TMPFILE` +desc=`sed -n 's/^DESC=//p' $TMPFILE` +email=`sed -n 's/^EMAIL=//p' $TMPFILE` +maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` +hotline=`sed -n 's/^HOTLINE=//p' $TMPFILE` +basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` +pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` + +if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi +if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi +if [ "$desc" = "" ] ; then errmsg $f: no description in either NAME or DESC field ; fi +if [ ${#desc} -gt 100 ] ; then errmsg $f: description greater than 100 chars ; fi +if [ "$version" = "" ] ; then errmsg $f: VERSION field blank ; fi +if [ "$maintname" = "" ] ; then errmsg $f: maintainer name not detected. Fill out VENDOR field properly ; fi +if [ "$email" = "" ] ; then errmsg $f: EMAIL field blank ; fi +if [ "$hotline" = "" ] ; then errmsg $f: HOTLINE field blank ; fi + """ + catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] + pkginfo = pkg_data["pkginfo"] + # PKG, NAME, ARCH, VERSION and CATEGORY + for parameter in ("PKG", "NAME", "ARCH", "VERSION", "CATEGORY"): + if parameter not in pkginfo: + error_mgr.ReportError("pkginfo-missing-parameter", parameter) + if not catalogname: + error_mgr.ReportError("pkginfo-empty-catalogname") + if not pkgname: + error_mgr.ReportError("pkginfo-empty-pkgname") + if not "VERSION" in pkginfo or not pkginfo["VERSION"]: + error_mgr.ReportError("pkginfo-version-field-missing") + # maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` + maintname = checkpkg.ExtractMaintainerName(pkginfo) + if not maintname: + error_mgr.ReportError("pkginfo-maintainer-name-not-set") + # email + if not pkginfo["EMAIL"]: + error_mgr.ReportError("pkginfo-email-blank") + # hotline + if not pkginfo["HOTLINE"]: + error_mgr.ReportError("pkginfo-hotline-blank") + pkginfo_version = pkg_data["basic_stats"]["parsed_basename"]["full_version_string"] + if pkginfo_version != pkginfo["VERSION"]: + error_mgr.ReportError("filename-version-does-not-match-pkginfo-version", + "filename=%s pkginfo=%s" + % (pkginfo_version, pkginfo["VERSION"])) + if re.search(r"-", pkginfo["VERSION"]): + error_mgr.ReportError("pkginfo-minus-in-version", pkginfo["VERSION"]) + if not re.match(VERSION_RE, pkginfo["VERSION"]): + msg = "Should match %s" % VERSION_RE + error_mgr.ReportError("pkginfo-version-wrong-format", + pkginfo["VERSION"], + msg) + if pkginfo["ARCH"] not in ARCH_LIST: + error_mgr.ReportError( + "pkginfo-nonstandard-architecture", + pkginfo["ARCH"], + "known architectures: %s" % ARCH_LIST) + + +def CheckEmail(pkg_data, error_mgr, logger, messenger): + """Checks the e-mail address.""" + catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] + pkginfo = pkg_data["pkginfo"] + if not re.match(EMAIL_RE, pkginfo["EMAIL"]): + error_mgr.ReportError("pkginfo-email-not-opencsw-org", + "email=%s" % pkginfo["EMAIL"]) + + +def CheckPstamp(pkg_data, error_mgr, logger, messenger): + pkginfo = pkg_data["pkginfo"] + if "PSTAMP" in pkginfo: + if not re.match(common_constants.PSTAMP_RE, pkginfo["PSTAMP"]): + msg=("It should be 'username at hostname-timestamp', " + "but it's %s." % repr(pkginfo["PSTAMP"])) + error_mgr.ReportError("pkginfo-pstamp-in-wrong-format", pkginfo["PSTAMP"], msg) + else: + error_mgr.ReportError("pkginfo-pstamp-missing") + + +def DisabledCheckMissingSymbols(pkgs_data, error_mgr, logger, messenger): + """Analyzes missing symbols reported by ldd -r. + + 1. Collect triplets: pkgname, binary, missing symbol + 2. If there are any missing symbols, collect all the symbols that are provided + by the set of packages. + 3. From the list of missing symbols, remove all symbols that are provided + by the set of packages. + 4. Report any remaining symbols as errors. + + What indexes do we need? + + symbol -> (pkgname, binary) + set(allsymbols) + """ + missing_symbols = [] + all_symbols = set() + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries = pkg_data["binaries"] + for binary in binaries: + for ldd_elem in pkg_data["ldd_dash_r"][binary]: + if ldd_elem["state"] == "symbol-not-found": + missing_symbols.append((pkgname, + binary, + ldd_elem["symbol"])) + for symbol in pkg_data["defined_symbols"][binary]: + all_symbols.add(symbol) + # Remove symbols defined elsewhere. + while missing_symbols: + ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() + if ms_symbol not in all_symbols: + error_mgr.ReportError("symbol-not-found", "%s %s" % (ms_binary, ms_symbol)) + + +def CheckBuildingUser(pkg_data, error_mgr, logger, messenger): + pkgname = pkg_data["basic_stats"]["pkgname"] + username = checkpkg.ExtractBuildUsername(pkg_data["pkginfo"]) + for entry in pkg_data["pkgmap"]: + if entry["user"] and entry["user"] == username: + error_mgr.ReportError("file-owned-by-building-user" + "%s, %s" % (entry["path"], entry["user"])) + + +def CheckDisallowedPaths(pkg_data, error_mgr, logger, messenger): + """Checks for disallowed paths, such as common paths.""" + arch = pkg_data["pkginfo"]["ARCH"] + # Common paths read from the file are absolute, e.g. /opt/csw/lib + # while paths in pkginfo are relative, e.g. opt/csw/lib. + common_paths = [] + for common_path in error_mgr.GetCommonPaths(arch): + if common_path.startswith("/"): + common_path = common_path[1:] + common_paths.append(common_path) + paths_only_allowed_in = copy.copy(PATHS_ALLOWED_ONLY_IN) + ss = paths_only_allowed_in["CSWcommon"]["string"] + paths_only_allowed_in["CSWcommon"]["string"] = set(ss).union(common_paths) + # Compile all the regex expressions ahead of time. + for pkgname in paths_only_allowed_in: + if "regex" in paths_only_allowed_in[pkgname]: + regexes = paths_only_allowed_in[pkgname]["regex"] + paths_only_allowed_in[pkgname]["regex"] = map(re.compile, regexes) + if "string" in paths_only_allowed_in[pkgname]: + paths_only_allowed_in[pkgname]["string"] = set( + paths_only_allowed_in[pkgname]["string"]) + paths_in_pkg = set() + for entry in pkg_data["pkgmap"]: + entry_path = entry["path"] + if not entry_path: + continue + if entry_path.startswith("/"): + entry_path = entry_path[1:] + paths_in_pkg.add(entry_path) + for pkgname in paths_only_allowed_in: + if pkgname != pkg_data["basic_stats"]["pkgname"]: + if "string" in paths_only_allowed_in[pkgname]: + ss = paths_only_allowed_in[pkgname]["string"] + intersection = ss.intersection(paths_in_pkg) + for path_in_pkg in intersection: + error_mgr.ReportError( + "disallowed-path", path_in_pkg, + "This path is already provided by %s " + "or is not allowed for other reasons." % pkgname) + if "regex" in paths_only_allowed_in[pkgname]: + rr = paths_only_allowed_in[pkgname]["regex"] + for disallowed_re in rr: + badpaths = filter(disallowed_re.match, paths_in_pkg) + for path_in_pkg in badpaths: + error_mgr.ReportError( + "disallowed-path", path_in_pkg, + "This path is already provided by %s " + "or is not allowed for other reasons." % pkgname) + + +def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger, messenger): + shared_libs = set(su.GetSharedLibs(pkg_data)) + for binary_info in pkg_data["binaries_dump_info"]: + for soname in binary_info["needed sonames"]: + if (binary_info["path"] in shared_libs + and + soname in common_constants.DO_NOT_LINK_AGAINST_THESE_SONAMES): + error_mgr.ReportError("linked-against-discouraged-library", + "%s %s" % (binary_info["base_name"], soname)) + + +def CheckDiscouragedFileNamePatterns(pkg_data, error_mgr, logger, messenger): + patterns = [(x, re.compile(x), y) for x, y in DISCOURAGED_FILE_PATTERNS] + for entry in pkg_data["pkgmap"]: + if entry["path"]: + for pattern, pattern_re, msg in patterns: + if pattern_re.search(entry["path"]): + error_mgr.ReportError("discouraged-path-in-pkgmap", + entry["path"]) + messenger.OneTimeMessage( + "discouraged-path-in-pkgmap-%s" % pattern, msg) + + +def CheckBadContent(pkg_data, error_mgr, logger, messenger): + for regex in pkg_data["bad_paths"]: + for file_name in pkg_data["bad_paths"][regex]: + messenger.Message( + "File %s contains bad content: %s. " + "If it's a legacy file you can't modify, " + "or if you investigated the issue and the string does not pose " + "a real issue, you can override this error. " + % (file_name, repr(regex))) + error_mgr.ReportError("file-with-bad-content", "%s %s" % (regex, file_name)) + + +def CheckPkgchk(pkg_data, error_mgr, logger, messenger): + if pkg_data["pkgchk"]["return_code"] != 0: + error_mgr.ReportError("pkgchk-failed-with-code", pkg_data["pkgchk"]["return_code"]) + for line in pkg_data["pkgchk"]["stderr_lines"]: + logger.warn(line) + +def CheckRpath(pkg_data, error_mgr, logger, messenger): + regex_whitelist = [re.compile(x) for x in RPATH_WHITELIST] + for binary_info in pkg_data["binaries_dump_info"]: + actual_rpaths = binary_info["runpath"] + matching = [] + not_matching = [] + for rpath in actual_rpaths: + matched = False + for white_re in regex_whitelist: + m = white_re.match(rpath) + if m: + matching.append((rpath, m.groupdict())) + matched = True + break + if matched: + matching.append(rpath) + else: + not_matching.append(rpath) + + for bad in sorted(not_matching): + logger.debug("Bad rpath: %s", bad) + error_mgr.ReportError( + "bad-rpath-entry", + "%s %s" % (bad, binary_info["path"])) + + +def DisabledCheckForMissingSymbols(pkgs_data, debug): + """Analyzes missing symbols reported by ldd -r. + + 1. Collect triplets: pkgname, binary, missing symbol + 2. If there are any missing symbols, collect all the symbols that are provided + by the set of packages. + 3. From the list of missing symbols, remove all symbols that are provided + by the set of packages. + 4. Report any remaining symbols as errors. + + What indexes do we need? + + symbol -> (pkgname, binary) + set(allsymbols) + """ + errors = [] + missing_symbols = [] + all_symbols = set() + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries = pkg_data["binaries"] + for binary in binaries: + for ldd_elem in pkg_data["ldd_dash_r"][binary]: + if ldd_elem["state"] == "symbol-not-found": + missing_symbols.append((pkgname, + binary, + ldd_elem["symbol"])) + for symbol in pkg_data["defined_symbols"][binary]: + all_symbols.add(symbol) + # Remove symbols defined elsewhere. + while missing_symbols: + ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() + if ms_symbol not in all_symbols: + errors.append(checkpkg.CheckpkgTag( + ms_pkgname, "symbol-not-found", "%s %s" % (ms_binary, ms_symbol))) + return errors + + +def DisabledCheckForMissingSymbolsDumb(pkg_data, error_mgr, logger, messenger): + """Analyzes missing symbols reported by ldd -r. + + So far only made sense for perl modules. Disables because it falls over on + big KDE packages. During pickling (serialization), Python runs out of memory. + """ + pkgname = pkg_data["basic_stats"]["pkgname"] + if not re.match(SYMBOLS_CHECK_ONLY_FOR, pkgname): + return + symbol_not_found_was_seen = False + relocation_was_seen = False + for binary_info in pkg_data["binaries_dump_info"]: + for ldd_elem in pkg_data["ldd_dash_r"][binary_info["path"]]: + if not symbol_not_found_was_seen and ldd_elem["state"] == "symbol-not-found": + error_mgr.ReportError("symbol-not-found", + "e.g. %s misses %s" % (binary_info["path"], ldd_elem["symbol"])) + symbol_not_found_was_seen = True + if (not relocation_was_seen + and + ldd_elem["state"] == 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility'): + error_mgr.ReportError(ldd_elem["state"], + "e.g. symbol: %s file: %s " + "relocation bound to a symbol with STV_PROTECTED visibility" + % (ldd_elem["symbol"], ldd_elem["path"])) + + +def SetCheckFileCollisions(pkgs_data, error_mgr, logger, messenger): + """Throw an error if two packages contain the same file. + + Directories don't count. The strategy is to create an in-memory index of + packages by filename. + """ + pkgs_by_path = {} + # File types are described at: + # http://docs.sun.com/app/docs/doc/816-5174/pkgmap-4?l=en&n=1&a=view + skip_file_types = set(["d"]) + pkgnames = set(x["basic_stats"]["pkgname"] for x in pkgs_data) + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + for pkgmap_entry in pkg_data["pkgmap"]: + if pkgmap_entry["path"] and pkgmap_entry["type"] not in skip_file_types: + if pkgmap_entry["path"] not in pkgs_by_path: + pkgs_by_path[pkgmap_entry["path"]] = set() + pkgs_by_path[pkgmap_entry["path"]].add(pkgname) + pkgs_in_db = error_mgr.GetPkgByPath(pkgmap_entry["path"]) + + # We need to simulate package removal before next install. We want to + # throw an error if two new packages have a conflict; however, we + # don't want to throw an error in the following scenario: + # + # db: + # CSWfoo with /opt/csw/bin/foo + # + # new: + # CSWfoo - empty + # CSWfoo-utils with /opt/csw/bin/foo + # + # Here, CSWfoo-utils conflicts with CSWfoo from the database; but we + # don't need to check against CSWfoo in the database, but with with + # one in the package set under examination instead. + pkgs_in_db = pkgs_in_db.difference(pkgnames) + + pkgs_by_path[pkgmap_entry["path"]].update(pkgs_in_db) + # Traversing the data structure + for file_path in pkgs_by_path: + if len(pkgs_by_path[file_path]) > 1: + pkgnames = sorted(pkgs_by_path[file_path]) + for pkgname in pkgnames: + error_mgr.ReportError( + pkgname, + 'file-collision', + '%s %s' % (file_path, " ".join(pkgnames))) + + +def CheckPythonPackageName(pkg_data, error_mgr, logger, messenger): + """Checks for CSWpy-* and py_* package names.""" + pyfile_re = re.compile(r"/opt/csw/lib/python.*/.*") + pkgname = pkg_data["basic_stats"]["pkgname"] + has_py_files = False + example_py_file = "" + for pkgmap_entry in pkg_data["pkgmap"]: + if not pkgmap_entry["path"]: + continue + if pyfile_re.match(pkgmap_entry["path"]): + has_py_files = True + example_py_file = pkgmap_entry["path"] + break + if has_py_files and not pkgname.startswith("CSWpy-"): + error_mgr.ReportError("pkgname-does-not-start-with-CSWpy-") + messenger.Message("The package " + "installs files into /opt/csw/lib/python. For example, %s. " + "However, the pkgname doesn't start with 'CSWpy-'." + % repr(example_py_file)) + if has_py_files and not pkg_data["basic_stats"]["catalogname"].startswith("py_"): + error_mgr.ReportError("catalogname-does-not-start-with-py_") + messenger.Message("The package installs files into /opt/csw/lib/python. " + "For example, %s. " + "However, the catalogname doesn't start with 'py_'." + % repr(example_py_file)) + + +def CheckArchitecture(pkg_data, error_mgr, logger, messenger): + pkgname = pkg_data["basic_stats"]["pkgname"] + for metadata in pkg_data["files_metadata"]: + if "machine_id" not in metadata: + continue + logger.debug("CheckArchitecture(): %s", metadata) + machine_data = HACHOIR_MACHINES[metadata["machine_id"]] + cpu_type = machine_data["name"] + # allowed_paths needs to depend on the OS release. The OS release is + # only available from the file name. + os_release = pkg_data["basic_stats"]["parsed_basename"]["osrel"] + if os_release not in machine_data["allowed"]: + raise checkpkg.InternalDataError( + "%s not found in machine_data" % os_release) + allowed_paths = set(machine_data["allowed"][os_release]) + disallowed_paths = set(machine_data["disallowed"]) + path_parts = set(metadata["path"].split(os.path.sep)) + if not path_parts.intersection(allowed_paths): + error_mgr.ReportError( + "binary-architecture-does-not-match-placement", + "file=%s arch_id=%s arch_name=%s" % ( + metadata["path"], + metadata["machine_id"], + cpu_type)) + messenger.OneTimeMessage( + "binary-placement", + "Files compiled for specific architectures must be placed in " + "subdirectories that match the architecture. " + "For example, a sparcv8+ binary must not be placed under " + "/opt/csw/lib, but under /opt/csw/lib/sparcv8plus. " + "Typically, the case is that sparcv8+ binaries end up under bin/ " + "or under lib/ because of ignored CFLAGS. " + "For more information about the OpenCSW binary placement policy, " + "visit " + "http://www.opencsw.org/extend-it/contribute-packages/" + "build-standards/" + "architecture-optimization-using-isaexec-and-isalist/") + else: + for bad_path in path_parts.intersection(disallowed_paths): + error_mgr.ReportError( + "binary-disallowed-placement", + "file=%s arch_id=%s arch_name=%s bad_path=%s" % ( + metadata["path"], + metadata["machine_id"], + cpu_type, + bad_path)) + messenger.Message( + "The %s binary is placed in a disallowed path. " + "For example, a sparcv8+ binary must not be placed " + "under a directory named sparcv9. " + "For more information, visit " + "http://www.opencsw.org/extend-it/contribute-packages/" + "build-standards/" + "architecture-optimization-using-isaexec-and-isalist/") + + +def CheckWrongArchitecture(pkg_data, error_mgr, logger, messenger): + pkgname = pkg_data["basic_stats"]["pkgname"] + filename_arch = pkg_data["basic_stats"]["parsed_basename"]["arch"] + pkginfo_arch = pkg_data["pkginfo"]["ARCH"] + files_metadata = pkg_data["files_metadata"] + for file_metadata in files_metadata: @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Oct 29 11:35:54 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 29 Oct 2011 10:35:54 +0100 Subject: [csw-devel] SF.net SVN: gar:[16010] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: <23733EC6-1BC7-4CFC-8262-9BBD9B798E22@opencsw.org> References: <23733EC6-1BC7-4CFC-8262-9BBD9B798E22@opencsw.org> Message-ID: 2011/10/28 Dagobert Michelsen : > Hi Maciej, > > Am 27.10.2011 um 21:26 schrieb Maciej (Matchek) Blizi?ski: >> 2011/10/27 Dagobert Michelsen : >>>> swig_pydir_extra=$(libdir)/python/site-packages >>> >>> It is correct by default, so no need for hinting :-) >> >> Are you sure Dago? Also, what do you mean by correct? ?For example, >> our /opt/csw/lib/python/site-packages path is wrong, it should be >> /opt/csw/lib/python2.6/site-packages. > > Than it is wrong, I saw the previous path. The way to go is to move > the args to build stage instead of install stage. Sounds good. >> Subversion could put files into >> /opt/csw/lib/python/site-packages, which would be right given our >> wrong setup, but wrong according to the Python installation standard. >> >> I've seen that there are overrides for *.pyc files pointing at wrong paths. > > But we have lots of packages with that, right? I suggest sparing this for > "kiel" and just release svn 1.7.1 with the current pathes. I was planning to use versioned library directory for Python 2.7 and/or Python 3.1/3.2. Maciej From skayser at opencsw.org Sat Oct 29 12:04:30 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Sat, 29 Oct 2011 12:04:30 +0200 Subject: [csw-devel] SF.net SVN: gar:[16011] csw/mgar/pkg/libmemcached/trunk/Makefile In-Reply-To: References: Message-ID: <20111029100430.GY26160@sebastiankayser.de> * Maciej (Matchek) Blizi??ski wrote: > 2011/10/26 : > > +GARTYPE = 2 > > I think this needs to match the gar branch string, e.g. "v2". Yes, needs to be "v2" (or any other gar branch name). When GARTYPE is set, the usual fallbacks to svn:externals and the default of "v2" shouldn't trigger either, as GARTYPE takes precendence and overrides them, i.e. this build should have failed to find its gar/category.mk. Sebastian From maciej at opencsw.org Sat Oct 29 19:42:21 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 29 Oct 2011 18:42:21 +0100 Subject: [csw-devel] SF.net SVN: gar:[16010] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: <23733EC6-1BC7-4CFC-8262-9BBD9B798E22@opencsw.org> Message-ID: 2011/10/29 rupert THURNER : > i am not fully sure how you plan to implement this with gar, could you have > a look please? for the moment i just dropped the concerning lines, and it > built. i was also not sure about a quick way to test that the python > bindings. maybe try to clone a svn repository using (python based) mercurial > ... hmm. The first and simplest way is look at the paths. Here's an old pythonsvn package and its files: http://www.opencsw.org/search/pythonsvn/ If you get the same paths in the new package, it's quite likely good. You can then release it into unstable and ask the original bug reporter to test it. Maciej From wahwah at users.sourceforge.net Sun Oct 30 02:03:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 30 Oct 2011 00:03:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16033] csw/mgar/gar/v2/lib/web/templates/index.html Message-ID: Revision: 16033 http://gar.svn.sourceforge.net/gar/?rev=16033&view=rev Author: wahwah Date: 2011-10-30 00:03:43 +0000 (Sun, 30 Oct 2011) Log Message: ----------- pkgdb-web: Add a link to the RESTful URLs On the index page, add a link to the source code where RESTful URLs are listed. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/index.html Modified: csw/mgar/gar/v2/lib/web/templates/index.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/index.html 2011-10-28 12:29:35 UTC (rev 16032) +++ csw/mgar/gar/v2/lib/web/templates/index.html 2011-10-30 00:03:43 UTC (rev 16033) @@ -26,6 +26,14 @@ Error tags + +

    + There's also a read-only RESTful interface available. + For available URLs, please look at the URL + patterns in the source code. +

    + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 30 02:58:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 30 Oct 2011 00:58:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[16034] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 16034 http://gar.svn.sourceforge.net/gar/?rev=16034&view=rev Author: bdwalton Date: 2011-10-30 00:58:34 +0000 (Sun, 30 Oct 2011) Log Message: ----------- gar/v2: ensure that migrateconf handling is not applied to stub packages Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-10-30 00:03:43 UTC (rev 16033) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-10-30 00:58:34 UTC (rev 16034) @@ -218,7 +218,7 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg -MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) +MIGRATECONF ?= $(strip $(foreach S,$(filter-out $(OBSOLETED_PKGS),$(SPKG_SPECS)),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) # It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also _USERGROUP_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),/etc/opt/csw/pkg/$S/cswusergroup))) @@ -765,7 +765,7 @@ reset-merge-php5ext: @rm -f $(COOKIEDIR)/post-merge-php5ext -merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) +merge-migrateconf: $(foreach S,$(filter-out $(OBSOLETED_PKGS),$(SPKG_SPECS)),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(MAKECOOKIE) merge-migrateconf-%: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 30 10:07:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 30 Oct 2011 09:07:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16035] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 16035 http://gar.svn.sourceforge.net/gar/?rev=16035&view=rev Author: wahwah Date: 2011-10-30 09:07:13 +0000 (Sun, 30 Oct 2011) Log Message: ----------- pkgdb-web: A temp workaround for pkginfo encoding Non-utf-8 encoding of strings in pkginfo crashed the exporter. Handling one known case before a generic fix is developed. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-30 00:58:34 UTC (rev 16034) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-10-30 09:07:13 UTC (rev 16035) @@ -322,6 +322,18 @@ pkg = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne() data_structure = pkg.GetStatsStruct() web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=pkg-stats') + # There was a problem with bad utf-8 in the VENDOR field. + # This is a workaround. + if "VENDOR" in data_structure["pkginfo"]: + vendor = data_structure["pkginfo"]["VENDOR"] + if type(vendor) != unicode: + try: + vendor = unicode(vendor, 'utf-8') + except UnicodeDecodeError, e: + vendor = vendor.decode("utf-8", "ignore") + data_structure["pkginfo"]["VENDOR"] = ( + vendor + " (bad unicode detected)") + # The end of the hack. return json.dumps(data_structure, cls=PkgStatsEncoder) except sqlobject.main.SQLObjectNotFound, e: raise web.notfound() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 30 10:57:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 30 Oct 2011 09:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[16036] csw/mgar/gar/v2/lib/python/models.py Message-ID: Revision: 16036 http://gar.svn.sourceforge.net/gar/?rev=16036&view=rev Author: wahwah Date: 2011-10-30 09:57:30 +0000 (Sun, 30 Oct 2011) Log Message: ----------- pkgdb: comment: maintainer status field It would be good to have maintainer status as one of the fields. It requires some sort of integration with another (mantis?) database. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2011-10-30 09:07:13 UTC (rev 16035) +++ csw/mgar/gar/v2/lib/python/models.py 2011-10-30 09:57:30 UTC (rev 16036) @@ -48,6 +48,10 @@ """The maintainer of the package, identified by the e-mail address.""" email = sqlobject.UnicodeCol(length=255, unique=True, notNone=True) full_name = sqlobject.UnicodeCol(length=255, default=None) + # TODO: Add more fields: status (active/retired/unregistered) + # There are some emails that are just errors, it would be good to + # distinguish emails that once were velid @opencsw.org addresses from pure + # bugs, e.g. "someone at opencsw.or". def ObfuscatedEmail(self): username, domain = self.email.split("@") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 30 10:58:04 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 30 Oct 2011 09:58:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[16037] csw/mgar/gar/v2/lib/web/templates/MaintainerList. html Message-ID: Revision: 16037 http://gar.svn.sourceforge.net/gar/?rev=16037&view=rev Author: wahwah Date: 2011-10-30 09:58:04 +0000 (Sun, 30 Oct 2011) Log Message: ----------- pkgdb-web: Don't make the trailing space a link A small template cleanup. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/MaintainerList.html Modified: csw/mgar/gar/v2/lib/web/templates/MaintainerList.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/MaintainerList.html 2011-10-30 09:57:30 UTC (rev 16036) +++ csw/mgar/gar/v2/lib/web/templates/MaintainerList.html 2011-10-30 09:58:04 UTC (rev 16037) @@ -10,9 +10,7 @@
      $for username, domain, maintainer in maintainers
    • - - $username - + $username ($domain.replace(".", "!")) $if maintainer.full_name: $maintainer.full_name This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 30 13:22:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 30 Oct 2011 12:22:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[16038] csw/mgar/pkg/git/trunk Message-ID: Revision: 16038 http://gar.svn.sourceforge.net/gar/?rev=16038&view=rev Author: bdwalton Date: 2011-10-30 12:22:23 +0000 (Sun, 30 Oct 2011) Log Message: ----------- git/trunk: version bump, update libcurl development dependency Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-10-30 09:58:04 UTC (rev 16037) +++ csw/mgar/pkg/git/trunk/Makefile 2011-10-30 12:22:23 UTC (rev 16038) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.6.4 +VERSION = 1.7.7.1 #PATCHLEVEL = rc1 CATEGORIES = devel @@ -48,7 +48,7 @@ ARCHALL_CSWgit-doc = 1 ARCHALL_CSWgit-completion = 1 -BUILD_DEP_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel +BUILD_DEP_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWlibcurl-dev BUILD_DEP_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs BUILD_DEP_PKGS += CSWpython Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2011-10-30 09:58:04 UTC (rev 16037) +++ csw/mgar/pkg/git/trunk/checksums 2011-10-30 12:22:23 UTC (rev 16038) @@ -1 +1 @@ -e0b7afcc0e5e43bbb82f85598ae34bd8 git-1.7.6.4.tar.gz +7cfb3e7ea585037272a7ad8e35f4ac0a git-1.7.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 30 14:52:56 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 30 Oct 2011 13:52:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[16039] csw/mgar/pkg/git/trunk Message-ID: Revision: 16039 http://gar.svn.sourceforge.net/gar/?rev=16039&view=rev Author: bdwalton Date: 2011-10-30 13:52:56 +0000 (Sun, 30 Oct 2011) Log Message: ----------- git/trunk: drop a patch that no longer applies (affected file was removed) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0003-Update-path-in-sample-hook-file.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-10-30 12:22:23 UTC (rev 16038) +++ csw/mgar/pkg/git/trunk/Makefile 2011-10-30 13:52:56 UTC (rev 16039) @@ -101,7 +101,6 @@ PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch -PATCHFILES += 0003-Update-path-in-sample-hook-file.patch PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch PATCHFILES += 0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch # this patch is required on current9s (not necessarily all sparc boxes) due Deleted: csw/mgar/pkg/git/trunk/files/0003-Update-path-in-sample-hook-file.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0003-Update-path-in-sample-hook-file.patch 2011-10-30 12:22:23 UTC (rev 16038) +++ csw/mgar/pkg/git/trunk/files/0003-Update-path-in-sample-hook-file.patch 2011-10-30 13:52:56 UTC (rev 16039) @@ -1,26 +0,0 @@ -From 0aaf1ea1247f9821df75908d3343a0efe43cb3ac Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sat, 27 Nov 2010 15:25:31 +0100 -Subject: [PATCH] Update path in sample hook file - -The post-receive-email sample hook file referenced /usr/share. Update -this to be /opt/csw/share. - -Signed-off-by: Ben Walton ---- - templates/hooks--post-receive.sample | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample -index 7a83e17..aaa5121 100755 ---- a/templates/hooks--post-receive.sample -+++ b/templates/hooks--post-receive.sample -@@ -12,4 +12,4 @@ - # see contrib/hooks/ for a sample, or uncomment the next line and - # rename the file to "post-receive". - --#. /usr/share/doc/git-core/contrib/hooks/post-receive-email -+#. /opt/csw/share/doc/git/contrib/hooks/post-receive-email --- -1.7.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Oct 30 14:57:30 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 30 Oct 2011 13:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[16040] csw/mgar/pkg/git/trunk Message-ID: Revision: 16040 http://gar.svn.sourceforge.net/gar/?rev=16040&view=rev Author: bdwalton Date: 2011-10-30 13:57:30 +0000 (Sun, 30 Oct 2011) Log Message: ----------- git/trunk: resequence patch numbers to make future patching nicer Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch csw/mgar/pkg/git/trunk/files/0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch csw/mgar/pkg/git/trunk/files/0005-Force-en_US.UTF-8-for-a-git-svn-test.patch Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-10-30 13:52:56 UTC (rev 16039) +++ csw/mgar/pkg/git/trunk/Makefile 2011-10-30 13:57:30 UTC (rev 16040) @@ -101,11 +101,11 @@ PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch -PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch -PATCHFILES += 0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch +PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch +PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch # this patch is required on current9s (not necessarily all sparc boxes) due # to the selection of available utf8 locales. -PATCHFILES_isa-sparcv8 += 0006-Force-en_US.UTF-8-for-a-git-svn-test.patch +PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Copied: csw/mgar/pkg/git/trunk/files/0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch (from rev 15145, csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch) =================================================================== --- csw/mgar/pkg/git/trunk/files/0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch 2011-10-30 13:57:30 UTC (rev 16040) @@ -0,0 +1,36 @@ +From 97a0f24b6e27759fc1f22fc513fc7a7133cfd749 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 27 Nov 2010 15:37:56 +0100 +Subject: [PATCH] Use bash and set PATH in contributed hook file + +Now that we're shipping this contributed hook, we should give it a chance +of running in an OpenCSW environment. + +Signed-off-by: Ben Walton +--- + contrib/hooks/post-receive-email | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email +index 0085086..8601a84 100755 +--- a/contrib/hooks/post-receive-email ++++ b/contrib/hooks/post-receive-email +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # Copyright (c) 2007 Andy Parkins + # +@@ -68,6 +68,9 @@ + # give information for debugging. + # + ++# Added by OpenCSW to ensure we have a sane place to find our git ++PATH=/opt/csw/bin:$PATH ++ + # ---------------------------- Functions + + # +-- +1.7.3 + Copied: csw/mgar/pkg/git/trunk/files/0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch (from rev 15145, csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch) =================================================================== --- csw/mgar/pkg/git/trunk/files/0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch 2011-10-30 13:57:30 UTC (rev 16040) @@ -0,0 +1,31 @@ +From ff5bf85995a459ded56e68fb4c4edef05380550d Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 2 Feb 2011 04:26:57 +0100 +Subject: [PATCH] Add OpenCSW apache2 path to instaweb search path + +We make sure that git instaweb will prefer our own apache2 if it is +available, but leave all the other options available to. This will +require a checkpkg override on the /usr/local path and a note at +release time. + +Signed-off-by: Ben Walton +--- + git-instaweb.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/git-instaweb.sh b/git-instaweb.sh +index 10fcebb..7fc62f7 100755 +--- a/git-instaweb.sh ++++ b/git-instaweb.sh +@@ -75,7 +75,7 @@ resolve_full_httpd () { + # these days and those are not in most users $PATHs + # in addition, we may have generated a server script + # in $fqgitdir/gitweb. +- for i in /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb" ++ for i in /opt/csw/apache2/sbin /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb" + do + if test -x "$i/$httpd_only" + then +-- +1.7.3.2 + Deleted: csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch 2011-10-30 13:52:56 UTC (rev 16039) +++ csw/mgar/pkg/git/trunk/files/0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch 2011-10-30 13:57:30 UTC (rev 16040) @@ -1,36 +0,0 @@ -From 97a0f24b6e27759fc1f22fc513fc7a7133cfd749 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sat, 27 Nov 2010 15:37:56 +0100 -Subject: [PATCH] Use bash and set PATH in contributed hook file - -Now that we're shipping this contributed hook, we should give it a chance -of running in an OpenCSW environment. - -Signed-off-by: Ben Walton ---- - contrib/hooks/post-receive-email | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email -index 0085086..8601a84 100755 ---- a/contrib/hooks/post-receive-email -+++ b/contrib/hooks/post-receive-email -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # Copyright (c) 2007 Andy Parkins - # -@@ -68,6 +68,9 @@ - # give information for debugging. - # - -+# Added by OpenCSW to ensure we have a sane place to find our git -+PATH=/opt/csw/bin:$PATH -+ - # ---------------------------- Functions - - # --- -1.7.3 - Deleted: csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch 2011-10-30 13:52:56 UTC (rev 16039) +++ csw/mgar/pkg/git/trunk/files/0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch 2011-10-30 13:57:30 UTC (rev 16040) @@ -1,31 +0,0 @@ -From ff5bf85995a459ded56e68fb4c4edef05380550d Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 2 Feb 2011 04:26:57 +0100 -Subject: [PATCH] Add OpenCSW apache2 path to instaweb search path - -We make sure that git instaweb will prefer our own apache2 if it is -available, but leave all the other options available to. This will -require a checkpkg override on the /usr/local path and a note at -release time. - -Signed-off-by: Ben Walton ---- - git-instaweb.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/git-instaweb.sh b/git-instaweb.sh -index 10fcebb..7fc62f7 100755 ---- a/git-instaweb.sh -+++ b/git-instaweb.sh -@@ -75,7 +75,7 @@ resolve_full_httpd () { - # these days and those are not in most users $PATHs - # in addition, we may have generated a server script - # in $fqgitdir/gitweb. -- for i in /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb" -+ for i in /opt/csw/apache2/sbin /usr/local/sbin /usr/sbin "$root" "$fqgitdir/gitweb" - do - if test -x "$i/$httpd_only" - then --- -1.7.3.2 - Copied: csw/mgar/pkg/git/trunk/files/0005-Force-en_US.UTF-8-for-a-git-svn-test.patch (from rev 15145, csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch) =================================================================== --- csw/mgar/pkg/git/trunk/files/0005-Force-en_US.UTF-8-for-a-git-svn-test.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0005-Force-en_US.UTF-8-for-a-git-svn-test.patch 2011-10-30 13:57:30 UTC (rev 16040) @@ -0,0 +1,32 @@ +From f2a93f88203f1c1331d7e06c46ac4066d0eef2bc Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 3 May 2011 04:50:15 +0200 +Subject: [PATCH] Force en_US.UTF-8 for a git-svn test + +This test fails when the UTF8 detection picks fr.UTF-8. Force it's hand +in this matter. This patch should only be applied on current9s for now. + +Signed-off-by: Ben Walton +--- + t/t9129-git-svn-i18n-commitencoding.sh | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + +diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh +index 8cfdfe7..dd570b6 100755 +--- a/t/t9129-git-svn-i18n-commitencoding.sh ++++ b/t/t9129-git-svn-i18n-commitencoding.sh +@@ -14,10 +14,7 @@ compare_git_head_with () { + test_cmp current "$1" + } + +-a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{ +- p +- q +-}') ++a_utf8_locale=en_US.UTF-8 + + if test -n "$a_utf8_locale" + then +-- +1.7.3.2 + Deleted: csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch 2011-10-30 13:52:56 UTC (rev 16039) +++ csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch 2011-10-30 13:57:30 UTC (rev 16040) @@ -1,32 +0,0 @@ -From f2a93f88203f1c1331d7e06c46ac4066d0eef2bc Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Tue, 3 May 2011 04:50:15 +0200 -Subject: [PATCH] Force en_US.UTF-8 for a git-svn test - -This test fails when the UTF8 detection picks fr.UTF-8. Force it's hand -in this matter. This patch should only be applied on current9s for now. - -Signed-off-by: Ben Walton ---- - t/t9129-git-svn-i18n-commitencoding.sh | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh -index 8cfdfe7..dd570b6 100755 ---- a/t/t9129-git-svn-i18n-commitencoding.sh -+++ b/t/t9129-git-svn-i18n-commitencoding.sh -@@ -14,10 +14,7 @@ compare_git_head_with () { - test_cmp current "$1" - } - --a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{ -- p -- q --}') -+a_utf8_locale=en_US.UTF-8 - - if test -n "$a_utf8_locale" - then --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Oct 30 16:50:13 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 30 Oct 2011 15:50:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16041] csw/mgar/pkg/sasl/trunk/files/ 0001-Install-plugin-at-proper-location.patch Message-ID: Revision: 16041 http://gar.svn.sourceforge.net/gar/?rev=16041&view=rev Author: guengel Date: 2011-10-30 15:50:13 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Patch for installing plugins at proper place. Added Paths: ----------- csw/mgar/pkg/sasl/trunk/files/0001-Install-plugin-at-proper-location.patch Added: csw/mgar/pkg/sasl/trunk/files/0001-Install-plugin-at-proper-location.patch =================================================================== --- csw/mgar/pkg/sasl/trunk/files/0001-Install-plugin-at-proper-location.patch (rev 0) +++ csw/mgar/pkg/sasl/trunk/files/0001-Install-plugin-at-proper-location.patch 2011-10-30 15:50:13 UTC (rev 16041) @@ -0,0 +1,56 @@ +From 761c2cf16086430bfbd76d07bc9efdbd957762d2 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Mon, 17 Oct 2011 21:42:30 +0200 +Subject: [PATCH] Install plugin at proper location + +--- + Makefile.in | 18 +----------------- + plugins/Makefile.in | 3 ++- + 2 files changed, 3 insertions(+), 18 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 8cee0e4..764fd68 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -834,23 +834,7 @@ dist-hook: + @find $(distdir) -name CVS -print | xargs -t rm -rf + (cd $(distdir)/plugins && sh makeinit.sh) + install-exec-local: $(INSTALLOSX) +- @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \ +- echo "********************************************************"; \ +- echo "* WARNING:"; \ +- echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \ +- echo "* but the library will look for them in $(plugindir)."; \ +- echo "* You need to make sure that the plugins will eventually"; \ +- echo "* be in $(plugindir) -- the easiest way is to make a"; \ +- echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \ +- echo "* but this may not be appropriate for your site, so this"; \ +- echo "* installation procedure won't do it for you."; \ +- echo "*"; \ +- echo "* If you don't want to do this for some reason, you can"; \ +- echo "* set the location where the library will look for plugins"; \ +- echo "* by setting the environment variable SASL_PATH to the path"; \ +- echo "* the library should use."; \ +- echo "********************************************************"; \ +- fi ++ + install-exec-local-osx: + $(mkinstalldirs) $(framedir)/Versions/A/Headers + $(mkinstalldirs) $(framedir)/Versions/A/Resources +diff --git a/plugins/Makefile.in b/plugins/Makefile.in +index 3ecf9b5..f30c804 100644 +--- a/plugins/Makefile.in ++++ b/plugins/Makefile.in +@@ -368,7 +368,8 @@ COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ + EXTRA_DIST = makeinit.sh NTMakefile + noinst_SCRIPTS = makeinit.sh + common_sources = plugin_common.c plugin_common.h +-sasldir = $(prefix)/lib/sasl2 ++# We want them to have installed in the proper location ++sasldir = $(plugindir) + sasl_LTLIBRARIES = @SASL_MECHS@ + EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \ + libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \ +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Oct 30 16:52:02 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 30 Oct 2011 15:52:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[16042] csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init Message-ID: Revision: 16042 http://gar.svn.sourceforge.net/gar/?rev=16042&view=rev Author: guengel Date: 2011-10-30 15:52:02 +0000 (Sun, 30 Oct 2011) Log Message: ----------- SMF will not be enabled by default. Made pgrep safe. Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init Modified: csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init =================================================================== --- csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init 2011-10-30 15:50:13 UTC (rev 16041) +++ csw/mgar/pkg/sasl/trunk/files/cswsaslauthd.init 2011-10-30 15:52:02 UTC (rev 16042) @@ -12,6 +12,7 @@ #RC_SNUM 85 #RC_KLEV 0,1,2,S #RC_SLEV 2 +#AUTOENABLE no INIT_FILE=/etc/opt/csw/saslauthd.init if [ ! -f "${INIT_FILE}" ]; then @@ -47,7 +48,7 @@ } stop() { - if test "x`pgrep saslauthd`" != x; then + if test "x`pgrep -x saslauthd`" != x; then echo "Stopping saslauthd " pkill saslauthd echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Oct 30 16:52:42 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 30 Oct 2011 15:52:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16043] csw/mgar/pkg/sasl/trunk/files Message-ID: Revision: 16043 http://gar.svn.sourceforge.net/gar/?rev=16043&view=rev Author: guengel Date: 2011-10-30 15:52:42 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Removed unneeded files. Removed Paths: ------------- csw/mgar/pkg/sasl/trunk/files/CSWsasl.prototype csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.postinstall csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.preremove csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.prototype csw/mgar/pkg/sasl/trunk/files/saslauthd-doc.diff csw/mgar/pkg/sasl/trunk/files/saslauthd-groff.diff Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsasl.prototype =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsasl.prototype 2011-10-30 15:52:02 UTC (rev 16042) +++ csw/mgar/pkg/sasl/trunk/files/CSWsasl.prototype 2011-10-30 15:52:42 UTC (rev 16043) @@ -1,145 +0,0 @@ -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/sasl 0755 root bin -f none /opt/csw/include/sasl/hmac-md5.h 0644 root bin -f none /opt/csw/include/sasl/md5.h 0644 root bin -f none /opt/csw/include/sasl/md5global.h 0644 root bin -f none /opt/csw/include/sasl/prop.h 0644 root bin -f none /opt/csw/include/sasl/sasl.h 0644 root bin -f none /opt/csw/include/sasl/saslplug.h 0644 root bin -f none /opt/csw/include/sasl/saslutil.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libsasl2.la 0755 root bin -f none /opt/csw/lib/libsasl2.so.2.0.22 0755 root bin -s none /opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 root bin -s none /opt/csw/lib/libsasl2.so=libsasl2.so.2.0.22 root bin -d none /opt/csw/lib/sasl2 0755 root bin -f none /opt/csw/lib/sasl2/libanonymous.la 0755 root bin -f none /opt/csw/lib/sasl2/libanonymous.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libanonymous.so.2=libanonymous.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libanonymous.so=libanonymous.so.2.0.22 root bin -f none /opt/csw/lib/sasl2/libcrammd5.la 0755 root bin -f none /opt/csw/lib/sasl2/libcrammd5.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libcrammd5.so.2=libcrammd5.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libcrammd5.so=libcrammd5.so.2.0.22 root bin -f none /opt/csw/lib/sasl2/libdigestmd5.la 0755 root bin -f none /opt/csw/lib/sasl2/libdigestmd5.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libdigestmd5.so.2=libdigestmd5.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libdigestmd5.so=libdigestmd5.so.2.0.22 root bin -f none /opt/csw/lib/sasl2/liblogin.la 0755 root bin -f none /opt/csw/lib/sasl2/liblogin.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/liblogin.so.2=liblogin.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/liblogin.so=liblogin.so.2.0.22 root bin -f none /opt/csw/lib/sasl2/libotp.la 0755 root bin -f none /opt/csw/lib/sasl2/libotp.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libotp.so.2=libotp.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libotp.so=libotp.so.2.0.22 root bin -f none /opt/csw/lib/sasl2/libplain.la 0755 root bin -f none /opt/csw/lib/sasl2/libplain.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libplain.so.2=libplain.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libplain.so=libplain.so.2.0.22 root bin -f none /opt/csw/lib/sasl2/libsasldb.la 0755 root bin -f none /opt/csw/lib/sasl2/libsasldb.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libsasldb.so.2=libsasldb.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libsasldb.so=libsasldb.so.2.0.22 root bin -d none /opt/csw/sbin 0755 root bin -f none /opt/csw/sbin/sasldblistusers2 0755 root bin -f none /opt/csw/sbin/saslpasswd2 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/sasl 0755 root bin -f none /opt/csw/share/doc/sasl/README.CSW 0644 root bin -f none /opt/csw/share/doc/sasl/ONEWS 0644 root bin -f none /opt/csw/share/doc/sasl/TODO 0644 root bin -f none /opt/csw/share/doc/sasl/advanced.html 0644 root bin -f none /opt/csw/share/doc/sasl/appconvert.html 0644 root bin -f none /opt/csw/share/doc/sasl/components.html 0644 root bin -f none /opt/csw/share/doc/sasl/draft-burdis-cat-srp-sasl-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-ietf-sasl-anon-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-ietf-sasl-crammd5-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-ietf-sasl-gssapi-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-ietf-sasl-plain-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-ietf-sasl-rfc2222bis-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-ietf-sasl-rfc2831bis-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-ietf-sasl-saslprep-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-murchison-sasl-login-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-newman-sasl-c-api-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/draft-newman-sasl-passdss-xx.txt 0644 root bin -f none /opt/csw/share/doc/sasl/gssapi.html 0644 root bin -f none /opt/csw/share/doc/sasl/index.html 0644 root bin -f none /opt/csw/share/doc/sasl/install.html 0644 root bin -f none /opt/csw/share/doc/sasl/macosx.html 0644 root bin -f none /opt/csw/share/doc/sasl/mechanisms.html 0644 root bin -f none /opt/csw/share/doc/sasl/options.html 0644 root bin -f none /opt/csw/share/doc/sasl/plugprog.html 0644 root bin -f none /opt/csw/share/doc/sasl/programming.html 0644 root bin -f none /opt/csw/share/doc/sasl/readme.html 0644 root bin -f none /opt/csw/share/doc/sasl/rfc1321.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc1939.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2104.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2195.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2222.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2243.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2245.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2289.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2444.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2595.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2831.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc2945.txt 0644 root bin -f none /opt/csw/share/doc/sasl/rfc3174.txt 0644 root bin -f none /opt/csw/share/doc/sasl/server-plugin-flow.fig 0644 root bin -f none /opt/csw/share/doc/sasl/sysadmin.html 0644 root bin -f none /opt/csw/share/doc/sasl/testing.txt 0644 root bin -f none /opt/csw/share/doc/sasl/upgrading.html 0644 root bin -f none /opt/csw/share/doc/sasl/windows.html 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/sasl.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_authorize_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_auxprop.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_auxprop_getctx.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_auxprop_request.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_callbacks.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_canon_user_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_chalprompt_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_checkapop.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_checkpass.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_client_init.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_client_new.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_client_start.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_client_step.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_decode.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_dispose.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_done.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_encode.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_encodev.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_errdetail.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_errors.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_errstring.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_getopt_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_getpath_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_getprop.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_getrealm_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_getsecret_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_getsimple_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_global_listmech.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_idle.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_listmech.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_log_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_server_init.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_server_new.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_server_start.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_server_step.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_server_userdb_checkpass_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_server_userdb_setpass_t.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_setpass.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_setprop.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_user_exists.3 0644 root bin -f none /opt/csw/share/man/man3/sasl_verifyfile_t.3 0644 root bin -d none /opt/csw/share/man/man8 0755 root bin -f none /opt/csw/share/man/man8/sasldblistusers2.8 0644 root bin -f none /opt/csw/share/man/man8/saslpasswd2.8 0644 root bin -i copyright=CSWsasl.copyright -i depend=CSWsasl.depend -i pkginfo=CSWsasl.pkginfo -i postinstall=CSWsasl.postinstall -i preinstall=CSWsasl.preinstall Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.postinstall =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.postinstall 2011-10-30 15:52:02 UTC (rev 16042) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.postinstall 2011-10-30 15:52:42 UTC (rev 16043) @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi - -if [ "$autoenable_daemons" = "no" ] ; then - CONFDIR=$PKG_INSTALL_ROOT/opt/csw/etc - # check if the saslauthd.init file exists before overwriting it. - if [ ! -f $CONFDIR/saslauthd.init ] ; then - echo "saslauthd.init doesn't exists. Copying $CONFDIR/saslauthd.init.CSW to $CONFDIR/saslauthd.init" - cp -p $CONFDIR/saslauthd.init.CSW $CONFDIR/saslauthd.init - echo - fi -fi - -# Start the server again... -$PKG_INSTALL_ROOT/etc/init.d/cswsaslauthd start - - -# Display message -echo '***' -echo '*** See README.CSW in /opt/csw/share/doc/saslauthd **' -echo '***' - -exit 0 Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.preremove =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.preremove 2011-10-30 15:52:02 UTC (rev 16042) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.preremove 2011-10-30 15:52:42 UTC (rev 16043) @@ -1,6 +0,0 @@ -# Stops the server if running... -if [ -x /etc/init.d/cswsaslauthd ]; then - /etc/init.d/cswsaslauthd stop -fi -exit 0 - Deleted: csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.prototype =================================================================== --- csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.prototype 2011-10-30 15:52:02 UTC (rev 16042) +++ csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.prototype 2011-10-30 15:52:42 UTC (rev 16043) @@ -1,28 +0,0 @@ -i copyright=CSWsaslauthd.copyright -i depend=CSWsaslauthd.depend -i pkginfo=CSWsaslauthd.pkginfo -i postinstall=CSWsaslauthd.postinstall -i preinstall=CSWsaslauthd.preremove -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/saslauthd.init.CSW=saslauthd.init.CSW 0755 root bin -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/testsaslauthd 0755 root bin -d none /opt/csw/sbin 0755 root bin -f none /opt/csw/sbin/saslauthd 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man8 0755 root bin -f none /opt/csw/share/man/man8/saslauthd.8 0644 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/saslauthd 0755 root bin -f none /opt/csw/share/doc/saslauthd/LDAP_SASLAUTHD 0644 root bin -f none /opt/csw/share/doc/saslauthd/README.CSW 0644 root bin -d none /var/opt 0755 root bin -d none /var/opt/csw 0755 root bin -d none /var/opt/csw/saslauthd 2770 root sasl -f none /etc/init.d/cswsaslauthd=cswsaslauthd.init 0755 root sys -s none /etc/rc2.d/S85cswsaslauthd=../init.d/cswsaslauthd -s none /etc/rc0.d/K15cswsaslauthd=../init.d/cswsaslauthd -s none /etc/rc1.d/K15cswsaslauthd=../init.d/cswsaslauthd -s none /etc/rc2.d/K15cswsaslauthd=../init.d/cswsaslauthd -s none /etc/rcS.d/K15cswsaslauthd=../init.d/cswsaslauthd Deleted: csw/mgar/pkg/sasl/trunk/files/saslauthd-doc.diff =================================================================== --- csw/mgar/pkg/sasl/trunk/files/saslauthd-doc.diff 2011-10-30 15:52:02 UTC (rev 16042) +++ csw/mgar/pkg/sasl/trunk/files/saslauthd-doc.diff 2011-10-30 15:52:42 UTC (rev 16043) @@ -1,47 +0,0 @@ -diff --speed-large-files --minimal -Nru cyrus-sasl-2.1.21.orig/saslauthd/LDAP_SASLAUTHD cyrus-sasl-2.1.21/saslauthd/LDAP_SASLAUTHD ---- cyrus-sasl-2.1.21.orig/saslauthd/LDAP_SASLAUTHD 2006-02-12 07:13:05.501062000 -0500 -+++ cyrus-sasl-2.1.21/saslauthd/LDAP_SASLAUTHD 2006-02-12 07:12:35.567793000 -0500 -@@ -36,7 +36,7 @@ - 2. START SASLAUTHD WITH LDAP - ---------------------------- - --Create /usr/local/etc/saslauthd.conf and add the following (modify to fit your -+Create /opt/csw/etc/saslauthd.conf and add the following (modify to fit your - environment): - ldap_servers: ldap://10.1.1.15/ ldap://10.1.1.25/ - ldap_bind_dn: cn=operator,ou=Profile,o=foo.com -diff --speed-large-files --minimal -Nru cyrus-sasl-2.1.21.orig/saslauthd/saslauthd.mdoc cyrus-sasl-2.1.21/saslauthd/saslauthd.mdoc ---- cyrus-sasl-2.1.21.orig/saslauthd/saslauthd.mdoc 2006-02-12 07:13:05.415699000 -0500 -+++ cyrus-sasl-2.1.21/saslauthd/saslauthd.mdoc 2006-02-12 07:12:42.640224000 -0500 -@@ -71,7 +71,7 @@ - as the pathname to the named socket to listen on for - connection requests. This must be an absolute pathname, and MUST NOT - include the trailing "/mux". Note that the default for this value --is "/var/state/saslauthd" (or what was specified at compile time) -+is "/var/opt/csw/saslauthd" (or what was specified at compile time) - and that this directory must exist for saslauthd to function. - .It Fl n Ar threads - Use -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /opt/csw/etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -246,10 +246,10 @@ - servers. (Kerberos - was never intended to be used in this manner, anyway.) - .Sh FILES --.Bl -tag -width "/var/run/saslauthd/mux" --.It Pa /var/run/saslauthd/mux -+.Bl -tag -width "/var/opt/csw/saslauthd/mux" -+.It Pa /var/opt/csw/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /opt/csw/etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO Deleted: csw/mgar/pkg/sasl/trunk/files/saslauthd-groff.diff =================================================================== --- csw/mgar/pkg/sasl/trunk/files/saslauthd-groff.diff 2011-10-30 15:52:02 UTC (rev 16042) +++ csw/mgar/pkg/sasl/trunk/files/saslauthd-groff.diff 2011-10-30 15:52:42 UTC (rev 16043) @@ -1,24 +0,0 @@ -diff --speed-large-files --minimal -Nru cyrus-sasl-2.1.21.orig/saslauthd/Makefile.am cyrus-sasl-2.1.21/saslauthd/Makefile.am ---- cyrus-sasl-2.1.21.orig/saslauthd/Makefile.am 2006-02-12 07:42:01.758715000 -0500 -+++ cyrus-sasl-2.1.21/saslauthd/Makefile.am 2006-02-12 07:41:33.267463000 -0500 -@@ -32,7 +32,7 @@ - dist-hook: saslauthd.8 - - saslauthd.8: saslauthd.mdoc -- nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8 -+ sed -e '/.Sh/a\.ll 65' $(srcdir)/saslauthd.mdoc | gnroff -c -mdoc > $(srcdir)/saslauthd.8 - - install-data-local: saslauthd.8 - $(mkinstalldirs) $(DESTDIR)$(mandir)/cat8 -diff --speed-large-files --minimal -Nru cyrus-sasl-2.1.21.orig/saslauthd/Makefile.in cyrus-sasl-2.1.21/saslauthd/Makefile.in ---- cyrus-sasl-2.1.21.orig/saslauthd/Makefile.in 2006-02-12 07:42:01.785104000 -0500 -+++ cyrus-sasl-2.1.21/saslauthd/Makefile.in 2006-02-12 07:41:23.435575000 -0500 -@@ -614,7 +614,7 @@ - dist-hook: saslauthd.8 - - saslauthd.8: saslauthd.mdoc -- nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8 -+ sed -e '/.Sh/a\.ll 65' $(srcdir)/saslauthd.mdoc | gnroff -c -mdoc > $(srcdir)/saslauthd.8 - - install-data-local: saslauthd.8 - $(mkinstalldirs) $(DESTDIR)$(mandir)/cat8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Oct 30 16:58:23 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 30 Oct 2011 15:58:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[16044] csw/mgar/pkg/sasl/trunk/Makefile Message-ID: Revision: 16044 http://gar.svn.sourceforge.net/gar/?rev=16044&view=rev Author: guengel Date: 2011-10-30 15:58:23 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Some cleanups. More comments. Made it conform to check package. Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2011-10-30 15:52:42 UTC (rev 16043) +++ csw/mgar/pkg/sasl/trunk/Makefile 2011-10-30 15:58:23 UTC (rev 16044) @@ -14,11 +14,20 @@ MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ DISTNAME = cyrus-$(NAME)-$(VERSION) -DISTFILES = cyrus-$(NAME)-$(FILEVERSION).tar.gz -DISTFILES += cswsaslauthd.init saslauthd.init.CSW -DISTFILES += README.sasl README.saslauthd +# This file will be renamed to cswsaslauthd during install +DISTFILES += cswsaslauthd.init +DISTFILES += saslauthd.init.CSW +DISTFILES += README.sasl +DISTFILES += README.saslauthd -# PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff +# For some reason or another, plugins are installed in +# $(prefix)/lib/sasl2, regardless of what --with-plugindir is set +# to. This patch will make the install routine put the plugins to +# the path specified by --with-plugindir +PATCHFILES = 0001-Install-plugin-at-proper-location.patch +# This patch makes libtool honor -R properly, without this +# patch libtool discards -R options passed with LDFLAGS +PATCHFILES += ltmain.diff VENDOR_URL = http://asg.web.cmu.edu/sasl/ @@ -27,13 +36,12 @@ SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt RUNTIME_DEP_PKGS_CSWsasl += CSWbdb47 -RUNTIME_DEP_PKGS_CSWsasl += CSWoldaprt -RUNTIME_DEP_PKGS_CSWsasl += CSWkrb5lib RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2 PACKAGES += CSWsaslauthd CATALOGNAME_CSWsaslauthd = saslauthd SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon +RUNTIME_DEP_PKGS_CSWsaslauthd += CSWsasl RUNTIME_DEP_PKGS_CSWsaslauthd += CSWosslrt RUNTIME_DEP_PKGS_CSWsaslauthd += CSWoldaprt RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibcom-err3 @@ -41,18 +49,42 @@ RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5support0 +CHECKPKG_OVERRIDES_CSWsaslauthd += surplus-dependency|CSWsasl +PKGFILES_CSWsaslauthd = $(sysconfdir)/init.d/cswsaslauthd +PKGFILES_CSWsaslauthd += $(sysconfdir)/saslauthd.init.CSW +PKGFILES_CSWsaslauthd += $(sbindir)/testsaslauthd +PKGFILES_CSWsaslauthd += $(sbindir)/saslauthd +PKGFILES_CSWsaslauthd += $(mandir)/.*/saslauthd\.8 +PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/LDAP_SASLAUTHD +PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/README.saslauthd +PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/README.CSW +PKGFILES_CSWsaslauthd += /var/opt/csw/saslauthd PACKAGES += CSWsaslgssapi CATALOGNAME_CSWsaslgssapi = sasl_gssapi SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding -RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib -CHECKPKG_OVERRIDES_CSWsaslgssapi += surplus-dependency|CSWsasl +RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibkrb5support0 +CHECKPKG_OVERRIDES_CSWsaslgssapi += catalogname-does-not-match-pkgname|pkgname=CSWsaslgssapi|catalogname=sasl_gssapi|expected-catalogname=saslgssapi +PKGFILES_CSWsaslgssapi = $(call pkgfiles_lib,sasl2/libgs2.so) +PKGFILES_CSWsaslgssapi += $(call pkgfiles_lib,sasl2/libgssapiv2.so) PACKAGES += CSWsaslsql CATALOGNAME_CSWsaslsql = sasl_sql SPKG_DESC_CSWsaslsql = Cyrus Simple Authentication and Security Layer SQL Binding -RUNTIME_DEP_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql5rt CSWsqlite -CHECKPKG_OVERRIDES_CSWsaslsql += surplus-dependency|CSWsasl +RUNTIME_DEP_PKGS_CSWsaslsql = CSWsasl +# 2011-10-24 raos +# libpq 64-bit is not available on Solaris 10 x86. +ifneq ($(MODULATION),isa-amd64) +RUNTIME_DEP_PKGS_CSWsaslsql += CSWlibpq +endif +RUNTIME_DEP_PKGS_CSWsaslsql += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWsaslsql += CSWlibmysqlclient15 +CHECKPKG_OVERRIDES_CSWsaslsql += catalogname-does-not-match-pkgname|pkgname=CSWsaslsql|catalogname=sasl_sql|expected-catalogname=saslsql +PKGFILES_CSWsaslsql = $(call pkgfiles_lib,sasl2/libsql.so) PACKAGES += CSWlibsasl2-2 SPKG_DESC_CSWlibsasl2-2 = Simple authentication and security layer library, libsasl2.so.2 @@ -63,20 +95,30 @@ PKGFILES_CSWsasl-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-2 +BUILD_DEP_PKGS += CSWlibkrb5-dev +BUILD_DEP_PKGS += CSWmysql-dev +BUILD_DEP_PKGS += CSWlibpq +BUILD_DEP_PKGS += CSWoldapdevel +BUILD_DEP_PKGS += CSWlibsqlite3-dev +BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWbdb47devel + EXTRA_CFLAGS = -D__EXTENSIONS__ EXTRA_BUILD_ENV = _REENTRANT=1 -# EXTRA_LIB = $(prefix)/bdb47/lib - EXTRA_INC = /opt/csw/include/gssapi EXTRA_INC += /opt/csw/include/mysql EXTRA_INC += /opt/csw/postgresql/include # Do not use LD_OPTIONS as it breaks tests by using the installed libraries # before the newly built ones. -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -LD_OPTIONS = -L$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) +EXTRA_RUNPATH_ISALIST = $(EXTRA_RUNPATH_DIRS) +# We use EXTRA_RUNPATH for bdb to make sure it is linked against $(prefix)/bdb47/lib/$(MM_LIBDIR)) +# which silences the check deprecated-library message. +EXTRA_RUNPATH_DIRS = $(prefix)/bdb47/lib/$(MM_LIBDIR) +EXTRA_LDFLAGS = -L$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) +EXTRA_LDFLAGS += -L$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR)) BUILD64 = 1 NOISALIST = 1 @@ -88,52 +130,59 @@ CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-sql +CONFIGURE_ARGS += --enable-login +CONFIGURE_ARGS += --enable-plain +CONFIGURE_ARGS += --enable-cram +CONFIGURE_ARGS += --enable-digest +CONFIGURE_ARGS += --enable-scram +CONFIGURE_ARGS += --enable-otp +CONFIGURE_ARGS += --enable-gssapi CONFIGURE_ARGS += --with-bdb-libdir=$(abspath /opt/csw/bdb47/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd CONFIGURE_ARGS += --with-ipctype=unix CONFIGURE_ARGS += --with-ldap=$(libdir) +# SQLite3 is supported +CONFIGURE_ARGS += --with-sqlite=no +CONFIGURE_ARGS += --with-sqlite3=$(prefix) # Autoconf tries to find the directory with the shared lib in it. Because of the # ISA suffix for 64 bit we must specify the exact library location and add # the include directories manually. #CONFIGURE_ARGS += --with-mysql=$(libdir) CONFIGURE_ARGS += --with-mysql=$(libdir) +# 2011-10-24 raos +# libpq 64-bit is not available on Solaris 10 x86. +# Although the configure script figures this out, the build +# breaks complaining that libpq cannot be found for amd64. +ifneq ($(MODULATION),isa-amd64) CONFIGURE_ARGS += --with-pgsql=$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR)) +endif CONFIGURE_ARGS += --with-openssl=$(libdir) CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2 CONFIGURE_ARGS += --with-plugindir=$(libdir)/sasl2 -CONFIGURE_ARGS += --enable-login +CONFIGURE_ARGS += --with-configdir=$(libdir)/sasl2 # This is for 32/64 switching. We do this all by ourselves, do not use SASLs mechanism +# See also the patch 0001-Install-plugin-at-proper-location.patch CONFIGURE_ARGS += --without-lib-subdir SED=/usr/bin/sed EGREP=/usr/bin/egrep max_cmd_line=65535 +SED_USR_LOCAL= sed -e 's|/usr/local|/opt/csw|g' -#INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir - -PKGFILES_CSWsaslauthd = /etc/opt/csw/init.d/cswsaslauthd.init -PKGFILES_CSWsaslauthd += $(bindir)/testsaslauthd -PKGFILES_CSWsaslauthd += $(sbindir)/saslauthd -PKGFILES_CSWsaslauthd += $(mandir)/.*/saslauthd\.8 -PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/LDAP_SASLAUTHD -PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/README.saslauthd -PKGFILES_CSWsaslauthd += /var/opt/csw/saslauthd -PKGFILES_CSWsaslgssapi = $(libdir)/sasl2/libgssapiv2\..* -PKGFILES_CSWsaslsql = $(libdir)/sasl2/libsql\..* - MIGRATECONF = saslauthd.conf sasldb2 -PRESERVECONF = saslauthd.conf +PRESERVECONF = /etc/opt/csw/saslauthd.conf /etc/opt/csw/saslauthd.init -INITSMF = /etc/opt/csw/init.d/cswsaslauthd.init +INITSMF = /etc/opt/csw/init.d/cswsaslauthd CSWsasl_usergroup = :sasl:::::: include gar/category.mk -post-install-modulated: testsaslauthd install-testsaslauthd install-doc +post-install-modulated: install-doc fix-path-manpages ginstall -d $(DESTDIR)/etc/opt/csw/init.d/ - ginstall $(WORKDIR)/cswsaslauthd.init $(DESTDIR)/etc/opt/csw/init.d + ginstall $(WORKDIR)/saslauthd.init.CSW $(DESTDIR)/etc/opt/csw/ + ginstall $(WORKDIR)/cswsaslauthd.init $(DESTDIR)/etc/opt/csw/init.d/cswsaslauthd @$(MAKECOOKIE) DOC_FILES = rfc1321.txt \ @@ -180,21 +229,18 @@ TODO \ ONEWS -testsaslauthd: - cd $(WORKSRC)/saslauthd && make testsaslauthd - -install-testsaslauthd: - mkdir -p $(DESTDIR)$(bindir) - cp $(WORKSRC)/saslauthd/testsaslauthd $(DESTDIR)$(bindir) - mkdir -p $(DESTDIR)/var/opt/csw/saslauthd - install-doc: mkdir -p $(DESTDIR)$(docdir)/sasl cp $(WORKDIR)/README.sasl $(DESTDIR)$(docdir)/sasl/README.CSW list='$(DOC_FILES)'; for file in $$list; do \ - cp $(WORKSRC)/doc/$$file $(DESTDIR)$(docdir)/sasl; \ + $(SED_USR_LOCAL) $(WORKSRC)/doc/$$file > $(DESTDIR)$(docdir)/sasl/$$file; \ done mkdir -p $(DESTDIR)$(docdir)/saslauthd - cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(DESTDIR)$(docdir)/saslauthd + $(SED_USR_LOCAL) $(WORKSRC)/saslauthd/LDAP_SASLAUTHD > $(DESTDIR)$(docdir)/saslauthd/LDAP_SASLAUTHD cp $(WORKDIR)/README.saslauthd $(DESTDIR)$(docdir)/saslauthd/README.CSW +fix-path-manpages: + for f in $(DESTDIR)$(mandir)/*/*.? ; do \ + $(SED_USR_LOCAL) $$f > $$f.tmp ; \ + mv $$f.tmp $$f ; \ + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Oct 30 17:09:43 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 30 Oct 2011 16:09:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16045] csw/mgar/pkg/sasl/trunk/Makefile Message-ID: Revision: 16045 http://gar.svn.sourceforge.net/gar/?rev=16045&view=rev Author: guengel Date: 2011-10-30 16:09:42 +0000 (Sun, 30 Oct 2011) Log Message: ----------- sasl/trunk: Re-added DISTFILES for source tarball. Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2011-10-30 15:58:23 UTC (rev 16044) +++ csw/mgar/pkg/sasl/trunk/Makefile 2011-10-30 16:09:42 UTC (rev 16045) @@ -14,6 +14,7 @@ MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ DISTNAME = cyrus-$(NAME)-$(VERSION) +DISTFILES = cyrus-$(NAME)-$(FILEVERSION).tar.gz # This file will be renamed to cswsaslauthd during install DISTFILES += cswsaslauthd.init DISTFILES += saslauthd.init.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Oct 30 19:03:32 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 30 Oct 2011 18:03:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[16046] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 16046 http://gar.svn.sourceforge.net/gar/?rev=16046&view=rev Author: wilbury Date: 2011-10-30 18:03:32 +0000 (Sun, 30 Oct 2011) Log Message: ----------- php5/trunk: Fix build deps. Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-10-30 16:09:42 UTC (rev 16045) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-10-30 18:03:32 UTC (rev 16046) @@ -53,17 +53,17 @@ BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils -BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWcurldevel CSWjpeg +BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWmysql-dev CSWjpeg BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib CSWxpm CSWlibgdbm-dev CSWlibgmp10 BUILD_DEP_PKGS += CSWggettext-dev CSWossldevel CSWlibgd2 CSWbdb42devel BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev CSWimap-devel BUILD_DEP_PKGS += CSWoldapdevel CSWlibkrb5-dev CSWsasl CSWlibltdl7 -BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql5devel CSWunixodbc +BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql-dev CSWunixodbc BUILD_DEP_PKGS += CSWlibpq CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp -BUILD_DEP_PKGS += CSWsqlite3devel CSWaspell CSWhtmltidy CSWpostgresql +BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWhtmltidy CSWpostgresql # NOTE: I think this is a leftover bug. we shouldn't depend on two versions # of sqlite... -BUILD_DEP_PKGS += CSWsqlite +BUILD_DEP_PKGS += CSWlibsqlite3-0 PRESERVECONF = $(sysconfdir)/php.ini $(sysconfdir)/pear.conf PRESERVECONF += /opt/csw/apache2/etc/extra/httpd-php5.conf @@ -217,6 +217,7 @@ NOISALIST = 1 STRIP_LIBTOOL = 1 +PACKAGING_PLATFORMS = solaris10-i386 sysconfdir = /etc$(prefix)/php5 @@ -232,6 +233,8 @@ CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d ifeq ($(SAPI),ap2) +MYSQL_VER = 5.0 + CONFIGURE_ARGS += --enable-bcmath=shared CONFIGURE_ARGS += --enable-calendar=shared CONFIGURE_ARGS += --enable-cli @@ -289,14 +292,14 @@ CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --with-mssql=shared,$(prefix) CONFIGURE_ARGS += --with-mysql=shared,$(prefix) -CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/mysql5/bin/$(ISA_DEFAULT)/mysql_config +CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/bin/mysql_config-$(MYSQL_VER) CONFIGURE_ARGS += --with-ndbm CONFIGURE_ARGS += --with-openssl=shared,$(prefix) CONFIGURE_ARGS += --with-pcre-dir=$(prefix) CONFIGURE_ARGS += --with-pcre-regex # not documented, but you can pass the path to mysql_config directly # we need the 32-bit version, so we have to force this -CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/mysql5/bin/$(ISA_DEFAULT)/mysql_config +CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/bin/mysql_config-$(MYSQL_VER) CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(prefix)/postgresql CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Oct 30 22:00:56 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 30 Oct 2011 21:00:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[16047] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 16047 http://gar.svn.sourceforge.net/gar/?rev=16047&view=rev Author: wilbury Date: 2011-10-30 21:00:55 +0000 (Sun, 30 Oct 2011) Log Message: ----------- php5/trunk: Fix build deps. Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-10-30 18:03:32 UTC (rev 16046) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-10-30 21:00:55 UTC (rev 16047) @@ -53,7 +53,7 @@ BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils -BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWmysql-dev CSWjpeg +BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib CSWxpm CSWlibgdbm-dev CSWlibgmp10 BUILD_DEP_PKGS += CSWggettext-dev CSWossldevel CSWlibgd2 CSWbdb42devel BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev CSWimap-devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Oct 30 22:26:04 2011 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 30 Oct 2011 21:26:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[16048] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 16048 http://gar.svn.sourceforge.net/gar/?rev=16048&view=rev Author: wilbury Date: 2011-10-30 21:26:04 +0000 (Sun, 30 Oct 2011) Log Message: ----------- php5/trunk: Do not specify PACKAGING_PLATFORMS in recipe. Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-10-30 21:00:55 UTC (rev 16047) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-10-30 21:26:04 UTC (rev 16048) @@ -217,7 +217,7 @@ NOISALIST = 1 STRIP_LIBTOOL = 1 -PACKAGING_PLATFORMS = solaris10-i386 +# PACKAGING_PLATFORMS = solaris10-i386 sysconfdir = /etc$(prefix)/php5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 31 03:02:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 31 Oct 2011 02:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16049] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 16049 http://gar.svn.sourceforge.net/gar/?rev=16049&view=rev Author: bdwalton Date: 2011-10-31 02:02:16 +0000 (Mon, 31 Oct 2011) Log Message: ----------- git/trunk: skip svn tests until mantis 4854 is resolved Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-10-30 21:26:04 UTC (rev 16048) +++ csw/mgar/pkg/git/trunk/Makefile 2011-10-31 02:02:16 UTC (rev 16049) @@ -12,6 +12,10 @@ # TEST_SCRIPTS = TEST_TARGET = test +# This is just until mantis 4854 is resolved +NO_SVN_TESTS = 1 +EXTRA_TEST_EXPORTS = NO_SVN_TESTS + PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 31 03:46:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 31 Oct 2011 02:46:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[16050] csw/mgar/gar/v2/bin/find_unpackaged Message-ID: Revision: 16050 http://gar.svn.sourceforge.net/gar/?rev=16050&view=rev Author: bdwalton Date: 2011-10-31 02:46:33 +0000 (Mon, 31 Oct 2011) Log Message: ----------- mgar/v2: add a script that can detect files installed in DESTDIR that are not in a prototype Added Paths: ----------- csw/mgar/gar/v2/bin/find_unpackaged Added: csw/mgar/gar/v2/bin/find_unpackaged =================================================================== --- csw/mgar/gar/v2/bin/find_unpackaged (rev 0) +++ csw/mgar/gar/v2/bin/find_unpackaged 2011-10-31 02:46:33 UTC (rev 16050) @@ -0,0 +1,40 @@ +#!/opt/csw/bin/perl + +# A quick hack of a script to find files that are not added to any +# package The idea is that we build a list of files from the main +# prototype file in build-global. Then, we look for each arch +# specific prototype and remove files that we see there from the +# global list. Any remaining file is not listed in a package +# prototype and therefore won't be delivered to client systems. + +# We expect a path to build-global as an argument. No error checking +# is done on this. + +chdir $ARGV[0]; +$proc = `uname -p`; + at ptypes = glob("*prototype-$proc"); +%ptype_whole = (); + +open (MAINPTYPE, "prototype") or die "Couldn't open full prototype.\n"; +while () { + @parts = split(/\s+/, $_); + next if $parts[0] eq 'i'; + # store references to each file. remove these while traversing + # sub-package prototypes + $ptype_whole{$parts[2]} = 1; +} +close(MAINPTYPE); + +foreach $ptype (@ptypes) { + open(PTYPE, "$ptype") or die "Couldn't open prototype $ptype.\n"; + while () { + @parts = split(/\s+/, $_); + next if $parts[0] eq 'i'; + delete $ptype_whole{$parts[2]}; + } + close(PTYPE); +} + +foreach $k (keys %ptype_whole) { + print "$k\n"; +} Property changes on: csw/mgar/gar/v2/bin/find_unpackaged ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 31 03:54:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 31 Oct 2011 02:54:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[16051] csw/mgar/pkg/git/trunk Message-ID: Revision: 16051 http://gar.svn.sourceforge.net/gar/?rev=16051&view=rev Author: bdwalton Date: 2011-10-31 02:54:32 +0000 (Mon, 31 Oct 2011) Log Message: ----------- git/trunk: patch out a few usr/share references Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0006-Patch-out-a-few-usr-share-references.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-10-31 02:46:33 UTC (rev 16050) +++ csw/mgar/pkg/git/trunk/Makefile 2011-10-31 02:54:32 UTC (rev 16051) @@ -110,6 +110,7 @@ # this patch is required on current9s (not necessarily all sparc boxes) due # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch +PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0006-Patch-out-a-few-usr-share-references.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0006-Patch-out-a-few-usr-share-references.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0006-Patch-out-a-few-usr-share-references.patch 2011-10-31 02:54:32 UTC (rev 16051) @@ -0,0 +1,34 @@ +From d2bae3e1637a0bf412c0223272bf402f66931f0b Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 31 Oct 2011 03:51:55 +0100 +Subject: [PATCH] Patch out a few usr/share references + +The post-receive-email sample hook had usr/share references. Correct +these for OpenCSW. + +Signed-off-by: Ben Walton +--- + contrib/hooks/post-receive-email | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email +index e459cc3..0849265 100755 +--- a/contrib/hooks/post-receive-email ++++ b/contrib/hooks/post-receive-email +@@ -11,11 +11,11 @@ + # will have put this somewhere standard. You should make this script + # executable then link to it in the repository you would like to use it in. + # For example, on debian the hook is stored in +-# /usr/share/git-core/contrib/hooks/post-receive-email: ++# /opt/csw/share/doc/git/contrib/hooks/post-receive-email: + # + # chmod a+x post-receive-email + # cd /path/to/your/repository.git +-# ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive ++# ln -sf /opt/csw/share/doc/git/contrib/hooks/post-receive-email hooks/post-receive + # + # This hook script assumes it is enabled on the central repository of a + # project, with all users pushing only to it and not between each other. It +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 31 04:10:53 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 31 Oct 2011 03:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[16052] csw/mgar/pkg/bacula/branches/5.2.0-beta Message-ID: Revision: 16052 http://gar.svn.sourceforge.net/gar/?rev=16052&view=rev Author: bdwalton Date: 2011-10-31 03:10:53 +0000 (Mon, 31 Oct 2011) Log Message: ----------- bacula/branches/5.2.0-beta: version bump to now released 5.2.1 Modified Paths: -------------- csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile csw/mgar/pkg/bacula/branches/5.2.0-beta/checksums Modified: csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile =================================================================== --- csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile 2011-10-31 02:54:32 UTC (rev 16051) +++ csw/mgar/pkg/bacula/branches/5.2.0-beta/Makefile 2011-10-31 03:10:53 UTC (rev 16052) @@ -1,6 +1,6 @@ # $Id$ NAME = bacula -VERSION = 5.2.0 +VERSION = 5.2.1 CATEGORIES = apps DESCRIPTION = The Open Source Network Backup Solution @@ -21,7 +21,7 @@ DISTFILES += CSWbacula-console.postinstall DISTFILES += postmsg -BUILD_DEP_PKGS = CSWmysql-dev CSWiconv CSWtcpwrap CSWossldevel +BUILD_DEP_PKGS = CSWmysql-dev CSWiconv CSWlibwrap1 CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev CSWlibcairo-dev PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd @@ -44,14 +44,16 @@ SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console OBSOLETED_BY_CSWbacula-console = CSWbaculaclient RUNTIME_DEP_PKGS_CSWbacula-console = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-console += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-console += CSWncurses -RUNTIME_DEP_PKGS_CSWbacula-console += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-console += CSWreadline +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibhistory6 +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWbacula-console += CSWosslrt -RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibstdc++6 PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf.CSW PKGFILES_CSWbacula-console += /etc/opt/csw/bacula/scripts/bconsole.CSW @@ -81,13 +83,13 @@ SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor OBSOLETED_BY_CSWbacula-tray-monitor = CSWbaculaclient RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWftype2 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgtk2 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibatk RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWpango @@ -98,13 +100,13 @@ CATALOGNAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files -RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWbacula-common += CSWmysql5rt RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-common += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-common += CSWosslrt -RUNTIME_DEP_PKGS_CSWbacula-common += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibpython2-6-1-0 PKGFILES_CSWbacula-common += .*libbac-$(VERSION).so .*libbac.so PKGFILES_CSWbacula-common += .*libbaccfg-$(VERSION).so .*libbaccfg.so @@ -120,11 +122,12 @@ CATALOGNAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon RUNTIME_DEP_PKGS_CSWbacula-fd = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibz1 +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWliblzo2-2 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd @@ -138,12 +141,13 @@ CATALOGNAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmysql5rt -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibz1 +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWliblzo2-2 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmtx @@ -168,12 +172,12 @@ CATALOGNAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-director += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-director += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWbacula-director += CSWmysql5rt -RUNTIME_DEP_PKGS_CSWbacula-director += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-director += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-director += CSWperl Modified: csw/mgar/pkg/bacula/branches/5.2.0-beta/checksums =================================================================== --- csw/mgar/pkg/bacula/branches/5.2.0-beta/checksums 2011-10-31 02:54:32 UTC (rev 16051) +++ csw/mgar/pkg/bacula/branches/5.2.0-beta/checksums 2011-10-31 03:10:53 UTC (rev 16052) @@ -1 +1 @@ -f72ad9ab47acab2bff50553faa40547d bacula-5.2.0.tar.gz +793da9f89fc5e024b6b95eb16a3120e5 bacula-5.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 31 16:19:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 31 Oct 2011 15:19:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[16053] csw/mgar/pkg Message-ID: Revision: 16053 http://gar.svn.sourceforge.net/gar/?rev=16053&view=rev Author: dmichelsen Date: 2011-10-31 15:19:08 +0000 (Mon, 31 Oct 2011) Log Message: ----------- recutils/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/recutils/ csw/mgar/pkg/recutils/Makefile csw/mgar/pkg/recutils/branches/ csw/mgar/pkg/recutils/tags/ csw/mgar/pkg/recutils/trunk/ csw/mgar/pkg/recutils/trunk/Makefile csw/mgar/pkg/recutils/trunk/checksums csw/mgar/pkg/recutils/trunk/files/ Added: csw/mgar/pkg/recutils/Makefile =================================================================== --- csw/mgar/pkg/recutils/Makefile (rev 0) +++ csw/mgar/pkg/recutils/Makefile 2011-10-31 15:19:08 UTC (rev 16053) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/recutils/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/recutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/recutils/trunk/Makefile (rev 0) +++ csw/mgar/pkg/recutils/trunk/Makefile 2011-10-31 15:19:08 UTC (rev 16053) @@ -0,0 +1,22 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = recutils +VERSION = 1.3.90 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = GNU Recutils +define BLURB + GNU Recutils is a set of tools and libraries to access human-editable, plain text databases called recfiles. + The data is stored as a sequence of records, each record containing an arbitrary number of named fields. +endef + +MASTER_SITES = $(GNU_MIRROR) +MASTER_SITES += ftp://alpha.gnu.org/gnu/$(GNU_PROJ)/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/recutils/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/recutils/trunk/checksums =================================================================== --- csw/mgar/pkg/recutils/trunk/checksums (rev 0) +++ csw/mgar/pkg/recutils/trunk/checksums 2011-10-31 15:19:08 UTC (rev 16053) @@ -0,0 +1 @@ +7d50e39d2ed5d31c0a35350e905d111c recutils-1.3.90.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.